From b5b66315cb633e52b67e80a7fb6bac798b32c130 Mon Sep 17 00:00:00 2001 From: hugeletters Date: Fri, 8 Sep 2023 16:48:57 +0200 Subject: [PATCH 01/13] renamed routes patched sveltekit to include tailwind config in tsconfig file added skeleton tailwind support --- frontend/package.json | 8 +- frontend/patches/@sveltejs__kit@1.23.0.patch | 14 ++ frontend/pnpm-lock.yaml | 161 +++++++++++++++++- .../src/routes/{hello => create}/+page.svelte | 5 +- .../src/routes/{hello => create}/common.ts | 0 .../job-search => create/cv}/+page.svelte | 0 .../offer}/+page.svelte | 0 frontend/tailwind.config.ts | 12 +- 8 files changed, 188 insertions(+), 12 deletions(-) create mode 100644 frontend/patches/@sveltejs__kit@1.23.0.patch rename frontend/src/routes/{hello => create}/+page.svelte (83%) rename frontend/src/routes/{hello => create}/common.ts (100%) rename frontend/src/routes/{hello/job-search => create/cv}/+page.svelte (100%) rename frontend/src/routes/{hello/employees-search => create/offer}/+page.svelte (100%) diff --git a/frontend/package.json b/frontend/package.json index 0d2189c6..9de336d3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,12 +10,14 @@ "openapi-gen": "tsx --tsconfig scripts/tsconfig.json scripts/openapi-gen.ts", "build": "vite build", "preview": "vite preview", + "analyze": "pnpm vite-bundle-visualizer", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", "lint": "prettier --plugin-search-dir . --check . && eslint .", "format": "prettier . -l -w --plugin prettier-plugin-svelte --plugin prettier-plugin-tailwindcss" }, "dependencies": { + "@floating-ui/dom": "^1.5.1", "@skeletonlabs/skeleton": "^2.0.0", "@skeletonlabs/tw-plugin": "^0.1.0", "@tanstack/svelte-query": "5.0.0-beta.20", @@ -45,11 +47,13 @@ "tslib": "^2.6.2", "tsx": "^3.12.7", "typescript": "^5.2.2", - "vite": "^4.4.9" + "vite": "^4.4.9", + "vite-bundle-visualizer": "^0.10.0" }, "pnpm": { "patchedDependencies": { - "openapi-fetch@0.7.4": "patches/openapi-fetch@0.7.4.patch" + "openapi-fetch@0.7.4": "patches/openapi-fetch@0.7.4.patch", + "@sveltejs/kit@1.23.0": "patches/@sveltejs__kit@1.23.0.patch" } } } diff --git a/frontend/patches/@sveltejs__kit@1.23.0.patch b/frontend/patches/@sveltejs__kit@1.23.0.patch new file mode 100644 index 00000000..27283279 --- /dev/null +++ b/frontend/patches/@sveltejs__kit@1.23.0.patch @@ -0,0 +1,14 @@ +diff --git a/src/core/sync/write_tsconfig.js b/src/core/sync/write_tsconfig.js +index 9f3a083649fe8645380e9a3558c6bef5c44530ff..cbda8cdc76ba32282c2975a60d2adf70dedce05a 100644 +--- a/src/core/sync/write_tsconfig.js ++++ b/src/core/sync/write_tsconfig.js +@@ -88,7 +88,8 @@ export function get_tsconfig(kit, include_base_url) { + const include = new Set([ + 'ambient.d.ts', + './types/**/$types.d.ts', +- config_relative('vite.config.ts') ++ config_relative('vite.config.ts'), ++ config_relative('tailwind.config.ts') + ]); + // TODO(v2): find a better way to include all src files. We can't just use routes/lib only because + // people might have other folders/files in src that they want included. diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index c000ebf2..fb7f92ca 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -5,11 +5,17 @@ settings: excludeLinksFromLockfile: false patchedDependencies: + '@sveltejs/kit@1.23.0': + hash: vra2r7fvwhg4pza7a47mqc2vja + path: patches/@sveltejs__kit@1.23.0.patch openapi-fetch@0.7.4: hash: s3g66rke3b2i4mtj7exmnnd27m path: patches/openapi-fetch@0.7.4.patch dependencies: + '@floating-ui/dom': + specifier: ^1.5.1 + version: 1.5.1 '@skeletonlabs/skeleton': specifier: ^2.0.0 version: 2.0.0(svelte@4.2.0) @@ -44,7 +50,7 @@ devDependencies: version: 2.1.0(@sveltejs/kit@1.23.0) '@sveltejs/kit': specifier: ^1.23.0 - version: 1.23.0(svelte@4.2.0)(vite@4.4.9) + version: 1.23.0(patch_hash=vra2r7fvwhg4pza7a47mqc2vja)(svelte@4.2.0)(vite@4.4.9) '@types/node': specifier: ^20.5.6 version: 20.5.6 @@ -96,6 +102,9 @@ devDependencies: vite: specifier: ^4.4.9 version: 4.4.9(@types/node@20.5.6) + vite-bundle-visualizer: + specifier: ^0.10.0 + version: 0.10.0 packages: @@ -575,6 +584,23 @@ packages: engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13'} dev: true + /@floating-ui/core@1.4.1: + resolution: {integrity: sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==} + dependencies: + '@floating-ui/utils': 0.1.1 + dev: false + + /@floating-ui/dom@1.5.1: + resolution: {integrity: sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==} + dependencies: + '@floating-ui/core': 1.4.1 + '@floating-ui/utils': 0.1.1 + dev: false + + /@floating-ui/utils@0.1.1: + resolution: {integrity: sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==} + dev: false + /@humanwhocodes/config-array@0.11.10: resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==} engines: {node: '>=10.10.0'} @@ -664,11 +690,11 @@ packages: peerDependencies: '@sveltejs/kit': ^1.0.0 dependencies: - '@sveltejs/kit': 1.23.0(svelte@4.2.0)(vite@4.4.9) + '@sveltejs/kit': 1.23.0(patch_hash=vra2r7fvwhg4pza7a47mqc2vja)(svelte@4.2.0)(vite@4.4.9) import-meta-resolve: 3.0.0 dev: true - /@sveltejs/kit@1.23.0(svelte@4.2.0)(vite@4.4.9): + /@sveltejs/kit@1.23.0(patch_hash=vra2r7fvwhg4pza7a47mqc2vja)(svelte@4.2.0)(vite@4.4.9): resolution: {integrity: sha512-MuDM6afpSMnPFMtEsE1O+Qn6NVPNHDqsDYYZE/8/+Z3IvGmE+GKHC+za6fEmCfwXLqNlxFZiV8s8kKOeNVJP+g==} engines: {node: ^16.14 || >=18} hasBin: true @@ -694,6 +720,7 @@ packages: transitivePeerDependencies: - supports-color dev: true + patched: true /@sveltejs/vite-plugin-svelte-inspector@1.0.4(@sveltejs/vite-plugin-svelte@2.4.5)(svelte@4.2.0)(vite@4.4.9): resolution: {integrity: sha512-zjiuZ3yydBtwpF3bj0kQNV0YXe+iKE545QGZVTaylW3eAzFr+pJ/cwK8lZEaRp4JtaJXhD5DyWAV4AxLh6DgaQ==} @@ -1036,6 +1063,11 @@ packages: streamsearch: 1.1.0 dev: true + /cac@6.7.14: + resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} + engines: {node: '>=8'} + dev: true + /callsites@3.1.0: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} @@ -1072,6 +1104,15 @@ packages: optionalDependencies: fsevents: 2.3.3 + /cliui@8.0.1: + resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} + engines: {node: '>=12'} + dependencies: + string-width: 4.2.3 + strip-ansi: 6.0.1 + wrap-ansi: 7.0.0 + dev: true + /code-red@1.0.4: resolution: {integrity: sha512-7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw==} dependencies: @@ -1159,6 +1200,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /define-lazy-prop@2.0.0: + resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} + engines: {node: '>=8'} + dev: true + /dequal@2.0.3: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} @@ -1198,6 +1244,10 @@ packages: resolution: {integrity: sha512-xqeGw3Gr6o3uyHy/yKjdnDQHY2RQvXcGC2cfHjccK1IGkH6cX1WQBN8EeC/YpwPhGkBaikDTecJ8+ssxSVRQlw==} dev: false + /emoji-regex@8.0.0: + resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} + dev: true + /es6-promise@3.3.1: resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==} dev: true @@ -1265,7 +1315,6 @@ packages: /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} - dev: false /escape-string-regexp@4.0.0: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} @@ -1487,6 +1536,11 @@ packages: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} dev: false + /get-caller-file@2.0.5: + resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} + engines: {node: 6.* || 8.* || >= 10.*} + dev: true + /get-tsconfig@4.7.0: resolution: {integrity: sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==} dependencies: @@ -1618,10 +1672,21 @@ packages: has: 1.0.3 dev: false + /is-docker@2.2.1: + resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} + engines: {node: '>=8'} + hasBin: true + dev: true + /is-extglob@2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} + /is-fullwidth-code-point@3.0.0: + resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} + engines: {node: '>=8'} + dev: true + /is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} @@ -1642,6 +1707,13 @@ packages: dependencies: '@types/estree': 1.0.1 + /is-wsl@2.2.0: + resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} + engines: {node: '>=8'} + dependencies: + is-docker: 2.2.1 + dev: true + /isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} dev: true @@ -1853,6 +1925,15 @@ packages: dependencies: wrappy: 1.0.2 + /open@8.4.2: + resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} + engines: {node: '>=12'} + dependencies: + define-lazy-prop: 2.0.0 + is-docker: 2.2.1 + is-wsl: 2.2.0 + dev: true + /openapi-fetch@0.7.4(patch_hash=s3g66rke3b2i4mtj7exmnnd27m): resolution: {integrity: sha512-ACoSikOuFO3sMROtqritJAsGd694gRNXFnWpYAqi+tQzowLOkcQ6SbeAvS+T6qNS92y/OLiiYcNrb/Rh/MrEVw==} dependencies: @@ -2160,6 +2241,11 @@ packages: dependencies: picomatch: 2.3.1 + /require-directory@2.1.1: + resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} + engines: {node: '>=0.10.0'} + dev: true + /resolve-from@4.0.0: resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} engines: {node: '>=4'} @@ -2196,6 +2282,22 @@ packages: glob: 7.2.3 dev: true + /rollup-plugin-visualizer@5.9.2: + resolution: {integrity: sha512-waHktD5mlWrYFrhOLbti4YgQCn1uR24nYsNuXxg7LkPH8KdTXVWR9DNY1WU0QqokyMixVXJS4J04HNrVTMP01A==} + engines: {node: '>=14'} + hasBin: true + peerDependencies: + rollup: 2.x || 3.x + peerDependenciesMeta: + rollup: + optional: true + dependencies: + open: 8.4.2 + picomatch: 2.3.1 + source-map: 0.7.4 + yargs: 17.7.2 + dev: true + /rollup@3.28.1: resolution: {integrity: sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} @@ -2296,11 +2398,25 @@ packages: engines: {node: '>=0.10.0'} dev: true + /source-map@0.7.4: + resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} + engines: {node: '>= 8'} + dev: true + /streamsearch@1.1.0: resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==} engines: {node: '>=10.0.0'} dev: true + /string-width@4.2.3: + resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} + engines: {node: '>=8'} + dependencies: + emoji-regex: 8.0.0 + is-fullwidth-code-point: 3.0.0 + strip-ansi: 6.0.1 + dev: true + /strip-ansi@6.0.1: resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} @@ -2629,6 +2745,16 @@ packages: /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + /vite-bundle-visualizer@0.10.0: + resolution: {integrity: sha512-11AwKlkhvw6jjiGbTiCZqBSGg/FQDLc0mVcoLWVov2jU/Ban67l+Sk4Fa0Iyctb5sObqg/dA28HkKCEmSRjw9g==} + hasBin: true + dependencies: + cac: 6.7.14 + rollup-plugin-visualizer: 5.9.2 + transitivePeerDependencies: + - rollup + dev: true + /vite@4.4.9(@types/node@20.5.6): resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} engines: {node: ^14.18.0 || >=16.0.0} @@ -2684,9 +2810,23 @@ packages: isexe: 2.0.0 dev: true + /wrap-ansi@7.0.0: + resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} + engines: {node: '>=10'} + dependencies: + ansi-styles: 4.3.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + dev: true + /wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} + /y18n@5.0.8: + resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} + engines: {node: '>=10'} + dev: true + /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} dev: true @@ -2706,6 +2846,19 @@ packages: engines: {node: '>=12'} dev: true + /yargs@17.7.2: + resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} + engines: {node: '>=12'} + dependencies: + cliui: 8.0.1 + escalade: 3.1.1 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + string-width: 4.2.3 + y18n: 5.0.8 + yargs-parser: 21.1.1 + dev: true + /yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} diff --git a/frontend/src/routes/hello/+page.svelte b/frontend/src/routes/create/+page.svelte similarity index 83% rename from frontend/src/routes/hello/+page.svelte rename to frontend/src/routes/create/+page.svelte index 7756500a..fbe09567 100644 --- a/frontend/src/routes/hello/+page.svelte +++ b/frontend/src/routes/create/+page.svelte @@ -1,14 +1,13 @@ -

