diff --git a/.vscode/settings.json b/.vscode/settings.json index ad273d94..e3fbdb9f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -34,6 +34,9 @@ "css": "css" }, "tailwindCSS.experimental.classRegex": [ + ["classes \\=([^;]*);", "'([^']*)'"], + ["classes \\=([^;]*);", "\"([^\"]*)\""], + ["classes \\=([^;]*);", "\\`([^\\`]*)\\`"] ], "editor.quickSuggestions": { "strings": true diff --git a/package.json b/package.json index 50b6a446..f9d71a9f 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "sass": "^1.72.0", "tailwindcss": "^3.4.3", "typescript": "^5.4.2", - "vite": "^5.1.6" + "vite": "^5.1.6", + "vite-tsconfig-paths": "^4.3.2" } } diff --git a/tailwind.config.js b/tailwind.config.js index da3cf767..75b273df 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -19,8 +19,12 @@ module.exports = { }, colors: generateShades(colors), boxShadow, + width: { + 'navigator': '420px' + }, height: { - 'toolbar': '55px' + 'toolbar': '55px', + 'navigator': '440px' }, zIndex: { 'toolbar': '' diff --git a/tsconfig.json b/tsconfig.json index 99124408..218721b0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,7 +20,10 @@ "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, - "jsx": "react-jsx" + "jsx": "react-jsx", + "paths": { + "@layout/*": ["layout/*"], + } }, "include": [ "src", diff --git a/vite.config.mjs b/vite.config.mjs index 7d6d25d5..4e043b5a 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -2,9 +2,10 @@ import react from '@vitejs/plugin-react'; import { resolve } from 'path'; import { defineConfig } from 'vite'; +import tsconfigPaths from 'vite-tsconfig-paths'; export default defineConfig({ - plugins: [ react() ], + plugins: [ react(), tsconfigPaths() ], resolve: { alias: { '@': resolve(__dirname, 'src'), diff --git a/yarn.lock b/yarn.lock index 11bd4faa..f0325633 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1261,7 +1261,7 @@ debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: +debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -1912,6 +1912,11 @@ globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" +globrex@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098" + integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg== + gopd@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" @@ -3242,6 +3247,11 @@ ts-interface-checker@^0.1.9: resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699" integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== +tsconfck@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-3.0.3.tgz#d9bda0e87d05b1c360e996c9050473c7e6f8084f" + integrity sha512-4t0noZX9t6GcPTfBAbIbbIU4pfpCwh0ueq3S4O/5qXI1VwK1outmxhe9dOiEWqMz3MW2LKgDTpqWV+37IWuVbA== + tsconfig-paths@^3.15.0: version "3.15.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" @@ -3373,6 +3383,15 @@ util-deprecate@^1.0.2: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== +vite-tsconfig-paths@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz#321f02e4b736a90ff62f9086467faf4e2da857a9" + integrity sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA== + dependencies: + debug "^4.1.1" + globrex "^0.1.2" + tsconfck "^3.0.3" + vite@^5.1.6: version "5.2.7" resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.7.tgz#e1b8a985eb54fcb9467d7f7f009d87485016df6e"