From b828fafee2a7c754d40ef7002b7c40697c0cdb4a Mon Sep 17 00:00:00 2001
From: albertying <albertlying@gmail.com>
Date: Wed, 12 Nov 2025 19:01:55 -0500
Subject: [PATCH] finish all tasks

---
 src/App.tsx                          | 16 +++--
 src/components/ApplicationsModal.tsx | 93 ++++++++++++++++++++++++++++
 src/components/UserCard.tsx          | 80 ++++++++++++++----------
 src/components/UserData.tsx          | 58 ++++++++++++-----
 src/components/UserModal.tsx         | 67 ++++++++++++++++++++
 5 files changed, 262 insertions(+), 52 deletions(-)
 create mode 100644 src/components/ApplicationsModal.tsx
 create mode 100644 src/components/UserModal.tsx

diff --git a/src/App.tsx b/src/App.tsx
index 18ac09d..4d27036 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -5,9 +5,15 @@ import { Routes, Route } from "react-router-dom";
 import axios from "axios";
 import { initializeApp } from "firebase/app";
 import { setPersistence, getAuth, inMemoryPersistence } from "firebase/auth";
-import { useLogin, LoadingScreen, AuthProvider } from "@hex-labs/core";
+import {
+  useLogin,
+  LoadingScreen,
+  AuthProvider,
+  Header,
+  Footer,
+} from "@hex-labs/core";
 
-import UserData from './components/UserData';
+import UserData from "./components/UserData";
 
 // a little bee ascii art
 // const art =
@@ -48,14 +54,14 @@ export const App = () => {
   // useAuth hook to retrieve the user's login details.
   return (
     <AuthProvider app={app}>
-
       {/* Setting up our React Router to route to all the different pages we may have */}
+      <Header children={null} />
       <Routes>
         <Route path="/" element={<UserData />} />
       </Routes>
-
+      <Footer />
     </AuthProvider>
   );
 };
 