Get started

Employess Search Job Search diff --git a/frontend/src/routes/hello/common.ts b/frontend/src/routes/create/common.ts similarity index 100% rename from frontend/src/routes/hello/common.ts rename to frontend/src/routes/create/common.ts diff --git a/frontend/src/routes/hello/job-search/+page.svelte b/frontend/src/routes/create/cv/+page.svelte similarity index 100% rename from frontend/src/routes/hello/job-search/+page.svelte rename to frontend/src/routes/create/cv/+page.svelte diff --git a/frontend/src/routes/hello/employees-search/+page.svelte b/frontend/src/routes/create/offer/+page.svelte similarity index 100% rename from frontend/src/routes/hello/employees-search/+page.svelte rename to frontend/src/routes/create/offer/+page.svelte diff --git a/frontend/tailwind.config.ts b/frontend/tailwind.config.ts index ad06fcbb..733d5af3 100644 --- a/frontend/tailwind.config.ts +++ b/frontend/tailwind.config.ts @@ -1,14 +1,20 @@ -import { Config } from 'tailwindcss'; +import { skeleton } from '@skeletonlabs/tw-plugin'; +import { join } from 'path'; +import type { Config } from 'tailwindcss'; import plugin from 'tailwindcss/plugin'; export default { - content: ['./src/**/*.{html,js,svelte,ts}'], + content: [ + './src/**/*.{html,js,svelte,ts}', + join(require.resolve('@skeletonlabs/skeleton'), '../**/*.{html,js,svelte,ts}') + ], theme: { extend: {} }, plugins: [ plugin(({ addVariant }) => { addVariant('current', ['&:focus-within', '&:hover']); - }) + }), + skeleton ] } satisfies Config; From 6d5f8c218873cf230c7e9f8331eb0d8510d9e4a3 Mon Sep 17 00:00:00 2001 From: hugeletters Date: Fri, 8 Sep 2023 18:09:53 +0200 Subject: [PATCH 02/13] updated styles more in line with design --- frontend/package.json | 5 +++- frontend/src/app.html | 2 +- frontend/src/app.pcss | 9 ++++++++ frontend/src/routes/+layout.svelte | 23 ++++++------------- frontend/src/routes/+page.svelte | 20 ++++++---------- frontend/src/routes/+page.ts | 2 +- frontend/src/routes/create/+page.svelte | 13 ----------- .../src/routes/profile/matches/+layout.svelte | 4 ++-- .../src/routes/profile/matches/Chats.svelte | 6 ++--- .../routes/profile/matches/[id]/+page.svelte | 6 ++--- frontend/svelte.config.js | 2 +- frontend/tailwind.config.ts | 8 ++++++- 12 files changed, 45 insertions(+), 55 deletions(-) delete mode 100644 frontend/src/routes/create/+page.svelte diff --git a/frontend/package.json b/frontend/package.json index 9de336d3..12cc7d90 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -34,11 +34,14 @@ "@types/node": "^20.5.6", "@typescript-eslint/eslint-plugin": "^6.4.1", "@typescript-eslint/parser": "^6.4.1", + "autoprefixer": "^10.4.14", "eslint": "^8.47.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-svelte": "^2.33.0", "nodemon": "^3.0.1", "openapi-typescript": "^6.5.3", + "postcss": "^8.4.24", + "postcss-load-config": "^4.0.1", "prettier": "^3.0.2", "prettier-plugin-svelte": "^3.0.3", "prettier-plugin-tailwindcss": "^0.5.3", @@ -56,4 +59,4 @@ "@sveltejs/kit@1.23.0": "patches/@sveltejs__kit@1.23.0.patch" } } -} +} \ No newline at end of file diff --git a/frontend/src/app.html b/frontend/src/app.html index f05e4825..c7b097b0 100644 --- a/frontend/src/app.html +++ b/frontend/src/app.html @@ -1,7 +1,7 @@ diff --git a/frontend/src/app.pcss b/frontend/src/app.pcss index 3f9fa1c8..af140243 100644 --- a/frontend/src/app.pcss +++ b/frontend/src/app.pcss @@ -4,3 +4,12 @@ /* Please think twice before editing this file unless you're absolutely sure global styles are warranted */ + +::-webkit-scrollbar-thumb { + background-color: theme('colors.black/0.5'); + border-radius: theme('borderRadius.md'); +} +::-webkit-scrollbar { + background-color: theme('colors.white/0.1'); + width: theme('width.2'); +} diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte index ae72d3e3..9bf8a078 100644 --- a/frontend/src/routes/+layout.svelte +++ b/frontend/src/routes/+layout.svelte @@ -1,16 +1,16 @@ @@ -18,17 +18,8 @@
- feet + +
feet
+ - - diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte index c9aa8bbd..44e04abe 100644 --- a/frontend/src/routes/+page.svelte +++ b/frontend/src/routes/+page.svelte @@ -12,17 +12,11 @@ }); -
-
THIS IS PREFETCHED: {$prefetchedQuery.data?.data}
-
THI IS FETCHED ONLY ON CLIENT: {$clientQuery.data?.data}
-
-

