From e623e3ad1a28dad2e83c32f8d74f94d08a43f0d3 Mon Sep 17 00:00:00 2001 From: Alf Sebastian Houge Date: Mon, 30 Jan 2023 22:01:19 +0100 Subject: [PATCH 1/3] Ignore .vscode directory in git --- .gitignore | 2 ++ ui/.gitignore | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a5a5ae1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# Don't track .vscode directory +.vscode diff --git a/ui/.gitignore b/ui/.gitignore index efc68ed..8cc86ba 100644 --- a/ui/.gitignore +++ b/ui/.gitignore @@ -29,3 +29,6 @@ yarn-error.log* *.njsproj *.sln *.sw* + +#Vs code files +.vscode From 05c5381a0651b936ccadc8735da6abd0097f313b Mon Sep 17 00:00:00 2001 From: Alf Sebastian Houge Date: Mon, 30 Jan 2023 22:03:23 +0100 Subject: [PATCH 2/3] Remove ui .vscode directory --- .gitignore | 2 + server/.gitignore | 3 +- ui/.gitignore | 2 + ui/.vscode/settings.json | 93 ---------------------------------------- 4 files changed, 6 insertions(+), 94 deletions(-) delete mode 100644 ui/.vscode/settings.json diff --git a/.gitignore b/.gitignore index a5a5ae1..8a8ea44 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ # Don't track .vscode directory .vscode +!.vscode/launch.json + diff --git a/server/.gitignore b/server/.gitignore index 032b3b4..3f1f4a3 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -14,6 +14,7 @@ # MS VSCode .vscode +!.vscode/launch.json __debug_bin # Dependency directories (remove the comment below to include it) @@ -22,4 +23,4 @@ assets/* keys/* backups/* nodemon.json -dist/* \ No newline at end of file +dist/* diff --git a/ui/.gitignore b/ui/.gitignore index 8cc86ba..47253a4 100644 --- a/ui/.gitignore +++ b/ui/.gitignore @@ -32,3 +32,5 @@ yarn-error.log* #Vs code files .vscode +!.vscode/launch.json + diff --git a/ui/.vscode/settings.json b/ui/.vscode/settings.json deleted file mode 100644 index 635d2a8..0000000 --- a/ui/.vscode/settings.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - // === - // Spacing - // === - - "editor.insertSpaces": true, - "editor.tabSize": 2, - "editor.trimAutoWhitespace": true, - "files.trimTrailingWhitespace": true, - "files.eol": "\n", - "files.insertFinalNewline": true, - "files.trimFinalNewlines": true, - - // === - // Files - // === - - "files.exclude": { - "**/*.log": true, - "**/*.log*": true, - "**/dist": true, - "**/coverage": true - }, - "files.associations": { - ".markdownlintrc": "jsonc" - }, - - // === - // Event Triggers - // === - - "editor.formatOnSave": true, - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.codeActionsOnSave": { - "source.fixAll.eslint": true, - "source.fixAll.stylelint": true, - "source.fixAll.markdownlint": true - }, - "eslint.validate": [ - "javascript", - "javascriptreact", - "vue", - "vue-html", - "html" - ], - "vetur.format.enable": false, - "vetur.completion.scaffoldSnippetSources": { - "user": "🗒️", - "workspace": "💼", - "vetur": "" - }, - "prettier.disableLanguages": [], - - // === - // HTML - // === - - "html.format.enable": false, - "vetur.validation.template": false, - "emmet.triggerExpansionOnTab": true, - "emmet.includeLanguages": { - "vue-html": "html" - }, - "vetur.completion.tagCasing": "initial", - - // === - // JS(ON) - // === - - "jest.autoEnable": false, - "jest.enableCodeLens": false, - "javascript.format.enable": false, - "json.format.enable": false, - "vetur.validation.script": false, - - // === - // CSS - // === - - "stylelint.enable": true, - "css.validate": false, - "scss.validate": false, - "vetur.validation.style": false, - - // === - // MARKDOWN - // === - - "[markdown]": { - "editor.wordWrap": "wordWrapColumn", - "editor.wordWrapColumn": 80 - } -} From 669bffa95560e55021f1f3c845ecb6aaa9efd427 Mon Sep 17 00:00:00 2001 From: Alf Sebastian Houge Date: Mon, 30 Jan 2023 22:06:47 +0100 Subject: [PATCH 3/3] Fix wrong translation for engine size field --- ui/src/router/views/createVehicle.vue | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ui/src/router/views/createVehicle.vue b/ui/src/router/views/createVehicle.vue index 409c1df..2d385e8 100644 --- a/ui/src/router/views/createVehicle.vue +++ b/ui/src/router/views/createVehicle.vue @@ -140,7 +140,7 @@ export default { - + @@ -168,13 +168,21 @@ export default { - +
- +