diff --git a/apps/api/package.json b/apps/api/package.json index 74252fd..65908f6 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -9,7 +9,7 @@ "start": "directus start" }, "dependencies": { - "directus": "^10.1.0", - "pg": "^8.10.0" + "directus": "^10.2.1", + "pg": "^8.11.0" } } diff --git a/apps/website/package.json b/apps/website/package.json index e44faa7..2002731 100644 --- a/apps/website/package.json +++ b/apps/website/package.json @@ -15,41 +15,42 @@ "lint": "eslint ." }, "dependencies": { - "@studio-freight/lenis": "^1.0.12", - "dayjs": "^1.11.7", + "@studio-freight/lenis": "^1.0.14", + "classix": "^2.1.32", + "dayjs": "^1.11.8", "embla-carousel": "^7.1.0", "focus-visible": "^5.2.0", - "motion": "^10.15.5", + "motion": "^10.16.2", "ogl": "^0.0.117", "sanitize.css": "^13.0.0", - "swell-js": "3.21.6", + "swell-js": "3.22.0", "tweakpane": "^3.1.9", "utils": "workspace:*" }, "devDependencies": { - "@sveltejs/adapter-auto": "^2.0.1", - "@sveltejs/adapter-vercel": "^2.4.3", - "@sveltejs/kit": "^1.16.3", - "@typescript-eslint/eslint-plugin": "^5.59.5", - "@typescript-eslint/parser": "^5.59.5", + "@sveltejs/adapter-auto": "^2.1.0", + "@sveltejs/adapter-vercel": "^3.0.1", + "@sveltejs/kit": "^1.20.2", + "@typescript-eslint/eslint-plugin": "^5.59.9", + "@typescript-eslint/parser": "^5.59.9", "base-64": "^1.0.0", - "browserslist": "^4.21.5", + "browserslist": "^4.21.7", "config": "workspace:*", "cssnano": "^6.0.1", - "eslint": "^8.40.0", - "eslint-plugin-svelte": "^2.28.0", - "postcss": "^8.4.23", + "eslint": "^8.42.0", + "eslint-plugin-svelte": "^2.30.0", + "postcss": "^8.4.24", "postcss-focus-visible": "^8.0.2", "postcss-normalize": "^10.0.1", - "postcss-preset-env": "^8.3.2", - "postcss-sort-media-queries": "^5.1.0", - "sass": "^1.62.1", + "postcss-preset-env": "^8.4.2", + "postcss-sort-media-queries": "^5.2.0", + "sass": "^1.63.3", "svelte": "^3.59.1", - "svelte-check": "^3.3.2", - "svelte-preprocess": "^5.0.3", - "tslib": "^2.5.0", - "typescript": "^5.0.4", - "vite": "^4.3.5" + "svelte-check": "^3.4.3", + "svelte-preprocess": "^5.0.4", + "tslib": "^2.5.3", + "typescript": "^5.1.3", + "vite": "^4.3.9" }, "type": "module", "browserslist": [ diff --git a/apps/website/src/components/PageTransition.svelte b/apps/website/src/components/PageTransition.svelte deleted file mode 100644 index bb654a3..0000000 --- a/apps/website/src/components/PageTransition.svelte +++ /dev/null @@ -1,33 +0,0 @@ - - -
{ - // Show page loading indicator - $pageLoading = true - }} - on:outroend={() => { - // Scroll back to top - doNotScroll && requestAnimationFrame(() => scrollToTop()) - }} -> - -
diff --git a/apps/website/src/components/SmoothScroll.svelte b/apps/website/src/components/SmoothScroll.svelte index 4335107..74cef26 100644 --- a/apps/website/src/components/SmoothScroll.svelte +++ b/apps/website/src/components/SmoothScroll.svelte @@ -11,7 +11,7 @@ if (browser) { $smoothScroll = new Lenis({ duration: 1.2, - easing: (t: number) => (t === 1 ? 1 : 1 - Math.pow(2, -10 * t)), // https://easings.net/ + easing: (t: number) => Math.min(1, 1.001 - Math.pow(2, -10 * t)), // https://easings.net/ smoothWheel: true, orientation: 'vertical', }) diff --git a/apps/website/src/components/SplitText.svelte b/apps/website/src/components/SplitText.svelte index cc50ba7..1e8d185 100644 --- a/apps/website/src/components/SplitText.svelte +++ b/apps/website/src/components/SplitText.svelte @@ -1,4 +1,5 @@ {#if clone} diff --git a/apps/website/src/components/atoms/AboutGridPhoto.svelte b/apps/website/src/components/atoms/AboutGridPhoto.svelte index 664e37f..283fce7 100644 --- a/apps/website/src/components/atoms/AboutGridPhoto.svelte +++ b/apps/website/src/components/atoms/AboutGridPhoto.svelte @@ -1,4 +1,5 @@ {#if tag === 'a'} diff --git a/apps/website/src/components/atoms/Icon.svelte b/apps/website/src/components/atoms/Icon.svelte index f4bb6a4..c810948 100644 --- a/apps/website/src/components/atoms/Icon.svelte +++ b/apps/website/src/components/atoms/Icon.svelte @@ -1,8 +1,10 @@ diff --git a/apps/website/src/components/atoms/IconEarth.svelte b/apps/website/src/components/atoms/IconEarth.svelte index 6ccb07f..a5ff124 100644 --- a/apps/website/src/components/atoms/IconEarth.svelte +++ b/apps/website/src/components/atoms/IconEarth.svelte @@ -7,9 +7,14 @@
{shopProduct.name} – {shopProduct.price}€
+ +{/if} diff --git a/apps/website/src/components/organisms/Cart.svelte b/apps/website/src/components/organisms/Cart.svelte index d98e487..792fbe7 100644 --- a/apps/website/src/components/organisms/Cart.svelte +++ b/apps/website/src/components/organisms/Cart.svelte @@ -132,14 +132,14 @@ {/if}
-

Free shipping worldwide!

+

Save 10% on your order with the code WORLDCITIZEN. Free shipping.

{#if $cartData && $cartAmount > 0 && $cartData.checkout_url}
diff --git a/apps/website/src/components/organisms/Locations.svelte b/apps/website/src/components/organisms/Locations.svelte index 898f8d9..e1af205 100644 --- a/apps/website/src/components/organisms/Locations.svelte +++ b/apps/website/src/components/organisms/Locations.svelte @@ -49,7 +49,8 @@ {#each continents as { name, slug }}