From a1a5db11b75aa984bc8038432f51f04038b26c79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= Date: Tue, 27 Aug 2024 00:25:42 +0000 Subject: [PATCH] "prettier" reformatting --- ui/.devcontainer/devcontainer.json | 72 +++++++++++------------ ui/.vscode/extensions.json | 6 +- ui/.vscode/launch.json | 2 +- ui/.vscode/settings.json | 5 +- ui/.vscode/tasks.json | 22 +++---- ui/README.md | 5 ++ ui/babel.config.json | 6 +- ui/package.json | 5 +- ui/public/index.html | 32 ++++++---- ui/src/bulma-scheme.scss | 12 ++-- ui/src/components/AdminButton.vue | 2 +- ui/src/components/admin/ConfigView.vue | 2 +- ui/src/components/admin/DoorMapEditor.vue | 6 +- ui/src/components/bulma/Drawer.vue | 1 + ui/src/components/bulma/Secret.vue | 1 + ui/tsconfig.json | 21 ++----- 16 files changed, 100 insertions(+), 100 deletions(-) diff --git a/ui/.devcontainer/devcontainer.json b/ui/.devcontainer/devcontainer.json index a707255..529b6e9 100644 --- a/ui/.devcontainer/devcontainer.json +++ b/ui/.devcontainer/devcontainer.json @@ -1,39 +1,39 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: // https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/javascript-node { - "name": "Advent22 UI", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/vscode/devcontainers/javascript-node:1-18-bookworm", - // Features to add to the dev container. More info: https://containers.dev/features. - "features": { - "ghcr.io/devcontainers-contrib/features/apt-get-packages:1": { - "packages": "git-flow, git-lfs" - }, - "ghcr.io/devcontainers-contrib/features/vue-cli:2": {} - }, - // Configure tool-specific properties. - "customizations": { - // Configure properties specific to VS Code. - "vscode": { - // Set *default* container specific settings.json values on container create. - "settings": { - "terminal.integrated.defaultProfile.linux": "zsh" - }, - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode", - "mhutchie.git-graph", - "Syler.sass-indented", - "Vue.volar" - ] - } - }, - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - // Use 'postCreateCommand' to run commands after the container is created. - // "postCreateCommand": "yarn install", - "postStartCommand": "yarn install --production false", - // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "node" -} \ No newline at end of file + "name": "Advent22 UI", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + "image": "mcr.microsoft.com/vscode/devcontainers/javascript-node:1-18-bookworm", + // Features to add to the dev container. More info: https://containers.dev/features. + "features": { + "ghcr.io/devcontainers-contrib/features/apt-get-packages:1": { + "packages": "git-flow, git-lfs" + }, + "ghcr.io/devcontainers-contrib/features/vue-cli:2": {} + }, + // Configure tool-specific properties. + "customizations": { + // Configure properties specific to VS Code. + "vscode": { + // Set *default* container specific settings.json values on container create. + "settings": { + "terminal.integrated.defaultProfile.linux": "zsh" + }, + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode", + "mhutchie.git-graph", + "Syler.sass-indented", + "Vue.volar" + ] + } + }, + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "yarn install", + "postStartCommand": "yarn install --production false", + // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "node" +} diff --git a/ui/.vscode/extensions.json b/ui/.vscode/extensions.json index e0be954..45d98df 100644 --- a/ui/.vscode/extensions.json +++ b/ui/.vscode/extensions.json @@ -1,5 +1,3 @@ { - "recommendations": [ - "sdras.vue-vscode-snippets" - ] -} \ No newline at end of file + "recommendations": ["sdras.vue-vscode-snippets"] +} diff --git a/ui/.vscode/launch.json b/ui/.vscode/launch.json index 91156ea..5423ca1 100644 --- a/ui/.vscode/launch.json +++ b/ui/.vscode/launch.json @@ -12,4 +12,4 @@ "webRoot": "${workspaceFolder}" } ] -} \ No newline at end of file +} diff --git a/ui/.vscode/settings.json b/ui/.vscode/settings.json index 37a5aab..46192d7 100644 --- a/ui/.vscode/settings.json +++ b/ui/.vscode/settings.json @@ -17,6 +17,5 @@ "sass.disableAutoIndent": true, "sass.format.convert": false, "sass.format.deleteWhitespace": true, - "prettier.trailingComma": "all", - "volar.inlayHints.eventArgumentInInlineHandlers": false, -} \ No newline at end of file + "volar.inlayHints.eventArgumentInInlineHandlers": false +} diff --git a/ui/.vscode/tasks.json b/ui/.vscode/tasks.json index 2cd5033..e5ffa95 100644 --- a/ui/.vscode/tasks.json +++ b/ui/.vscode/tasks.json @@ -1,12 +1,12 @@ { - "version": "2.0.0", - "tasks": [ - { - "type": "npm", - "script": "serve", - "problemMatcher": [], - "label": "UI starten", - "detail": "vue-cli-service serve" - } - ] -} \ No newline at end of file + "version": "2.0.0", + "tasks": [ + { + "type": "npm", + "script": "serve", + "problemMatcher": [], + "label": "UI starten", + "detail": "vue-cli-service serve" + } + ] +} diff --git a/ui/README.md b/ui/README.md index 5715cb1..9ed3aab 100644 --- a/ui/README.md +++ b/ui/README.md @@ -1,24 +1,29 @@ # advent22_ui ## Project setup + ``` yarn install ``` ### Compiles and hot-reloads for development + ``` yarn serve ``` ### Compiles and minifies for production + ``` yarn build ``` ### Lints and fixes files + ``` yarn lint ``` ### Customize configuration + See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/ui/babel.config.json b/ui/babel.config.json index 07c2147..7895cad 100644 --- a/ui/babel.config.json +++ b/ui/babel.config.json @@ -1,5 +1,3 @@ { - "presets": [ - "@vue/cli-plugin-babel/preset" - ] -} \ No newline at end of file + "presets": ["@vue/cli-plugin-babel/preset"] +} diff --git a/ui/package.json b/ui/package.json index 633251e..e2d6b3d 100644 --- a/ui/package.json +++ b/ui/package.json @@ -41,5 +41,8 @@ "vue": "^3.4.37", "vue-class-component": "^8.0.0-0" }, - "dependencies": {} + "dependencies": {}, + "prettier": { + "trailingComma": "all" + } } diff --git a/ui/public/index.html b/ui/public/index.html index 3c5b076..17c86a1 100644 --- a/ui/public/index.html +++ b/ui/public/index.html @@ -1,30 +1,38 @@ - - - - + + + + <%= htmlWebpackPlugin.options.title %>
diff --git a/ui/src/bulma-scheme.scss b/ui/src/bulma-scheme.scss index 0173814..6bd4e05 100644 --- a/ui/src/bulma-scheme.scss +++ b/ui/src/bulma-scheme.scss @@ -5,10 +5,10 @@ //===================== $colors: ( - "primary": #945DE1, - "link": #64B4BD, - "info": #8C4E80, - "success": #7E8E2B, - "warning": #F6CA6B, - "danger": #C5443B, + "primary": #945de1, + "link": #64b4bd, + "info": #8c4e80, + "success": #7e8e2b, + "warning": #f6ca6b, + "danger": #c5443b, ); diff --git a/ui/src/components/AdminButton.vue b/ui/src/components/AdminButton.vue index 75ab479..b61e106 100644 --- a/ui/src/components/AdminButton.vue +++ b/ui/src/components/AdminButton.vue @@ -11,11 +11,11 @@