diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6249c7d2..66f6d196 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,7 +141,7 @@ jobs: build-mac: name: Mac - runs-on: macos-12 + runs-on: macos-latest steps: diff --git a/client/package.json b/client/package.json index 7066c234..e50f9064 100644 --- a/client/package.json +++ b/client/package.json @@ -9,20 +9,20 @@ "preview": "vite preview" }, "dependencies": { - "@quasar/extras": "^1.16.12", - "axios": "^1.7.7", + "@quasar/extras": "^1.16.15", + "axios": "^1.7.9", "compare-versions": "^6.1.1", - "quasar": "^2.17.0", - "vue": "^3.5.12", - "vue-router": "^4.4.5", + "quasar": "^2.17.5", + "vue": "^3.5.13", + "vue-router": "^4.5.0", "vuedraggable": "^4.1.0" }, "devDependencies": { - "@quasar/vite-plugin": "^1.7.0", - "@vitejs/plugin-vue": "^5.1.4", + "@quasar/vite-plugin": "^1.8.1", + "@vitejs/plugin-vue": "^5.2.1", "sass": "1.79.5", - "typescript": "^5.6.3", - "vite": "^5.4.9", - "vue-tsc": "^2.1.6" + "typescript": "^5.7.2", + "vite": "^5.4.11", + "vue-tsc": "^2.2.0" } } \ No newline at end of file diff --git a/client/src/assets/bg.jpg b/client/src/assets/bg.jpg index ff708fe3..6bc70d45 100644 Binary files a/client/src/assets/bg.jpg and b/client/src/assets/bg.jpg differ diff --git a/client/src/style/app.scss b/client/src/style/app.scss index 96daedce..8af315f4 100644 --- a/client/src/style/app.scss +++ b/client/src/style/app.scss @@ -1,26 +1,26 @@ -@import 'quasar.scss'; +@import './quasar.scss'; @font-face { - font-family: Dosis; - src: url('./fonts/Dosis-Light.ttf'); + font-family: 'Dosis'; + src: url('./fonts/Dosis-Light.ttf') format('truetype'); font-weight: 300; } @font-face { - font-family: Dosis; - src: url('./fonts/Dosis-Regular.ttf'); + font-family: 'Dosis'; + src: url('./fonts/Dosis-Regular.ttf') format('truetype'); font-weight: 400; } @font-face { - font-family: Dosis; - src: url('./fonts/Dosis-Medium.ttf'); + font-family: 'Dosis'; + src: url('./fonts/Dosis-Medium.ttf') format('truetype'); font-weight: 500; } @font-face { - font-family: Dosis; - src: url('./fonts/Dosis-SemiBold.ttf'); + font-family: 'Dosis'; + src: url('./fonts/Dosis-SemiBold.ttf') format('truetype'); font-weight: 600; } @@ -209,4 +209,5 @@ code { ::-webkit-scrollbar-corner { background-color: transparent !important; -} \ No newline at end of file +} + diff --git a/client/vite.config.ts b/client/vite.config.ts index 0a5ae832..5fcf51b9 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -2,21 +2,22 @@ import { defineConfig } from 'vite'; import { quasar, transformAssetUrls } from '@quasar/vite-plugin'; import vue from '@vitejs/plugin-vue'; - -// https://vitejs.dev/config/ export default defineConfig({ plugins: [ vue({ template: { transformAssetUrls } }), - quasar({ - sassVariables: 'src/style/quasar.scss' - }) + quasar() ], + css: { + preprocessorOptions: { + scss: {} + } + }, server: { port: 8080 }, build: { assetsInlineLimit: 16 * 1024 } -}); +}); \ No newline at end of file