From 658bc92bf76b0583a0820e30241ffd71522dc098 Mon Sep 17 00:00:00 2001 From: Anton Lilleby Date: Mon, 20 Jan 2025 15:49:53 +0100 Subject: [PATCH 1/6] fix: use inter as default font --- app/src/app.html | 4 ++++ app/tailwind.config.js | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/app.html b/app/src/app.html index f0f60cf..58fde8a 100644 --- a/app/src/app.html +++ b/app/src/app.html @@ -2,6 +2,10 @@ + diff --git a/app/tailwind.config.js b/app/tailwind.config.js index 3aa79d2..da01fd1 100644 --- a/app/tailwind.config.js +++ b/app/tailwind.config.js @@ -1,4 +1,4 @@ -import flowbite from 'flowbite/plugin'; +import flowbite from "flowbite/plugin"; /** @type {import('tailwindcss').Config} */ export default { @@ -7,6 +7,9 @@ export default { "./node_modules/flowbite-svelte/**/*.{html,js,svelte,ts}", ], theme: { + fontFamily: { + sans: ["Inter"], + }, extend: { colors: { capraDarkMode: "#0c1c35", From 19062afc155b4194dc177c364bccbbca1cf4ee78 Mon Sep 17 00:00:00 2001 From: Anton Lilleby Date: Mon, 20 Jan 2025 15:50:32 +0100 Subject: [PATCH 2/6] fix: update old svelte icon library --- app/package.json | 3 ++- app/pnpm-lock.yaml | 31 +++++++++++++++++++++---------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/app/package.json b/app/package.json index d4a5a37..256407c 100644 --- a/app/package.json +++ b/app/package.json @@ -29,7 +29,6 @@ "kysely-postgres-js": "^2.0.0", "nodemailer": "^6.9.14", "postgres": "^3.4.4", - "svelte-icons": "^2.1.0", "validator": "^13.12.0", "zod": "^3.23.8" }, @@ -56,9 +55,11 @@ "prettier-plugin-tailwindcss": "^0.6.5", "svelte": "^4.2.18", "svelte-eslint-parser": "^0.41.0", + "svelte-feather-icons": "^4.2.0", "sveltekit-rate-limiter": "^0.5.1", "sveltekit-superforms": "^2.16.1", "tailwindcss": "^3.4.4", + "tailwind-merge": "^2.6.0", "typescript": "^5.5.4", "typescript-eslint": "^7.17.0", "vite": "^5.3.1" diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index fb51054..3bb6151 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -59,9 +59,6 @@ importers: postgres: specifier: ^3.4.4 version: 3.4.4 - svelte-icons: - specifier: ^2.1.0 - version: 2.1.0 validator: specifier: ^13.12.0 version: 13.12.0 @@ -135,12 +132,18 @@ importers: svelte-eslint-parser: specifier: ^0.41.0 version: 0.41.0(svelte@4.2.18) + svelte-feather-icons: + specifier: ^4.2.0 + version: 4.2.0 sveltekit-rate-limiter: specifier: ^0.5.1 version: 0.5.2(@sveltejs/kit@2.5.18(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.5(@types/node@20.14.12)))(svelte@4.2.18)(vite@5.3.5(@types/node@20.14.12))) sveltekit-superforms: specifier: ^2.16.1 version: 2.16.1(@sveltejs/kit@2.5.18(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.5(@types/node@20.14.12)))(svelte@4.2.18)(vite@5.3.5(@types/node@20.14.12)))(svelte@4.2.18) + tailwind-merge: + specifier: ^2.6.0 + version: 2.6.0 tailwindcss: specifier: ^3.4.4 version: 3.4.6 @@ -2410,14 +2413,18 @@ packages: svelte: optional: true + svelte-feather-icons@4.2.0: + resolution: {integrity: sha512-KuMTDrL6sA8aCxBv3RMgmmnnyIaAXaYcmWkmNa2r2Qj70vi+An2T6ZBAdiZr6wjx+a3eZJy+FRseeRkzQFGHPw==} + svelte-hmr@0.16.0: resolution: {integrity: sha512-Gyc7cOS3VJzLlfj7wKS0ZnzDVdv3Pn2IuVeJPk9m2skfhcu5bq3wtIZyQGggr7/Iim5rH5cncyQft/kRLupcnA==} engines: {node: ^12.20 || ^14.13.1 || >= 16} peerDependencies: svelte: ^3.19.0 || ^4.0.0 - svelte-icons@2.1.0: - resolution: {integrity: sha512-rHPQjweEc9fGSnvM0/4gA3pDHwyZyYsC5KhttCZRhSMJfLttJST5Uq0B16Czhw+HQ+HbSOk8kLigMlPs7gZtfg==} + svelte@3.59.2: + resolution: {integrity: sha512-vzSyuGr3eEoAtT/A6bmajosJZIUWySzY2CzB3w2pgPvnkUjGqlDnsNnA0PMO+mMAhuyMul6C2uuZzY6ELSkzyA==} + engines: {node: '>= 8'} svelte@4.2.18: resolution: {integrity: sha512-d0FdzYIiAePqRJEb90WlJDkjUEx42xhivxN8muUBmfZnP+tzUgz12DJ2hRJi8sIHCME7jeK1PTMgKPSfTd8JrA==} @@ -2465,8 +2472,8 @@ packages: resolution: {integrity: sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw==} engines: {node: '>= 0.8.0'} - tailwind-merge@2.4.0: - resolution: {integrity: sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==} + tailwind-merge@2.6.0: + resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==} tailwindcss@3.4.6: resolution: {integrity: sha512-1uRHzPB+Vzu57ocybfZ4jh5Q3SdlH7XW23J5sQoM9LhE9eIOlzxer/3XPSsycvih3rboRsvt0QCmzSrqyOYUIA==} @@ -4009,7 +4016,7 @@ snapshots: apexcharts: 3.51.0 flowbite: 2.4.1(rollup@4.19.0) svelte: 4.2.18 - tailwind-merge: 2.4.0 + tailwind-merge: 2.6.0 transitivePeerDependencies: - rollup @@ -4745,11 +4752,15 @@ snapshots: optionalDependencies: svelte: 4.2.18 + svelte-feather-icons@4.2.0: + dependencies: + svelte: 3.59.2 + svelte-hmr@0.16.0(svelte@4.2.18): dependencies: svelte: 4.2.18 - svelte-icons@2.1.0: {} + svelte@3.59.2: {} svelte@4.2.18: dependencies: @@ -4827,7 +4838,7 @@ snapshots: dependencies: svg.js: 2.7.1 - tailwind-merge@2.4.0: {} + tailwind-merge@2.6.0: {} tailwindcss@3.4.6: dependencies: From 46f1960d43d0513d02e1ec2089c0e0373ef47bb5 Mon Sep 17 00:00:00 2001 From: Anton Lilleby Date: Mon, 20 Jan 2025 15:50:57 +0100 Subject: [PATCH 3/6] fix: extend flowbite DarkMode component with value option --- app/src/components/shared/DarkMode.svelte | 71 +++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 app/src/components/shared/DarkMode.svelte diff --git a/app/src/components/shared/DarkMode.svelte b/app/src/components/shared/DarkMode.svelte new file mode 100644 index 0000000..7923d86 --- /dev/null +++ b/app/src/components/shared/DarkMode.svelte @@ -0,0 +1,71 @@ + + + + + + + + + From 910e784a629227cebe6cf3f8a16e824b500b00f3 Mon Sep 17 00:00:00 2001 From: Anton Lilleby Date: Mon, 20 Jan 2025 15:51:21 +0100 Subject: [PATCH 4/6] fix: update pagination button design --- app/src/routes/+page.svelte | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/routes/+page.svelte b/app/src/routes/+page.svelte index 8966614..1f2c098 100644 --- a/app/src/routes/+page.svelte +++ b/app/src/routes/+page.svelte @@ -1,5 +1,5 @@ - + {#each categories as { title, keyword }} - -{:else} - -{/if} diff --git a/app/src/components/shared/SignedInDesktopMenu.svelte b/app/src/components/shared/SignedInDesktopMenu.svelte new file mode 100644 index 0000000..adf11f6 --- /dev/null +++ b/app/src/components/shared/SignedInDesktopMenu.svelte @@ -0,0 +1,32 @@ + + + diff --git a/app/src/components/shared/SignedInMobileMenu.svelte b/app/src/components/shared/SignedInMobileMenu.svelte new file mode 100644 index 0000000..fc989ef --- /dev/null +++ b/app/src/components/shared/SignedInMobileMenu.svelte @@ -0,0 +1,48 @@ + + +
+ + + {#if isMenuOpen} +
+ + + + +
+ {/if} +
diff --git a/app/src/components/shared/SignedOutMenu.svelte b/app/src/components/shared/SignedOutMenu.svelte new file mode 100644 index 0000000..1748795 --- /dev/null +++ b/app/src/components/shared/SignedOutMenu.svelte @@ -0,0 +1,22 @@ + + +
+ + +