Refresh page after user action

Author: nalves599

src/app/(authenticated)/profile/achievements/page.tsx

@@ -36,19 +36,21 @@ export default async function Achievements() {
       <div className="flex flex-col items-start gap-y-2 p-4 text-start text-sm">
         <h1 className="text-2xl font-bold">Achievements</h1>
         <span className="text-gray-600">
-          Total points:{" "}
+          Total points:&nbsp;
           {userAchievements?.reduce((acc, a) => acc + a.value, 0) || 0}
         </span>
       </div>
       {sortedKinds.map((k) => (
         <GridList key={k} title={formatAchievementKind(k)}>
-          {achievementsByKind[k].map((a) => (
-            <AchievementTile
-              key={a.id}
-              achievement={a}
-              achieved={!!user && a.users?.includes(user.id)}
-            />
-          ))}
+          {achievementsByKind[k]
+            .sort((a, b) => a.name.localeCompare(b.name))
+            .map((a) => (
+              <AchievementTile
+                key={a.id}
+                achievement={a}
+                achieved={!!user && a.users?.includes(user.id)}
+              />
+            ))}
         </GridList>
       ))}
     </div>

src/app/(authenticated)/profile/edit/page.tsx

@@ -4,6 +4,7 @@ import { getServerSession } from "next-auth";
 import EditProfileForm from "./EditProfileForm";
 import { redirect } from "next/navigation";
 import UserSignOut from "@/components/UserSignOut";
+import { revalidatePath } from "next/cache";
 
 export default async function EditProfile() {
   const session = (await getServerSession(authOptions))!;
@@ -12,7 +13,17 @@ export default async function EditProfile() {
 
   async function updateUser(newUser: User) {
     "use server";
-    if (await UserService.updateMe(session.cannonToken, newUser)) {
+    const updatedUser = await UserService.updateMe(
+      session.cannonToken,
+      newUser,
+    );
+    if (updatedUser) {
+      if (
+        newUser.img.startsWith("data:") &&
+        updatedUser.img.startsWith("http")
+      ) {
+        revalidatePath(updatedUser.img);
+      }
       redirect("/profile");
     }
   }

src/app/(authenticated)/qr/scan/QRScanner.tsx

@@ -51,26 +51,24 @@ export default function QRScanner({ user, cannonToken }: QRScannerProps) {
           }
         }
       } else if (scannedAchievement) {
-        const redeemedAchievement = await AchievementService.redeemSecretAchievement(
-          cannonToken,
-          scannedAchievement
-        )
+        const redeemedAchievement =
+          await AchievementService.redeemSecretAchievement(
+            cannonToken,
+            scannedAchievement,
+          );
 
         if (redeemedAchievement) {
-          setBottomCard(<MessageCard
-            type="success"
-            content="Secret Achievement found!"
-          />,
+          setBottomCard(
+            <MessageCard type="success" content="Achievement redeemed!" />,
           );
         } else {
-          setBottomCard(<MessageCard
-            type="warning"
-            content="Failed to get user's achievement. Scan again!"
-          />,
+          setBottomCard(
+            <MessageCard
+              type="warning"
+              content="Failed to redeem achievement. Scan again!"
+            />,
           );
         }
-
-        
       } else {
         setBottomCard(<MessageCard type="danger" content="Invalid QR-Code" />);
       }

src/app/(authenticated)/users/[id]/buttons/ConnectButton.tsx

@@ -19,6 +19,7 @@ export default function ConnectButton({
     if (!connection) {
       alert("Failed to connect");
     }
+    window.location.reload();
   }
 
   async function handleRemoveConnection() {
@@ -29,6 +30,7 @@ export default function ConnectButton({
     if (!connection) {
       alert("Failed to connect");
     }
+    window.location.reload();
   }
 
   if (connection) {

src/app/(authenticated)/users/[id]/buttons/DemoteButton.tsx

@@ -23,6 +23,7 @@ export default function DemoteButton({
   async function handleDemote() {
     if (await UserService.demote(cannonToken, otherUser.id)) router.refresh();
     else alert("Failed to demote!");
+    window.location.reload();
   }
 
   return (

src/app/(authenticated)/users/[id]/buttons/ValidateSpinButton.tsx

@@ -8,7 +8,6 @@ import {
 import { FerrisWheel } from "lucide-react";
 import { ProfileButtonProps } from ".";
 import { UserService } from "@/services/UserService";
-import { useRouter } from "next/navigation";
 import { SPIN_WHEEL_MAXIMUM } from "@/constants";
 
 export default function ValidateSpinButton({
@@ -17,8 +16,6 @@ export default function ValidateSpinButton({
   otherUser,
   edition,
 }: ProfileButtonProps) {
-  const router = useRouter();
-
   if (
     user.id === otherUser.id ||
     !isMember(user.role) ||
@@ -38,9 +35,9 @@ export default function ValidateSpinButton({
   async function validateSpinWheel() {
     const success = await UserService.validateSpinWheel(
       cannonToken,
-      otherUser.id
+      otherUser.id,
     );
-    if (success) router.refresh();
+    if (success) window.location.reload();
     else alert("Could not validate!");
   }
 

src/services/AchievementService.ts

@@ -14,14 +14,16 @@ export const AchievementService = (() => {
 
   const getAchievementBySession = async (
     cannonToken: string,
-    sessionId: string
+    sessionId: string,
   ): Promise<Achievement | null> => {
     try {
       const resp = await fetch(`${achievementsEndpoint}/session/${sessionId}`, {
         headers: {
           Authorization: `Bearer ${cannonToken}`,
         },
-        next: { revalidate: 5 },
+        next: {
+          revalidate: 0, // 1 day
+        },
       });
       if (resp.ok) return (await resp.json()) as Achievement;
     } catch (e) {
@@ -33,22 +35,22 @@ export const AchievementService = (() => {
   const redeemSecretAchievement = async (
     cannonToken: string,
     code: string,
-  ): Promise<Achievement | null> => {
+  ): Promise<boolean> => {
     try {
-      const resp = await fetch(`${achievementsEndpoint}/session/secret`, {
+      const resp = await fetch(`${achievementsEndpoint}/redeem/secret`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
           Authorization: `Bearer ${cannonToken}`,
         },
-        body: JSON.stringify({code}),
+        body: JSON.stringify({ code }),
       });
-      if (resp.ok) return (await resp.json()) as Achievement;
+      if (resp.ok) return true;
     } catch (e) {
       console.error(e);
     }
-    return null;
-  }
+    return false;
+  };
 
   return { getAchievements, getAchievementBySession, redeemSecretAchievement };
 })();

src/services/UserService.ts

@@ -48,7 +48,7 @@ export const UserService = (() => {
           Authorization: `Bearer ${cannonToken}`,
         },
         next: {
-          revalidate: 300, // 5 mins
+          revalidate: 0, // 1 day
           tags: ["modified-me"],
         },
       });
@@ -67,7 +67,7 @@ export const UserService = (() => {
           Authorization: `Bearer ${cannonToken}`,
         },
         next: {
-          revalidate: 300, // 5 mins
+          revalidate: 0, // 1 day
           tags: ["modified-me"],
         },
       });
@@ -102,7 +102,7 @@ export const UserService = (() => {
   const updateMe = async (
     cannonToken: string,
     user: User,
-  ): Promise<boolean> => {
+  ): Promise<User | null> => {
     try {
       const resp = await fetch(usersEndpoint + "/me", {
         method: "PUT",
@@ -119,12 +119,12 @@ export const UserService = (() => {
       });
       if (resp.ok) {
         revalidateTag(`modified-me`);
-        return true;
+        return (await resp.json()) as User;
       }
     } catch (error) {
       console.error(error);
     }
-    return false;
+    return null;
   };
 
   const getCVInfo = async (