- Home -

- - Hello - +
+
+
THIS IS PREFETCHED: {$prefetchedQuery.data?.data}
+
THI IS FETCHED ONLY ON CLIENT: {$clientQuery.data?.data}
+
+
+

Home

diff --git a/frontend/src/routes/+page.ts b/frontend/src/routes/+page.ts index 3638f8da..209287af 100644 --- a/frontend/src/routes/+page.ts +++ b/frontend/src/routes/+page.ts @@ -1,4 +1,4 @@ -import api from '$lib/api/index.js'; +import api from '$lib/api'; export const load = async ({ parent, fetch }) => { const { queryClient } = await parent(); diff --git a/frontend/src/routes/create/+page.svelte b/frontend/src/routes/create/+page.svelte deleted file mode 100644 index fbe09567..00000000 --- a/frontend/src/routes/create/+page.svelte +++ /dev/null @@ -1,13 +0,0 @@ - - -Employess Search -Job Search diff --git a/frontend/src/routes/profile/matches/+layout.svelte b/frontend/src/routes/profile/matches/+layout.svelte index b3fa0706..97c7737d 100644 --- a/frontend/src/routes/profile/matches/+layout.svelte +++ b/frontend/src/routes/profile/matches/+layout.svelte @@ -14,8 +14,8 @@
{#if $chatsQuery.isSuccess} diff --git a/frontend/src/routes/profile/matches/Chats.svelte b/frontend/src/routes/profile/matches/Chats.svelte index e1bbeea2..c3447401 100644 --- a/frontend/src/routes/profile/matches/Chats.svelte +++ b/frontend/src/routes/profile/matches/Chats.svelte @@ -12,12 +12,12 @@ }); -