feat: formatting

vhs · Sep 23, 2024 · 3038fbe · 3038fbe
1 parent c613215
commit 3038fbe
Show file tree

Hide file tree

Showing 17 changed files with 1,669 additions and 1,029 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -0,0 +1,3 @@
+{
+    "extends": ["stylelint-config-standard", "stylelint-prettier/recommended"]
+}
diff --git a/README.md b/README.md
@@ -22,8 +22,8 @@ The `pages/api` directory is mapped to `/api/*`. Files in this directory are tre
 
 To learn more about Next.js, take a look at the following resources:
 
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+-   [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
+-   [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
 
 You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
 

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -1,14 +1,12 @@
-version: '3.4'
-
-services:
-  masks-override-page:
-    image: local/${DOCKER_TEMPLATE}
-    build: .
-    ports:
-      - "7442:3000"
-    environment:
-      - DEBUG=app:*
-    env_file:
-      - .env.local
-    volumes:
-      - ./public/config.json:/app/public/config.json
+services:
+    masks-override-page:
+        image: local/${DOCKER_TEMPLATE}
+        build: .
+        ports:
+            - '7442:3000'
+        environment:
+            - DEBUG=app:*
+        env_file:
+            - .env.local
+        volumes:
+            - ./public/config.json:/app/public/config.json
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.4'
-
-services:
-  masks-override-page:
-    image: ${DOCKER_TEMPLATE}
+services:
+    masks-override-page:
+        image: ${DOCKER_TEMPLATE}
diff --git a/jsconfig.json b/jsconfig.json
@@ -1,41 +1,41 @@
 {
-  "compilerOptions": {
-    "baseUrl": ".",
-    "checkJs": false,
-    "resolveJsonModule": true,
-    "moduleResolution": "node",
-    "target": "es2020",
-    "module": "es2015",
-    "paths": {
-      "@/components/*": [
-        "components/*"
-      ],
-      "@/styles/*": [
-        "styles/*"
-      ],
-      "@/pages/*": [
-        "pages/*"
-      ]
-    }
-  },
-  "exclude": [
-    "dist",
-    "node_modules",
-    "build",
-    ".vscode",
-    ".next",
-    "coverage",
-    ".npm",
-    ".yarn"
-  ],
-  "include": [
-    "."
-  ],
-  "typeAcquisition": {
-    "enable": true,
+    "compilerOptions": {
+        "baseUrl": ".",
+        "checkJs": false,
+        "resolveJsonModule": true,
+        "moduleResolution": "node",
+        "target": "es2020",
+        "module": "es2015",
+        "paths": {
+            "@/components/*": [
+                "components/*"
+            ],
+            "@/styles/*": [
+                "styles/*"
+            ],
+            "@/pages/*": [
+                "pages/*"
+            ]
+        }
+    },
+    "exclude": [
+        "dist",
+        "node_modules",
+        "build",
+        ".vscode",
+        ".next",
+        "coverage",
+        ".npm",
+        ".yarn"
+    ],
     "include": [
-      "react",
-      "react-dom"
-    ]
-  }
+        "."
+    ],
+    "typeAcquisition": {
+        "enable": true,
+        "include": [
+            "react",
+            "react-dom"
+        ]
+    }
 }
diff --git a/package.json b/package.json
@@ -16,11 +16,6 @@
         "autoprefixer": "^10.4.7",
         "bootstrap": "5.2.0-beta1",
         "debug": "^4.3.4",
-        "eslint-config-standard": "^17.0.0",
-        "eslint-plugin-jest": "^26.5.3",
-        "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-promise": "^6.0.0",
-        "eslint-plugin-standard": "^5.0.0",
         "moment": "^2.29.4",
         "next": "14.1.1",
         "postcss": "^8.4.14",
@@ -29,9 +24,19 @@
         "react-dom": "18.2.0",
         "react-toastify": "^9.0.4"
     },
+    "packageManager": "[email protected]",
     "devDependencies": {
         "eslint": "8.17.0",
-        "eslint-config-next": "12.1.6"
-    },
-    "packageManager": "[email protected]"
+        "eslint-config-next": "12.1.6",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-config-standard": "^17.0.0",
+        "eslint-plugin-jest": "^26.5.3",
+        "eslint-plugin-node": "^11.1.0",
+        "eslint-plugin-promise": "^6.0.0",
+        "eslint-plugin-standard": "^5.0.0",
+        "prettier": "^3.3.3",
+        "stylelint": "^16.9.0",
+        "stylelint-config-standard": "^36.0.1",
+        "stylelint-prettier": "^5.0.2"
+    }
 }
diff --git a/src/components/Clock/Clock.js b/src/components/Clock/Clock.js
@@ -3,29 +3,25 @@ import PropTypes from 'prop-types'
 import styles from './Clock.module.css'
 
 const Clock = ({ time, color }) => {
-  if (time == null || time === false) {
-    return (
-      <div className={styles.Clock}>
-      __:__
-    </div>
-    )
-  }
+    if (time == null || time === false) {
+        return <div className={styles.Clock}>__:__</div>
+    }
 
-  const date = new Date(time)
+    const date = new Date(time)
 
-  const hours = date.getHours().toString().padStart(2, '0')
-  const minutes = date.getMinutes().toString().padStart(2, '0')
+    const hours = date.getHours().toString().padStart(2, '0')
+    const minutes = date.getMinutes().toString().padStart(2, '0')
 
-  return (
-    <div className={styles.Clock} style={{ color }}>
-      {hours}:{minutes}
-    </div>
-  )
+    return (
+        <div className={styles.Clock} style={{ color }}>
+            {hours}:{minutes}
+        </div>
+    )
 }
 
 Clock.propTypes = {
-  time: PropTypes.any.isRequired,
-  color: PropTypes.string
+    time: PropTypes.any.isRequired,
+    color: PropTypes.string
 }
 
 Clock.defaultProps = {}

