-
+
+ {cocktail && (
+
+
+
+
+
+ {cocktailInfo.name}
+
+
+ )}
-
+ {cocktail && (
+
+ )}
+
+ {!cocktail && accessToken && (
+
+
+
+ )}
-
+ {!cocktail && !accessToken && (
+
+ )}
);
diff --git a/src/components/story/Calculation.tsx b/src/components/story/Calculation.tsx
index 514e445..2139857 100644
--- a/src/components/story/Calculation.tsx
+++ b/src/components/story/Calculation.tsx
@@ -1,19 +1,20 @@
+import scores from "@/store/score";
import { useStore } from "@nanostores/react";
import { useEffect } from "react";
-
-import scores from "@/store/score";
+import { useCookies } from "react-cookie";
const Calculation = () => {
const $scores = useStore(scores);
+ const setCookie = useCookies(["cocktail"])[1];
useEffect(() => {
const url: Record
= {
- 0: "/cocktail/sangria",
- 1: "/cocktail/cosmopolitan",
- 2: "/cocktail/pinacolada",
- 3: "/cocktail/ginandtonic",
- 4: "/cocktail/bluelagoon",
- 5: "/cocktail/lavenderlemonade",
+ 0: "sangria",
+ 1: "cosmopolitan",
+ 2: "pinacolada",
+ 3: "ginandtonic",
+ 4: "bluelagoon",
+ 5: "lavenderlemonade",
};
const scoreMap: { [key: string]: number } = $scores;
const fullscore = [40, 52, 45.5, 49, 49.5, 42.5];
@@ -23,7 +24,10 @@ const Calculation = () => {
}
const maxScore = Math.max(...product);
const maxKey = product.indexOf(maxScore);
- if (window) window.location.href = url[maxKey];
+ setCookie("cocktail", url[maxKey].toString(), {
+ path: "/",
+ });
+ if (window) window.location.href = "/cocktail/" + url[maxKey];
}, []);
};
diff --git a/src/lib/supabase.ts b/src/lib/supabase.ts
index e6271d4..abefb05 100644
--- a/src/lib/supabase.ts
+++ b/src/lib/supabase.ts
@@ -6,9 +6,6 @@ export const supabase = createClient(
{
auth: {
flowType: "pkce",
- // autoRefreshToken: false,
- // detectSessionInUrl: false,
- // persistSession: true,
},
}
);
diff --git a/src/middleware/index.ts b/src/middleware/index.ts
index be5317b..b983bb8 100644
--- a/src/middleware/index.ts
+++ b/src/middleware/index.ts
@@ -1,8 +1,20 @@
import { defineMiddleware } from "astro:middleware";
-export const onRequest = defineMiddleware((context, next) => {
- // TODO: Implement auth routes logic
- console.log("Middleware works!");
+export const onRequest = defineMiddleware(
+ ({ cookies, request, redirect }, next) => {
+ const token = cookies.get("sb-access-token")?.value;
+ const cocktail = cookies.get("cocktail")?.value;
- return next();
-});
+ if (
+ (request.url.includes("/story") || request.url.includes("/cocktail")) &&
+ !token
+ ) {
+ return redirect("/");
+ }
+
+ if (request.url.includes("/story") && cocktail) {
+ return redirect("/cocktail/" + cocktail);
+ }
+ return next();
+ }
+);
diff --git a/src/pages/index.astro b/src/pages/index.astro
index adedd6b..70160f1 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -12,6 +12,7 @@ import kntuLogo from "@/assets/logo/kntu-logo.png";
const { cookies } = Astro;
const accessToken = cookies.get("sb-access-token")?.value;
+const cocktail = cookies.get("cocktail")?.value;
---
@@ -32,7 +33,7 @@ const accessToken = cookies.get("sb-access-token")?.value;
class="rounded-full backdrop-blur-lg"
/>