From 21869e725023c9f135ad15f5738200ac348fd2ba Mon Sep 17 00:00:00 2001 From: Driedoutjerky Date: Sun, 7 Jun 2026 13:16:45 +0900 Subject: [PATCH 01/29] fix:Quest check active again in write post --- src/pages/WritePostPage.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/WritePostPage.jsx b/src/pages/WritePostPage.jsx index c1f4fa3..b94e73a 100644 --- a/src/pages/WritePostPage.jsx +++ b/src/pages/WritePostPage.jsx @@ -32,7 +32,7 @@ function WritePostPage() { return; } - const { newPost, updatedPosts } = await addPost({ + const { newPost } = await addPost({ title, content, tag, @@ -40,7 +40,7 @@ function WritePostPage() { visibility, }); - /*await checkPostForQuestCompletion(newPost);*/ + await checkPostForQuestCompletion(newPost); alert("Post created! Redirecting you to Archive Page"); navigate("/archive"); From bf205efa5fc4892fc126eb27c8e358a1bbac67b7 Mon Sep 17 00:00:00 2001 From: Driedoutjerky Date: Sun, 7 Jun 2026 13:19:50 +0900 Subject: [PATCH 02/29] fix:Render dashboard quests from quest hook --- src/pages/EggDashboardPage.jsx | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/pages/EggDashboardPage.jsx b/src/pages/EggDashboardPage.jsx index 57743ee..3b8a6f4 100644 --- a/src/pages/EggDashboardPage.jsx +++ b/src/pages/EggDashboardPage.jsx @@ -7,9 +7,12 @@ import windowFrameImage from "../assets/windowframe.PNG"; import windowBackgroundImage from "../assets/background.png"; import { useEgg } from "../hooks/useEgg"; +import { useQuests } from "../hooks/useQuests"; function EggDashboardPage() { const { egg, loading } = useEgg(); + const { quests, loading: questsLoading } = useQuests(); + return (
@@ -105,20 +108,24 @@ function EggDashboardPage() {

Today’s Quests

+ {questsLoading ? ( +

Loading quests...

+ ) : quests.length === 0 ? ( +

No quests assigned.

+ ) : (
    -
  • - - Write 500+ words in total today -
  • -
  • - - Write about what you studied -
  • -
  • - - Upload one photo memory -
  • + {quests.map((quest) => ( +
  • + + {quest.title} +
  • + ))}
+ )}
diff --git a/src/pages/ShopPage.jsx b/src/pages/ShopPage.jsx index bee6a0c..72c81fd 100644 --- a/src/pages/ShopPage.jsx +++ b/src/pages/ShopPage.jsx @@ -6,6 +6,8 @@ import { getCosmeticAsset, } from "../assets/assetRegistry"; +import { Link } from "react-router-dom"; + const shopCategories = [ { id: "background", @@ -112,9 +114,9 @@ function ShopPage() {

▦ Egg Shop

- + Return To Egg - +
@@ -180,9 +182,9 @@ function ShopPage() {