diff --git a/src/components/Clock/Clock.module.css b/src/components/Clock/Clock.module.css
@@ -1,11 +1,11 @@
 .Clock {
-    display         : flex;
-    flex-direction  : column;
-    align-items     : center;
-    justify-content : center;
-    background-color: #EDEDED;
-    border-radius   : 5px;
-    box-shadow      : 0 0 10px rgba(0, 0, 0, 0.1);
-    font-family     : "Helvetica Neue Regular", Helvetica, Arial, sans-serif;
-    font-size       : 4rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    background-color: #ededed;
+    border-radius: 5px;
+    box-shadow: 0 0 10px rgb(0 0 0 / 10%);
+    font-family: 'Helvetica Neue Regular', Helvetica, Arial, sans-serif;
+    font-size: 4rem;
 }
diff --git a/src/lib/mqtt-beacon/service.js b/src/lib/mqtt-beacon/service.js
@@ -4,8 +4,10 @@ import Debug from 'debug'
 const debug = Debug('app:mqtt-beacon:service')
 
 const mqttUri = process.env.MQTT_URI ?? 'wss://test.mosquitto.org:8081/mqtt'
-const mqttTopic = process.env.MQTT_TOPIC ?? '/test/vhs/spacebus/status/space/mask-override'
-const mqttInterval = (process.env.MQTT_INTERVAL != null) ? parseInt(process.env.MQTT_INTERVAL) : 1
+const mqttTopic =
+    process.env.MQTT_TOPIC ?? '/test/vhs/spacebus/status/space/mask-override'
+const mqttInterval =
+    process.env.MQTT_INTERVAL != null ? parseInt(process.env.MQTT_INTERVAL) : 1
 const mqttStoppedValue = process.env.MQTT_STOPPED_VALUE ?? 'off'
 
 class MQTTBeaconService {
@@ -14,55 +16,58 @@ class MQTTBeaconService {
     static intervalId = null
     static beaconValue = mqttStoppedValue
 
-    static start () {
-      debug('start')
+    static start() {
+        debug('start')
 
-      if (!MQTTBeaconService.started) {
-        debug('start', 'Connecting to', mqttUri)
-        MQTTBeaconService.client = MQTT.connect(mqttUri)
+        if (!MQTTBeaconService.started) {
+            debug('start', 'Connecting to', mqttUri)
+            MQTTBeaconService.client = MQTT.connect(mqttUri)
 
-        MQTTBeaconService.client.on('connect', () => {
-          debug('start', 'Subscribing to', mqttTopic)
-          MQTTBeaconService.client.subscribe(mqttTopic)
-        })
+            MQTTBeaconService.client.on('connect', () => {
+                debug('start', 'Subscribing to', mqttTopic)
+                MQTTBeaconService.client.subscribe(mqttTopic)
+            })
 
-        MQTTBeaconService.intervalId = setInterval(() => MQTTBeaconService.sendBeacon(), (mqttInterval < 1000 ? mqttInterval * 1000 : mqttInterval))
+            MQTTBeaconService.intervalId = setInterval(
+                () => MQTTBeaconService.sendBeacon(),
+                mqttInterval < 1000 ? mqttInterval * 1000 : mqttInterval
+            )
 
-        MQTTBeaconService.started = true
-      }
+            MQTTBeaconService.started = true
+        }
     }
 
-    static stop () {
-      debug('stop')
-      MQTTBeaconService.client.end()
-      clearInterval(MQTTBeaconService.intervalId)
-      MQTTBeaconService.started = false
-      MQTTBeaconService.client = null
-      MQTTBeaconService.intervalId = null
+    static stop() {
+        debug('stop')
+        MQTTBeaconService.client.end()
+        clearInterval(MQTTBeaconService.intervalId)
+        MQTTBeaconService.started = false
+        MQTTBeaconService.client = null
+        MQTTBeaconService.intervalId = null
     }
 
-    static getBeaconValue () {
-      return MQTTBeaconService.beaconValue
+    static getBeaconValue() {
+        return MQTTBeaconService.beaconValue
     }
 
-    static setBeaconValue (value) {
-      MQTTBeaconService.beaconValue = value
-      MQTTBeaconService.sendBeacon(value)
+    static setBeaconValue(value) {
+        MQTTBeaconService.beaconValue = value
+        MQTTBeaconService.sendBeacon(value)
     }
 
-    static sendBeacon (value) {
-      value = value ?? MQTTBeaconService.getBeaconValue()
+    static sendBeacon(value) {
+        value = value ?? MQTTBeaconService.getBeaconValue()
 
-      if (value != null && MQTTBeaconService.client != null) {
-        debug('publish', MQTTBeaconService.beaconValue)
-        MQTTBeaconService.client.publish(mqttTopic, value)
-      }
+        if (value != null && MQTTBeaconService.client != null) {
+            debug('publish', MQTTBeaconService.beaconValue)
+            MQTTBeaconService.client.publish(mqttTopic, value)
+        }
     }
 }
 
 if (global.MQTTBeaconServiceInstance == null) {
-  global.MQTTBeaconServiceInstance = MQTTBeaconService
-  global.MQTTBeaconServiceInstance.start()
+    global.MQTTBeaconServiceInstance = MQTTBeaconService
+    global.MQTTBeaconServiceInstance.start()
 }
 
 const MQTTBeaconServiceInstance = global.MQTTBeaconServiceInstance