-export default App;
\ No newline at end of file
+export default App;
diff --git a/src/components/ApplicationsModal.tsx b/src/components/ApplicationsModal.tsx
new file mode 100644
index 0000000..f6c7b1c
--- /dev/null
+++ b/src/components/ApplicationsModal.tsx
@@ -0,0 +1,93 @@
+import React from "react";
+import {
+  Modal,
+  ModalOverlay,
+  ModalContent,
+  ModalHeader,
+  ModalCloseButton,
+  ModalBody,
+  ModalFooter,
+  Box,
+  Text,
+} from "@chakra-ui/react";
+
+import axios from "axios";
+import { useState, useEffect } from "react";
+
+import { apiUrl } from "@hex-labs/core";
+import { Service } from "@hex-labs/core";
+
+type UserModalProps = {
+  isOpen: boolean;
+  onClose: () => void;
+  user: any;
+};
+
+const ApplicationsModal: React.FC<UserModalProps> = ({
+  isOpen,
+  onClose,
+  user,
+}) => {
+  const [hexathons, setHexathons] = useState<any[]>([]);
+
+  useEffect(() => {
+    if (!isOpen) {
+      return;
+    }
+    const loadApps = async () => {
+      let URL = apiUrl(Service.HEXATHONS, "/hexathons");
+      const { data } = await axios.get(URL);
+
+      const applications = await Promise.all(
+        data.map(async (hexathon: any) => {
+          const res = await axios.get(
+            apiUrl(Service.REGISTRATION, "/applications"),
+            {
+              params: {
+                hexathon: hexathon.id,
+                userId: user.userId,
+              },
+            },
+          );
+          if (res.data.applications.length > 0) {
+            return hexathon.name;
+          } else {
+            return null;
+          }
+        }),
+      );
+      const filteredHexathons = applications.filter(
+        (hexathon) => hexathon !== null,
+      );
+      setHexathons(filteredHexathons);
+      console.log(user.userId);
+    };
+    loadApps();
+  }, [isOpen, user?.userId]);
+  return (
+    <Modal isOpen={isOpen} onClose={onClose} isCentered>
+      <ModalOverlay />
+      <ModalContent>
+        <ModalHeader>Applications</ModalHeader>
+        <ModalCloseButton />
+        <ModalBody>
+          <Box>
+            <b>Applied Hexathons: </b>
+            {hexathons.length > 0 ? (
+              <Box>
+                {hexathons.map((hexathon) => (
+                  <Text key={hexathon}>{hexathon}</Text>
+                ))}
+              </Box>
+            ) : (
+              <Text>No hexathons applied</Text>
+            )}
+          </Box>
+        </ModalBody>
+        <ModalFooter></ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+};
+
+export default ApplicationsModal;
diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx
index d552982..d818a80 100644
--- a/src/components/UserCard.tsx
+++ b/src/components/UserCard.tsx
@@ -1,21 +1,18 @@
-import {
-  Box,
-  Flex,
-  HStack,
-  Text,
-} from "@chakra-ui/react";
+import { Box, Flex, HStack, Text } from "@chakra-ui/react";
 import React from "react";
+import { useDisclosure } from "@chakra-ui/react";
+import UserModal from "./UserModal";
+import ApplicationsModal from "./ApplicationsModal";
 
 type Props = {
   user: any;
 };
 
-
 // TODO: right now, the UserCard only displays the user's name and email. Create a new modal component <UserModal> that
 // pops up when the card is clicked. In this modal, list all the user's information including name, email, phoneNumber,
-// and userId. 
+// and userId.
 
-// TODO: Explore if you can display the email as a link to the user's email that will open up the user's 
+// TODO: Explore if you can display the email as a link to the user's email that will open up the user's
 // email client and start a new email to that user. Also explore if you can provide a link to the user's resume.
 
 // TODO: In our database structure, every user has a userId that is unique to them. This is the primary key of the user
@@ -24,31 +21,50 @@ type Props = {
 // and the /hexathons endpoint of the hexathons service to get a list of all the hexathons.
 
 const UserCard: React.FC<Props> = (props: Props) => {
+  const userModal = useDisclosure();
+  const applicationsModal = useDisclosure();
 
   return (
-    <Box
-    borderWidth="1px"
-    rounded="lg"
-    boxShadow="lg"
-    height="175px"
-    fontWeight="bold"
-    alignItems="center"
-    >
-      <Flex padding="2" flexDirection="column">
-        <HStack align="flex-end" justify="space-between">
-          <Text fontSize='xl'>{`${props.user.name.first} ${props.user.name.last}`}</Text>
-        </HStack>
-        <Text
-          fontSize="sm"
-          fontWeight="semibold"
-          justifyContent="justify"
-          mt="2"
-        >
-          {props.user.email}
-        </Text>
-      </Flex>
-    </Box>
+    <>
+      <Box
+        borderWidth="1px"
+        rounded="lg"
+        boxShadow="lg"
+        height="175px"
+        fontWeight="bold"
+        alignItems="center"
+        onClick={userModal.onOpen}
+      >
+        <Flex padding="2" flexDirection="column">
+          <HStack align="flex-end" justify="space-between">
+            <Text fontSize="xl">{`${props.user.name.first} ${props.user.name.last}`}</Text>
+          </HStack>
+          <Text
+            fontSize="sm"
+            fontWeight="semibold"
+            justifyContent="justify"
+            mt="2"
+          >
+            {props.user.email}
+          </Text>
+        </Flex>
+      </Box>
+      <UserModal
+        isOpen={userModal.isOpen}
+        onClose={userModal.onClose}
+        user={props.user}
+        onApplicationsOpen={() => {
+          userModal.onClose();
+          applicationsModal.onOpen();
+        }}
+      />
+      <ApplicationsModal
+        isOpen={applicationsModal.isOpen}
+        onClose={applicationsModal.onClose}
+        user={props.user}
+      />
+    </>
   );
 };
 
-export default UserCard;
\ No newline at end of file
+export default UserCard;
diff --git a/src/components/UserData.tsx b/src/components/UserData.tsx
index d5aeb78..5e89552 100644
--- a/src/components/UserData.tsx
+++ b/src/components/UserData.tsx
@@ -2,10 +2,25 @@ import React, { useEffect, useState } from "react";
 import { apiUrl, Service } from "@hex-labs/core";
 import { SimpleGrid, Text } from "@chakra-ui/react";
 import axios from "axios";
+import { Button } from "@chakra-ui/react";
 import UserCard from "./UserCard";
 
-const UserData: React.FC = () => {
+interface UserName {
+  first: string;
+  middle?: string;
+  last: string;
+}
+
+interface User {
+  id: string;
+  userId: string;
+  email: string;
+  phoneNumber?: string;
+  gender?: string;
+  name: UserName;
+}
 
+const UserData: React.FC = () => {
   // The useState hook is used to store state in a functional component. The
   // first argument is the initial value of the state, and the second argument
   // is a function that can be used to update the state. The useState hook
@@ -19,14 +34,12 @@ const UserData: React.FC = () => {
   // only happen once when the component is loaded.
 
   useEffect(() => {
-
     // This is an example of an async function. The async keyword tells the
     // function to wait for the axios request to finish before continuing. This
     // is useful because we can't use the data from the request until it is
     // finished.
 
     const getUsers = async () => {
-
       // TODO: Use the apiUrl() function to make a request to the /users endpoint of our USERS service. The first argument is the URL
       // of the request, which is created for the hexlabs api through our custom function apiUrl(), which builds the request URL based on
       // the Service enum and the following specific endpoint URL.
@@ -37,13 +50,21 @@ const UserData: React.FC = () => {
       // Postman will be your best friend here, because it's better to test out the API calls in Postman before implementing them here.
 
       // this is the endpoint you want to hit, but don't just hit it directly using axios, use the apiUrl() function to make the request
-      const URL = 'https://users.api.hexlabs.org/users/hexlabs';
+      // const URL = "https://users.api.hexlabs.org/users/hexlabs";
+
+      const URL = apiUrl(Service.USERS, "/users/hexlabs");
+
+      const { data } = await axios.get(URL);
 
       // uncomment the line below to test if you have successfully made the API call and retrieved the data. The below line takes
       // the raw request response and extracts the actual data that we need from it.
-      // setUsers(data?.data?.profiles);
+
+      const filteredUsers = data.filter((user: User) =>
+        user.phoneNumber?.startsWith("470"),
+      );
+      setUsers(filteredUsers);
     };
-    document.title = "Hexlabs Users"
+    document.title = "Hexlabs Users";
     getUsers();
   }, []);
   // ^^ The empty array at the end of the useEffect hook tells React that the
@@ -51,29 +72,36 @@ const UserData: React.FC = () => {
   // run every time a variable changes, you can put that variable in the array
   // and it will run every time that variable changes.
 
-
   // TODO: Create a function that sorts the users array based on the first name of the users. Then, create a button that
   // calls this function and sorts the users alphabetically by first name. You can use the built in sort() function to do this.
 
+  const handleSort = () => {
+    const sorted = [...users].sort((a, b) =>
+      a.name.first.localeCompare(b.name.first),
+    );
+    setUsers(sorted);
+  };
 
   return (
     <>
       <Text fontSize="4xl">Hexlabs Users</Text>
-      <Text fontSize="2xl">This is an example of a page that makes an API call to the Hexlabs API to get a list of users.</Text>
-
-
+      <Text fontSize="2xl">
+        This is an example of a page that makes an API call to the Hexlabs API
+        to get a list of users.
+      </Text>
+      <Button size="md" onClick={handleSort}>
+        Sort by first name
+      </Button>
       <SimpleGrid columns={[2, 3, 5]} spacing={6} padding={10}>
-
         {/* Here we are mapping every entry in our users array to a unique UserCard component, each with the unique respective
         data of each unique user in our array. This is a really important concept that we use a lot so be sure to familiarize
         yourself with the syntax - compartmentalizing code makes your work so much more readable. */}
-        { users.map((user) => (
-          <UserCard user={user} />
+        {users.map((user) => (
+          <UserCard key={user.id} user={user} />
         ))}
-
       </SimpleGrid>
     </>
   );
 };
 
-export default UserData;
\ No newline at end of file
+export default UserData;
diff --git a/src/components/UserModal.tsx b/src/components/UserModal.tsx
new file mode 100644
index 0000000..47bfec1
--- /dev/null
+++ b/src/components/UserModal.tsx
@@ -0,0 +1,67 @@
+import React from "react";
+import {
+  Modal,
+  ModalOverlay,
+  ModalContent,
+  ModalHeader,
+  ModalCloseButton,
+  ModalBody,
+  ModalFooter,
+  Link,
+  Button,
+  Text,
+} from "@chakra-ui/react";
+
+type UserModalProps = {
+  isOpen: boolean;
+  onClose: () => void;
+  onApplicationsOpen: () => void;
+  user: any;
+};
+
+const UserModal: React.FC<UserModalProps> = ({
+  isOpen,
+  onClose,
+  onApplicationsOpen,
+  user,
+}) => {
+  return (
+    <Modal isOpen={isOpen} onClose={onClose} isCentered>
+      <ModalOverlay />
+      <ModalContent>
+        <ModalHeader>{`${user.name.first} ${user.name.last}`}</ModalHeader>
+        <ModalCloseButton />
+        <ModalBody>
+          <Text>
+            <b>Email: </b>
+            <Link color="blue.500" href={`mailto:${user.email}`}>
+              {user.email}
+            </Link>
+          </Text>
+          <Text>
+            <b>Phone: </b>{" "}
+            {user.phoneNumber
+              ? user.phoneNumber.slice(0, 3) +
+                "-" +
+                user.phoneNumber.slice(3, 6) +
+                "-" +
+                user.phoneNumber.slice(6)
+              : "N/A"}
+          </Text>
+        </ModalBody>
+        <ModalFooter>
+          <Button
+            onClick={() => {
+              onClose();
+              onApplicationsOpen();
+            }}
+          >
+            Open Applications
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+};
+
+export default UserModal;