Recent activity

app/admin/page.tsx

@@ -79,6 +79,22 @@ const Admin = () => {
     console.log(data);
   };
 
+  const setRecentActivity = async () => {
+    const res = await fetch(
+      `/api/vercel/set-recent-activity?key=${setterKey}&value=${setterValue}`
+    );
+    const data = await res.json();
+    console.log(data);
+  };
+
+  const getAllRecentActivity = async () => {
+    const res = await fetch(
+      `/api/vercel/get-all-recent-activity?key=${inputValue}`
+    );
+    const data = await res.json();
+    console.log(data);
+  };
+
   const buttons = [
     {
       name: "flushall",
@@ -109,6 +125,15 @@ const Admin = () => {
       name: "setData",
       method: () => setData(),
     },
+    {
+      name: "setRecentActivity",
+      method: () => setRecentActivity(),
+    },
+
+    {
+      name: "getAllRecentActivity - by parent wallet",
+      method: () => getAllRecentActivity(),
+    },
   ];
 
   if (!isUnlocked) {

app/parent-dashboard/page.tsx

@@ -1,5 +1,4 @@
 "use client";
-/* eslint-disable react/no-children-prop */
 
 import {
   Box,
@@ -40,8 +39,8 @@ const Parent: React.FC = () => {
   //=============================================================================
 
   const [childKey, setChildKey] = useState<number>(0);
-  const [childrenLoading, setChildrenLoading] = useState(false);
-  const [children, setChildren] = useState([]);
+  const [membersLoading, setMembersLoading] = useState(false);
+  const [members, setMembers] = useState<User[]>([]);
   // const [stakeContract, setStakeContract] = useState<StakeContract>();
   const [familyDetails, setFamilyDetails] = useState({} as User);
 
@@ -84,12 +83,6 @@ const Parent: React.FC = () => {
     onClose: onCloseEtherScan,
   } = useDisclosure();
 
-  const {
-    isOpen: isOpenChildDetails,
-    onOpen: onOpenChildDetails,
-    onClose: onCloseChildDetails,
-  } = useDisclosure();
-
   const {
     isOpen: isChangeUsernameOpen,
     onOpen: onChangeUsernameOpen,
@@ -134,16 +127,9 @@ const Parent: React.FC = () => {
 
   useEffect(() => {
     fetchFamilyDetails();
-    fetchChildren();
+    fetchMembers();
   }, []);
 
-  // useEffect(() => {
-  //   if (!stakeContract || !children.length) {
-  //     setChildrenStakes({});
-  //     return;
-  //   }
-  // }, [stakeContract, children]);
-
   //=============================================================================
   //                               FUNCTIONS
   //=============================================================================
@@ -159,30 +145,30 @@ const Parent: React.FC = () => {
     setFamilyDetails(user);
   }, [userDetails?.wallet]);
 
-  const fetchChildren = useCallback(async () => {
-    const getChildren = async () => {
+  const fetchMembers = useCallback(async () => {
+    const getMembers = async () => {
       if (!userDetails?.wallet) return;
 
-      const children = [] as User[];
+      const members = [] as User[];
 
       familyDetails.children?.forEach(async (walletAddress) => {
         const { data } = await axios.get(
           `/api/vercel/get-json?key=${walletAddress}`
         );
 
-        children.push(data as User);
+        members.push(data as User);
       });
 
-      if (children.length) {
-        const childrenWalletBalances = await axios.post(
+      if (members.length) {
+        const membersWalletBalances = await axios.post(
           `/api/etherscan/balancemulti`,
           {
-            addresses: children.map((c) => c.wallet),
+            addresses: members.map((c) => c.wallet),
           }
         );
 
-        const childrenWithBalances = children.map((c) => {
-          const balance = childrenWalletBalances.data.find(
+        const membersWithBalances = members.map((c) => {
+          const balance = membersWalletBalances.data.find(
             (b) => b.account === c.wallet
           );
           return {
@@ -191,17 +177,17 @@ const Parent: React.FC = () => {
           };
         });
 
-        // setChildren(childrenWithBalances);
+        setMembers(membersWithBalances);
       } else {
-        // setChildren(children);
+        setMembers(members);
       }
 
-      setChildrenLoading(false);
+      setMembersLoading(false);
     };
 
-    await getChildren();
+    await getMembers();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [children.length, userDetails?.wallet]);
+  }, [members.length, userDetails?.wallet]);
 
   const closeTab = () => {
     setSelectedTab(ParentDashboardTabs.DASHBOARD);
@@ -213,7 +199,7 @@ const Parent: React.FC = () => {
         <Box zIndex={1}>
           <ExpandedDashboardMenu
             familyDetails={familyDetails}
-            children={children}
+            members={members}
             onAddChildOpen={onAddChildOpen}
             setSelectedTab={setSelectedTab}
             onToggleCollapsedMenu={onToggleCollapsedMenu}
@@ -302,7 +288,7 @@ const Parent: React.FC = () => {
             bg={useColorModeValue("gray.100", "gray.900")}
             borderRadius={isMobileSize ? "0" : "10px"}
           >
-            <RecentMemberActivity />
+            <RecentMemberActivity members={members} />
           </GridItem>
 
           <GridItem
@@ -322,9 +308,9 @@ const Parent: React.FC = () => {
         isOpen={isChangeUsernameOpen}
         onClose={onChangeUsernameClose}
         childKey={childKey}
-        children={children}
+        members={members}
         familyId={familyDetails.familyId}
-        fetchChildren={fetchChildren}
+        fetchChildren={fetchMembers}
         fetchFamilyDetails={fetchFamilyDetails}
       />
 

pages/api/vercel/get-all-recent-activity.ts

@@ -0,0 +1,16 @@
+import { kv } from "@vercel/kv";
+import { NextApiRequest, NextApiResponse } from "next";
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse
+) {
+  try {
+    const { key } = req.query as { key: string };
+    const data = await kv.hgetall(`activity::${key}`);
+    return res.status(200).json(data);
+  } catch (error) {
+    console.error("Error:", error);
+    return res.status(500).json({ error: "An error occurred" });
+  }
+}

pages/api/vercel/set-recent-activity.ts

@@ -0,0 +1,27 @@
+import { kv } from "@vercel/kv";
+import { NextApiRequest, NextApiResponse } from "next";
+
+//https://redis.io/commands/hset/
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse
+) {
+  try {
+    const { key, value } = req.query as unknown as {
+      key: string;
+      value: string;
+    };
+
+    // value = "<walletAddress>::<eventDescription>"
+
+    const data = await kv.hset(`activity::${key}`, {
+      [Math.floor(Date.now() / 1000)]: value,
+    });
+
+    return res.status(200).json(data);
+  } catch (error) {
+    console.error("Error:", error);
+    return res.status(500).json({ error: "An error occurred" });
+  }
+}

src/components/AvatarSelection.tsx

@@ -159,7 +159,7 @@ export const AvatarSelection = ({
         <Avatar
           size="2xl"
           name={familyDetails?.username ? familyDetails?.username : "Avatar"}
-          src={avatar ? avatar : "/images/placeholder-avatar.jpeg"}
+          src={avatar && avatar}
           _hover={{ cursor: "pointer", transform: "scale(1.1)" }}
           onClick={openFileInput}
         />

src/components/CollapsedDashboardMenu.tsx

@@ -66,11 +66,8 @@ export const CollapsedDashboardMenu = ({
               name={userDetails?.username}
               sx={{
                 fontFamily: "Slackey",
-                bgColor: `${
-                  userDetails?.avatarURI ? "transparent" : "purple.500"
-                }`,
               }}
-              src={userDetails?.avatarURI || "/images/placeholder-avatar.jpeg"}
+              src={userDetails?.avatarURI}
             />
             <Flex direction="column" ml={3}>
               <Heading fontSize="lg">{userDetails?.username}</Heading>

src/components/ExpandedDashboardMenu.tsx

@@ -29,7 +29,7 @@ import { useNetwork } from "wagmi";
 
 export const ExpandedDashboardMenu = ({
   familyDetails,
-  children,
+  members,
   onAddChildOpen,
   setSelectedTab,
   onToggleCollapsedMenu,
@@ -44,7 +44,7 @@ export const ExpandedDashboardMenu = ({
   onOpenMembersTableModal,
 }: {
   familyDetails: User;
-  children: User[];
+  members: User[];
   onAddChildOpen: () => void;
   setSelectedTab: (tab: ParentDashboardTabs) => void;
   onToggleCollapsedMenu: () => void;
@@ -133,7 +133,7 @@ export const ExpandedDashboardMenu = ({
                 onOpenSendFundsModal={onOpenSendFundsModal}
                 onOpenNetworkModal={onOpenNetworkModal}
                 onOpenMembersTableModal={onOpenMembersTableModal}
-                children={children}
+                members={members}
               />
             </Box>
 

src/components/LoggedInNavbar.tsx

@@ -52,11 +52,7 @@ export default function LoggedInNavBar() {
           <Avatar
             size="md"
             name={userDetails?.username}
-            src={
-              userDetails?.avatarURI
-                ? userDetails?.avatarURI
-                : "/images/placeholder-avatar.jpeg"
-            }
+            src={userDetails?.avatarURI && userDetails?.avatarURI}
             onClick={() => {
               setMobileMenuOpen(!mobileMenuOpen);
             }}

src/components/forms/RegisterParentForm.tsx

@@ -33,6 +33,7 @@ import shallow from "zustand/shallow";
 import { useRouter } from "next/navigation";
 import { useAccount } from "wagmi";
 import { TestnetNetworks, NetworkType } from "@/data-schema/enums";
+import { registerActivityEvent } from "@/utils/recentActivity";
 
 export const RegisterParentForm = ({ onClose }: { onClose: () => void }) => {
   //=============================================================================
@@ -144,6 +145,12 @@ export const RegisterParentForm = ({ onClose }: { onClose: () => void }) => {
       setUserDetails(body);
       setIsLoggedIn(true);
 
+      registerActivityEvent(
+        String(address),
+        String(address),
+        "Registered as parent"
+      );
+
       const emailSent = await sendEmailConfirmation();
       if (!emailSent) {
         return;

src/components/modals/UsernameModal.tsx

@@ -33,7 +33,7 @@ export const UsernameModal = ({
   isOpen,
   onClose,
   childKey,
-  children,
+  members,
   familyId,
   fetchChildren,
   fetchFamilyDetails,
@@ -43,7 +43,7 @@ export const UsernameModal = ({
   isOpen: boolean;
   onClose: () => void;
   childKey?: number;
-  children?: any;
+  members?: any;
   familyId?: string;
   fetchChildren?: () => void;
   fetchFamilyDetails?: () => void;

src/components/parentDashboard/Avatar.tsx

@@ -20,7 +20,7 @@ const ParentAvatar = () => {
         sx={{
           bgColor: `${!userDetails?.avatarURI && "purple.500"}`,
         }}
-        src={userDetails?.avatarURI || "/images/placeholder-avatar.jpeg"}
+        src={userDetails?.avatarURI}
       />
     </Flex>
   );

src/components/parentDashboard/ButtonMenu.tsx

@@ -16,7 +16,7 @@ const ButtonMenu = ({
   onOpenSendFundsModal,
   onOpenNetworkModal,
   onOpenMembersTableModal,
-  children,
+  members,
 }: {
   onAddChildOpen: () => void;
   setSelectedTab: (tab: ParentDashboardTabs) => void;
@@ -26,7 +26,7 @@ const ButtonMenu = ({
   onOpenSendFundsModal: () => void;
   onOpenNetworkModal: () => void;
   onOpenMembersTableModal: () => void;
-  children?: User[];
+  members?: User[];
 }) => {
   const { userDetails } = useAuthStore(
     (state) => ({