From 38dd2098cd0ecc3c8ca4afe59afbf84278572a2a Mon Sep 17 00:00:00 2001 From: Julia Demianetc Date: Fri, 6 Mar 2026 00:47:14 +0100 Subject: [PATCH 1/2] updated kudos in schema --- backend/schemas.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/schemas.js b/backend/schemas.js index 4b2cd2b262..78f56f33dc 100644 --- a/backend/schemas.js +++ b/backend/schemas.js @@ -55,10 +55,12 @@ const questSchema = new mongoose.Schema( default: 0, }, - kudosByUser: { - type: mongoose.Schema.Types.ObjectId, - ref: "User", - }, + kudosByUser: [ + { + type: mongoose.Schema.Types.ObjectId, + ref: "User", + }, + ], }, { timestamps: true }, From d63639aa14bb553a8b3c58871021dbb09d5799f9 Mon Sep 17 00:00:00 2001 From: Julia Demianetc Date: Fri, 6 Mar 2026 09:50:09 +0100 Subject: [PATCH 2/2] style updates --- frontend/src/pages/FriendFeedPage.jsx | 84 ++++++++++++++------------ frontend/src/pages/HomePage.jsx | 83 ++++++++++++++++++------- frontend/src/pages/RewardPage.jsx | 3 +- frontend/src/pages/UserProfilePage.jsx | 46 +++++++++++--- 4 files changed, 144 insertions(+), 72 deletions(-) diff --git a/frontend/src/pages/FriendFeedPage.jsx b/frontend/src/pages/FriendFeedPage.jsx index 910152e680..576f08f785 100644 --- a/frontend/src/pages/FriendFeedPage.jsx +++ b/frontend/src/pages/FriendFeedPage.jsx @@ -3,10 +3,10 @@ import { useState, useEffect } from "react"; import { Navbar } from "../components/Navbar"; import { FriendQuestCard } from "../components/cards/FriendQuestCard"; import { apiUrl } from "../../api"; -import { useUserStore } from '../stores/useUserStore' +import { useUserStore } from "../stores/useUserStore"; export const FriendFeed = () => { - const { user } = useUserStore() + const { user } = useUserStore(); const [friendsQuests, setFriendsQuests] = useState([]); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); @@ -30,27 +30,27 @@ export const FriendFeed = () => { useEffect(() => { const fetchFeed = async () => { try { - const response = await fetch(apiUrl + '/feed/quests', { + const response = await fetch(apiUrl + "/feed/quests", { headers: { - 'Content-Type': 'application/json', - 'Authorization': user?.accessToken - } - }) + "Content-Type": "application/json", + Authorization: user?.accessToken, + }, + }); - if (!response.ok) throw new Error("Couldn't fetch feed") + if (!response.ok) throw new Error("Couldn't fetch feed"); - const data = await response.json() - setFriendsQuests(data) + const data = await response.json(); + setFriendsQuests(data); } catch (err) { - setError("Couldn't load quests feed") - console.error(err) + setError("Couldn't load quests feed"); + console.error(err); } finally { - setLoading(false) + setLoading(false); } - } + }; - if (user) fetchFeed() - }, [user]) + if (user) fetchFeed(); + }, [user]); if (loading) return
Loading feed...
; if (error) return
{error}
; @@ -59,7 +59,9 @@ export const FriendFeed = () => { // pass params from login and register forms to an authentication component to then add authentication after H2 // smth like {!user ? ()} -

Friends completed quests

+ +

Friends completed quests

+
{/*