From 63a91dbc83964718bd8c266666184512366a7d5d Mon Sep 17 00:00:00 2001 From: vikingowl Date: Wed, 24 Jan 2024 12:04:39 +0100 Subject: [PATCH] added fork-awesome and prettier to project --- frontend/.prettierrc.json | 25 +++++++++++++++++++++++++ frontend/index.html | 19 ++++++++----------- frontend/package.json | 2 ++ frontend/src/assets/styles/base.scss | 1 + frontend/src/main.ts | 7 +++++-- frontend/yarn.lock | 10 ++++++++++ 6 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 frontend/.prettierrc.json create mode 100644 frontend/src/assets/styles/base.scss diff --git a/frontend/.prettierrc.json b/frontend/.prettierrc.json new file mode 100644 index 0000000..9c24ca9 --- /dev/null +++ b/frontend/.prettierrc.json @@ -0,0 +1,25 @@ +{ + "trailingComma": "none", + "tabWidth": 2, + "semi": false, + "singleQuote": true, + "printWidth": 100, + "bracketSameLine": true, + "overrides": [ + { + "files": "*.test.js", + "options": { + "semi": true + } + }, + { + "files": [ + ",*.html", + "legacy/**/*.js" + ], + "options": { + "tabWidth": 4 + } + } + ] +} diff --git a/frontend/index.html b/frontend/index.html index 56bb2a8..a2c2dbb 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,19 +1,16 @@ - + - - + - - + - + ALHP Status - + - +
- - - + + diff --git a/frontend/package.json b/frontend/package.json index 1e22508..9c21b73 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -8,6 +8,7 @@ }, "dependencies": { "@mdi/font": "7.0.96", + "fork-awesome": "^1.2.0", "roboto-fontface": "*", "vue": "^3.3.0", "vuetify": "^3.0.0" @@ -16,6 +17,7 @@ "@babel/types": "^7.23.0", "@types/node": "^20.10.0", "@vitejs/plugin-vue": "^4.5.0", + "prettier": "^3.2.4", "sass": "^1.69.0", "typescript": "^5.3.0", "unplugin-fonts": "^1.1.0", diff --git a/frontend/src/assets/styles/base.scss b/frontend/src/assets/styles/base.scss new file mode 100644 index 0000000..9de6160 --- /dev/null +++ b/frontend/src/assets/styles/base.scss @@ -0,0 +1 @@ +@import "fork-awesome/css/fork-awesome.min.css"; diff --git a/frontend/src/main.ts b/frontend/src/main.ts index c8fc172..da0f2a5 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -5,13 +5,16 @@ */ // Plugins -import { registerPlugins } from '@/plugins' +import {registerPlugins} from '@/plugins' // Components import App from './App.vue' // Composables -import { createApp } from 'vue' +import {createApp} from 'vue' + +// Styles +import '@/assets/styles/base.scss' const app = createApp(App) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 21ae8da..f3b6fc3 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -529,6 +529,11 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" +fork-awesome@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.2.0.tgz#acd43f1e1f54510fa45209c31385b4fde3a95003" + integrity sha512-MNwTBnnudMIweHfDtTY8TeR5fxIAZ2w9o8ITn5XDySqdxa4k5AH8IuAMa89RVxDxgPNlosZxqkFKN5UmHXuYSw== + fsevents@~2.3.2, fsevents@~2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" @@ -682,6 +687,11 @@ postcss@^8.4.32, postcss@^8.4.33: picocolors "^1.0.0" source-map-js "^1.0.2" +prettier@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283" + integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ== + queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"