From 47946281c474359fe08f6c53dd27ba2b3322f97d Mon Sep 17 00:00:00 2001
From: benjytan45678 <Benjytan45678@gmail.com>
Date: Sun, 21 May 2023 00:23:41 +0800
Subject: [PATCH 001/223] add calendar functionality

---
 package.json                             |   5 +
 src/components/calendar/Meeting.tsx      |  86 +++++++++++
 src/components/calendar/SideCalendar.tsx | 179 +++++++++++++++++++++++
 src/components/common/TopNavbar.tsx      |   6 +
 src/pages/calendar/index.tsx             |  89 +++++++++++
 yarn.lock                                |  81 +++++++++-
 6 files changed, 444 insertions(+), 2 deletions(-)
 create mode 100644 src/components/calendar/Meeting.tsx
 create mode 100644 src/components/calendar/SideCalendar.tsx
 create mode 100644 src/pages/calendar/index.tsx

diff --git a/package.json b/package.json
index a43c912b..d0be7664 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,9 @@
     "@chakra-ui/react": "^2.6.1",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
+    "@fullcalendar/react": "^6.1.7",
+    "@headlessui/react": "^1.7.14",
+    "@heroicons/react": "v1",
     "@hookform/resolvers": "^2.9.10",
     "@next-auth/prisma-adapter": "1.0.5",
     "@prisma/client": "^4.14.0",
@@ -28,10 +31,12 @@
     "@trpc/server": "^10.26.0",
     "bcryptjs": "^2.4.3",
     "clsx": "^1.2.1",
+    "date-fns": "^2.30.0",
     "dayjs": "^1.11.7",
     "flowbite": "^1.6.5",
     "flowbite-react": "^0.4.4",
     "framer-motion": "^9.0.4",
+    "fullcalendar": "^6.1.7",
     "next": "^13.1.6",
     "next-auth": "^4.22.1",
     "nodemailer": "^6.9.2",
diff --git a/src/components/calendar/Meeting.tsx b/src/components/calendar/Meeting.tsx
new file mode 100644
index 00000000..ff3018d1
--- /dev/null
+++ b/src/components/calendar/Meeting.tsx
@@ -0,0 +1,86 @@
+import { Menu} from '@headlessui/react'
+import {format, parseISO} from 'date-fns'
+import { DotsVerticalIcon } from '@heroicons/react/outline'
+
+export type Meeting = {
+    id: number 
+    title: string | null
+    start: string 
+    end: string
+}
+export type meeting = {
+    meeting: Meeting
+}
+
+function combineClasses(classes: string[]) {
+    return classes.join('')
+}
+
+export default function Meeting({meeting}: meeting) {
+    const startDateTime = parseISO(meeting.start)
+    const endDateTime = parseISO(meeting.end)
+  
+    return (
+      <li className="flex items-center px-4 py-2 space-x-4 group rounded-xl focus-within:bg-green-400 hover:bg-green-400">
+        <div className="flex-auto text-white">
+          <p className="font-bold">{meeting.title}</p>
+          <p className="mt-0.5">
+            <time dateTime={meeting.start}>
+              {format(startDateTime, 'h:mm a')}
+            </time>{' '}
+            -{' '}
+            <time dateTime={meeting.end}>
+              {format(endDateTime, 'h:mm a')}
+            </time>
+          </p>
+        </div>
+        <Menu
+          as="div"
+          className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
+        >
+          <div>
+            <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
+              <span className="sr-only">Open options</span>
+              <DotsVerticalIcon className="w-6 h-6" aria-hidden="true" />
+            </Menu.Button>
+          </div>
+            <Menu.Items className="absolute right-0 z-10 mt-2 origin-top-right bg-white rounded-md shadow-lg w-36 ring-1 ring-black ring-opacity-5 focus:outline-none">
+              <div className="py-1">
+                <Menu.Item>
+                  {({ active }) => (
+                    <button
+                      className={
+                        combineClasses(['block px-4 py-2 text-sm'].concat(
+                            active ? 'bg-gray-100 text-black' : 'text-gray-900'))
+                      }
+                      onClick={() => {
+                        alert("You want to edit meeting")
+                      }}                    
+                    >
+                      Edit Meeting
+                    </button>
+                  )}
+                </Menu.Item>
+                <Menu.Item>
+                  {({ active }) => (
+                    <button
+                      className={
+                        combineClasses(['block px-4 py-2 text-sm'].concat(
+                        active ? 'bg-gray-100 text-black' : 'text-gray-900'))
+                      }
+                      onClick={() => {
+                        alert("You want to cancel meeting")
+                      }}
+                    >
+                      Cancel Meeting
+                    </button>
+                  )}
+                </Menu.Item>
+              </div>
+            </Menu.Items>
+        </Menu>
+      </li>
+    )
+  }
+  
+  
\ No newline at end of file
diff --git a/src/components/calendar/SideCalendar.tsx b/src/components/calendar/SideCalendar.tsx
new file mode 100644
index 00000000..23d7be80
--- /dev/null
+++ b/src/components/calendar/SideCalendar.tsx
@@ -0,0 +1,179 @@
+import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/solid'
+import {
+  add,
+  eachDayOfInterval,
+  endOfMonth,
+  getDay,
+  format,
+  parseISO,
+  isEqual,
+  isSameDay,
+  isSameMonth,
+  isToday,
+  parse,
+  startOfToday,
+} from 'date-fns'
+import { useState } from 'react'
+import Meeting from './Meeting'
+
+export type Meeting = {
+    id: number 
+    title: string | null
+    start: string 
+    end: string
+}
+
+export type Meetings = {
+    meetings: Meeting[]
+}
+
+function classNames(...classes) {
+    return classes.filter(Boolean).join(' ')
+  }
+
+export default function SideCalendar({meetings}: Meetings) {
+  const today = startOfToday()
+  const [selectedDay, setSelectedDay] = useState(today)
+  const [currentMonth, setCurrentMonth] = useState(format(today, 'MMM-yyyy'))
+  const firstDayCurrentMonth = parse(currentMonth, 'MMM-yyyy', new Date())
+
+  const days = eachDayOfInterval({
+    start: firstDayCurrentMonth,
+    end: endOfMonth(firstDayCurrentMonth),
+  })
+
+  function previousMonth() {
+    const firstDayNextMonth = add(firstDayCurrentMonth, { months: -1 })
+    setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
+  }
+
+  function nextMonth() {
+    const firstDayNextMonth = add(firstDayCurrentMonth, { months: 1 })
+    setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
+  }
+
+  const selectedDayMeetings = meetings?.filter((meeting) =>
+    isSameDay(parseISO(meeting.start), selectedDay)
+  ) 
+
+  return (
+    <div className="pt-16 bg-zinc-900 col-span-1">
+      <div className="max-w-md px-4 mx-auto sm:px-7 md:max-w-4xl md:px-6">
+        <div className="md:grid md:grid-rows-2">
+          <div className="md:pr-14">
+            <div className="flex items-center">
+              <h2 className="flex-auto font-semibold text-white text-4xl">
+                {format(firstDayCurrentMonth, 'MMMM yyyy')}
+              </h2>
+              <button
+                type="button"
+                onClick={previousMonth}
+                className="-my-1.5 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
+              >
+                <span className="sr-only">Previous month</span>
+                <ChevronLeftIcon className="w-5 h-5" aria-hidden="true" />
+              </button>
+              <button
+                onClick={nextMonth}
+                type="button"
+                className="-my-1.5 -mr-1.5 ml-2 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
+              >
+                <span className="sr-only">Next month</span>
+                <ChevronRightIcon className="w-5 h-5" aria-hidden="true" />
+              </button>
+            </div>
+            <div className="grid grid-cols-7 mt-10 text-xs leading-6 text-center text-gray-500">
+              <div>S</div>
+              <div>M</div>
+              <div>T</div>
+              <div>W</div>
+              <div>T</div>
+              <div>F</div>
+              <div>S</div>
+            </div>
+            <div className="grid grid-cols-7 mt-2 text-sm">
+              {days.map((day, dayIdx) => (
+                <div
+                  key={day.toString()}
+                  className={classNames(
+                    dayIdx === 0 && colStartClasses[getDay(day)],
+                    'py-1.5'
+                  )}
+                >
+                  <button
+                    type="button"
+                    onClick={() => setSelectedDay(day)}
+                    className={classNames(
+                      !isEqual(day, selectedDay) &&
+                        isToday(day) &&
+                        'text-red-500',
+                      !isEqual(day, selectedDay) &&
+                        !isToday(day) &&
+                        isSameMonth(day, firstDayCurrentMonth) &&
+                        'text-gray-900',
+                      !isEqual(day, selectedDay) &&
+                        !isToday(day) &&
+                        !isSameMonth(day, firstDayCurrentMonth) &&
+                        'text-gray-400',
+                      isEqual(day, selectedDay) && isToday(day) && 'bg-red-500',
+                      isEqual(day, selectedDay) &&
+                        !isToday(day) &&
+                        'bg-blue-400',
+                      !isEqual(day, selectedDay) && 'hover:bg-yellow-400',
+                      (isEqual(day, selectedDay) || isToday(day)) &&
+                        'font-semibold',
+                      'mx-auto flex h-8 w-8 items-center justify-center rounded-full'
+                    )}
+                  >
+                    <time className = "text-white" dateTime={format(day, 'yyyy-MM-dd')}>
+                      {format(day, 'd')}
+                    </time>
+                  </button>
+
+                  <div className="w-1 h-1 mx-auto mt-1">
+                    {meetings?.some((meeting) =>
+                      isSameDay(parseISO(meeting.start), day)
+                    ) && (
+                      <div className="w-1 h-1 rounded-full bg-violet-700"></div>
+                    )}
+                  </div>
+                </div>
+              ))}
+            </div>
+          </div>
+          <section className="divide-y divide-gray-400">
+            <h2 className="font-semibold text-blue-700 text-center">
+              {isSameDay(today, selectedDay)
+              ?'TODAY ' 
+              : ''
+              }
+              <time dateTime={format(selectedDay, 'yyyy-MM-dd')}>
+                {format(selectedDay, 'dd/LL/yyyy')}
+              </time>
+            </h2>
+            <ol className="text-sm leading-6 text-gray-500">
+              {selectedDayMeetings?.length > 0 ? (
+                selectedDayMeetings?.map((meeting) => (
+                  <Meeting meeting={meeting} key={meeting.id}/>
+                ))
+              ) : (
+                <p>No meetings for today.</p>
+              )}
+            </ol>
+          </section>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+
+const colStartClasses = [
+  '',
+  'col-start-2',
+  'col-start-3',
+  'col-start-4',
+  'col-start-5',
+  'col-start-6',
+  'col-start-7',
+]
diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index a87e1ee2..340a808a 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -37,6 +37,9 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
           <Link href="/profile">
             <Dropdown.Item>Profile</Dropdown.Item>
           </Link>
+          <Link href = "/calendar">
+            <Dropdown.Item>Calendar</Dropdown.Item>
+          </Link>
           <Dropdown.Item>
             <div onClick={logout}>Sign Out</div>
           </Dropdown.Item>
@@ -55,6 +58,9 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
         <Navbar.Link href="/events" className="ml-4 text-white">
           Events
         </Navbar.Link>
+        <Navbar.Link href="/calendar" className="ml-4 text-white">
+          Calendar
+        </Navbar.Link>
       </Navbar.Collapse>
     </Navbar>
   )
diff --git a/src/pages/calendar/index.tsx b/src/pages/calendar/index.tsx
new file mode 100644
index 00000000..32a0eee9
--- /dev/null
+++ b/src/pages/calendar/index.tsx
@@ -0,0 +1,89 @@
+import Layout from '~/components/common/Layout'
+import Head from 'next/head'
+import TopNavbar from '~/components/common/TopNavbar'
+import withAuth, {type BaseProps} from '~/utils/withAuth'
+import FullCalendar from '@fullcalendar/react' // must go before plugins
+import dayGridPlugin from '@fullcalendar/daygrid'
+import interactionPlugin from '@fullcalendar/interaction'
+import timeGridPlugin from '@fullcalendar/timegrid'
+import styled from "@emotion/styled";
+import { useState } from 'react'
+import SideCalendar from '~/components/calendar/sideCalendar'
+
+// add styles as css
+export const StyleWrapper = styled.div`
+`
+
+const meetings = [
+  {
+    id: 1,
+    title: 'Meeting 1',
+    start: '2023-05-11T13:00',
+    end: '2023-05-11T14:30',
+  },
+  {
+    id: 2,
+    title: 'Meeting 2',
+    start: '2023-05-20T09:00',
+    end: '2023-05-20T11:30',
+  },
+  {
+    id: 3,
+    title: 'Meeting 3',
+    start: '2023-05-20T17:00',
+    end: '2023-05-20T18:30',
+  },
+  {
+    id: 4,
+    title: 'Meeting 4',
+    start: '2023-06-09T13:00',
+    end: '2023-06-09T14:30',
+  },
+  {
+    id: 5,
+    title: 'Meeting 5',
+    start: '2023-05-13T14:00',
+    end: '2023-05-13T14:30',
+  },
+]
+
+const CalendarPage: React.FC<BaseProps> = ({session}) => {
+    const [events, useEvents] = useState(
+        [
+            { title: 'event 1', start: '2023-05-01T15:30' ,end: '2023-05-01T16:30'},
+            { title: 'event 2', start: '2023-05-02T06:00' , end: '2023-05-02T07:00'}
+        ]
+    );
+  return (
+    <>
+      <Head>
+        <title>Atlas | Calendar</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta name="description" content="The calendar page for Atlas" />
+      </Head>
+      <TopNavbar isAdmin={session.isAdmin} />
+      <div className="grid-container grid grid-cols-5">
+      <SideCalendar meetings={meetings}/>
+      <StyleWrapper className='col-span-4'>
+        <FullCalendar
+            plugins={[ dayGridPlugin, timeGridPlugin, interactionPlugin]}
+            initialView="dayGridMonth"
+            headerToolbar={{
+                start: 'prev,today,next',
+                center: 'dayGridMonth,timeGridWeek,timeGridDay',
+                end: 'title'
+            }}
+            allDaySlot = {false}
+            events = {events}
+            eventClick={(info) => {
+                alert('Event: ' + info.event.title);
+            }}
+
+        />
+    </StyleWrapper>
+    </div>
+    </>
+  )
+}
+
+export default withAuth(CalendarPage, true)
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index f0e0b271..105c91b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -163,7 +163,7 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.20.13":
+"@babel/runtime@^7.20.13", "@babel/runtime@^7.21.0":
   version "7.21.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"
   integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
@@ -1184,6 +1184,59 @@
     aria-hidden "^1.1.3"
     tabbable "^6.0.1"
 
+"@fullcalendar/core@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/core/-/core-6.1.7.tgz#83d8b109fbf0deb1d4c3262ca4b2d70e77a287c4"
+  integrity sha512-Hc63ARSyABlNo10B3NkA0z8ndaDmq5MKpcBB2iQsGQyn8N8cyn/x6V284Je1EwDoKsBlbrZAj+j+efBO+QQf5g==
+  dependencies:
+    preact "~10.12.1"
+
+"@fullcalendar/daygrid@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/daygrid/-/daygrid-6.1.7.tgz#529d5f1989081c5ab9d129fcaf409111b31be976"
+  integrity sha512-IB+QdRcs+TeTlsK8qJFtYZ/2GugmXEFC0C00/n1aLT7GLgFn3ueV1GN0EKvXv9HJ5ai8My65mYbSyQizY/Ishw==
+
+"@fullcalendar/interaction@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/interaction/-/interaction-6.1.7.tgz#f2d86312371b284b46caae8c74b303e1fc7bdd4c"
+  integrity sha512-C2KHSinc9cFUTcGYxRSIj7cBYNSroce+1d2Wa+HKVHguVv4kQuEvm/oPxJpTLXqFjNLfxyxVac7Zd4U0znjFtg==
+
+"@fullcalendar/list@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/list/-/list-6.1.7.tgz#27d1b11984c9e4fc66da9a71b2429d38c427be94"
+  integrity sha512-Fl6jGKylhrk+g/RCISsv66vzpzjCFhd4r3nUDeHTAAE375OYGlVPKpH67YaKxpMrofj82JLIzS3JEzyQBZo0Cg==
+
+"@fullcalendar/multimonth@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/multimonth/-/multimonth-6.1.7.tgz#bec09460746abd96b147306c4b5a342c56dbf049"
+  integrity sha512-x4Z8XjmjlXNElZsVYr+AdNYiGPrYdmG3nxDYjxIDPl1CvH/pAmZinaRlOmVP4wq7ES9RP/9xOlAhe2/RKpsh3w==
+  dependencies:
+    "@fullcalendar/daygrid" "~6.1.7"
+
+"@fullcalendar/react@^6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/react/-/react-6.1.7.tgz#acdfaa84b0b12a9a70b26a6e8d494c14de0d3b44"
+  integrity sha512-Pwe88D4zXwP/XQsYWOa1foroF/OpHSLet5CiE4crnaKvngEtzt3SBDIO01agQOpo+yE1KM/n3yE5ePbdJtVJIQ==
+
+"@fullcalendar/timegrid@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/timegrid/-/timegrid-6.1.7.tgz#1c2dac33a7870928359f17a5e142d26f08022f79"
+  integrity sha512-kVgJVswu96LrCozr+GyYzF+LUZjURC4HyDg11tCfrj2wMTsrYKqUxilTGXuD3daD4T7qp3CLCg5GdD6lbYHI7A==
+  dependencies:
+    "@fullcalendar/daygrid" "~6.1.7"
+
+"@headlessui/react@^1.7.14":
+  version "1.7.14"
+  resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.14.tgz#75f19552c535113640fe8a3a40e71474f49e89c9"
+  integrity sha512-znzdq9PG8rkwcu9oQ2FwIy0ZFtP9Z7ycS+BAqJ3R5EIqC/0bJGvhT7193rFf+45i9nnPsYvCQVW4V/bB9Xc+gA==
+  dependencies:
+    client-only "^0.0.1"
+
+"@heroicons/react@v1":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@heroicons/react/-/react-1.0.6.tgz#35dd26987228b39ef2316db3b1245c42eb19e324"
+  integrity sha512-JJCXydOFWMDpCP4q13iEplA503MQO3xLoZiKum+955ZCtHINWnx26CUxVxxFQu/uLb4LW3ge15ZpzIkXKkJ8oQ==
+
 "@hookform/resolvers@^2.9.10":
   version "2.9.11"
   resolved "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-2.9.11.tgz"
@@ -2010,7 +2063,7 @@ classnames@^2.2.6, classnames@^2.3.2:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
   integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
 
-client-only@0.0.1:
+client-only@0.0.1, client-only@^0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz"
   integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
@@ -2146,6 +2199,13 @@ damerau-levenshtein@^1.0.8:
   resolved "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
+date-fns@^2.30.0:
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
+  integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
+  dependencies:
+    "@babel/runtime" "^7.21.0"
+
 dayjs@^1.11.7:
   version "1.11.7"
   resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"
@@ -2793,6 +2853,18 @@ fsevents@~2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
+fullcalendar@^6.1.7:
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-6.1.7.tgz#f1ab71bd128a584359b4c823ac93646d01c6dd17"
+  integrity sha512-e4KF/wf0gOilgDRAhOOJZrAzzPqDDAGF0SogyM0rTrZvn4HgC3ZL9CfBttc4juMMnmKQGNcGt649+ZnG+zxUTA==
+  dependencies:
+    "@fullcalendar/core" "~6.1.7"
+    "@fullcalendar/daygrid" "~6.1.7"
+    "@fullcalendar/interaction" "~6.1.7"
+    "@fullcalendar/list" "~6.1.7"
+    "@fullcalendar/multimonth" "~6.1.7"
+    "@fullcalendar/timegrid" "~6.1.7"
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -3840,6 +3912,11 @@ preact@^10.6.3:
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.13.2.tgz#2c40c73d57248b57234c4ae6cd9ab9d8186ebc0a"
   integrity sha512-q44QFLhOhty2Bd0Y46fnYW0gD/cbVM9dUVtNTDKPcdXSMA7jfY+Jpd6rk3GB0lcQss0z5s/6CmVP0Z/hV+g6pw==
 
+preact@~10.12.1:
+  version "10.12.1"
+  resolved "https://registry.yarnpkg.com/preact/-/preact-10.12.1.tgz#8f9cb5442f560e532729b7d23d42fd1161354a21"
+  integrity sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"

From cb71c79ef1c27047ffe2597533a42200d7a4fa8e Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sun, 21 May 2023 18:26:46 +0800
Subject: [PATCH 002/223] Remove unused bottom navbar and layout

---
 src/components/calendar/SideCalendar.tsx |  2 +-
 src/components/common/BottomNavbar.tsx   | 62 ------------------------
 src/components/common/Layout.tsx         | 14 ------
 src/components/common/TopNavbar.tsx      |  4 +-
 src/pages/calendar/index.tsx             | 51 +++++++++----------
 src/pages/users/index.tsx                | 10 ++--
 6 files changed, 30 insertions(+), 113 deletions(-)
 delete mode 100644 src/components/common/BottomNavbar.tsx
 delete mode 100644 src/components/common/Layout.tsx

diff --git a/src/components/calendar/SideCalendar.tsx b/src/components/calendar/SideCalendar.tsx
index 23d7be80..341fa635 100644
--- a/src/components/calendar/SideCalendar.tsx
+++ b/src/components/calendar/SideCalendar.tsx
@@ -27,7 +27,7 @@ export type Meetings = {
     meetings: Meeting[]
 }
 
-function classNames(...classes) {
+function classNames(...classes: any[]) {
     return classes.filter(Boolean).join(' ')
   }
 
diff --git a/src/components/common/BottomNavbar.tsx b/src/components/common/BottomNavbar.tsx
deleted file mode 100644
index 3e895d01..00000000
--- a/src/components/common/BottomNavbar.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import Image from 'next/image'
-import Link from 'next/link'
-
-const BottomNavBar = () => {
-  return (
-    <section
-      id="bottom-navigation"
-      className="fixed inset-x-0 bottom-0 z-10 block bg-white shadow md:invisible"
-    >
-      <div id="tabs" className="flex justify-between">
-        {TabConfig.map(({ href, src, title }, index) => (
-          <TabButton key={index} href={href} src={src} title={title} />
-        ))}
-      </div>
-    </section>
-  )
-}
-
-export default BottomNavBar
-
-const TabButton = ({ href, src, title }: TabButtonProps) => {
-  return (
-    <div className="inline-block w-full justify-center pt-2 pb-1 text-center hover:text-teal-500 focus:text-teal-500">
-      <Link href={href}>
-        <div>
-          <Image
-            alt="Home"
-            className="mb-1 inline-block"
-            height={25}
-            src={src}
-            width={25}
-          />
-          <span className="block text-xs">{title}</span>
-        </div>
-      </Link>
-    </div>
-  )
-}
-
-type TabButtonProps = {
-  href: string
-  src: string
-  title: string
-}
-
-const TabConfig: TabButtonProps[] = [
-  {
-    href: '/',
-    src: '/mobile/home.svg',
-    title: 'Home',
-  },
-  {
-    href: '/event',
-    src: '/mobile/event.svg',
-    title: 'Event',
-  },
-  {
-    href: '/profile',
-    src: '/mobile/profile.svg',
-    title: 'Profile',
-  },
-]
diff --git a/src/components/common/Layout.tsx b/src/components/common/Layout.tsx
deleted file mode 100644
index 4ffcd6c7..00000000
--- a/src/components/common/Layout.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import BottomNavBar from './BottomNavbar'
-
-const Layout = ({ children }: { children: JSX.Element[] | JSX.Element }) => {
-  return (
-    <>
-      <div className="relative mx-auto mt-8 min-h-screen w-screen flex-col">
-        {children}
-      </div>
-      <BottomNavBar />
-    </>
-  )
-}
-
-export default Layout
diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index 340a808a..b66bc11b 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -37,7 +37,7 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
           <Link href="/profile">
             <Dropdown.Item>Profile</Dropdown.Item>
           </Link>
-          <Link href = "/calendar">
+          <Link href="/calendar">
             <Dropdown.Item>Calendar</Dropdown.Item>
           </Link>
           <Dropdown.Item>
@@ -59,7 +59,7 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
           Events
         </Navbar.Link>
         <Navbar.Link href="/calendar" className="ml-4 text-white">
-          Calendar
+          Recruitment
         </Navbar.Link>
       </Navbar.Collapse>
     </Navbar>
diff --git a/src/pages/calendar/index.tsx b/src/pages/calendar/index.tsx
index 32a0eee9..80fe7e0f 100644
--- a/src/pages/calendar/index.tsx
+++ b/src/pages/calendar/index.tsx
@@ -1,18 +1,16 @@
-import Layout from '~/components/common/Layout'
 import Head from 'next/head'
 import TopNavbar from '~/components/common/TopNavbar'
-import withAuth, {type BaseProps} from '~/utils/withAuth'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
 import FullCalendar from '@fullcalendar/react' // must go before plugins
 import dayGridPlugin from '@fullcalendar/daygrid'
 import interactionPlugin from '@fullcalendar/interaction'
 import timeGridPlugin from '@fullcalendar/timegrid'
-import styled from "@emotion/styled";
+import styled from '@emotion/styled'
 import { useState } from 'react'
-import SideCalendar from '~/components/calendar/sideCalendar'
+import SideCalendar from '~/components/calendar/SideCalendar'
 
 // add styles as css
-export const StyleWrapper = styled.div`
-`
+export const StyleWrapper = styled.div``
 
 const meetings = [
   {
@@ -47,13 +45,11 @@ const meetings = [
   },
 ]
 
-const CalendarPage: React.FC<BaseProps> = ({session}) => {
-    const [events, useEvents] = useState(
-        [
-            { title: 'event 1', start: '2023-05-01T15:30' ,end: '2023-05-01T16:30'},
-            { title: 'event 2', start: '2023-05-02T06:00' , end: '2023-05-02T07:00'}
-        ]
-    );
+const CalendarPage: React.FC<BaseProps> = ({ session }) => {
+  const [events, useEvents] = useState([
+    { title: 'event 1', start: '2023-05-01T15:30', end: '2023-05-01T16:30' },
+    { title: 'event 2', start: '2023-05-02T06:00', end: '2023-05-02T07:00' },
+  ])
   return (
     <>
       <Head>
@@ -63,27 +59,26 @@ const CalendarPage: React.FC<BaseProps> = ({session}) => {
       </Head>
       <TopNavbar isAdmin={session.isAdmin} />
       <div className="grid-container grid grid-cols-5">
-      <SideCalendar meetings={meetings}/>
-      <StyleWrapper className='col-span-4'>
-        <FullCalendar
-            plugins={[ dayGridPlugin, timeGridPlugin, interactionPlugin]}
+        <SideCalendar meetings={meetings} />
+        <StyleWrapper className="col-span-4">
+          <FullCalendar
+            plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
             initialView="dayGridMonth"
             headerToolbar={{
-                start: 'prev,today,next',
-                center: 'dayGridMonth,timeGridWeek,timeGridDay',
-                end: 'title'
+              start: 'prev,today,next',
+              center: 'dayGridMonth,timeGridWeek,timeGridDay',
+              end: 'title',
             }}
-            allDaySlot = {false}
-            events = {events}
+            allDaySlot={false}
+            events={events}
             eventClick={(info) => {
-                alert('Event: ' + info.event.title);
+              alert('Event: ' + info.event.title)
             }}
-
-        />
-    </StyleWrapper>
-    </div>
+          />
+        </StyleWrapper>
+      </div>
     </>
   )
 }
 
-export default withAuth(CalendarPage, true)
\ No newline at end of file
+export default withAuth(CalendarPage, true)
diff --git a/src/pages/users/index.tsx b/src/pages/users/index.tsx
index 3569e37d..448c0c30 100644
--- a/src/pages/users/index.tsx
+++ b/src/pages/users/index.tsx
@@ -1,10 +1,9 @@
-import Layout from '~/components/common/Layout'
 import Head from 'next/head'
 import DataTable from '~/components/users/Table'
 import TopNavbar from '~/components/common/TopNavbar'
-import withAuth, {type BaseProps} from '~/utils/withAuth'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
 
-const AdminUserPage: React.FC<BaseProps> = ({session}) => {
+const AdminUserPage: React.FC<BaseProps> = ({ session }) => {
   return (
     <>
       <Head>
@@ -13,9 +12,8 @@ const AdminUserPage: React.FC<BaseProps> = ({session}) => {
         <meta name="description" content="The login page for Atlas" />
       </Head>
       <TopNavbar isAdmin={session.isAdmin} />
-      <Layout>
-        <DataTable />
-      </Layout>
+
+      <DataTable />
     </>
   )
 }

From 601201aa03fecff47f75f0d7731f7a2498fdef90 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sun, 21 May 2023 18:33:46 +0800
Subject: [PATCH 003/223] Refactor out the MainCalendar

---
 src/components/calendar/MainCalendar.tsx |  36 ++++++
 src/components/calendar/Meeting.tsx      | 143 +++++++++++------------
 src/components/calendar/SideCalendar.tsx |  51 ++++----
 src/pages/calendar/index.tsx             |  31 +----
 4 files changed, 133 insertions(+), 128 deletions(-)
 create mode 100644 src/components/calendar/MainCalendar.tsx

diff --git a/src/components/calendar/MainCalendar.tsx b/src/components/calendar/MainCalendar.tsx
new file mode 100644
index 00000000..c41863d1
--- /dev/null
+++ b/src/components/calendar/MainCalendar.tsx
@@ -0,0 +1,36 @@
+import FullCalendar from '@fullcalendar/react' // must go before plugins
+import dayGridPlugin from '@fullcalendar/daygrid'
+import interactionPlugin from '@fullcalendar/interaction'
+import timeGridPlugin from '@fullcalendar/timegrid'
+import styled from '@emotion/styled'
+import { useState } from 'react'
+
+export const StyleWrapper = styled.div``
+
+const MainCalendar = () => {
+  const [events, useEvents] = useState([
+    { title: 'event 1', start: '2023-05-01T15:30', end: '2023-05-01T16:30' },
+    { title: 'event 2', start: '2023-05-02T06:00', end: '2023-05-02T07:00' },
+  ])
+
+  return (
+    <StyleWrapper className="col-span-4">
+      <FullCalendar
+        plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
+        initialView="dayGridMonth"
+        headerToolbar={{
+          start: 'prev,today,next',
+          center: 'dayGridMonth,timeGridWeek,timeGridDay',
+          end: 'title',
+        }}
+        allDaySlot={false}
+        events={events}
+        eventClick={(info) => {
+          alert('Event: ' + info.event.title)
+        }}
+      />
+    </StyleWrapper>
+  )
+}
+
+export default MainCalendar
diff --git a/src/components/calendar/Meeting.tsx b/src/components/calendar/Meeting.tsx
index ff3018d1..7ef3363c 100644
--- a/src/components/calendar/Meeting.tsx
+++ b/src/components/calendar/Meeting.tsx
@@ -1,86 +1,83 @@
-import { Menu} from '@headlessui/react'
-import {format, parseISO} from 'date-fns'
+import { Menu } from '@headlessui/react'
+import { format, parseISO } from 'date-fns'
 import { DotsVerticalIcon } from '@heroicons/react/outline'
 
 export type Meeting = {
-    id: number 
-    title: string | null
-    start: string 
-    end: string
+  id: number
+  title: string | null
+  start: string
+  end: string
 }
 export type meeting = {
-    meeting: Meeting
+  meeting: Meeting
 }
 
 function combineClasses(classes: string[]) {
-    return classes.join('')
+  return classes.join('')
 }
 
-export default function Meeting({meeting}: meeting) {
-    const startDateTime = parseISO(meeting.start)
-    const endDateTime = parseISO(meeting.end)
-  
-    return (
-      <li className="flex items-center px-4 py-2 space-x-4 group rounded-xl focus-within:bg-green-400 hover:bg-green-400">
-        <div className="flex-auto text-white">
-          <p className="font-bold">{meeting.title}</p>
-          <p className="mt-0.5">
-            <time dateTime={meeting.start}>
-              {format(startDateTime, 'h:mm a')}
-            </time>{' '}
-            -{' '}
-            <time dateTime={meeting.end}>
-              {format(endDateTime, 'h:mm a')}
-            </time>
-          </p>
+export default function Meeting({ meeting }: meeting) {
+  const startDateTime = parseISO(meeting.start)
+  const endDateTime = parseISO(meeting.end)
+
+  return (
+    <li className="group flex items-center space-x-4 rounded-xl px-4 py-2 focus-within:bg-green-400 hover:bg-green-400">
+      <div className="flex-auto text-white">
+        <p className="font-bold">{meeting.title}</p>
+        <p className="mt-0.5">
+          <time dateTime={meeting.start}>
+            {format(startDateTime, 'h:mm a')}
+          </time>{' '}
+          - <time dateTime={meeting.end}>{format(endDateTime, 'h:mm a')}</time>
+        </p>
+      </div>
+      <Menu
+        as="div"
+        className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
+      >
+        <div>
+          <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
+            <span className="sr-only">Open options</span>
+            <DotsVerticalIcon className="h-6 w-6" aria-hidden="true" />
+          </Menu.Button>
         </div>
-        <Menu
-          as="div"
-          className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
-        >
-          <div>
-            <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
-              <span className="sr-only">Open options</span>
-              <DotsVerticalIcon className="w-6 h-6" aria-hidden="true" />
-            </Menu.Button>
-          </div>
-            <Menu.Items className="absolute right-0 z-10 mt-2 origin-top-right bg-white rounded-md shadow-lg w-36 ring-1 ring-black ring-opacity-5 focus:outline-none">
-              <div className="py-1">
-                <Menu.Item>
-                  {({ active }) => (
-                    <button
-                      className={
-                        combineClasses(['block px-4 py-2 text-sm'].concat(
-                            active ? 'bg-gray-100 text-black' : 'text-gray-900'))
-                      }
-                      onClick={() => {
-                        alert("You want to edit meeting")
-                      }}                    
-                    >
-                      Edit Meeting
-                    </button>
+        <Menu.Items className="absolute right-0 z-10 mt-2 w-36 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+          <div className="py-1">
+            <Menu.Item>
+              {({ active }) => (
+                <button
+                  className={combineClasses(
+                    ['block px-4 py-2 text-sm'].concat(
+                      active ? 'bg-gray-100 text-black' : 'text-gray-900'
+                    )
                   )}
-                </Menu.Item>
-                <Menu.Item>
-                  {({ active }) => (
-                    <button
-                      className={
-                        combineClasses(['block px-4 py-2 text-sm'].concat(
-                        active ? 'bg-gray-100 text-black' : 'text-gray-900'))
-                      }
-                      onClick={() => {
-                        alert("You want to cancel meeting")
-                      }}
-                    >
-                      Cancel Meeting
-                    </button>
+                  onClick={() => {
+                    alert('You want to edit meeting')
+                  }}
+                >
+                  Edit Meeting
+                </button>
+              )}
+            </Menu.Item>
+            <Menu.Item>
+              {({ active }) => (
+                <button
+                  className={combineClasses(
+                    ['block px-4 py-2 text-sm'].concat(
+                      active ? 'bg-gray-100 text-black' : 'text-gray-900'
+                    )
                   )}
-                </Menu.Item>
-              </div>
-            </Menu.Items>
-        </Menu>
-      </li>
-    )
-  }
-  
-  
\ No newline at end of file
+                  onClick={() => {
+                    alert('You want to cancel meeting')
+                  }}
+                >
+                  Cancel Meeting
+                </button>
+              )}
+            </Menu.Item>
+          </div>
+        </Menu.Items>
+      </Menu>
+    </li>
+  )
+}
diff --git a/src/components/calendar/SideCalendar.tsx b/src/components/calendar/SideCalendar.tsx
index 341fa635..f5a4a7fe 100644
--- a/src/components/calendar/SideCalendar.tsx
+++ b/src/components/calendar/SideCalendar.tsx
@@ -17,21 +17,21 @@ import { useState } from 'react'
 import Meeting from './Meeting'
 
 export type Meeting = {
-    id: number 
-    title: string | null
-    start: string 
-    end: string
+  id: number
+  title: string | null
+  start: string
+  end: string
 }
 
 export type Meetings = {
-    meetings: Meeting[]
+  meetings: Meeting[]
 }
 
 function classNames(...classes: any[]) {
-    return classes.filter(Boolean).join(' ')
-  }
+  return classes.filter(Boolean).join(' ')
+}
 
-export default function SideCalendar({meetings}: Meetings) {
+export default function SideCalendar({ meetings }: Meetings) {
   const today = startOfToday()
   const [selectedDay, setSelectedDay] = useState(today)
   const [currentMonth, setCurrentMonth] = useState(format(today, 'MMM-yyyy'))
@@ -54,15 +54,15 @@ export default function SideCalendar({meetings}: Meetings) {
 
   const selectedDayMeetings = meetings?.filter((meeting) =>
     isSameDay(parseISO(meeting.start), selectedDay)
-  ) 
+  )
 
   return (
-    <div className="pt-16 bg-zinc-900 col-span-1">
-      <div className="max-w-md px-4 mx-auto sm:px-7 md:max-w-4xl md:px-6">
+    <div className="col-span-1 bg-zinc-900 pt-16">
+      <div className="mx-auto max-w-md px-4 sm:px-7 md:max-w-4xl md:px-6">
         <div className="md:grid md:grid-rows-2">
           <div className="md:pr-14">
             <div className="flex items-center">
-              <h2 className="flex-auto font-semibold text-white text-4xl">
+              <h2 className="flex-auto text-4xl font-semibold text-white">
                 {format(firstDayCurrentMonth, 'MMMM yyyy')}
               </h2>
               <button
@@ -71,7 +71,7 @@ export default function SideCalendar({meetings}: Meetings) {
                 className="-my-1.5 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
               >
                 <span className="sr-only">Previous month</span>
-                <ChevronLeftIcon className="w-5 h-5" aria-hidden="true" />
+                <ChevronLeftIcon className="h-5 w-5" aria-hidden="true" />
               </button>
               <button
                 onClick={nextMonth}
@@ -79,10 +79,10 @@ export default function SideCalendar({meetings}: Meetings) {
                 className="-my-1.5 -mr-1.5 ml-2 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
               >
                 <span className="sr-only">Next month</span>
-                <ChevronRightIcon className="w-5 h-5" aria-hidden="true" />
+                <ChevronRightIcon className="h-5 w-5" aria-hidden="true" />
               </button>
             </div>
-            <div className="grid grid-cols-7 mt-10 text-xs leading-6 text-center text-gray-500">
+            <div className="mt-10 grid grid-cols-7 text-center text-xs leading-6 text-gray-500">
               <div>S</div>
               <div>M</div>
               <div>T</div>
@@ -91,7 +91,7 @@ export default function SideCalendar({meetings}: Meetings) {
               <div>F</div>
               <div>S</div>
             </div>
-            <div className="grid grid-cols-7 mt-2 text-sm">
+            <div className="mt-2 grid grid-cols-7 text-sm">
               {days.map((day, dayIdx) => (
                 <div
                   key={day.toString()}
@@ -125,16 +125,19 @@ export default function SideCalendar({meetings}: Meetings) {
                       'mx-auto flex h-8 w-8 items-center justify-center rounded-full'
                     )}
                   >
-                    <time className = "text-white" dateTime={format(day, 'yyyy-MM-dd')}>
+                    <time
+                      className="text-white"
+                      dateTime={format(day, 'yyyy-MM-dd')}
+                    >
                       {format(day, 'd')}
                     </time>
                   </button>
 
-                  <div className="w-1 h-1 mx-auto mt-1">
+                  <div className="mx-auto mt-1 h-1 w-1">
                     {meetings?.some((meeting) =>
                       isSameDay(parseISO(meeting.start), day)
                     ) && (
-                      <div className="w-1 h-1 rounded-full bg-violet-700"></div>
+                      <div className="h-1 w-1 rounded-full bg-violet-700"></div>
                     )}
                   </div>
                 </div>
@@ -142,11 +145,8 @@ export default function SideCalendar({meetings}: Meetings) {
             </div>
           </div>
           <section className="divide-y divide-gray-400">
-            <h2 className="font-semibold text-blue-700 text-center">
-              {isSameDay(today, selectedDay)
-              ?'TODAY ' 
-              : ''
-              }
+            <h2 className="text-center font-semibold text-blue-700">
+              {isSameDay(today, selectedDay) ? 'TODAY ' : ''}
               <time dateTime={format(selectedDay, 'yyyy-MM-dd')}>
                 {format(selectedDay, 'dd/LL/yyyy')}
               </time>
@@ -154,7 +154,7 @@ export default function SideCalendar({meetings}: Meetings) {
             <ol className="text-sm leading-6 text-gray-500">
               {selectedDayMeetings?.length > 0 ? (
                 selectedDayMeetings?.map((meeting) => (
-                  <Meeting meeting={meeting} key={meeting.id}/>
+                  <Meeting meeting={meeting} key={meeting.id} />
                 ))
               ) : (
                 <p>No meetings for today.</p>
@@ -167,7 +167,6 @@ export default function SideCalendar({meetings}: Meetings) {
   )
 }
 
-
 const colStartClasses = [
   '',
   'col-start-2',
diff --git a/src/pages/calendar/index.tsx b/src/pages/calendar/index.tsx
index 80fe7e0f..d995dd8a 100644
--- a/src/pages/calendar/index.tsx
+++ b/src/pages/calendar/index.tsx
@@ -1,16 +1,8 @@
 import Head from 'next/head'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
-import FullCalendar from '@fullcalendar/react' // must go before plugins
-import dayGridPlugin from '@fullcalendar/daygrid'
-import interactionPlugin from '@fullcalendar/interaction'
-import timeGridPlugin from '@fullcalendar/timegrid'
-import styled from '@emotion/styled'
-import { useState } from 'react'
 import SideCalendar from '~/components/calendar/SideCalendar'
-
-// add styles as css
-export const StyleWrapper = styled.div``
+import MainCalendar from '~/components/calendar/MainCalendar'
 
 const meetings = [
   {
@@ -46,10 +38,6 @@ const meetings = [
 ]
 
 const CalendarPage: React.FC<BaseProps> = ({ session }) => {
-  const [events, useEvents] = useState([
-    { title: 'event 1', start: '2023-05-01T15:30', end: '2023-05-01T16:30' },
-    { title: 'event 2', start: '2023-05-02T06:00', end: '2023-05-02T07:00' },
-  ])
   return (
     <>
       <Head>
@@ -60,22 +48,7 @@ const CalendarPage: React.FC<BaseProps> = ({ session }) => {
       <TopNavbar isAdmin={session.isAdmin} />
       <div className="grid-container grid grid-cols-5">
         <SideCalendar meetings={meetings} />
-        <StyleWrapper className="col-span-4">
-          <FullCalendar
-            plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
-            initialView="dayGridMonth"
-            headerToolbar={{
-              start: 'prev,today,next',
-              center: 'dayGridMonth,timeGridWeek,timeGridDay',
-              end: 'title',
-            }}
-            allDaySlot={false}
-            events={events}
-            eventClick={(info) => {
-              alert('Event: ' + info.event.title)
-            }}
-          />
-        </StyleWrapper>
+        <MainCalendar />
       </div>
     </>
   )

From b4dc271fd2ab00bcef721b6e34938d3693f99155 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Thu, 25 May 2023 21:12:45 +0800
Subject: [PATCH 004/223] Remove the Announcement model

---
 prisma/schema.prisma                          | 33 ++++----------
 src/server/trpc/router/_app.ts                |  2 -
 .../trpc/router/admin/announcement/create.ts  | 43 -------------------
 .../trpc/router/admin/announcement/index.ts   |  8 ----
 .../trpc/router/admin/announcement/read.ts    | 21 ---------
 5 files changed, 9 insertions(+), 98 deletions(-)
 delete mode 100644 src/server/trpc/router/admin/announcement/create.ts
 delete mode 100644 src/server/trpc/router/admin/announcement/index.ts
 delete mode 100644 src/server/trpc/router/admin/announcement/read.ts

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 5f91e6d2..2d305286 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -21,37 +21,23 @@ model Projects {
 }
 
 model Departments {
-  department_id String          @id
+  department_id String     @id
   name          String
-  announcements Announcements[]
   projects      Projects[]
 }
 
-model Announcements {
-  announcement_id String       @id
-  content         String
-  image           String?
-  title           String
-  updated_date    DateTime
-  uploaded_date   DateTime
-  department_id   String?
-  userId          String
-  Departments     Departments? @relation(fields: [department_id], references: [department_id])
-  created_by      User         @relation(fields: [userId], references: [id])
-}
-
 model User {
-  attendance      Int?            @default(0)
+  attendance      Int?         @default(0)
   batch           String?
   department      String?
   diet            String?
   discord         String?
-  email           String          @unique
+  email           String       @unique
   faculty         String?
   gender          String?
   hashedPassword  String
   hobbies         String?
-  id              String          @id
+  id              String       @id
   image           String?
   level           String
   linkedin        String?
@@ -63,15 +49,14 @@ model User {
   roles           String?
   shirt           String?
   telegram        String?
-  total_events    Int?            @default(0)
+  total_events    Int?         @default(0)
   wallet          String?
   year            String?
   date_of_birth   DateTime?
-  isAdmin         Boolean?        @default(false)
-  announcements   Announcements[]
-  events          Event[]         @relation("EventToUser")
-  projects        Projects[]      @relation("ProjectsToUser")
-  Attendance      Attendance[]    @relation("attendanceToUser")
+  isAdmin         Boolean?     @default(false)
+  events          Event[]      @relation("EventToUser")
+  projects        Projects[]   @relation("ProjectsToUser")
+  Attendance      Attendance[] @relation("attendanceToUser")
   AttendanceTaken Attendance[]
 }
 
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index 35d6a63c..3bb29760 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -1,6 +1,5 @@
 import { router } from '../trpc'
 import { authRouter } from './auth'
-import { announcementRouter } from './admin/announcement'
 import { memberRouter } from './member'
 import { profileRouter } from './profile'
 import { userRouter } from './admin/users'
@@ -9,7 +8,6 @@ import { attendanceRouter } from './admin/attendance'
 
 export const appRouter = router({
   auth: authRouter,
-  announcement: announcementRouter,
   event: eventRouter,
   member: memberRouter,
   profile: profileRouter,
diff --git a/src/server/trpc/router/admin/announcement/create.ts b/src/server/trpc/router/admin/announcement/create.ts
deleted file mode 100644
index 27d7b11c..00000000
--- a/src/server/trpc/router/admin/announcement/create.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { protectedProcedure } from '~/server/trpc/trpc'
-import { TRPCError } from '@trpc/server'
-import { z } from 'zod'
-import { randomUUID } from 'crypto'
-import dayjs from 'dayjs'
-
-export default protectedProcedure
-  .input(
-    z.object({
-      content: z.string(),
-      title: z.string(),
-    })
-  )
-  .mutation(async ({ ctx, input }) => {
-    try {
-      const user = await ctx.prisma.user.findUnique({
-        where: { id: ctx.session.user.id },
-      })
-
-      if (!user || user.level !== 'super') {
-        throw new TRPCError({
-          code: 'UNAUTHORIZED',
-          message: 'You cannot create an event',
-        })
-      }
-
-      await ctx.prisma.announcements.create({
-        data: {
-          announcement_id: randomUUID(),
-          content: input.content,
-          title: input.title,
-          updated_date: dayjs().toDate(),
-          uploaded_date: dayjs().toDate(),
-          userId: ctx.session.user.id,
-        },
-      })
-    } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
diff --git a/src/server/trpc/router/admin/announcement/index.ts b/src/server/trpc/router/admin/announcement/index.ts
deleted file mode 100644
index 33c617e2..00000000
--- a/src/server/trpc/router/admin/announcement/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { router } from '~/server/trpc/trpc'
-import createAnnouncements from './create'
-import readAnnouncements from './read'
-
-export const announcementRouter = router({
-  createAnnouncements,
-  readAnnouncements,
-})
diff --git a/src/server/trpc/router/admin/announcement/read.ts b/src/server/trpc/router/admin/announcement/read.ts
deleted file mode 100644
index a57a1f96..00000000
--- a/src/server/trpc/router/admin/announcement/read.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { protectedProcedure } from '~/server/trpc/trpc'
-import { TRPCError } from '@trpc/server'
-
-export default protectedProcedure.query(async ({ ctx }) => {
-  try {
-    const announcements = await ctx.prisma.announcements.findMany({
-      include: {
-        created_by: {
-          select: { name: true },
-        },
-      },
-    })
-
-    return announcements
-  } catch (e) {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: (e as Error).message,
-    })
-  }
-})

From 98de923a3838985c68fe75c527faaafdb21897f1 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Thu, 25 May 2023 22:10:04 +0800
Subject: [PATCH 005/223] Update the user schema

---
 prisma/schema.prisma                         |  9 +--------
 src/components/attendance/DataTableModal.tsx |  9 ++-------
 src/components/events/DataTable.tsx          |  4 ++--
 src/components/profile/ProfileGrid.tsx       |  2 +-
 src/components/users/CreateMultipleUsers.tsx |  4 +---
 src/components/users/EditModal.tsx           |  2 +-
 src/components/users/ProfileModal.tsx        |  4 ++--
 src/components/users/SingleUserForm.tsx      | 12 ++++--------
 src/components/users/Table.tsx               |  4 ++--
 src/components/users/UserTable.tsx           |  2 +-
 src/server/trpc/router/admin/users/index.ts  |  4 ++--
 src/server/trpc/router/events/index.ts       |  4 ++--
 src/server/trpc/router/member/create.ts      | 10 ++++------
 src/server/trpc/router/member/helper.ts      | 14 ++++----------
 src/server/trpc/router/member/read.ts        |  8 ++++----
 src/server/trpc/router/member/update.ts      |  4 ++--
 src/types/admin.type.ts                      |  4 +---
 src/types/event/event.type.ts                |  2 +-
 18 files changed, 37 insertions(+), 65 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 2d305286..b50480b7 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -27,32 +27,25 @@ model Departments {
 }
 
 model User {
-  attendance      Int?         @default(0)
   batch           String?
   department      String?
-  diet            String?
   discord         String?
   email           String       @unique
   faculty         String?
   gender          String?
   hashedPassword  String
-  hobbies         String?
   id              String       @id
   image           String?
-  level           String
   linkedin        String?
   major           String?
   name            String?
   phone           String?
   personal_email  String?
-  race            String?
-  roles           String?
-  shirt           String?
+  role            String
   telegram        String?
   total_events    Int?         @default(0)
   wallet          String?
   year            String?
-  date_of_birth   DateTime?
   isAdmin         Boolean?     @default(false)
   events          Event[]      @relation("EventToUser")
   projects        Projects[]   @relation("ProjectsToUser")
diff --git a/src/components/attendance/DataTableModal.tsx b/src/components/attendance/DataTableModal.tsx
index 69c4d553..e0d0f805 100644
--- a/src/components/attendance/DataTableModal.tsx
+++ b/src/components/attendance/DataTableModal.tsx
@@ -63,12 +63,7 @@ const Body: React.FC<{ data: BodyProps | null | undefined }> = ({ data }) => {
     <>
       {data.qr_code && (
         <div className="flex flex-row items-center justify-center">
-          <Image
-            alt="event-qr"
-            height={200}
-            src={data.qr_code}
-            width={200}
-          />
+          <Image alt="event-qr" height={200} src={data.qr_code} width={200} />
         </div>
       )}
       <p>Department: </p>
@@ -91,7 +86,7 @@ const Body: React.FC<{ data: BodyProps | null | undefined }> = ({ data }) => {
                 <Td>{index + 1}</Td>
                 <Td>{attendee.name}</Td>
                 <Td>{attendee.department}</Td>
-                <Td>{attendee.roles}</Td>
+                <Td>{attendee.role}</Td>
                 <Td>{data.attended.has(attendee.id) ? 'Yes' : 'No'}</Td>
               </Tr>
             )
diff --git a/src/components/events/DataTable.tsx b/src/components/events/DataTable.tsx
index b66a0af4..29986aae 100644
--- a/src/components/events/DataTable.tsx
+++ b/src/components/events/DataTable.tsx
@@ -31,7 +31,7 @@ import React, { useEffect, useRef, useState, type HTMLProps } from 'react'
 
 export type Attendees = {
   department: string | null
-  roles: string | null
+  role: string | null
   name: string | null
   id: string
 }
@@ -94,7 +94,7 @@ export function DataTable({ data, setAttendees }: DataTableProps) {
       enableColumnFilter: true,
       filterFn: MultiSelectFilterFn,
     }),
-    columnHelper.accessor('roles', {
+    columnHelper.accessor('role', {
       cell: (info) => info.getValue(),
       header: 'Role',
       enableColumnFilter: true,
diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index 7b9ea71c..c32f2a17 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -30,7 +30,7 @@ const ProfileGrid = ({
           refetch={refetch}
           name={data.user.name}
           dept={data.user.department}
-          role={data.user.roles}
+          role={data.user.role}
           studentId={studentId}
           session={session}
         />
diff --git a/src/components/users/CreateMultipleUsers.tsx b/src/components/users/CreateMultipleUsers.tsx
index 5fa74b87..af2bad68 100644
--- a/src/components/users/CreateMultipleUsers.tsx
+++ b/src/components/users/CreateMultipleUsers.tsx
@@ -30,7 +30,6 @@ const CreateMultipleUsers = () => {
                 ],
               faculty: item['Faculty'] || '',
               gender: item['Gender '] || 'Male',
-              hobbies: item['Hobbies '] || '',
               linkedin:
                 item['LinkedIn profile LINK (eg. www.linkedin.com/in/XXX)'],
               major: item['Major and Specialization (if any)'] || '',
@@ -39,8 +38,7 @@ const CreateMultipleUsers = () => {
               personal_email: item['Gmail'],
               phone: item['Phone Number'],
               race: item['Race '] || '',
-              roles: item['Appointed Role '] || '',
-              shirt: item['Shirt size'] || '',
+              role: item['Appointed Role '] || '',
               student_id: item['Student ID (AXXXXXXXX)'] || '',
               telegram: item['Telegram Handle(@xxx)'] || '',
               year: item['Year of Study'] || '',
diff --git a/src/components/users/EditModal.tsx b/src/components/users/EditModal.tsx
index 4d6ce39c..f70cf516 100644
--- a/src/components/users/EditModal.tsx
+++ b/src/components/users/EditModal.tsx
@@ -38,7 +38,7 @@ const EditModal: React.FC<editModalProps> = (props) => {
         name: data.name,
         email: data.email,
         department: data.department,
-        roles: data.roles,
+        role: data.roles,
       }
       await mutateAsync(projData)
       toast({
diff --git a/src/components/users/ProfileModal.tsx b/src/components/users/ProfileModal.tsx
index 97cbd7e5..393d9616 100644
--- a/src/components/users/ProfileModal.tsx
+++ b/src/components/users/ProfileModal.tsx
@@ -252,7 +252,7 @@ const ProfileInfo = (props: ProfilePageType) => {
           <Tbody>
             <Tr>
               <Td>ROLE</Td>
-              <Td>{props.roles}</Td>
+              <Td>{props.role}</Td>
             </Tr>
             <Tr>
               <Td>GENDER</Td>
@@ -337,7 +337,7 @@ const PersonalInformationModal = ({
 
 type ProfilePageType = {
   name: string | null
-  roles: string | null
+  role: string | null
   gender: string | null
   batch: string | null
   year: string | null
diff --git a/src/components/users/SingleUserForm.tsx b/src/components/users/SingleUserForm.tsx
index 5aec9bdd..902b6669 100644
--- a/src/components/users/SingleUserForm.tsx
+++ b/src/components/users/SingleUserForm.tsx
@@ -12,20 +12,18 @@ import { useState, type FormEvent } from 'react'
 
 const SingleUserForm = () => {
   const router = useRouter()
-  const { mutateAsync } = trpc.member.createSingleUser.useMutation()
+  const { mutateAsync, isLoading } = trpc.member.createSingleUser.useMutation()
   const toast = useToast()
   const [email, setEmail] = useState('')
   const [password, setPassword] = useState('')
-  const [level, setLevel] = useState('')
+  const [role, setRole] = useState('')
   const [id, setId] = useState('')
-  const [isLoading, setIsLoading] = useState(false)
   const [isAdmin, setIsAdmin] = useState(false)
 
   const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
     try {
       e.preventDefault()
-      setIsLoading(true)
-      await mutateAsync({ email, password, level, id, isAdmin })
+      await mutateAsync({ email, password, id, isAdmin, role })
       toast({
         title: 'Successfully updated!',
         description: 'User successfully created',
@@ -33,9 +31,7 @@ const SingleUserForm = () => {
         isClosable: true,
         duration: 9000,
       })
-      setIsLoading(false)
     } catch (e) {
-      setIsLoading(false)
       toast({
         title: 'Oops, something went wrong!',
         description: 'An error went wrong while creating the user',
@@ -86,7 +82,7 @@ const SingleUserForm = () => {
       <Select
         marginBottom={5}
         isRequired
-        onChange={(e) => setLevel(e.target.value)}
+        onChange={(e) => setRole(e.target.value)}
         placeholder="Select the level"
       >
         <option value="member">Member</option>
diff --git a/src/components/users/Table.tsx b/src/components/users/Table.tsx
index ce4b6b93..708d9075 100644
--- a/src/components/users/Table.tsx
+++ b/src/components/users/Table.tsx
@@ -15,7 +15,7 @@ import EditModal from './EditModal'
 
 type User = {
   name: string | null
-  roles: string | null
+  role: string | null
   department: string | null
   email: string
   id: string
@@ -58,7 +58,7 @@ const useColumns = () => {
             footer: (props) => props.column.id,
           },
           {
-            accessorKey: 'roles',
+            accessorKey: 'role',
             cell: (info) => info.getValue(),
             header: 'Role',
             footer: (props) => props.column.id,
diff --git a/src/components/users/UserTable.tsx b/src/components/users/UserTable.tsx
index 68a123f7..73537260 100644
--- a/src/components/users/UserTable.tsx
+++ b/src/components/users/UserTable.tsx
@@ -37,7 +37,7 @@ const UserTable = ({ session }: { session: Session }) => {
         </Button>
       </td>
       <td>{data.name}</td>
-      <td>{data.roles}</td>
+      <td>{data.role}</td>
       <td>{data.department}</td>
     </tr>
   ))
diff --git a/src/server/trpc/router/admin/users/index.ts b/src/server/trpc/router/admin/users/index.ts
index f734287d..ffde7068 100644
--- a/src/server/trpc/router/admin/users/index.ts
+++ b/src/server/trpc/router/admin/users/index.ts
@@ -11,7 +11,7 @@ const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
         email: true,
         id: true,
         name: true,
-        roles: true,
+        role: true,
       },
     })
 
@@ -39,7 +39,7 @@ const getAllUsersForTable = protectedProcedure
           email: true,
           id: true,
           name: true,
-          roles: true,
+          role: true,
         },
         skip: input.pageIndex * input.pageSize,
         take: input.pageSize,
diff --git a/src/server/trpc/router/events/index.ts b/src/server/trpc/router/events/index.ts
index 37cca92a..23f3e874 100644
--- a/src/server/trpc/router/events/index.ts
+++ b/src/server/trpc/router/events/index.ts
@@ -58,7 +58,7 @@ const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
     return await ctx.prisma.user.findMany({
       select: {
         department: true,
-        roles: true,
+        role: true,
         name: true,
         id: true,
       },
@@ -80,7 +80,7 @@ const getEventInfo = protectedProcedure
           where: { id: input },
           select: {
             attendees: {
-              select: { name: true, department: true, roles: true, id: true },
+              select: { name: true, department: true, role: true, id: true },
             },
             _count: { select: { Attendance: true, attendees: true } },
             endDate: true,
diff --git a/src/server/trpc/router/member/create.ts b/src/server/trpc/router/member/create.ts
index cbafa268..08f24f05 100644
--- a/src/server/trpc/router/member/create.ts
+++ b/src/server/trpc/router/member/create.ts
@@ -28,7 +28,6 @@ export const addMultipleUsers = protectedProcedure
         discord: z.string(),
         faculty: z.string(),
         gender: z.string(),
-        hobbies: z.string(),
         linkedin: z.string(),
         major: z.string(),
         name: z.string(),
@@ -36,8 +35,7 @@ export const addMultipleUsers = protectedProcedure
         personal_email: z.string(),
         phone: z.string(),
         race: z.string(),
-        roles: z.string(),
-        shirt: z.string(),
+        role: z.string(),
         student_id: z.string(),
         telegram: z.string(),
         year: z.string(),
@@ -68,18 +66,18 @@ export const createSingleUser = protectedProcedure
     z.object({
       id: z.string(),
       email: z.string(),
+      role: z.string(),
       password: z.optional(z.string()),
-      level: z.string(),
       isAdmin: z.boolean(),
     })
   )
   .mutation(async ({ ctx, input }) => {
     try {
-      const { email, id, level, isAdmin } = input
+      const { email, id, isAdmin, role } = input
       const password = input.password || randomBytes(10).toString('hex')
 
       await checkIfUserExist(email, ctx.prisma)
-      await createNewUser(email, id, isAdmin, level, password, ctx.prisma)
+      await createNewUser(email, id, isAdmin, role, password, ctx.prisma)
       await sendEmail(email, password)
     } catch (e) {
       await ctx.prisma.log.create({
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index 94c8165c..1b970fcb 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -55,7 +55,7 @@ async function createNewUser(
   email: string,
   id: string,
   isAdmin: boolean,
-  level: string,
+  role: string,
   password: string,
   prisma: PrismaClient
 ) {
@@ -65,12 +65,11 @@ async function createNewUser(
     data: {
       batch: 'AY2022/2023',
       name: '',
-      roles: '',
+      role,
       email,
       id,
       hashedPassword,
       isAdmin,
-      level,
     },
   })
 }
@@ -126,7 +125,6 @@ function buildUserObject(
     discord: string
     faculty: string
     gender: string
-    hobbies: string
     linkedin: string
     major: string
     name: string
@@ -134,8 +132,7 @@ function buildUserObject(
     personal_email: string
     phone: string
     race: string
-    roles: string
-    shirt: string
+    role: string
     student_id: string
     telegram: string
     year: string
@@ -144,7 +141,6 @@ function buildUserObject(
 ) {
   return input.map((user) => {
     return {
-      attendance: 0,
       batch: 'AY22/23',
       department: user.department,
       date_of_birth: dayjs().toDate(),
@@ -153,7 +149,6 @@ function buildUserObject(
       faculty: user.faculty,
       gender: user.gender,
       hashedPassword,
-      hobbies: user.hobbies,
       image: null,
       level: 'member',
       linkedin: user.linkedin,
@@ -165,8 +160,7 @@ function buildUserObject(
       personal_email: user.personal_email,
       phone: user.phone,
       race: user.race,
-      roles: user.roles,
-      shirt: user.shirt,
+      role: user.role,
       telegram: user.telegram,
       total_events: 0,
       wallet: null,
diff --git a/src/server/trpc/router/member/read.ts b/src/server/trpc/router/member/read.ts
index 47af1179..70e0fa23 100644
--- a/src/server/trpc/router/member/read.ts
+++ b/src/server/trpc/router/member/read.ts
@@ -22,7 +22,7 @@ export const getMemberProfile = protectedProcedure
           email: true,
           personal_email: true,
           department: true,
-          roles: true,
+          role: true,
           major: true,
           projects: true,
         },
@@ -69,8 +69,8 @@ export const getRoles = protectedProcedure.query(async ({ ctx }) => {
   try {
     return await ctx.prisma.user.findMany({
       where: {},
-      distinct: ['roles'],
-      select: { roles: true },
+      distinct: ['role'],
+      select: { role: true },
     })
   } catch (error) {
     throw new TRPCError({
@@ -90,7 +90,7 @@ export const getAllUsers = protectedProcedure
     try {
       return await ctx.prisma.user.findMany({
         where: {
-          roles: input.roles,
+          role: input.roles,
         },
         select: {
           name: true,
diff --git a/src/server/trpc/router/member/update.ts b/src/server/trpc/router/member/update.ts
index 784fa597..80219db1 100644
--- a/src/server/trpc/router/member/update.ts
+++ b/src/server/trpc/router/member/update.ts
@@ -26,7 +26,7 @@ export const updateProfile = protectedProcedure
     z.object({
       id: z.string(),
       name: z.string(),
-      roles: z.string(),
+      role: z.string(),
       department: z.string(),
     })
   )
@@ -36,7 +36,7 @@ export const updateProfile = protectedProcedure
       data: {
         department: input.department,
         name: input.name,
-        roles: input.roles,
+        role: input.role,
       },
     })
   })
diff --git a/src/types/admin.type.ts b/src/types/admin.type.ts
index d742b224..ea95925f 100644
--- a/src/types/admin.type.ts
+++ b/src/types/admin.type.ts
@@ -5,7 +5,6 @@ export type AddUsersType = {
   diet: string
   faculty: string
   gender: string
-  hobbies: string
   linkedin: string
   major: string
   name: string
@@ -13,8 +12,7 @@ export type AddUsersType = {
   personal_email: string
   phone: string
   race: string
-  roles: string
-  shirt: string
+  role: string
   student_id: string
   telegram: string
   year: string
diff --git a/src/types/event/event.type.ts b/src/types/event/event.type.ts
index 54ea7ae9..67c421a8 100644
--- a/src/types/event/event.type.ts
+++ b/src/types/event/event.type.ts
@@ -22,7 +22,7 @@ export interface BodyProps {
     name: string | null
     department: string | null
     id: string
-    roles: string | null
+    role: string | null
   }[]
   endDate: Date
   hasStarted: boolean

From e4cc9c614b8dc8d68671a13632d191f3659b58e4 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Thu, 25 May 2023 22:17:41 +0800
Subject: [PATCH 006/223] Update the user schema

---
 prisma/schema.prisma | 2 --
 1 file changed, 2 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index b50480b7..284da80d 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -36,10 +36,8 @@ model User {
   hashedPassword  String
   id              String       @id
   image           String?
-  linkedin        String?
   major           String?
   name            String?
-  phone           String?
   personal_email  String?
   role            String
   telegram        String?

From bc70e3e387fe2ae4ef71d6b71fde841803eea1e0 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 14 May 2023 16:07:13 +0800
Subject: [PATCH 007/223] base layout with responsive searchbar

---
 src/components/common/SearchBar.tsx  | 35 ++++++++++++++++++++++++++++
 src/pages/recruitment/applicants.tsx | 28 ++++++++++++++++++++++
 src/pages/recruitment/index.tsx      | 23 ++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 src/components/common/SearchBar.tsx
 create mode 100644 src/pages/recruitment/applicants.tsx
 create mode 100644 src/pages/recruitment/index.tsx

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
new file mode 100644
index 00000000..1912020f
--- /dev/null
+++ b/src/components/common/SearchBar.tsx
@@ -0,0 +1,35 @@
+import React, { useState } from 'react'
+import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
+import { SearchIcon } from '@chakra-ui/icons'
+
+const SearchBar = () => {
+  const [searchQuery, setSearchQuery] = useState('')
+  return (
+    <InputGroup
+      minWidth={'150px'}
+      maxWidth={'300px'}
+      position="absolute"
+      top={{ lg: '0' }}
+      right={{ lg: '12', base: '0' }}
+      left={{ lg: 'unset', base: '0' }}
+      marginTop={{ lg: 'unset', base: '5' }}
+      marginLeft={{ base: 'auto' }}
+      marginRight={{ base: 'auto' }}
+    >
+      <InputLeftElement>
+        <SearchIcon />
+      </InputLeftElement>
+      <Input
+        placeholder="Search"
+        value={searchQuery}
+        onChange={(e) => setSearchQuery(e.target.value)}
+        borderWidth="3px"
+        border="3px solid #004586"
+        borderColor="#004586"
+        borderRadius="20px"
+      ></Input>
+    </InputGroup>
+  )
+}
+
+export default SearchBar
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
new file mode 100644
index 00000000..66dbf9a9
--- /dev/null
+++ b/src/pages/recruitment/applicants.tsx
@@ -0,0 +1,28 @@
+import { Text } from '@chakra-ui/react'
+import Head from 'next/head'
+import Layout from '~/components/common/Layout'
+import TopNavbar from '~/components/common/TopNavbar'
+import SearchBar from '~/components/common/SearchBar'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
+
+const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
+  return (
+    <>
+      <Head>
+        <title>Atlas | Applicants </title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta
+          name="description"
+          content="The applicants page for Atlas recruitment"
+        />
+      </Head>
+      <TopNavbar isAdmin={session.isAdmin} />
+      <Layout>
+        <Text className="text-center text-4xl font-bold">Applicants</Text>
+        <SearchBar />
+      </Layout>
+    </>
+  )
+}
+
+export default withAuth(ApplicantsPage, true)
diff --git a/src/pages/recruitment/index.tsx b/src/pages/recruitment/index.tsx
new file mode 100644
index 00000000..5567a9cc
--- /dev/null
+++ b/src/pages/recruitment/index.tsx
@@ -0,0 +1,23 @@
+import Layout from '~/components/common/Layout'
+import Head from 'next/head'
+import TopNavbar from '~/components/common/TopNavbar'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
+import { Text } from '@chakra-ui/react'
+
+const RecruitmentPage: React.FC<BaseProps> = ({ session }) => {
+  return (
+    <>
+      <Head>
+        <title>Atlas | Recruitment</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta name="description" content="The recruitment page for Atlas" />
+      </Head>
+      <TopNavbar isAdmin={session.isAdmin} />
+      <Layout>
+        <Text className="text-center text-4xl font-bold">Recruitment</Text>
+      </Layout>
+    </>
+  )
+}
+
+export default withAuth(RecruitmentPage, true)

From 78838ff33eee12d0443e85bcd3aec55828e88fa1 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Wed, 17 May 2023 22:39:32 +0800
Subject: [PATCH 008/223] create applicants directors page base components

---
 public/images/applicantcard_bg.svg            |  7 ++
 src/components/recruitment/ApplicantCard.tsx  | 71 ++++++++++++++++
 src/components/recruitment/ApplicantGrid.tsx  | 16 ++++
 src/components/recruitment/DocumentModal.tsx  | 51 ++++++++++++
 .../recruitment/DocumentModalAddButton.tsx    | 21 +++++
 .../recruitment/DocumentModalCard.tsx         | 18 +++++
 src/components/recruitment/EditModal.tsx      | 80 +++++++++++++++++++
 src/components/recruitment/InfoPopup.tsx      | 80 +++++++++++++++++++
 src/components/recruitment/NoteModal.tsx      | 41 ++++++++++
 src/pages/recruitment/applicants.tsx          |  4 +
 10 files changed, 389 insertions(+)
 create mode 100644 public/images/applicantcard_bg.svg
 create mode 100644 src/components/recruitment/ApplicantCard.tsx
 create mode 100644 src/components/recruitment/ApplicantGrid.tsx
 create mode 100644 src/components/recruitment/DocumentModal.tsx
 create mode 100644 src/components/recruitment/DocumentModalAddButton.tsx
 create mode 100644 src/components/recruitment/DocumentModalCard.tsx
 create mode 100644 src/components/recruitment/EditModal.tsx
 create mode 100644 src/components/recruitment/InfoPopup.tsx
 create mode 100644 src/components/recruitment/NoteModal.tsx

diff --git a/public/images/applicantcard_bg.svg b/public/images/applicantcard_bg.svg
new file mode 100644
index 00000000..db3821ed
--- /dev/null
+++ b/public/images/applicantcard_bg.svg
@@ -0,0 +1,7 @@
+<svg width="228" height="75" viewBox="0 0 228 75" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 7.625L3.47067 7.875C6.916 8.125 13.8573 8.625 20.7733 9.25C27.6893 9.875 34.6307 10.625 41.496 10.25C48.3867 9.875 55.2267 8.375 62.1173 8C68.9827 7.625 75.924 8.375 82.84 9.875C89.756 11.375 96.6973 13.625 103.613 13.625C110.529 13.625 117.471 11.375 124.387 11.25C131.303 11.125 138.244 13.125 145.16 13.875C152.076 14.625 159.017 14.125 165.883 12.875C172.773 11.625 179.613 9.625 186.504 8.75C193.369 7.875 200.311 8.125 207.227 9.75C214.143 11.375 221.084 14.375 224.529 15.875L228 17.375V0H224.529C221.084 0 214.143 0 207.227 0C200.311 0 193.369 0 186.504 0C179.613 0 172.773 0 165.883 0C159.017 0 152.076 0 145.16 0C138.244 0 131.303 0 124.387 0C117.471 0 110.529 0 103.613 0C96.6973 0 89.756 0 82.84 0C75.924 0 68.9827 0 62.1173 0C55.2267 0 48.3867 0 41.496 0C34.6307 0 27.6893 0 20.7733 0C13.8573 0 6.916 0 3.47067 0H0V7.625Z" fill="#69C4F1"/>
+<path d="M0 21.875L3.47067 23C6.916 24.125 13.8573 26.375 20.7733 28.25C27.6893 30.125 34.6307 31.625 41.496 29.375C48.3867 27.125 55.2267 21.125 62.1173 20.125C68.9827 19.125 75.924 23.125 82.84 26.25C89.756 29.375 96.6973 31.625 103.613 32.375C110.529 33.125 117.471 32.375 124.387 30.5C131.303 28.625 138.244 25.625 145.16 26.25C152.076 26.875 159.017 31.125 165.883 31C172.773 30.875 179.613 26.375 186.504 24C193.369 21.625 200.311 21.375 207.227 22.25C214.143 23.125 221.084 25.125 224.529 26.125L228 27.125V17.125L224.529 15.625C221.084 14.125 214.143 11.125 207.227 9.5C200.311 7.875 193.369 7.625 186.504 8.5C179.613 9.375 172.773 11.375 165.883 12.625C159.017 13.875 152.076 14.375 145.16 13.625C138.244 12.875 131.303 10.875 124.387 11C117.471 11.125 110.529 13.375 103.613 13.375C96.6973 13.375 89.756 11.125 82.84 9.625C75.924 8.125 68.9827 7.375 62.1173 7.75C55.2267 8.125 48.3867 9.625 41.496 10C34.6307 10.375 27.6893 9.625 20.7733 9C13.8573 8.375 6.916 7.875 3.47067 7.625L0 7.375V21.875Z" fill="#39B4EE"/>
+<path d="M0 44.375L3.47067 46.875C6.916 49.375 13.8573 54.375 20.7733 57C27.6893 59.625 34.6307 59.875 41.496 57.125C48.3867 54.375 55.2267 48.625 62.1173 46.875C68.9827 45.125 75.924 47.375 82.84 48.25C89.756 49.125 96.6973 48.625 103.613 48.25C110.529 47.875 117.471 47.625 124.387 48.25C131.303 48.875 138.244 50.375 145.16 51.875C152.076 53.375 159.017 54.875 165.883 55C172.773 55.125 179.613 53.875 186.504 51.25C193.369 48.625 200.311 44.625 207.227 46.125C214.143 47.625 221.084 54.625 224.529 58.125L228 61.625V26.875L224.529 25.875C221.084 24.875 214.143 22.875 207.227 22C200.311 21.125 193.369 21.375 186.504 23.75C179.613 26.125 172.773 30.625 165.883 30.75C159.017 30.875 152.076 26.625 145.16 26C138.244 25.375 131.303 28.375 124.387 30.25C117.471 32.125 110.529 32.875 103.613 32.125C96.6973 31.375 89.756 29.125 82.84 26C75.924 22.875 68.9827 18.875 62.1173 19.875C55.2267 20.875 48.3867 26.875 41.496 29.125C34.6307 31.375 27.6893 29.875 20.7733 28C13.8573 26.125 6.916 23.875 3.47067 22.75L0 21.625V44.375Z" fill="#009CD6"/>
+<path d="M0 75.125H3.47067C6.916 75.125 13.8573 75.125 20.7733 75.125C27.6893 75.125 34.6307 75.125 41.496 75.125C48.3867 75.125 55.2267 75.125 62.1173 75.125C68.9827 75.125 75.924 75.125 82.84 75.125C89.756 75.125 96.6973 75.125 103.613 75.125C110.529 75.125 117.471 75.125 124.387 75.125C131.303 75.125 138.244 75.125 145.16 75.125C152.076 75.125 159.017 75.125 165.883 75.125C172.773 75.125 179.613 75.125 186.504 75.125C193.369 75.125 200.311 75.125 207.227 75.125C214.143 75.125 221.084 75.125 224.529 75.125H228V61.375L224.529 57.875C221.084 54.375 214.143 47.375 207.227 45.875C200.311 44.375 193.369 48.375 186.504 51C179.613 53.625 172.773 54.875 165.883 54.75C159.017 54.625 152.076 53.125 145.16 51.625C138.244 50.125 131.303 48.625 124.387 48C117.471 47.375 110.529 47.625 103.613 48C96.6973 48.375 89.756 48.875 82.84 48C75.924 47.125 68.9827 44.875 62.1173 46.625C55.2267 48.375 48.3867 54.125 41.496 56.875C34.6307 59.625 27.6893 59.375 20.7733 56.75C13.8573 54.125 6.916 49.125 3.47067 46.625L0 44.125V75.125Z" fill="#007EAC"/>
+</svg>
+
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
new file mode 100644
index 00000000..5bfd27db
--- /dev/null
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -0,0 +1,71 @@
+import {
+  Box,
+  Card,
+  CardBody,
+  CardHeader,
+  Heading,
+  Image,
+  ListIcon,
+  ListItem,
+  Stack,
+  Text,
+  UnorderedList,
+} from '@chakra-ui/react'
+import { Avatar } from 'flowbite-react'
+import { BsCircleFill } from 'react-icons/bs'
+import DocumentModal from './DocumentModal'
+import EditModal from './EditModal'
+import NoteModal from './NoteModal'
+
+const ApplicantCard = () => {
+  return (
+    <Card
+      maxWidth="sm"
+      borderRadius="20"
+      boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
+    >
+      <CardHeader paddingBottom="0" zIndex={1}>
+        <Heading size="md" textAlign="center" textColor="white">
+          Name
+        </Heading>
+      </CardHeader>
+      <Image
+        src="/images/applicantcard_bg.svg"
+        alt="blue wave background"
+        borderTopLeftRadius="20"
+        borderTopRightRadius="20"
+        boxSize="300px"
+        position="absolute"
+        height="85px"
+      />
+      <CardBody className="relative">
+        <Stack rowGap="3">
+          <Avatar alt="User-settings" rounded={true} />
+          <Box className="absolute top-8 left-0 flex w-full justify-between">
+            <Box>
+              <NoteModal />
+              <DocumentModal />
+            </Box>
+            <EditModal />
+          </Box>
+          <UnorderedList styleType="none" spacing="2">
+            <ListItem className="flex items-center justify-between">
+              <Text>1. SD - Software Engineer</Text>
+              <ListIcon as={BsCircleFill} marginLeft="2" fill="#46FFDE" />
+            </ListItem>
+            <ListItem className="flex items-center justify-between">
+              <Text>2. ML - Role</Text>
+              <ListIcon as={BsCircleFill} marginLeft="2" fill="#FFBD3C" />
+            </ListItem>
+            <ListItem className="flex items-center justify-between">
+              <Text>3. IA - Director</Text>
+              <ListIcon as={BsCircleFill} marginLeft="2" fill="#0038FF" />
+            </ListItem>
+          </UnorderedList>
+        </Stack>
+      </CardBody>
+    </Card>
+  )
+}
+
+export default ApplicantCard
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
new file mode 100644
index 00000000..8306165a
--- /dev/null
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -0,0 +1,16 @@
+import ApplicantCard from './ApplicantCard'
+
+const ApplicantGrid = (data: any) => {
+  return (
+    <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
+      <ApplicantCard />
+      <ApplicantCard />
+      <ApplicantCard />
+      <ApplicantCard />
+      <ApplicantCard />
+      <ApplicantCard />
+    </div>
+  )
+}
+
+export default ApplicantGrid
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
new file mode 100644
index 00000000..4c9477c3
--- /dev/null
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -0,0 +1,51 @@
+import {
+  IconButton,
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalHeader,
+  ModalOverlay,
+  useDisclosure,
+} from '@chakra-ui/react'
+import { BsFolder2Open } from 'react-icons/bs'
+import DocumentModalAddButton from './DocumentModalAddButton'
+import DocumentModalCard from './DocumentModalCard'
+
+const DocumentModal = () => {
+  const { isOpen, onOpen, onClose } = useDisclosure()
+  return (
+    <>
+      <IconButton
+        aria-label="Upload documents"
+        icon={<BsFolder2Open />}
+        bg="None"
+        _hover={{ background: 'None' }}
+        onClick={onOpen}
+      />
+      <Modal isOpen={isOpen} onClose={onClose} isCentered>
+        <ModalOverlay />
+        <ModalContent
+          pb={4}
+          backgroundColor="#F1F3FF"
+          borderRadius="20px"
+          boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
+        >
+          <ModalHeader textAlign="center" fontSize="2xl">
+            [Username] Documents
+          </ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>
+            <div className="my-5 mx-10 grid grid-cols-1 place-items-center gap-y-10 lg:grid-cols-2 ">
+              <DocumentModalCard />
+              <DocumentModalCard />
+              <DocumentModalAddButton />
+            </div>
+          </ModalBody>
+        </ModalContent>
+      </Modal>
+    </>
+  )
+}
+
+export default DocumentModal
diff --git a/src/components/recruitment/DocumentModalAddButton.tsx b/src/components/recruitment/DocumentModalAddButton.tsx
new file mode 100644
index 00000000..b6a543ee
--- /dev/null
+++ b/src/components/recruitment/DocumentModalAddButton.tsx
@@ -0,0 +1,21 @@
+import { AddIcon } from '@chakra-ui/icons'
+import { IconButton } from '@chakra-ui/react'
+
+const DocumentModalAddButton = () => {
+  return (
+    <IconButton
+      aria-label="Info popup for applicant detail"
+      icon={<AddIcon />}
+      borderRadius="30px"
+      boxShadow="0px 8px 4px 2px rgba(0, 0, 0, 0.15)"
+      bg="white"
+      _hover={{ background: '#e4e8ff' }}
+      fontSize="40px"
+      p="12"
+      width="120px"
+      height="120px"
+    />
+  )
+}
+
+export default DocumentModalAddButton
diff --git a/src/components/recruitment/DocumentModalCard.tsx b/src/components/recruitment/DocumentModalCard.tsx
new file mode 100644
index 00000000..2fe98acd
--- /dev/null
+++ b/src/components/recruitment/DocumentModalCard.tsx
@@ -0,0 +1,18 @@
+import { Card, CardBody, Text } from '@chakra-ui/react'
+
+const DocumentModalCard = () => {
+  return (
+    <Card
+      borderRadius="30px"
+      boxShadow="0px 8px 4px 2px rgba(0, 0, 0, 0.15)"
+      width="120px"
+      height="120px"
+    >
+      <CardBody>
+        <Text textAlign="center">Transcript</Text>
+      </CardBody>
+    </Card>
+  )
+}
+
+export default DocumentModalCard
diff --git a/src/components/recruitment/EditModal.tsx b/src/components/recruitment/EditModal.tsx
new file mode 100644
index 00000000..299d1fba
--- /dev/null
+++ b/src/components/recruitment/EditModal.tsx
@@ -0,0 +1,80 @@
+import {
+  Button,
+  FormControl,
+  FormLabel,
+  Grid,
+  GridItem,
+  IconButton,
+  Input,
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+  Stack,
+  Text,
+  Textarea,
+  useDisclosure,
+} from '@chakra-ui/react'
+import { Avatar } from 'flowbite-react'
+import { BsPencilSquare } from 'react-icons/bs'
+
+const EditModal = () => {
+  const { isOpen, onOpen, onClose } = useDisclosure()
+  return (
+    <>
+      <IconButton
+        aria-label="Edit details"
+        icon={<BsPencilSquare />}
+        bg="None"
+        _hover={{ background: 'None' }}
+        onClick={onOpen}
+      />
+      <Modal isOpen={isOpen} onClose={onClose} isCentered>
+        <ModalOverlay />
+        <ModalContent
+          pb={4}
+          backgroundColor="#F1F3FF"
+          borderRadius="20px"
+          boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
+        >
+          <ModalHeader textAlign="center">Edit NAME</ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>
+            <Grid templateColumns="repeat(3, 1fr)" gap="6">
+              <GridItem colSpan={2}>
+                <Stack>
+                  <FormControl>
+                    <FormLabel>Application Status</FormLabel>
+                    <Input placeholder="Application Status" />
+                  </FormControl>
+
+                  <FormControl mt={4}>
+                    <FormLabel>Department</FormLabel>
+                    <Input placeholder="Department" />
+                  </FormControl>
+
+                  <FormControl mt={4}>
+                    <FormLabel>Interview Notes</FormLabel>
+                    <Textarea placeholder="Interview Notes" />
+                  </FormControl>
+                </Stack>
+              </GridItem>
+              <GridItem>
+                <Avatar alt="User-settings" rounded={true} size="lg" />
+                <Text textAlign="center">Some long name we try</Text>
+              </GridItem>
+            </Grid>
+          </ModalBody>
+          <ModalFooter>
+            <Button bg="#97AEFF">Save</Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+    </>
+  )
+}
+
+export default EditModal
diff --git a/src/components/recruitment/InfoPopup.tsx b/src/components/recruitment/InfoPopup.tsx
new file mode 100644
index 00000000..b9d3e926
--- /dev/null
+++ b/src/components/recruitment/InfoPopup.tsx
@@ -0,0 +1,80 @@
+import { QuestionIcon } from '@chakra-ui/icons'
+import {
+  Box,
+  Icon,
+  IconButton,
+  ListItem,
+  Popover,
+  PopoverBody,
+  PopoverCloseButton,
+  PopoverContent,
+  PopoverTrigger,
+  Text,
+  UnorderedList,
+} from '@chakra-ui/react'
+import { BsCircleFill } from 'react-icons/bs'
+
+const InfoPopup = () => {
+  return (
+    <Box className="bottom-25 absolute right-20">
+      <Popover placement="left">
+        <PopoverTrigger>
+          <IconButton
+            aria-label="Info popup for applicant detail"
+            icon={<QuestionIcon />}
+            borderRadius="full"
+            bg="None"
+            _hover={{ background: 'None' }}
+            fontSize="50px"
+            stroke="#02005A"
+          />
+        </PopoverTrigger>
+        <PopoverContent>
+          <PopoverCloseButton />
+          <PopoverBody>
+            <UnorderedList styleType="none" spacing="2">
+              <ListItem className="flex items-center">
+                <Icon
+                  as={BsCircleFill}
+                  marginLeft="2"
+                  marginRight="2"
+                  fill="#46FFDE"
+                />
+                <Text>Accepted</Text>
+              </ListItem>
+              <ListItem className="flex items-center">
+                <Icon
+                  as={BsCircleFill}
+                  marginLeft="2"
+                  marginRight="2"
+                  fill="#0038FF"
+                />
+                <Text>Offered</Text>
+              </ListItem>
+              <ListItem className="flex items-center">
+                <Icon
+                  as={BsCircleFill}
+                  marginLeft="2"
+                  marginRight="2"
+                  fill="#FFBD3C"
+                />
+                <Text>Pending Review</Text>
+              </ListItem>
+              <ListItem className="flex items-center">
+                <Icon
+                  as={BsCircleFill}
+                  marginLeft="2"
+                  marginRight="2"
+                  fill="#FF0099"
+                />
+                <Text>Interviewed</Text>
+              </ListItem>
+            </UnorderedList>
+          </PopoverBody>
+        </PopoverContent>
+      </Popover>
+    </Box>
+  )
+}
+
+export default InfoPopup
diff --git a/src/components/recruitment/NoteModal.tsx b/src/components/recruitment/NoteModal.tsx
new file mode 100644
index 00000000..0cc89803
--- /dev/null
+++ b/src/components/recruitment/NoteModal.tsx
@@ -0,0 +1,41 @@
+import {
+  IconButton,
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalHeader,
+  ModalOverlay,
+  useDisclosure,
+} from '@chakra-ui/react'
+import { BsFileEarmark } from 'react-icons/bs'
+
+const NoteModal = () => {
+  const { isOpen, onOpen, onClose } = useDisclosure()
+  return (
+    <>
+      <IconButton
+        aria-label="Interview notes"
+        icon={<BsFileEarmark />}
+        bg="None"
+        _hover={{ background: 'None' }}
+        onClick={onOpen}
+      />
+      <Modal isOpen={isOpen} onClose={onClose} isCentered>
+        <ModalOverlay />
+        <ModalContent
+          pb={4}
+          backgroundColor="#F1F3FF"
+          borderRadius="20px"
+          boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
+        >
+          <ModalHeader textAlign="center">Interview Notes</ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>Notes on notes on notes</ModalBody>
+        </ModalContent>
+      </Modal>
+    </>
+  )
+}
+
+export default NoteModal
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 66dbf9a9..115a534e 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -4,6 +4,8 @@ import Layout from '~/components/common/Layout'
 import TopNavbar from '~/components/common/TopNavbar'
 import SearchBar from '~/components/common/SearchBar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
+import ApplicantGrid from '~/components/recruitment/ApplicantGrid'
+import InfoPopup from '~/components/recruitment/InfoPopup'
 
 const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
   return (
@@ -20,6 +22,8 @@ const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
       <Layout>
         <Text className="text-center text-4xl font-bold">Applicants</Text>
         <SearchBar />
+        <ApplicantGrid />
+        <InfoPopup />
       </Layout>
     </>
   )

From fd3e3b81c6d4783404548f532409afc3f5532a38 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 21 May 2023 21:03:10 +0800
Subject: [PATCH 009/223] schema updates

---
 prisma/schema.prisma                          | 69 +++++++++++++------
 src/components/profile/ProfileInfo.tsx        |  6 +-
 .../trpc/router/admin/announcement/create.ts  |  2 +-
 .../trpc/router/admin/announcement/read.ts    |  2 +-
 src/server/trpc/router/member/create.ts       |  1 +
 src/server/trpc/router/member/helper.ts       |  2 +
 6 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 5f91e6d2..a45018f6 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -7,28 +7,29 @@ datasource db {
   url      = env("DATABASE_URL")
 }
 
-model Projects {
+model Project {
   description  String
   difficulty   Int
   rating       Int
-  departments  String?
-  project_id   Int          @id
+  department   String?
+  project_id   Int         @id
   name         String
   team_lead    String
   created_date DateTime
-  Departments  Departments? @relation(fields: [departments], references: [department_id])
-  User         User[]       @relation("ProjectsToUser")
+  Department   Department? @relation(fields: [department], references: [department_id])
+  User         User[]      @relation("ProjectToUser")
 }
 
-model Departments {
-  department_id String          @id
+model Department {
+  department_id String         @id
   name          String
-  announcements Announcements[]
-  projects      Projects[]
+  announcements Announcement[]
+  projects      Project[]
+  AppliedRole   AppliedRole[]  @relation("appliedDepartment")
 }
 
-model Announcements {
-  announcement_id String       @id
+model Announcement {
+  announcement_id String      @id
   content         String
   image           String?
   title           String
@@ -36,22 +37,22 @@ model Announcements {
   uploaded_date   DateTime
   department_id   String?
   userId          String
-  Departments     Departments? @relation(fields: [department_id], references: [department_id])
-  created_by      User         @relation(fields: [userId], references: [id])
+  Department      Department? @relation(fields: [department_id], references: [department_id])
+  created_by      User        @relation(fields: [userId], references: [id])
 }
 
 model User {
-  attendance      Int?            @default(0)
+  attendance      Int?           @default(0)
   batch           String?
   department      String?
   diet            String?
   discord         String?
-  email           String          @unique
+  email           String         @unique
   faculty         String?
   gender          String?
   hashedPassword  String
   hobbies         String?
-  id              String          @id
+  id              String         @id
   image           String?
   level           String
   linkedin        String?
@@ -63,16 +64,19 @@ model User {
   roles           String?
   shirt           String?
   telegram        String?
-  total_events    Int?            @default(0)
+  total_events    Int?           @default(0)
   wallet          String?
   year            String?
   date_of_birth   DateTime?
-  isAdmin         Boolean?        @default(false)
-  announcements   Announcements[]
-  events          Event[]         @relation("EventToUser")
-  projects        Projects[]      @relation("ProjectsToUser")
-  Attendance      Attendance[]    @relation("attendanceToUser")
+  isAdmin         Boolean?       @default(false)
+  interviewNotes  String?
+  appliedRoles    AppliedRole[]  @relation("applicant")
+  announcements   Announcement[]
+  events          Event[]        @relation("EventToUser")
+  projects        Project[]      @relation("ProjectToUser")
+  Attendance      Attendance[]   @relation("attendanceToUser")
   AttendanceTaken Attendance[]
+  AppliedRole     AppliedRole[]
 }
 
 model Event {
@@ -107,3 +111,24 @@ enum LogType {
   WARNING
   ERROR
 }
+
+model AppliedRole {
+  id             String            @id
+  rank           Int
+  department     Department        @relation("appliedDepartment", fields: [departmentId], references: [department_id])
+  departmentId   String
+  role           String
+  status         ApplicationStatus
+  applicant      User              @relation("applicant", fields: [applicantEmail], references: [email])
+  applicantEmail String
+  User           User?             @relation(fields: [userId], references: [id])
+  userId         String?
+}
+
+enum ApplicationStatus {
+  ACCEPTED
+  OFFERED
+  PENDINGREVIEW
+  INTERVIEWED
+  REJECTED
+}
diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index ad896f75..ef1909b3 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -1,5 +1,5 @@
 import { Box, Table, TableContainer, Tbody, Td, Tr } from '@chakra-ui/react'
-import type { Projects } from '@prisma/client'
+import type { Project } from '@prisma/client'
 
 type ProfilePageType = {
   gender: string | null
@@ -7,7 +7,7 @@ type ProfilePageType = {
   year: string | null
   faculty: string | null
   major: string | null
-  projects: Projects[]
+  projects: Project[]
 }
 
 const ProfileInfo = (props: ProfilePageType) => {
@@ -65,7 +65,7 @@ const ProfileInfo = (props: ProfilePageType) => {
               <Td textColor="#002D70" className="font-medium">
                 PROJECTS
               </Td>
-              {props.projects.map((project: Projects) => {
+              {props.projects.map((project: Project) => {
                 return (
                   <Td
                     key={project.project_id}
diff --git a/src/server/trpc/router/admin/announcement/create.ts b/src/server/trpc/router/admin/announcement/create.ts
index 27d7b11c..7ea1c016 100644
--- a/src/server/trpc/router/admin/announcement/create.ts
+++ b/src/server/trpc/router/admin/announcement/create.ts
@@ -24,7 +24,7 @@ export default protectedProcedure
         })
       }
 
-      await ctx.prisma.announcements.create({
+      await ctx.prisma.announcement.create({
         data: {
           announcement_id: randomUUID(),
           content: input.content,
diff --git a/src/server/trpc/router/admin/announcement/read.ts b/src/server/trpc/router/admin/announcement/read.ts
index a57a1f96..1d5e92b9 100644
--- a/src/server/trpc/router/admin/announcement/read.ts
+++ b/src/server/trpc/router/admin/announcement/read.ts
@@ -3,7 +3,7 @@ import { TRPCError } from '@trpc/server'
 
 export default protectedProcedure.query(async ({ ctx }) => {
   try {
-    const announcements = await ctx.prisma.announcements.findMany({
+    const announcements = await ctx.prisma.announcement.findMany({
       include: {
         created_by: {
           select: { name: true },
diff --git a/src/server/trpc/router/member/create.ts b/src/server/trpc/router/member/create.ts
index cbafa268..f7f9e99a 100644
--- a/src/server/trpc/router/member/create.ts
+++ b/src/server/trpc/router/member/create.ts
@@ -29,6 +29,7 @@ export const addMultipleUsers = protectedProcedure
         faculty: z.string(),
         gender: z.string(),
         hobbies: z.string(),
+        interviewNotes: z.string(),
         linkedin: z.string(),
         major: z.string(),
         name: z.string(),
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index 94c8165c..bc1a1350 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -127,6 +127,7 @@ function buildUserObject(
     faculty: string
     gender: string
     hobbies: string
+    interviewNotes: string
     linkedin: string
     major: string
     name: string
@@ -155,6 +156,7 @@ function buildUserObject(
       hashedPassword,
       hobbies: user.hobbies,
       image: null,
+      interviewNotes: user.interviewNotes,
       level: 'member',
       linkedin: user.linkedin,
       major: user.major,

From 529897f8fbcdb7b6e78933bb1386704127445625 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 21 May 2023 22:18:33 +0800
Subject: [PATCH 010/223] impl edit recruitment notes and status endpoints

---
 src/server/trpc/router/_app.ts                |  2 +
 .../trpc/router/admin/recruitment/index.ts    |  7 +++
 .../trpc/router/admin/recruitment/update.ts   | 56 +++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 src/server/trpc/router/admin/recruitment/index.ts
 create mode 100644 src/server/trpc/router/admin/recruitment/update.ts

diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index 35d6a63c..38bbb1af 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -6,6 +6,7 @@ import { profileRouter } from './profile'
 import { userRouter } from './admin/users'
 import { eventRouter } from './events'
 import { attendanceRouter } from './admin/attendance'
+import { recruitmentRouter } from './admin/recruitment'
 
 export const appRouter = router({
   auth: authRouter,
@@ -15,6 +16,7 @@ export const appRouter = router({
   profile: profileRouter,
   user: userRouter,
   attendance: attendanceRouter,
+  recruitment: recruitmentRouter,
 })
 
 export type AppRouter = typeof appRouter
diff --git a/src/server/trpc/router/admin/recruitment/index.ts b/src/server/trpc/router/admin/recruitment/index.ts
new file mode 100644
index 00000000..2217fc97
--- /dev/null
+++ b/src/server/trpc/router/admin/recruitment/index.ts
@@ -0,0 +1,7 @@
+import { router } from '~/server/trpc/trpc'
+import { updateAppliedRoleStatus, updateInterviewNotes } from './update'
+
+export const recruitmentRouter = router({
+  updateAppliedRoleStatus,
+  updateInterviewNotes,
+})
diff --git a/src/server/trpc/router/admin/recruitment/update.ts b/src/server/trpc/router/admin/recruitment/update.ts
new file mode 100644
index 00000000..38111cef
--- /dev/null
+++ b/src/server/trpc/router/admin/recruitment/update.ts
@@ -0,0 +1,56 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { z } from 'zod'
+import { TRPCError } from '@trpc/server'
+import type { ApplicationStatus } from '@prisma/client'
+
+export const updateAppliedRoleStatus = protectedProcedure
+  .input(
+    z.object({
+      appliedRoleId: z.string(),
+      status: z.string(),
+    })
+  )
+  .mutation(async ({ ctx, input }) => {
+    try {
+      const role = await ctx.prisma.appliedRole.update({
+        where: {
+          id: input.appliedRoleId,
+        },
+        data: {
+          status: input.status as ApplicationStatus,
+        },
+      })
+      return role
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })
+
+export const updateInterviewNotes = protectedProcedure
+  .input(
+    z.object({
+      applicantId: z.string(),
+      interviewNotes: z.string(),
+    })
+  )
+  .mutation(async ({ ctx, input }) => {
+    try {
+      const applicant = await ctx.prisma.user.update({
+        where: {
+          id: input.applicantId,
+        },
+        data: {
+          interviewNotes: input.interviewNotes,
+        },
+      })
+      return applicant
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })

From 45c638425dba141885eeb9e4c3e4a075fb3030d5 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Mon, 22 May 2023 22:30:17 +0800
Subject: [PATCH 011/223] schema updaate

---
 prisma/schema.prisma | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index a45018f6..b636c59d 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -76,7 +76,6 @@ model User {
   projects        Project[]      @relation("ProjectToUser")
   Attendance      Attendance[]   @relation("attendanceToUser")
   AttendanceTaken Attendance[]
-  AppliedRole     AppliedRole[]
 }
 
 model Event {
@@ -113,16 +112,15 @@ enum LogType {
 }
 
 model AppliedRole {
-  id             String            @id
-  rank           Int
-  department     Department        @relation("appliedDepartment", fields: [departmentId], references: [department_id])
-  departmentId   String
-  role           String
-  status         ApplicationStatus
-  applicant      User              @relation("applicant", fields: [applicantEmail], references: [email])
-  applicantEmail String
-  User           User?             @relation(fields: [userId], references: [id])
-  userId         String?
+  id           String            @id
+  rank         Int
+  department   Department        @relation("appliedDepartment", fields: [departmentId], references: [department_id])
+  departmentId String
+  role         String
+  status       ApplicationStatus
+  applicant    User              @relation("applicant", fields: [applicantId], references: [id])
+  applicantId  String
+  userId       String?
 }
 
 enum ApplicationStatus {

From 982734631b5b0e930d9ff7f1c989957367a9450d Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Mon, 22 May 2023 22:43:07 +0800
Subject: [PATCH 012/223] impl applicant endpoints for read

---
 .../trpc/router/admin/recruitment/index.ts    |  3 ++
 .../trpc/router/admin/recruitment/read.ts     | 45 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 src/server/trpc/router/admin/recruitment/read.ts

diff --git a/src/server/trpc/router/admin/recruitment/index.ts b/src/server/trpc/router/admin/recruitment/index.ts
index 2217fc97..6a3255f7 100644
--- a/src/server/trpc/router/admin/recruitment/index.ts
+++ b/src/server/trpc/router/admin/recruitment/index.ts
@@ -1,7 +1,10 @@
 import { router } from '~/server/trpc/trpc'
 import { updateAppliedRoleStatus, updateInterviewNotes } from './update'
+import { getAllApplicants, getApplicant } from './read'
 
 export const recruitmentRouter = router({
   updateAppliedRoleStatus,
   updateInterviewNotes,
+  getAllApplicants,
+  getApplicant,
 })
diff --git a/src/server/trpc/router/admin/recruitment/read.ts b/src/server/trpc/router/admin/recruitment/read.ts
new file mode 100644
index 00000000..43e5c4fa
--- /dev/null
+++ b/src/server/trpc/router/admin/recruitment/read.ts
@@ -0,0 +1,45 @@
+import { TRPCError } from '@trpc/server'
+import { z } from 'zod'
+import { protectedProcedure } from '~/server/trpc/trpc'
+
+export const getAllApplicants = protectedProcedure.query(async ({ ctx }) => {
+  try {
+    return await ctx.prisma.user.findMany({
+      where: {
+        level: 'applicant',
+      },
+      select: {
+        name: true,
+        interviewNotes: true,
+        appliedRoles: true,
+      },
+    })
+  } catch (error) {
+    throw new TRPCError({
+      code: 'INTERNAL_SERVER_ERROR',
+      message: 'Error retrieving applicants: ' + error,
+    })
+  }
+})
+
+export const getApplicant = protectedProcedure
+  .input(z.string())
+  .query(async ({ ctx, input }) => {
+    try {
+      return await ctx.prisma.user.findUnique({
+        where: {
+          id: input,
+        },
+        select: {
+          name: true,
+          interviewNotes: true,
+          appliedRoles: true,
+        },
+      })
+    } catch (error) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: 'Error retrieving applicants: ' + error,
+      })
+    }
+  })

From 67b1215bdd04983f0239185c2121c80b9c66f5cc Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Thu, 25 May 2023 23:04:40 +0800
Subject: [PATCH 013/223] schema updates

---
 prisma/schema.prisma | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index b636c59d..0bfec8bd 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -12,7 +12,7 @@ model Project {
   difficulty   Int
   rating       Int
   department   String?
-  project_id   Int         @id
+  project_id   String      @id @default(uuid())
   name         String
   team_lead    String
   created_date DateTime
@@ -29,7 +29,7 @@ model Department {
 }
 
 model Announcement {
-  announcement_id String      @id
+  announcement_id String      @id @default(uuid())
   content         String
   image           String?
   title           String
@@ -98,7 +98,7 @@ model Log {
 }
 
 model Attendance {
-  id      String @id
+  id      String @id @default(uuid())
   eventId String
   user    User   @relation(fields: [userId], references: [id])
   Event   Event  @relation(fields: [eventId], references: [id])
@@ -112,7 +112,7 @@ enum LogType {
 }
 
 model AppliedRole {
-  id           String            @id
+  id           String            @id @default(uuid())
   rank         Int
   department   Department        @relation("appliedDepartment", fields: [departmentId], references: [department_id])
   departmentId String
@@ -120,7 +120,6 @@ model AppliedRole {
   status       ApplicationStatus
   applicant    User              @relation("applicant", fields: [applicantId], references: [id])
   applicantId  String
-  userId       String?
 }
 
 enum ApplicationStatus {

From f62923fdbf069f23e13a99fda52ef7675448c7f4 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Thu, 25 May 2023 23:06:03 +0800
Subject: [PATCH 014/223] search fn with redux

---
 src/components/common/SearchBar.tsx           |  9 ++++---
 src/components/recruitment/searchNameSlice.ts | 27 +++++++++++++++++++
 src/pages/recruitment/applicants.tsx          | 12 ++++++++-
 src/store/store.ts                            | 16 +++++++++++
 4 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 src/components/recruitment/searchNameSlice.ts
 create mode 100644 src/store/store.ts

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 1912020f..cb85f032 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -1,9 +1,13 @@
 import React, { useState } from 'react'
 import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import { SearchIcon } from '@chakra-ui/icons'
+import { useDispatch } from 'react-redux'
+import { searchByName } from '../recruitment/searchNameSlice'
+import type { RootState } from '~/store/store'
 
 const SearchBar = () => {
-  const [searchQuery, setSearchQuery] = useState('')
+  const dispatch = useDispatch()
+
   return (
     <InputGroup
       minWidth={'150px'}
@@ -21,9 +25,8 @@ const SearchBar = () => {
       </InputLeftElement>
       <Input
         placeholder="Search"
-        value={searchQuery}
-        onChange={(e) => setSearchQuery(e.target.value)}
         borderWidth="3px"
+        onChange={(e) => dispatch(searchByName(e.target.value))}
         border="3px solid #004586"
         borderColor="#004586"
         borderRadius="20px"
diff --git a/src/components/recruitment/searchNameSlice.ts b/src/components/recruitment/searchNameSlice.ts
new file mode 100644
index 00000000..b73e5c6b
--- /dev/null
+++ b/src/components/recruitment/searchNameSlice.ts
@@ -0,0 +1,27 @@
+import { createSlice } from '@reduxjs/toolkit'
+import type { PayloadAction } from '@reduxjs/toolkit'
+import { RootState } from '~/store/store'
+
+export interface SearchNameSlice {
+  value: string
+}
+
+const initialState: SearchNameSlice = {
+  value: '',
+}
+
+export const searchNameSlice = createSlice({
+  name: 'searchName',
+  initialState,
+  reducers: {
+    searchByName: (state, action: PayloadAction<string>) => {
+      state.value = action.payload
+    },
+  },
+})
+
+export const { searchByName } = searchNameSlice.actions
+
+export const selectSearchValue = (state: RootState) => state.searchName.value
+
+export default searchNameSlice.reducer
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 115a534e..2b512ca7 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -6,8 +6,18 @@ import SearchBar from '~/components/common/SearchBar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
 import ApplicantGrid from '~/components/recruitment/ApplicantGrid'
 import InfoPopup from '~/components/recruitment/InfoPopup'
+import { trpc } from '~/utils/trpc'
+import { useSelector } from 'react-redux'
+import { selectSearchValue } from '~/components/recruitment/searchNameSlice'
 
 const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
+  const { data } = trpc.recruitment.getAllApplicants.useQuery()
+  const searchValue = useSelector(selectSearchValue)
+
+  const filteredData = data?.filter((item) =>
+    searchValue == '' ? item : item.name?.toLowerCase().includes(searchValue)
+  )
+
   return (
     <>
       <Head>
@@ -22,7 +32,7 @@ const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
       <Layout>
         <Text className="text-center text-4xl font-bold">Applicants</Text>
         <SearchBar />
-        <ApplicantGrid />
+        <ApplicantGrid data={filteredData} />
         <InfoPopup />
       </Layout>
     </>
diff --git a/src/store/store.ts b/src/store/store.ts
new file mode 100644
index 00000000..4deb8b5c
--- /dev/null
+++ b/src/store/store.ts
@@ -0,0 +1,16 @@
+import { configureStore } from '@reduxjs/toolkit'
+import dashboardReducer from './admin/dashboard'
+import searchNameReducer from '../components/recruitment/searchNameSlice'
+
+const store = configureStore({
+  reducer: {
+    dashboard: dashboardReducer,
+    searchName: searchNameReducer,
+  },
+})
+
+// Infer the `RootState` and `AppDispatch` types from the store itself
+export type RootState = ReturnType<typeof store.getState>
+// Inferred type: {posts: PostsState, comments: CommentsState, users: UsersState}
+export type AppDispatch = typeof store.dispatch
+export default store

From 1294b0b41539b4ea736d2e99a8cfe1bb585bab30 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Thu, 25 May 2023 23:06:47 +0800
Subject: [PATCH 015/223] components refactor and design change

---
 src/components/recruitment/ApplicantCard.tsx  |  54 ++++---
 src/components/recruitment/ApplicantGrid.tsx  |  16 +-
 .../recruitment/AppliedRoleListItem.tsx       |  16 ++
 src/components/recruitment/DocumentModal.tsx  |   1 +
 src/components/recruitment/EditModal.tsx      |  80 ----------
 src/components/recruitment/InfoPopup.tsx      |   9 ++
 src/components/recruitment/NoteModal.tsx      | 107 ++++++++++++-
 src/components/recruitment/StatusPopup.tsx    | 151 ++++++++++++++++++
 8 files changed, 320 insertions(+), 114 deletions(-)
 create mode 100644 src/components/recruitment/AppliedRoleListItem.tsx
 delete mode 100644 src/components/recruitment/EditModal.tsx
 create mode 100644 src/components/recruitment/StatusPopup.tsx

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index 5bfd27db..a2a425d9 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -5,19 +5,24 @@ import {
   CardHeader,
   Heading,
   Image,
-  ListIcon,
-  ListItem,
   Stack,
-  Text,
   UnorderedList,
 } from '@chakra-ui/react'
+import { User } from '@prisma/client'
 import { Avatar } from 'flowbite-react'
-import { BsCircleFill } from 'react-icons/bs'
+import AppliedRoleListItem from './AppliedRoleListItem'
 import DocumentModal from './DocumentModal'
-import EditModal from './EditModal'
 import NoteModal from './NoteModal'
+import type { AppliedRole } from '@prisma/client'
+import { trpc } from '~/utils/trpc'
+import { ApplicantWithAppliedRole } from '~/types/model'
 
-const ApplicantCard = () => {
+const ApplicantCard = ({
+  applicant,
+}: {
+  applicant: ApplicantWithAppliedRole
+}) => {
+  const { refetch } = trpc.recruitment.getApplicant.useQuery(applicant.id)
   return (
     <Card
       maxWidth="sm"
@@ -38,29 +43,28 @@ const ApplicantCard = () => {
         position="absolute"
         height="85px"
       />
-      <CardBody className="relative">
-        <Stack rowGap="3">
-          <Avatar alt="User-settings" rounded={true} />
-          <Box className="absolute top-8 left-0 flex w-full justify-between">
+      <CardBody className="relative" pt="10px">
+        <Stack>
+          <Avatar alt="User-settings" rounded={true} size="lg" />
+          <Box className="flex justify-center">
             <Box>
-              <NoteModal />
               <DocumentModal />
+              <NoteModal
+                applicantId={applicant.id}
+                interviewNotes={applicant.interviewNotes}
+                refetch={refetch}
+              />
             </Box>
-            <EditModal />
           </Box>
-          <UnorderedList styleType="none" spacing="2">
-            <ListItem className="flex items-center justify-between">
-              <Text>1. SD - Software Engineer</Text>
-              <ListIcon as={BsCircleFill} marginLeft="2" fill="#46FFDE" />
-            </ListItem>
-            <ListItem className="flex items-center justify-between">
-              <Text>2. ML - Role</Text>
-              <ListIcon as={BsCircleFill} marginLeft="2" fill="#FFBD3C" />
-            </ListItem>
-            <ListItem className="flex items-center justify-between">
-              <Text>3. IA - Director</Text>
-              <ListIcon as={BsCircleFill} marginLeft="2" fill="#0038FF" />
-            </ListItem>
+          <UnorderedList styleType="none">
+            {applicant.appliedRoles.map((appliedRole) => {
+              return (
+                <AppliedRoleListItem
+                  appliedRole={appliedRole}
+                  key={appliedRole.id}
+                />
+              )
+            })}
           </UnorderedList>
         </Stack>
       </CardBody>
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 8306165a..e894607a 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,14 +1,16 @@
+import type { ApplicantWithAppliedRole } from '~/types/model'
 import ApplicantCard from './ApplicantCard'
 
-const ApplicantGrid = (data: any) => {
+const ApplicantGrid = ({
+  data,
+}: {
+  data: ApplicantWithAppliedRole[] | undefined
+}) => {
   return (
     <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
-      <ApplicantCard />
-      <ApplicantCard />
-      <ApplicantCard />
-      <ApplicantCard />
-      <ApplicantCard />
-      <ApplicantCard />
+      {data?.map((applicant) => {
+        return <ApplicantCard applicant={applicant} key={applicant.id} />
+      })}
     </div>
   )
 }
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
new file mode 100644
index 00000000..3787e565
--- /dev/null
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -0,0 +1,16 @@
+import { ListItem, Text } from '@chakra-ui/react'
+import type { AppliedRole } from '@prisma/client'
+import StatusPopup from './StatusPopup'
+
+const AppliedRoleListItem = ({ appliedRole }: { appliedRole: AppliedRole }) => {
+  return (
+    <ListItem className="flex items-center justify-between">
+      <Text>
+        {appliedRole.rank}. {appliedRole.departmentId} - {appliedRole.role}
+      </Text>
+      <StatusPopup status={appliedRole.status} appliedRoleId={appliedRole.id} />
+    </ListItem>
+  )
+}
+
+export default AppliedRoleListItem
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
index 4c9477c3..5d4a07c3 100644
--- a/src/components/recruitment/DocumentModal.tsx
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -22,6 +22,7 @@ const DocumentModal = () => {
         bg="None"
         _hover={{ background: 'None' }}
         onClick={onOpen}
+        fontSize="23px"
       />
       <Modal isOpen={isOpen} onClose={onClose} isCentered>
         <ModalOverlay />
diff --git a/src/components/recruitment/EditModal.tsx b/src/components/recruitment/EditModal.tsx
deleted file mode 100644
index 299d1fba..00000000
--- a/src/components/recruitment/EditModal.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import {
-  Button,
-  FormControl,
-  FormLabel,
-  Grid,
-  GridItem,
-  IconButton,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Stack,
-  Text,
-  Textarea,
-  useDisclosure,
-} from '@chakra-ui/react'
-import { Avatar } from 'flowbite-react'
-import { BsPencilSquare } from 'react-icons/bs'
-
-const EditModal = () => {
-  const { isOpen, onOpen, onClose } = useDisclosure()
-  return (
-    <>
-      <IconButton
-        aria-label="Edit details"
-        icon={<BsPencilSquare />}
-        bg="None"
-        _hover={{ background: 'None' }}
-        onClick={onOpen}
-      />
-      <Modal isOpen={isOpen} onClose={onClose} isCentered>
-        <ModalOverlay />
-        <ModalContent
-          pb={4}
-          backgroundColor="#F1F3FF"
-          borderRadius="20px"
-          boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
-        >
-          <ModalHeader textAlign="center">Edit NAME</ModalHeader>
-          <ModalCloseButton />
-          <ModalBody>
-            <Grid templateColumns="repeat(3, 1fr)" gap="6">
-              <GridItem colSpan={2}>
-                <Stack>
-                  <FormControl>
-                    <FormLabel>Application Status</FormLabel>
-                    <Input placeholder="Application Status" />
-                  </FormControl>
-
-                  <FormControl mt={4}>
-                    <FormLabel>Department</FormLabel>
-                    <Input placeholder="Department" />
-                  </FormControl>
-
-                  <FormControl mt={4}>
-                    <FormLabel>Interview Notes</FormLabel>
-                    <Textarea placeholder="Interview Notes" />
-                  </FormControl>
-                </Stack>
-              </GridItem>
-              <GridItem>
-                <Avatar alt="User-settings" rounded={true} size="lg" />
-                <Text textAlign="center">Some long name we try</Text>
-              </GridItem>
-            </Grid>
-          </ModalBody>
-          <ModalFooter>
-            <Button bg="#97AEFF">Save</Button>
-          </ModalFooter>
-        </ModalContent>
-      </Modal>
-    </>
-  )
-}
-
-export default EditModal
diff --git a/src/components/recruitment/InfoPopup.tsx b/src/components/recruitment/InfoPopup.tsx
index b9d3e926..e32f0c9b 100644
--- a/src/components/recruitment/InfoPopup.tsx
+++ b/src/components/recruitment/InfoPopup.tsx
@@ -69,6 +69,15 @@ const InfoPopup = () => {
                 />
                 <Text>Interviewed</Text>
               </ListItem>
+              <ListItem className="flex items-center">
+                <Icon
+                  as={BsCircleFill}
+                  marginLeft="2"
+                  marginRight="2"
+                  fill="#FF0000"
+                />
+                <Text>Rejected</Text>
+              </ListItem>
             </UnorderedList>
           </PopoverBody>
         </PopoverContent>
diff --git a/src/components/recruitment/NoteModal.tsx b/src/components/recruitment/NoteModal.tsx
index 0cc89803..29cffa6b 100644
--- a/src/components/recruitment/NoteModal.tsx
+++ b/src/components/recruitment/NoteModal.tsx
@@ -1,17 +1,83 @@
 import {
+  Button,
   IconButton,
+  Input,
   Modal,
   ModalBody,
   ModalCloseButton,
   ModalContent,
+  ModalFooter,
   ModalHeader,
   ModalOverlay,
   useDisclosure,
+  useToast,
 } from '@chakra-ui/react'
+import { useEffect, useState } from 'react'
 import { BsFileEarmark } from 'react-icons/bs'
+import { trpc } from '~/utils/trpc'
+import { Message } from '~/constant/messages'
+import type { QueryObserverResult } from '@tanstack/react-query'
 
-const NoteModal = () => {
+const NoteModal = ({
+  applicantId,
+  interviewNotes,
+  refetch,
+}: {
+  applicantId: string
+  interviewNotes: string | null
+  refetch: () => Promise<QueryObserverResult>
+}) => {
+  interviewNotes = 'hello there testing'
+
+  const toast = useToast()
+  const { mutateAsync } = trpc.recruitment.updateInterviewNotes.useMutation()
+  const [edit, setEdit] = useState(false)
+  const [notes, setNotes] = useState('default notes')
+  const [tempNotes, setTempNotes] = useState('')
   const { isOpen, onOpen, onClose } = useDisclosure()
+
+  //TODO: checking inputs
+  useEffect(() => {
+    console.log('notes:', notes)
+    console.log('temp notes:', tempNotes)
+  })
+  //TODO: checking inputs
+  useEffect(() => {
+    if (interviewNotes) {
+      setNotes(interviewNotes)
+      setTempNotes(interviewNotes)
+    }
+  }, [interviewNotes])
+
+  const resetNotes = () => {
+    setTempNotes(notes)
+    setEdit(false)
+  }
+
+  const updateNotes = async () => {
+    await mutateAsync({
+      interviewNotes: tempNotes,
+      applicantId: applicantId,
+    })
+
+    toast({
+      duration: 3000,
+      status: 'loading',
+      title: 'Loading',
+      description: Message.PERSONAL_INFO_LOADING,
+    })
+
+    await refetch()
+    setEdit(false)
+
+    toast({
+      duration: 3000,
+      status: 'success',
+      title: 'Success',
+      description: Message.PERSONAL_INFO_SUCCESS,
+    })
+  }
+
   return (
     <>
       <IconButton
@@ -20,6 +86,7 @@ const NoteModal = () => {
         bg="None"
         _hover={{ background: 'None' }}
         onClick={onOpen}
+        fontSize="20px"
       />
       <Modal isOpen={isOpen} onClose={onClose} isCentered>
         <ModalOverlay />
@@ -31,7 +98,43 @@ const NoteModal = () => {
         >
           <ModalHeader textAlign="center">Interview Notes</ModalHeader>
           <ModalCloseButton />
-          <ModalBody>Notes on notes on notes</ModalBody>
+          <ModalBody>
+            {tempNotes ? (
+              <Input
+                variant="unstyled"
+                value={tempNotes}
+                onChange={(e) => {
+                  setTempNotes(e.currentTarget.value)
+                  setEdit(true)
+                }}
+              />
+            ) : (
+              <Input
+                variant="unstyled"
+                placeholder="Write notes.."
+                onChange={(e) => {
+                  setTempNotes(e.currentTarget.value)
+                  setEdit(true)
+                }}
+              />
+            )}
+          </ModalBody>
+          <ModalFooter>
+            {edit ? (
+              <>
+                <Button mx="2" bg="#d3d3d3" onClick={resetNotes}>
+                  Cancel
+                </Button>
+                <Button
+                  bg="#97AEFF"
+                  _hover={{ bg: '#adbfff' }}
+                  onClick={updateNotes}
+                >
+                  Save
+                </Button>
+              </>
+            ) : null}
+          </ModalFooter>
         </ModalContent>
       </Modal>
     </>
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
new file mode 100644
index 00000000..c9941fa7
--- /dev/null
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -0,0 +1,151 @@
+import {
+  IconButton,
+  ListItem,
+  Popover,
+  PopoverBody,
+  PopoverCloseButton,
+  PopoverContent,
+  PopoverTrigger,
+  Text,
+  UnorderedList,
+  useToast,
+} from '@chakra-ui/react'
+import { ApplicationStatus } from '@prisma/client'
+import type { QueryObserverResult } from '@tanstack/react-query'
+import { BsCircleFill } from 'react-icons/bs'
+import { trpc } from '~/utils/trpc'
+
+const statusFillMap = {
+  [ApplicationStatus.ACCEPTED]: '#46FFDE',
+  [ApplicationStatus.OFFERED]: '#0038FF',
+  [ApplicationStatus.PENDINGREVIEW]: '#FFBD3C',
+  [ApplicationStatus.INTERVIEWED]: '#CE44FF',
+  [ApplicationStatus.REJECTED]: '#FF0000',
+}
+
+const StatusPopup = ({
+  status,
+  appliedRoleId,
+}: {
+  appliedRoleId: string
+  status: ApplicationStatus
+}) => {
+  const toast = useToast()
+  const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRoleId)
+  const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
+
+  const updateStatus = async (status: ApplicationStatus) => {
+    try {
+      await mutateAsync({
+        status: status,
+        appliedRoleId: appliedRoleId,
+      })
+      await refetch()
+      toast({
+        duration: 2000,
+        status: 'success',
+        title: 'Success',
+        description: 'Application status updated successfully!',
+      })
+    } catch (e) {
+      toast({
+        description: (e as Error).message,
+        duration: 2000,
+        status: 'error',
+        title: 'Oops, an error occurred!',
+      })
+    }
+  }
+
+  return (
+    <Popover>
+      <PopoverTrigger>
+        <IconButton
+          aria-label="status"
+          icon={<BsCircleFill fill={statusFillMap[status]} />}
+          bg="None"
+          _hover={{ background: 'None' }}
+          marginLeft="2"
+        ></IconButton>
+      </PopoverTrigger>
+      <PopoverContent>
+        <PopoverCloseButton />
+        <PopoverBody>
+          <UnorderedList styleType="none">
+            <ListItem className="flex items-center">
+              <IconButton
+                aria-label="accepted status"
+                icon={<BsCircleFill fill="#46FFDE" />}
+                bg="None"
+                _hover={{ background: 'None' }}
+                marginLeft="2"
+                onClick={() =>
+                  updateStatus(ApplicationStatus.ACCEPTED as ApplicationStatus)
+                }
+              />
+              <Text>Accepted</Text>
+            </ListItem>
+            <ListItem className="flex items-center">
+              <IconButton
+                aria-label="offered status"
+                icon={<BsCircleFill fill="#0038FF" />}
+                bg="None"
+                _hover={{ background: 'None' }}
+                marginLeft="2"
+                onClick={() =>
+                  updateStatus(ApplicationStatus.OFFERED as ApplicationStatus)
+                }
+              />
+              <Text>Offered</Text>
+            </ListItem>
+            <ListItem className="flex items-center">
+              <IconButton
+                aria-label="pending review status"
+                icon={<BsCircleFill fill="#FFBD3C" />}
+                bg="None"
+                _hover={{ background: 'None' }}
+                marginLeft="2"
+                onClick={() =>
+                  updateStatus(
+                    ApplicationStatus.PENDINGREVIEW as ApplicationStatus
+                  )
+                }
+              />
+              <Text>Pending Review</Text>
+            </ListItem>
+            <ListItem className="flex items-center">
+              <IconButton
+                aria-label="interviewed status"
+                icon={<BsCircleFill fill="#FF0099" />}
+                bg="None"
+                _hover={{ background: 'None' }}
+                marginLeft="2"
+                onClick={() =>
+                  updateStatus(
+                    ApplicationStatus.INTERVIEWED as ApplicationStatus
+                  )
+                }
+              />
+              <Text>Interviewed</Text>
+            </ListItem>
+            <ListItem className="flex items-center">
+              <IconButton
+                aria-label="rejected status"
+                icon={<BsCircleFill fill="#FF0000" />}
+                bg="None"
+                _hover={{ background: 'None' }}
+                marginLeft="2"
+                onClick={() =>
+                  updateStatus(ApplicationStatus.REJECTED as ApplicationStatus)
+                }
+              />
+              <Text>Rejected</Text>
+            </ListItem>
+          </UnorderedList>
+        </PopoverBody>
+      </PopoverContent>
+    </Popover>
+  )
+}
+
+export default StatusPopup

From 4ae0488a334d48231dd56f86eb7153b11b198610 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Thu, 25 May 2023 23:08:01 +0800
Subject: [PATCH 016/223] create applicants endpoint

---
 .../trpc/router/admin/recruitment/create.ts   | 64 +++++++++++++++++++
 .../trpc/router/admin/recruitment/index.ts    |  5 +-
 .../trpc/router/admin/recruitment/read.ts     | 24 +++++++
 .../trpc/router/constants/ErrorTitle.ts       |  1 +
 src/types/model.ts                            |  8 +++
 5 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 src/server/trpc/router/admin/recruitment/create.ts
 create mode 100644 src/types/model.ts

diff --git a/src/server/trpc/router/admin/recruitment/create.ts b/src/server/trpc/router/admin/recruitment/create.ts
new file mode 100644
index 00000000..2697ccaf
--- /dev/null
+++ b/src/server/trpc/router/admin/recruitment/create.ts
@@ -0,0 +1,64 @@
+import { ApplicationStatus, LogType } from '@prisma/client'
+import { hash } from 'bcryptjs'
+import { randomUUID } from 'crypto'
+import { z } from 'zod'
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { ErrorTitle } from '../../constants/ErrorTitle'
+
+export const createSingleApplicant = protectedProcedure
+  .input(
+    z.object({
+      email: z.string(),
+      password: z.string(),
+      name: z.string(),
+      firstRole: z.string(),
+      firstDepartmentId: z.string(),
+      secondRole: z.string(),
+      secondDepartmentId: z.string(),
+      thirdRole: z.string(),
+      thirdDepartmentId: z.string(),
+    })
+  )
+  .mutation(async ({ ctx, input }) => {
+    const hashedPassword = await hash(input.password, 10)
+    try {
+      await ctx.prisma.user.create({
+        data: {
+          email: input.email,
+          hashedPassword,
+          name: input.name,
+          level: 'applicant',
+          appliedRoles: {
+            create: [
+              {
+                rank: 1,
+                departmentId: input.firstDepartmentId,
+                role: input.firstRole,
+                status: ApplicationStatus.PENDINGREVIEW,
+              },
+              {
+                rank: 2,
+                departmentId: input.secondDepartmentId,
+                role: input.secondRole,
+                status: ApplicationStatus.PENDINGREVIEW,
+              },
+              {
+                rank: 3,
+                departmentId: input.thirdDepartmentId,
+                role: input.thirdRole,
+                status: ApplicationStatus.PENDINGREVIEW,
+              },
+            ],
+          },
+        },
+      })
+    } catch (e) {
+      await ctx.prisma.log.create({
+        data: {
+          message: (e as Error).message,
+          title: ErrorTitle.ERROR_CREATING_SINGLE_APPLICANT,
+          type: LogType.ERROR,
+        },
+      })
+    }
+  })
diff --git a/src/server/trpc/router/admin/recruitment/index.ts b/src/server/trpc/router/admin/recruitment/index.ts
index 6a3255f7..6f2014bb 100644
--- a/src/server/trpc/router/admin/recruitment/index.ts
+++ b/src/server/trpc/router/admin/recruitment/index.ts
@@ -1,10 +1,13 @@
 import { router } from '~/server/trpc/trpc'
 import { updateAppliedRoleStatus, updateInterviewNotes } from './update'
-import { getAllApplicants, getApplicant } from './read'
+import { getAllApplicants, getApplicant, getAppliedRole } from './read'
+import { createSingleApplicant } from './create'
 
 export const recruitmentRouter = router({
   updateAppliedRoleStatus,
   updateInterviewNotes,
   getAllApplicants,
   getApplicant,
+  getAppliedRole,
+  createSingleApplicant,
 })
diff --git a/src/server/trpc/router/admin/recruitment/read.ts b/src/server/trpc/router/admin/recruitment/read.ts
index 43e5c4fa..4c3340aa 100644
--- a/src/server/trpc/router/admin/recruitment/read.ts
+++ b/src/server/trpc/router/admin/recruitment/read.ts
@@ -9,6 +9,7 @@ export const getAllApplicants = protectedProcedure.query(async ({ ctx }) => {
         level: 'applicant',
       },
       select: {
+        id: true,
         name: true,
         interviewNotes: true,
         appliedRoles: true,
@@ -43,3 +44,26 @@ export const getApplicant = protectedProcedure
       })
     }
   })
+
+export const getAppliedRole = protectedProcedure
+  .input(z.string())
+  .query(async ({ ctx, input }) => {
+    try {
+      return await ctx.prisma.appliedRole.findUnique({
+        where: {
+          id: input,
+        },
+        select: {
+          rank: true,
+          departmentId: true,
+          role: true,
+          status: true,
+        },
+      })
+    } catch (error) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: 'Error retrieving applicants: ' + error,
+      })
+    }
+  })
diff --git a/src/server/trpc/router/constants/ErrorTitle.ts b/src/server/trpc/router/constants/ErrorTitle.ts
index de834110..9bf44c5c 100644
--- a/src/server/trpc/router/constants/ErrorTitle.ts
+++ b/src/server/trpc/router/constants/ErrorTitle.ts
@@ -6,4 +6,5 @@ export enum ErrorTitle {
   ERROR_ADDING_MULTIPLE_USERS = 'ERROR ADDING MULTIPLE USERS',
   ERROR_ADDING_SINGLE_USER = 'ERROR ADDING SINGLE USER',
   ERROR_CREATING_EVENT = 'ERROR CREATING EVENT',
+  ERROR_CREATING_SINGLE_APPLICANT = 'ERROR ADDING SINGLE APPLICANT',
 }
diff --git a/src/types/model.ts b/src/types/model.ts
new file mode 100644
index 00000000..5245fb18
--- /dev/null
+++ b/src/types/model.ts
@@ -0,0 +1,8 @@
+import { AppliedRole, Prisma } from '@prisma/client'
+
+export type ApplicantWithAppliedRole = {
+  id: string
+  name: string | null
+  interviewNotes: string | null
+  appliedRoles: AppliedRole[]
+}

From 9035b05950c36e27cf417abdccfd272dc2ef1e36 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Thu, 25 May 2023 23:39:48 +0800
Subject: [PATCH 017/223] remove redux

---
 src/components/common/SearchBar.tsx           |  6 -----
 src/components/recruitment/searchNameSlice.ts | 27 -------------------
 src/pages/recruitment/applicants.tsx          |  8 +-----
 src/store/store.ts                            | 16 -----------
 4 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 src/components/recruitment/searchNameSlice.ts
 delete mode 100644 src/store/store.ts

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index cb85f032..a7d1f6d2 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -1,13 +1,8 @@
 import React, { useState } from 'react'
 import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import { SearchIcon } from '@chakra-ui/icons'
-import { useDispatch } from 'react-redux'
-import { searchByName } from '../recruitment/searchNameSlice'
-import type { RootState } from '~/store/store'
 
 const SearchBar = () => {
-  const dispatch = useDispatch()
-
   return (
     <InputGroup
       minWidth={'150px'}
@@ -26,7 +21,6 @@ const SearchBar = () => {
       <Input
         placeholder="Search"
         borderWidth="3px"
-        onChange={(e) => dispatch(searchByName(e.target.value))}
         border="3px solid #004586"
         borderColor="#004586"
         borderRadius="20px"
diff --git a/src/components/recruitment/searchNameSlice.ts b/src/components/recruitment/searchNameSlice.ts
deleted file mode 100644
index b73e5c6b..00000000
--- a/src/components/recruitment/searchNameSlice.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { createSlice } from '@reduxjs/toolkit'
-import type { PayloadAction } from '@reduxjs/toolkit'
-import { RootState } from '~/store/store'
-
-export interface SearchNameSlice {
-  value: string
-}
-
-const initialState: SearchNameSlice = {
-  value: '',
-}
-
-export const searchNameSlice = createSlice({
-  name: 'searchName',
-  initialState,
-  reducers: {
-    searchByName: (state, action: PayloadAction<string>) => {
-      state.value = action.payload
-    },
-  },
-})
-
-export const { searchByName } = searchNameSlice.actions
-
-export const selectSearchValue = (state: RootState) => state.searchName.value
-
-export default searchNameSlice.reducer
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 2b512ca7..186fc0d8 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -8,15 +8,9 @@ import ApplicantGrid from '~/components/recruitment/ApplicantGrid'
 import InfoPopup from '~/components/recruitment/InfoPopup'
 import { trpc } from '~/utils/trpc'
 import { useSelector } from 'react-redux'
-import { selectSearchValue } from '~/components/recruitment/searchNameSlice'
 
 const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
   const { data } = trpc.recruitment.getAllApplicants.useQuery()
-  const searchValue = useSelector(selectSearchValue)
-
-  const filteredData = data?.filter((item) =>
-    searchValue == '' ? item : item.name?.toLowerCase().includes(searchValue)
-  )
 
   return (
     <>
@@ -32,7 +26,7 @@ const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
       <Layout>
         <Text className="text-center text-4xl font-bold">Applicants</Text>
         <SearchBar />
-        <ApplicantGrid data={filteredData} />
+        <ApplicantGrid data={data} />
         <InfoPopup />
       </Layout>
     </>
diff --git a/src/store/store.ts b/src/store/store.ts
deleted file mode 100644
index 4deb8b5c..00000000
--- a/src/store/store.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { configureStore } from '@reduxjs/toolkit'
-import dashboardReducer from './admin/dashboard'
-import searchNameReducer from '../components/recruitment/searchNameSlice'
-
-const store = configureStore({
-  reducer: {
-    dashboard: dashboardReducer,
-    searchName: searchNameReducer,
-  },
-})
-
-// Infer the `RootState` and `AppDispatch` types from the store itself
-export type RootState = ReturnType<typeof store.getState>
-// Inferred type: {posts: PostsState, comments: CommentsState, users: UsersState}
-export type AppDispatch = typeof store.dispatch
-export default store

From 23056beb9ab26532886fc4d919aff88eb8b9b5c2 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Thu, 25 May 2023 23:42:59 +0800
Subject: [PATCH 018/223] Update the UI for the create single user

---
 prisma/schema.prisma                    |   4 +-
 src/components/users/SingleUserForm.tsx | 210 ++++++++++++++++++++++--
 src/server/trpc/router/member/create.ts |  10 +-
 src/server/trpc/router/member/helper.ts |   5 +-
 4 files changed, 204 insertions(+), 25 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 284da80d..3717c9ae 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -28,7 +28,7 @@ model Departments {
 
 model User {
   batch           String?
-  department      String?
+  department      String
   discord         String?
   email           String       @unique
   faculty         String?
@@ -37,7 +37,7 @@ model User {
   id              String       @id
   image           String?
   major           String?
-  name            String?
+  name            String
   personal_email  String?
   role            String
   telegram        String?
diff --git a/src/components/users/SingleUserForm.tsx b/src/components/users/SingleUserForm.tsx
index 902b6669..8b5d697e 100644
--- a/src/components/users/SingleUserForm.tsx
+++ b/src/components/users/SingleUserForm.tsx
@@ -8,22 +8,175 @@ import {
   Checkbox,
 } from '@chakra-ui/react'
 import { useRouter } from 'next/router'
-import { useState, type FormEvent } from 'react'
+import { useState, useCallback } from 'react'
+
+const roles = [
+  {
+    department: 'Software Engineering',
+    role: 'Software Engineer',
+  },
+  {
+    department: 'Software Engineering',
+    role: 'Technical Lead',
+  },
+  {
+    department: 'Software Engineering',
+    role: 'UI/UX Designer',
+  },
+  {
+    department: 'Software Engineering',
+    role: 'Head of Design',
+  },
+  {
+    department: 'Software Engineering',
+    role: 'Co-Director',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Co-Director',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Core Developer',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Community Manager',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Developer',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Lead Developer',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Research Analyst',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Research Community Developer',
+  },
+  {
+    department: 'Machine Learning',
+    role: 'Quant Tech Analyst',
+  },
+  ,
+  {
+    department: 'Machine Learning',
+    role: 'Quant Tech Lead',
+  },
+  {
+    department: 'Machine Learning',
+    role: 'Quant wing head',
+  },
+  {
+    department: 'Machine Learning',
+    role: 'Project Tech Analyst',
+  },
+  {
+    department: 'Machine Learning',
+    role: 'Project Tech Lead',
+  },
+  {
+    department: 'Machine Learning',
+    role: 'Tech Analyst/Trainee',
+  },
+  {
+    department: 'Machine Learning',
+    role: 'Training Head',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Co-Director',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Community Development Executive',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Community Development Lead',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Finance Executive',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Finance Lead',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Project Manager Executive',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Product Manager',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Talent Management Executive',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Talent Management Lead',
+  },
+  {
+    department: 'External Relations',
+    role: 'Partnerships Executive',
+  },
+  {
+    department: 'External Relations',
+    role: 'Director',
+  },
+  {
+    department: 'External Relations',
+    role: 'Marketing Executive',
+  },
+  {
+    department: 'External Relations',
+    role: 'Marketing Lead',
+  },
+  {
+    department: 'External Relations',
+    role: 'Partnerships Lead',
+  },
+  {
+    department: 'External Relations',
+    role: 'Finance Executive',
+  },
+  {
+    department: 'External Relations',
+    role: 'Finance Lead',
+  },
+]
 
 const SingleUserForm = () => {
   const router = useRouter()
   const { mutateAsync, isLoading } = trpc.member.createSingleUser.useMutation()
   const toast = useToast()
   const [email, setEmail] = useState('')
+  const [name, setName] = useState('')
+  const [department, setDepartment] = useState('')
   const [password, setPassword] = useState('')
   const [role, setRole] = useState('')
   const [id, setId] = useState('')
   const [isAdmin, setIsAdmin] = useState(false)
 
-  const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
+  const handleSubmit = useCallback(async () => {
     try {
-      e.preventDefault()
-      await mutateAsync({ email, password, id, isAdmin, role })
+      await mutateAsync({
+        name,
+        department,
+        email,
+        password,
+        id,
+        isAdmin,
+        role,
+      })
       toast({
         title: 'Successfully updated!',
         description: 'User successfully created',
@@ -40,17 +193,28 @@ const SingleUserForm = () => {
         duration: 9000,
       })
     }
-  }
+  }, [department, email, id, isAdmin, mutateAsync, name, password, role, toast])
 
   return (
-    <form onSubmit={handleSubmit}>
+    <>
       <Input
-        id="id"
+        id="name"
         isRequired
         marginY={5}
+        name="name"
+        onChange={(e) => setName(e.target.value)}
+        placeholder="Name"
+        value={name}
+        variant="outline"
+      />
+
+      <Input
+        id="id"
+        isRequired
+        marginBottom={5}
         name="id"
         onChange={(e) => setId(e.target.value)}
-        placeholder="Enter the student id"
+        placeholder="Matriculation Number"
         value={id}
         variant="outline"
       />
@@ -62,7 +226,7 @@ const SingleUserForm = () => {
           marginBottom={5}
           name="email"
           onChange={(e) => setEmail(e.target.value)}
-          placeholder="Enter a email"
+          placeholder="Email"
           value={email}
           variant="outline"
         />
@@ -73,8 +237,9 @@ const SingleUserForm = () => {
         marginBottom={5}
         name="password"
         type="password"
+        isRequired
         onChange={(e) => setPassword(e.target.value)}
-        placeholder="Enter a password. If no password is provided, a random one will be generated"
+        placeholder="Password"
         value={password}
         variant="outline"
       />
@@ -82,13 +247,22 @@ const SingleUserForm = () => {
       <Select
         marginBottom={5}
         isRequired
-        onChange={(e) => setRole(e.target.value)}
-        placeholder="Select the level"
+        onChange={(e) => {
+          setRole(e.target.value)
+          if (!e.target.value) return
+          const element = roles.filter((role) => role.role === e.target.value)
+          if (!element || !element.length || !element[0]) return
+          setDepartment(element[0].department)
+        }}
+        placeholder="Select role"
       >
-        <option value="member">Member</option>
-        <option value="lead">Lead</option>
-        <option value="codirector">Co-Director</option>
-        <option value="director">Director</option>
+        {roles.map((role) => {
+          return (
+            <option key={role.role} value={role.role}>
+              {role.role} ({role.department})
+            </option>
+          )
+        })}
       </Select>
 
       <Checkbox
@@ -113,12 +287,12 @@ const SingleUserForm = () => {
           bg="light.secondary.primary"
           className="text-white"
           isLoading={isLoading}
-          type="submit"
+          onClick={handleSubmit}
         >
           Create User
         </Button>
       </div>
-    </form>
+    </>
   )
 }
 
diff --git a/src/server/trpc/router/member/create.ts b/src/server/trpc/router/member/create.ts
index 08f24f05..0c83a2f7 100644
--- a/src/server/trpc/router/member/create.ts
+++ b/src/server/trpc/router/member/create.ts
@@ -64,20 +64,22 @@ export const addMultipleUsers = protectedProcedure
 export const createSingleUser = protectedProcedure
   .input(
     z.object({
+      department: z.string(),
       id: z.string(),
       email: z.string(),
+      name: z.string(),
       role: z.string(),
-      password: z.optional(z.string()),
+      password: z.string(),
       isAdmin: z.boolean(),
     })
   )
   .mutation(async ({ ctx, input }) => {
     try {
-      const { email, id, isAdmin, role } = input
-      const password = input.password || randomBytes(10).toString('hex')
+      const { email, id, isAdmin, role, department, name } = input
+      const password = input.password
 
       await checkIfUserExist(email, ctx.prisma)
-      await createNewUser(email, id, isAdmin, role, password, ctx.prisma)
+      await createNewUser(name, department, email, id, isAdmin, role, password, ctx.prisma)
       await sendEmail(email, password)
     } catch (e) {
       await ctx.prisma.log.create({
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index 1b970fcb..dec00a45 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -52,6 +52,8 @@ async function checkIfUserExist(email: string, prisma: PrismaClient) {
  * @param password The password of the user
  */
 async function createNewUser(
+  name: string,
+  department: string,
   email: string,
   id: string,
   isAdmin: boolean,
@@ -64,7 +66,8 @@ async function createNewUser(
   await prisma.user.create({
     data: {
       batch: 'AY2022/2023',
-      name: '',
+      department,
+      name,
       role,
       email,
       id,

From 56cff94752ec6f36e6b706543f4e91aa15d735e8 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Thu, 25 May 2023 23:48:52 +0800
Subject: [PATCH 019/223] Fix typing issue

---
 src/components/users/SingleUserForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/users/SingleUserForm.tsx b/src/components/users/SingleUserForm.tsx
index 8b5d697e..6403b786 100644
--- a/src/components/users/SingleUserForm.tsx
+++ b/src/components/users/SingleUserForm.tsx
@@ -152,7 +152,7 @@ const roles = [
     department: 'External Relations',
     role: 'Finance Lead',
   },
-]
+] as { department: string; role: string }[]
 
 const SingleUserForm = () => {
   const router = useRouter()

From c1b8dafe978491a16eefa6ea6c439e5c827c0cd4 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Fri, 26 May 2023 14:39:20 +0800
Subject: [PATCH 020/223] remove unused import

---
 src/pages/recruitment/applicants.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 186fc0d8..90fa1f4b 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -7,7 +7,6 @@ import withAuth, { type BaseProps } from '~/utils/withAuth'
 import ApplicantGrid from '~/components/recruitment/ApplicantGrid'
 import InfoPopup from '~/components/recruitment/InfoPopup'
 import { trpc } from '~/utils/trpc'
-import { useSelector } from 'react-redux'
 
 const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
   const { data } = trpc.recruitment.getAllApplicants.useQuery()

From 1b4a080b5574057cd0083cb9861f86e486db4655 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Fri, 26 May 2023 15:01:48 +0800
Subject: [PATCH 021/223] update buildUserObject w new schema

---
 src/server/trpc/router/member/helper.ts | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index b9b59db6..7607e0f3 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -123,18 +123,14 @@ async function sendEmail(email: string, password: string) {
 function buildUserObject(
   input: {
     date_of_birth: string
-    diet: string
     department: string
     discord: string
     faculty: string
     gender: string
-    linkedin: string
     major: string
     name: string
     nus_email: string
     personal_email: string
-    phone: string
-    race: string
     role: string
     student_id: string
     telegram: string
@@ -147,23 +143,19 @@ function buildUserObject(
       batch: 'AY22/23',
       department: user.department,
       date_of_birth: dayjs().toDate(),
-      diet: user.diet,
       discord: user.discord,
       faculty: user.faculty,
       gender: user.gender,
       hashedPassword,
       image: null,
-      interviewNotes: user.interviewNotes,
       level: 'member',
-      linkedin: user.linkedin,
       major: user.major,
       id: user.student_id,
       isAdmin: false,
+      interviewNotes: null,
       name: user.name,
       email: user.nus_email,
       personal_email: user.personal_email,
-      phone: user.phone,
-      race: user.race,
       role: user.role,
       telegram: user.telegram,
       total_events: 0,

From 3748fd0fe030c68c4fa66e85213864f6828b7927 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sat, 27 May 2023 22:06:50 +0800
Subject: [PATCH 022/223] schema update inc department relation

---
 prisma/schema.prisma                               | 4 +++-
 src/server/trpc/router/admin/recruitment/create.ts | 7 ++++++-
 src/server/trpc/router/admin/recruitment/read.ts   | 2 +-
 src/server/trpc/router/member/create.ts            | 2 +-
 src/server/trpc/router/member/helper.ts            | 8 ++++----
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index c18fec3b..c4370d07 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -25,11 +25,13 @@ model Department {
   name          String
   projects      Project[]
   AppliedRole   AppliedRole[] @relation("appliedDepartment")
+  User          User[]
 }
 
 model User {
   batch           String?
-  department      String
+  department      Department?   @relation(fields: [departmentId], references: [department_id])
+  departmentId    String?
   discord         String?
   email           String        @unique
   faculty         String?
diff --git a/src/server/trpc/router/admin/recruitment/create.ts b/src/server/trpc/router/admin/recruitment/create.ts
index 2697ccaf..9f3ff726 100644
--- a/src/server/trpc/router/admin/recruitment/create.ts
+++ b/src/server/trpc/router/admin/recruitment/create.ts
@@ -8,6 +8,7 @@ import { ErrorTitle } from '../../constants/ErrorTitle'
 export const createSingleApplicant = protectedProcedure
   .input(
     z.object({
+      id: z.string(),
       email: z.string(),
       password: z.string(),
       name: z.string(),
@@ -24,25 +25,29 @@ export const createSingleApplicant = protectedProcedure
     try {
       await ctx.prisma.user.create({
         data: {
+          id: input.id,
           email: input.email,
           hashedPassword,
           name: input.name,
-          level: 'applicant',
+          role: 'Applicant',
           appliedRoles: {
             create: [
               {
+                id: input.id,
                 rank: 1,
                 departmentId: input.firstDepartmentId,
                 role: input.firstRole,
                 status: ApplicationStatus.PENDINGREVIEW,
               },
               {
+                id: input.id,
                 rank: 2,
                 departmentId: input.secondDepartmentId,
                 role: input.secondRole,
                 status: ApplicationStatus.PENDINGREVIEW,
               },
               {
+                id: input.id,
                 rank: 3,
                 departmentId: input.thirdDepartmentId,
                 role: input.thirdRole,
diff --git a/src/server/trpc/router/admin/recruitment/read.ts b/src/server/trpc/router/admin/recruitment/read.ts
index 4c3340aa..21ade831 100644
--- a/src/server/trpc/router/admin/recruitment/read.ts
+++ b/src/server/trpc/router/admin/recruitment/read.ts
@@ -6,7 +6,7 @@ export const getAllApplicants = protectedProcedure.query(async ({ ctx }) => {
   try {
     return await ctx.prisma.user.findMany({
       where: {
-        level: 'applicant',
+        role: 'applicant',
       },
       select: {
         id: true,
diff --git a/src/server/trpc/router/member/create.ts b/src/server/trpc/router/member/create.ts
index 928c4347..8c481139 100644
--- a/src/server/trpc/router/member/create.ts
+++ b/src/server/trpc/router/member/create.ts
@@ -24,7 +24,7 @@ export const addMultipleUsers = protectedProcedure
       z.object({
         date_of_birth: z.string(),
         diet: z.string(),
-        department: z.string(),
+        departmentId: z.string(),
         discord: z.string(),
         faculty: z.string(),
         gender: z.string(),
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index 7607e0f3..574c550b 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -53,7 +53,7 @@ async function checkIfUserExist(email: string, prisma: PrismaClient) {
  */
 async function createNewUser(
   name: string,
-  department: string,
+  departmentId: string,
   email: string,
   id: string,
   isAdmin: boolean,
@@ -66,7 +66,7 @@ async function createNewUser(
   await prisma.user.create({
     data: {
       batch: 'AY2022/2023',
-      department,
+      departmentId,
       name,
       role,
       email,
@@ -123,7 +123,7 @@ async function sendEmail(email: string, password: string) {
 function buildUserObject(
   input: {
     date_of_birth: string
-    department: string
+    departmentId: string
     discord: string
     faculty: string
     gender: string
@@ -141,7 +141,7 @@ function buildUserObject(
   return input.map((user) => {
     return {
       batch: 'AY22/23',
-      department: user.department,
+      departmentId: user.departmentId,
       date_of_birth: dayjs().toDate(),
       discord: user.discord,
       faculty: user.faculty,

From 44a2382e540e439967946f9bb6bf6dc6adc0b090 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 28 May 2023 18:10:50 +0800
Subject: [PATCH 023/223] impl search applicant and edit notes fn

---
 src/components/common/SearchBar.tsx           |  8 +++-
 src/components/recruitment/ApplicantCard.tsx  |  6 +--
 src/components/recruitment/ApplicantGrid.tsx  | 35 ++++++++++-----
 src/components/recruitment/NoteModal.tsx      | 43 +++++++------------
 src/constant/messages.ts                      |  2 +
 src/context/recruitment/SearchProvider.tsx    | 24 +++++++++++
 src/pages/recruitment/applicants.tsx          | 12 +++---
 .../trpc/router/admin/recruitment/read.ts     |  2 +-
 src/types/model.ts                            |  2 +-
 9 files changed, 82 insertions(+), 52 deletions(-)
 create mode 100644 src/context/recruitment/SearchProvider.tsx

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index a7d1f6d2..0a4d15d0 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -1,8 +1,11 @@
-import React, { useState } from 'react'
+import React, { useContext, useState } from 'react'
 import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import { SearchIcon } from '@chakra-ui/icons'
+import { searchContext } from '~/context/recruitment/SearchProvider'
 
 const SearchBar = () => {
+  const { search, setSearch } = useContext(searchContext)
+  console.log('searchbar: ', search)
   return (
     <InputGroup
       minWidth={'150px'}
@@ -24,6 +27,9 @@ const SearchBar = () => {
         border="3px solid #004586"
         borderColor="#004586"
         borderRadius="20px"
+        onChange={(e) => {
+          setSearch(e.currentTarget.value)
+        }}
       ></Input>
     </InputGroup>
   )
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index a2a425d9..be1f1223 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -8,14 +8,12 @@ import {
   Stack,
   UnorderedList,
 } from '@chakra-ui/react'
-import { User } from '@prisma/client'
 import { Avatar } from 'flowbite-react'
 import AppliedRoleListItem from './AppliedRoleListItem'
 import DocumentModal from './DocumentModal'
 import NoteModal from './NoteModal'
-import type { AppliedRole } from '@prisma/client'
 import { trpc } from '~/utils/trpc'
-import { ApplicantWithAppliedRole } from '~/types/model'
+import type { ApplicantWithAppliedRole } from '~/types/model'
 
 const ApplicantCard = ({
   applicant,
@@ -31,7 +29,7 @@ const ApplicantCard = ({
     >
       <CardHeader paddingBottom="0" zIndex={1}>
         <Heading size="md" textAlign="center" textColor="white">
-          Name
+          {applicant.name}
         </Heading>
       </CardHeader>
       <Image
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index e894607a..52c0e3a5 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,17 +1,30 @@
-import type { ApplicantWithAppliedRole } from '~/types/model'
+import { useContext } from 'react'
+import { searchContext } from '~/context/recruitment/SearchProvider'
+import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
+import InfoPopup from '~/components/recruitment/InfoPopup'
+
+const ApplicantGrid = () => {
+  const { search } = useContext(searchContext)
+  const { data } = trpc.recruitment.getAllApplicants.useQuery()
+  if (!data) return <></>
+
+  const filteredData =
+    search === ''
+      ? data
+      : data?.filter((applicant) => {
+          return applicant.name.toLowerCase().includes(search.toLowerCase())
+        })
 
-const ApplicantGrid = ({
-  data,
-}: {
-  data: ApplicantWithAppliedRole[] | undefined
-}) => {
   return (
-    <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
-      {data?.map((applicant) => {
-        return <ApplicantCard applicant={applicant} key={applicant.id} />
-      })}
-    </div>
+    <>
+      <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
+        {filteredData?.map((applicant) => {
+          return <ApplicantCard applicant={applicant} key={applicant.id} />
+        })}
+      </div>
+      {filteredData.length > 0 && <InfoPopup />}
+    </>
   )
 }
 
diff --git a/src/components/recruitment/NoteModal.tsx b/src/components/recruitment/NoteModal.tsx
index 29cffa6b..20d4c85a 100644
--- a/src/components/recruitment/NoteModal.tsx
+++ b/src/components/recruitment/NoteModal.tsx
@@ -27,13 +27,13 @@ const NoteModal = ({
   interviewNotes: string | null
   refetch: () => Promise<QueryObserverResult>
 }) => {
-  interviewNotes = 'hello there testing'
-
   const toast = useToast()
   const { mutateAsync } = trpc.recruitment.updateInterviewNotes.useMutation()
   const [edit, setEdit] = useState(false)
-  const [notes, setNotes] = useState('default notes')
-  const [tempNotes, setTempNotes] = useState('')
+  const [notes, setNotes] = useState(interviewNotes ? interviewNotes : '')
+  const [tempNotes, setTempNotes] = useState(
+    interviewNotes ? interviewNotes : ''
+  )
   const { isOpen, onOpen, onClose } = useDisclosure()
 
   //TODO: checking inputs
@@ -61,20 +61,20 @@ const NoteModal = ({
     })
 
     toast({
-      duration: 3000,
+      duration: 2000,
       status: 'loading',
       title: 'Loading',
-      description: Message.PERSONAL_INFO_LOADING,
+      description: Message.APPLICANT_INFO_LOADING,
     })
 
     await refetch()
     setEdit(false)
 
     toast({
-      duration: 3000,
+      duration: 2000,
       status: 'success',
       title: 'Success',
-      description: Message.PERSONAL_INFO_SUCCESS,
+      description: Message.APPLICANT_INFO_SUCCESS,
     })
   }
 
@@ -99,25 +99,14 @@ const NoteModal = ({
           <ModalHeader textAlign="center">Interview Notes</ModalHeader>
           <ModalCloseButton />
           <ModalBody>
-            {tempNotes ? (
-              <Input
-                variant="unstyled"
-                value={tempNotes}
-                onChange={(e) => {
-                  setTempNotes(e.currentTarget.value)
-                  setEdit(true)
-                }}
-              />
-            ) : (
-              <Input
-                variant="unstyled"
-                placeholder="Write notes.."
-                onChange={(e) => {
-                  setTempNotes(e.currentTarget.value)
-                  setEdit(true)
-                }}
-              />
-            )}
+            <Input
+              variant="unstyled"
+              value={tempNotes || ''}
+              onChange={(e) => {
+                setTempNotes(e.currentTarget.value)
+                setEdit(true)
+              }}
+            />
           </ModalBody>
           <ModalFooter>
             {edit ? (
diff --git a/src/constant/messages.ts b/src/constant/messages.ts
index cb2b5c10..e4301b64 100644
--- a/src/constant/messages.ts
+++ b/src/constant/messages.ts
@@ -5,4 +5,6 @@ export enum Message {
   PERSONAL_INFO_ERROR = 'An error occurred while updating your personal information. Please try again. If this error continues, please contact the dev team',
   PERSONAL_INFO_LOADING = 'Your contact info is currently being updated. Please wait for a while.',
   PERSONAL_INFO_SUCCESS = 'Your contact info has been successfully updated.',
+  APPLICANT_INFO_LOADING = 'Applicant info is currently being updated. Please wait for awhile.',
+  APPLICANT_INFO_SUCCESS = 'Applicant info has been successfully updated.',
 }
diff --git a/src/context/recruitment/SearchProvider.tsx b/src/context/recruitment/SearchProvider.tsx
new file mode 100644
index 00000000..0405535d
--- /dev/null
+++ b/src/context/recruitment/SearchProvider.tsx
@@ -0,0 +1,24 @@
+import { createContext, Dispatch, SetStateAction, useState } from 'react'
+
+type SearchContextType = {
+  search: string
+  setSearch: (s: string) => void
+}
+
+export const searchContext = createContext<SearchContextType>({
+  search: '',
+  setSearch: () => {
+    return
+  },
+})
+
+const SearchProvider = (props: any) => {
+  const [search, setSearch] = useState<string>('')
+  return (
+    <searchContext.Provider value={{ search, setSearch }}>
+      {props.children}
+    </searchContext.Provider>
+  )
+}
+
+export default SearchProvider
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 90fa1f4b..54e73311 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -5,12 +5,9 @@ import TopNavbar from '~/components/common/TopNavbar'
 import SearchBar from '~/components/common/SearchBar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
 import ApplicantGrid from '~/components/recruitment/ApplicantGrid'
-import InfoPopup from '~/components/recruitment/InfoPopup'
-import { trpc } from '~/utils/trpc'
+import SearchProvider from '~/context/recruitment/SearchProvider'
 
 const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
-  const { data } = trpc.recruitment.getAllApplicants.useQuery()
-
   return (
     <>
       <Head>
@@ -24,9 +21,10 @@ const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
       <TopNavbar isAdmin={session.isAdmin} />
       <Layout>
         <Text className="text-center text-4xl font-bold">Applicants</Text>
-        <SearchBar />
-        <ApplicantGrid data={data} />
-        <InfoPopup />
+        <SearchProvider>
+          <SearchBar />
+          <ApplicantGrid />
+        </SearchProvider>
       </Layout>
     </>
   )
diff --git a/src/server/trpc/router/admin/recruitment/read.ts b/src/server/trpc/router/admin/recruitment/read.ts
index 21ade831..54a1a6f6 100644
--- a/src/server/trpc/router/admin/recruitment/read.ts
+++ b/src/server/trpc/router/admin/recruitment/read.ts
@@ -6,7 +6,7 @@ export const getAllApplicants = protectedProcedure.query(async ({ ctx }) => {
   try {
     return await ctx.prisma.user.findMany({
       where: {
-        role: 'applicant',
+        role: 'Applicant',
       },
       select: {
         id: true,
diff --git a/src/types/model.ts b/src/types/model.ts
index 5245fb18..e6c03eb2 100644
--- a/src/types/model.ts
+++ b/src/types/model.ts
@@ -1,4 +1,4 @@
-import { AppliedRole, Prisma } from '@prisma/client'
+import type { AppliedRole } from '@prisma/client'
 
 export type ApplicantWithAppliedRole = {
   id: string

From 0ac8905ff08f43646eb4c81c55fed94333be3905 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Mon, 29 May 2023 21:58:28 +0800
Subject: [PATCH 024/223] file upload impl w firebase

---
 firebase.ts                                   |  16 +
 package.json                                  |   1 +
 src/components/recruitment/ApplicantCard.tsx  |   5 +-
 src/components/recruitment/DocumentModal.tsx  |  44 +-
 .../recruitment/DocumentModalAdd.tsx          |  61 ++
 .../recruitment/DocumentModalAddButton.tsx    |  21 -
 .../recruitment/DocumentModalCard.tsx         |  17 +-
 src/constant/messages.ts                      |   2 +
 src/types/model.ts                            |   2 +-
 yarn.lock                                     | 687 +++++++++++++++++-
 10 files changed, 820 insertions(+), 36 deletions(-)
 create mode 100644 firebase.ts
 create mode 100644 src/components/recruitment/DocumentModalAdd.tsx
 delete mode 100644 src/components/recruitment/DocumentModalAddButton.tsx

diff --git a/firebase.ts b/firebase.ts
new file mode 100644
index 00000000..23eab88e
--- /dev/null
+++ b/firebase.ts
@@ -0,0 +1,16 @@
+// Import the functions you need from the SDKs you need
+import { initializeApp } from 'firebase/app'
+import { getStorage } from 'firebase/storage'
+
+const firebaseConfig = {
+  apiKey: 'AIzaSyAOUlACTtNKliBsPnGsWnCu0I_76eXDQ-U',
+  authDomain: 'fintech-society.firebaseapp.com',
+  projectId: 'fintech-society',
+  storageBucket: 'fintech-society.appspot.com',
+  messagingSenderId: '181597094279',
+  appId: '1:181597094279:web:f5dd7ebab8e9750337d322',
+}
+
+// Initialize Firebase
+const app = initializeApp(firebaseConfig)
+export const storage = getStorage(app)
diff --git a/package.json b/package.json
index a43c912b..d1909757 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "bcryptjs": "^2.4.3",
     "clsx": "^1.2.1",
     "dayjs": "^1.11.7",
+    "firebase": "^9.22.1",
     "flowbite": "^1.6.5",
     "flowbite-react": "^0.4.4",
     "framer-motion": "^9.0.4",
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index be1f1223..01a902a7 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -46,7 +46,10 @@ const ApplicantCard = ({
           <Avatar alt="User-settings" rounded={true} size="lg" />
           <Box className="flex justify-center">
             <Box>
-              <DocumentModal />
+              <DocumentModal
+                applicantId={applicant.id}
+                applicantName={applicant.name}
+              />
               <NoteModal
                 applicantId={applicant.id}
                 interviewNotes={applicant.interviewNotes}
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
index 5d4a07c3..a6b44f41 100644
--- a/src/components/recruitment/DocumentModal.tsx
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -8,12 +8,42 @@ import {
   ModalOverlay,
   useDisclosure,
 } from '@chakra-ui/react'
+import { getDownloadURL, listAll, ref } from 'firebase/storage'
+import { useEffect, useState } from 'react'
 import { BsFolder2Open } from 'react-icons/bs'
-import DocumentModalAddButton from './DocumentModalAddButton'
+import { storage } from '~/../firebase'
+import DocumentModalAdd from './DocumentModalAdd'
 import DocumentModalCard from './DocumentModalCard'
 
-const DocumentModal = () => {
+const DocumentModal = ({
+  applicantId,
+  applicantName,
+}: {
+  applicantId: string
+  applicantName: string
+}) => {
   const { isOpen, onOpen, onClose } = useDisclosure()
+  const [fileList, setFileList] = useState<string[]>([])
+  const applicantListRef = ref(storage, `${applicantId}/`)
+
+  // Hook to get the files associated with the applicant
+  useEffect(() => {
+    listAll(applicantListRef)
+      .then((res) => {
+        const urlList: string[] = []
+        res.items.forEach((item) => {
+          getDownloadURL(item).then((url) => {
+            urlList.push(url)
+          })
+        })
+        setFileList(urlList)
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+    console.log('fileList: ', fileList)
+  }, [])
+
   return (
     <>
       <IconButton
@@ -33,15 +63,17 @@ const DocumentModal = () => {
           boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
         >
           <ModalHeader textAlign="center" fontSize="2xl">
-            [Username] Documents
+            {applicantName} Documents
           </ModalHeader>
           <ModalCloseButton />
           <ModalBody>
             <div className="my-5 mx-10 grid grid-cols-1 place-items-center gap-y-10 lg:grid-cols-2 ">
-              <DocumentModalCard />
-              <DocumentModalCard />
-              <DocumentModalAddButton />
+              {fileList.map((file) => {
+                console.log('file: ', file)
+                return <DocumentModalCard file={file} key={file} />
+              })}
             </div>
+            <DocumentModalAdd applicantId={applicantId} />
           </ModalBody>
         </ModalContent>
       </Modal>
diff --git a/src/components/recruitment/DocumentModalAdd.tsx b/src/components/recruitment/DocumentModalAdd.tsx
new file mode 100644
index 00000000..54c51d1a
--- /dev/null
+++ b/src/components/recruitment/DocumentModalAdd.tsx
@@ -0,0 +1,61 @@
+import { AddIcon } from '@chakra-ui/icons'
+import { Box, IconButton, Input, useToast } from '@chakra-ui/react'
+import { useEffect, useState } from 'react'
+import { storage } from '../../../firebase'
+import { ref, uploadBytes } from 'firebase/storage'
+import { uuidv4 } from '@firebase/util'
+import { Message } from '~/constant/messages'
+
+const DocumentModalAdd = ({ applicantId }: { applicantId: string }) => {
+  const toast = useToast()
+  const [file, setFile] = useState<File>()
+
+  const uploadFile = () => {
+    if (file == null) return
+    const fileRef = ref(storage, `${applicantId}/${file.name + uuidv4()}`)
+    uploadBytes(fileRef, file)
+      .then(() => {
+        toast({
+          duration: 2000,
+          status: 'success',
+          title: 'Success',
+          description: Message.FILE_UPLOAD_SUCCESS,
+        })
+      })
+      .catch(() => {
+        toast({
+          duration: 2000,
+          status: 'error',
+          title: 'Error',
+          description: Message.FILE_UPLOAD_FAIL,
+        })
+      })
+  }
+
+  return (
+    <Box className="mx-10 mt-10 mb-4 flex">
+      <Input
+        type="file"
+        mr="4"
+        onChange={(e) => {
+          if (e.target.files) setFile(e.target.files[0])
+        }}
+      ></Input>
+      <IconButton
+        aria-label="Info popup for applicant detail"
+        icon={<AddIcon />}
+        borderRadius="30px"
+        boxShadow="0px 4px 4px 2px rgba(0, 0, 0, 0.15)"
+        bg="white"
+        _hover={{ background: '#e4e8ff' }}
+        fontSize="16px"
+        p="4"
+        width="30px"
+        height="30px"
+        onClick={uploadFile}
+      />
+    </Box>
+  )
+}
+
+export default DocumentModalAdd
diff --git a/src/components/recruitment/DocumentModalAddButton.tsx b/src/components/recruitment/DocumentModalAddButton.tsx
deleted file mode 100644
index b6a543ee..00000000
--- a/src/components/recruitment/DocumentModalAddButton.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { AddIcon } from '@chakra-ui/icons'
-import { IconButton } from '@chakra-ui/react'
-
-const DocumentModalAddButton = () => {
-  return (
-    <IconButton
-      aria-label="Info popup for applicant detail"
-      icon={<AddIcon />}
-      borderRadius="30px"
-      boxShadow="0px 8px 4px 2px rgba(0, 0, 0, 0.15)"
-      bg="white"
-      _hover={{ background: '#e4e8ff' }}
-      fontSize="40px"
-      p="12"
-      width="120px"
-      height="120px"
-    />
-  )
-}
-
-export default DocumentModalAddButton
diff --git a/src/components/recruitment/DocumentModalCard.tsx b/src/components/recruitment/DocumentModalCard.tsx
index 2fe98acd..9ef3a0a0 100644
--- a/src/components/recruitment/DocumentModalCard.tsx
+++ b/src/components/recruitment/DocumentModalCard.tsx
@@ -1,17 +1,24 @@
-import { Card, CardBody, Text } from '@chakra-ui/react'
+import { Card, CardBody, IconButton, Text } from '@chakra-ui/react'
 
-const DocumentModalCard = () => {
+const DocumentModalCard = ({ file }: { file: string }) => {
+  const openDocumentInNewTab = () => {
+    window.open(file, '_blank', 'noreferrer')
+  }
   return (
-    <Card
+    <IconButton
+      aria-label={file}
       borderRadius="30px"
       boxShadow="0px 8px 4px 2px rgba(0, 0, 0, 0.15)"
+      bg="white"
+      _hover={{ background: '#e4e8ff' }}
       width="120px"
       height="120px"
+      onClick={() => openDocumentInNewTab()}
     >
       <CardBody>
-        <Text textAlign="center">Transcript</Text>
+        <Text textAlign="center">Document</Text>
       </CardBody>
-    </Card>
+    </IconButton>
   )
 }
 
diff --git a/src/constant/messages.ts b/src/constant/messages.ts
index e4301b64..b9597e65 100644
--- a/src/constant/messages.ts
+++ b/src/constant/messages.ts
@@ -2,6 +2,8 @@ export enum Message {
   IMAGE_UPLOAD_ERROR = 'An error occured while uploading your image. Please try again. If this error continues, please contact the dev team.',
   IMAGE_UPLOAD_LOADING = 'Your image is currently being updated. Please wait for a while.',
   IMAGE_UPLOAD_SUCCESS = 'Your image has been successfully updated. Please refresh to see the updated image.',
+  FILE_UPLOAD_SUCCESS = 'File has been successfully uploaded.',
+  FILE_UPLOAD_FAIL = 'An error occurred while uploading file.',
   PERSONAL_INFO_ERROR = 'An error occurred while updating your personal information. Please try again. If this error continues, please contact the dev team',
   PERSONAL_INFO_LOADING = 'Your contact info is currently being updated. Please wait for a while.',
   PERSONAL_INFO_SUCCESS = 'Your contact info has been successfully updated.',
diff --git a/src/types/model.ts b/src/types/model.ts
index e6c03eb2..d36946e4 100644
--- a/src/types/model.ts
+++ b/src/types/model.ts
@@ -2,7 +2,7 @@ import type { AppliedRole } from '@prisma/client'
 
 export type ApplicantWithAppliedRole = {
   id: string
-  name: string | null
+  name: string
   interviewNotes: string | null
   appliedRoles: AppliedRole[]
 }
diff --git a/yarn.lock b/yarn.lock
index f0e0b271..3e584825 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1144,6 +1144,378 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@firebase/analytics-compat@0.2.6":
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.2.6.tgz#50063978c42f13eb800e037e96ac4b17236841f4"
+  integrity sha512-4MqpVLFkGK7NJf/5wPEEP7ePBJatwYpyjgJ+wQHQGHfzaCDgntOnl9rL2vbVGGKCnRqWtZDIWhctB86UWXaX2Q==
+  dependencies:
+    "@firebase/analytics" "0.10.0"
+    "@firebase/analytics-types" "0.8.0"
+    "@firebase/component" "0.6.4"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/analytics-types@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.8.0.tgz#551e744a29adbc07f557306530a2ec86add6d410"
+  integrity sha512-iRP+QKI2+oz3UAh4nPEq14CsEjrjD6a5+fuypjScisAh9kXKFvdJOZJDwk7kikLvWVLGEs9+kIUS4LPQV7VZVw==
+
+"@firebase/analytics@0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.10.0.tgz#9c6986acd573c6c6189ffb52d0fd63c775db26d7"
+  integrity sha512-Locv8gAqx0e+GX/0SI3dzmBY5e9kjVDtD+3zCFLJ0tH2hJwuCAiL+5WkHuxKj92rqQj/rvkBUCfA1ewlX2hehg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/app-check-compat@0.3.7":
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.3.7.tgz#e150f61d653a0f2043a34dcb995616a717161839"
+  integrity sha512-cW682AxsyP1G+Z0/P7pO/WT2CzYlNxoNe5QejVarW2o5ZxeWSSPAiVEwpEpQR/bUlUmdeWThYTMvBWaopdBsqw==
+  dependencies:
+    "@firebase/app-check" "0.8.0"
+    "@firebase/app-check-types" "0.5.0"
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/app-check-interop-types@0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.0.tgz#b27ea1397cb80427f729e4bbf3a562f2052955c4"
+  integrity sha512-xAxHPZPIgFXnI+vb4sbBjZcde7ZluzPPaSK7Lx3/nmuVk4TjZvnL8ONnkd4ERQKL8WePQySU+pRcWkh8rDf5Sg==
+
+"@firebase/app-check-types@0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-types/-/app-check-types-0.5.0.tgz#1b02826213d7ce6a1cf773c329b46ea1c67064f4"
+  integrity sha512-uwSUj32Mlubybw7tedRzR24RP8M8JUVR3NPiMk3/Z4bCmgEKTlQBwMXrehDAZ2wF+TsBq0SN1c6ema71U/JPyQ==
+
+"@firebase/app-check@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.8.0.tgz#b531ec40900af9c3cf1ec63de9094a0ddd733d6a"
+  integrity sha512-dRDnhkcaC2FspMiRK/Vbp+PfsOAEP6ZElGm9iGFJ9fDqHoPs0HOPn7dwpJ51lCFi1+2/7n5pRPGhqF/F03I97g==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/app-compat@0.2.11":
+  version "0.2.11"
+  resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.2.11.tgz#6f9864a5663ba6da3042880f91641bc435addbce"
+  integrity sha512-IzjLh3Z9F4gPo+Ft7lNVxeKlYfKI6fseUmiLaySidcx/Sdro1vOzoBMOr+5OVVpVVMSib9BZ3QtBKZkPZk+Ucw==
+  dependencies:
+    "@firebase/app" "0.9.11"
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/app-types@0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.9.0.tgz#35b5c568341e9e263b29b3d2ba0e9cfc9ec7f01e"
+  integrity sha512-AeweANOIo0Mb8GiYm3xhTEBVCmPwTYAu9Hcd2qSkLuga/6+j9b1Jskl5bpiSQWy9eJ/j5pavxj6eYogmnuzm+Q==
+
+"@firebase/app@0.9.11":
+  version "0.9.11"
+  resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.9.11.tgz#1892645682dd0b1695f4eb79ef21c0ebcc31c6f1"
+  integrity sha512-b6OVXqn2qHXTASLstlu2aW8loHgB7gWcjVWbNKi6pZYZ9Tu3VE+xJuD8NH1br9gDh4ueVnrMBisfBTeZ0Hvlvg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    idb "7.1.1"
+    tslib "^2.1.0"
+
+"@firebase/auth-compat@0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.4.2.tgz#cb65edc2fbd5f72fff32310409f2fd702b5145e7"
+  integrity sha512-Q30e77DWXFmXEt5dg5JbqEDpjw9y3/PcP9LslDPR7fARmAOTIY9MM6HXzm9KC+dlrKH/+p6l8g9ifJiam9mc4A==
+  dependencies:
+    "@firebase/auth" "0.23.2"
+    "@firebase/auth-types" "0.12.0"
+    "@firebase/component" "0.6.4"
+    "@firebase/util" "1.9.3"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/auth-interop-types@0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.2.1.tgz#78884f24fa539e34a06c03612c75f222fcc33742"
+  integrity sha512-VOaGzKp65MY6P5FI84TfYKBXEPi6LmOCSMMzys6o2BN2LOsqy7pCuZCup7NYnfbk5OkkQKzvIfHOzTm0UDpkyg==
+
+"@firebase/auth-types@0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.12.0.tgz#f28e1b68ac3b208ad02a15854c585be6da3e8e79"
+  integrity sha512-pPwaZt+SPOshK8xNoiQlK5XIrS97kFYc3Rc7xmy373QsOJ9MmqXxLaYssP5Kcds4wd2qK//amx/c+A8O2fVeZA==
+
+"@firebase/auth@0.23.2":
+  version "0.23.2"
+  resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.23.2.tgz#9e6d8dd550a28053c1825fb98c7dc9b37119254d"
+  integrity sha512-dM9iJ0R6tI1JczuGSxXmQbXAgtYie0K4WvKcuyuSTCu9V8eEDiz4tfa1sO3txsfvwg7nOY3AjoCyMYEdqZ8hdg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/component@0.6.4":
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.6.4.tgz#8981a6818bd730a7554aa5e0516ffc9b1ae3f33d"
+  integrity sha512-rLMyrXuO9jcAUCaQXCMjCMUsWrba5fzHlNK24xz5j2W6A/SRmK8mZJ/hn7V0fViLbxC0lPMtrK1eYzk6Fg03jA==
+  dependencies:
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/database-compat@0.3.4":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.3.4.tgz#4e57932f7a5ba761cd5ac946ab6b6ab3f660522c"
+  integrity sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/database" "0.14.4"
+    "@firebase/database-types" "0.10.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/database-types@0.10.4":
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.10.4.tgz#47ba81113512dab637abace61cfb65f63d645ca7"
+  integrity sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==
+  dependencies:
+    "@firebase/app-types" "0.9.0"
+    "@firebase/util" "1.9.3"
+
+"@firebase/database@0.14.4":
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.14.4.tgz#9e7435a16a540ddfdeb5d99d45618e6ede179aa6"
+  integrity sha512-+Ea/IKGwh42jwdjCyzTmeZeLM3oy1h0mFPsTy6OqCWzcu/KFqRAr5Tt1HRCOBlNOdbh84JPZC47WLU18n2VbxQ==
+  dependencies:
+    "@firebase/auth-interop-types" "0.2.1"
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    faye-websocket "0.11.4"
+    tslib "^2.1.0"
+
+"@firebase/firestore-compat@0.3.10":
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.3.10.tgz#a79330d02d863810a196b60bd33d1bfcb7f78c14"
+  integrity sha512-mPxRwgi8riB0+EXVzwwOBssoBMCR1NtOz8uE0+vPlEzm3qCCDeyWK9Tqu8LBPs2uopWk6GJhy5esDHt0dnUd6A==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/firestore" "3.12.1"
+    "@firebase/firestore-types" "2.5.1"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/firestore-types@2.5.1":
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-2.5.1.tgz#464b2ee057956599ca34de50eae957c30fdbabb7"
+  integrity sha512-xG0CA6EMfYo8YeUxC8FeDzf6W3FX1cLlcAGBYV6Cku12sZRI81oWcu61RSKM66K6kUENP+78Qm8mvroBcm1whw==
+
+"@firebase/firestore@3.12.1":
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-3.12.1.tgz#39eeb357e2d522f4e7f7d837cdaee7cd32cffc68"
+  integrity sha512-TgJup6AIAT9/u7MxdCeES/I96kJx7DLBTokOlW4FiiSCeOzyss9BYBrh1tkkXNIpFn9mUsvT44foZvFsOKp14Q==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    "@firebase/webchannel-wrapper" "0.10.1"
+    "@grpc/grpc-js" "~1.7.0"
+    "@grpc/proto-loader" "^0.6.13"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/functions-compat@0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.3.5.tgz#7a532d3a9764c6d5fbc1ec5541a989a704326647"
+  integrity sha512-uD4jwgwVqdWf6uc3NRKF8cSZ0JwGqSlyhPgackyUPe+GAtnERpS4+Vr66g0b3Gge0ezG4iyHo/EXW/Hjx7QhHw==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/functions" "0.10.0"
+    "@firebase/functions-types" "0.6.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/functions-types@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.6.0.tgz#ccd7000dc6fc668f5acb4e6a6a042a877a555ef2"
+  integrity sha512-hfEw5VJtgWXIRf92ImLkgENqpL6IWpYaXVYiRkFY1jJ9+6tIhWM7IzzwbevwIIud/jaxKVdRzD7QBWfPmkwCYw==
+
+"@firebase/functions@0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.10.0.tgz#c630ddf12cdf941c25bc8d554e30c3226cd560f6"
+  integrity sha512-2U+fMNxTYhtwSpkkR6WbBcuNMOVaI7MaH3cZ6UAeNfj7AgEwHwMIFLPpC13YNZhno219F0lfxzTAA0N62ndWzA==
+  dependencies:
+    "@firebase/app-check-interop-types" "0.3.0"
+    "@firebase/auth-interop-types" "0.2.1"
+    "@firebase/component" "0.6.4"
+    "@firebase/messaging-interop-types" "0.2.0"
+    "@firebase/util" "1.9.3"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/installations-compat@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@firebase/installations-compat/-/installations-compat-0.2.4.tgz#b5557c897b4cd3635a59887a8bf69c3731aaa952"
+  integrity sha512-LI9dYjp0aT9Njkn9U4JRrDqQ6KXeAmFbRC0E7jI7+hxl5YmRWysq5qgQl22hcWpTk+cm3es66d/apoDU/A9n6Q==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/installations-types" "0.5.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/installations-types@0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.5.0.tgz#2adad64755cd33648519b573ec7ec30f21fb5354"
+  integrity sha512-9DP+RGfzoI2jH7gY4SlzqvZ+hr7gYzPODrbzVD82Y12kScZ6ZpRg/i3j6rleto8vTFC8n6Len4560FnV1w2IRg==
+
+"@firebase/installations@0.6.4":
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.6.4.tgz#20382e33e6062ac5eff4bede8e468ed4c367609e"
+  integrity sha512-u5y88rtsp7NYkCHC3ElbFBrPtieUybZluXyzl7+4BsIz4sqb4vSAuwHEUgCgCeaQhvsnxDEU6icly8U9zsJigA==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/util" "1.9.3"
+    idb "7.0.1"
+    tslib "^2.1.0"
+
+"@firebase/logger@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.4.0.tgz#15ecc03c452525f9d47318ad9491b81d1810f113"
+  integrity sha512-eRKSeykumZ5+cJPdxxJRgAC3G5NknY2GwEbKfymdnXtnT0Ucm4pspfR6GT4MUQEDuJwRVbVcSx85kgJulMoFFA==
+  dependencies:
+    tslib "^2.1.0"
+
+"@firebase/messaging-compat@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.2.4.tgz#323ca48deef77065b4fcda3cfd662c4337dffcfd"
+  integrity sha512-lyFjeUhIsPRYDPNIkYX1LcZMpoVbBWXX4rPl7c/rqc7G+EUea7IEtSt4MxTvh6fDfPuzLn7+FZADfscC+tNMfg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/messaging" "0.12.4"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/messaging-interop-types@0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging-interop-types/-/messaging-interop-types-0.2.0.tgz#6056f8904a696bf0f7fdcf5f2ca8f008e8f6b064"
+  integrity sha512-ujA8dcRuVeBixGR9CtegfpU4YmZf3Lt7QYkcj693FFannwNuZgfAYaTmbJ40dtjB81SAu6tbFPL9YLNT15KmOQ==
+
+"@firebase/messaging@0.12.4":
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.12.4.tgz#ccb49df5ab97d5650c9cf5b8c77ddc34daafcfe0"
+  integrity sha512-6JLZct6zUaex4g7HI3QbzeUrg9xcnmDAPTWpkoMpd/GoSVWH98zDoWXMGrcvHeCAIsLpFMe4MPoZkJbrPhaASw==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/messaging-interop-types" "0.2.0"
+    "@firebase/util" "1.9.3"
+    idb "7.0.1"
+    tslib "^2.1.0"
+
+"@firebase/performance-compat@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.2.4.tgz#95cbf32057b5d9f0c75d804bc50e6ed3ba486274"
+  integrity sha512-nnHUb8uP9G8islzcld/k6Bg5RhX62VpbAb/Anj7IXs/hp32Eb2LqFPZK4sy3pKkBUO5wcrlRWQa6wKOxqlUqsg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/performance" "0.6.4"
+    "@firebase/performance-types" "0.2.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/performance-types@0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.2.0.tgz#400685f7a3455970817136d9b48ce07a4b9562ff"
+  integrity sha512-kYrbr8e/CYr1KLrLYZZt2noNnf+pRwDq2KK9Au9jHrBMnb0/C9X9yWSXmZkFt4UIdsQknBq8uBB7fsybZdOBTA==
+
+"@firebase/performance@0.6.4":
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.6.4.tgz#0ad766bfcfab4f386f4fe0bef43bbcf505015069"
+  integrity sha512-HfTn/bd8mfy/61vEqaBelNiNnvAbUtME2S25A67Nb34zVuCSCRIX4SseXY6zBnOFj3oLisaEqhVcJmVPAej67g==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/remote-config-compat@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.2.4.tgz#1f494c81a6c9560b1f9ca1b4fbd4bbbe47cf4776"
+  integrity sha512-FKiki53jZirrDFkBHglB3C07j5wBpitAaj8kLME6g8Mx+aq7u9P7qfmuSRytiOItADhWUj7O1JIv7n9q87SuwA==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/remote-config" "0.4.4"
+    "@firebase/remote-config-types" "0.3.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/remote-config-types@0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.3.0.tgz#689900dcdb3e5c059e8499b29db393e4e51314b4"
+  integrity sha512-RtEH4vdcbXZuZWRZbIRmQVBNsE7VDQpet2qFvq6vwKLBIQRQR5Kh58M4ok3A3US8Sr3rubYnaGqZSurCwI8uMA==
+
+"@firebase/remote-config@0.4.4":
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.4.4.tgz#6a496117054de58744bc9f382d2a6d1e14060c65"
+  integrity sha512-x1ioTHGX8ZwDSTOVp8PBLv2/wfwKzb4pxi0gFezS5GCJwbLlloUH4YYZHHS83IPxnua8b6l0IXUaWd0RgbWwzQ==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/storage-compat@0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.3.2.tgz#51a97170fd652a516f729f82b97af369e5a2f8d7"
+  integrity sha512-wvsXlLa9DVOMQJckbDNhXKKxRNNewyUhhbXev3t8kSgoCotd1v3MmqhKKz93ePhDnhHnDs7bYHy+Qa8dRY6BXw==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/storage" "0.11.2"
+    "@firebase/storage-types" "0.8.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/storage-types@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.8.0.tgz#f1e40a5361d59240b6e84fac7fbbbb622bfaf707"
+  integrity sha512-isRHcGrTs9kITJC0AVehHfpraWFui39MPaU7Eo8QfWlqW7YPymBmRgjDrlOgFdURh6Cdeg07zmkLP5tzTKRSpg==
+
+"@firebase/storage@0.11.2":
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.11.2.tgz#c5e0316543fe1c4026b8e3910f85ad73f5b77571"
+  integrity sha512-CtvoFaBI4hGXlXbaCHf8humajkbXhs39Nbh6MbNxtwJiCqxPy9iH3D3CCfXAvP0QvAAwmJUTK3+z9a++Kc4nkA==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/util" "1.9.3"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/util@1.9.3":
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.9.3.tgz#45458dd5cd02d90e55c656e84adf6f3decf4b7ed"
+  integrity sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==
+  dependencies:
+    tslib "^2.1.0"
+
+"@firebase/webchannel-wrapper@0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.10.1.tgz#60bb2aaf129f9e00621f8d698722ddba6ee1f8ac"
+  integrity sha512-Dq5rYfEpdeel0bLVN+nfD1VWmzCkK+pJbSjIawGE+RY4+NIJqhbUDDQjvV0NUK84fMfwxvtFoCtEe70HfZjFcw==
+
 "@floating-ui/core@^1.2.1":
   version "1.2.1"
   resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.1.tgz"
@@ -1184,6 +1556,36 @@
     aria-hidden "^1.1.3"
     tabbable "^6.0.1"
 
+"@grpc/grpc-js@~1.7.0":
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.7.3.tgz#f2ea79f65e31622d7f86d4b4c9ae38f13ccab99a"
+  integrity sha512-H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog==
+  dependencies:
+    "@grpc/proto-loader" "^0.7.0"
+    "@types/node" ">=12.12.47"
+
+"@grpc/proto-loader@^0.6.13":
+  version "0.6.13"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.13.tgz#008f989b72a40c60c96cd4088522f09b05ac66bc"
+  integrity sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g==
+  dependencies:
+    "@types/long" "^4.0.1"
+    lodash.camelcase "^4.3.0"
+    long "^4.0.0"
+    protobufjs "^6.11.3"
+    yargs "^16.2.0"
+
+"@grpc/proto-loader@^0.7.0":
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.7.tgz#d33677a77eea8407f7c66e2abd97589b60eb4b21"
+  integrity sha512-1TIeXOi8TuSCQprPItwoMymZXxWT0CPxUhkrkeCUH+D8U7QDwQ6b7SUz2MaLuWM2llT+J/TVFLmQI5KtML3BhQ==
+  dependencies:
+    "@types/long" "^4.0.1"
+    lodash.camelcase "^4.3.0"
+    long "^4.0.0"
+    protobufjs "^7.0.0"
+    yargs "^17.7.2"
+
 "@hookform/resolvers@^2.9.10":
   version "2.9.11"
   resolved "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-2.9.11.tgz"
@@ -1455,6 +1857,59 @@
   resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.14.0.tgz#4bed9e6f3d01bb0e4598e76c1726f33579d6a2c3"
   integrity sha512-PDNlhP/1vyTgmNyiucGqGCdXIp7HIkkvKO50si3y3PcceeHvqtiKPaH1iJdz63jCWMVMbj2MElSxXPOeBvEVIQ==
 
+"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
+  integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
+
+"@protobufjs/base64@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
+  integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
+
+"@protobufjs/codegen@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
+  integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
+
+"@protobufjs/eventemitter@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
+  integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
+
+"@protobufjs/fetch@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
+  integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.1"
+    "@protobufjs/inquire" "^1.1.0"
+
+"@protobufjs/float@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
+  integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
+
+"@protobufjs/inquire@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
+  integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
+
+"@protobufjs/path@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
+  integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
+
+"@protobufjs/pool@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
+  integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
+
+"@protobufjs/utf8@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
+  integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
+
 "@rushstack/eslint-patch@^1.1.3":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz"
@@ -1541,11 +1996,21 @@
   resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"
   integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
 
+"@types/long@^4.0.1":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
+  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
+
 "@types/node@*", "@types/node@^18.11.18":
   version "18.14.0"
   resolved "https://registry.npmjs.org/@types/node/-/node-18.14.0.tgz"
   integrity sha512-5EWrvLmglK+imbCJY0+INViFWUHg1AHel1sq4ZVSfdcNqGy9Edv3UB9IIzzg+xPaUcAgZYcfVs2fBcwDeZzU0A==
 
+"@types/node@>=12.12.47", "@types/node@>=13.7.0":
+  version "20.2.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.2.5.tgz#26d295f3570323b2837d322180dfbf1ba156fefb"
+  integrity sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ==
+
 "@types/nodemailer@^6.4.7":
   version "6.4.7"
   resolved "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.7.tgz"
@@ -2024,6 +2489,24 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
 clsx@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz"
@@ -2680,6 +3163,13 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
+faye-websocket@0.11.4:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
+  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
+  dependencies:
+    websocket-driver ">=0.5.1"
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
@@ -2715,6 +3205,38 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
+firebase@^9.22.1:
+  version "9.22.1"
+  resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.22.1.tgz#9bf49d8cb87eefae6500cc2bd2ec1fddbc1c1ebb"
+  integrity sha512-8x55ZZJwPlctKIhlfXL+KTOpdabp6dDpDwTEmuW1QNbfCkE1ZEuXHgjiQMfTkoeyQO9luV6YwVdgbgCt7yfYCg==
+  dependencies:
+    "@firebase/analytics" "0.10.0"
+    "@firebase/analytics-compat" "0.2.6"
+    "@firebase/app" "0.9.11"
+    "@firebase/app-check" "0.8.0"
+    "@firebase/app-check-compat" "0.3.7"
+    "@firebase/app-compat" "0.2.11"
+    "@firebase/app-types" "0.9.0"
+    "@firebase/auth" "0.23.2"
+    "@firebase/auth-compat" "0.4.2"
+    "@firebase/database" "0.14.4"
+    "@firebase/database-compat" "0.3.4"
+    "@firebase/firestore" "3.12.1"
+    "@firebase/firestore-compat" "0.3.10"
+    "@firebase/functions" "0.10.0"
+    "@firebase/functions-compat" "0.3.5"
+    "@firebase/installations" "0.6.4"
+    "@firebase/installations-compat" "0.2.4"
+    "@firebase/messaging" "0.12.4"
+    "@firebase/messaging-compat" "0.2.4"
+    "@firebase/performance" "0.6.4"
+    "@firebase/performance-compat" "0.2.4"
+    "@firebase/remote-config" "0.4.4"
+    "@firebase/remote-config-compat" "0.2.4"
+    "@firebase/storage" "0.11.2"
+    "@firebase/storage-compat" "0.3.2"
+    "@firebase/util" "1.9.3"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
@@ -2818,7 +3340,7 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -3022,6 +3544,21 @@ hoist-non-react-statics@^3.3.1:
   dependencies:
     react-is "^16.7.0"
 
+http-parser-js@>=0.5.1:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
+  integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
+
+idb@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-7.0.1.tgz#d2875b3a2f205d854ee307f6d196f246fea590a7"
+  integrity sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg==
+
+idb@7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.1.tgz#d910ded866d32c7ced9befc5bfdf36f572ced72b"
+  integrity sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==
+
 ignore@^5.2.0:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
@@ -3374,6 +3911,11 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
+
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
@@ -3389,6 +3931,16 @@ lodash@^4.17.20:
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+long@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
+  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
+
+long@^5.0.0:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
+  integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
+
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
@@ -3515,6 +4067,13 @@ next@^13.1.6:
     "@next/swc-win32-ia32-msvc" "13.1.6"
     "@next/swc-win32-x64-msvc" "13.1.6"
 
+node-fetch@2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 node-releases@^2.0.8:
   version "2.0.10"
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz"
@@ -3876,6 +4435,43 @@ prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+protobufjs@^6.11.3:
+  version "6.11.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
+  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/long" "^4.0.1"
+    "@types/node" ">=13.7.0"
+    long "^4.0.0"
+
+protobufjs@^7.0.0:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.3.tgz#01af019e40d9c6133c49acbb3ff9e30f4f0f70b2"
+  integrity sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/node" ">=13.7.0"
+    long "^5.0.0"
+
 punycode@^2.1.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"
@@ -4107,6 +4703,11 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+safe-buffer@>=5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
 safe-regex-test@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"
@@ -4197,7 +4798,7 @@ stop-iteration-iterator@^1.0.0:
   dependencies:
     internal-slot "^1.0.4"
 
-string-width@^4.1.0, string-width@^4.2.0:
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -4380,6 +4981,11 @@ totalist@^1.0.0:
   resolved "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz"
   integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
 
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
 tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"
@@ -4498,6 +5104,11 @@ uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+
 webpack-bundle-analyzer@4.7.0:
   version "4.7.0"
   resolved "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz"
@@ -4513,6 +5124,28 @@ webpack-bundle-analyzer@4.7.0:
     sirv "^1.0.7"
     ws "^7.3.1"
 
+websocket-driver@>=0.5.1:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
+  dependencies:
+    http-parser-js ">=0.5.1"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
+
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"
@@ -4572,6 +5205,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
@@ -4592,6 +5234,11 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
   integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"
@@ -4615,6 +5262,16 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
 yargs@^15.3.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
@@ -4632,6 +5289,32 @@ yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
+yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"

From f6fbbfebb30f1604378668adad2cc8ba6d2c2c08 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Mon, 29 May 2023 22:39:07 +0800
Subject: [PATCH 025/223] add in firestore

---
 package.json                                |    2 +
 src/pages/api/auth/[...nextauth].ts         |    7 +
 src/server/db/collections/BaseCollection.ts |   56 +
 src/server/db/collections/UserCollection.ts |   10 +
 src/server/db/firebase.ts                   |    9 +
 src/server/db/models/User.ts                |    5 +
 yarn.lock                                   | 1588 ++++++++++++++++++-
 7 files changed, 1656 insertions(+), 21 deletions(-)
 create mode 100644 src/server/db/collections/BaseCollection.ts
 create mode 100644 src/server/db/collections/UserCollection.ts
 create mode 100644 src/server/db/firebase.ts
 create mode 100644 src/server/db/models/User.ts

diff --git a/package.json b/package.json
index d0be7664..fc5ec36f 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,8 @@
     "clsx": "^1.2.1",
     "date-fns": "^2.30.0",
     "dayjs": "^1.11.7",
+    "firebase": "^9.22.1",
+    "firebase-admin": "^11.8.0",
     "flowbite": "^1.6.5",
     "flowbite-react": "^0.4.4",
     "framer-motion": "^9.0.4",
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 357cf656..70c9fb00 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -6,6 +6,9 @@ import { prisma } from '../../../server/db/client'
 import { env } from '../../../env/server.mjs'
 import type { User } from '@prisma/client'
 
+import { db } from '~/server/db/firebase'
+import { collection, addDoc } from 'firebase/firestore'
+
 export const authOptions: NextAuthOptions = {
   callbacks: {
     // We need this to ensure that the client knows when to log in
@@ -42,6 +45,10 @@ export const authOptions: NextAuthOptions = {
             password: string
           }
 
+          await addDoc(collection(db, 'users'), {
+            name: 'John',
+          })
+
           // Step 2: If no credentials are provided, throw an error
           if (!credential || !email || !password) {
             throw new Error('No email or password provided')
diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
new file mode 100644
index 00000000..215317ea
--- /dev/null
+++ b/src/server/db/collections/BaseCollection.ts
@@ -0,0 +1,56 @@
+import { db } from '../firebase'
+import {
+  collection,
+  addDoc,
+  getDoc,
+  doc,
+  query,
+  getDocs,
+  where,
+  type WithFieldValue,
+  type DocumentData,
+  type WhereFilterOp,
+  type FieldPath,
+} from 'firebase/firestore'
+
+type Queries<T> = {
+  fieldPath: keyof T
+  direction: WhereFilterOp
+  value: T[keyof T]
+}
+
+export abstract class BaseCollection<T> {
+  protected abstract collectionName: string
+  protected abstract objectName: string
+
+  get collection() {
+    return collection(db, this.collectionName)
+  }
+
+  async set(payload: T) {
+    return await addDoc(
+      this.collection,
+      payload as WithFieldValue<DocumentData>
+    )
+  }
+
+  async getById(id: string) {
+    const docRef = doc(db, this.collectionName, id)
+    const result = await getDoc(docRef)
+    if (!result.exists) {
+      throw Error(`The ${this.objectName} does not exist`)
+    }
+    return { ...result, id: result.id } as T
+  }
+
+  async queries(queries: Queries<T>[]) {
+    const items = queries.map((q) => {
+      return where(q.fieldPath as string | FieldPath, q.direction, q.value)
+    })
+    const q = query(this.collection, ...items)
+    const snapshots = await getDocs(q)
+    return snapshots.docs.map((doc) => {
+      return { ...doc.data(), id: doc.id } as T
+    })
+  }
+}
diff --git a/src/server/db/collections/UserCollection.ts b/src/server/db/collections/UserCollection.ts
new file mode 100644
index 00000000..a86c2180
--- /dev/null
+++ b/src/server/db/collections/UserCollection.ts
@@ -0,0 +1,10 @@
+import { BaseCollection } from './BaseCollection'
+import type { User } from '../models/User'
+
+class UserCollection extends BaseCollection<User> {
+  protected override collectionName = 'users'
+  protected override objectName = 'user'
+}
+
+const userCollection = new UserCollection()
+export default userCollection
diff --git a/src/server/db/firebase.ts b/src/server/db/firebase.ts
new file mode 100644
index 00000000..9a266c3c
--- /dev/null
+++ b/src/server/db/firebase.ts
@@ -0,0 +1,9 @@
+import { initializeApp } from 'firebase/app'
+import { getFirestore } from 'firebase/firestore'
+
+const firebaseConfig = {
+
+}
+
+const app = initializeApp(firebaseConfig)
+export const db = getFirestore(app)
diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
new file mode 100644
index 00000000..8be8142b
--- /dev/null
+++ b/src/server/db/models/User.ts
@@ -0,0 +1,5 @@
+export type User = {
+  email: string
+  hashedPassword: string
+  name: number
+}
diff --git a/yarn.lock b/yarn.lock
index 105c91b0..19249f8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -156,6 +156,11 @@
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz"
   integrity sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==
 
+"@babel/parser@^7.20.15":
+  version "7.22.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.4.tgz#a770e98fd785c231af9d93f6459d36770993fb32"
+  integrity sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==
+
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
   version "7.20.13"
   resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"
@@ -1144,6 +1149,385 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@fastify/busboy@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-1.2.1.tgz#9c6db24a55f8b803b5222753b24fe3aea2ba9ca3"
+  integrity sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==
+  dependencies:
+    text-decoding "^1.0.0"
+
+"@firebase/analytics-compat@0.2.6":
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.2.6.tgz#50063978c42f13eb800e037e96ac4b17236841f4"
+  integrity sha512-4MqpVLFkGK7NJf/5wPEEP7ePBJatwYpyjgJ+wQHQGHfzaCDgntOnl9rL2vbVGGKCnRqWtZDIWhctB86UWXaX2Q==
+  dependencies:
+    "@firebase/analytics" "0.10.0"
+    "@firebase/analytics-types" "0.8.0"
+    "@firebase/component" "0.6.4"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/analytics-types@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.8.0.tgz#551e744a29adbc07f557306530a2ec86add6d410"
+  integrity sha512-iRP+QKI2+oz3UAh4nPEq14CsEjrjD6a5+fuypjScisAh9kXKFvdJOZJDwk7kikLvWVLGEs9+kIUS4LPQV7VZVw==
+
+"@firebase/analytics@0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.10.0.tgz#9c6986acd573c6c6189ffb52d0fd63c775db26d7"
+  integrity sha512-Locv8gAqx0e+GX/0SI3dzmBY5e9kjVDtD+3zCFLJ0tH2hJwuCAiL+5WkHuxKj92rqQj/rvkBUCfA1ewlX2hehg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/app-check-compat@0.3.7":
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.3.7.tgz#e150f61d653a0f2043a34dcb995616a717161839"
+  integrity sha512-cW682AxsyP1G+Z0/P7pO/WT2CzYlNxoNe5QejVarW2o5ZxeWSSPAiVEwpEpQR/bUlUmdeWThYTMvBWaopdBsqw==
+  dependencies:
+    "@firebase/app-check" "0.8.0"
+    "@firebase/app-check-types" "0.5.0"
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/app-check-interop-types@0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.0.tgz#b27ea1397cb80427f729e4bbf3a562f2052955c4"
+  integrity sha512-xAxHPZPIgFXnI+vb4sbBjZcde7ZluzPPaSK7Lx3/nmuVk4TjZvnL8ONnkd4ERQKL8WePQySU+pRcWkh8rDf5Sg==
+
+"@firebase/app-check-types@0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-types/-/app-check-types-0.5.0.tgz#1b02826213d7ce6a1cf773c329b46ea1c67064f4"
+  integrity sha512-uwSUj32Mlubybw7tedRzR24RP8M8JUVR3NPiMk3/Z4bCmgEKTlQBwMXrehDAZ2wF+TsBq0SN1c6ema71U/JPyQ==
+
+"@firebase/app-check@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.8.0.tgz#b531ec40900af9c3cf1ec63de9094a0ddd733d6a"
+  integrity sha512-dRDnhkcaC2FspMiRK/Vbp+PfsOAEP6ZElGm9iGFJ9fDqHoPs0HOPn7dwpJ51lCFi1+2/7n5pRPGhqF/F03I97g==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/app-compat@0.2.11":
+  version "0.2.11"
+  resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.2.11.tgz#6f9864a5663ba6da3042880f91641bc435addbce"
+  integrity sha512-IzjLh3Z9F4gPo+Ft7lNVxeKlYfKI6fseUmiLaySidcx/Sdro1vOzoBMOr+5OVVpVVMSib9BZ3QtBKZkPZk+Ucw==
+  dependencies:
+    "@firebase/app" "0.9.11"
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/app-types@0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.9.0.tgz#35b5c568341e9e263b29b3d2ba0e9cfc9ec7f01e"
+  integrity sha512-AeweANOIo0Mb8GiYm3xhTEBVCmPwTYAu9Hcd2qSkLuga/6+j9b1Jskl5bpiSQWy9eJ/j5pavxj6eYogmnuzm+Q==
+
+"@firebase/app@0.9.11":
+  version "0.9.11"
+  resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.9.11.tgz#1892645682dd0b1695f4eb79ef21c0ebcc31c6f1"
+  integrity sha512-b6OVXqn2qHXTASLstlu2aW8loHgB7gWcjVWbNKi6pZYZ9Tu3VE+xJuD8NH1br9gDh4ueVnrMBisfBTeZ0Hvlvg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    idb "7.1.1"
+    tslib "^2.1.0"
+
+"@firebase/auth-compat@0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.4.2.tgz#cb65edc2fbd5f72fff32310409f2fd702b5145e7"
+  integrity sha512-Q30e77DWXFmXEt5dg5JbqEDpjw9y3/PcP9LslDPR7fARmAOTIY9MM6HXzm9KC+dlrKH/+p6l8g9ifJiam9mc4A==
+  dependencies:
+    "@firebase/auth" "0.23.2"
+    "@firebase/auth-types" "0.12.0"
+    "@firebase/component" "0.6.4"
+    "@firebase/util" "1.9.3"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/auth-interop-types@0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.2.1.tgz#78884f24fa539e34a06c03612c75f222fcc33742"
+  integrity sha512-VOaGzKp65MY6P5FI84TfYKBXEPi6LmOCSMMzys6o2BN2LOsqy7pCuZCup7NYnfbk5OkkQKzvIfHOzTm0UDpkyg==
+
+"@firebase/auth-types@0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.12.0.tgz#f28e1b68ac3b208ad02a15854c585be6da3e8e79"
+  integrity sha512-pPwaZt+SPOshK8xNoiQlK5XIrS97kFYc3Rc7xmy373QsOJ9MmqXxLaYssP5Kcds4wd2qK//amx/c+A8O2fVeZA==
+
+"@firebase/auth@0.23.2":
+  version "0.23.2"
+  resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.23.2.tgz#9e6d8dd550a28053c1825fb98c7dc9b37119254d"
+  integrity sha512-dM9iJ0R6tI1JczuGSxXmQbXAgtYie0K4WvKcuyuSTCu9V8eEDiz4tfa1sO3txsfvwg7nOY3AjoCyMYEdqZ8hdg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/component@0.6.4":
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.6.4.tgz#8981a6818bd730a7554aa5e0516ffc9b1ae3f33d"
+  integrity sha512-rLMyrXuO9jcAUCaQXCMjCMUsWrba5fzHlNK24xz5j2W6A/SRmK8mZJ/hn7V0fViLbxC0lPMtrK1eYzk6Fg03jA==
+  dependencies:
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/database-compat@0.3.4", "@firebase/database-compat@^0.3.4":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.3.4.tgz#4e57932f7a5ba761cd5ac946ab6b6ab3f660522c"
+  integrity sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/database" "0.14.4"
+    "@firebase/database-types" "0.10.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/database-types@0.10.4", "@firebase/database-types@^0.10.4":
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.10.4.tgz#47ba81113512dab637abace61cfb65f63d645ca7"
+  integrity sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==
+  dependencies:
+    "@firebase/app-types" "0.9.0"
+    "@firebase/util" "1.9.3"
+
+"@firebase/database@0.14.4":
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.14.4.tgz#9e7435a16a540ddfdeb5d99d45618e6ede179aa6"
+  integrity sha512-+Ea/IKGwh42jwdjCyzTmeZeLM3oy1h0mFPsTy6OqCWzcu/KFqRAr5Tt1HRCOBlNOdbh84JPZC47WLU18n2VbxQ==
+  dependencies:
+    "@firebase/auth-interop-types" "0.2.1"
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    faye-websocket "0.11.4"
+    tslib "^2.1.0"
+
+"@firebase/firestore-compat@0.3.10":
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.3.10.tgz#a79330d02d863810a196b60bd33d1bfcb7f78c14"
+  integrity sha512-mPxRwgi8riB0+EXVzwwOBssoBMCR1NtOz8uE0+vPlEzm3qCCDeyWK9Tqu8LBPs2uopWk6GJhy5esDHt0dnUd6A==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/firestore" "3.12.1"
+    "@firebase/firestore-types" "2.5.1"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/firestore-types@2.5.1":
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-2.5.1.tgz#464b2ee057956599ca34de50eae957c30fdbabb7"
+  integrity sha512-xG0CA6EMfYo8YeUxC8FeDzf6W3FX1cLlcAGBYV6Cku12sZRI81oWcu61RSKM66K6kUENP+78Qm8mvroBcm1whw==
+
+"@firebase/firestore@3.12.1":
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-3.12.1.tgz#39eeb357e2d522f4e7f7d837cdaee7cd32cffc68"
+  integrity sha512-TgJup6AIAT9/u7MxdCeES/I96kJx7DLBTokOlW4FiiSCeOzyss9BYBrh1tkkXNIpFn9mUsvT44foZvFsOKp14Q==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    "@firebase/webchannel-wrapper" "0.10.1"
+    "@grpc/grpc-js" "~1.7.0"
+    "@grpc/proto-loader" "^0.6.13"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/functions-compat@0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.3.5.tgz#7a532d3a9764c6d5fbc1ec5541a989a704326647"
+  integrity sha512-uD4jwgwVqdWf6uc3NRKF8cSZ0JwGqSlyhPgackyUPe+GAtnERpS4+Vr66g0b3Gge0ezG4iyHo/EXW/Hjx7QhHw==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/functions" "0.10.0"
+    "@firebase/functions-types" "0.6.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/functions-types@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.6.0.tgz#ccd7000dc6fc668f5acb4e6a6a042a877a555ef2"
+  integrity sha512-hfEw5VJtgWXIRf92ImLkgENqpL6IWpYaXVYiRkFY1jJ9+6tIhWM7IzzwbevwIIud/jaxKVdRzD7QBWfPmkwCYw==
+
+"@firebase/functions@0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.10.0.tgz#c630ddf12cdf941c25bc8d554e30c3226cd560f6"
+  integrity sha512-2U+fMNxTYhtwSpkkR6WbBcuNMOVaI7MaH3cZ6UAeNfj7AgEwHwMIFLPpC13YNZhno219F0lfxzTAA0N62ndWzA==
+  dependencies:
+    "@firebase/app-check-interop-types" "0.3.0"
+    "@firebase/auth-interop-types" "0.2.1"
+    "@firebase/component" "0.6.4"
+    "@firebase/messaging-interop-types" "0.2.0"
+    "@firebase/util" "1.9.3"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/installations-compat@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@firebase/installations-compat/-/installations-compat-0.2.4.tgz#b5557c897b4cd3635a59887a8bf69c3731aaa952"
+  integrity sha512-LI9dYjp0aT9Njkn9U4JRrDqQ6KXeAmFbRC0E7jI7+hxl5YmRWysq5qgQl22hcWpTk+cm3es66d/apoDU/A9n6Q==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/installations-types" "0.5.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/installations-types@0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.5.0.tgz#2adad64755cd33648519b573ec7ec30f21fb5354"
+  integrity sha512-9DP+RGfzoI2jH7gY4SlzqvZ+hr7gYzPODrbzVD82Y12kScZ6ZpRg/i3j6rleto8vTFC8n6Len4560FnV1w2IRg==
+
+"@firebase/installations@0.6.4":
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.6.4.tgz#20382e33e6062ac5eff4bede8e468ed4c367609e"
+  integrity sha512-u5y88rtsp7NYkCHC3ElbFBrPtieUybZluXyzl7+4BsIz4sqb4vSAuwHEUgCgCeaQhvsnxDEU6icly8U9zsJigA==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/util" "1.9.3"
+    idb "7.0.1"
+    tslib "^2.1.0"
+
+"@firebase/logger@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.4.0.tgz#15ecc03c452525f9d47318ad9491b81d1810f113"
+  integrity sha512-eRKSeykumZ5+cJPdxxJRgAC3G5NknY2GwEbKfymdnXtnT0Ucm4pspfR6GT4MUQEDuJwRVbVcSx85kgJulMoFFA==
+  dependencies:
+    tslib "^2.1.0"
+
+"@firebase/messaging-compat@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.2.4.tgz#323ca48deef77065b4fcda3cfd662c4337dffcfd"
+  integrity sha512-lyFjeUhIsPRYDPNIkYX1LcZMpoVbBWXX4rPl7c/rqc7G+EUea7IEtSt4MxTvh6fDfPuzLn7+FZADfscC+tNMfg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/messaging" "0.12.4"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/messaging-interop-types@0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging-interop-types/-/messaging-interop-types-0.2.0.tgz#6056f8904a696bf0f7fdcf5f2ca8f008e8f6b064"
+  integrity sha512-ujA8dcRuVeBixGR9CtegfpU4YmZf3Lt7QYkcj693FFannwNuZgfAYaTmbJ40dtjB81SAu6tbFPL9YLNT15KmOQ==
+
+"@firebase/messaging@0.12.4":
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.12.4.tgz#ccb49df5ab97d5650c9cf5b8c77ddc34daafcfe0"
+  integrity sha512-6JLZct6zUaex4g7HI3QbzeUrg9xcnmDAPTWpkoMpd/GoSVWH98zDoWXMGrcvHeCAIsLpFMe4MPoZkJbrPhaASw==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/messaging-interop-types" "0.2.0"
+    "@firebase/util" "1.9.3"
+    idb "7.0.1"
+    tslib "^2.1.0"
+
+"@firebase/performance-compat@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.2.4.tgz#95cbf32057b5d9f0c75d804bc50e6ed3ba486274"
+  integrity sha512-nnHUb8uP9G8islzcld/k6Bg5RhX62VpbAb/Anj7IXs/hp32Eb2LqFPZK4sy3pKkBUO5wcrlRWQa6wKOxqlUqsg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/performance" "0.6.4"
+    "@firebase/performance-types" "0.2.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/performance-types@0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.2.0.tgz#400685f7a3455970817136d9b48ce07a4b9562ff"
+  integrity sha512-kYrbr8e/CYr1KLrLYZZt2noNnf+pRwDq2KK9Au9jHrBMnb0/C9X9yWSXmZkFt4UIdsQknBq8uBB7fsybZdOBTA==
+
+"@firebase/performance@0.6.4":
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.6.4.tgz#0ad766bfcfab4f386f4fe0bef43bbcf505015069"
+  integrity sha512-HfTn/bd8mfy/61vEqaBelNiNnvAbUtME2S25A67Nb34zVuCSCRIX4SseXY6zBnOFj3oLisaEqhVcJmVPAej67g==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/remote-config-compat@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.2.4.tgz#1f494c81a6c9560b1f9ca1b4fbd4bbbe47cf4776"
+  integrity sha512-FKiki53jZirrDFkBHglB3C07j5wBpitAaj8kLME6g8Mx+aq7u9P7qfmuSRytiOItADhWUj7O1JIv7n9q87SuwA==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/remote-config" "0.4.4"
+    "@firebase/remote-config-types" "0.3.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/remote-config-types@0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.3.0.tgz#689900dcdb3e5c059e8499b29db393e4e51314b4"
+  integrity sha512-RtEH4vdcbXZuZWRZbIRmQVBNsE7VDQpet2qFvq6vwKLBIQRQR5Kh58M4ok3A3US8Sr3rubYnaGqZSurCwI8uMA==
+
+"@firebase/remote-config@0.4.4":
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.4.4.tgz#6a496117054de58744bc9f382d2a6d1e14060c65"
+  integrity sha512-x1ioTHGX8ZwDSTOVp8PBLv2/wfwKzb4pxi0gFezS5GCJwbLlloUH4YYZHHS83IPxnua8b6l0IXUaWd0RgbWwzQ==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/storage-compat@0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.3.2.tgz#51a97170fd652a516f729f82b97af369e5a2f8d7"
+  integrity sha512-wvsXlLa9DVOMQJckbDNhXKKxRNNewyUhhbXev3t8kSgoCotd1v3MmqhKKz93ePhDnhHnDs7bYHy+Qa8dRY6BXw==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/storage" "0.11.2"
+    "@firebase/storage-types" "0.8.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/storage-types@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.8.0.tgz#f1e40a5361d59240b6e84fac7fbbbb622bfaf707"
+  integrity sha512-isRHcGrTs9kITJC0AVehHfpraWFui39MPaU7Eo8QfWlqW7YPymBmRgjDrlOgFdURh6Cdeg07zmkLP5tzTKRSpg==
+
+"@firebase/storage@0.11.2":
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.11.2.tgz#c5e0316543fe1c4026b8e3910f85ad73f5b77571"
+  integrity sha512-CtvoFaBI4hGXlXbaCHf8humajkbXhs39Nbh6MbNxtwJiCqxPy9iH3D3CCfXAvP0QvAAwmJUTK3+z9a++Kc4nkA==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/util" "1.9.3"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/util@1.9.3":
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.9.3.tgz#45458dd5cd02d90e55c656e84adf6f3decf4b7ed"
+  integrity sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==
+  dependencies:
+    tslib "^2.1.0"
+
+"@firebase/webchannel-wrapper@0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.10.1.tgz#60bb2aaf129f9e00621f8d698722ddba6ee1f8ac"
+  integrity sha512-Dq5rYfEpdeel0bLVN+nfD1VWmzCkK+pJbSjIawGE+RY4+NIJqhbUDDQjvV0NUK84fMfwxvtFoCtEe70HfZjFcw==
+
 "@floating-ui/core@^1.2.1":
   version "1.2.1"
   resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.1.tgz"
@@ -1225,6 +1609,95 @@
   dependencies:
     "@fullcalendar/daygrid" "~6.1.7"
 
+"@google-cloud/firestore@^6.5.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-6.6.0.tgz#f7fd0d9cf318417b14851ddce941810b1214ab0c"
+  integrity sha512-XDWsmCtQQFs0RoXZaq3fCYe4jRtAAFmW38ezGLKWSjLQ5FNv7jxpBGtdITBM2PDI0tFNCyeogjqsDbI6CIVeuQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    functional-red-black-tree "^1.0.1"
+    google-gax "^3.5.7"
+    protobufjs "^7.0.0"
+
+"@google-cloud/paginator@^3.0.7":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-3.0.7.tgz#fb6f8e24ec841f99defaebf62c75c2e744dd419b"
+  integrity sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ==
+  dependencies:
+    arrify "^2.0.0"
+    extend "^3.0.2"
+
+"@google-cloud/projectify@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-3.0.0.tgz#302b25f55f674854dce65c2532d98919b118a408"
+  integrity sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA==
+
+"@google-cloud/promisify@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-3.0.1.tgz#8d724fb280f47d1ff99953aee0c1669b25238c2e"
+  integrity sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA==
+
+"@google-cloud/storage@^6.9.5":
+  version "6.10.1"
+  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-6.10.1.tgz#7b62b7956668b649bfa3affa471619ce06d297dd"
+  integrity sha512-EtLlT0YbXtrbUxaNbEfTyTytrjELtl4i42flf8COg+Hu5+apdNjsFO9XEY39wshxAuVjLf4fCSm7GTSW+BD3gQ==
+  dependencies:
+    "@google-cloud/paginator" "^3.0.7"
+    "@google-cloud/projectify" "^3.0.0"
+    "@google-cloud/promisify" "^3.0.0"
+    abort-controller "^3.0.0"
+    async-retry "^1.3.3"
+    compressible "^2.0.12"
+    duplexify "^4.0.0"
+    ent "^2.2.0"
+    extend "^3.0.2"
+    gaxios "^5.0.0"
+    google-auth-library "^8.0.1"
+    mime "^3.0.0"
+    mime-types "^2.0.8"
+    p-limit "^3.0.1"
+    retry-request "^5.0.0"
+    teeny-request "^8.0.0"
+    uuid "^8.0.0"
+
+"@grpc/grpc-js@~1.7.0":
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.7.3.tgz#f2ea79f65e31622d7f86d4b4c9ae38f13ccab99a"
+  integrity sha512-H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog==
+  dependencies:
+    "@grpc/proto-loader" "^0.7.0"
+    "@types/node" ">=12.12.47"
+
+"@grpc/grpc-js@~1.8.0":
+  version "1.8.14"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.8.14.tgz#4fe0f9917d6f094cf59245763c275442b182e9ad"
+  integrity sha512-w84maJ6CKl5aApCMzFll0hxtFNT6or9WwMslobKaqWUEf1K+zhlL43bSQhFreyYWIWR+Z0xnVFC1KtLm4ZpM/A==
+  dependencies:
+    "@grpc/proto-loader" "^0.7.0"
+    "@types/node" ">=12.12.47"
+
+"@grpc/proto-loader@^0.6.13":
+  version "0.6.13"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.13.tgz#008f989b72a40c60c96cd4088522f09b05ac66bc"
+  integrity sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g==
+  dependencies:
+    "@types/long" "^4.0.1"
+    lodash.camelcase "^4.3.0"
+    long "^4.0.0"
+    protobufjs "^6.11.3"
+    yargs "^16.2.0"
+
+"@grpc/proto-loader@^0.7.0":
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.7.tgz#d33677a77eea8407f7c66e2abd97589b60eb4b21"
+  integrity sha512-1TIeXOi8TuSCQprPItwoMymZXxWT0CPxUhkrkeCUH+D8U7QDwQ6b7SUz2MaLuWM2llT+J/TVFLmQI5KtML3BhQ==
+  dependencies:
+    "@types/long" "^4.0.1"
+    lodash.camelcase "^4.3.0"
+    long "^4.0.0"
+    protobufjs "^7.0.0"
+    yargs "^17.7.2"
+
 "@headlessui/react@^1.7.14":
   version "1.7.14"
   resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.14.tgz#75f19552c535113640fe8a3a40e71474f49e89c9"
@@ -1301,6 +1774,13 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@jsdoc/salty@^0.2.1":
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.5.tgz#1b2fa5bb8c66485b536d86eee877c263d322f692"
+  integrity sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==
+  dependencies:
+    lodash "^4.17.21"
+
 "@motionone/animation@^10.15.1":
   version "10.15.1"
   resolved "https://registry.npmjs.org/@motionone/animation/-/animation-10.15.1.tgz"
@@ -1508,6 +1988,59 @@
   resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.14.0.tgz#4bed9e6f3d01bb0e4598e76c1726f33579d6a2c3"
   integrity sha512-PDNlhP/1vyTgmNyiucGqGCdXIp7HIkkvKO50si3y3PcceeHvqtiKPaH1iJdz63jCWMVMbj2MElSxXPOeBvEVIQ==
 
+"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
+  integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
+
+"@protobufjs/base64@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
+  integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
+
+"@protobufjs/codegen@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
+  integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
+
+"@protobufjs/eventemitter@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
+  integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
+
+"@protobufjs/fetch@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
+  integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.1"
+    "@protobufjs/inquire" "^1.1.0"
+
+"@protobufjs/float@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
+  integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
+
+"@protobufjs/inquire@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
+  integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
+
+"@protobufjs/path@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
+  integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
+
+"@protobufjs/pool@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
+  integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
+
+"@protobufjs/utf8@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
+  integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
+
 "@rushstack/eslint-patch@^1.1.3":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz"
@@ -1545,6 +2078,11 @@
   resolved "https://registry.yarnpkg.com/@tanstack/table-core/-/table-core-8.9.1.tgz#869410ca1748c45d4e19ccfd4db7e36452611674"
   integrity sha512-2+R83n8vMZND0q3W1lSiF7co9nFbeWbjAErFf27xwbeA9E0wtUu5ZDfgj+TZ6JzdAEQAgfxkk/QNFAKiS8E4MA==
 
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
 "@trpc/client@^10.26.0":
   version "10.26.0"
   resolved "https://registry.yarnpkg.com/@trpc/client/-/client-10.26.0.tgz#eaccff7b101882cbf543931abc1f764b3b17bae6"
@@ -1572,6 +2110,49 @@
   resolved "https://registry.npmjs.org/@types/bcryptjs/-/bcryptjs-2.4.2.tgz"
   integrity sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==
 
+"@types/body-parser@*":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/connect@*":
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/express-serve-static-core@^4.17.33":
+  version "4.17.35"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f"
+  integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+    "@types/send" "*"
+
+"@types/express@^4.17.14":
+  version "4.17.17"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4"
+  integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.33"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
+"@types/glob@*":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
+  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
+  dependencies:
+    "@types/minimatch" "^5.1.2"
+    "@types/node" "*"
+
 "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
@@ -1582,6 +2163,18 @@
   resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
+"@types/jsonwebtoken@^9.0.0":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#9eeb56c76dd555039be2a3972218de5bd3b8d83e"
+  integrity sha512-drE6uz7QBKq1fYqqoFKTDRdFCPHd5TCub75BM+D+cMx7NU9hUz7SESLfC2fSCXVFMO5Yj8sOWHuGqPgjc+fz0Q==
+  dependencies:
+    "@types/node" "*"
+
+"@types/linkify-it@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
+  integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
+
 "@types/lodash.mergewith@4.6.7":
   version "4.6.7"
   resolved "https://registry.npmjs.org/@types/lodash.mergewith/-/lodash.mergewith-4.6.7.tgz"
@@ -1594,11 +2187,49 @@
   resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"
   integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
 
+"@types/long@^4.0.0", "@types/long@^4.0.1":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
+  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
+
+"@types/markdown-it@^12.2.3":
+  version "12.2.3"
+  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
+  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
+  dependencies:
+    "@types/linkify-it" "*"
+    "@types/mdurl" "*"
+
+"@types/mdurl@*":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
+  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
+
+"@types/mime@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
+  integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
+
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+
+"@types/minimatch@^5.1.2":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
+
 "@types/node@*", "@types/node@^18.11.18":
   version "18.14.0"
   resolved "https://registry.npmjs.org/@types/node/-/node-18.14.0.tgz"
   integrity sha512-5EWrvLmglK+imbCJY0+INViFWUHg1AHel1sq4ZVSfdcNqGy9Edv3UB9IIzzg+xPaUcAgZYcfVs2fBcwDeZzU0A==
 
+"@types/node@>=12.12.47", "@types/node@>=13.7.0":
+  version "20.2.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.2.5.tgz#26d295f3570323b2837d322180dfbf1ba156fefb"
+  integrity sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ==
+
 "@types/nodemailer@^6.4.7":
   version "6.4.7"
   resolved "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.7.tgz"
@@ -1630,6 +2261,16 @@
   dependencies:
     "@types/node" "*"
 
+"@types/qs@*":
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+
+"@types/range-parser@*":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+
 "@types/react-dom@^18.2.4":
   version "18.2.4"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.4.tgz#13f25bfbf4e404d26f62ac6e406591451acba9e0"
@@ -1662,6 +2303,14 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/rimraf@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.2.tgz#a63d175b331748e5220ad48c901d7bbf1f44eef8"
+  integrity sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==
+  dependencies:
+    "@types/glob" "*"
+    "@types/node" "*"
+
 "@types/scheduler@*":
   version "0.16.2"
   resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz"
@@ -1672,6 +2321,22 @@
   resolved "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz"
   integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
+"@types/send@*":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301"
+  integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
+"@types/serve-static@*":
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d"
+  integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==
+  dependencies:
+    "@types/mime" "*"
+    "@types/node" "*"
+
 "@typescript-eslint/eslint-plugin@^5.48.1":
   version "5.52.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.52.0.tgz"
@@ -1766,6 +2431,13 @@
   resolved "https://registry.yarnpkg.com/@zag-js/focus-visible/-/focus-visible-0.2.2.tgz#56233480ca1275d3218fb2e10696a33d1a6b9e64"
   integrity sha512-0j2gZq8HiZ51z4zNnSkF1iSkqlwRDvdH+son3wHdoz+7IUdMN/5Exd4TxMJ+gq2Of1DiXReYLL9qqh2PdQ4wgA==
 
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  dependencies:
+    event-target-shim "^5.0.0"
+
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
@@ -1800,6 +2472,13 @@ acorn@^8.0.4, acorn@^8.8.0:
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
 
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
 ajv@^6.10.0, ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
@@ -1915,11 +2594,23 @@ array.prototype.tosorted@^1.1.1:
     es-shim-unscopables "^1.0.0"
     get-intrinsic "^1.1.3"
 
+arrify@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
+  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
+
 ast-types-flow@^0.0.7:
   version "0.0.7"
   resolved "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz"
   integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
 
+async-retry@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280"
+  integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==
+  dependencies:
+    retry "0.13.1"
+
 autoprefixer@^10.4.13:
   version "10.4.13"
   resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz"
@@ -1963,16 +2654,31 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+base64-js@^1.3.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
 bcryptjs@^2.4.3:
   version "2.4.3"
   resolved "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"
   integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==
 
+bignumber.js@^9.0.0:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz#c4df7dc496bd849d4c9464344c1aa74228b4dac6"
+  integrity sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==
+
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
+bluebird@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1981,6 +2687,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
@@ -1998,6 +2711,11 @@ browserslist@^4.21.3, browserslist@^4.21.4:
     node-releases "^2.0.8"
     update-browserslist-db "^1.0.10"
 
+buffer-equal-constant-time@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
+
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
@@ -2026,6 +2744,13 @@ caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.300014
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001456.tgz"
   integrity sha512-XFHJY5dUgmpMV25UqaD4kVq2LsiaU5rS8fb0f17pCoXQiQslzmFgnfOxfvo1bTpTqf7dwG/N/05CnLCnOEKmzA==
 
+catharsis@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121"
+  integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==
+  dependencies:
+    lodash "^4.17.15"
+
 chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
@@ -2077,6 +2802,24 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
 clsx@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz"
@@ -2116,6 +2859,13 @@ commander@^7.2.0:
   resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
+compressible@^2.0.12:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
+  dependencies:
+    mime-db ">= 1.43.0 < 2"
+
 compute-scroll-into-view@1.0.20:
   version "1.0.20"
   resolved "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz"
@@ -2216,6 +2966,13 @@ debounce@^1.2.0:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
@@ -2223,13 +2980,6 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -2258,7 +3008,7 @@ deep-equal@^2.0.5:
     which-collection "^1.0.1"
     which-typed-array "^1.1.9"
 
-deep-is@^0.1.3:
+deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -2344,11 +3094,28 @@ duplexer@^0.1.2:
   resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
+duplexify@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0"
+  integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==
+  dependencies:
+    end-of-stream "^1.4.1"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+    stream-shift "^1.0.0"
+
 easy-bem@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/easy-bem/-/easy-bem-1.1.1.tgz#1bfcc10425498090bcfddc0f9c000aba91399e03"
   integrity sha512-GJRqdiy2h+EXy6a8E6R+ubmqUM08BK0FWNq41k24fup6045biQ8NXxoXimiwegMQvFFV3t1emADdGNL1TlS61A==
 
+ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 electron-to-chromium@^1.4.284:
   version "1.4.302"
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.302.tgz"
@@ -2369,6 +3136,13 @@ encode-utf8@^1.0.3:
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
+end-of-stream@^1.4.1:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
 enhanced-resolve@^5.10.0:
   version "5.12.0"
   resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz"
@@ -2377,6 +3151,16 @@ enhanced-resolve@^5.10.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+ent@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
+
+entities@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
@@ -2473,11 +3257,28 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
+escodegen@^1.13.0:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-config-next@^13.1.6:
   version "13.1.6"
   resolved "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.1.6.tgz"
@@ -2624,6 +3425,11 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
+eslint-visitor-keys@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+
 eslint@^8.31.0:
   version "8.34.0"
   resolved "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz"
@@ -2669,6 +3475,15 @@ eslint@^8.31.0:
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
+espree@^9.0.0:
+  version "9.5.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
+  integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
+  dependencies:
+    acorn "^8.8.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
+
 espree@^9.4.0:
   version "9.4.1"
   resolved "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz"
@@ -2678,6 +3493,11 @@ espree@^9.4.0:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
+esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
 esquery@^1.4.0:
   version "1.4.2"
   resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz"
@@ -2692,7 +3512,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1:
+estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -2707,6 +3527,16 @@ esutils@^2.0.2:
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
+extend@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
@@ -2728,11 +3558,16 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
+fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867"
+  integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==
+
 fastq@^1.6.0:
   version "1.15.0"
   resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"
@@ -2740,6 +3575,13 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
+faye-websocket@0.11.4:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
+  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
+  dependencies:
+    websocket-driver ">=0.5.1"
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
@@ -2775,6 +3617,55 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
+firebase-admin@^11.8.0:
+  version "11.8.0"
+  resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-11.8.0.tgz#4cb57e39e5ad7cbc690c6e073d93be549c7854b3"
+  integrity sha512-RxO0wWDnuqVikXExhVjnhVaaXpziKCad4D1rOX5c1WJdk1jAu9hfE4rbrFKZQZgF1okZS04kgCBIFJro7xn8NQ==
+  dependencies:
+    "@fastify/busboy" "^1.2.1"
+    "@firebase/database-compat" "^0.3.4"
+    "@firebase/database-types" "^0.10.4"
+    "@types/node" ">=12.12.47"
+    jsonwebtoken "^9.0.0"
+    jwks-rsa "^3.0.1"
+    node-forge "^1.3.1"
+    uuid "^9.0.0"
+  optionalDependencies:
+    "@google-cloud/firestore" "^6.5.0"
+    "@google-cloud/storage" "^6.9.5"
+
+firebase@^9.22.1:
+  version "9.22.1"
+  resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.22.1.tgz#9bf49d8cb87eefae6500cc2bd2ec1fddbc1c1ebb"
+  integrity sha512-8x55ZZJwPlctKIhlfXL+KTOpdabp6dDpDwTEmuW1QNbfCkE1ZEuXHgjiQMfTkoeyQO9luV6YwVdgbgCt7yfYCg==
+  dependencies:
+    "@firebase/analytics" "0.10.0"
+    "@firebase/analytics-compat" "0.2.6"
+    "@firebase/app" "0.9.11"
+    "@firebase/app-check" "0.8.0"
+    "@firebase/app-check-compat" "0.3.7"
+    "@firebase/app-compat" "0.2.11"
+    "@firebase/app-types" "0.9.0"
+    "@firebase/auth" "0.23.2"
+    "@firebase/auth-compat" "0.4.2"
+    "@firebase/database" "0.14.4"
+    "@firebase/database-compat" "0.3.4"
+    "@firebase/firestore" "3.12.1"
+    "@firebase/firestore-compat" "0.3.10"
+    "@firebase/functions" "0.10.0"
+    "@firebase/functions-compat" "0.3.5"
+    "@firebase/installations" "0.6.4"
+    "@firebase/installations-compat" "0.2.4"
+    "@firebase/messaging" "0.12.4"
+    "@firebase/messaging-compat" "0.2.4"
+    "@firebase/performance" "0.6.4"
+    "@firebase/performance-compat" "0.2.4"
+    "@firebase/remote-config" "0.4.4"
+    "@firebase/remote-config-compat" "0.2.4"
+    "@firebase/storage" "0.11.2"
+    "@firebase/storage-compat" "0.3.2"
+    "@firebase/util" "1.9.3"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
@@ -2880,17 +3771,40 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
+
 functions-have-names@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
+gaxios@^5.0.0, gaxios@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-5.1.0.tgz#133b77b45532be71eec72012b7e97c2320b6140a"
+  integrity sha512-aezGIjb+/VfsJtIcHGcBSerNEDdfdHeMros+RbYbGpmonKWQCOVOes0LVZhn1lDtIgq55qq0HaxymIoae3Fl/A==
+  dependencies:
+    extend "^3.0.2"
+    https-proxy-agent "^5.0.0"
+    is-stream "^2.0.0"
+    node-fetch "^2.6.7"
+
+gcp-metadata@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.2.0.tgz#b4772e9c5976241f5d3e69c4f446c906d25506ec"
+  integrity sha512-aFhhvvNycky2QyhG+dcfEdHBF0FRbYcf39s6WNHUDysKSrbJ5vuFbjydxBcmewtXeV248GP8dWT3ByPNxsyHCw==
+  dependencies:
+    gaxios "^5.0.0"
+    json-bigint "^1.0.0"
+
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -2960,6 +3874,17 @@ glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -3012,6 +3937,49 @@ globrex@^0.1.2:
   resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
   integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
 
+google-auth-library@^8.0.1, google-auth-library@^8.0.2:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-8.8.0.tgz#2e17494431cef56b571420d483a4debff6c481cd"
+  integrity sha512-0iJn7IDqObDG5Tu9Tn2WemmJ31ksEa96IyK0J0OZCpTh6CrC6FrattwKX87h3qKVuprCJpdOGKc1Xi8V0kMh8Q==
+  dependencies:
+    arrify "^2.0.0"
+    base64-js "^1.3.0"
+    ecdsa-sig-formatter "^1.0.11"
+    fast-text-encoding "^1.0.0"
+    gaxios "^5.0.0"
+    gcp-metadata "^5.2.0"
+    gtoken "^6.1.0"
+    jws "^4.0.0"
+    lru-cache "^6.0.0"
+
+google-gax@^3.5.7:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-3.6.0.tgz#0f4ae350159737fe0aa289815c0d92838b19f6af"
+  integrity sha512-2fyb61vWxUonHiArRNJQmE4tx5oY1ni8VPo08fzII409vDSCWG7apDX4qNOQ2GXXT82gLBn3d3P1Dydh7pWjyw==
+  dependencies:
+    "@grpc/grpc-js" "~1.8.0"
+    "@grpc/proto-loader" "^0.7.0"
+    "@types/long" "^4.0.0"
+    "@types/rimraf" "^3.0.2"
+    abort-controller "^3.0.0"
+    duplexify "^4.0.0"
+    fast-text-encoding "^1.0.3"
+    google-auth-library "^8.0.2"
+    is-stream-ended "^0.1.4"
+    node-fetch "^2.6.1"
+    object-hash "^3.0.0"
+    proto3-json-serializer "^1.0.0"
+    protobufjs "7.2.3"
+    protobufjs-cli "1.1.1"
+    retry-request "^5.0.0"
+
+google-p12-pem@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-4.0.1.tgz#82841798253c65b7dc2a4e5fe9df141db670172a"
+  integrity sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==
+  dependencies:
+    node-forge "^1.3.1"
+
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -3019,6 +3987,11 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
+graceful-fs@^4.1.9:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 graceful-fs@^4.2.4:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
@@ -3029,6 +4002,15 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
+gtoken@^6.1.0:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-6.1.2.tgz#aeb7bdb019ff4c3ba3ac100bbe7b6e74dce0e8bc"
+  integrity sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==
+  dependencies:
+    gaxios "^5.0.1"
+    google-p12-pem "^4.0.0"
+    jws "^4.0.0"
+
 gzip-size@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
@@ -3094,6 +4076,38 @@ hoist-non-react-statics@^3.3.1:
   dependencies:
     react-is "^16.7.0"
 
+http-parser-js@>=0.5.1:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
+  integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
+
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
+https-proxy-agent@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
+idb@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-7.0.1.tgz#d2875b3a2f205d854ee307f6d196f246fea590a7"
+  integrity sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg==
+
+idb@7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.1.tgz#d910ded866d32c7ced9befc5bfdf36f572ced72b"
+  integrity sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==
+
 ignore@^5.2.0:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
@@ -3120,7 +4134,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2:
+inherits@2, inherits@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -3273,6 +4287,16 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
+is-stream-ended@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-stream-ended/-/is-stream-ended-0.1.4.tgz#f50224e95e06bce0e356d440a4827cd35b267eda"
+  integrity sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==
+
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"
@@ -3340,7 +4364,7 @@ isexe@^2.0.0:
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-jose@^4.11.4, jose@^4.14.1:
+jose@^4.10.4, jose@^4.11.4, jose@^4.14.1:
   version "4.14.4"
   resolved "https://registry.yarnpkg.com/jose/-/jose-4.14.4.tgz#59e09204e2670c3164ee24cbfe7115c6f8bff9ca"
   integrity sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g==
@@ -3362,11 +4386,46 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+js2xmlparser@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a"
+  integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==
+  dependencies:
+    xmlcreate "^2.0.4"
+
+jsdoc@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e"
+  integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==
+  dependencies:
+    "@babel/parser" "^7.20.15"
+    "@jsdoc/salty" "^0.2.1"
+    "@types/markdown-it" "^12.2.3"
+    bluebird "^3.7.2"
+    catharsis "^0.9.0"
+    escape-string-regexp "^2.0.0"
+    js2xmlparser "^4.0.2"
+    klaw "^3.0.0"
+    markdown-it "^12.3.2"
+    markdown-it-anchor "^8.4.1"
+    marked "^4.0.10"
+    mkdirp "^1.0.4"
+    requizzle "^0.2.3"
+    strip-json-comments "^3.1.0"
+    underscore "~1.13.2"
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
+json-bigint@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
+  integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==
+  dependencies:
+    bignumber.js "^9.0.0"
+
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
   resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
@@ -3394,6 +4453,16 @@ json5@^2.2.2:
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
+jsonwebtoken@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
+  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
+  dependencies:
+    jws "^3.2.2"
+    lodash "^4.17.21"
+    ms "^2.1.1"
+    semver "^7.3.8"
+
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.3:
   version "3.3.3"
   resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz"
@@ -3402,6 +4471,59 @@ json5@^2.2.2:
     array-includes "^3.1.5"
     object.assign "^4.1.3"
 
+jwa@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jwa@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz#a7e9c3f29dae94027ebcaf49975c9345593410fc"
+  integrity sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jwks-rsa@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-3.0.1.tgz#ba79ddca7ee7520f7bb26b942ef1aee91df8d7e4"
+  integrity sha512-UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw==
+  dependencies:
+    "@types/express" "^4.17.14"
+    "@types/jsonwebtoken" "^9.0.0"
+    debug "^4.3.4"
+    jose "^4.10.4"
+    limiter "^1.1.5"
+    lru-memoizer "^2.1.4"
+
+jws@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+  dependencies:
+    jwa "^1.4.1"
+    safe-buffer "^5.0.1"
+
+jws@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz#2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4"
+  integrity sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==
+  dependencies:
+    jwa "^2.0.0"
+    safe-buffer "^5.0.1"
+
+klaw@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146"
+  integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==
+  dependencies:
+    graceful-fs "^4.1.9"
+
 language-subtag-registry@~0.3.2:
   version "0.3.22"
   resolved "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz"
@@ -3422,16 +4544,36 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 lilconfig@^2.0.5, lilconfig@^2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz"
   integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==
 
+limiter@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
+  integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==
+
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
+linkify-it@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
+  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
+  dependencies:
+    uc.micro "^1.0.1"
+
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -3446,6 +4588,16 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
+
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==
+
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
@@ -3456,11 +4608,21 @@ lodash.mergewith@4.6.2:
   resolved "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"
   integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
-lodash@^4.17.20:
+lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+long@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
+  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
+
+long@^5.0.0:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
+  integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
+
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
@@ -3482,6 +4644,48 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@~4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
+  integrity sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==
+  dependencies:
+    pseudomap "^1.0.1"
+    yallist "^2.0.0"
+
+lru-memoizer@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/lru-memoizer/-/lru-memoizer-2.2.0.tgz#b9d90c91637b4b1a423ef76f3156566691293df8"
+  integrity sha512-QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw==
+  dependencies:
+    lodash.clonedeep "^4.5.0"
+    lru-cache "~4.0.0"
+
+markdown-it-anchor@^8.4.1:
+  version "8.6.7"
+  resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634"
+  integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==
+
+markdown-it@^12.3.2:
+  version "12.3.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
+  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
+  dependencies:
+    argparse "^2.0.1"
+    entities "~2.1.0"
+    linkify-it "^3.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+marked@^4.0.10:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
+  integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==
+
+mdurl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
+
 memoize-one@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz"
@@ -3500,6 +4704,23 @@ micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
+mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-types@^2.0.8:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
+mime@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
+  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
+
 mini-svg-data-uri@^1.4.3:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939"
@@ -3512,11 +4733,23 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^5.0.1:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 mrmime@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz"
@@ -3587,6 +4820,25 @@ next@^13.1.6:
     "@next/swc-win32-ia32-msvc" "13.1.6"
     "@next/swc-win32-x64-msvc" "13.1.6"
 
+node-fetch@2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-fetch@^2.6.1, node-fetch@^2.6.7:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
+  integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-forge@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
+  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
+
 node-releases@^2.0.8:
   version "2.0.10"
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz"
@@ -3695,7 +4947,7 @@ oidc-token-hash@^5.0.3:
   resolved "https://registry.yarnpkg.com/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz#9a229f0a1ce9d4fc89bcaee5478c97a889e7b7b6"
   integrity sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==
 
-once@^1.3.0:
+once@^1.3.0, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
@@ -3726,6 +4978,18 @@ openid-client@^5.4.0:
     object-hash "^2.2.0"
     oidc-token-hash "^5.0.3"
 
+optionator@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"
@@ -3745,7 +5009,7 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2:
+p-limit@^3.0.1, p-limit@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -3922,6 +5186,11 @@ prelude-ls@^1.2.1:
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
+
 prettier-plugin-tailwindcss@^0.2.3:
   version "0.2.3"
   resolved "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.3.tgz"
@@ -3953,6 +5222,71 @@ prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+proto3-json-serializer@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz#1b5703152b6ce811c5cdcc6468032caf53521331"
+  integrity sha512-AwAuY4g9nxx0u52DnSMkqqgyLHaW/XaPLtaAo3y/ZCfeaQB/g4YDH4kb8Wc/mWzWvu0YjOznVnfn373MVZZrgw==
+  dependencies:
+    protobufjs "^7.0.0"
+
+protobufjs-cli@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz#f531201b1c8c7772066aa822bf9a08318b24a704"
+  integrity sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==
+  dependencies:
+    chalk "^4.0.0"
+    escodegen "^1.13.0"
+    espree "^9.0.0"
+    estraverse "^5.1.0"
+    glob "^8.0.0"
+    jsdoc "^4.0.0"
+    minimist "^1.2.0"
+    semver "^7.1.2"
+    tmp "^0.2.1"
+    uglify-js "^3.7.7"
+
+protobufjs@7.2.3, protobufjs@^7.0.0:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.3.tgz#01af019e40d9c6133c49acbb3ff9e30f4f0f70b2"
+  integrity sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/node" ">=13.7.0"
+    long "^5.0.0"
+
+protobufjs@^6.11.3:
+  version "6.11.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
+  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/long" "^4.0.1"
+    "@types/node" ">=13.7.0"
+    long "^4.0.0"
+
+pseudomap@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
+
 punycode@^2.1.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"
@@ -4106,6 +5440,15 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
+readable-stream@^3.1.1:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
@@ -4142,6 +5485,13 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
+requizzle@^0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c"
+  integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==
+  dependencies:
+    lodash "^4.17.21"
+
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
@@ -4165,12 +5515,25 @@ resolve@^2.0.0-next.4:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+retry-request@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-5.0.2.tgz#143d85f90c755af407fcc46b7166a4ba520e44da"
+  integrity sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==
+  dependencies:
+    debug "^4.1.1"
+    extend "^3.0.2"
+
+retry@0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
+  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
+
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^3.0.2:
+rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -4184,6 +5547,11 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
 safe-regex-test@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"
@@ -4205,6 +5573,13 @@ semver@^6.3.0:
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.1.2, semver@^7.3.8:
+  version "7.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
+  integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@^7.3.7:
   version "7.3.8"
   resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"
@@ -4267,6 +5642,11 @@ source-map@^0.5.7:
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
+source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
 stop-iteration-iterator@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz"
@@ -4274,7 +5654,19 @@ stop-iteration-iterator@^1.0.0:
   dependencies:
     internal-slot "^1.0.4"
 
-string-width@^4.1.0, string-width@^4.2.0:
+stream-events@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5"
+  integrity sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==
+  dependencies:
+    stubs "^3.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -4315,6 +5707,13 @@ string.prototype.trimstart@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -4332,6 +5731,11 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+stubs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
+  integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==
+
 styled-jsx@5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz"
@@ -4417,6 +5821,22 @@ tapable@^2.2.0:
   resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
+teeny-request@^8.0.0:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-8.0.3.tgz#5cb9c471ef5e59f2fca8280dc3c5909595e6ca24"
+  integrity sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww==
+  dependencies:
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    node-fetch "^2.6.1"
+    stream-events "^1.0.5"
+    uuid "^9.0.0"
+
+text-decoding@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/text-decoding/-/text-decoding-1.0.0.tgz#38a5692d23b5c2b12942d6e245599cb58b1bc52f"
+  integrity sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
@@ -4435,6 +5855,13 @@ tiny-invariant@^1.0.6:
   resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz"
   integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
+tmp@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
@@ -4457,6 +5884,11 @@ totalist@^1.0.0:
   resolved "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz"
   integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
 
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
 tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"
@@ -4496,6 +5928,13 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
+  dependencies:
+    prelude-ls "~1.1.2"
+
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
@@ -4515,6 +5954,16 @@ typescript@^4.9.4:
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
+uc.micro@^1.0.1, uc.micro@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
+
+uglify-js@^3.7.7:
+  version "3.17.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
+  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"
@@ -4525,6 +5974,11 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
+underscore@~1.13.2:
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
+  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
+
 update-browserslist-db@^1.0.10:
   version "1.0.10"
   resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"
@@ -4565,16 +6019,26 @@ use-sync-external-store@^1.2.0:
   resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
 
-util-deprecate@^1.0.2:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-uuid@^8.3.2:
+uuid@^8.0.0, uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+
 webpack-bundle-analyzer@4.7.0:
   version "4.7.0"
   resolved "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz"
@@ -4590,6 +6054,28 @@ webpack-bundle-analyzer@4.7.0:
     sirv "^1.0.7"
     ws "^7.3.1"
 
+websocket-driver@>=0.5.1:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
+  dependencies:
+    http-parser-js ">=0.5.1"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
+
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"
@@ -4635,7 +6121,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-word-wrap@^1.2.3:
+word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
@@ -4649,6 +6135,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
@@ -4659,6 +6154,11 @@ ws@^7.3.1:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
+xmlcreate@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be"
+  integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==
+
 xtend@^4.0.2:
   version "4.0.2"
   resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
@@ -4669,6 +6169,16 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
   integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
+yallist@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
+
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"
@@ -4692,6 +6202,16 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
 yargs@^15.3.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
@@ -4709,6 +6229,32 @@ yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
+yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"

From d5c53461a3aad23f7e72e75136d034b8ba9efd1c Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Mon, 29 May 2023 23:07:54 +0800
Subject: [PATCH 026/223] Create a helper class for the base collection

---
 src/server/db/collections/BaseCollection.ts | 54 +++++++++++++++++----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index 215317ea..dfd10f31 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -7,6 +7,9 @@ import {
   query,
   getDocs,
   where,
+  deleteDoc,
+  updateDoc,
+  type Transaction,
   type WithFieldValue,
   type DocumentData,
   type WhereFilterOp,
@@ -23,15 +26,12 @@ export abstract class BaseCollection<T> {
   protected abstract collectionName: string
   protected abstract objectName: string
 
-  get collection() {
-    return collection(db, this.collectionName)
-  }
+  async set(payload: T, id?: string) {
+    const c = id
+      ? collection(db, this.collectionName, id)
+      : collection(db, this.collectionName)
 
-  async set(payload: T) {
-    return await addDoc(
-      this.collection,
-      payload as WithFieldValue<DocumentData>
-    )
+    return await addDoc(c, payload as WithFieldValue<DocumentData>)
   }
 
   async getById(id: string) {
@@ -47,10 +47,46 @@ export abstract class BaseCollection<T> {
     const items = queries.map((q) => {
       return where(q.fieldPath as string | FieldPath, q.direction, q.value)
     })
-    const q = query(this.collection, ...items)
+    const q = query(collection(db, this.collectionName), ...items)
     const snapshots = await getDocs(q)
     return snapshots.docs.map((doc) => {
       return { ...doc.data(), id: doc.id } as T
     })
   }
+
+  async delete(id: string) {
+    await deleteDoc(doc(db, this.collectionName, id))
+  }
+
+  async update(id: string, payload: Partial<T>) {
+    await updateDoc(
+      doc(db, this.collectionName, id),
+      payload as WithFieldValue<DocumentData>
+    )
+  }
+
+  withTransaction(transaction: Transaction) {
+    return {
+      set: (payload: T, id?: string) => {
+        const docRef = id
+          ? doc(db, this.collectionName, id)
+          : doc(db, this.collectionName)
+
+        transaction.set(docRef, payload as WithFieldValue<DocumentData>)
+      },
+      get: async (id: string) => {
+        const result = await transaction.get(doc(db, this.collectionName, id))
+        return { ...result.data, id: result.id }
+      },
+      update: (payload: Partial<T>, id: string) => {
+        transaction.update(
+          doc(db, this.collectionName, id),
+          payload as WithFieldValue<DocumentData>
+        )
+      },
+      delete: (id: string) => {
+        transaction.delete(doc(db, this.collectionName, id))
+      },
+    }
+  }
 }

From 15f92f67e2246ae8b585c3d459e98d32ca6709ca Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Mon, 29 May 2023 23:57:34 +0800
Subject: [PATCH 027/223] Migrate to firebase

---
 src/components/users/SingleUserForm.tsx     |  2 +-
 src/pages/api/auth/[...nextauth].ts         | 42 +++++++++---------
 src/server/db/collections/BaseCollection.ts | 22 +++++++---
 src/server/trpc/router/member/create.ts     | 38 +++++++++--------
 src/server/trpc/router/member/helper.ts     | 47 +++------------------
 5 files changed, 66 insertions(+), 85 deletions(-)

diff --git a/src/components/users/SingleUserForm.tsx b/src/components/users/SingleUserForm.tsx
index 6403b786..178b57a7 100644
--- a/src/components/users/SingleUserForm.tsx
+++ b/src/components/users/SingleUserForm.tsx
@@ -187,7 +187,7 @@ const SingleUserForm = () => {
     } catch (e) {
       toast({
         title: 'Oops, something went wrong!',
-        description: 'An error went wrong while creating the user',
+        description: (e as Error).message,
         status: 'error',
         isClosable: true,
         duration: 9000,
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 70c9fb00..2dd346fb 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -2,12 +2,10 @@ import NextAuth, { type NextAuthOptions } from 'next-auth'
 import CredentialsProvider from 'next-auth/providers/credentials'
 import { compare } from 'bcryptjs'
 
-import { prisma } from '../../../server/db/client'
 import { env } from '../../../env/server.mjs'
-import type { User } from '@prisma/client'
+import type { User } from '~/server/db/models/User'
 
-import { db } from '~/server/db/firebase'
-import { collection, addDoc } from 'firebase/firestore'
+import userCollection from '~/server/db/collections/UserCollection'
 
 export const authOptions: NextAuthOptions = {
   callbacks: {
@@ -45,34 +43,36 @@ export const authOptions: NextAuthOptions = {
             password: string
           }
 
-          await addDoc(collection(db, 'users'), {
-            name: 'John',
-          })
-
           // Step 2: If no credentials are provided, throw an error
           if (!credential || !email || !password) {
             throw new Error('No email or password provided')
           }
 
           // Step 3: Get the user by the email
-          const adapterUser = await prisma.user.findUnique({
-            where: { email },
-          })
-          if (!adapterUser) throw new Error('Invalid email or password')
+          const users = await userCollection.queries([
+            {
+              fieldPath: 'email',
+              direction: '==',
+              value: email,
+            },
+          ])
 
-          // Step 4: Type cast it to the type of User
-          const account = adapterUser as User
+          if (users.length === 0) {
+            throw Error('Invalid email or password')
+          }
 
-          // If the account is found, challenge the hashPassword with the password
-          const success = await compare(password, account.hashedPassword)
-          if (!success) throw new Error('Invalid email or password')
+          const user = users[0] as User
+          const isSuccess = await compare(password, user.hashedPassword)
+          if (!isSuccess) {
+            throw Error('Incorrect password')
+          }
 
           // The user object is passed to the session callback in session.data.user
           return {
-            id: account.id,
-            name: account.name,
-            email: account.email,
-            isAdmin: account.isAdmin,
+            id: user.id as string,
+            name: user.name,
+            email: user.email,
+            isAdmin: user.isAdmin,
           }
         } catch (e) {
           throw new Error((e as Error).message)
diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index dfd10f31..1b39accc 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -1,7 +1,7 @@
 import { db } from '../firebase'
 import {
   collection,
-  addDoc,
+  setDoc,
   getDoc,
   doc,
   query,
@@ -27,11 +27,23 @@ export abstract class BaseCollection<T> {
   protected abstract objectName: string
 
   async set(payload: T, id?: string) {
-    const c = id
-      ? collection(db, this.collectionName, id)
-      : collection(db, this.collectionName)
+    const docRef = id
+      ? doc(db, this.collectionName, id)
+      : doc(db, this.collectionName)
 
-    return await addDoc(c, payload as WithFieldValue<DocumentData>)
+    return await setDoc(docRef, {
+      ...payload,
+      id: id ? id : docRef.id,
+    } as WithFieldValue<DocumentData>)
+  }
+
+  async findById(id: string) {
+    const docRef = doc(db, this.collectionName, id)
+    const result = await getDoc(docRef)
+    if (!result.exists) {
+      return null
+    }
+    return { ...result.data(), id: result.id } as T
   }
 
   async getById(id: string) {
diff --git a/src/server/trpc/router/member/create.ts b/src/server/trpc/router/member/create.ts
index 0c83a2f7..b58cfbdd 100644
--- a/src/server/trpc/router/member/create.ts
+++ b/src/server/trpc/router/member/create.ts
@@ -5,7 +5,6 @@ import { hash } from 'bcryptjs'
 import type { User } from '@prisma/client'
 import {
   checkIfUserExist,
-  createNewUser,
   sendEmail,
   sendMultipleEmails,
   buildUserObject,
@@ -13,6 +12,7 @@ import {
 } from './helper'
 import { LogType } from '@prisma/client'
 import { ErrorTitle } from '../constants/ErrorTitle'
+import userCollection from '~/server/db/collections/UserCollection'
 
 /**
  * Create multiple accounts for many users and send out an
@@ -73,21 +73,25 @@ export const createSingleUser = protectedProcedure
       isAdmin: z.boolean(),
     })
   )
-  .mutation(async ({ ctx, input }) => {
-    try {
-      const { email, id, isAdmin, role, department, name } = input
-      const password = input.password
+  .mutation(async ({ input }) => {
+    const { email, id, isAdmin, role, department, name, password } = input
 
-      await checkIfUserExist(email, ctx.prisma)
-      await createNewUser(name, department, email, id, isAdmin, role, password, ctx.prisma)
-      await sendEmail(email, password)
-    } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          title: ErrorTitle.ERROR_ADDING_SINGLE_USER,
-          message: (e as Error).message,
-          type: LogType.ERROR,
-        },
-      })
-    }
+    const [hashedPassword] = await Promise.all([
+      hash(password, 10),
+      checkIfUserExist(id),
+    ])
+
+    await userCollection.set(
+      {
+        department,
+        email,
+        isAdmin,
+        name,
+        hashedPassword,
+        role,
+      },
+      id
+    )
+
+    await sendEmail(email, hashedPassword)
   })
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index dec00a45..cf61dc35 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -1,11 +1,11 @@
 import { TRPCError } from '@trpc/server'
-import { hash } from 'bcryptjs'
 import nodemailer from 'nodemailer'
 import { env } from '~/env/server.mjs'
 import type { User } from '@prisma/client'
 import { type PrismaClient } from '@prisma/client'
 import dayjs from 'dayjs'
 import type SMTPTransport from 'nodemailer/lib/smtp-transport'
+import userCollection from '~/server/db/collections/UserCollection'
 
 /**
  * Validates whether the user has the necessary permissions
@@ -32,51 +32,17 @@ async function checkUserPermission(id: string, prisma: PrismaClient) {
  * @param email The email of the user
  * @throws {TRPCError} if the user already exists
  */
-async function checkIfUserExist(email: string, prisma: PrismaClient) {
-  const foundUser = await prisma.user.findUnique({ where: { email } })
-  if (foundUser) {
+async function checkIfUserExist(id: string) {
+  const results = await userCollection.findById(id)
+
+  if (results) {
     throw new TRPCError({
       code: 'CONFLICT',
-      message: 'User already exists',
+      message: 'The user already exists',
     })
   }
 }
 
-/**
- * CREATE a new user into the database
- *
- * @param email The email of the user
- * @param id The student id of the user
- * @param isAdmin Whether the user has admin rights
- * @param level The role of the user
- * @param password The password of the user
- */
-async function createNewUser(
-  name: string,
-  department: string,
-  email: string,
-  id: string,
-  isAdmin: boolean,
-  role: string,
-  password: string,
-  prisma: PrismaClient
-) {
-  const hashedPassword = await hash(password, 10)
-
-  await prisma.user.create({
-    data: {
-      batch: 'AY2022/2023',
-      department,
-      name,
-      role,
-      email,
-      id,
-      hashedPassword,
-      isAdmin,
-    },
-  })
-}
-
 /**
  * Sends an email to the user after the account has been generated.
  *
@@ -202,7 +168,6 @@ export {
   createManyUsers,
   checkUserPermission,
   checkIfUserExist,
-  createNewUser,
   sendEmail,
   sendMultipleEmails,
   buildUserObject,

From c9b4edb621a38310fe7533885398854ba824e72f Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 00:13:03 +0800
Subject: [PATCH 028/223] Update the create multiple users

---
 src/server/db/models/User.ts            |  6 +++-
 src/server/trpc/router/member/create.ts | 45 +++++++++++++++++++------
 src/server/trpc/router/member/helper.ts | 11 +++---
 3 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index 8be8142b..f31429d0 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -1,5 +1,9 @@
 export type User = {
+  department: string
   email: string
   hashedPassword: string
-  name: number
+  isAdmin: boolean
+  id?: string
+  name: string
+  role: string
 }
diff --git a/src/server/trpc/router/member/create.ts b/src/server/trpc/router/member/create.ts
index b58cfbdd..aaaf31f1 100644
--- a/src/server/trpc/router/member/create.ts
+++ b/src/server/trpc/router/member/create.ts
@@ -2,17 +2,14 @@ import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import { randomBytes } from 'crypto'
 import { hash } from 'bcryptjs'
-import type { User } from '@prisma/client'
-import {
-  checkIfUserExist,
-  sendEmail,
-  sendMultipleEmails,
-  buildUserObject,
-  createManyUsers,
-} from './helper'
+
+import { checkIfUserExist, sendEmail, sendMultipleEmails } from './helper'
 import { LogType } from '@prisma/client'
 import { ErrorTitle } from '../constants/ErrorTitle'
 import userCollection from '~/server/db/collections/UserCollection'
+import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
+import { db } from '~/server/db/firebase'
+import type { User } from '~/server/db/models/User'
 
 /**
  * Create multiple accounts for many users and send out an
@@ -46,10 +43,36 @@ export const addMultipleUsers = protectedProcedure
     try {
       const password = randomBytes(10).toString('hex')
       const hashedPassword = await hash(password, 10)
+      const emails: string[] = []
+
+      // Add user logic. Note that each firebase batch only allow up to 500 writes so we need an array for more than 500 users.
+      let batchIndex = 0
+      let counter = 0
+      const batches: WriteBatch[] = [writeBatch(db)]
+      input.forEach((user) => {
+        emails.push(user.nus_email)
+
+        batches[batchIndex]?.set(doc(db, 'users', user.student_id), {
+          department: user.department,
+          email: user.nus_email,
+          hashedPassword,
+          name: user.name,
+          isAdmin: false,
+          id: user.student_id,
+          role: user.role,
+        } as User)
+
+        counter += 1
+
+        if (counter === 499) {
+          batches.push(writeBatch(db))
+          batchIndex += 1
+          counter = 0
+        }
+      })
 
-      const users: User[] = buildUserObject(input, hashedPassword)
-      await createManyUsers(users, ctx.prisma)
-      await sendMultipleEmails(users, password)
+      await Promise.all(batches.map(async (batch) => await batch.commit()))
+      await sendMultipleEmails(emails, password)
     } catch (e) {
       await ctx.prisma.log.create({
         data: {
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index cf61dc35..34b9ee3e 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -144,13 +144,10 @@ function buildUserObject(
  * @param users The array of users object
  * @param password The hashed password
  */
-async function sendMultipleEmails(users: User[], password: string) {
-  const promises: Promise<SMTPTransport.SentMessageInfo>[] = []
-  users.forEach((user) => {
-    const promise = sendEmail(user.email, password)
-    promises.push(promise)
-  })
-  await Promise.all(promises)
+async function sendMultipleEmails(emails: string[], password: string) {
+  await Promise.all(
+    emails.map(async (email) => await sendEmail(email, password))
+  )
 }
 
 /**

From 0531ac795dba39196fc0a2b09a4f1018030b1f59 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 00:28:09 +0800
Subject: [PATCH 029/223] Migrate the getAllAttendance

---
 src/server/db/collections/EventCollection.ts  | 10 ++++++
 src/server/db/models/Event.ts                 | 17 ++++++++++
 .../admin/attendance/getAllAttendance.ts      | 24 +++++++++++++
 .../trpc/router/admin/attendance/index.ts     |  2 +-
 .../trpc/router/admin/attendance/read.ts      | 34 -------------------
 5 files changed, 52 insertions(+), 35 deletions(-)
 create mode 100644 src/server/db/collections/EventCollection.ts
 create mode 100644 src/server/db/models/Event.ts
 create mode 100644 src/server/trpc/router/admin/attendance/getAllAttendance.ts
 delete mode 100644 src/server/trpc/router/admin/attendance/read.ts

diff --git a/src/server/db/collections/EventCollection.ts b/src/server/db/collections/EventCollection.ts
new file mode 100644
index 00000000..cdbddc63
--- /dev/null
+++ b/src/server/db/collections/EventCollection.ts
@@ -0,0 +1,10 @@
+import { BaseCollection } from './BaseCollection'
+import type { Event } from '../models/Event'
+
+class EventCollection extends BaseCollection<Event> {
+  protected override collectionName = 'events'
+  protected override objectName = 'event'
+}
+
+const eventCollection = new EventCollection()
+export default eventCollection
diff --git a/src/server/db/models/Event.ts b/src/server/db/models/Event.ts
new file mode 100644
index 00000000..6b289595
--- /dev/null
+++ b/src/server/db/models/Event.ts
@@ -0,0 +1,17 @@
+import type { Timestamp } from 'firebase/firestore'
+
+type User = {
+  id: string
+  name: string
+}
+
+export type Event = {
+  attendees: User[]
+  endDate: Timestamp
+  hasStarted: boolean
+  id: string
+  invitedAttendees: User[]
+  name: string
+  qrCode?: string
+  startDate: Timestamp
+}
diff --git a/src/server/trpc/router/admin/attendance/getAllAttendance.ts b/src/server/trpc/router/admin/attendance/getAllAttendance.ts
new file mode 100644
index 00000000..2bcb5239
--- /dev/null
+++ b/src/server/trpc/router/admin/attendance/getAllAttendance.ts
@@ -0,0 +1,24 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { TRPCError } from '@trpc/server'
+import eventCollection from '~/server/db/collections/EventCollection'
+
+export const getAllAttendance = protectedProcedure.query(async () => {
+  try {
+    const events = await eventCollection.queries([])
+    return events.map((event) => {
+      return {
+        endDate: event.endDate.toDate(),
+        id: event.id,
+        name: event.name,
+        startDate: event.startDate.toDate(),
+        total_attendees: event.attendees.length,
+        total_users: event.invitedAttendees.length,
+      }
+    })
+  } catch (e) {
+    throw new TRPCError({
+      code: 'INTERNAL_SERVER_ERROR',
+      message: (e as Error).message,
+    })
+  }
+})
diff --git a/src/server/trpc/router/admin/attendance/index.ts b/src/server/trpc/router/admin/attendance/index.ts
index 7da37c84..264c5465 100644
--- a/src/server/trpc/router/admin/attendance/index.ts
+++ b/src/server/trpc/router/admin/attendance/index.ts
@@ -1,5 +1,5 @@
 import { router } from '~/server/trpc/trpc'
-import { getAllAttendance } from './read'
+import { getAllAttendance } from './getAllAttendance'
 
 export const attendanceRouter = router({
   getAllAttendance,
diff --git a/src/server/trpc/router/admin/attendance/read.ts b/src/server/trpc/router/admin/attendance/read.ts
deleted file mode 100644
index fb0c2a01..00000000
--- a/src/server/trpc/router/admin/attendance/read.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { protectedProcedure } from '~/server/trpc/trpc'
-import { TRPCError } from '@trpc/server'
-
-export const getAllAttendance = protectedProcedure.query(async ({ ctx }) => {
-  try {
-    const queries = await ctx.prisma.event.findMany({
-      select: {
-        name: true,
-        startDate: true,
-        endDate: true,
-        id: true,
-        _count: {
-          select: { Attendance: true, attendees: true },
-        },
-      },
-    })
-
-    return queries.map((query) => {
-      return {
-        endDate: query.endDate,
-        name: query.name,
-        id: query.id,
-        startDate: query.startDate,
-        total_attendees: query._count.Attendance,
-        total_users: query._count.attendees,
-      }
-    })
-  } catch (e) {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: (e as Error).message,
-    })
-  }
-})

From cda29f8a1983ead722a6187f2903051ab91a732c Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 00:56:18 +0800
Subject: [PATCH 030/223] Continue migration

---
 src/pages/events/create.tsx                   |  6 +-
 src/server/db/collections/BaseCollection.ts   |  8 +--
 src/server/trpc/router/_app.ts                |  2 +-
 .../trpc/router/attendance/createEvent.ts     | 58 +++++++++++++++++++
 .../attendance/getAllAttendance.ts            |  0
 .../router/attendance/getAllUsersButSelf.ts   | 29 ++++++++++
 .../router/{admin => }/attendance/index.ts    |  4 ++
 src/server/trpc/router/member/helper.ts       |  1 -
 8 files changed, 99 insertions(+), 9 deletions(-)
 create mode 100644 src/server/trpc/router/attendance/createEvent.ts
 rename src/server/trpc/router/{admin => }/attendance/getAllAttendance.ts (100%)
 create mode 100644 src/server/trpc/router/attendance/getAllUsersButSelf.ts
 rename src/server/trpc/router/{admin => }/attendance/index.ts (52%)

diff --git a/src/pages/events/create.tsx b/src/pages/events/create.tsx
index 0410e85c..cfb8cc4a 100644
--- a/src/pages/events/create.tsx
+++ b/src/pages/events/create.tsx
@@ -60,9 +60,9 @@ const EventPage: React.FC<BaseProps> = ({ session }) => {
     resolver: zodResolver(FormSchema),
   })
 
-  const { data } = trpc.event.getAllUsers.useQuery()
+  const { data } = trpc.attendance.getAllAttendanceButSelf.useQuery()
   const { mutateAsync, isLoading: isSubmitting } =
-    trpc.event.createEvent.useMutation()
+    trpc.attendance.createEvent.useMutation()
 
   const invalidAttendees = attendees.length === 0
   const formSubmit = async (formData: FormSchemaType) => {
@@ -220,4 +220,4 @@ const EventPage: React.FC<BaseProps> = ({ session }) => {
   )
 }
 
-export default withAuth(EventPage, true)
+export default withAuth(EventPage)
diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index 1b39accc..c6036926 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -40,10 +40,10 @@ export abstract class BaseCollection<T> {
   async findById(id: string) {
     const docRef = doc(db, this.collectionName, id)
     const result = await getDoc(docRef)
-    if (!result.exists) {
+    if (!result.exists()) {
       return null
     }
-    return { ...result.data(), id: result.id } as T
+    return { ...result.data(), id: result.id as string } as T
   }
 
   async getById(id: string) {
@@ -52,7 +52,7 @@ export abstract class BaseCollection<T> {
     if (!result.exists) {
       throw Error(`The ${this.objectName} does not exist`)
     }
-    return { ...result, id: result.id } as T
+    return { ...result, id: result.id as string } as T
   }
 
   async queries(queries: Queries<T>[]) {
@@ -62,7 +62,7 @@ export abstract class BaseCollection<T> {
     const q = query(collection(db, this.collectionName), ...items)
     const snapshots = await getDocs(q)
     return snapshots.docs.map((doc) => {
-      return { ...doc.data(), id: doc.id } as T
+      return { ...doc.data(), id: doc.id as string } as T
     })
   }
 
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index 3bb29760..d5bcd2ae 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -4,7 +4,7 @@ import { memberRouter } from './member'
 import { profileRouter } from './profile'
 import { userRouter } from './admin/users'
 import { eventRouter } from './events'
-import { attendanceRouter } from './admin/attendance'
+import { attendanceRouter } from './attendance'
 
 export const appRouter = router({
   auth: authRouter,
diff --git a/src/server/trpc/router/attendance/createEvent.ts b/src/server/trpc/router/attendance/createEvent.ts
new file mode 100644
index 00000000..d3c3ab7a
--- /dev/null
+++ b/src/server/trpc/router/attendance/createEvent.ts
@@ -0,0 +1,58 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { z } from 'zod'
+import { toDataURL } from 'qrcode'
+import { randomUUID } from 'crypto'
+import { LogType } from '@prisma/client'
+import { ErrorTitle } from '../constants/ErrorTitle'
+import { env } from '~/env/server.mjs'
+import eventCollection from '~/server/db/collections/EventCollection'
+import { Timestamp } from 'firebase/firestore'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const createEvent = protectedProcedure
+  .input(
+    z.object({
+      name: z.string(),
+      startDate: z.date(),
+      endDate: z.date(),
+      departments: z.array(z.string()),
+      attendees: z.array(z.string()),
+      isQrRequired: z.boolean(),
+    })
+  )
+  .mutation(async ({ ctx, input }) => {
+    try {
+      let qr_code: string | undefined
+      const id = randomUUID()
+
+      if (input.isQrRequired) {
+        qr_code = await toDataURL(`${env.DOMAIN}/events/${id}`)
+      }
+
+      const users = await Promise.all(
+        input.attendees.map(async (attendee) => {
+          const data = await userCollection.getById(attendee)
+          return { name: data.name, id: data.id as string }
+        })
+      )
+
+      await eventCollection.set({
+        attendees: [],
+        endDate: Timestamp.fromDate(input.endDate),
+        hasStarted: false,
+        id,
+        invitedAttendees: users,
+        name: input.name,
+        startDate: Timestamp.fromDate(input.startDate),
+        qrCode: qr_code,
+      })
+    } catch (e) {
+      await ctx.prisma.log.create({
+        data: {
+          message: (e as Error).message,
+          title: ErrorTitle.ERROR_CREATING_EVENT,
+          type: LogType.ERROR,
+        },
+      })
+    }
+  })
diff --git a/src/server/trpc/router/admin/attendance/getAllAttendance.ts b/src/server/trpc/router/attendance/getAllAttendance.ts
similarity index 100%
rename from src/server/trpc/router/admin/attendance/getAllAttendance.ts
rename to src/server/trpc/router/attendance/getAllAttendance.ts
diff --git a/src/server/trpc/router/attendance/getAllUsersButSelf.ts b/src/server/trpc/router/attendance/getAllUsersButSelf.ts
new file mode 100644
index 00000000..4dca4144
--- /dev/null
+++ b/src/server/trpc/router/attendance/getAllUsersButSelf.ts
@@ -0,0 +1,29 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { TRPCError } from '@trpc/server'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const getAllAttendanceButSelf = protectedProcedure.query(async ({ ctx }) => {
+  try {
+    const users = await userCollection.queries([
+      {
+        fieldPath: 'id',
+        direction: '!=',
+        value: ctx.session.user.id,
+      },
+    ])
+
+    return users.map((user) => {
+      return {
+        department: user.department,
+        id: user.id as string,
+        name: user.name,
+        role: user.role,
+      }
+    })
+  } catch (e) {
+    throw new TRPCError({
+      code: 'INTERNAL_SERVER_ERROR',
+      message: (e as Error).message,
+    })
+  }
+})
diff --git a/src/server/trpc/router/admin/attendance/index.ts b/src/server/trpc/router/attendance/index.ts
similarity index 52%
rename from src/server/trpc/router/admin/attendance/index.ts
rename to src/server/trpc/router/attendance/index.ts
index 264c5465..fa3fda8d 100644
--- a/src/server/trpc/router/admin/attendance/index.ts
+++ b/src/server/trpc/router/attendance/index.ts
@@ -1,6 +1,10 @@
 import { router } from '~/server/trpc/trpc'
 import { getAllAttendance } from './getAllAttendance'
+import { getAllAttendanceButSelf } from './getAllUsersButSelf'
+import { createEvent } from './createEvent'
 
 export const attendanceRouter = router({
+  createEvent,
   getAllAttendance,
+  getAllAttendanceButSelf,
 })
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index 34b9ee3e..b4b21e1a 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -34,7 +34,6 @@ async function checkUserPermission(id: string, prisma: PrismaClient) {
  */
 async function checkIfUserExist(id: string) {
   const results = await userCollection.findById(id)
-
   if (results) {
     throw new TRPCError({
       code: 'CONFLICT',

From bfa735217bf895c472f66804b164299532ba2231 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 01:25:52 +0800
Subject: [PATCH 031/223] Fix bugs

---
 src/server/db/collections/BaseCollection.ts   | 16 ++++++++-----
 .../trpc/router/attendance/createEvent.ts     | 23 ++++++++-----------
 src/server/trpc/router/member/helper.ts       |  1 -
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index c6036926..e569157a 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -6,6 +6,7 @@ import {
   doc,
   query,
   getDocs,
+  addDoc,
   where,
   deleteDoc,
   updateDoc,
@@ -26,14 +27,17 @@ export abstract class BaseCollection<T> {
   protected abstract collectionName: string
   protected abstract objectName: string
 
-  async set(payload: T, id?: string) {
-    const docRef = id
-      ? doc(db, this.collectionName, id)
-      : doc(db, this.collectionName)
+  async add(payload: T) {
+    return await addDoc(
+      collection(db, this.collectionName),
+      payload as WithFieldValue<DocumentData>
+    )
+  }
 
+  async set(payload: T, id: string) {
+    const docRef = doc(db, this.collectionName, id)
     return await setDoc(docRef, {
       ...payload,
-      id: id ? id : docRef.id,
     } as WithFieldValue<DocumentData>)
   }
 
@@ -52,7 +56,7 @@ export abstract class BaseCollection<T> {
     if (!result.exists) {
       throw Error(`The ${this.objectName} does not exist`)
     }
-    return { ...result, id: result.id as string } as T
+    return { ...result.data(), id: result.id as string } as T
   }
 
   async queries(queries: Queries<T>[]) {
diff --git a/src/server/trpc/router/attendance/createEvent.ts b/src/server/trpc/router/attendance/createEvent.ts
index d3c3ab7a..29018f17 100644
--- a/src/server/trpc/router/attendance/createEvent.ts
+++ b/src/server/trpc/router/attendance/createEvent.ts
@@ -2,12 +2,11 @@ import { protectedProcedure } from '~/server/trpc/trpc'
 import { z } from 'zod'
 import { toDataURL } from 'qrcode'
 import { randomUUID } from 'crypto'
-import { LogType } from '@prisma/client'
-import { ErrorTitle } from '../constants/ErrorTitle'
 import { env } from '~/env/server.mjs'
 import eventCollection from '~/server/db/collections/EventCollection'
 import { Timestamp } from 'firebase/firestore'
 import userCollection from '~/server/db/collections/UserCollection'
+import type { Event } from '~/server/db/models/Event'
 
 export const createEvent = protectedProcedure
   .input(
@@ -32,11 +31,11 @@ export const createEvent = protectedProcedure
       const users = await Promise.all(
         input.attendees.map(async (attendee) => {
           const data = await userCollection.getById(attendee)
-          return { name: data.name, id: data.id as string }
+          console.log("The data is ", data)
+          return { name: data.name || '', id: data.id as string }
         })
       )
-
-      await eventCollection.set({
+      const payload: Event = {
         attendees: [],
         endDate: Timestamp.fromDate(input.endDate),
         hasStarted: false,
@@ -44,15 +43,11 @@ export const createEvent = protectedProcedure
         invitedAttendees: users,
         name: input.name,
         startDate: Timestamp.fromDate(input.startDate),
-        qrCode: qr_code,
-      })
+        qrCode: qr_code || '',
+      }
+
+      await eventCollection.add(payload)
     } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          message: (e as Error).message,
-          title: ErrorTitle.ERROR_CREATING_EVENT,
-          type: LogType.ERROR,
-        },
-      })
+      console.error('The error is ', (e as Error).message)
     }
   })
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index b4b21e1a..730a4710 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -4,7 +4,6 @@ import { env } from '~/env/server.mjs'
 import type { User } from '@prisma/client'
 import { type PrismaClient } from '@prisma/client'
 import dayjs from 'dayjs'
-import type SMTPTransport from 'nodemailer/lib/smtp-transport'
 import userCollection from '~/server/db/collections/UserCollection'
 
 /**

From 2ae3976cfd0f2544a6c9c6806c22a3e122cf8a6a Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 01:46:03 +0800
Subject: [PATCH 032/223] Update the getEventInfo

---
 src/components/attendance/DataTableModal.tsx  |  8 ++---
 src/server/db/models/Event.ts                 |  3 ++
 .../trpc/router/attendance/createEvent.ts     | 11 +++++--
 .../trpc/router/attendance/getEventInfo.ts    | 32 +++++++++++++++++++
 src/server/trpc/router/attendance/index.ts    |  2 ++
 src/types/event/event.type.ts                 | 29 +++++++++--------
 6 files changed, 64 insertions(+), 21 deletions(-)
 create mode 100644 src/server/trpc/router/attendance/getEventInfo.ts

diff --git a/src/components/attendance/DataTableModal.tsx b/src/components/attendance/DataTableModal.tsx
index e0d0f805..d328862a 100644
--- a/src/components/attendance/DataTableModal.tsx
+++ b/src/components/attendance/DataTableModal.tsx
@@ -22,7 +22,7 @@ import { type BodyProps } from '~/types/event/event.type'
 
 const DataTableModal = () => {
   const modal = useContext(EventModalContext)
-  const { data, isLoading } = trpc.event.getEventInfo.useQuery(modal.id)
+  const { data, isLoading } = trpc.attendance.getEventInfo.useQuery(modal.id)
 
   if (!modal.id) {
     return null
@@ -69,7 +69,7 @@ const Body: React.FC<{ data: BodyProps | null | undefined }> = ({ data }) => {
       <p>Department: </p>
       <p>Start Date: {startDate}</p>
       <p>End Date: {endDate}</p>
-      <p>Attendance: {`${data._count.Attendance}/${data._count.attendees}`}</p>
+      <p>Attendance: {`${data.showup}/${data.invitedAttendees.length}`}</p>
       <p>Required Attendees:</p>
       <Table>
         <Thead>
@@ -80,14 +80,14 @@ const Body: React.FC<{ data: BodyProps | null | undefined }> = ({ data }) => {
           <Th color="white">Attendance</Th>
         </Thead>
         <Tbody>
-          {data.attendees.map((attendee, index) => {
+          {data.invitedAttendees.map((attendee, index) => {
             return (
               <Tr key={index}>
                 <Td>{index + 1}</Td>
                 <Td>{attendee.name}</Td>
                 <Td>{attendee.department}</Td>
                 <Td>{attendee.role}</Td>
-                <Td>{data.attended.has(attendee.id) ? 'Yes' : 'No'}</Td>
+                <Td>{attendee.attended ? 'Yes' : 'No'}</Td>
               </Tr>
             )
           })}
diff --git a/src/server/db/models/Event.ts b/src/server/db/models/Event.ts
index 6b289595..08915055 100644
--- a/src/server/db/models/Event.ts
+++ b/src/server/db/models/Event.ts
@@ -1,8 +1,11 @@
 import type { Timestamp } from 'firebase/firestore'
 
 type User = {
+  attended: boolean
+  department: string
   id: string
   name: string
+  role: string
 }
 
 export type Event = {
diff --git a/src/server/trpc/router/attendance/createEvent.ts b/src/server/trpc/router/attendance/createEvent.ts
index 29018f17..2b95348e 100644
--- a/src/server/trpc/router/attendance/createEvent.ts
+++ b/src/server/trpc/router/attendance/createEvent.ts
@@ -19,7 +19,7 @@ export const createEvent = protectedProcedure
       isQrRequired: z.boolean(),
     })
   )
-  .mutation(async ({ ctx, input }) => {
+  .mutation(async ({ input }) => {
     try {
       let qr_code: string | undefined
       const id = randomUUID()
@@ -31,8 +31,13 @@ export const createEvent = protectedProcedure
       const users = await Promise.all(
         input.attendees.map(async (attendee) => {
           const data = await userCollection.getById(attendee)
-          console.log("The data is ", data)
-          return { name: data.name || '', id: data.id as string }
+          return {
+            name: data.name,
+            id: data.id as string,
+            attended: false,
+            department: data.department,
+            role: data.role,
+          }
         })
       )
       const payload: Event = {
diff --git a/src/server/trpc/router/attendance/getEventInfo.ts b/src/server/trpc/router/attendance/getEventInfo.ts
new file mode 100644
index 00000000..96daa79a
--- /dev/null
+++ b/src/server/trpc/router/attendance/getEventInfo.ts
@@ -0,0 +1,32 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { z } from 'zod'
+import { TRPCError } from '@trpc/server'
+import eventCollection from '~/server/db/collections/EventCollection'
+
+/**
+ * @param {string} id The event id
+ */
+export const getEventInfo = protectedProcedure
+  .input(z.string())
+  .query(async ({ input }) => {
+    try {
+      const event = await eventCollection.getById(input)
+      console.log('The event is ', event)
+
+      return {
+        attendees: event.attendees,
+        endDate: event.endDate.toDate(),
+        id: event.id,
+        invitedAttendees: event.invitedAttendees,
+        name: event.name,
+        showup: event.attendees.length,
+        qr_code: event.qrCode,
+        startDate: event.startDate.toDate(),
+      }
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })
diff --git a/src/server/trpc/router/attendance/index.ts b/src/server/trpc/router/attendance/index.ts
index fa3fda8d..60be309f 100644
--- a/src/server/trpc/router/attendance/index.ts
+++ b/src/server/trpc/router/attendance/index.ts
@@ -2,9 +2,11 @@ import { router } from '~/server/trpc/trpc'
 import { getAllAttendance } from './getAllAttendance'
 import { getAllAttendanceButSelf } from './getAllUsersButSelf'
 import { createEvent } from './createEvent'
+import { getEventInfo } from './getEventInfo'
 
 export const attendanceRouter = router({
   createEvent,
   getAllAttendance,
   getAllAttendanceButSelf,
+  getEventInfo,
 })
diff --git a/src/types/event/event.type.ts b/src/types/event/event.type.ts
index 67c421a8..8ca9442e 100644
--- a/src/types/event/event.type.ts
+++ b/src/types/event/event.type.ts
@@ -1,5 +1,3 @@
-import { Attendance } from '@prisma/client'
-
 export type EventInfos = {
   number: string
   name: string
@@ -11,21 +9,24 @@ export type EventInfos = {
 }
 
 export interface BodyProps {
-  _count: {
-    Attendance: number
-    attendees: number
-  }
-  attended: Set<string>
-  name: string
-  id: string
   attendees: {
-    name: string | null
-    department: string | null
+    attended: boolean
+    department: string
+    name: string
     id: string
-    role: string | null
+    role: string
   }[]
   endDate: Date
-  hasStarted: boolean
-  qr_code: string | null
+  id: string
+  invitedAttendees: {
+    attended: boolean
+    department: string
+    name: string
+    id: string
+    role: string
+  }[]
+  name: string
+  showup: number
+  qr_code: string | undefined
   startDate: Date
 }

From 1601c9dcda4ba1e38da14d8a75c4eca792a147a9 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 01:59:52 +0800
Subject: [PATCH 033/223] Fix up the getEventInfo

---
 src/server/db/models/Event.ts                         |  4 ++--
 src/server/trpc/router/attendance/createEvent.ts      | 11 ++++-------
 src/server/trpc/router/attendance/getAllAttendance.ts |  2 +-
 src/server/trpc/router/attendance/getEventInfo.ts     |  9 ++++++---
 src/server/trpc/router/attendance/markAttendance.ts   |  0
 src/types/event/event.type.ts                         | 10 ++--------
 6 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100644 src/server/trpc/router/attendance/markAttendance.ts

diff --git a/src/server/db/models/Event.ts b/src/server/db/models/Event.ts
index 08915055..8700cd98 100644
--- a/src/server/db/models/Event.ts
+++ b/src/server/db/models/Event.ts
@@ -9,10 +9,10 @@ type User = {
 }
 
 export type Event = {
-  attendees: User[]
+  attendees: number
   endDate: Timestamp
   hasStarted: boolean
-  id: string
+  id?: string
   invitedAttendees: User[]
   name: string
   qrCode?: string
diff --git a/src/server/trpc/router/attendance/createEvent.ts b/src/server/trpc/router/attendance/createEvent.ts
index 2b95348e..eac27dbe 100644
--- a/src/server/trpc/router/attendance/createEvent.ts
+++ b/src/server/trpc/router/attendance/createEvent.ts
@@ -6,7 +6,6 @@ import { env } from '~/env/server.mjs'
 import eventCollection from '~/server/db/collections/EventCollection'
 import { Timestamp } from 'firebase/firestore'
 import userCollection from '~/server/db/collections/UserCollection'
-import type { Event } from '~/server/db/models/Event'
 
 export const createEvent = protectedProcedure
   .input(
@@ -40,18 +39,16 @@ export const createEvent = protectedProcedure
           }
         })
       )
-      const payload: Event = {
-        attendees: [],
+
+      await eventCollection.add({
+        attendees: 0,
         endDate: Timestamp.fromDate(input.endDate),
         hasStarted: false,
-        id,
         invitedAttendees: users,
         name: input.name,
         startDate: Timestamp.fromDate(input.startDate),
         qrCode: qr_code || '',
-      }
-
-      await eventCollection.add(payload)
+      })
     } catch (e) {
       console.error('The error is ', (e as Error).message)
     }
diff --git a/src/server/trpc/router/attendance/getAllAttendance.ts b/src/server/trpc/router/attendance/getAllAttendance.ts
index 2bcb5239..6c70333b 100644
--- a/src/server/trpc/router/attendance/getAllAttendance.ts
+++ b/src/server/trpc/router/attendance/getAllAttendance.ts
@@ -11,7 +11,7 @@ export const getAllAttendance = protectedProcedure.query(async () => {
         id: event.id,
         name: event.name,
         startDate: event.startDate.toDate(),
-        total_attendees: event.attendees.length,
+        total_attendees: event.attendees,
         total_users: event.invitedAttendees.length,
       }
     })
diff --git a/src/server/trpc/router/attendance/getEventInfo.ts b/src/server/trpc/router/attendance/getEventInfo.ts
index 96daa79a..c0e00b03 100644
--- a/src/server/trpc/router/attendance/getEventInfo.ts
+++ b/src/server/trpc/router/attendance/getEventInfo.ts
@@ -10,16 +10,19 @@ export const getEventInfo = protectedProcedure
   .input(z.string())
   .query(async ({ input }) => {
     try {
+      if (!input) return
       const event = await eventCollection.getById(input)
-      console.log('The event is ', event)
+      const attendees = event.invitedAttendees.filter(
+        (attendee) => attendee.attended
+      )
 
       return {
-        attendees: event.attendees,
+        attendees: attendees.length,
         endDate: event.endDate.toDate(),
         id: event.id,
         invitedAttendees: event.invitedAttendees,
         name: event.name,
-        showup: event.attendees.length,
+        showup: event.attendees,
         qr_code: event.qrCode,
         startDate: event.startDate.toDate(),
       }
diff --git a/src/server/trpc/router/attendance/markAttendance.ts b/src/server/trpc/router/attendance/markAttendance.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/types/event/event.type.ts b/src/types/event/event.type.ts
index 8ca9442e..c06a7857 100644
--- a/src/types/event/event.type.ts
+++ b/src/types/event/event.type.ts
@@ -9,15 +9,9 @@ export type EventInfos = {
 }
 
 export interface BodyProps {
-  attendees: {
-    attended: boolean
-    department: string
-    name: string
-    id: string
-    role: string
-  }[]
+  attendees: number,
   endDate: Date
-  id: string
+  id?: string
   invitedAttendees: {
     attended: boolean
     department: string

From f0ddb31e4f5745cf26752d1943aea0770f0a29ee Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 07:06:00 +0800
Subject: [PATCH 034/223] Migrate some code over

---
 prisma/schema.prisma                          |  2 +-
 src/env/schema.mjs                            |  8 ++
 src/pages/events/[id].tsx                     |  2 +-
 src/server/db/collections/LogCollection.ts    | 10 +++
 src/server/db/firebase.ts                     |  8 +-
 src/server/db/models/Log.ts                   |  9 +++
 .../trpc/router/attendance/createEvent.ts     |  8 +-
 src/server/trpc/router/attendance/index.ts    |  2 +
 .../trpc/router/attendance/markAttendance.ts  | 37 +++++++++
 src/server/trpc/router/events/index.ts        | 80 -------------------
 10 files changed, 82 insertions(+), 84 deletions(-)
 create mode 100644 src/server/db/collections/LogCollection.ts
 create mode 100644 src/server/db/models/Log.ts

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 3717c9ae..c8f9e140 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -28,7 +28,7 @@ model Departments {
 
 model User {
   batch           String?
-  department      String
+  department      String       @default("")
   discord         String?
   email           String       @unique
   faculty         String?
diff --git a/src/env/schema.mjs b/src/env/schema.mjs
index df140b9c..df7d76bb 100644
--- a/src/env/schema.mjs
+++ b/src/env/schema.mjs
@@ -22,6 +22,14 @@ export const serverSchema = z.object({
   ),
   GMAIL: z.string(),
   GMAIL_PASSWORD: z.string(),
+
+  // Firestore Services
+  APP_ID: z.string(),
+  MESSAGING_SENDER_ID: z.string(),
+  API_KEY: z.string(),
+  AUTH_DOMAIN: z.string(),
+  PROJECT_ID: z.string(),
+  STORAGE_BUCKET: z.string()
 });
 
 /**
diff --git a/src/pages/events/[id].tsx b/src/pages/events/[id].tsx
index b26b55e6..e7b1aebd 100644
--- a/src/pages/events/[id].tsx
+++ b/src/pages/events/[id].tsx
@@ -55,7 +55,7 @@ const ConfirmAttendance: React.FC<BaseProps> = ({ session }) => {
   const eventId = route.query.id as string
   const { data, isLoading, refetch } = trpc.event.getEvent.useQuery(eventId)
   const { mutateAsync, isLoading: loading } =
-    trpc.event.markAttendance.useMutation()
+    trpc.attendance.markAttendance.useMutation()
   dayjs.extend(LocalizedFormat)
 
   const markAttendance = useCallback(async () => {
diff --git a/src/server/db/collections/LogCollection.ts b/src/server/db/collections/LogCollection.ts
new file mode 100644
index 00000000..d0f30761
--- /dev/null
+++ b/src/server/db/collections/LogCollection.ts
@@ -0,0 +1,10 @@
+import { BaseCollection } from './BaseCollection'
+import type { Log } from '../models/Log'
+
+class LogCollection extends BaseCollection<Log> {
+  protected override collectionName = 'logs'
+  protected override objectName = 'log'
+}
+
+const logCollection = new LogCollection()
+export default logCollection
diff --git a/src/server/db/firebase.ts b/src/server/db/firebase.ts
index 9a266c3c..bbaa9044 100644
--- a/src/server/db/firebase.ts
+++ b/src/server/db/firebase.ts
@@ -1,8 +1,14 @@
 import { initializeApp } from 'firebase/app'
 import { getFirestore } from 'firebase/firestore'
+import { env } from '~/env/server.mjs'
 
 const firebaseConfig = {
-
+  apiKey: env.API_KEY,
+  authDomain: env.AUTH_DOMAIN,
+  projectId: env.PROJECT_ID,
+  storageBucket: env.STORAGE_BUCKET,
+  messagingSenderId: env.MESSAGING_SENDER_ID,
+  appId: env.APP_ID,
 }
 
 const app = initializeApp(firebaseConfig)
diff --git a/src/server/db/models/Log.ts b/src/server/db/models/Log.ts
new file mode 100644
index 00000000..d8c9204a
--- /dev/null
+++ b/src/server/db/models/Log.ts
@@ -0,0 +1,9 @@
+import type { Timestamp } from 'firebase/firestore'
+
+export type Log = {
+  createdAt: Timestamp
+  id?: string
+  level: 'INFO' | 'WARNING' | 'ERROR'
+  description: string
+  title: string
+}
diff --git a/src/server/trpc/router/attendance/createEvent.ts b/src/server/trpc/router/attendance/createEvent.ts
index eac27dbe..ae7791ed 100644
--- a/src/server/trpc/router/attendance/createEvent.ts
+++ b/src/server/trpc/router/attendance/createEvent.ts
@@ -6,6 +6,7 @@ import { env } from '~/env/server.mjs'
 import eventCollection from '~/server/db/collections/EventCollection'
 import { Timestamp } from 'firebase/firestore'
 import userCollection from '~/server/db/collections/UserCollection'
+import logCollection from '~/server/db/collections/LogCollection'
 
 export const createEvent = protectedProcedure
   .input(
@@ -50,6 +51,11 @@ export const createEvent = protectedProcedure
         qrCode: qr_code || '',
       })
     } catch (e) {
-      console.error('The error is ', (e as Error).message)
+      await logCollection.add({
+        createdAt: Timestamp.fromDate(new Date()),
+        level: 'INFO',
+        description: (e as Error).message,
+        title: 'Create event failed',
+      })
     }
   })
diff --git a/src/server/trpc/router/attendance/index.ts b/src/server/trpc/router/attendance/index.ts
index 60be309f..6bfca66f 100644
--- a/src/server/trpc/router/attendance/index.ts
+++ b/src/server/trpc/router/attendance/index.ts
@@ -3,10 +3,12 @@ import { getAllAttendance } from './getAllAttendance'
 import { getAllAttendanceButSelf } from './getAllUsersButSelf'
 import { createEvent } from './createEvent'
 import { getEventInfo } from './getEventInfo'
+import { markAttendance } from './markAttendance'
 
 export const attendanceRouter = router({
   createEvent,
   getAllAttendance,
   getAllAttendanceButSelf,
   getEventInfo,
+  markAttendance,
 })
diff --git a/src/server/trpc/router/attendance/markAttendance.ts b/src/server/trpc/router/attendance/markAttendance.ts
index e69de29b..a602604d 100644
--- a/src/server/trpc/router/attendance/markAttendance.ts
+++ b/src/server/trpc/router/attendance/markAttendance.ts
@@ -0,0 +1,37 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { z } from 'zod'
+import { LogType } from '@prisma/client'
+import { TRPCError } from '@trpc/server'
+import eventCollection from '~/server/db/collections/EventCollection'
+
+export const markAttendance = protectedProcedure
+  .input(z.string())
+  .mutation(async ({ ctx, input }) => {
+    try {
+      const user = ctx.session.user
+      const event = await eventCollection.getById(input)
+      event.invitedAttendees = event.invitedAttendees.map((attendee) => {
+        if (attendee.id === user.id) {
+          attendee.attended = true
+        }
+        return attendee
+      })
+
+      await eventCollection.update(input, {
+        attendees: event.attendees + 1,
+        invitedAttendees: event.invitedAttendees,
+      })
+    } catch (e) {
+      await ctx.prisma.log.create({
+        data: {
+          type: LogType.ERROR,
+          title: 'Error signing attendance',
+          message: (e as Error).message,
+        },
+      })
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })
diff --git a/src/server/trpc/router/events/index.ts b/src/server/trpc/router/events/index.ts
index 23f3e874..16ed1f0f 100644
--- a/src/server/trpc/router/events/index.ts
+++ b/src/server/trpc/router/events/index.ts
@@ -1,57 +1,7 @@
 import { router } from '~/server/trpc/trpc'
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { z } from 'zod'
-import { toDataURL } from 'qrcode'
-import { randomUUID } from 'crypto'
-import { LogType } from '@prisma/client'
-import { ErrorTitle } from '../constants/ErrorTitle'
 import { TRPCError } from '@trpc/server'
-import { env } from '~/env/server.mjs'
-
-const createEvent = protectedProcedure
-  .input(
-    z.object({
-      name: z.string(),
-      startDate: z.date(),
-      endDate: z.date(),
-      departments: z.array(z.string()),
-      attendees: z.array(z.string()),
-      isQrRequired: z.boolean(),
-    })
-  )
-  .mutation(async ({ ctx, input }) => {
-    try {
-      let qr_code: string | undefined
-      const id = randomUUID()
-
-      if (input.isQrRequired) {
-        qr_code = await toDataURL(`${env.DOMAIN}/events/${id}`)
-      }
-
-      await ctx.prisma.event.create({
-        data: {
-          attendees: {
-            connect: input.attendees.map((attendee) => {
-              return { id: attendee }
-            }),
-          },
-          id,
-          name: input.name,
-          startDate: input.startDate,
-          endDate: input.endDate,
-          qr_code,
-        },
-      })
-    } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          message: (e as Error).message,
-          title: ErrorTitle.ERROR_CREATING_EVENT,
-          type: LogType.ERROR,
-        },
-      })
-    }
-  })
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -157,38 +107,8 @@ const getEvent = protectedProcedure
     }
   })
 
-const markAttendance = protectedProcedure
-  .input(z.string())
-  .mutation(async ({ ctx, input }) => {
-    try {
-      const user = ctx.session.user
-      const result = await ctx.prisma.attendance.create({
-        data: {
-          id: user.id + input,
-          eventId: input,
-          userId: user.id,
-        },
-      })
-      console.log('Success!', result)
-    } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          type: LogType.ERROR,
-          title: 'Error signing attendance',
-          message: (e as Error).message,
-        },
-      })
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
-
 export const eventRouter = router({
-  createEvent,
   getAllUsers,
   getEvent,
   getEventInfo,
-  markAttendance,
 })

From 4dd735a7bd891d9e71fc15a064c5876b1037cf4e Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 07:21:11 +0800
Subject: [PATCH 035/223] Continue the migration

---
 src/pages/events/[id].tsx                     |   5 +-
 src/server/trpc/router/_app.ts                |   6 +-
 .../trpc/router/attendance/getEventForUser.ts |  38 ++++++
 .../trpc/router/attendance/getEventInfo.ts    |   3 -
 src/server/trpc/router/attendance/index.ts    |   2 +
 .../trpc/router/attendance/markAttendance.ts  |  19 ++-
 src/server/trpc/router/auth.ts                |   6 -
 src/server/trpc/router/events/index.ts        | 114 ------------------
 src/server/trpc/router/users/auth.ts          |   6 +
 .../trpc/router/{auth => users}/post.ts       |   0
 10 files changed, 58 insertions(+), 141 deletions(-)
 create mode 100644 src/server/trpc/router/attendance/getEventForUser.ts
 delete mode 100644 src/server/trpc/router/auth.ts
 delete mode 100644 src/server/trpc/router/events/index.ts
 create mode 100644 src/server/trpc/router/users/auth.ts
 rename src/server/trpc/router/{auth => users}/post.ts (100%)

diff --git a/src/pages/events/[id].tsx b/src/pages/events/[id].tsx
index e7b1aebd..b43cfc32 100644
--- a/src/pages/events/[id].tsx
+++ b/src/pages/events/[id].tsx
@@ -53,7 +53,8 @@ const UserActionRequired: React.FC<UserActionRequiredProp> = ({
 const ConfirmAttendance: React.FC<BaseProps> = ({ session }) => {
   const route = useRouter()
   const eventId = route.query.id as string
-  const { data, isLoading, refetch } = trpc.event.getEvent.useQuery(eventId)
+  const { data, isLoading, refetch } =
+    trpc.attendance.getEventForUser.useQuery(eventId)
   const { mutateAsync, isLoading: loading } =
     trpc.attendance.markAttendance.useMutation()
   dayjs.extend(LocalizedFormat)
@@ -86,7 +87,7 @@ const ConfirmAttendance: React.FC<BaseProps> = ({ session }) => {
                 {data.name}
               </h1>
               <h1 className="mb-2 self-center text-center text-3xl font-medium">
-                {dayjs(data.startDate).format('lll')}
+                {dayjs(data.startDate.toDate()).format('lll')}
               </h1>
               <UserActionRequired
                 isAttendanceRequired={data.isAttendanceRequired}
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index d5bcd2ae..825134d1 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -1,18 +1,16 @@
 import { router } from '../trpc'
-import { authRouter } from './auth'
+import { authRouter } from './users/auth'
 import { memberRouter } from './member'
 import { profileRouter } from './profile'
 import { userRouter } from './admin/users'
-import { eventRouter } from './events'
 import { attendanceRouter } from './attendance'
 
 export const appRouter = router({
+  attendance: attendanceRouter,
   auth: authRouter,
-  event: eventRouter,
   member: memberRouter,
   profile: profileRouter,
   user: userRouter,
-  attendance: attendanceRouter,
 })
 
 export type AppRouter = typeof appRouter
diff --git a/src/server/trpc/router/attendance/getEventForUser.ts b/src/server/trpc/router/attendance/getEventForUser.ts
new file mode 100644
index 00000000..586d9eea
--- /dev/null
+++ b/src/server/trpc/router/attendance/getEventForUser.ts
@@ -0,0 +1,38 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { z } from 'zod'
+import eventCollection from '~/server/db/collections/EventCollection'
+import logCollection from '~/server/db/collections/LogCollection'
+import { Timestamp } from 'firebase/firestore'
+
+export const getEventForUser = protectedProcedure
+  .input(z.string())
+  .query(async ({ ctx, input }) => {
+    try {
+      const event = await eventCollection.getById(input)
+      const user = ctx.session.user
+
+      // Check if the user is within the array of objects and whether the attended flag is true.
+      const hasUserMarkedAttendance =
+        event.invitedAttendees.filter((attendee) => {
+          return attendee.id === user.id && attendee.attended
+        }).length === 1
+
+      // Check whether the user is within the array of objects.
+      const isAttendanceRequired =
+        event.invitedAttendees.filter((attendee) => attendee.id === user.id)
+          .length > 0
+
+      return {
+        ...event,
+        isAttendanceRequired,
+        hasUserMarkedAttendance: hasUserMarkedAttendance !== null,
+      }
+    } catch (e) {
+      await logCollection.add({
+        level: 'WARNING',
+        title: `Error marking attendance for ${ctx.session.user.name}`,
+        description: (e as Error).message,
+        createdAt: Timestamp.fromDate(new Date()),
+      })
+    }
+  })
diff --git a/src/server/trpc/router/attendance/getEventInfo.ts b/src/server/trpc/router/attendance/getEventInfo.ts
index c0e00b03..f47f1aba 100644
--- a/src/server/trpc/router/attendance/getEventInfo.ts
+++ b/src/server/trpc/router/attendance/getEventInfo.ts
@@ -3,9 +3,6 @@ import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import eventCollection from '~/server/db/collections/EventCollection'
 
-/**
- * @param {string} id The event id
- */
 export const getEventInfo = protectedProcedure
   .input(z.string())
   .query(async ({ input }) => {
diff --git a/src/server/trpc/router/attendance/index.ts b/src/server/trpc/router/attendance/index.ts
index 6bfca66f..95ef52c9 100644
--- a/src/server/trpc/router/attendance/index.ts
+++ b/src/server/trpc/router/attendance/index.ts
@@ -4,11 +4,13 @@ import { getAllAttendanceButSelf } from './getAllUsersButSelf'
 import { createEvent } from './createEvent'
 import { getEventInfo } from './getEventInfo'
 import { markAttendance } from './markAttendance'
+import { getEventForUser } from './getEventForUser'
 
 export const attendanceRouter = router({
   createEvent,
   getAllAttendance,
   getAllAttendanceButSelf,
   getEventInfo,
+  getEventForUser,
   markAttendance,
 })
diff --git a/src/server/trpc/router/attendance/markAttendance.ts b/src/server/trpc/router/attendance/markAttendance.ts
index a602604d..e048e04a 100644
--- a/src/server/trpc/router/attendance/markAttendance.ts
+++ b/src/server/trpc/router/attendance/markAttendance.ts
@@ -1,8 +1,8 @@
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { z } from 'zod'
-import { LogType } from '@prisma/client'
-import { TRPCError } from '@trpc/server'
 import eventCollection from '~/server/db/collections/EventCollection'
+import logCollection from '~/server/db/collections/LogCollection'
+import { Timestamp } from 'firebase/firestore'
 
 export const markAttendance = protectedProcedure
   .input(z.string())
@@ -22,16 +22,11 @@ export const markAttendance = protectedProcedure
         invitedAttendees: event.invitedAttendees,
       })
     } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          type: LogType.ERROR,
-          title: 'Error signing attendance',
-          message: (e as Error).message,
-        },
-      })
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
+      await logCollection.add({
+        createdAt: Timestamp.fromDate(new Date()),
+        level: 'WARNING',
+        title: 'Error marking attendance',
+        description: (e as Error).message,
       })
     }
   })
diff --git a/src/server/trpc/router/auth.ts b/src/server/trpc/router/auth.ts
deleted file mode 100644
index 0e18e662..00000000
--- a/src/server/trpc/router/auth.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { router } from '../trpc'
-import { resetPassword } from './auth/post'
-
-export const authRouter = router({
-  resetPassword,
-})
diff --git a/src/server/trpc/router/events/index.ts b/src/server/trpc/router/events/index.ts
deleted file mode 100644
index 16ed1f0f..00000000
--- a/src/server/trpc/router/events/index.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { router } from '~/server/trpc/trpc'
-import { protectedProcedure } from '~/server/trpc/trpc'
-import { z } from 'zod'
-import { TRPCError } from '@trpc/server'
-
-const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
-  try {
-    return await ctx.prisma.user.findMany({
-      select: {
-        department: true,
-        role: true,
-        name: true,
-        id: true,
-      },
-    })
-  } catch (e) {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: (e as Error).message,
-    })
-  }
-})
-
-const getEventInfo = protectedProcedure
-  .input(z.string())
-  .query(async ({ ctx, input }) => {
-    try {
-      const [event, attendance] = await Promise.all([
-        ctx.prisma.event.findUnique({
-          where: { id: input },
-          select: {
-            attendees: {
-              select: { name: true, department: true, role: true, id: true },
-            },
-            _count: { select: { Attendance: true, attendees: true } },
-            endDate: true,
-            id: true,
-            hasStarted: true,
-            name: true,
-            qr_code: true,
-            startDate: true,
-          },
-        }),
-        ctx.prisma.attendance.findMany({
-          where: {
-            eventId: input,
-          },
-        }),
-      ])
-
-      if (!event) {
-        return null
-      }
-
-      const attended = new Set<string>()
-      attendance.forEach((a) => attended.add(a.userId))
-
-      return { ...event, attended }
-    } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
-
-const getEvent = protectedProcedure
-  .input(z.string())
-  .query(async ({ ctx, input }) => {
-    try {
-      const event = await ctx.prisma.event.findUnique({
-        where: { id: input },
-        select: {
-          attendees: true,
-          name: true,
-          startDate: true,
-          hasStarted: true,
-        },
-      })
-
-      if (!event) {
-        return null
-      }
-
-      const user = ctx.session.user
-
-      const hasUserMarkedAttendance = await ctx.prisma.attendance.findFirst({
-        where: {
-          eventId: input,
-          userId: user.id,
-        },
-      })
-
-      const isAttendanceRequired =
-        event.attendees.filter((attendee) => attendee.id === user.id).length > 0
-
-      return {
-        ...event,
-        isAttendanceRequired,
-        hasUserMarkedAttendance: hasUserMarkedAttendance !== null,
-      }
-    } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
-
-export const eventRouter = router({
-  getAllUsers,
-  getEvent,
-  getEventInfo,
-})
diff --git a/src/server/trpc/router/users/auth.ts b/src/server/trpc/router/users/auth.ts
new file mode 100644
index 00000000..04d0d45b
--- /dev/null
+++ b/src/server/trpc/router/users/auth.ts
@@ -0,0 +1,6 @@
+import { router } from '../../trpc'
+import { resetPassword } from './post'
+
+export const authRouter = router({
+  resetPassword,
+})
diff --git a/src/server/trpc/router/auth/post.ts b/src/server/trpc/router/users/post.ts
similarity index 100%
rename from src/server/trpc/router/auth/post.ts
rename to src/server/trpc/router/users/post.ts

From 3565d6736489c098969a5a0263af7051debf8f79 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 07:34:05 +0800
Subject: [PATCH 036/223] Shift the createSingleUser and createMultipleUsers
 out

---
 src/pages/auth/login.tsx                      |   2 +-
 src/server/db/firebase.ts                     |   2 +
 src/server/db/models/User.ts                  |   1 +
 src/server/trpc/router/_app.ts                |   4 +-
 src/server/trpc/router/member/create.ts       | 120 ------------------
 .../trpc/router/member/createMultipleUsers.ts |  67 ++++++++++
 .../trpc/router/member/createSingleUser.ts    |  51 ++++++++
 src/server/trpc/router/member/index.ts        |   5 +-
 src/server/trpc/router/users/auth.ts          |   6 -
 .../trpc/router/{admin => }/users/index.ts    |   2 +
 10 files changed, 128 insertions(+), 132 deletions(-)
 delete mode 100644 src/server/trpc/router/member/create.ts
 create mode 100644 src/server/trpc/router/member/createMultipleUsers.ts
 create mode 100644 src/server/trpc/router/member/createSingleUser.ts
 delete mode 100644 src/server/trpc/router/users/auth.ts
 rename src/server/trpc/router/{admin => }/users/index.ts (96%)

diff --git a/src/pages/auth/login.tsx b/src/pages/auth/login.tsx
index 5c410a76..25f1178f 100644
--- a/src/pages/auth/login.tsx
+++ b/src/pages/auth/login.tsx
@@ -17,7 +17,7 @@ const LoginPage = () => {
   const { status } = useSession()
   const toast = useToast()
   const router = useRouter()
-  const { mutateAsync, isLoading } = trpc.auth.resetPassword.useMutation()
+  const { mutateAsync, isLoading } = trpc.user.resetPassword.useMutation()
   const [loginLoading, setLoginLoading] = useState(false)
   const [email, setEmail] = useState('')
   const [password, setPassword] = useState('')
diff --git a/src/server/db/firebase.ts b/src/server/db/firebase.ts
index bbaa9044..58555e73 100644
--- a/src/server/db/firebase.ts
+++ b/src/server/db/firebase.ts
@@ -1,5 +1,6 @@
 import { initializeApp } from 'firebase/app'
 import { getFirestore } from 'firebase/firestore'
+import { getStorage } from 'firebase/storage'
 import { env } from '~/env/server.mjs'
 
 const firebaseConfig = {
@@ -13,3 +14,4 @@ const firebaseConfig = {
 
 const app = initializeApp(firebaseConfig)
 export const db = getFirestore(app)
+export const storage = getStorage(app)
diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index f31429d0..cbcccb79 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -4,6 +4,7 @@ export type User = {
   hashedPassword: string
   isAdmin: boolean
   id?: string
+  image?: string
   name: string
   role: string
 }
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index 825134d1..76b5d95e 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -1,13 +1,11 @@
 import { router } from '../trpc'
-import { authRouter } from './users/auth'
 import { memberRouter } from './member'
 import { profileRouter } from './profile'
-import { userRouter } from './admin/users'
+import { userRouter } from './users'
 import { attendanceRouter } from './attendance'
 
 export const appRouter = router({
   attendance: attendanceRouter,
-  auth: authRouter,
   member: memberRouter,
   profile: profileRouter,
   user: userRouter,
diff --git a/src/server/trpc/router/member/create.ts b/src/server/trpc/router/member/create.ts
deleted file mode 100644
index aaaf31f1..00000000
--- a/src/server/trpc/router/member/create.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { protectedProcedure } from '../../trpc'
-import { z } from 'zod'
-import { randomBytes } from 'crypto'
-import { hash } from 'bcryptjs'
-
-import { checkIfUserExist, sendEmail, sendMultipleEmails } from './helper'
-import { LogType } from '@prisma/client'
-import { ErrorTitle } from '../constants/ErrorTitle'
-import userCollection from '~/server/db/collections/UserCollection'
-import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
-import { db } from '~/server/db/firebase'
-import type { User } from '~/server/db/models/User'
-
-/**
- * Create multiple accounts for many users and send out an
- * email to the people with the random generated password.
- */
-export const addMultipleUsers = protectedProcedure
-  .input(
-    z.array(
-      z.object({
-        date_of_birth: z.string(),
-        diet: z.string(),
-        department: z.string(),
-        discord: z.string(),
-        faculty: z.string(),
-        gender: z.string(),
-        linkedin: z.string(),
-        major: z.string(),
-        name: z.string(),
-        nus_email: z.string(),
-        personal_email: z.string(),
-        phone: z.string(),
-        race: z.string(),
-        role: z.string(),
-        student_id: z.string(),
-        telegram: z.string(),
-        year: z.string(),
-      })
-    )
-  )
-  .mutation(async ({ ctx, input }) => {
-    try {
-      const password = randomBytes(10).toString('hex')
-      const hashedPassword = await hash(password, 10)
-      const emails: string[] = []
-
-      // Add user logic. Note that each firebase batch only allow up to 500 writes so we need an array for more than 500 users.
-      let batchIndex = 0
-      let counter = 0
-      const batches: WriteBatch[] = [writeBatch(db)]
-      input.forEach((user) => {
-        emails.push(user.nus_email)
-
-        batches[batchIndex]?.set(doc(db, 'users', user.student_id), {
-          department: user.department,
-          email: user.nus_email,
-          hashedPassword,
-          name: user.name,
-          isAdmin: false,
-          id: user.student_id,
-          role: user.role,
-        } as User)
-
-        counter += 1
-
-        if (counter === 499) {
-          batches.push(writeBatch(db))
-          batchIndex += 1
-          counter = 0
-        }
-      })
-
-      await Promise.all(batches.map(async (batch) => await batch.commit()))
-      await sendMultipleEmails(emails, password)
-    } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          title: ErrorTitle.ERROR_ADDING_MULTIPLE_USERS,
-          message: (e as Error).message,
-          type: LogType.ERROR,
-        },
-      })
-    }
-  })
-
-export const createSingleUser = protectedProcedure
-  .input(
-    z.object({
-      department: z.string(),
-      id: z.string(),
-      email: z.string(),
-      name: z.string(),
-      role: z.string(),
-      password: z.string(),
-      isAdmin: z.boolean(),
-    })
-  )
-  .mutation(async ({ input }) => {
-    const { email, id, isAdmin, role, department, name, password } = input
-
-    const [hashedPassword] = await Promise.all([
-      hash(password, 10),
-      checkIfUserExist(id),
-    ])
-
-    await userCollection.set(
-      {
-        department,
-        email,
-        isAdmin,
-        name,
-        hashedPassword,
-        role,
-      },
-      id
-    )
-
-    await sendEmail(email, hashedPassword)
-  })
diff --git a/src/server/trpc/router/member/createMultipleUsers.ts b/src/server/trpc/router/member/createMultipleUsers.ts
new file mode 100644
index 00000000..838a72b5
--- /dev/null
+++ b/src/server/trpc/router/member/createMultipleUsers.ts
@@ -0,0 +1,67 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import { randomBytes } from 'crypto'
+import { hash } from 'bcryptjs'
+
+import { sendMultipleEmails } from './helper'
+import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
+import { db } from '~/server/db/firebase'
+import type { User } from '~/server/db/models/User'
+import logCollection from '~/server/db/collections/LogCollection'
+import { Timestamp } from 'firebase/firestore'
+
+export const createMultipleUsers = protectedProcedure
+  .input(
+    z.array(
+      z.object({
+        department: z.string(),
+        name: z.string(),
+        nus_email: z.string(),
+        role: z.string(),
+        student_id: z.string(),
+      })
+    )
+  )
+  .mutation(async ({ ctx, input }) => {
+    try {
+      const password = randomBytes(10).toString('hex')
+      const hashedPassword = await hash(password, 10)
+      const emails: string[] = []
+
+      // Add user logic. Note that each firebase batch only allow up to 500 writes so we need an array for more than 500 users.
+      let batchIndex = 0
+      let counter = 0
+      const batches: WriteBatch[] = [writeBatch(db)]
+      input.forEach((user) => {
+        emails.push(user.nus_email)
+
+        batches[batchIndex]?.set(doc(db, 'users', user.student_id), {
+          department: user.department,
+          email: user.nus_email,
+          hashedPassword,
+          name: user.name,
+          isAdmin: false,
+          id: user.student_id,
+          role: user.role,
+        } as User)
+
+        counter += 1
+
+        if (counter === 499) {
+          batches.push(writeBatch(db))
+          batchIndex += 1
+          counter = 0
+        }
+      })
+
+      await Promise.all(batches.map(async (batch) => await batch.commit()))
+      await sendMultipleEmails(emails, password)
+    } catch (e) {
+      await logCollection.add({
+        createdAt: Timestamp.fromDate(new Date()),
+        level: 'WARNING',
+        description: (e as Error).message,
+        title: 'Error while uploading multiple users',
+      })
+    }
+  })
diff --git a/src/server/trpc/router/member/createSingleUser.ts b/src/server/trpc/router/member/createSingleUser.ts
new file mode 100644
index 00000000..a1f63903
--- /dev/null
+++ b/src/server/trpc/router/member/createSingleUser.ts
@@ -0,0 +1,51 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import { hash } from 'bcryptjs'
+import { checkIfUserExist, sendEmail } from './helper'
+import userCollection from '~/server/db/collections/UserCollection'
+import logCollection from '~/server/db/collections/LogCollection'
+import { Timestamp } from 'firebase/firestore'
+
+export const createSingleUser = protectedProcedure
+  .input(
+    z.object({
+      department: z.string(),
+      id: z.string(),
+      email: z.string(),
+      name: z.string(),
+      role: z.string(),
+      password: z.string(),
+      isAdmin: z.boolean(),
+    })
+  )
+  .mutation(async ({ input }) => {
+    try {
+      const { email, id, isAdmin, role, department, name, password } = input
+
+      const [hashedPassword] = await Promise.all([
+        hash(password, 10),
+        checkIfUserExist(id),
+      ])
+
+      await userCollection.set(
+        {
+          department,
+          email,
+          isAdmin,
+          name,
+          hashedPassword,
+          role,
+        },
+        id
+      )
+
+      await sendEmail(email, hashedPassword)
+    } catch (e) {
+      await logCollection.add({
+        createdAt: Timestamp.fromDate(new Date()),
+        description: (e as Error).message,
+        title: 'Error creating a single user',
+        level: 'WARNING',
+      })
+    }
+  })
diff --git a/src/server/trpc/router/member/index.ts b/src/server/trpc/router/member/index.ts
index 878d7b17..15c6eff3 100644
--- a/src/server/trpc/router/member/index.ts
+++ b/src/server/trpc/router/member/index.ts
@@ -6,10 +6,11 @@ import {
   updateMemberContacts,
 } from './update'
 import { deleteMemberImage } from './delete'
-import { addMultipleUsers, createSingleUser } from './create'
+import {  createSingleUser } from './createSingleUser'
+import { createMultipleUsers } from './createMultipleUsers'
 
 export const memberRouter = router({
-  addMultipleUsers,
+  createMultipleUsers,
   createSingleUser,
   deleteMemberImage,
   getAllUsers,
diff --git a/src/server/trpc/router/users/auth.ts b/src/server/trpc/router/users/auth.ts
deleted file mode 100644
index 04d0d45b..00000000
--- a/src/server/trpc/router/users/auth.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { router } from '../../trpc'
-import { resetPassword } from './post'
-
-export const authRouter = router({
-  resetPassword,
-})
diff --git a/src/server/trpc/router/admin/users/index.ts b/src/server/trpc/router/users/index.ts
similarity index 96%
rename from src/server/trpc/router/admin/users/index.ts
rename to src/server/trpc/router/users/index.ts
index ffde7068..630887d9 100644
--- a/src/server/trpc/router/admin/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -1,6 +1,7 @@
 import { router } from '~/server/trpc/trpc'
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { TRPCError } from '@trpc/server'
+import { resetPassword } from './post'
 import { z } from 'zod'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
@@ -60,4 +61,5 @@ const getAllUsersForTable = protectedProcedure
 export const userRouter = router({
   getAllUsers,
   getAllUsersForTable,
+  resetPassword,
 })

From 28d0ee4a124016705485d3007c2adb5130218f5c Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 08:13:01 +0800
Subject: [PATCH 037/223] Migrate getAllUsersForTable

---
 package.json                                  |   1 -
 src/components/profile/UploadImageButton.tsx  |  62 +-
 src/pages/api/auth/[...nextauth].ts           |   1 +
 src/server/db/collections/BaseCollection.ts   |  29 +-
 .../router/attendance/getAllUsersButSelf.ts   |   1 +
 .../trpc/router/users/getAllUsersForTable.ts  |  36 +
 src/server/trpc/router/users/index.ts         |  35 +-
 yarn.lock                                     | 931 +-----------------
 8 files changed, 131 insertions(+), 965 deletions(-)
 create mode 100644 src/server/trpc/router/users/getAllUsersForTable.ts

diff --git a/package.json b/package.json
index fc5ec36f..8a8f76c5 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "date-fns": "^2.30.0",
     "dayjs": "^1.11.7",
     "firebase": "^9.22.1",
-    "firebase-admin": "^11.8.0",
     "flowbite": "^1.6.5",
     "flowbite-react": "^0.4.4",
     "framer-motion": "^9.0.4",
diff --git a/src/components/profile/UploadImageButton.tsx b/src/components/profile/UploadImageButton.tsx
index 0d56e992..3b229109 100644
--- a/src/components/profile/UploadImageButton.tsx
+++ b/src/components/profile/UploadImageButton.tsx
@@ -6,6 +6,10 @@ import EditIcon from './EditIcon'
 import { type QueryObserverResult } from '@tanstack/react-query'
 import { Message } from '~/constant/messages'
 
+// TODO: Fix the environment variables.
+import { storage } from '~/server/db/firebase'
+import { ref, uploadBytes, getDownloadURL } from 'firebase/storage'
+
 const UploadImageBtn = ({
   studentId,
   refetch,
@@ -20,36 +24,36 @@ const UploadImageBtn = ({
   const onUpload = () => {
     uploadRef.current?.click()
   }
-  const handleFileSelected = (e: ChangeEvent<HTMLInputElement>): void => {
-    if (e.target.files) {
-      const reader = new FileReader()
-      reader.addEventListener('load', async () => {
-        try {
-          const imageDataURI = reader.result as string
-          const image = imageDataURI as string
-          toast({
-            duration: 1000,
-            title: Message.IMAGE_UPLOAD_LOADING,
-            status: 'loading',
-          })
-          await mutateAsync({ studentId, image })
-          await refetch()
-          toast({
-            duration: 3000,
-            description: Message.IMAGE_UPLOAD_SUCCESS,
-            title: 'Success',
-            status: 'success',
-          })
-        } catch (e) {
-          toast({
-            duration: 3000,
-            description: Message.IMAGE_UPLOAD_ERROR,
-            status: 'error',
-            title: 'Something went wrong',
-          })
-        }
+  const handleFileSelected = async (e: ChangeEvent<HTMLInputElement>) => {
+    try {
+      if (e.target.files) {
+        toast({
+          duration: 1000,
+          title: Message.IMAGE_UPLOAD_LOADING,
+          status: 'loading',
+        })
+        const storageRef = ref(storage, `${studentId}/image/profile_pic`)
+        await uploadBytes(storageRef, e.target.files[0] as File)
+        const image = await getDownloadURL(storageRef)
+        await mutateAsync({
+          studentId,
+          image,
+        })
+        await refetch()
+        toast({
+          duration: 3000,
+          description: Message.IMAGE_UPLOAD_SUCCESS,
+          title: 'Success',
+          status: 'success',
+        })
+      }
+    } catch (e) {
+      toast({
+        duration: 3000,
+        description: Message.IMAGE_UPLOAD_ERROR,
+        status: 'error',
+        title: 'Something went wrong',
       })
-      reader.readAsDataURL(e?.target?.files[0] as Blob)
     }
   }
   return (
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 2dd346fb..93716178 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -51,6 +51,7 @@ export const authOptions: NextAuthOptions = {
           // Step 3: Get the user by the email
           const users = await userCollection.queries([
             {
+              type: "where",
               fieldPath: 'email',
               direction: '==',
               value: email,
diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index e569157a..2c6d7e62 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -15,18 +15,28 @@ import {
   type DocumentData,
   type WhereFilterOp,
   type FieldPath,
+  orderBy,
+  startAt,
+  endAt,
+  limit,
+  getCountFromServer,
 } from 'firebase/firestore'
 
 type Queries<T> = {
-  fieldPath: keyof T
-  direction: WhereFilterOp
-  value: T[keyof T]
+  fieldPath?: keyof T
+  direction?: WhereFilterOp
+  value?: T[keyof T] | number
+  type: 'where' | 'orderBy' | 'limit'
 }
 
 export abstract class BaseCollection<T> {
   protected abstract collectionName: string
   protected abstract objectName: string
 
+  async count() {
+    return await getCountFromServer(collection(db, this.collectionName))
+  }
+
   async add(payload: T) {
     return await addDoc(
       collection(db, this.collectionName),
@@ -61,7 +71,18 @@ export abstract class BaseCollection<T> {
 
   async queries(queries: Queries<T>[]) {
     const items = queries.map((q) => {
-      return where(q.fieldPath as string | FieldPath, q.direction, q.value)
+      switch (q.type) {
+        case 'where':
+          return where(
+            q.fieldPath as string | FieldPath,
+            q.direction as WhereFilterOp,
+            q.value
+          )
+        case 'orderBy':
+          return orderBy(q.fieldPath as string | FieldPath)
+        case 'limit':
+          return limit(q.value as number)
+      }
     })
     const q = query(collection(db, this.collectionName), ...items)
     const snapshots = await getDocs(q)
diff --git a/src/server/trpc/router/attendance/getAllUsersButSelf.ts b/src/server/trpc/router/attendance/getAllUsersButSelf.ts
index 4dca4144..a63b9d0f 100644
--- a/src/server/trpc/router/attendance/getAllUsersButSelf.ts
+++ b/src/server/trpc/router/attendance/getAllUsersButSelf.ts
@@ -6,6 +6,7 @@ export const getAllAttendanceButSelf = protectedProcedure.query(async ({ ctx })
   try {
     const users = await userCollection.queries([
       {
+        type: "where",
         fieldPath: 'id',
         direction: '!=',
         value: ctx.session.user.id,
diff --git a/src/server/trpc/router/users/getAllUsersForTable.ts b/src/server/trpc/router/users/getAllUsersForTable.ts
new file mode 100644
index 00000000..7fdb8fb6
--- /dev/null
+++ b/src/server/trpc/router/users/getAllUsersForTable.ts
@@ -0,0 +1,36 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { TRPCError } from '@trpc/server'
+import { z } from 'zod'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const getAllUsersForTable = protectedProcedure
+  .input(
+    z.object({
+      pageIndex: z.number(),
+      pageSize: z.number(),
+    })
+  )
+  .query(async ({ input }) => {
+    // TODO: Fix up the pagination logic
+    try {
+      const users = (await userCollection.queries([])).map((user) => {
+        return {
+          department: user.department,
+          email: user.email,
+          id: user.id as string,
+          name: user.name,
+          role: user.role,
+        }
+      })
+
+      const total = await userCollection.count()
+      const pageCount = Math.ceil(total.data().count / input.pageSize)
+
+      return { users, pageCount }
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index 630887d9..6eaf3f70 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -2,7 +2,7 @@ import { router } from '~/server/trpc/trpc'
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { TRPCError } from '@trpc/server'
 import { resetPassword } from './post'
-import { z } from 'zod'
+import { getAllUsersForTable } from './getAllUsersForTable'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -25,39 +25,6 @@ const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   }
 })
 
-const getAllUsersForTable = protectedProcedure
-  .input(
-    z.object({
-      pageIndex: z.number(),
-      pageSize: z.number(),
-    })
-  )
-  .query(async ({ ctx, input }) => {
-    try {
-      const users = await ctx.prisma.user.findMany({
-        select: {
-          department: true,
-          email: true,
-          id: true,
-          name: true,
-          role: true,
-        },
-        skip: input.pageIndex * input.pageSize,
-        take: input.pageSize,
-      })
-
-      const total = await ctx.prisma.user.count()
-      const pageCount = Math.ceil(total / input.pageSize)
-
-      return { users, pageCount }
-    } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
-
 export const userRouter = router({
   getAllUsers,
   getAllUsersForTable,
diff --git a/yarn.lock b/yarn.lock
index 19249f8d..558b4b9b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -156,11 +156,6 @@
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz"
   integrity sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==
 
-"@babel/parser@^7.20.15":
-  version "7.22.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.4.tgz#a770e98fd785c231af9d93f6459d36770993fb32"
-  integrity sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==
-
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
   version "7.20.13"
   resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"
@@ -1149,13 +1144,6 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@fastify/busboy@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-1.2.1.tgz#9c6db24a55f8b803b5222753b24fe3aea2ba9ca3"
-  integrity sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==
-  dependencies:
-    text-decoding "^1.0.0"
-
 "@firebase/analytics-compat@0.2.6":
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.2.6.tgz#50063978c42f13eb800e037e96ac4b17236841f4"
@@ -1283,7 +1271,7 @@
     "@firebase/util" "1.9.3"
     tslib "^2.1.0"
 
-"@firebase/database-compat@0.3.4", "@firebase/database-compat@^0.3.4":
+"@firebase/database-compat@0.3.4":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.3.4.tgz#4e57932f7a5ba761cd5ac946ab6b6ab3f660522c"
   integrity sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==
@@ -1295,7 +1283,7 @@
     "@firebase/util" "1.9.3"
     tslib "^2.1.0"
 
-"@firebase/database-types@0.10.4", "@firebase/database-types@^0.10.4":
+"@firebase/database-types@0.10.4":
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.10.4.tgz#47ba81113512dab637abace61cfb65f63d645ca7"
   integrity sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==
@@ -1609,57 +1597,6 @@
   dependencies:
     "@fullcalendar/daygrid" "~6.1.7"
 
-"@google-cloud/firestore@^6.5.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-6.6.0.tgz#f7fd0d9cf318417b14851ddce941810b1214ab0c"
-  integrity sha512-XDWsmCtQQFs0RoXZaq3fCYe4jRtAAFmW38ezGLKWSjLQ5FNv7jxpBGtdITBM2PDI0tFNCyeogjqsDbI6CIVeuQ==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    functional-red-black-tree "^1.0.1"
-    google-gax "^3.5.7"
-    protobufjs "^7.0.0"
-
-"@google-cloud/paginator@^3.0.7":
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-3.0.7.tgz#fb6f8e24ec841f99defaebf62c75c2e744dd419b"
-  integrity sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ==
-  dependencies:
-    arrify "^2.0.0"
-    extend "^3.0.2"
-
-"@google-cloud/projectify@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-3.0.0.tgz#302b25f55f674854dce65c2532d98919b118a408"
-  integrity sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA==
-
-"@google-cloud/promisify@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-3.0.1.tgz#8d724fb280f47d1ff99953aee0c1669b25238c2e"
-  integrity sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA==
-
-"@google-cloud/storage@^6.9.5":
-  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-6.10.1.tgz#7b62b7956668b649bfa3affa471619ce06d297dd"
-  integrity sha512-EtLlT0YbXtrbUxaNbEfTyTytrjELtl4i42flf8COg+Hu5+apdNjsFO9XEY39wshxAuVjLf4fCSm7GTSW+BD3gQ==
-  dependencies:
-    "@google-cloud/paginator" "^3.0.7"
-    "@google-cloud/projectify" "^3.0.0"
-    "@google-cloud/promisify" "^3.0.0"
-    abort-controller "^3.0.0"
-    async-retry "^1.3.3"
-    compressible "^2.0.12"
-    duplexify "^4.0.0"
-    ent "^2.2.0"
-    extend "^3.0.2"
-    gaxios "^5.0.0"
-    google-auth-library "^8.0.1"
-    mime "^3.0.0"
-    mime-types "^2.0.8"
-    p-limit "^3.0.1"
-    retry-request "^5.0.0"
-    teeny-request "^8.0.0"
-    uuid "^8.0.0"
-
 "@grpc/grpc-js@~1.7.0":
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.7.3.tgz#f2ea79f65e31622d7f86d4b4c9ae38f13ccab99a"
@@ -1668,14 +1605,6 @@
     "@grpc/proto-loader" "^0.7.0"
     "@types/node" ">=12.12.47"
 
-"@grpc/grpc-js@~1.8.0":
-  version "1.8.14"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.8.14.tgz#4fe0f9917d6f094cf59245763c275442b182e9ad"
-  integrity sha512-w84maJ6CKl5aApCMzFll0hxtFNT6or9WwMslobKaqWUEf1K+zhlL43bSQhFreyYWIWR+Z0xnVFC1KtLm4ZpM/A==
-  dependencies:
-    "@grpc/proto-loader" "^0.7.0"
-    "@types/node" ">=12.12.47"
-
 "@grpc/proto-loader@^0.6.13":
   version "0.6.13"
   resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.13.tgz#008f989b72a40c60c96cd4088522f09b05ac66bc"
@@ -1774,13 +1703,6 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
-"@jsdoc/salty@^0.2.1":
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.5.tgz#1b2fa5bb8c66485b536d86eee877c263d322f692"
-  integrity sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==
-  dependencies:
-    lodash "^4.17.21"
-
 "@motionone/animation@^10.15.1":
   version "10.15.1"
   resolved "https://registry.npmjs.org/@motionone/animation/-/animation-10.15.1.tgz"
@@ -2078,11 +2000,6 @@
   resolved "https://registry.yarnpkg.com/@tanstack/table-core/-/table-core-8.9.1.tgz#869410ca1748c45d4e19ccfd4db7e36452611674"
   integrity sha512-2+R83n8vMZND0q3W1lSiF7co9nFbeWbjAErFf27xwbeA9E0wtUu5ZDfgj+TZ6JzdAEQAgfxkk/QNFAKiS8E4MA==
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
 "@trpc/client@^10.26.0":
   version "10.26.0"
   resolved "https://registry.yarnpkg.com/@trpc/client/-/client-10.26.0.tgz#eaccff7b101882cbf543931abc1f764b3b17bae6"
@@ -2110,49 +2027,6 @@
   resolved "https://registry.npmjs.org/@types/bcryptjs/-/bcryptjs-2.4.2.tgz"
   integrity sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==
 
-"@types/body-parser@*":
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
-  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
-  dependencies:
-    "@types/connect" "*"
-    "@types/node" "*"
-
-"@types/connect@*":
-  version "3.4.35"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
-  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/express-serve-static-core@^4.17.33":
-  version "4.17.35"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f"
-  integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==
-  dependencies:
-    "@types/node" "*"
-    "@types/qs" "*"
-    "@types/range-parser" "*"
-    "@types/send" "*"
-
-"@types/express@^4.17.14":
-  version "4.17.17"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4"
-  integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
-  dependencies:
-    "@types/body-parser" "*"
-    "@types/express-serve-static-core" "^4.17.33"
-    "@types/qs" "*"
-    "@types/serve-static" "*"
-
-"@types/glob@*":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
-  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
-  dependencies:
-    "@types/minimatch" "^5.1.2"
-    "@types/node" "*"
-
 "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
@@ -2163,18 +2037,6 @@
   resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/jsonwebtoken@^9.0.0":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#9eeb56c76dd555039be2a3972218de5bd3b8d83e"
-  integrity sha512-drE6uz7QBKq1fYqqoFKTDRdFCPHd5TCub75BM+D+cMx7NU9hUz7SESLfC2fSCXVFMO5Yj8sOWHuGqPgjc+fz0Q==
-  dependencies:
-    "@types/node" "*"
-
-"@types/linkify-it@*":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
-  integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
-
 "@types/lodash.mergewith@4.6.7":
   version "4.6.7"
   resolved "https://registry.npmjs.org/@types/lodash.mergewith/-/lodash.mergewith-4.6.7.tgz"
@@ -2187,39 +2049,11 @@
   resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"
   integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
 
-"@types/long@^4.0.0", "@types/long@^4.0.1":
+"@types/long@^4.0.1":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
   integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
-"@types/markdown-it@^12.2.3":
-  version "12.2.3"
-  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
-  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
-  dependencies:
-    "@types/linkify-it" "*"
-    "@types/mdurl" "*"
-
-"@types/mdurl@*":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
-  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
-
-"@types/mime@*":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
-  integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
-
-"@types/mime@^1":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
-  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
-
-"@types/minimatch@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
-  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
-
 "@types/node@*", "@types/node@^18.11.18":
   version "18.14.0"
   resolved "https://registry.npmjs.org/@types/node/-/node-18.14.0.tgz"
@@ -2261,16 +2095,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/qs@*":
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
-  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
-
-"@types/range-parser@*":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
-  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
-
 "@types/react-dom@^18.2.4":
   version "18.2.4"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.4.tgz#13f25bfbf4e404d26f62ac6e406591451acba9e0"
@@ -2303,14 +2127,6 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/rimraf@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.2.tgz#a63d175b331748e5220ad48c901d7bbf1f44eef8"
-  integrity sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==
-  dependencies:
-    "@types/glob" "*"
-    "@types/node" "*"
-
 "@types/scheduler@*":
   version "0.16.2"
   resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz"
@@ -2321,22 +2137,6 @@
   resolved "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz"
   integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
-"@types/send@*":
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301"
-  integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==
-  dependencies:
-    "@types/mime" "^1"
-    "@types/node" "*"
-
-"@types/serve-static@*":
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d"
-  integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==
-  dependencies:
-    "@types/mime" "*"
-    "@types/node" "*"
-
 "@typescript-eslint/eslint-plugin@^5.48.1":
   version "5.52.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.52.0.tgz"
@@ -2431,13 +2231,6 @@
   resolved "https://registry.yarnpkg.com/@zag-js/focus-visible/-/focus-visible-0.2.2.tgz#56233480ca1275d3218fb2e10696a33d1a6b9e64"
   integrity sha512-0j2gZq8HiZ51z4zNnSkF1iSkqlwRDvdH+son3wHdoz+7IUdMN/5Exd4TxMJ+gq2Of1DiXReYLL9qqh2PdQ4wgA==
 
-abort-controller@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
-  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
-  dependencies:
-    event-target-shim "^5.0.0"
-
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
@@ -2472,13 +2265,6 @@ acorn@^8.0.4, acorn@^8.8.0:
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
 
-agent-base@6:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
-
 ajv@^6.10.0, ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
@@ -2594,23 +2380,11 @@ array.prototype.tosorted@^1.1.1:
     es-shim-unscopables "^1.0.0"
     get-intrinsic "^1.1.3"
 
-arrify@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
-  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
-
 ast-types-flow@^0.0.7:
   version "0.0.7"
   resolved "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz"
   integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
 
-async-retry@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280"
-  integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==
-  dependencies:
-    retry "0.13.1"
-
 autoprefixer@^10.4.13:
   version "10.4.13"
   resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz"
@@ -2654,31 +2428,16 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.3.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
 bcryptjs@^2.4.3:
   version "2.4.3"
   resolved "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"
   integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==
 
-bignumber.js@^9.0.0:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz#c4df7dc496bd849d4c9464344c1aa74228b4dac6"
-  integrity sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==
-
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bluebird@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -2687,13 +2446,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
-  dependencies:
-    balanced-match "^1.0.0"
-
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
@@ -2711,11 +2463,6 @@ browserslist@^4.21.3, browserslist@^4.21.4:
     node-releases "^2.0.8"
     update-browserslist-db "^1.0.10"
 
-buffer-equal-constant-time@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
-  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
-
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
@@ -2744,13 +2491,6 @@ caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.300014
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001456.tgz"
   integrity sha512-XFHJY5dUgmpMV25UqaD4kVq2LsiaU5rS8fb0f17pCoXQiQslzmFgnfOxfvo1bTpTqf7dwG/N/05CnLCnOEKmzA==
 
-catharsis@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121"
-  integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==
-  dependencies:
-    lodash "^4.17.15"
-
 chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
@@ -2859,13 +2599,6 @@ commander@^7.2.0:
   resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
-compressible@^2.0.12:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
-  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
-  dependencies:
-    mime-db ">= 1.43.0 < 2"
-
 compute-scroll-into-view@1.0.20:
   version "1.0.20"
   resolved "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz"
@@ -2966,13 +2699,6 @@ debounce@^1.2.0:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
@@ -2980,6 +2706,13 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -3008,7 +2741,7 @@ deep-equal@^2.0.5:
     which-collection "^1.0.1"
     which-typed-array "^1.1.9"
 
-deep-is@^0.1.3, deep-is@~0.1.3:
+deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -3094,28 +2827,11 @@ duplexer@^0.1.2:
   resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
-duplexify@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0"
-  integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==
-  dependencies:
-    end-of-stream "^1.4.1"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-    stream-shift "^1.0.0"
-
 easy-bem@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/easy-bem/-/easy-bem-1.1.1.tgz#1bfcc10425498090bcfddc0f9c000aba91399e03"
   integrity sha512-GJRqdiy2h+EXy6a8E6R+ubmqUM08BK0FWNq41k24fup6045biQ8NXxoXimiwegMQvFFV3t1emADdGNL1TlS61A==
 
-ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
-  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
-  dependencies:
-    safe-buffer "^5.0.1"
-
 electron-to-chromium@^1.4.284:
   version "1.4.302"
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.302.tgz"
@@ -3136,13 +2852,6 @@ encode-utf8@^1.0.3:
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
-end-of-stream@^1.4.1:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
 enhanced-resolve@^5.10.0:
   version "5.12.0"
   resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz"
@@ -3151,16 +2860,6 @@ enhanced-resolve@^5.10.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-ent@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
-
-entities@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
-  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
-
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
@@ -3257,28 +2956,11 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
-escape-string-regexp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
-  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
-
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escodegen@^1.13.0:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
-  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
 eslint-config-next@^13.1.6:
   version "13.1.6"
   resolved "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.1.6.tgz"
@@ -3425,11 +3107,6 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint-visitor-keys@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
-  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
-
 eslint@^8.31.0:
   version "8.34.0"
   resolved "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz"
@@ -3475,15 +3152,6 @@ eslint@^8.31.0:
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-espree@^9.0.0:
-  version "9.5.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
-  integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
-  dependencies:
-    acorn "^8.8.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
-
 espree@^9.4.0:
   version "9.4.1"
   resolved "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz"
@@ -3493,11 +3161,6 @@ espree@^9.4.0:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
-esprima@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 esquery@^1.4.0:
   version "1.4.2"
   resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz"
@@ -3512,7 +3175,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.1:
   version "4.3.0"
   resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -3527,16 +3190,6 @@ esutils@^2.0.2:
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-event-target-shim@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
-  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
-
-extend@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
@@ -3558,16 +3211,11 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867"
-  integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==
-
 fastq@^1.6.0:
   version "1.15.0"
   resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"
@@ -3617,23 +3265,6 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-firebase-admin@^11.8.0:
-  version "11.8.0"
-  resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-11.8.0.tgz#4cb57e39e5ad7cbc690c6e073d93be549c7854b3"
-  integrity sha512-RxO0wWDnuqVikXExhVjnhVaaXpziKCad4D1rOX5c1WJdk1jAu9hfE4rbrFKZQZgF1okZS04kgCBIFJro7xn8NQ==
-  dependencies:
-    "@fastify/busboy" "^1.2.1"
-    "@firebase/database-compat" "^0.3.4"
-    "@firebase/database-types" "^0.10.4"
-    "@types/node" ">=12.12.47"
-    jsonwebtoken "^9.0.0"
-    jwks-rsa "^3.0.1"
-    node-forge "^1.3.1"
-    uuid "^9.0.0"
-  optionalDependencies:
-    "@google-cloud/firestore" "^6.5.0"
-    "@google-cloud/storage" "^6.9.5"
-
 firebase@^9.22.1:
   version "9.22.1"
   resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.22.1.tgz#9bf49d8cb87eefae6500cc2bd2ec1fddbc1c1ebb"
@@ -3771,34 +3402,11 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
 functions-have-names@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-gaxios@^5.0.0, gaxios@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-5.1.0.tgz#133b77b45532be71eec72012b7e97c2320b6140a"
-  integrity sha512-aezGIjb+/VfsJtIcHGcBSerNEDdfdHeMros+RbYbGpmonKWQCOVOes0LVZhn1lDtIgq55qq0HaxymIoae3Fl/A==
-  dependencies:
-    extend "^3.0.2"
-    https-proxy-agent "^5.0.0"
-    is-stream "^2.0.0"
-    node-fetch "^2.6.7"
-
-gcp-metadata@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.2.0.tgz#b4772e9c5976241f5d3e69c4f446c906d25506ec"
-  integrity sha512-aFhhvvNycky2QyhG+dcfEdHBF0FRbYcf39s6WNHUDysKSrbJ5vuFbjydxBcmewtXeV248GP8dWT3ByPNxsyHCw==
-  dependencies:
-    gaxios "^5.0.0"
-    json-bigint "^1.0.0"
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -3874,17 +3482,6 @@ glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
-  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -3937,49 +3534,6 @@ globrex@^0.1.2:
   resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
   integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
 
-google-auth-library@^8.0.1, google-auth-library@^8.0.2:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-8.8.0.tgz#2e17494431cef56b571420d483a4debff6c481cd"
-  integrity sha512-0iJn7IDqObDG5Tu9Tn2WemmJ31ksEa96IyK0J0OZCpTh6CrC6FrattwKX87h3qKVuprCJpdOGKc1Xi8V0kMh8Q==
-  dependencies:
-    arrify "^2.0.0"
-    base64-js "^1.3.0"
-    ecdsa-sig-formatter "^1.0.11"
-    fast-text-encoding "^1.0.0"
-    gaxios "^5.0.0"
-    gcp-metadata "^5.2.0"
-    gtoken "^6.1.0"
-    jws "^4.0.0"
-    lru-cache "^6.0.0"
-
-google-gax@^3.5.7:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-3.6.0.tgz#0f4ae350159737fe0aa289815c0d92838b19f6af"
-  integrity sha512-2fyb61vWxUonHiArRNJQmE4tx5oY1ni8VPo08fzII409vDSCWG7apDX4qNOQ2GXXT82gLBn3d3P1Dydh7pWjyw==
-  dependencies:
-    "@grpc/grpc-js" "~1.8.0"
-    "@grpc/proto-loader" "^0.7.0"
-    "@types/long" "^4.0.0"
-    "@types/rimraf" "^3.0.2"
-    abort-controller "^3.0.0"
-    duplexify "^4.0.0"
-    fast-text-encoding "^1.0.3"
-    google-auth-library "^8.0.2"
-    is-stream-ended "^0.1.4"
-    node-fetch "^2.6.1"
-    object-hash "^3.0.0"
-    proto3-json-serializer "^1.0.0"
-    protobufjs "7.2.3"
-    protobufjs-cli "1.1.1"
-    retry-request "^5.0.0"
-
-google-p12-pem@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-4.0.1.tgz#82841798253c65b7dc2a4e5fe9df141db670172a"
-  integrity sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==
-  dependencies:
-    node-forge "^1.3.1"
-
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -3987,11 +3541,6 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.9:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
 graceful-fs@^4.2.4:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
@@ -4002,15 +3551,6 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
-gtoken@^6.1.0:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-6.1.2.tgz#aeb7bdb019ff4c3ba3ac100bbe7b6e74dce0e8bc"
-  integrity sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==
-  dependencies:
-    gaxios "^5.0.1"
-    google-p12-pem "^4.0.0"
-    jws "^4.0.0"
-
 gzip-size@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
@@ -4081,23 +3621,6 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
   integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
-  dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
 idb@7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/idb/-/idb-7.0.1.tgz#d2875b3a2f205d854ee307f6d196f246fea590a7"
@@ -4134,7 +3657,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3:
+inherits@2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4287,16 +3810,6 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-stream-ended@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-stream-ended/-/is-stream-ended-0.1.4.tgz#f50224e95e06bce0e356d440a4827cd35b267eda"
-  integrity sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==
-
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"
@@ -4364,7 +3877,7 @@ isexe@^2.0.0:
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-jose@^4.10.4, jose@^4.11.4, jose@^4.14.1:
+jose@^4.11.4, jose@^4.14.1:
   version "4.14.4"
   resolved "https://registry.yarnpkg.com/jose/-/jose-4.14.4.tgz#59e09204e2670c3164ee24cbfe7115c6f8bff9ca"
   integrity sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g==
@@ -4386,46 +3899,11 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-js2xmlparser@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a"
-  integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==
-  dependencies:
-    xmlcreate "^2.0.4"
-
-jsdoc@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e"
-  integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==
-  dependencies:
-    "@babel/parser" "^7.20.15"
-    "@jsdoc/salty" "^0.2.1"
-    "@types/markdown-it" "^12.2.3"
-    bluebird "^3.7.2"
-    catharsis "^0.9.0"
-    escape-string-regexp "^2.0.0"
-    js2xmlparser "^4.0.2"
-    klaw "^3.0.0"
-    markdown-it "^12.3.2"
-    markdown-it-anchor "^8.4.1"
-    marked "^4.0.10"
-    mkdirp "^1.0.4"
-    requizzle "^0.2.3"
-    strip-json-comments "^3.1.0"
-    underscore "~1.13.2"
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-json-bigint@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
-  integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==
-  dependencies:
-    bignumber.js "^9.0.0"
-
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
   resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
@@ -4453,16 +3931,6 @@ json5@^2.2.2:
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-jsonwebtoken@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
-  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
-  dependencies:
-    jws "^3.2.2"
-    lodash "^4.17.21"
-    ms "^2.1.1"
-    semver "^7.3.8"
-
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.3:
   version "3.3.3"
   resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz"
@@ -4471,59 +3939,6 @@ jsonwebtoken@^9.0.0:
     array-includes "^3.1.5"
     object.assign "^4.1.3"
 
-jwa@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
-  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
-  dependencies:
-    buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.11"
-    safe-buffer "^5.0.1"
-
-jwa@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz#a7e9c3f29dae94027ebcaf49975c9345593410fc"
-  integrity sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==
-  dependencies:
-    buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.11"
-    safe-buffer "^5.0.1"
-
-jwks-rsa@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-3.0.1.tgz#ba79ddca7ee7520f7bb26b942ef1aee91df8d7e4"
-  integrity sha512-UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw==
-  dependencies:
-    "@types/express" "^4.17.14"
-    "@types/jsonwebtoken" "^9.0.0"
-    debug "^4.3.4"
-    jose "^4.10.4"
-    limiter "^1.1.5"
-    lru-memoizer "^2.1.4"
-
-jws@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
-  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
-  dependencies:
-    jwa "^1.4.1"
-    safe-buffer "^5.0.1"
-
-jws@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz#2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4"
-  integrity sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==
-  dependencies:
-    jwa "^2.0.0"
-    safe-buffer "^5.0.1"
-
-klaw@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146"
-  integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==
-  dependencies:
-    graceful-fs "^4.1.9"
-
 language-subtag-registry@~0.3.2:
   version "0.3.22"
   resolved "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz"
@@ -4544,36 +3959,16 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 lilconfig@^2.0.5, lilconfig@^2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz"
   integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==
 
-limiter@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
-  integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==
-
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-linkify-it@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
-  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
-  dependencies:
-    uc.micro "^1.0.1"
-
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -4593,11 +3988,6 @@ lodash.camelcase@^4.3.0:
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
   integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
 
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==
-
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
@@ -4608,7 +3998,7 @@ lodash.mergewith@4.6.2:
   resolved "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"
   integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
-lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
+lodash@^4.17.20:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -4644,48 +4034,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@~4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
-  integrity sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==
-  dependencies:
-    pseudomap "^1.0.1"
-    yallist "^2.0.0"
-
-lru-memoizer@^2.1.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/lru-memoizer/-/lru-memoizer-2.2.0.tgz#b9d90c91637b4b1a423ef76f3156566691293df8"
-  integrity sha512-QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw==
-  dependencies:
-    lodash.clonedeep "^4.5.0"
-    lru-cache "~4.0.0"
-
-markdown-it-anchor@^8.4.1:
-  version "8.6.7"
-  resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634"
-  integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==
-
-markdown-it@^12.3.2:
-  version "12.3.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
-  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
-  dependencies:
-    argparse "^2.0.1"
-    entities "~2.1.0"
-    linkify-it "^3.0.1"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
-
-marked@^4.0.10:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
-  integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==
-
-mdurl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
-
 memoize-one@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz"
@@ -4704,23 +4052,6 @@ micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.0.8:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
-mime@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
-  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
-
 mini-svg-data-uri@^1.4.3:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939"
@@ -4733,23 +4064,11 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
-  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 mrmime@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz"
@@ -4827,18 +4146,6 @@ node-fetch@2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@^2.6.1, node-fetch@^2.6.7:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
-  integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-node-forge@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
-  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
-
 node-releases@^2.0.8:
   version "2.0.10"
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz"
@@ -4947,7 +4254,7 @@ oidc-token-hash@^5.0.3:
   resolved "https://registry.yarnpkg.com/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz#9a229f0a1ce9d4fc89bcaee5478c97a889e7b7b6"
   integrity sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==
 
-once@^1.3.0, once@^1.4.0:
+once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
@@ -4978,18 +4285,6 @@ openid-client@^5.4.0:
     object-hash "^2.2.0"
     oidc-token-hash "^5.0.3"
 
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"
@@ -5009,7 +4304,7 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.1, p-limit@^3.0.2:
+p-limit@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -5186,11 +4481,6 @@ prelude-ls@^1.2.1:
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
-
 prettier-plugin-tailwindcss@^0.2.3:
   version "0.2.3"
   resolved "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.3.tgz"
@@ -5222,33 +4512,10 @@ prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
-proto3-json-serializer@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz#1b5703152b6ce811c5cdcc6468032caf53521331"
-  integrity sha512-AwAuY4g9nxx0u52DnSMkqqgyLHaW/XaPLtaAo3y/ZCfeaQB/g4YDH4kb8Wc/mWzWvu0YjOznVnfn373MVZZrgw==
-  dependencies:
-    protobufjs "^7.0.0"
-
-protobufjs-cli@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz#f531201b1c8c7772066aa822bf9a08318b24a704"
-  integrity sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==
-  dependencies:
-    chalk "^4.0.0"
-    escodegen "^1.13.0"
-    espree "^9.0.0"
-    estraverse "^5.1.0"
-    glob "^8.0.0"
-    jsdoc "^4.0.0"
-    minimist "^1.2.0"
-    semver "^7.1.2"
-    tmp "^0.2.1"
-    uglify-js "^3.7.7"
-
-protobufjs@7.2.3, protobufjs@^7.0.0:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.3.tgz#01af019e40d9c6133c49acbb3ff9e30f4f0f70b2"
-  integrity sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==
+protobufjs@^6.11.3:
+  version "6.11.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
+  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -5260,13 +4527,14 @@ protobufjs@7.2.3, protobufjs@^7.0.0:
     "@protobufjs/path" "^1.1.2"
     "@protobufjs/pool" "^1.1.0"
     "@protobufjs/utf8" "^1.1.0"
+    "@types/long" "^4.0.1"
     "@types/node" ">=13.7.0"
-    long "^5.0.0"
+    long "^4.0.0"
 
-protobufjs@^6.11.3:
-  version "6.11.3"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
-  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
+protobufjs@^7.0.0:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.3.tgz#01af019e40d9c6133c49acbb3ff9e30f4f0f70b2"
+  integrity sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -5278,14 +4546,8 @@ protobufjs@^6.11.3:
     "@protobufjs/path" "^1.1.2"
     "@protobufjs/pool" "^1.1.0"
     "@protobufjs/utf8" "^1.1.0"
-    "@types/long" "^4.0.1"
     "@types/node" ">=13.7.0"
-    long "^4.0.0"
-
-pseudomap@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
+    long "^5.0.0"
 
 punycode@^2.1.0:
   version "2.3.0"
@@ -5440,15 +4702,6 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
-readable-stream@^3.1.1:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
@@ -5485,13 +4738,6 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-requizzle@^0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c"
-  integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==
-  dependencies:
-    lodash "^4.17.21"
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
@@ -5515,25 +4761,12 @@ resolve@^2.0.0-next.4:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-retry-request@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-5.0.2.tgz#143d85f90c755af407fcc46b7166a4ba520e44da"
-  integrity sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==
-  dependencies:
-    debug "^4.1.1"
-    extend "^3.0.2"
-
-retry@0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
-  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
-
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -5547,7 +4780,7 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@~5.2.0:
+safe-buffer@>=5.1.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -5573,13 +4806,6 @@ semver@^6.3.0:
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.1.2, semver@^7.3.8:
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
-  integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
-  dependencies:
-    lru-cache "^6.0.0"
-
 semver@^7.3.7:
   version "7.3.8"
   resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"
@@ -5642,11 +4868,6 @@ source-map@^0.5.7:
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
-source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
 stop-iteration-iterator@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz"
@@ -5654,18 +4875,6 @@ stop-iteration-iterator@^1.0.0:
   dependencies:
     internal-slot "^1.0.4"
 
-stream-events@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5"
-  integrity sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==
-  dependencies:
-    stubs "^3.0.0"
-
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -5707,13 +4916,6 @@ string.prototype.trimstart@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -5731,11 +4933,6 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-stubs@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
-  integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==
-
 styled-jsx@5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz"
@@ -5821,22 +5018,6 @@ tapable@^2.2.0:
   resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-teeny-request@^8.0.0:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-8.0.3.tgz#5cb9c471ef5e59f2fca8280dc3c5909595e6ca24"
-  integrity sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww==
-  dependencies:
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    node-fetch "^2.6.1"
-    stream-events "^1.0.5"
-    uuid "^9.0.0"
-
-text-decoding@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/text-decoding/-/text-decoding-1.0.0.tgz#38a5692d23b5c2b12942d6e245599cb58b1bc52f"
-  integrity sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==
-
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
@@ -5855,13 +5036,6 @@ tiny-invariant@^1.0.6:
   resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz"
   integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
-tmp@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
@@ -5928,13 +5102,6 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
-  dependencies:
-    prelude-ls "~1.1.2"
-
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
@@ -5954,16 +5121,6 @@ typescript@^4.9.4:
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
-uc.micro@^1.0.1, uc.micro@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
-
-uglify-js@^3.7.7:
-  version "3.17.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
-  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
-
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"
@@ -5974,11 +5131,6 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-underscore@~1.13.2:
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
-  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
-
 update-browserslist-db@^1.0.10:
   version "1.0.10"
   resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"
@@ -6019,21 +5171,16 @@ use-sync-external-store@^1.2.0:
   resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2:
+util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-uuid@^8.0.0, uuid@^8.3.2:
+uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-uuid@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
-  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
@@ -6121,7 +5268,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-word-wrap@^1.2.3, word-wrap@~1.2.3:
+word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
@@ -6154,11 +5301,6 @@ ws@^7.3.1:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
-xmlcreate@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be"
-  integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==
-
 xtend@^4.0.2:
   version "4.0.2"
   resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
@@ -6174,11 +5316,6 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yallist@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
-
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"

From 084842bfe4f0b18dcf1c6673f20919d710b9c6a7 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 08:36:21 +0800
Subject: [PATCH 038/223] Migrate the profile

---
 src/components/profile/ProfileContactInfo.tsx | 18 ++++-----
 src/components/profile/ProfileGrid.tsx        | 14 +++----
 src/components/profile/ProfileInfo.tsx        |  6 +--
 src/components/profile/UploadImageButton.tsx  | 12 ++----
 src/pages/preferences.tsx                     |  2 +-
 src/server/trpc/router/_app.ts                |  2 -
 .../trpc/router/member/createMultipleUsers.ts |  2 +-
 src/server/trpc/router/profile/index.ts       |  6 ---
 .../password.ts => users/changePassword.ts}   | 20 +++-------
 .../trpc/router/users/getUserProfile.ts       | 17 ++++++++
 src/server/trpc/router/users/index.ts         |  6 ++-
 .../users/{post.ts => resetPassword.ts}       | 40 +++++++++----------
 src/server/trpc/router/util/transporter.ts    | 10 +++++
 13 files changed, 80 insertions(+), 75 deletions(-)
 delete mode 100644 src/server/trpc/router/profile/index.ts
 rename src/server/trpc/router/{profile/password.ts => users/changePassword.ts} (69%)
 create mode 100644 src/server/trpc/router/users/getUserProfile.ts
 rename src/server/trpc/router/users/{post.ts => resetPassword.ts} (51%)
 create mode 100644 src/server/trpc/router/util/transporter.ts

diff --git a/src/components/profile/ProfileContactInfo.tsx b/src/components/profile/ProfileContactInfo.tsx
index e565663f..bf0398b8 100644
--- a/src/components/profile/ProfileContactInfo.tsx
+++ b/src/components/profile/ProfileContactInfo.tsx
@@ -13,9 +13,9 @@ import { Message } from '~/constant/messages'
 
 const ProfileContactInfo = (props: {
   studentId: string | null
-  telegram: string | null
-  discord: string | null
-  personal_email: string | null
+  // telegram: string | null
+  // discord: string | null
+  // personal_email: string | null
   email: string
   refetch: () => Promise<QueryObserverResult>
 }) => {
@@ -30,9 +30,9 @@ const ProfileContactInfo = (props: {
 
   // Form validation logic
   const preloadedValues = {
-    telegram: props.telegram ? props.telegram : '',
-    discord: props.discord ? props.discord : '',
-    personal_email: props.personal_email ? props.personal_email : '',
+    // telegram: props.telegram ? props.telegram : '',
+    // discord: props.discord ? props.discord : '',
+    // personal_email: props.personal_email ? props.personal_email : '',
     email: props.email ? props.email : '',
   }
 
@@ -98,7 +98,7 @@ const ProfileContactInfo = (props: {
           boxShadow="0px 3px 3px rgba(0, 0, 0, 0.2)"
           className="flex flex-col gap-3 py-6 px-10"
         >
-          <Box className="flex items-center gap-1">
+          {/* <Box className="flex items-center gap-1">
             <BsTelegram size="20px" className="fill-[#0088cc]" />
             <DynamicInputField
               edit={edit}
@@ -117,7 +117,7 @@ const ProfileContactInfo = (props: {
               field="discord"
               fieldValue={props.discord}
             />
-          </Box>
+          </Box> 
           <Box className="flex items-center gap-1">
             <BsEnvelopeFill size="20px" className="fill-[#54CCFF]" />
             <DynamicInputField
@@ -127,7 +127,7 @@ const ProfileContactInfo = (props: {
               field="personal_email"
               fieldValue={props.personal_email}
             />
-          </Box>
+          </Box> */}
           <Box className="flex items-center gap-1">
             <BsEnvelopeFill size="20px" className="fill-[#97AEFF]" />
             <DynamicInputField
diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index c32f2a17..c614097b 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -13,13 +13,13 @@ const ProfileGrid = ({
   session: Session
 }) => {
   const { data, isError, isLoading, refetch } =
-    trpc.member.getMemberProfile.useQuery(studentId)
+    trpc.user.getUserProfile.useQuery(studentId)
 
   if (isLoading) {
     return <LoadingScreen />
   }
 
-  if (!data || !data.user || isError) {
+  if (!data || isError) {
     return <p className="text-3xl">Something is wrong</p>
   }
 
@@ -28,9 +28,9 @@ const ProfileGrid = ({
       <div className="row-span-3 h-full w-3/4 max-w-md bg-[#01003D] md:place-self-end">
         <ProfileCard
           refetch={refetch}
-          name={data.user.name}
-          dept={data.user.department}
-          role={data.user.role}
+          name={data.name}
+          dept={data.department}
+          role={data.role}
           studentId={studentId}
           session={session}
         />
@@ -38,12 +38,12 @@ const ProfileGrid = ({
       <div className="col-span-2 w-3/4">
         <ProfileContactInfo
           studentId={studentId}
-          {...data.user}
+          {...data}
           refetch={refetch}
         />
       </div>
       <div className="col-span-2 row-span-2 mb-10 w-3/4">
-        <ProfileInfo {...data.user} />
+        {/* <ProfileInfo {...data} /> */}
       </div>
     </div>
   )
diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index ad896f75..a9956c0c 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -7,7 +7,7 @@ type ProfilePageType = {
   year: string | null
   faculty: string | null
   major: string | null
-  projects: Projects[]
+  // projects: Projects[]
 }
 
 const ProfileInfo = (props: ProfilePageType) => {
@@ -61,7 +61,7 @@ const ProfileInfo = (props: ProfilePageType) => {
                 {props.major}
               </Td>
             </Tr>
-            <Tr>
+            {/* <Tr>
               <Td textColor="#002D70" className="font-medium">
                 PROJECTS
               </Td>
@@ -76,7 +76,7 @@ const ProfileInfo = (props: ProfilePageType) => {
                   </Td>
                 )
               })}
-            </Tr>
+            </Tr> */}
           </Tbody>
         </Table>
       </TableContainer>
diff --git a/src/components/profile/UploadImageButton.tsx b/src/components/profile/UploadImageButton.tsx
index 3b229109..930cd86d 100644
--- a/src/components/profile/UploadImageButton.tsx
+++ b/src/components/profile/UploadImageButton.tsx
@@ -7,8 +7,7 @@ import { type QueryObserverResult } from '@tanstack/react-query'
 import { Message } from '~/constant/messages'
 
 // TODO: Fix the environment variables.
-import { storage } from '~/server/db/firebase'
-import { ref, uploadBytes, getDownloadURL } from 'firebase/storage'
+
 
 const UploadImageBtn = ({
   studentId,
@@ -32,13 +31,8 @@ const UploadImageBtn = ({
           title: Message.IMAGE_UPLOAD_LOADING,
           status: 'loading',
         })
-        const storageRef = ref(storage, `${studentId}/image/profile_pic`)
-        await uploadBytes(storageRef, e.target.files[0] as File)
-        const image = await getDownloadURL(storageRef)
-        await mutateAsync({
-          studentId,
-          image,
-        })
+
+
         await refetch()
         toast({
           duration: 3000,
diff --git a/src/pages/preferences.tsx b/src/pages/preferences.tsx
index 89acfbc9..7da64f52 100644
--- a/src/pages/preferences.tsx
+++ b/src/pages/preferences.tsx
@@ -10,7 +10,7 @@ import Link from 'next/link'
 
 const ChangePasswordPage = () => {
   const toast = useToast()
-  const { mutateAsync, isLoading } = trpc.profile.changePassword.useMutation()
+  const { mutateAsync, isLoading } = trpc.user.changePassword.useMutation()
   const { status } = useSession({ required: true })
   const [oldPassword, setOldPassword] = useState('')
   const [password, setPassword] = useState('')
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index 76b5d95e..f38a257f 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -1,13 +1,11 @@
 import { router } from '../trpc'
 import { memberRouter } from './member'
-import { profileRouter } from './profile'
 import { userRouter } from './users'
 import { attendanceRouter } from './attendance'
 
 export const appRouter = router({
   attendance: attendanceRouter,
   member: memberRouter,
-  profile: profileRouter,
   user: userRouter,
 })
 
diff --git a/src/server/trpc/router/member/createMultipleUsers.ts b/src/server/trpc/router/member/createMultipleUsers.ts
index 838a72b5..74832888 100644
--- a/src/server/trpc/router/member/createMultipleUsers.ts
+++ b/src/server/trpc/router/member/createMultipleUsers.ts
@@ -22,7 +22,7 @@ export const createMultipleUsers = protectedProcedure
       })
     )
   )
-  .mutation(async ({ ctx, input }) => {
+  .mutation(async ({ input }) => {
     try {
       const password = randomBytes(10).toString('hex')
       const hashedPassword = await hash(password, 10)
diff --git a/src/server/trpc/router/profile/index.ts b/src/server/trpc/router/profile/index.ts
deleted file mode 100644
index ea732215..00000000
--- a/src/server/trpc/router/profile/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { router } from '~/server/trpc/trpc'
-import changePassword from './password'
-
-export const profileRouter = router({
-  changePassword,
-})
diff --git a/src/server/trpc/router/profile/password.ts b/src/server/trpc/router/users/changePassword.ts
similarity index 69%
rename from src/server/trpc/router/profile/password.ts
rename to src/server/trpc/router/users/changePassword.ts
index 9d8356e2..3b82e9ca 100644
--- a/src/server/trpc/router/profile/password.ts
+++ b/src/server/trpc/router/users/changePassword.ts
@@ -2,8 +2,9 @@ import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import { compare, hash } from 'bcryptjs'
+import userCollection from '~/server/db/collections/UserCollection'
 
-export default protectedProcedure
+export const changePassword = protectedProcedure
   .input(
     z.object({
       oldPassword: z.string(),
@@ -16,17 +17,7 @@ export default protectedProcedure
       const { id } = ctx.session.user
 
       // Throw an error if we are unable to find the user
-      const foundUser = await ctx.prisma.user.findUnique({
-        where: { id },
-        select: { hashedPassword: true },
-      })
-
-      if (!foundUser) {
-        throw new TRPCError({
-          code: 'UNAUTHORIZED',
-          message: 'Oops, something went wrong!',
-        })
-      }
+      const foundUser = await userCollection.getById(id)
 
       // Verify if the current password is correct
       const success = await compare(oldPassword, foundUser.hashedPassword)
@@ -38,9 +29,8 @@ export default protectedProcedure
       }
 
       const newPassword = await hash(password, 10)
-      await ctx.prisma.user.update({
-        data: { hashedPassword: newPassword },
-        where: { id },
+      await userCollection.update(id, {
+        hashedPassword: newPassword,
       })
     } catch (e) {
       // Throw an error if there is an issue with updating of password
diff --git a/src/server/trpc/router/users/getUserProfile.ts b/src/server/trpc/router/users/getUserProfile.ts
new file mode 100644
index 00000000..f0764146
--- /dev/null
+++ b/src/server/trpc/router/users/getUserProfile.ts
@@ -0,0 +1,17 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import { TRPCError } from '@trpc/server'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const getUserProfile = protectedProcedure
+  .input(z.string())
+  .query(async ({ ctx }) => {
+    try {
+      return await userCollection.getById(ctx.session.user.id)
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index 6eaf3f70..5a884dbb 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -1,8 +1,10 @@
 import { router } from '~/server/trpc/trpc'
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { TRPCError } from '@trpc/server'
-import { resetPassword } from './post'
+import { resetPassword } from './resetPassword'
+import { changePassword } from './changePassword'
 import { getAllUsersForTable } from './getAllUsersForTable'
+import { getUserProfile } from './getUserProfile'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -26,7 +28,9 @@ const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
 })
 
 export const userRouter = router({
+  changePassword,
   getAllUsers,
   getAllUsersForTable,
+  getUserProfile,
   resetPassword,
 })
diff --git a/src/server/trpc/router/users/post.ts b/src/server/trpc/router/users/resetPassword.ts
similarity index 51%
rename from src/server/trpc/router/users/post.ts
rename to src/server/trpc/router/users/resetPassword.ts
index 5e4743e8..ff946d55 100644
--- a/src/server/trpc/router/users/post.ts
+++ b/src/server/trpc/router/users/resetPassword.ts
@@ -1,37 +1,33 @@
 import { publicProcedure } from '../../trpc'
 import { z } from 'zod'
-import { TRPCError } from '@trpc/server'
-import nodemailer from 'nodemailer'
 import { env } from '~/env/server.mjs'
+import { transporter } from '../util/transporter'
+import userCollection from '~/server/db/collections/UserCollection'
+import logCollection from '~/server/db/collections/LogCollection'
+import { Timestamp } from 'firebase/firestore'
 
 export const resetPassword = publicProcedure
   .input(z.string())
-  .mutation(async ({ ctx, input }) => {
+  .mutation(async ({ input: email }) => {
     try {
-      const email = input
-      const foundUser = await ctx.prisma.user.findFirst({
-        where: {
-          email,
+      const foundUser = await userCollection.queries([
+        {
+          type: 'where',
+          fieldPath: 'email',
+          direction: '==',
+          value: email,
         },
-      })
+      ])
 
       // Do not tell the user if the account cannot be found for security reasons
-      if (!foundUser) return
-
-      const transporter = nodemailer.createTransport({
-        service: 'gmail',
-        auth: {
-          user: env.GMAIL,
-          pass: env.GMAIL_PASSWORD,
-        },
-      })
+      if (!foundUser.length) return
 
       await transporter.sendMail({
         from: env.GMAIL,
         to: email,
         subject: 'Reset Password',
         html: `
-            Hi ${foundUser.name || 'user'},
+            Hi ${foundUser[0]?.name || 'user'},
             <br />
             <p>A request to reset your account's password has been made. 
             If you did not make this request, please ignore the email.
@@ -42,9 +38,11 @@ export const resetPassword = publicProcedure
           `,
       })
     } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
+      await logCollection.add({
+        level: 'WARNING',
+        title: 'Error resetting password',
+        description: (e as Error).message,
+        createdAt: Timestamp.fromDate(new Date()),
       })
     }
   })
diff --git a/src/server/trpc/router/util/transporter.ts b/src/server/trpc/router/util/transporter.ts
new file mode 100644
index 00000000..a198256e
--- /dev/null
+++ b/src/server/trpc/router/util/transporter.ts
@@ -0,0 +1,10 @@
+import nodemailer from 'nodemailer'
+import { env } from '~/env/server.mjs'
+
+export const transporter = nodemailer.createTransport({
+  service: 'gmail',
+  auth: {
+    user: env.GMAIL,
+    pass: env.GMAIL_PASSWORD,
+  },
+})

From 959fccef8fa444f1099ca6a5929af1c084a89366 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 09:37:52 +0800
Subject: [PATCH 039/223] Integrate in the google storage

---
 src/components/profile/UploadImageButton.tsx     | 12 +++++++++---
 src/components/users/CreateMultipleUsers.tsx     |  2 +-
 src/env/schema.mjs                               | 16 ++++++++++++++--
 src/server/trpc/router/member/index.ts           |  6 +++---
 .../createManyUsers.ts}                          |  4 ++--
 src/server/trpc/router/users/index.ts            |  2 ++
 src/utils/storage.ts                             | 15 +++++++++++++++
 7 files changed, 46 insertions(+), 11 deletions(-)
 rename src/server/trpc/router/{member/createMultipleUsers.ts => users/createManyUsers.ts} (94%)
 create mode 100644 src/utils/storage.ts

diff --git a/src/components/profile/UploadImageButton.tsx b/src/components/profile/UploadImageButton.tsx
index 930cd86d..35b214bb 100644
--- a/src/components/profile/UploadImageButton.tsx
+++ b/src/components/profile/UploadImageButton.tsx
@@ -7,7 +7,8 @@ import { type QueryObserverResult } from '@tanstack/react-query'
 import { Message } from '~/constant/messages'
 
 // TODO: Fix the environment variables.
-
+import { storage } from '~/utils/storage'
+import { ref, uploadBytes, getDownloadURL } from 'firebase/storage'
 
 const UploadImageBtn = ({
   studentId,
@@ -31,8 +32,13 @@ const UploadImageBtn = ({
           title: Message.IMAGE_UPLOAD_LOADING,
           status: 'loading',
         })
-
-
+        const storageRef = ref(storage, `${studentId}/image/profile_pic`)
+        await uploadBytes(storageRef, e.target.files[0] as File)
+        const image = await getDownloadURL(storageRef)
+        await mutateAsync({
+          studentId,
+          image,
+        })
         await refetch()
         toast({
           duration: 3000,
diff --git a/src/components/users/CreateMultipleUsers.tsx b/src/components/users/CreateMultipleUsers.tsx
index af2bad68..fdd0c603 100644
--- a/src/components/users/CreateMultipleUsers.tsx
+++ b/src/components/users/CreateMultipleUsers.tsx
@@ -11,7 +11,7 @@ const CreateMultipleUsers = () => {
   const toast = useToast()
   const [users, setUsers] = useState<AddUsersType[]>([])
 
-  const { isLoading, mutateAsync } = trpc.member.addMultipleUsers.useMutation()
+  const { isLoading, mutateAsync } = trpc.user.createManyUsers.useMutation()
 
   const handleFile = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
     if (e.target.files && e.target.files.length && e.target.files[0]) {
diff --git a/src/env/schema.mjs b/src/env/schema.mjs
index df7d76bb..952589b0 100644
--- a/src/env/schema.mjs
+++ b/src/env/schema.mjs
@@ -37,7 +37,14 @@ export const serverSchema = z.object({
  * This way you can ensure the app isn't built with invalid env vars.
  * To expose them to the client, prefix them with `NEXT_PUBLIC_`.
  */
-export const clientSchema = z.object({});
+export const clientSchema = z.object({
+  NEXT_PUBLIC_APP_ID: z.string(),
+  NEXT_PUBLIC_MESSAGING_SENDER_ID: z.string(),
+  NEXT_PUBLIC_API_KEY: z.string(),
+  NEXT_PUBLIC_AUTH_DOMAIN: z.string(),
+  NEXT_PUBLIC_PROJECT_ID: z.string(),
+  NEXT_PUBLIC_STORAGE_BUCKET: z.string()
+});
 
 /**
  * You can't destruct `process.env` as a regular object, so you have to do
@@ -46,5 +53,10 @@ export const clientSchema = z.object({});
  * @type {{ [k in keyof z.infer<typeof clientSchema>]: z.infer<typeof clientSchema>[k] | undefined }}
  */
 export const clientEnv = {
-  // NEXT_PUBLIC_CLIENTVAR: process.env.NEXT_PUBLIC_CLIENTVAR,
+  NEXT_PUBLIC_APP_ID: process.env.NEXT_PUBLIC_APP_ID,
+  NEXT_PUBLIC_MESSAGING_SENDER_ID: process.env.NEXT_PUBLIC_MESSAGING_SENDER_ID,
+  NEXT_PUBLIC_API_KEY: process.env.NEXT_PUBLIC_API_KEY,
+  NEXT_PUBLIC_AUTH_DOMAIN: process.env.NEXT_PUBLIC_AUTH_DOMAIN,
+  NEXT_PUBLIC_PROJECT_ID: process.env.NEXT_PUBLIC_PROJECT_ID,
+  NEXT_PUBLIC_STORAGE_BUCKET: process.env.NEXT_PUBLIC_STORAGE_BUCKET
 };
diff --git a/src/server/trpc/router/member/index.ts b/src/server/trpc/router/member/index.ts
index 15c6eff3..aa37d709 100644
--- a/src/server/trpc/router/member/index.ts
+++ b/src/server/trpc/router/member/index.ts
@@ -6,11 +6,11 @@ import {
   updateMemberContacts,
 } from './update'
 import { deleteMemberImage } from './delete'
-import {  createSingleUser } from './createSingleUser'
-import { createMultipleUsers } from './createMultipleUsers'
+import { createSingleUser } from './createSingleUser'
+import { createManyUsers } from '../users/createManyUsers'
 
 export const memberRouter = router({
-  createMultipleUsers,
+  createManyUsers,
   createSingleUser,
   deleteMemberImage,
   getAllUsers,
diff --git a/src/server/trpc/router/member/createMultipleUsers.ts b/src/server/trpc/router/users/createManyUsers.ts
similarity index 94%
rename from src/server/trpc/router/member/createMultipleUsers.ts
rename to src/server/trpc/router/users/createManyUsers.ts
index 74832888..04803a4e 100644
--- a/src/server/trpc/router/member/createMultipleUsers.ts
+++ b/src/server/trpc/router/users/createManyUsers.ts
@@ -3,14 +3,14 @@ import { z } from 'zod'
 import { randomBytes } from 'crypto'
 import { hash } from 'bcryptjs'
 
-import { sendMultipleEmails } from './helper'
+import { sendMultipleEmails } from '../member/helper'
 import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
 import { db } from '~/server/db/firebase'
 import type { User } from '~/server/db/models/User'
 import logCollection from '~/server/db/collections/LogCollection'
 import { Timestamp } from 'firebase/firestore'
 
-export const createMultipleUsers = protectedProcedure
+export const createManyUsers = protectedProcedure
   .input(
     z.array(
       z.object({
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index 5a884dbb..0d580d03 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -5,6 +5,7 @@ import { resetPassword } from './resetPassword'
 import { changePassword } from './changePassword'
 import { getAllUsersForTable } from './getAllUsersForTable'
 import { getUserProfile } from './getUserProfile'
+import { createManyUsers } from './createManyUsers'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -29,6 +30,7 @@ const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
 
 export const userRouter = router({
   changePassword,
+  createManyUsers,
   getAllUsers,
   getAllUsersForTable,
   getUserProfile,
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
new file mode 100644
index 00000000..20a8adc7
--- /dev/null
+++ b/src/utils/storage.ts
@@ -0,0 +1,15 @@
+import { initializeApp } from 'firebase/app'
+import { getStorage } from 'firebase/storage'
+import { env } from '~/env/client.mjs'
+
+const firebaseConfig = {
+  apiKey: env.NEXT_PUBLIC_API_KEY,
+  authDomain: env.NEXT_PUBLIC_AUTH_DOMAIN,
+  projectId: env.NEXT_PUBLIC_PROJECT_ID,
+  storageBucket: env.NEXT_PUBLIC_STORAGE_BUCKET,
+  messagingSenderId: env.NEXT_PUBLIC_MESSAGING_SENDER_ID,
+  appId: env.NEXT_PUBLIC_APP_ID,
+}
+
+const app = initializeApp(firebaseConfig)
+export const storage = getStorage(app)

From ff8933aea20719ff04a3590c990a92f4055e430c Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 09:57:02 +0800
Subject: [PATCH 040/223] Migrate the getUserImage and updateUserImage

---
 src/components/profile/ProfileCard.tsx        | 14 +++-
 src/components/profile/UploadImageButton.tsx  | 65 ++++++++++---------
 src/server/trpc/router/member/index.ts        |  4 +-
 src/server/trpc/router/users/getUserImage.ts  |  9 +++
 src/server/trpc/router/users/index.ts         |  4 ++
 .../update.ts => users/updateUserImage.ts}    | 15 ++---
 6 files changed, 65 insertions(+), 46 deletions(-)
 create mode 100644 src/server/trpc/router/users/getUserImage.ts
 rename src/server/trpc/router/{member/update.ts => users/updateUserImage.ts} (84%)

diff --git a/src/components/profile/ProfileCard.tsx b/src/components/profile/ProfileCard.tsx
index becab063..2dabd918 100644
--- a/src/components/profile/ProfileCard.tsx
+++ b/src/components/profile/ProfileCard.tsx
@@ -25,14 +25,18 @@ const ProfileCard = ({
   const router = useRouter()
   const redirectToResetPassword = () => router.push('/auth/forgetpassword')
 
-  const { isLoading, data } = trpc.member.getMemberImage.useQuery(studentId)
+  const {
+    isLoading,
+    data,
+    refetch: refetchImage,
+  } = trpc.user.getUserImage.useQuery(studentId)
 
   return (
     <Box className="mb-10 flex flex-col items-center">
       <Box className="relative">
         <Image
           alt="profile-pic"
-          src={isLoading || !data || !data.image ? DEFAULT_IMAGE : data.image}
+          src={isLoading || !data ? DEFAULT_IMAGE : data}
           fallbackSrc={DEFAULT_IMAGE}
           objectFit="cover"
           borderRadius="full"
@@ -40,7 +44,11 @@ const ProfileCard = ({
         />
         {session?.user?.id === studentId ? (
           <Box className="absolute bottom-0 right-0">
-            <UploadImageBtn refetch={refetch} studentId={studentId} />
+            <UploadImageBtn
+              refetchImage={refetchImage}
+              refetch={refetch}
+              studentId={studentId}
+            />
           </Box>
         ) : null}
       </Box>
diff --git a/src/components/profile/UploadImageButton.tsx b/src/components/profile/UploadImageButton.tsx
index 35b214bb..4f15002c 100644
--- a/src/components/profile/UploadImageButton.tsx
+++ b/src/components/profile/UploadImageButton.tsx
@@ -1,4 +1,4 @@
-import { type ChangeEvent, useRef } from 'react'
+import { type ChangeEvent, useRef, useCallback } from 'react'
 import { trpc } from '../../utils/trpc'
 import { IconContext } from 'react-icons'
 import { Button, useToast } from '@chakra-ui/react'
@@ -13,49 +13,54 @@ import { ref, uploadBytes, getDownloadURL } from 'firebase/storage'
 const UploadImageBtn = ({
   studentId,
   refetch,
+  refetchImage
 }: {
   studentId: string
   refetch: () => Promise<QueryObserverResult>
+  refetchImage: () => Promise<QueryObserverResult>
 }) => {
   const toast = useToast()
   // trigger a click event on the file input element when button is clicked
   const uploadRef = useRef<HTMLInputElement>(null)
-  const { mutateAsync } = trpc.member.updateMemberImage.useMutation()
+  const { mutateAsync } = trpc.user.updateUserImage.useMutation()
   const onUpload = () => {
     uploadRef.current?.click()
   }
-  const handleFileSelected = async (e: ChangeEvent<HTMLInputElement>) => {
-    try {
-      if (e.target.files) {
-        toast({
-          duration: 1000,
-          title: Message.IMAGE_UPLOAD_LOADING,
-          status: 'loading',
-        })
-        const storageRef = ref(storage, `${studentId}/image/profile_pic`)
-        await uploadBytes(storageRef, e.target.files[0] as File)
-        const image = await getDownloadURL(storageRef)
-        await mutateAsync({
-          studentId,
-          image,
-        })
-        await refetch()
+  const handleFileSelected = useCallback(
+    async (e: ChangeEvent<HTMLInputElement>) => {
+      try {
+        if (e.target.files) {
+          toast({
+            duration: 1000,
+            title: Message.IMAGE_UPLOAD_LOADING,
+            status: 'loading',
+          })
+          const storageRef = ref(storage, `${studentId}/image/profile_pic`)
+          await uploadBytes(storageRef, e.target.files[0] as File)
+          const image = await getDownloadURL(storageRef)
+          await mutateAsync({
+            studentId,
+            image,
+          })
+          await refetchImage()
+          toast({
+            duration: 3000,
+            description: Message.IMAGE_UPLOAD_SUCCESS,
+            title: 'Success',
+            status: 'success',
+          })
+        }
+      } catch (e) {
         toast({
           duration: 3000,
-          description: Message.IMAGE_UPLOAD_SUCCESS,
-          title: 'Success',
-          status: 'success',
+          description: Message.IMAGE_UPLOAD_ERROR,
+          status: 'error',
+          title: 'Something went wrong',
         })
       }
-    } catch (e) {
-      toast({
-        duration: 3000,
-        description: Message.IMAGE_UPLOAD_ERROR,
-        status: 'error',
-        title: 'Something went wrong',
-      })
-    }
-  }
+    },
+    [refetch, studentId, mutateAsync, toast]
+  )
   return (
     <Button
       variant="ghost"
diff --git a/src/server/trpc/router/member/index.ts b/src/server/trpc/router/member/index.ts
index aa37d709..8e9f975b 100644
--- a/src/server/trpc/router/member/index.ts
+++ b/src/server/trpc/router/member/index.ts
@@ -1,10 +1,9 @@
 import { router } from '~/server/trpc/trpc'
 import { getMemberProfile, getMemberImage, getRoles, getAllUsers } from './read'
 import {
-  updateMemberImage,
   updateProfile,
   updateMemberContacts,
-} from './update'
+} from '../users/updateUserImage'
 import { deleteMemberImage } from './delete'
 import { createSingleUser } from './createSingleUser'
 import { createManyUsers } from '../users/createManyUsers'
@@ -17,7 +16,6 @@ export const memberRouter = router({
   getMemberImage,
   getMemberProfile,
   getRoles,
-  updateMemberImage,
   updateProfile,
   updateMemberContacts,
 })
diff --git a/src/server/trpc/router/users/getUserImage.ts b/src/server/trpc/router/users/getUserImage.ts
new file mode 100644
index 00000000..16d624e6
--- /dev/null
+++ b/src/server/trpc/router/users/getUserImage.ts
@@ -0,0 +1,9 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const getUserImage = protectedProcedure
+  .input(z.string())
+  .query(async ({ input }) => {
+    return (await userCollection.getById(input)).image
+  })
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index 0d580d03..63c70539 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -6,6 +6,8 @@ import { changePassword } from './changePassword'
 import { getAllUsersForTable } from './getAllUsersForTable'
 import { getUserProfile } from './getUserProfile'
 import { createManyUsers } from './createManyUsers'
+import { updateUserImage } from './updateUserImage'
+import { getUserImage } from './getUserImage'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -33,6 +35,8 @@ export const userRouter = router({
   createManyUsers,
   getAllUsers,
   getAllUsersForTable,
+  getUserImage,
   getUserProfile,
   resetPassword,
+  updateUserImage
 })
diff --git a/src/server/trpc/router/member/update.ts b/src/server/trpc/router/users/updateUserImage.ts
similarity index 84%
rename from src/server/trpc/router/member/update.ts
rename to src/server/trpc/router/users/updateUserImage.ts
index 80219db1..7011fb91 100644
--- a/src/server/trpc/router/member/update.ts
+++ b/src/server/trpc/router/users/updateUserImage.ts
@@ -1,24 +1,19 @@
 import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
+import userCollection from '~/server/db/collections/UserCollection'
 
-export const updateMemberImage = protectedProcedure
+export const updateUserImage = protectedProcedure
   .input(
     z.object({
       image: z.string(),
       studentId: z.string(),
     })
   )
-  .mutation(async ({ ctx, input }) => {
-    const user = await ctx.prisma.user.update({
-      where: {
-        id: input.studentId,
-      },
-      data: {
-        image: input.image,
-      },
+  .mutation(async ({ input }) => {
+    await userCollection.update(input.studentId, {
+      image: input.image,
     })
-    return user
   })
 
 export const updateProfile = protectedProcedure

From 86ceaab1621563f1c38f25f910285d61625cab9c Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 10:27:36 +0800
Subject: [PATCH 041/223] Add in a Storage Service

---
 src/components/profile/ProfileCard.tsx        | 13 +++-------
 src/components/profile/ProfileGrid.tsx        |  7 +-----
 src/components/profile/UploadImageButton.tsx  | 19 +++++++--------
 src/components/users/ProfileModal.tsx         |  8 ++++---
 src/components/users/SingleUserForm.tsx       |  2 +-
 src/server/trpc/router/member/delete.ts       | 24 -------------------
 src/server/trpc/router/member/index.ts        | 11 ++++-----
 .../{member => users}/createSingleUser.ts     |  2 +-
 .../trpc/router/users/deleteUserImage.ts      | 21 ++++++++++++++++
 src/server/trpc/router/users/index.ts         |  6 ++++-
 src/utils/storage.ts                          | 23 ++++++++++++++++--
 11 files changed, 70 insertions(+), 66 deletions(-)
 delete mode 100644 src/server/trpc/router/member/delete.ts
 rename src/server/trpc/router/{member => users}/createSingleUser.ts (95%)
 create mode 100644 src/server/trpc/router/users/deleteUserImage.ts

diff --git a/src/components/profile/ProfileCard.tsx b/src/components/profile/ProfileCard.tsx
index 2dabd918..5d87535a 100644
--- a/src/components/profile/ProfileCard.tsx
+++ b/src/components/profile/ProfileCard.tsx
@@ -3,7 +3,6 @@ import { Box, Button, Image, Text } from '@chakra-ui/react'
 import type { Session } from 'next-auth'
 import { useRouter } from 'next/router'
 import UploadImageBtn from './UploadImageButton'
-import { type QueryObserverResult } from '@tanstack/react-query'
 
 const DEFAULT_IMAGE = '/fintech_logo.png'
 
@@ -13,14 +12,12 @@ const ProfileCard = ({
   role,
   studentId,
   session,
-  refetch,
 }: {
   name: string | null
   dept: string | null
   role: string | null
   studentId: string
   session: Session
-  refetch: () => Promise<QueryObserverResult>
 }) => {
   const router = useRouter()
   const redirectToResetPassword = () => router.push('/auth/forgetpassword')
@@ -42,15 +39,11 @@ const ProfileCard = ({
           borderRadius="full"
           boxSize="170px"
         />
-        {session?.user?.id === studentId ? (
+        {session?.user?.id === studentId ?? (
           <Box className="absolute bottom-0 right-0">
-            <UploadImageBtn
-              refetchImage={refetchImage}
-              refetch={refetch}
-              studentId={studentId}
-            />
+            <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
           </Box>
-        ) : null}
+        )}
       </Box>
       <Box className="flex flex-col items-center py-2">
         <Text textColor="##FFFFFF" className="text-2xl font-medium">
diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index c614097b..260518e2 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -27,7 +27,6 @@ const ProfileGrid = ({
     <div className="m-10 grid grid-cols-1 grid-rows-3 place-items-center gap-y-6 md:grid-cols-3">
       <div className="row-span-3 h-full w-3/4 max-w-md bg-[#01003D] md:place-self-end">
         <ProfileCard
-          refetch={refetch}
           name={data.name}
           dept={data.department}
           role={data.role}
@@ -36,11 +35,7 @@ const ProfileGrid = ({
         />
       </div>
       <div className="col-span-2 w-3/4">
-        <ProfileContactInfo
-          studentId={studentId}
-          {...data}
-          refetch={refetch}
-        />
+        <ProfileContactInfo studentId={studentId} {...data} refetch={refetch} />
       </div>
       <div className="col-span-2 row-span-2 mb-10 w-3/4">
         {/* <ProfileInfo {...data} /> */}
diff --git a/src/components/profile/UploadImageButton.tsx b/src/components/profile/UploadImageButton.tsx
index 4f15002c..265b8cfe 100644
--- a/src/components/profile/UploadImageButton.tsx
+++ b/src/components/profile/UploadImageButton.tsx
@@ -5,18 +5,13 @@ import { Button, useToast } from '@chakra-ui/react'
 import EditIcon from './EditIcon'
 import { type QueryObserverResult } from '@tanstack/react-query'
 import { Message } from '~/constant/messages'
-
-// TODO: Fix the environment variables.
-import { storage } from '~/utils/storage'
-import { ref, uploadBytes, getDownloadURL } from 'firebase/storage'
+import { StorageService } from '~/utils/storage'
 
 const UploadImageBtn = ({
   studentId,
-  refetch,
-  refetchImage
+  refetchImage,
 }: {
   studentId: string
-  refetch: () => Promise<QueryObserverResult>
   refetchImage: () => Promise<QueryObserverResult>
 }) => {
   const toast = useToast()
@@ -35,9 +30,11 @@ const UploadImageBtn = ({
             title: Message.IMAGE_UPLOAD_LOADING,
             status: 'loading',
           })
-          const storageRef = ref(storage, `${studentId}/image/profile_pic`)
-          await uploadBytes(storageRef, e.target.files[0] as File)
-          const image = await getDownloadURL(storageRef)
+
+          const image = await StorageService.uploadFile(
+            e.target.files[0] as Blob,
+            `${studentId}/image/profile_pic`
+          )
           await mutateAsync({
             studentId,
             image,
@@ -59,7 +56,7 @@ const UploadImageBtn = ({
         })
       }
     },
-    [refetch, studentId, mutateAsync, toast]
+    [studentId, mutateAsync, toast, refetchImage]
   )
   return (
     <Button
diff --git a/src/components/users/ProfileModal.tsx b/src/components/users/ProfileModal.tsx
index 393d9616..96a577a7 100644
--- a/src/components/users/ProfileModal.tsx
+++ b/src/components/users/ProfileModal.tsx
@@ -34,6 +34,7 @@ import {
 } from '@chakra-ui/react'
 import Image from 'next/image'
 import type { Session } from 'next-auth'
+import { StorageService } from '~/utils/storage'
 
 const defaultImage = '/150.png'
 
@@ -148,7 +149,7 @@ const UploadImageBtn = ({
   const toast = useToast()
   // trigger a click event on the file input element when button is clicked
   const uploadRef = useRef<HTMLInputElement>(null)
-  const { mutateAsync } = trpc.member.updateMemberImage.useMutation()
+  const { mutateAsync } = trpc.user.updateUserImage.useMutation()
   const onUpload = () => {
     uploadRef.current?.click()
   }
@@ -206,7 +207,7 @@ const DeleteImageBtn = ({
   studentId: string
 }) => {
   const toast = useToast()
-  const { mutateAsync } = trpc.member.deleteMemberImage.useMutation({
+  const { mutateAsync } = trpc.user.deleteUserImage.useMutation({
     onSuccess: () => {
       setImage(defaultImage)
     },
@@ -215,7 +216,8 @@ const DeleteImageBtn = ({
   // DELETE IMAGE LOGIC
   const handleDelete = async () => {
     try {
-      await mutateAsync(studentId)
+      await StorageService.deleteFile(`${studentId}/image/profile_pic`)
+      await mutateAsync()
       toast({
         duration: 3000,
         description: 'Image successfully deleted.',
diff --git a/src/components/users/SingleUserForm.tsx b/src/components/users/SingleUserForm.tsx
index 178b57a7..20dbed46 100644
--- a/src/components/users/SingleUserForm.tsx
+++ b/src/components/users/SingleUserForm.tsx
@@ -156,7 +156,7 @@ const roles = [
 
 const SingleUserForm = () => {
   const router = useRouter()
-  const { mutateAsync, isLoading } = trpc.member.createSingleUser.useMutation()
+  const { mutateAsync, isLoading } = trpc.user.createSingleUser.useMutation()
   const toast = useToast()
   const [email, setEmail] = useState('')
   const [name, setName] = useState('')
diff --git a/src/server/trpc/router/member/delete.ts b/src/server/trpc/router/member/delete.ts
deleted file mode 100644
index aa9ad81a..00000000
--- a/src/server/trpc/router/member/delete.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { protectedProcedure } from '../../trpc'
-import { z } from 'zod'
-import { TRPCError } from '@trpc/server'
-
-export const deleteMemberImage = protectedProcedure
-  .input(z.string())
-  .mutation(async ({ ctx, input }) => {
-    try {
-      const user = await ctx.prisma.user.update({
-        where: {
-          id: input,
-        },
-        data: {
-          image: '',
-        },
-      })
-      return user
-    } catch (error) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: 'ERROR DELETING IMAGE' + error,
-      })
-    }
-  })
diff --git a/src/server/trpc/router/member/index.ts b/src/server/trpc/router/member/index.ts
index 8e9f975b..71812b64 100644
--- a/src/server/trpc/router/member/index.ts
+++ b/src/server/trpc/router/member/index.ts
@@ -1,17 +1,14 @@
 import { router } from '~/server/trpc/trpc'
 import { getMemberProfile, getMemberImage, getRoles, getAllUsers } from './read'
-import {
-  updateProfile,
-  updateMemberContacts,
-} from '../users/updateUserImage'
-import { deleteMemberImage } from './delete'
-import { createSingleUser } from './createSingleUser'
+import { updateProfile, updateMemberContacts } from '../users/updateUserImage'
+import { deleteUserImage } from '../users/deleteUserImage'
+import { createSingleUser } from '../users/createSingleUser'
 import { createManyUsers } from '../users/createManyUsers'
 
 export const memberRouter = router({
   createManyUsers,
   createSingleUser,
-  deleteMemberImage,
+  deleteUserImage,
   getAllUsers,
   getMemberImage,
   getMemberProfile,
diff --git a/src/server/trpc/router/member/createSingleUser.ts b/src/server/trpc/router/users/createSingleUser.ts
similarity index 95%
rename from src/server/trpc/router/member/createSingleUser.ts
rename to src/server/trpc/router/users/createSingleUser.ts
index a1f63903..ff594e92 100644
--- a/src/server/trpc/router/member/createSingleUser.ts
+++ b/src/server/trpc/router/users/createSingleUser.ts
@@ -1,7 +1,7 @@
 import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import { hash } from 'bcryptjs'
-import { checkIfUserExist, sendEmail } from './helper'
+import { checkIfUserExist, sendEmail } from '../member/helper'
 import userCollection from '~/server/db/collections/UserCollection'
 import logCollection from '~/server/db/collections/LogCollection'
 import { Timestamp } from 'firebase/firestore'
diff --git a/src/server/trpc/router/users/deleteUserImage.ts b/src/server/trpc/router/users/deleteUserImage.ts
new file mode 100644
index 00000000..ef43c642
--- /dev/null
+++ b/src/server/trpc/router/users/deleteUserImage.ts
@@ -0,0 +1,21 @@
+import { protectedProcedure } from '../../trpc'
+import { Timestamp } from 'firebase/firestore'
+import logCollection from '~/server/db/collections/LogCollection'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const deleteUserImage = protectedProcedure.mutation(
+  async ({ ctx }) => {
+    try {
+      return await userCollection.update(ctx.session.user.id, {
+        image: '',
+      })
+    } catch (e) {
+      await logCollection.add({
+        title: `Error deleting image for ${ctx.session.user.name}`,
+        description: (e as Error).message,
+        level: 'WARNING',
+        createdAt: Timestamp.fromDate(new Date()),
+      })
+    }
+  }
+)
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index 63c70539..bf5650a5 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -8,6 +8,8 @@ import { getUserProfile } from './getUserProfile'
 import { createManyUsers } from './createManyUsers'
 import { updateUserImage } from './updateUserImage'
 import { getUserImage } from './getUserImage'
+import { createSingleUser } from './createSingleUser'
+import { deleteUserImage } from './deleteUserImage'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -33,10 +35,12 @@ const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
 export const userRouter = router({
   changePassword,
   createManyUsers,
+  createSingleUser,
+  deleteUserImage,
   getAllUsers,
   getAllUsersForTable,
   getUserImage,
   getUserProfile,
   resetPassword,
-  updateUserImage
+  updateUserImage,
 })
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
index 20a8adc7..c3cd830b 100644
--- a/src/utils/storage.ts
+++ b/src/utils/storage.ts
@@ -1,5 +1,11 @@
 import { initializeApp } from 'firebase/app'
-import { getStorage } from 'firebase/storage'
+import {
+  ref,
+  getStorage,
+  uploadBytes,
+  getDownloadURL,
+  deleteObject,
+} from 'firebase/storage'
 import { env } from '~/env/client.mjs'
 
 const firebaseConfig = {
@@ -12,4 +18,17 @@ const firebaseConfig = {
 }
 
 const app = initializeApp(firebaseConfig)
-export const storage = getStorage(app)
+export class StorageService {
+  private static storage = getStorage(app)
+
+  static async uploadFile(file: Blob, pathName: string) {
+    const storageRef = ref(this.storage, pathName)
+    await uploadBytes(storageRef, file)
+    return await getDownloadURL(storageRef)
+  }
+
+  static async deleteFile(pathName: string) {
+    const storageRef = ref(this.storage, pathName)
+    await deleteObject(storageRef)
+  }
+}

From 333432b017d453aefeb76702130bed1f4906cbda Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 18:46:10 +0800
Subject: [PATCH 042/223] Complete the migration

---
 prisma/schema.prisma                          |  10 +-
 src/components/profile/ProfileContactInfo.tsx |   2 +-
 src/components/users/EditModal.tsx            |   2 +-
 src/components/users/ProfileModal.tsx         |  63 +++++------
 src/server/db/collections/BaseCollection.ts   |   2 -
 src/server/trpc/router/_app.ts                |   2 -
 src/server/trpc/router/member/index.ts        |  18 ---
 src/server/trpc/router/member/read.ts         | 106 ------------------
 .../trpc/router/users/getUserProfile.ts       |   4 +-
 src/server/trpc/router/users/index.ts         |   4 +
 .../trpc/router/users/updateUserContacts.ts   |  19 ++++
 .../trpc/router/users/updateUserImage.ts      |  52 ---------
 .../trpc/router/users/updateUserProfile.ts    |  20 ++++
 13 files changed, 81 insertions(+), 223 deletions(-)
 delete mode 100644 src/server/trpc/router/member/index.ts
 delete mode 100644 src/server/trpc/router/member/read.ts
 create mode 100644 src/server/trpc/router/users/updateUserContacts.ts
 create mode 100644 src/server/trpc/router/users/updateUserProfile.ts

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index c8f9e140..253e1a04 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -28,7 +28,6 @@ model Departments {
 
 model User {
   batch           String?
-  department      String       @default("")
   discord         String?
   email           String       @unique
   faculty         String?
@@ -42,13 +41,14 @@ model User {
   role            String
   telegram        String?
   total_events    Int?         @default(0)
-  wallet          String?
   year            String?
   isAdmin         Boolean?     @default(false)
+  wallet          String?
+  department      String       @default("")
+  AttendanceTaken Attendance[]
   events          Event[]      @relation("EventToUser")
   projects        Projects[]   @relation("ProjectsToUser")
   Attendance      Attendance[] @relation("attendanceToUser")
-  AttendanceTaken Attendance[]
 }
 
 model Event {
@@ -73,10 +73,10 @@ model Log {
 model Attendance {
   id      String @id
   eventId String
-  user    User   @relation(fields: [userId], references: [id])
+  userId  String
   Event   Event  @relation(fields: [eventId], references: [id])
+  user    User   @relation(fields: [userId], references: [id])
   User    User[] @relation("attendanceToUser")
-  userId  String
 }
 
 enum LogType {
diff --git a/src/components/profile/ProfileContactInfo.tsx b/src/components/profile/ProfileContactInfo.tsx
index bf0398b8..0e87d8b4 100644
--- a/src/components/profile/ProfileContactInfo.tsx
+++ b/src/components/profile/ProfileContactInfo.tsx
@@ -21,7 +21,7 @@ const ProfileContactInfo = (props: {
 }) => {
   const toast = useToast()
   const { isLoading: isSubmitting, mutateAsync } =
-    trpc.member.updateMemberContacts.useMutation()
+    trpc.user.updateUserContacts.useMutation()
 
   const [edit, setEdit] = useState(false)
   const onEdit = () => {
diff --git a/src/components/users/EditModal.tsx b/src/components/users/EditModal.tsx
index f70cf516..a513b77c 100644
--- a/src/components/users/EditModal.tsx
+++ b/src/components/users/EditModal.tsx
@@ -29,7 +29,7 @@ const EditModal: React.FC<editModalProps> = (props) => {
     mode: 'onSubmit',
   })
 
-  const { mutateAsync } = trpc.member.updateProfile.useMutation()
+  const { mutateAsync } = trpc.user.updateUserProfile.useMutation()
   const toast = useToast()
   const onSubmit = async (data: any) => {
     try {
diff --git a/src/components/users/ProfileModal.tsx b/src/components/users/ProfileModal.tsx
index 96a577a7..08f931d6 100644
--- a/src/components/users/ProfileModal.tsx
+++ b/src/components/users/ProfileModal.tsx
@@ -46,7 +46,7 @@ const ProfilePage = ({
   session: Session
 }) => {
   // TRPC USEQUERY HOOK: SET REFETCH TO FALSE TO CACHE THE DATA
-  const { data, isLoading, isError } = trpc.member.getMemberProfile.useQuery(
+  const { data, isLoading, isError } = trpc.user.getUserProfile.useQuery(
     studentId,
     {
       refetchOnWindowFocus: false,
@@ -57,48 +57,43 @@ const ProfilePage = ({
   if (isLoading) return <LoadingScreen />
 
   // IF THERE IS SOMETHING WRONG WITH FETCHING THE USER, THROW AN ERROR
-  if (!data || !data.user || isError) {
+  if (!data || isError) {
     return <p className="text-3xl">Something is wrong</p>
   }
 
   return (
     <div className="mt-4 flex flex-wrap justify-between gap-6">
-      <ProfileInfo {...data.user} />
+      {/* <ProfileInfo {...data} /> */}
       <div className="flex flex-col">
         <ProfilePicture studentId={studentId} session={session} />
-        <ProfileContactInfo {...data.user} />
+        {/* <ProfileContactInfo {...data} /> */}
       </div>
     </div>
   )
 }
 
-const ProfileContactInfo = (props: {
-  telegram: string | null
-  discord: string | null
-  personal_email: string | null
-  email: string
-}) => {
-  return (
-    <Box className="flex flex-col gap-1">
-      <Box className="flex items-center gap-1">
-        <BsTelegram className="fill-[#0088cc]" />
-        <p>{props.telegram}</p>
-      </Box>
-      <Box className="flex items-center gap-1">
-        <BsDiscord className="fill-[#5865F2]" />
-        <p>{props.discord}</p>
-      </Box>
-      <Box className="flex items-center gap-1">
-        <BsEnvelopeFill />
-        <p>{props.personal_email}</p>
-      </Box>
-      <Box className="flex items-center gap-1">
-        <BsEnvelopeFill className="fill-blue-300" />
-        <p>{props.email}</p>
-      </Box>
-    </Box>
-  )
-}
+// const ProfileContactInfo = (props: { email: string }) => {
+//   return (
+//     <Box className="flex flex-col gap-1">
+//       <Box className="flex items-center gap-1">
+//         <BsTelegram className="fill-[#0088cc]" />
+//         <p>{props.telegram}</p>
+//       </Box>
+//       <Box className="flex items-center gap-1">
+//         <BsDiscord className="fill-[#5865F2]" />
+//         <p>{props.discord}</p>
+//       </Box>
+//       <Box className="flex items-center gap-1">
+//         <BsEnvelopeFill />
+//         <p>{props.personal_email}</p>
+//       </Box>
+//       <Box className="flex items-center gap-1">
+//         <BsEnvelopeFill className="fill-blue-300" />
+//         <p>{props.email}</p>
+//       </Box>
+//     </Box>
+//   )
+// }
 
 const ProfilePicture = ({
   studentId,
@@ -109,11 +104,11 @@ const ProfilePicture = ({
 }) => {
   const [image, setImage] = useState(defaultImage)
 
-  trpc.member.getMemberImage.useQuery(studentId, {
+  trpc.user.getUserImage.useQuery(studentId, {
     refetchOnWindowFocus: false,
     onSuccess(data) {
-      if (!data || !data.image) return
-      setImage(data.image)
+      if (!data) return
+      setImage(data)
     },
   })
 
diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index 2c6d7e62..9ae8df89 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -16,8 +16,6 @@ import {
   type WhereFilterOp,
   type FieldPath,
   orderBy,
-  startAt,
-  endAt,
   limit,
   getCountFromServer,
 } from 'firebase/firestore'
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index f38a257f..4e900311 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -1,11 +1,9 @@
 import { router } from '../trpc'
-import { memberRouter } from './member'
 import { userRouter } from './users'
 import { attendanceRouter } from './attendance'
 
 export const appRouter = router({
   attendance: attendanceRouter,
-  member: memberRouter,
   user: userRouter,
 })
 
diff --git a/src/server/trpc/router/member/index.ts b/src/server/trpc/router/member/index.ts
deleted file mode 100644
index 71812b64..00000000
--- a/src/server/trpc/router/member/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { router } from '~/server/trpc/trpc'
-import { getMemberProfile, getMemberImage, getRoles, getAllUsers } from './read'
-import { updateProfile, updateMemberContacts } from '../users/updateUserImage'
-import { deleteUserImage } from '../users/deleteUserImage'
-import { createSingleUser } from '../users/createSingleUser'
-import { createManyUsers } from '../users/createManyUsers'
-
-export const memberRouter = router({
-  createManyUsers,
-  createSingleUser,
-  deleteUserImage,
-  getAllUsers,
-  getMemberImage,
-  getMemberProfile,
-  getRoles,
-  updateProfile,
-  updateMemberContacts,
-})
diff --git a/src/server/trpc/router/member/read.ts b/src/server/trpc/router/member/read.ts
deleted file mode 100644
index 70e0fa23..00000000
--- a/src/server/trpc/router/member/read.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { protectedProcedure } from '../../trpc'
-import { z } from 'zod'
-import { TRPCError } from '@trpc/server'
-
-export const getMemberProfile = protectedProcedure
-  .input(z.string())
-  .query(async ({ ctx, input }) => {
-    try {
-      const user = await ctx.prisma.user.findUnique({
-        where: {
-          id: input,
-        },
-        select: {
-          name: true,
-          gender: true,
-          batch: true,
-          year: true,
-          faculty: true,
-          image: true,
-          telegram: true,
-          discord: true,
-          email: true,
-          personal_email: true,
-          department: true,
-          role: true,
-          major: true,
-          projects: true,
-        },
-      })
-
-      if (!user) {
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'No user found',
-        })
-      }
-
-      return { user }
-    } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
-
-export const getMemberImage = protectedProcedure
-  .input(z.string())
-  .query(async ({ ctx, input }) => {
-    try {
-      const user = await ctx.prisma.user.findUnique({
-        where: {
-          id: input,
-        },
-        select: {
-          image: true,
-        },
-      })
-      return user
-    } catch (error) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: 'error retrieving image' + error,
-      })
-    }
-  })
-
-export const getRoles = protectedProcedure.query(async ({ ctx }) => {
-  try {
-    return await ctx.prisma.user.findMany({
-      where: {},
-      distinct: ['role'],
-      select: { role: true },
-    })
-  } catch (error) {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: 'error retrieving roles' + error,
-    })
-  }
-})
-
-export const getAllUsers = protectedProcedure
-  .input(
-    z.object({
-      roles: z.string(),
-    })
-  )
-  .query(async ({ ctx, input }) => {
-    try {
-      return await ctx.prisma.user.findMany({
-        where: {
-          role: input.roles,
-        },
-        select: {
-          name: true,
-          batch: true,
-        },
-      })
-    } catch (error) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: 'error retrieving users' + error,
-      })
-    }
-  })
diff --git a/src/server/trpc/router/users/getUserProfile.ts b/src/server/trpc/router/users/getUserProfile.ts
index f0764146..65b8c26b 100644
--- a/src/server/trpc/router/users/getUserProfile.ts
+++ b/src/server/trpc/router/users/getUserProfile.ts
@@ -5,9 +5,9 @@ import userCollection from '~/server/db/collections/UserCollection'
 
 export const getUserProfile = protectedProcedure
   .input(z.string())
-  .query(async ({ ctx }) => {
+  .query(async ({ input }) => {
     try {
-      return await userCollection.getById(ctx.session.user.id)
+      return await userCollection.getById(input)
     } catch (e) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index bf5650a5..508ff850 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -10,6 +10,8 @@ import { updateUserImage } from './updateUserImage'
 import { getUserImage } from './getUserImage'
 import { createSingleUser } from './createSingleUser'
 import { deleteUserImage } from './deleteUserImage'
+import { updateUserProfile } from './updateUserProfile'
+import { updateUserContacts } from './updateUserContacts'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -42,5 +44,7 @@ export const userRouter = router({
   getUserImage,
   getUserProfile,
   resetPassword,
+  updateUserContacts,
   updateUserImage,
+  updateUserProfile,
 })
diff --git a/src/server/trpc/router/users/updateUserContacts.ts b/src/server/trpc/router/users/updateUserContacts.ts
new file mode 100644
index 00000000..8ab98214
--- /dev/null
+++ b/src/server/trpc/router/users/updateUserContacts.ts
@@ -0,0 +1,19 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const updateUserContacts = protectedProcedure
+  .input(
+    z.object({
+      studentId: z.string(),
+      telegram: z.string(),
+      discord: z.string(),
+      personal_email: z.string(),
+      email: z.string(),
+    })
+  )
+  .mutation(async ({ ctx, input }) => {
+    return await userCollection.update(ctx.session.user.id, {
+      email: input.email,
+    })
+  })
diff --git a/src/server/trpc/router/users/updateUserImage.ts b/src/server/trpc/router/users/updateUserImage.ts
index 7011fb91..b81f4e85 100644
--- a/src/server/trpc/router/users/updateUserImage.ts
+++ b/src/server/trpc/router/users/updateUserImage.ts
@@ -1,6 +1,5 @@
 import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
-import { TRPCError } from '@trpc/server'
 import userCollection from '~/server/db/collections/UserCollection'
 
 export const updateUserImage = protectedProcedure
@@ -16,54 +15,3 @@ export const updateUserImage = protectedProcedure
     })
   })
 
-export const updateProfile = protectedProcedure
-  .input(
-    z.object({
-      id: z.string(),
-      name: z.string(),
-      role: z.string(),
-      department: z.string(),
-    })
-  )
-  .mutation(async ({ ctx, input }) => {
-    await ctx.prisma.user.update({
-      where: { id: input.id },
-      data: {
-        department: input.department,
-        name: input.name,
-        role: input.role,
-      },
-    })
-  })
-
-export const updateMemberContacts = protectedProcedure
-  .input(
-    z.object({
-      studentId: z.string(),
-      telegram: z.string(),
-      discord: z.string(),
-      personal_email: z.string(),
-      email: z.string(),
-    })
-  )
-  .mutation(async ({ ctx, input }) => {
-    try {
-      const user = await ctx.prisma.user.update({
-        where: {
-          id: input.studentId,
-        },
-        data: {
-          telegram: input.telegram,
-          discord: input.discord,
-          personal_email: input.personal_email,
-          email: input.email,
-        },
-      })
-      return user
-    } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
diff --git a/src/server/trpc/router/users/updateUserProfile.ts b/src/server/trpc/router/users/updateUserProfile.ts
new file mode 100644
index 00000000..9d36492b
--- /dev/null
+++ b/src/server/trpc/router/users/updateUserProfile.ts
@@ -0,0 +1,20 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const updateUserProfile = protectedProcedure
+  .input(
+    z.object({
+      id: z.string(),
+      name: z.string(),
+      role: z.string(),
+      department: z.string(),
+    })
+  )
+  .mutation(async ({ ctx, input }) => {
+    await userCollection.update(ctx.session.user.id, {
+      department: input.department,
+      name: input.name,
+      role: input.role,
+    })
+  })

From c269cced9cfec4df422d1cb114207e786443f215 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Tue, 30 May 2023 22:32:09 +0800
Subject: [PATCH 043/223] add the applicants status page and the tasks page

---
 Atlas.zip                               | Bin 0 -> 3074 bytes
 prisma/schema.prisma                    |  12 +-
 public/images/Ellipse 1.svg             |   3 +
 public/images/applicants_background.svg |  15 ++
 public/images/black_logo.svg            |   9 +
 public/images/blue_dot.svg              |   3 +
 public/images/pink_dot.svg              |   3 +
 public/images/red_dot.svg               |   3 +
 public/images/tasks_background.svg      |  15 ++
 public/images/yellow_dot.svg            |   3 +
 src/components/common/TopNavbar.tsx     |   6 +
 src/pages/application_status/index.tsx  | 194 ++++++++++++++++++
 src/pages/tasks/index.tsx               | 253 ++++++++++++++++++++++++
 13 files changed, 515 insertions(+), 4 deletions(-)
 create mode 100644 Atlas.zip
 create mode 100644 public/images/Ellipse 1.svg
 create mode 100644 public/images/applicants_background.svg
 create mode 100644 public/images/black_logo.svg
 create mode 100644 public/images/blue_dot.svg
 create mode 100644 public/images/pink_dot.svg
 create mode 100644 public/images/red_dot.svg
 create mode 100644 public/images/tasks_background.svg
 create mode 100644 public/images/yellow_dot.svg
 create mode 100644 src/pages/application_status/index.tsx
 create mode 100644 src/pages/tasks/index.tsx

diff --git a/Atlas.zip b/Atlas.zip
new file mode 100644
index 0000000000000000000000000000000000000000..5e7a95b030b6eff75fe1ae2cb1c7bb45fc348ca9
GIT binary patch
literal 3074
zcmZve2{csw8^_0tHG5M=$TBF(T7<H^wqh`2DO*FmdPBlAGX_KPGO~@eG&Ez$WSeXu
z#E=w5b|GtI5@{-mnh^b^^RGYWfA6{H+<VXY{LXXE=RD8zwY36q?g9V+yZ|*k-LdYB
zP~P>;uk6j|=U>N*7XnZiHEf`lc0z?vq{bfephwI%bpt#;)aWDPe$L2!6V^o!EdAoN
z^bMy-EuSVRSTcTJ#0QbYmUqrWyeG%|&En=9B3pePMW2Ck7;pSdnR=lYXBeD#KP)px
zkt|+F6zM{Kek3quH)y6{FFj7Z?cV=b_EUv+(OpAay?}wikH(iD%7kFK7A9ijOdi{9
z#mdSZD|*fW0K5hP00O^@Rn`1iuA4)%|G0)gBl|G#f`0TKMVQ1pAf<vD^KtB{KNne%
zqw;|>p+3h5#+QZT_I(|PfKJKd)>msH@a%wzB+x-2knb?P`>U>y3HM|mYh`?CO;<$Z
zf$s8~bM*BvDWTq&FMx$6cFZt(L^@ghoMSOQ8!dKqqsoN~>N@)AY4^~V&ev#u#Op<Z
ztY$%o%r1NT*eE+?g!12sq9*1qG9&bs?|bCi^WPt%XdXq#wa2;IR^3~tIba`Cqs{lk
z=f~<>zJZrU-8kG5+(C=9RI#M;N@zquNlk(Gb~~2cDamq$iX{Qbph4f(f3h&`Ssh&#
zEh&kE54$3BxyLWS?TQ=V`Pl)QqCVHj@XGj7pR+1=M5|-1YwpfRDv4XtK?R)_d=9B3
z)tvW5dkzRaPiyvCi~fjE%C8{K!~JTP^JZ;NxcY#-6jU75CGVmks0;JAxv-^A*o~c0
zig5<QCXt6$K6a6>vhn-BFY+hxXEc;32A734+YFi*9(IrPI;A%99#eT@-dHE3`32`(
z2tj{VFkphrLZTWNSJlL<Avi;X^b-2)ePqi@T1Z!6uxR0%bMhO-(;)4u?IEXx*G<-!
ztyXBW<x?nB%&nL8fouL{8^G=EKckvmdp6y_*zW$wFZTwh@xKIKE**|#!Ivy1_m{^W
zG23?}?{c(17jujodBP$=$*5_N@yv$DID~P~(C|jk+C~LodJ!`kBv;VR@pb&EfA~Dm
ziEj}-BE+8SRTB|OKxZU{%Oo+>GJ6XB{_Qnl41_|yrgyT~-JasyQk=agx*)i}Z6JnD
z86Q5EZqN`g&0`EzF`tPORKD03Nki}zA1Z=k)kNeGn#vi1R3m6cSDqIs?%Cez<2Mrz
z9Dr!e5yO>V6g3X&g5@P_XkK-1F|LigTo6qrlZm5}iKa<-(#bfpB;wfv5UXqG)Knd(
zGu8(^o;e@Q*qs({?h;yDC3zuDDz{)X0g|F!rw5h9niXHm(_iI)J4fNPK87I;F6`dR
zP&CC{e}_9s>IbJqlBwyaV;K3m{P!qyx9dyyk9P<A!NFk6^`h)2x5*8bOqU_gGi~JT
z0$TmO8DFWKx<j7I$^0~wk@{Sp{ke*=J1Fha=KPtx$zhJ4Jpu)5JWEC-huTYtsw3nE
z51GGS*YrPdmP9@su!i_kf{4`@oi*KFR`2(zz%e99#dSE%^bs5yf*sxPYYErBn)?|t
zbSlK%zppn?xarnE!op(5!us3zgMyYI+r3}@>~>^e)BEIh???aZeL~}>cV3)Ya^54N
zuIYrFX}#xLN7?ixj$!&8P3HIS_LcdUkB{!jX=h8*#%tLi6~-K1LLgKOG_VnzG20xg
z3tC{TW5QR&1vreKnHq%YWy1-2=XydxGEIoN+Ggve@2h^bXGvTTV!BaGmPkLmld>g!
ziL;lmV*CmkADR|51N!!_;Y@#MSC8?ccxl+}e9xPvlvZF2=d-(sJxS0SkDHUHkHsB2
zvb(ZYtYj#h>q^4iZe*&a2gWcGdl_+{?X9@JUb|SMQwbYiS|1qkIM*ZVl;U0Vpu3O*
zO;XXZ<Y|gYUl^>)!%FIwR)qJEb)YqV?@1-O=uEk_Gowy#GN{zsN;LNb>R5(}D9@Pe
z9`Nb20E1npQ>3cX9b%porN!5H04=#mX}h#`!8~3ubCWwFPSw;YfevPvIl%Wj<prL9
zPE;F;&P=thNya_tI9XDSfJze*g(bb;2MuGr^UEt(%_B-*X4)Py%x!p3_Mw$4eHXN8
z5tQqyqxv7wpTeJR%127N5n0YUzLNOP>RWF$-G-{q_|(<-7}PkS{mjpnsa}CVo;RKR
z&X@+DHpE@KQ@BbBt6_g@r7y0#cfn<l_~0O&aE|Tr%UKW4_ioCc-!5P4m;4I<E%|$+
zPNWx@#odTUM%OF-YI=;G%#}ud3HhG6^hz7If#ze`E8p5r!D`D<JQ>M|frl()z#{@W
zTtDF^G*xIaX>En|=Gw5R$e^xDQ%-W>K-r0NJ!?Xf;W<6!bpOnPboFaSy+?ZzHvLb6
z?aDvDeA)e>v;0z2p&OeZ3&~TMZ}!SlO5p?Hr9E190~KQIfCOw9ALHN2`C-fGSAAal
z8s@Iw1NO5hV$_5GkT_R?-MCczE2db%=lnFFT#2@klie(5DzFH)y!$~!Wyf)W(W9|9
zs|m4X3LKX1G6K&!Q?9zwRWl;n?1lJsMBB&|P(%mKOakMQb;&PI2!>3o@D_&Q%=S53
zv8=gI**6-WAHv~yec)Eb#~FFL+8W*%T#(>u=HXFHU5IkVwdrOwZ8m`5d@q{c?vRfB
z98ybXrdo|V_l7jd1`HF8`()>K=SuyQGvOlYM=niAN<zG(RBU3*KX{(ePMH>)m_@f9
zSCJoAQ1vGGJExyVo=s`>jfiGp5-$^LGxjG$&%f(|r?tLs(e84>2HLB7&ON++^ZSDA
z25TBL6kZg9NFL8$z2vk6#(v9g!Zl7dhVU%-@0|8Na<hW{o8o7-i`U+{>5(U)%0D-K
zvARLPuymkgpNde5Vynd9`ggme`4T!OJ`BMORlu>oJ|bNDfstNQE3nv~Fuv}u&vvW+
zv9R`G`O4~BI)Fn$@B^!SeY!7*F@PR#W-L7YRJzc%wDN`JdDI3BPbf5^3tksF7KjfD
z$Ff(K^q*KwU8}XaFE+bu#${^H>#SQ$l2a^!UXj#@*8sOzR53}mx|br0xTyX2@Ul!7
zc$CXwTfQpCLykTBGWMpWI;2Ki&dhhwoZAIWf5I)#XSxdrvq-JP7gY@^NI|^^U0|Z}
zV1g(1md2$X(*k`fh-nHD`5->-cCH1W=5?MaE#3QuEz!+kKyk!gG1^vEll$3`mOHBA
zc?lh*T%=AaZ=0_<b)C$gre($y<HtO<_BAX@JJ5LkM2Djt7}hU`@vHj_6rV*<vZTDA
z@6GQrH@{z`-+f^=9!AbNOcCu)CVDPbbp|cc%bguH9@1_ht;-+2acQ+0xrKB^x4t+C
z2^G#-mM$L|TX2<0#2OxF_?47>Nj)(qS;4$wGe?=pR3D39k?4U8>P<~)XOhAtKjp+A
z>{m~J(bQL0e;3o#sXpBd3uhhsx;O@EXj<X7wc-Ho*-D@PKa*}Iz5luXB-EYU&Up9-
zD&2hj#r+D4JIS5l;txp!{wBAg#!hnQdiq1=a{eZ_meo#j=WP2!W^?~0w<g_Aa%Xe=
eA=7z(lUuD~YsIyB768D#dAn}5(~X}IAMhWqhdv7c

literal 0
HcmV?d00001

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 3717c9ae..881bfe99 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -42,13 +42,12 @@ model User {
   role            String
   telegram        String?
   total_events    Int?         @default(0)
-  wallet          String?
   year            String?
   isAdmin         Boolean?     @default(false)
+  AttendanceTaken Attendance[]
   events          Event[]      @relation("EventToUser")
   projects        Projects[]   @relation("ProjectsToUser")
   Attendance      Attendance[] @relation("attendanceToUser")
-  AttendanceTaken Attendance[]
 }
 
 model Event {
@@ -73,10 +72,15 @@ model Log {
 model Attendance {
   id      String @id
   eventId String
-  user    User   @relation(fields: [userId], references: [id])
+  userId  String
   Event   Event  @relation(fields: [eventId], references: [id])
+  user    User   @relation(fields: [userId], references: [id])
   User    User[] @relation("attendanceToUser")
-  userId  String
+}
+
+model EmailTemplates {
+  template String
+  type     String @id @unique
 }
 
 enum LogType {
diff --git a/public/images/Ellipse 1.svg b/public/images/Ellipse 1.svg
new file mode 100644
index 00000000..8b4bb861
--- /dev/null
+++ b/public/images/Ellipse 1.svg	
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#46FFDE"/>
+</svg>
diff --git a/public/images/applicants_background.svg b/public/images/applicants_background.svg
new file mode 100644
index 00000000..be2d9c8a
--- /dev/null
+++ b/public/images/applicants_background.svg
@@ -0,0 +1,15 @@
+<svg width="1512" height="982" viewBox="0 0 1512 982" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_2)">
+<path d="M1512 0H0V982H1512V0Z" fill="#DEF4FF"/>
+<path d="M0 731.59L28.056 720.461C55.944 709.168 112.056 686.909 168 697.711C223.944 708.677 280.056 752.867 336 761.541C391.944 770.379 448.056 743.538 504 742.228C559.944 740.919 616.056 764.814 672 777.908C727.944 791.001 784.056 793.292 840 786.909C895.944 780.69 952.056 765.96 1008 744.683C1063.94 723.407 1120.06 695.583 1176 686.909C1231.94 678.071 1288.06 688.546 1344 690.673C1399.94 692.801 1456.06 686.909 1483.94 683.799L1512 680.853V983.637H1483.94C1456.06 983.637 1399.94 983.637 1344 983.637C1288.06 983.637 1231.94 983.637 1176 983.637C1120.06 983.637 1063.94 983.637 1008 983.637C952.056 983.637 895.944 983.637 840 983.637C784.056 983.637 727.944 983.637 672 983.637C616.056 983.637 559.944 983.637 504 983.637C448.056 983.637 391.944 983.637 336 983.637C280.056 983.637 223.944 983.637 168 983.637C112.056 983.637 55.944 983.637 28.056 983.637H0V731.59Z" fill="#97AEFF"/>
+<path d="M0 739.773L28.056 736.5C55.944 733.227 112.056 726.68 168 722.588C223.944 718.497 280.056 716.86 336 713.914C391.944 710.804 448.056 706.549 504 701.803C559.944 697.22 616.056 692.31 672 709.495C727.944 726.68 784.056 765.96 840 768.742C895.944 771.361 952.056 737.646 1008 726.189C1063.94 714.732 1120.06 725.534 1176 745.993C1231.94 766.451 1288.06 796.566 1344 788.546C1399.94 780.69 1456.06 734.863 1483.94 711.95L1512 689.037V983.637H1483.94C1456.06 983.637 1399.94 983.637 1344 983.637C1288.06 983.637 1231.94 983.637 1176 983.637C1120.06 983.637 1063.94 983.637 1008 983.637C952.056 983.637 895.944 983.637 840 983.637C784.056 983.637 727.944 983.637 672 983.637C616.056 983.637 559.944 983.637 504 983.637C448.056 983.637 391.944 983.637 336 983.637C280.056 983.637 223.944 983.637 168 983.637C112.056 983.637 55.944 983.637 28.056 983.637H0V739.773Z" fill="#758DD8"/>
+<path d="M0 805.24L28.056 814.569C55.944 823.734 112.056 842.392 168 843.374C223.944 844.52 280.056 828.153 336 831.918C391.944 835.846 448.056 859.741 504 851.558C559.944 843.374 616.056 803.112 672 782.818C727.944 762.687 784.056 762.687 840 760.559C895.944 758.268 952.056 754.012 1008 769.724C1063.94 785.6 1120.06 821.607 1176 832.736C1231.94 844.029 1288.06 830.281 1344 815.551C1399.94 800.821 1456.06 785.109 1483.94 777.089L1512 769.233V983.637H1483.94C1456.06 983.637 1399.94 983.637 1344 983.637C1288.06 983.637 1231.94 983.637 1176 983.637C1120.06 983.637 1063.94 983.637 1008 983.637C952.056 983.637 895.944 983.637 840 983.637C784.056 983.637 727.944 983.637 672 983.637C616.056 983.637 559.944 983.637 504 983.637C448.056 983.637 391.944 983.637 336 983.637C280.056 983.637 223.944 983.637 168 983.637C112.056 983.637 55.944 983.637 28.056 983.637H0V805.24Z" fill="#546DB2"/>
+<path d="M0 905.077L28.056 896.402C55.944 887.564 112.056 870.216 168 857.286C223.944 844.52 280.056 836.337 336 828.153C391.944 819.97 448.056 811.787 504 824.553C559.944 837.482 616.056 871.198 672 883.473C727.944 895.748 784.056 886.582 840 875.617C895.944 864.651 952.056 852.212 1008 855.977C1063.94 859.741 1120.06 880.036 1176 880.036C1231.94 880.036 1288.06 859.741 1344 845.829C1399.94 831.918 1456.06 824.389 1483.94 820.461L1512 816.697V983.637H1483.94C1456.06 983.637 1399.94 983.637 1344 983.637C1288.06 983.637 1231.94 983.637 1176 983.637C1120.06 983.637 1063.94 983.637 1008 983.637C952.056 983.637 895.944 983.637 840 983.637C784.056 983.637 727.944 983.637 672 983.637C616.056 983.637 559.944 983.637 504 983.637C448.056 983.637 391.944 983.637 336 983.637C280.056 983.637 223.944 983.637 168 983.637C112.056 983.637 55.944 983.637 28.056 983.637H0V905.077Z" fill="#334F8D"/>
+<path d="M0 891.983L28.056 890.838C55.944 889.856 112.056 887.564 168 900.167C223.944 912.769 280.056 939.938 336 953.358C391.944 966.779 448.056 966.124 504 952.213C559.944 938.301 616.056 911.132 672 905.568C727.944 900.167 784.056 916.533 840 926.026C895.944 935.682 952.056 938.301 1008 943.047C1063.94 947.63 1120.06 954.177 1176 957.45C1231.94 960.723 1288.06 960.723 1344 955.486C1399.94 950.412 1456.06 939.938 1483.94 934.864L1512 929.627V983.637H1483.94C1456.06 983.637 1399.94 983.637 1344 983.637C1288.06 983.637 1231.94 983.637 1176 983.637C1120.06 983.637 1063.94 983.637 1008 983.637C952.056 983.637 895.944 983.637 840 983.637C784.056 983.637 727.944 983.637 672 983.637C616.056 983.637 559.944 983.637 504 983.637C448.056 983.637 391.944 983.637 336 983.637C280.056 983.637 223.944 983.637 168 983.637C112.056 983.637 55.944 983.637 28.056 983.637H0V891.983Z" fill="#0B336A"/>
+</g>
+<defs>
+<clipPath id="clip0_1_2">
+<rect width="1512" height="982" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/images/black_logo.svg b/public/images/black_logo.svg
new file mode 100644
index 00000000..6d6c5bbc
--- /dev/null
+++ b/public/images/black_logo.svg
@@ -0,0 +1,9 @@
+<svg width="255" height="113" viewBox="0 0 255 113" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect width="255" height="113" fill="url(#pattern0)"/>
+<defs>
+<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_1493_1048" transform="matrix(0.00331126 0 0 0.00747231 0 -0.00811698)"/>
+</pattern>
+<image id="image0_1493_1048" width="302" height="136" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAS4AAACICAYAAABZcgYEAAAAAXNSR0IArs4c6QAAFRtJREFUeF7tnf1rFMm6x3vyZhJfEs2bujkwhEElboaERkN278Jwf1iQQxb9oWFdXwjci39H/o7l3Ivo7nFhfvCwchD2p4G9bojSRCZrrsoggZvrOeo9Z188V9eYxEO3053qnqquqp5+7+/Awpqpfuqpz/PUd6qrq6sKCj4gAAIgkDIChZT5C3dBAARAQIFwIQlAAARSRwDClbqQwWEQAAEIF3IABEAgdQQgXKkLGRwGARCAcCEHQAAEUkcAwpW6kMFhEAABCBdyAARAIHUEIFypCxkcBgEQgHAhB0AABFJHAMKVupDBYRAAAQgXcgAEQCB1BCBcqQsZHAYBEIBwIQdAAARSRwDClbqQwWEQAAEIF3IABEAgdQQgXKkLGRwGARCAcCEHQAAEUkcAwpW6kMFhEAABCBdyAARAIHUEIFypCxkcBgEQgHAhB0AABFJHAMKVupDBYRAAAQgXcgAEQCB1BCBcqQsZHAYBEIBwIQdAAARSRwDClbqQwWEQAAEIF3IABEAgdQQgXKkLGRwGARCAcCEHQAAEGAQWOxRlcSeJeCBcSYwKfAKBiAmcOrVw+N69q3+hVJtIjUikUxHHDNWBQN4JvPMAkEiNSKRTec8itB8EIibAFq5KpVup1bYi9odbHYSLiwgFQCDzBLxGXB2Konh9HwscCFcs2FEpCCSGAFOUSqUzA43G7V8T4ynhCIQriVGBTyAQDQFStBI5smJhgHBFkyCoBQSSRoAQrcXOpC57gHAlLW3gDwjER4AcaaVy8JJKp+OLN2oGgfQSUNXzw7p+40UWpoogXOnNw1g8n61cGF+uff0/RuXqJxeP6t9/RVu0GItvqNSTgD3KGp/T+jeWqq/TzAvCleboRe876wkU8ij6WMjUmPpbQ3djkXAy4c93WeZjc4y8Ep0YmRMtgzaEK9E5lyjneIsQkUsJClexuNC7vn6VvB3MVHwy1ZgE5U0WXYFwpSSqMx9/fnTlzjf/m4VJeBZyCFdKkjFmN6miparnR5xPqbQuRalux+xr3qu3YzU19cWh1dU//pRFIBCuLEY12DaJzJGIlAnWK1hzEFBVtVvX9c3dP6ZvUalMSCFcMrTyV1ZGkNyjMuRWRPkyNfXFwdXVP/49y7eGeKoYUTKluRpVne/X9Vv/L9sRSqUzexqN27/JXpdmVgnw3f7BUNWLR3U9H+vq8KuYgMxLmAt2R5hQtcEnevUXH/7ZNk6cPjf88O7Nv/mwgUv4BAjRutKj61++5V+SjRIQrmzEMahWyNwaetY5PX128P79P5ETw8i1oKL03k5gsQrWrWis5TGZHHMxlUqlu7a7wyPvkf9uVN7vDNnyC6eq5i8fMUnqDGRp9sJAY/nrRO1xVKlUumrOtgSZF7nuYCF149wzDTJBQ4pRKGa9JpLt7wxRM2onO3X5o0tj9R+uPzf+flSd73/aOhfk2i7kQUFRqvbWt+XypbF6/f31SfhENDJyMCV+KJKAIDU+TKjawBO9+jPhcF77b25XztNGVlYS0H7NvH7h3N+Z/56c1PasrVXJkZf59+bap/9LSG+J8kngbl0J3cc8ITFhueH6QUzmsWFRMcylYnOOYgpEuIwAfjh7/vCPyzeeNYNp2i0WF/rW16+ST96iirW7niAm4aV8j2h0J+VTSgrn/tbQHadcCtfs7Pmx5eUbf1XV+b2ux/4sPtIjLlqHKFYW+tZr8YpW65KFWFa72zyzsMVKyOIH0aIAzqVwzc1d/mBp6drG8Y8/O/DozrcvPU4x8bp9tHDyRmi0vI6FuyXYhkPHj3924NEjs+1xfWxup04tHLl37+pf43IkwfVCtBjBiaUDJSBRzISYmdFGV1aq1o6QovNe7kMF7Os0TeuqVu2JeJPt5KS2b22t6haIOLhHOZ8lGuIk+iTqe2jlyh9dGq3/cN2aYjDqiSNfQmtfEIbzCsTsMOQTPsr8C5kwdgejLGewv5ub04aWlqrmYsvxca1/Y8Oxy2Scv5523ZOT2v61teo/gkieYGxoneRTV3TS3fVZ09NnD96//yfyKWIwyDNgJXfCNT6n9W0sVV9ZsXO9Qc8aAdBGYy3zYfRJf3MOyX0ScJTc4xRMmS5i+6mqao+u67lZBW5CqlS6HOsC8eTVM3ei7EAySRxS2cUORVls2XbFYxGqzefD2fNjPy7fYM3DmOVOzmmHHjRHXB4NiJJ5WkTLwpXLW8fSjDbSWKmSa/uizJGQ+lq4ZgEoXL6xWFfVi0d0/aunRuWuJRmx+CNTaQ5f1M6lWMvkBK0shKtdgsm73u4IrpFk8jz19mh3XrF0prfRuP0mbQ0Q8BeiJQAJwuUTUsouszpD6n+UrHMAydesUhYLnrtmrHbfsjCnMnZ4F+H7HD5mpbzvFVgelMvnxur1m88nJ7WetbWq9AiBfOLnnlObrfz775ZrfzDPM5RdgyXjT6l0ZqDRuP2rsSdXb+/I4J07/0nuXR4YK0VR7GUlxemzg+vOnSQ86zFYGAUsHlZhkpH1t3aezKmfXDyif//+lpv2IRfPer+ovtihqo0x6/ZdBCJt22V3Tsz96+XxnZ2egpuDZV82T0T8SkqZ1P8qS4IUeTooaTLw4gVyjoplXfLJm1S7m0s57Cevgbdw1yBtgW/g1amqNqjL7SsmxYvmcHOXEOvJqC97rqUrvmz4aHvg/MMwmCvhkhl5tAP75Elt6MGD9+u5ZD4zH3/+wcqdb6xfeG6iFqfPHlwXW+fDtUX62XyfMoqTjiMRrmbbRHKdyoky+uHyLBYrfevrNfOd1BOnzw09vHvTz4v1pM/G//u5jRRpt0yaJqJsJhslSZaVhBw29KUVHp2kpR7RyfO5uX87tLT0H15CKBNHbnvL5U/31uvftSxSpbxXyLXV5CFazgqdbHky5H6v9XMdU8Aou4ME4aNtQ1W1Ad25xY31nUwuSHaV5BTPRSM5uP0kLC8JaVxb6jmqzu99qt8SvSVjdpLSjDba2H11SSS7HLbK5Uv76vXr9h7zx49/tv/Ro28dmx0ytuORYUcry8o/Gbu09srUZVzfTn3Ua91MXU62U59panp6YfD+/au0o8dy0adz0cikCpfk6zeetyfWpLqIalE6qiMPpqZ+f3B19c/kqTGGWSExlhlxerze03bH5rWR4BRGXQrnTENGneJHis3MaCMrzkWrGHEJJn9WivlNXKMjW9e6bQh18rHyp/ue1b8jT9PxYsqdV5F4z4/nr+P706cvD9+9e412qyrLjldvELeKLBsyozupH3TarbX1hJkRUBY39wv8zHyAcGVFfvy3Q6bzEWWNbZ1r1juIIh2ypZ4gR1y7zRf61eb5y/ver8CEYZe0SQqOSF0ysedlmMztadvCdfr05aG7d6/RJvylRJfXqKR+n4tGBnirGGgnkVxn467bawTGiyuvU/O+9yVc5fKl0Xqd3K6FKbIygsKKiXvuSmgU7HGr65lGjBGQzCiPdTtOrXfqX744uPpfjkNgcauYVJUNyS+hTkLZV8tOylLpzIFG4zZ5/qBQJ2lTuNwd08YjMFnPEyb7+7m5y+NLS9dYi1CF2LniZl/T3IGW9nBCyC5lmYGbu2nHtczEU3QlY+JOSR5XjuALjZZNGx4v/fN+tELqRtGazUUjAxpxiSYlq7qWztjGhLrXLZFZP2eNF68tXqMYsn1CAsMSrgAm53nt8Ao9w3dx8XAbP6aeH36s3zA3pvQ3xyVVtx/20apLiLVBuDiPwicmtIEnTxxHQvkdkrck2sSENvjkifBJ0VQxoYz27HSZmvr9odXVP9MembfT4dsVLpF0FumUMnNKtDpF6hDx1U8Zr9t8P/bIa3LRp3PRSJ8jLl4CybJrSVaJle+GL6JzOQ6/T5w+N/zw7k33E8G0CleQMYFw8Wgm+HvZzpfgpvh2ze+vnyy7MIXLLWwOGJR5GwhXe4tOfSdb80K/OSdSr2xeithMXJlcNNLfiGuxU1FvdSr6xA5l62XDpCy7sIXLU7wIfw2/3e+8ybbFQhrWqEXEbhZvFWXiIMIocYITlEMyoIKqM2l2RBOg3VFKFMLFES/7DMV225IE4aK1VSafReMeRr4GUXcQNsJoWyQ2ZQIdiUMxVCKYAC0vVcuyi0q4REZemRCuqakvDq6uOtYyOWJyVJ3vf6rfIt9M4D6NVRSpJ3vUdFVVtVvX57c9NgUUzDnP3hCEjRi6WzBVyna+YGpNlhWZBPCaIOe1KjLhomxqx/PNbx7IsOP5QH4vY1fmoQVXuEqlCwONxteOF8xlHCcfojS3N3K/8+n1wyIcB7zyIxmVDBYPqpPw0EQmXIQjopPAwh3G1UgZdjw+kQpXuXxpb71+nXW+pC8evBGgQFyE67W2taZAFbYhE5Cklc1FIznQw+p87mpb6gliHZdX2yQ2TvSbB2Gxk7C72FEqLXczDtPg3RJL1CPUdXn1WUbarhfvKgrFI9OF2k4iQTot9QS0ct6zesqZfbTyKRYuevMpr2gZBR3tZN5u+TiMlfEjweLads7hXUXBXpfhYm0nkSCblnrGT2pDGw+qtDkQmslA59dcFSRIuKR3lmXhp8WV1k5q/CX39KfNW3kxbTvnMMcl2OsyXKztJBJk01LPiRPnhh8+bFnVzhMt63tZsfGa75K1Fdgtj7ux75/I6ZsMplw/j6nzw4/1W+b7gpRPWCMg0VvEILlFlbeC6R1tMW4iROtOLLVFlQAt9Xg8dSJBBCk4Qbc1aHtKsbjQu75+lXVQBzNfx8e1vo2NKnMbbMbW0yZnr7lAgdt5BwPB7biD4BaEjVg6XBCV5k24RJ+ysdiK8mqjHq3rxImtwYcPpU+F4ftWqXQptZp1ZBbZRu61smcfSox2aLdZQeS2w8aHs+cP/7h84xnHcBtx8zzv0pddcofcmY8/P7py5xvpMy5FD2QJHHjIBrkJG3L9UZv3lUCEk6K82qjH3FmVJi48VkK+MXa74F576pR2+N696l94Tnh872fOp43qnJcyXjZn2fcTv8Dbd0w9P/JYv2HtcurHJ2VmRhtdkTtIJTDmYRriJmyYlcdh27ilOHBA6fy577ed7bdvCp3de971/O3lTn//yM7o6IudWm3kXaXyovD8+UjH5uY/TD6NxuxbuaPRFzuKxVrP5tB+Yw9x89P/y9b2wMDvdvbvf2wm4MuXxwrPnv3UZfx/V9cL829DQy+3dV1/qyha5/DxN/0H3u7p6O1VthVF2VxbO7nl8qGgqle6dMNerWaUkUxsrVNRTr6Ta5fWWSy+6O7q6nu3tfW6sLU1UjB8N/7d07PvXV/fwXdG+wyGTduGT1y/jHmt168n7Fy0uFs2X7/+qfDq1YsOg6cRs6GtgcL29htH7v6857edvl83t4tFZavmiwczG5n+C94WNg2/zwkjz5qxbGFjLBz+77/37Nn/qrNza+v1pnUu465nix1j5R/6jHZa+Wrk0S5zo6QR0wdNNlUjLzL5yZ1wZTKKaBQI5IwAhKu9gJu/xlmdR2gPDa4GgfAIQLh8sD15Ujv04EGV3JwPHH1wxCUg4JcAOpw8Odk1O/I14IqEEzAXybr3NEu4z9lyD8IlF09StMBOjl0kpYvFSu/6eo21DszwgYybzFoo7kOGSBooV4nwAbNyZuMvjc4nHgOIljirWEoyjpBjjZDtvxvrpfa/6txqNG7/Zjk+oWqDT3T7IBOXDXNDRusw4OYltL/ZIum43jgIuKvrl3f1+nes3Slk+Rn92PjPHgWWSmd6GS+ey9pOZHkIl1hYIFpinOIuZcdpclLbs7ZWtV4dcsfP/jcpUO59zJq7d/zsahRrxFY4dWrh8L17V8m1blZZmnhSR3DEa2BMn4vFhT7X2wUF1zY3me/XmW9gAD0JohUAxChMzM1d/mBp6doGWRchYOQTYHKBr7sPMG8Jj6nzI4/1W+5j763yhh3u6K7pG62s5TZN7NzlRa6PAnlsdUC4GOjJXzCv99xiixwqZhHwmosqzHyijax8X31OXOzoA+XypdF6/Trj1SB7z377cmOUZixWNkZ3qnrxiK5/9ZRi29Mnq3xp9sKBxrK9+2rLD2a5/Oneev07citqmt1c9OlcNNJHH7cTAmu0fNCL+xJN61Sq7jkoplOOPuBxtL1hwLO/SNwqks6wbHJH+qo636+z99SPOwqh1g/hasXLTZhQIwLjvgmon1w8on//1VPK+3leIx73kzdmWdeEveWnfatIET3ZOS7m/JkHlFzmK4SrmRHHj3+2/9Gjb8lDEsDGt4TEdqHdicmnauTOFuPjWj9l+xsz1rSFxZRdGey8UNUr3br+pfUAoFD+6NJo/QfHbSZTuIqVhd712lXjKSZLeEQFSbRcbEEJo2J0zvdUWZOqYTCHzfAItIyWmpPzb7zmnUoz2mj/9i+vyOUJrr3SXHbNI8wcLzAXi5U+9/qx0uyFga1n3Zse+4u5SZj90Ro5Wl8ydrYozMxowysrjvk67u1seOijtQzhIkSr+ZjZXssTbShQW7sEKKfsUIWB+CPrtrClX7C2Sp6ePnvw/v3pX91CJtsW6/aWMvI3TamqNqjvritTTpy+PPTw7jX3E05FVa/s1fUvmRsqyvqV1PJ5F65cDrOTmozwCwRECeRSuBgrrEWZoRwIgEDMBHInXOQixXL50r56/Tq5LibmcKB6EAABEQJ5Ey771lBVr/To+pd+tkgW4YoyIAACIRLIk3BhPivERIJpEIiSQF6EC6IVZVahLhAImUDGhcs4EMLx6kfG2xtytsA8CCSEQGY7Mvn6RVaPaEpIDsENEIicQAaFy9xWl1zVnME2Rp4nqBAEEkUgY50aopWo7IIzIBASgcwIF+WVjMy0LaTYwywIpJZAJjo3ZfO3TLQrtVkFx0EgZAKp6+CcF2lT156Q4wvzIJBJAqnq6JR3DMmgpKotmcwmNAoEIiKQts7O3J0S7x1GlDGoBgQSQCBVwuXeYI3kl/Vz5BKQK3ABBBJDIFXC1aQmvPlbYijDERAAgUAJpFG4FKVS6VJqtbfl8rmxev0medRUoHBgDARAIJkE0ilcyWQJr0AABCIiAOGKCDSqAQEQCI4AhCs4lrAEAiAQEQEIV0SgUQ0IgEBwBCBcwbGEJRAAgYgIQLgiAo1qQAAEgiMA4QqOJSyBAAhERADCFRFoVAMCIBAcAQhXcCxhCQRAICICEK6IQKMaEACB4AhAuIJjCUsgAAIREYBwRQQa1YAACARHAMIVHEtYAgEQiIjAPwH2+C/yJXnZ9gAAAABJRU5ErkJggg=="/>
+</defs>
+</svg>
diff --git a/public/images/blue_dot.svg b/public/images/blue_dot.svg
new file mode 100644
index 00000000..dd1de551
--- /dev/null
+++ b/public/images/blue_dot.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#0038FF"/>
+</svg>
diff --git a/public/images/pink_dot.svg b/public/images/pink_dot.svg
new file mode 100644
index 00000000..9ba1dc5e
--- /dev/null
+++ b/public/images/pink_dot.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#CE44FF"/>
+</svg>
diff --git a/public/images/red_dot.svg b/public/images/red_dot.svg
new file mode 100644
index 00000000..0153e4a4
--- /dev/null
+++ b/public/images/red_dot.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#FF0000"/>
+</svg>
diff --git a/public/images/tasks_background.svg b/public/images/tasks_background.svg
new file mode 100644
index 00000000..3d9e32b5
--- /dev/null
+++ b/public/images/tasks_background.svg
@@ -0,0 +1,15 @@
+<svg width="1280" height="832" viewBox="0 0 1280 832" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3_2)">
+<path d="M1280 0H0V832H1280V0Z" fill="#0A0950"/>
+<path d="M0 341.12L26.7378 338.347C53.6178 335.573 107.093 330.027 160.427 328.363C213.76 326.837 266.951 329.056 320.284 327.947C373.618 326.837 427.093 322.123 480.427 329.056C533.76 335.989 586.951 354.571 640.284 357.76C693.618 360.949 747.093 349.024 800.427 358.176C853.76 367.467 906.951 397.973 960.284 401.717C1013.62 405.323 1067.09 382.304 1120.43 366.08C1173.76 349.856 1226.95 340.704 1253.4 335.989L1280 331.413V833.387H1253.4C1226.95 833.387 1173.76 833.387 1120.43 833.387C1067.09 833.387 1013.62 833.387 960.284 833.387C906.951 833.387 853.76 833.387 800.427 833.387C747.093 833.387 693.618 833.387 640.284 833.387C586.951 833.387 533.76 833.387 480.427 833.387C427.093 833.387 373.618 833.387 320.284 833.387C266.951 833.387 213.76 833.387 160.427 833.387C107.093 833.387 53.6178 833.387 26.7378 833.387H0V341.12Z" fill="#3120A3"/>
+<path d="M0 520L26.7378 519.584C53.6178 519.029 107.093 518.197 160.427 508.907C213.76 499.616 266.951 482.144 320.284 471.189C373.618 460.373 427.093 456.213 480.427 451.637C533.76 446.923 586.951 441.931 640.284 437.909C693.618 434.027 747.093 431.253 800.427 428.757C853.76 426.123 906.951 423.904 960.284 425.429C1013.62 427.093 1067.09 432.64 1120.43 441.237C1173.76 449.696 1226.95 461.344 1253.4 467.029L1280 472.853V833.387H1253.4C1226.95 833.387 1173.76 833.387 1120.43 833.387C1067.09 833.387 1013.62 833.387 960.284 833.387C906.951 833.387 853.76 833.387 800.427 833.387C747.093 833.387 693.618 833.387 640.284 833.387C586.951 833.387 533.76 833.387 480.427 833.387C427.093 833.387 373.618 833.387 320.284 833.387C266.951 833.387 213.76 833.387 160.427 833.387C107.093 833.387 53.6178 833.387 26.7378 833.387H0V520Z" fill="#4A28B2"/>
+<path d="M0 597.653L26.7378 591.829C53.6178 586.144 107.093 574.496 160.427 565.483C213.76 556.469 266.951 550.091 320.284 543.296C373.618 536.64 427.093 529.707 480.427 533.589C533.76 537.611 586.951 552.309 640.284 566.869C693.618 581.429 747.093 595.851 800.427 600.843C853.76 605.973 906.951 601.813 960.284 602.091C1013.62 602.229 1067.09 606.944 1120.43 592.384C1173.76 577.824 1226.95 543.989 1253.4 527.211L1280 510.293V833.387H1253.4C1226.95 833.387 1173.76 833.387 1120.43 833.387C1067.09 833.387 1013.62 833.387 960.284 833.387C906.951 833.387 853.76 833.387 800.427 833.387C747.093 833.387 693.618 833.387 640.284 833.387C586.951 833.387 533.76 833.387 480.427 833.387C427.093 833.387 373.618 833.387 320.284 833.387C266.951 833.387 213.76 833.387 160.427 833.387C107.093 833.387 53.6178 833.387 26.7378 833.387H0V597.653Z" fill="#6131C1"/>
+<path d="M0 675.307L26.7378 664.213C53.6178 653.12 107.093 630.933 160.427 631.904C213.76 632.736 266.951 656.864 320.284 666.571C373.618 676.277 427.093 671.563 480.427 663.52C533.76 655.477 586.951 643.829 640.284 636.48C693.618 629.131 747.093 625.803 800.427 623.584C853.76 621.227 906.951 619.84 960.284 626.496C1013.62 633.291 1067.09 647.989 1120.43 650.069C1173.76 652.149 1226.95 641.611 1253.4 636.203L1280 630.933V833.387H1253.4C1226.95 833.387 1173.76 833.387 1120.43 833.387C1067.09 833.387 1013.62 833.387 960.284 833.387C906.951 833.387 853.76 833.387 800.427 833.387C747.093 833.387 693.618 833.387 640.284 833.387C586.951 833.387 533.76 833.387 480.427 833.387C427.093 833.387 373.618 833.387 320.284 833.387C266.951 833.387 213.76 833.387 160.427 833.387C107.093 833.387 53.6178 833.387 26.7378 833.387H0V675.307Z" fill="#773AD0"/>
+<path d="M0 766.827L26.7378 767.243C53.6178 767.797 107.093 768.629 160.427 762.944C213.76 757.12 266.951 744.64 320.284 732.576C373.618 720.651 427.093 709.003 480.427 711.776C533.76 714.549 586.951 731.744 640.284 739.509C693.618 747.413 747.093 746.027 800.427 742.144C853.76 738.123 906.951 731.744 960.284 729.803C1013.62 728 1067.09 730.773 1120.43 737.707C1173.76 744.64 1226.95 755.733 1253.4 761.28L1280 766.827V833.387H1253.4C1226.95 833.387 1173.76 833.387 1120.43 833.387C1067.09 833.387 1013.62 833.387 960.284 833.387C906.951 833.387 853.76 833.387 800.427 833.387C747.093 833.387 693.618 833.387 640.284 833.387C586.951 833.387 533.76 833.387 480.427 833.387C427.093 833.387 373.618 833.387 320.284 833.387C266.951 833.387 213.76 833.387 160.427 833.387C107.093 833.387 53.6178 833.387 26.7378 833.387H0V766.827Z" fill="#8D44DF"/>
+</g>
+<defs>
+<clipPath id="clip0_3_2">
+<rect width="1280" height="832" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/images/yellow_dot.svg b/public/images/yellow_dot.svg
new file mode 100644
index 00000000..a1f19386
--- /dev/null
+++ b/public/images/yellow_dot.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#FFBD3C"/>
+</svg>
diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index b66bc11b..81972dd7 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -61,6 +61,12 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
         <Navbar.Link href="/calendar" className="ml-4 text-white">
           Recruitment
         </Navbar.Link>
+        <Navbar.Link href="/application_status" className="ml-4 text-white">
+          Application status
+        </Navbar.Link>
+        <Navbar.Link href="/tasks" className="ml-4 text-white">
+          Tasks
+        </Navbar.Link>
       </Navbar.Collapse>
     </Navbar>
   )
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
new file mode 100644
index 00000000..c4ff84b5
--- /dev/null
+++ b/src/pages/application_status/index.tsx
@@ -0,0 +1,194 @@
+import { useRouter } from 'next/router'
+import { useSession, signIn } from 'next-auth/react'
+import { useState, useCallback } from 'react'
+import Head from 'next/head'
+import { useToast } from '@chakra-ui/react'
+import Image from 'next/image'
+import TopNavbar from '~/components/common/TopNavbar'
+import withAuth, { BaseProps } from '~/utils/withAuth'
+
+enum PageState {
+  LOGIN,
+  FORGET_PASSWORD,
+}
+
+const application_status:React.FC<BaseProps> = ({ session }) =>{
+
+  //this part needs backend to update the status
+  const application_status = "accepted"
+
+  const [pageState, setPageState] = useState(PageState.LOGIN)
+
+  return (
+    <>
+      <Head>
+        <title>Atlas | Login</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta name="description" content="The login page for Atlas" />
+      </Head>
+      <TopNavbar isAdmin={session.isAdmin} />
+      <main>
+        <div className="relative h-screen w-screen bg-[url('/images/applicants_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
+          {/* Nav element containing the logo */}
+       
+          <nav className="flex justify-center items-center  px-2 py-2 " >
+          
+            <Image
+              alt="logo"
+              src="/images/black_logo.svg"
+              height={150}
+              width={150}
+            
+            
+            />
+         
+          </nav>
+       
+
+          {/* Login */}
+          <div className="flex flex-col justify-center gap-8 font-[Inter]">
+          
+            <h1 className='flex justify-center font-bold text-8xl mt-10'>
+              Hi User,
+            </h1>
+            <h2 className='flex justify-center  mt-3 font-bold text-6xl'>
+              your current status is:
+            </h2>
+            {application_status == 'accepted' && 
+            <h3 className='flex mt-3 justify-center text-5xl'>
+        
+              <Image
+                alt="logo"
+                src="/images/Ellipse 1.svg"
+                height={35}
+                width={35}
+                className='mr-5'              
+              />
+                Accepted
+              </h3>
+            }
+            {application_status == 'offered' && <h3 className='flex justify-center text-[55px]'>
+        
+              <Image
+                alt="logo"
+                src="/images/blue_dot.svg"
+                height={35}
+                width={35}
+                className='mr-5'
+              />
+                Offered
+              </h3>
+            }
+            {application_status == 'pending_review' && <h3 className='flex justify-center text-[55px]'>
+              
+              <Image
+                alt="logo"
+                src="/images/yellow_dot.svg"
+                height={35}
+                width={35}
+                className='mr-5'             
+              />
+                Pending Review
+              </h3>
+            }
+            {application_status == 'interviewed' && <h3 className='flex justify-center text-[55px]'>
+              
+              <Image
+                alt="logo"
+                src="/images/pink_dot.svg"
+                height={35}
+                width={35}
+                className='mr-5'             
+              />
+                Interviewed
+              </h3>
+            }
+            {application_status == 'rejected' && <h3 className='flex justify-center text-[55px]'>
+              
+              <Image
+                alt="logo"
+                src="/images/red_dot.svg"
+                height={35}
+                width={35}
+                className='mr-5'             
+              />
+                Rejected
+              </h3>
+            }
+            
+            
+            <div className="flex justify-center items-center mt-[80px]">
+            {application_status != "rejected" &&
+            <button
+          
+              className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] flex-col w-357px h-109px items-center bg-opacity-0 border-2 border-[#86C5FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition hover:bg-opacity-80"
+             
+            >
+              <div className='font-[Inter] text-[25px]'>
+                Update 
+                  <div className="relative">
+                  </div>
+                Information
+              </div>
+            </button>
+            }
+            {application_status == "rejected" &&
+            <button
+              disabled = {true}
+              className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] flex-col w-357px h-109px items-center bg-opacity-0 border-2 border-[#BFE0FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition"
+             
+            >
+              <div className='font-[Inter] text-[25px] text-[#9AA8B6]'>
+                Update 
+                  <div className="relative">
+                  </div>
+                Information
+              </div>
+            </button>
+            }
+
+            
+            
+            {(application_status == "accepted" || application_status == "offered") && 
+            <button
+          
+              className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] -ml-5 w-357px h-109px items-center bg-opacity-0 border-2 border-[#86C5FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition hover:bg-opacity-80"
+        
+            >
+              <div className='font-[Inter] text-[25px]'>
+                Tasks to be
+                  <div className="relative">
+                  </div>
+                Completed
+              </div>
+         
+            </button>
+            }
+            
+            {(application_status != "offered" && application_status != "accepted") &&
+            <button
+            disabled = {true}
+            className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] -ml-5 flex-col w-357px h-109px -ml-5 items-center bg-opacity-0 border-2 border-[#BFE0FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition"
+           
+            >
+            <div className='font-[Inter] text-[25px] text-[#9AA8B6]'>
+              Tasks to be
+                <div className="relative">
+                </div>
+              Completed
+            </div>
+          </button>
+            }
+            
+            </div>
+
+          
+          </div>
+        </div>
+      </main>
+    </>
+  )
+}
+
+
+export default withAuth(application_status, true)
\ No newline at end of file
diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
new file mode 100644
index 00000000..61fbb37a
--- /dev/null
+++ b/src/pages/tasks/index.tsx
@@ -0,0 +1,253 @@
+import { useRouter, } from 'next/router'
+import { useSession} from 'next-auth/react'
+import { useState, useCallback, useRef } from 'react'
+import Head from 'next/head'
+import {  Box, Button, Grid, GridItem, Heading, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, Portal, useDisclosure, useToast, Text } from '@chakra-ui/react'
+import Image from 'next/image'
+import TopNavbar from '~/components/common/TopNavbar'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
+
+
+
+
+enum PageState {
+  LOGIN,
+  FORGET_PASSWORD,
+}
+
+const tasks:React.FC<BaseProps> = ({ session }) => {
+  const { status } = useSession()
+  //this part needs backend to update the status
+  const [pageState, setPageState] = useState(PageState.LOGIN)
+  const [searchQuery, setSearchQuery] = useState('')
+  const [showModal, setShowModal] = useState(false)
+  const { isOpen, onOpen, onClose } = useDisclosure()
+  const [currentDetails, setCurrentDetails] = useState('')
+  const [currentName, setCurrentName] = useState('')
+
+
+
+  const data = [
+    {
+      id: 1,
+      status: 'Done',
+      name: 'Join Telegram Group',
+      due: '09/12/23',
+      details: 'User should join the telegram group before they due date.'
+    },
+    {
+        id: 2,
+        status: 'In Progress',
+        name: 'Have lunch',
+        due: '1/4/24',
+        details: 'Have lunch at school with friends.'
+      },
+      {
+        id: 3,
+        status: 'Incomplete',
+        name: 'Attend first townhall',
+        due: '23/5/24',
+        details: 'Attend the first townhall to learn more about Fintech Society and its projects.'
+      },
+    
+  ]
+  
+
+  const filteredData = data.filter((item) =>
+    item.name.toLowerCase().includes(searchQuery.toLowerCase())
+  )
+
+
+
+  return (
+    <>
+    
+      <Head>
+        <title>Atlas | Login</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta name="description" content="The login page for Atlas" />
+      </Head>
+      <TopNavbar isAdmin={session.isAdmin} />
+      <main>
+        <div className="relative h-screen w-screen bg-[url('/images/tasks_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
+          {/* Nav element containing the logo */}
+       
+
+       
+
+          {/* Login */}
+          <div className="flex flex-col justify-center gap-8 font-[Inter]">
+           
+          
+            <h1 className='flex justify-center font-bold text-4xl mt-[3%] text-white'>
+             Tasks
+            </h1>
+            
+            <Input
+                placeholder="Search"
+                value={searchQuery}
+                onChange={(e) => setSearchQuery(e.target.value)}
+                borderWidth="3px"
+                w={{ base: '150px', md: '300px' }}
+                border="3px solid #F9813E"
+                borderColor="#9BAFC2" 
+                borderRadius="30px"
+                className="mt-[1%] ml-[8%] mb-4 text-white"
+                _placeholder={{
+                pl: { base: '65px', lg: '210px' },
+                fontStyle: 'italic',
+                }}
+            />
+           <Box
+  overflowY="auto"
+  maxHeight="40vh"
+  sx={{
+    '&::-webkit-scrollbar': {
+      width: '30px',
+    },
+    '&::-webkit-scrollbar-thumb': {
+      backgroundColor: `#004B90`,
+      borderRadius: '20px',
+      border: '5px solid transparent',
+      backgroundClip: 'content-box',
+    },
+  }}
+  className="p-16"
+>
+  <Grid
+  className='ml-[11%]'
+    templateColumns={{
+      base: 'repeat(3, 1fr)',
+      md: 'repeat(3, 1fr)',
+    }}
+    gridGap={{ base: '4' }}
+    gridRowGap={{ base: '4', md: '12' }}
+  >
+    {/* Column headings */}
+    <GridItem colSpan={1} className="justify-content-center flex flex-col">
+      <h1 className="text-lg font-bold text-white">Status</h1>
+    </GridItem>
+    <GridItem colSpan={1} className="justify-content-center flex flex-col">
+      <h1 className="text-lg font-bold text-white">Task</h1>
+    </GridItem>
+    <GridItem colSpan={1} className="justify-content-center flex flex-col">
+      <h1 className="text-lg font-bold text-white">Do By</h1>
+    </GridItem>
+    </Grid>
+
+    {/* Data rows */}
+    {filteredData.map((item) => (
+      <Grid
+      className='mt-[2%] ml-[11%]'
+      templateColumns={{
+        base: 'repeat(3, 1fr)',
+        md: 'repeat(3, 1fr)',
+      }}
+      gridGap={{ base: '4' }}
+      gridRowGap={{ base: '4', md: '12' }}
+
+    >
+      
+        <GridItem colSpan={1} className="justify-content-center flex flex-col">
+          
+          <h1 className="  text-white">{item.status == "Incomplete" && 
+          <button
+          disabled = {true}
+          className="flex-col  items-center w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#C51F29] py-1 px-5 font-medium transition"
+
+            >
+          <div className='font-[Inter] text-xl text-white'>
+          {item.status}
+          </div>
+        </button>
+          }
+          {item.status == "In Progress" && <button
+          disabled = {true}
+          className="flex-col items-center w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#FFBD3C] py-1 px-5 font-medium transition"
+         
+            >
+          <div className='font-[Inter] text-xl text-white'>
+          {item.status}
+          </div>
+        </button>}
+          {item.status == "Done" && <button
+          disabled = {true}
+          className="flex-col items-center w-[150px] max-w-20 bg-opacity-100  text-md mx-auto rounded-full  bg-[#00C09D] py-1 px-5 font-medium transition"
+         
+            >
+          <div className='font-[Inter] text-xl text-white'>
+          {item.status}
+          </div>
+        </button>}
+          </h1>
+          
+        </GridItem>
+      
+       
+        
+      
+        
+       
+        <GridItem colSpan={1} className="justify-content-center flex flex-col">
+         
+          <Text
+        as="span"
+        cursor="pointer"
+        _hover={{ textDecoration: 'underline' }}
+        className='text-xl text-white'
+        onClick={() => { setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
+       
+      >
+        {item.name}
+      </Text>
+     
+          <Modal  isOpen={isOpen} onClose={onClose}>
+            <ModalOverlay 
+            bg='none'
+            backdropFilter='auto'
+            
+            backdropBlur='2px'
+            />
+           
+            
+            <ModalContent 
+           
+            
+        
+            >
+            <ModalHeader fontSize='5xl' >{currentName}</ModalHeader>
+            <ModalCloseButton />
+            <ModalBody fontSize='3xl' >
+                {currentDetails}
+            
+            </ModalBody>
+
+            <ModalFooter>
+           
+            </ModalFooter>
+        </ModalContent>
+        
+        </Modal>
+       
+ 
+        </GridItem>
+        <GridItem colSpan={1} className="justify-content-center flex flex-col">
+          <h1 className="text-xl text-white">{item.due}</h1>
+        </GridItem>
+    </Grid>
+  
+       
+    ))}
+ 
+</Box>
+            
+
+          
+          </div>
+        </div>
+      </main>
+    </>
+  )
+}
+
+export default withAuth(tasks, true)
\ No newline at end of file

From d279854ba07c67067864d71388e40dcb057354d9 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Tue, 30 May 2023 22:38:37 +0800
Subject: [PATCH 044/223] info popup on hover

---
 src/components/recruitment/InfoPopup.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/recruitment/InfoPopup.tsx b/src/components/recruitment/InfoPopup.tsx
index e32f0c9b..d850a5ac 100644
--- a/src/components/recruitment/InfoPopup.tsx
+++ b/src/components/recruitment/InfoPopup.tsx
@@ -17,7 +17,7 @@ import { BsCircleFill } from 'react-icons/bs'
 const InfoPopup = () => {
   return (
     <Box className="bottom-25 absolute right-20">
-      <Popover placement="left">
+      <Popover placement="left" trigger="hover">
         <PopoverTrigger>
           <IconButton
             aria-label="Info popup for applicant detail"
@@ -29,8 +29,7 @@ const InfoPopup = () => {
             stroke="#02005A"
           />
         </PopoverTrigger>
-        <PopoverContent>
-          <PopoverCloseButton />
+        <PopoverContent rootProps={{ style: { right: 0 } }}>
           <PopoverBody>
             <UnorderedList styleType="none" spacing="2">
               <ListItem className="flex items-center">

From 94cfac2f9b15029f68f7d9002d299d5b57114acc Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 31 May 2023 00:24:10 +0800
Subject: [PATCH 045/223] Update the prisma

---
 prisma/schema.prisma | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 253e1a04..838f8c75 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -27,28 +27,32 @@ model Departments {
 }
 
 model User {
+  attendance      Int?            @default(0)
   batch           String?
-  discord         String?
-  email           String       @unique
-  faculty         String?
+  department      String?
+  diet            String?
+  email           String          @unique
+  course          String?
   gender          String?
   hashedPassword  String
-  id              String       @id
+  id              String          @id
   image           String?
-  major           String?
-  name            String
+  linkedin        String?
+  name            String?
+  phone           String?
   personal_email  String?
-  role            String
-  telegram        String?
-  total_events    Int?         @default(0)
+  roles           String?
+  shirt           String?
+  telegram        String?        @default(0)
   year            String?
-  isAdmin         Boolean?     @default(false)
-  wallet          String?
-  department      String       @default("")
+  date_of_birth   DateTime?
+
+  isAdmin         Boolean?        @default(false)
+  announcements   Announcements[]
+  events          Event[]         @relation("EventToUser")
+  projects        Projects[]      @relation("ProjectsToUser")
+  Attendance      Attendance[]    @relation("attendanceToUser")
   AttendanceTaken Attendance[]
-  events          Event[]      @relation("EventToUser")
-  projects        Projects[]   @relation("ProjectsToUser")
-  Attendance      Attendance[] @relation("attendanceToUser")
 }
 
 model Event {

From 6ffc7c6f398dcf917e9d86a9961b09c222ab12a1 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 31 May 2023 01:17:13 +0800
Subject: [PATCH 046/223] Fix schema

---
 prisma/schema.prisma | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 838f8c75..9fbbe8f3 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -27,15 +27,15 @@ model Departments {
 }
 
 model User {
-  attendance      Int?            @default(0)
+  attendance      Int?         @default(0)
   batch           String?
   department      String?
   diet            String?
-  email           String          @unique
+  email           String       @unique
   course          String?
   gender          String?
   hashedPassword  String
-  id              String          @id
+  id              String       @id
   image           String?
   linkedin        String?
   name            String?
@@ -43,15 +43,13 @@ model User {
   personal_email  String?
   roles           String?
   shirt           String?
-  telegram        String?        @default(0)
+  telegram        String?
   year            String?
   date_of_birth   DateTime?
-
-  isAdmin         Boolean?        @default(false)
-  announcements   Announcements[]
-  events          Event[]         @relation("EventToUser")
-  projects        Projects[]      @relation("ProjectsToUser")
-  Attendance      Attendance[]    @relation("attendanceToUser")
+  isAdmin         Boolean?     @default(false)
+  events          Event[]      @relation("EventToUser")
+  projects        Projects[]   @relation("ProjectsToUser")
+  Attendance      Attendance[] @relation("attendanceToUser")
   AttendanceTaken Attendance[]
 }
 

From 367b116cbba293eba2d4e15a8e86c0344fcc2ef1 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 31 May 2023 08:03:36 +0800
Subject: [PATCH 047/223] make text size more consistent

---
 src/pages/tasks/index.tsx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 61fbb37a..79d3238f 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -16,11 +16,8 @@ enum PageState {
 }
 
 const tasks:React.FC<BaseProps> = ({ session }) => {
-  const { status } = useSession()
-  //this part needs backend to update the status
-  const [pageState, setPageState] = useState(PageState.LOGIN)
+
   const [searchQuery, setSearchQuery] = useState('')
-  const [showModal, setShowModal] = useState(false)
   const { isOpen, onOpen, onClose } = useDisclosure()
   const [currentDetails, setCurrentDetails] = useState('')
   const [currentName, setCurrentName] = useState('')
@@ -125,13 +122,13 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
   >
     {/* Column headings */}
     <GridItem colSpan={1} className="justify-content-center flex flex-col">
-      <h1 className="text-lg font-bold text-white">Status</h1>
+      <h1 className="text-xl font-bold text-white">Status</h1>
     </GridItem>
     <GridItem colSpan={1} className="justify-content-center flex flex-col">
-      <h1 className="text-lg font-bold text-white">Task</h1>
+      <h1 className="text-xl font-bold text-white">Task</h1>
     </GridItem>
     <GridItem colSpan={1} className="justify-content-center flex flex-col">
-      <h1 className="text-lg font-bold text-white">Do By</h1>
+      <h1 className="text-xl font-bold text-white">Do By</h1>
     </GridItem>
     </Grid>
 

From 4e5f55c0fe0ab7f84e7ba4d0ad609adfa78eecb6 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Wed, 31 May 2023 21:56:11 +0800
Subject: [PATCH 048/223] director page style adjustments

---
 src/pages/recruitment/applicants.tsx                     | 7 +++----
 src/server/trpc/router/{admin => }/recruitment/create.ts | 2 +-
 src/server/trpc/router/{admin => }/recruitment/index.ts  | 0
 src/server/trpc/router/{admin => }/recruitment/read.ts   | 0
 src/server/trpc/router/{admin => }/recruitment/update.ts | 0
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename src/server/trpc/router/{admin => }/recruitment/create.ts (97%)
 rename src/server/trpc/router/{admin => }/recruitment/index.ts (100%)
 rename src/server/trpc/router/{admin => }/recruitment/read.ts (100%)
 rename src/server/trpc/router/{admin => }/recruitment/update.ts (100%)

diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 54e73311..4078a37f 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -1,6 +1,5 @@
-import { Text } from '@chakra-ui/react'
+import { Box, Text } from '@chakra-ui/react'
 import Head from 'next/head'
-import Layout from '~/components/common/Layout'
 import TopNavbar from '~/components/common/TopNavbar'
 import SearchBar from '~/components/common/SearchBar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
@@ -19,13 +18,13 @@ const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
         />
       </Head>
       <TopNavbar isAdmin={session.isAdmin} />
-      <Layout>
+      <Box position="relative" mt="10">
         <Text className="text-center text-4xl font-bold">Applicants</Text>
         <SearchProvider>
           <SearchBar />
           <ApplicantGrid />
         </SearchProvider>
-      </Layout>
+      </Box>
     </>
   )
 }
diff --git a/src/server/trpc/router/admin/recruitment/create.ts b/src/server/trpc/router/recruitment/create.ts
similarity index 97%
rename from src/server/trpc/router/admin/recruitment/create.ts
rename to src/server/trpc/router/recruitment/create.ts
index 9f3ff726..4c4ae03f 100644
--- a/src/server/trpc/router/admin/recruitment/create.ts
+++ b/src/server/trpc/router/recruitment/create.ts
@@ -3,7 +3,7 @@ import { hash } from 'bcryptjs'
 import { randomUUID } from 'crypto'
 import { z } from 'zod'
 import { protectedProcedure } from '~/server/trpc/trpc'
-import { ErrorTitle } from '../../constants/ErrorTitle'
+import { ErrorTitle } from '../constants/ErrorTitle'
 
 export const createSingleApplicant = protectedProcedure
   .input(
diff --git a/src/server/trpc/router/admin/recruitment/index.ts b/src/server/trpc/router/recruitment/index.ts
similarity index 100%
rename from src/server/trpc/router/admin/recruitment/index.ts
rename to src/server/trpc/router/recruitment/index.ts
diff --git a/src/server/trpc/router/admin/recruitment/read.ts b/src/server/trpc/router/recruitment/read.ts
similarity index 100%
rename from src/server/trpc/router/admin/recruitment/read.ts
rename to src/server/trpc/router/recruitment/read.ts
diff --git a/src/server/trpc/router/admin/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
similarity index 100%
rename from src/server/trpc/router/admin/recruitment/update.ts
rename to src/server/trpc/router/recruitment/update.ts

From d3e68a2e01797ed0d4247198cc36c3d305133b45 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 31 May 2023 21:59:24 +0800
Subject: [PATCH 049/223] Update user model

---
 src/server/db/models/User.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index cbcccb79..41fec1ac 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -4,7 +4,18 @@ export type User = {
   hashedPassword: string
   isAdmin: boolean
   id?: string
-  image?: string
   name: string
   role: string
+
+  // Optional field: User can upload their image later.
+  image?: string
+
+  // Optional fields in create single user.
+  batch?: string
+  diet?: string
+  course?: string
+  linkedin?: string
+  phone?: string
+  telegram?: string
+  dob: string // Store in DD-MM format so that we can get their birthday easily.
 }

From 548473c5a80a203a2d40b32f4b35672e1e09a97c Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 31 May 2023 22:15:07 +0800
Subject: [PATCH 050/223] improve formatting

---
 src/components/common/TopNavbar.tsx    | 2 +-
 src/pages/application_status/index.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index 81972dd7..14578687 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -62,7 +62,7 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
           Recruitment
         </Navbar.Link>
         <Navbar.Link href="/application_status" className="ml-4 text-white">
-          Application status
+          Application Status
         </Navbar.Link>
         <Navbar.Link href="/tasks" className="ml-4 text-white">
           Tasks
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index c4ff84b5..45dce51d 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -48,7 +48,7 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
           {/* Login */}
           <div className="flex flex-col justify-center gap-8 font-[Inter]">
           
-            <h1 className='flex justify-center font-bold text-8xl mt-10'>
+            <h1 className='flex justify-center font-bold text-8xl mt-4'>
               Hi User,
             </h1>
             <h2 className='flex justify-center  mt-3 font-bold text-6xl'>
@@ -117,7 +117,7 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
             }
             
             
-            <div className="flex justify-center items-center mt-[80px]">
+            <div className="flex justify-center items-center mt-5">
             {application_status != "rejected" &&
             <button
           

From 7762729c43f8e992393f9940fd9b5804821e79dc Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 31 May 2023 23:04:53 +0800
Subject: [PATCH 051/223] Remove prisma completely

---
 package.json                                |  4 -
 prisma/schema.prisma                        | 89 ---------------------
 src/components/profile/ProfileInfo.tsx      |  1 -
 src/components/users/UserTable.tsx          |  2 +-
 src/server/db/client.ts                     | 19 -----
 src/server/trpc/context.ts                  |  2 -
 src/server/trpc/router/member/helper.ts     | 41 +---------
 src/server/trpc/router/users/getAllUsers.ts | 15 ++++
 src/server/trpc/router/users/index.ts       | 24 +-----
 yarn.lock                                   | 29 -------
 10 files changed, 18 insertions(+), 208 deletions(-)
 delete mode 100644 prisma/schema.prisma
 delete mode 100644 src/server/db/client.ts
 create mode 100644 src/server/trpc/router/users/getAllUsers.ts

diff --git a/package.json b/package.json
index 8a8f76c5..aa20c2cc 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,6 @@
   "scripts": {
     "build": "next build",
     "dev": "next dev",
-    "postinstall": "prisma generate",
     "lint": "next lint",
     "start": "next start",
     "analyze": "cross-env ANALYZE=true next build",
@@ -21,8 +20,6 @@
     "@headlessui/react": "^1.7.14",
     "@heroicons/react": "v1",
     "@hookform/resolvers": "^2.9.10",
-    "@next-auth/prisma-adapter": "1.0.5",
-    "@prisma/client": "^4.14.0",
     "@tanstack/react-query": "^4.29.5",
     "@tanstack/react-table": "^8.9.1",
     "@trpc/client": "^10.26.0",
@@ -71,7 +68,6 @@
     "postcss": "^8.4.21",
     "prettier": "^2.8.2",
     "prettier-plugin-tailwindcss": "^0.2.3",
-    "prisma": "^4.14.0",
     "tailwindcss": "^3.2.4",
     "typescript": "^4.9.4"
   },
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
deleted file mode 100644
index 838f8c75..00000000
--- a/prisma/schema.prisma
+++ /dev/null
@@ -1,89 +0,0 @@
-generator client {
-  provider = "prisma-client-js"
-}
-
-datasource db {
-  provider = "postgresql"
-  url      = env("DATABASE_URL")
-}
-
-model Projects {
-  description  String
-  difficulty   Int
-  rating       Int
-  departments  String?
-  project_id   Int          @id
-  name         String
-  team_lead    String
-  created_date DateTime
-  Departments  Departments? @relation(fields: [departments], references: [department_id])
-  User         User[]       @relation("ProjectsToUser")
-}
-
-model Departments {
-  department_id String     @id
-  name          String
-  projects      Projects[]
-}
-
-model User {
-  attendance      Int?            @default(0)
-  batch           String?
-  department      String?
-  diet            String?
-  email           String          @unique
-  course          String?
-  gender          String?
-  hashedPassword  String
-  id              String          @id
-  image           String?
-  linkedin        String?
-  name            String?
-  phone           String?
-  personal_email  String?
-  roles           String?
-  shirt           String?
-  telegram        String?        @default(0)
-  year            String?
-  date_of_birth   DateTime?
-
-  isAdmin         Boolean?        @default(false)
-  announcements   Announcements[]
-  events          Event[]         @relation("EventToUser")
-  projects        Projects[]      @relation("ProjectsToUser")
-  Attendance      Attendance[]    @relation("attendanceToUser")
-  AttendanceTaken Attendance[]
-}
-
-model Event {
-  endDate    DateTime     @db.Date
-  hasStarted Boolean      @default(false)
-  name       String
-  id         String       @id @default(uuid())
-  qr_code    String?
-  startDate  DateTime     @default(now()) @db.Date
-  Attendance Attendance[]
-  attendees  User[]       @relation("EventToUser")
-}
-
-model Log {
-  date    DateTime? @default(now())
-  message String
-  id      String    @id @default(uuid())
-  title   String
-  type    LogType
-}
-
-model Attendance {
-  id      String @id
-  eventId String
-  userId  String
-  Event   Event  @relation(fields: [eventId], references: [id])
-  user    User   @relation(fields: [userId], references: [id])
-  User    User[] @relation("attendanceToUser")
-}
-
-enum LogType {
-  WARNING
-  ERROR
-}
diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index a9956c0c..13263710 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -1,5 +1,4 @@
 import { Box, Table, TableContainer, Tbody, Td, Tr } from '@chakra-ui/react'
-import type { Projects } from '@prisma/client'
 
 type ProfilePageType = {
   gender: string | null
diff --git a/src/components/users/UserTable.tsx b/src/components/users/UserTable.tsx
index 73537260..f885caa8 100644
--- a/src/components/users/UserTable.tsx
+++ b/src/components/users/UserTable.tsx
@@ -29,7 +29,7 @@ const UserTable = ({ session }: { session: Session }) => {
           colorScheme="black"
           onClick={(e) => {
             e.preventDefault()
-            setSelected(data.id)
+            setSelected(data.id as string)
             onOpen()
           }}
         >
diff --git a/src/server/db/client.ts b/src/server/db/client.ts
deleted file mode 100644
index d632301c..00000000
--- a/src/server/db/client.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { PrismaClient } from '@prisma/client'
-
-import { env } from '../../env/server.mjs'
-
-declare global {
-  // eslint-disable-next-line no-var
-  var prisma: PrismaClient | undefined
-}
-
-export const prisma =
-  global.prisma ||
-  new PrismaClient({
-    log:
-      env.NODE_ENV === 'development' ? ['query', 'error', 'warn'] : ['error'],
-  })
-
-if (env.NODE_ENV !== 'production') {
-  global.prisma = prisma
-}
diff --git a/src/server/trpc/context.ts b/src/server/trpc/context.ts
index 76223529..ab99fae1 100644
--- a/src/server/trpc/context.ts
+++ b/src/server/trpc/context.ts
@@ -3,7 +3,6 @@ import { type CreateNextContextOptions } from '@trpc/server/adapters/next'
 import { type Session } from 'next-auth'
 
 import { getServerAuthSession } from '../common/get-server-auth-session'
-import { prisma } from '../db/client'
 
 type CreateContextOptions = {
   session: Session | null
@@ -17,7 +16,6 @@ type CreateContextOptions = {
 export const createContextInner = async (opts: CreateContextOptions) => {
   return {
     session: opts.session,
-    prisma,
   }
 }
 
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index 730a4710..e30194c9 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -1,30 +1,9 @@
 import { TRPCError } from '@trpc/server'
 import nodemailer from 'nodemailer'
 import { env } from '~/env/server.mjs'
-import type { User } from '@prisma/client'
-import { type PrismaClient } from '@prisma/client'
 import dayjs from 'dayjs'
 import userCollection from '~/server/db/collections/UserCollection'
 
-/**
- * Validates whether the user has the necessary permissions
- *
- * @param id The student id of the user
- * @throws {TRPCError} if the user does not have permission
- */
-async function checkUserPermission(id: string, prisma: PrismaClient) {
-  const personMakingRequest = await prisma.user.findUnique({
-    where: { id },
-  })
-
-  if (!personMakingRequest || !personMakingRequest.isAdmin) {
-    throw new TRPCError({
-      code: 'UNAUTHORIZED',
-      message: 'User is not authorized to create a new account',
-    })
-  }
-}
-
 /**
  * Validates whether the user already exists in the database
  *
@@ -148,22 +127,4 @@ async function sendMultipleEmails(emails: string[], password: string) {
   )
 }
 
-/**
- * Creates many users in the database
- *
- * @param users The array of users object
- */
-async function createManyUsers(users: User[], prisma: PrismaClient) {
-  await prisma.user.createMany({
-    data: users,
-  })
-}
-
-export {
-  createManyUsers,
-  checkUserPermission,
-  checkIfUserExist,
-  sendEmail,
-  sendMultipleEmails,
-  buildUserObject,
-}
+export { checkIfUserExist, sendEmail, sendMultipleEmails, buildUserObject }
diff --git a/src/server/trpc/router/users/getAllUsers.ts b/src/server/trpc/router/users/getAllUsers.ts
new file mode 100644
index 00000000..43f7e8a6
--- /dev/null
+++ b/src/server/trpc/router/users/getAllUsers.ts
@@ -0,0 +1,15 @@
+import { protectedProcedure } from '../../trpc'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const getAllUsers = protectedProcedure.query(async () => {
+  const users = await userCollection.queries([])
+  return users.map((user) => {
+    return {
+      department: user.department,
+      email: user.email,
+      id: user.id,
+      name: user.name,
+      role: user.role,
+    }
+  })
+})
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index 508ff850..d96ba604 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -1,6 +1,4 @@
 import { router } from '~/server/trpc/trpc'
-import { protectedProcedure } from '~/server/trpc/trpc'
-import { TRPCError } from '@trpc/server'
 import { resetPassword } from './resetPassword'
 import { changePassword } from './changePassword'
 import { getAllUsersForTable } from './getAllUsersForTable'
@@ -12,27 +10,7 @@ import { createSingleUser } from './createSingleUser'
 import { deleteUserImage } from './deleteUserImage'
 import { updateUserProfile } from './updateUserProfile'
 import { updateUserContacts } from './updateUserContacts'
-
-const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
-  try {
-    const users = await ctx.prisma.user.findMany({
-      select: {
-        department: true,
-        email: true,
-        id: true,
-        name: true,
-        role: true,
-      },
-    })
-
-    return users
-  } catch (e) {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: (e as Error).message,
-    })
-  }
-})
+import { getAllUsers } from './getAllUsers'
 
 export const userRouter = router({
   changePassword,
diff --git a/yarn.lock b/yarn.lock
index 558b4b9b..778c1a95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1756,11 +1756,6 @@
     hey-listen "^1.0.8"
     tslib "^2.3.1"
 
-"@next-auth/prisma-adapter@1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@next-auth/prisma-adapter/-/prisma-adapter-1.0.5.tgz#41a2fc7b44907054b81d456b426164e58becf4ed"
-  integrity sha512-VqMS11IxPXrPGXw6Oul6jcyS/n8GLOWzRMrPr3EMdtD6eOalM6zz05j08PcNiis8QzkfuYnCv49OvufTuaEwYQ==
-
 "@next/bundle-analyzer@^13.1.1":
   version "13.1.6"
   resolved "https://registry.npmjs.org/@next/bundle-analyzer/-/bundle-analyzer-13.1.6.tgz"
@@ -1893,23 +1888,6 @@
   resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz"
   integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==
 
-"@prisma/client@^4.14.0":
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.14.0.tgz#715b3dd045d094b03cb0a7f2991f088d15ae553e"
-  integrity sha512-MK/XaA2sFdfaOa7I9MjNKz6dxeIEdeZlnpNRoF2w3JuRLlFJLkpp6cD3yaqw2nUUhbrn3Iqe3ZpVV+VuGGil7Q==
-  dependencies:
-    "@prisma/engines-version" "4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c"
-
-"@prisma/engines-version@4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c":
-  version "4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c.tgz#0aeca447c4a5f23c83f68b8033e627b60bc01850"
-  integrity sha512-3jum8/YSudeSN0zGW5qkpz+wAN2V/NYCQ+BPjvHYDfWatLWlQkqy99toX0GysDeaUoBIJg1vaz2yKqiA3CFcQw==
-
-"@prisma/engines@4.14.0":
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.14.0.tgz#4bed9e6f3d01bb0e4598e76c1726f33579d6a2c3"
-  integrity sha512-PDNlhP/1vyTgmNyiucGqGCdXIp7HIkkvKO50si3y3PcceeHvqtiKPaH1iJdz63jCWMVMbj2MElSxXPOeBvEVIQ==
-
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
@@ -4496,13 +4474,6 @@ pretty-format@^3.8.0:
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-3.8.0.tgz#bfbed56d5e9a776645f4b1ff7aa1a3ac4fa3c385"
   integrity sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==
 
-prisma@^4.14.0:
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.14.0.tgz#1328308f6b2b4b0f5f1e4839b4d81e817377e179"
-  integrity sha512-+5dMl1uxMQb4RepndY6AwR9xi1cDcaGFICu+ws6/Nmgt93mFPNj8tYxSfTdmfg+rkNrUId9rk/Ac2vTgLe/oXA==
-  dependencies:
-    "@prisma/engines" "4.14.0"
-
 prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"

From 1e0282617c822afd37bd9fdb0cbbbbcf7a8ee714 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 31 May 2023 23:17:02 +0800
Subject: [PATCH 052/223] Remove database url from the env

---
 src/env/schema.mjs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/env/schema.mjs b/src/env/schema.mjs
index 952589b0..f513916e 100644
--- a/src/env/schema.mjs
+++ b/src/env/schema.mjs
@@ -6,7 +6,6 @@ import {z} from "zod";
  * This way you can ensure the app isn't built with invalid env vars.
  */
 export const serverSchema = z.object({
-  DATABASE_URL: z.string().url(),
   DOMAIN: z.string().url(),
   NODE_ENV: z.enum(["development", "test", "production"]),
   NEXTAUTH_SECRET:

From 29c618345980b93ddc6f992ab4e22210e09e934b Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Wed, 31 May 2023 23:26:27 +0800
Subject: [PATCH 053/223] add applicants fields

---
 .../db/collections/AppliedRoleCollection.ts     | 10 ++++++++++
 src/server/db/models/AppliedRole.ts             | 17 +++++++++++++++++
 src/server/db/models/User.ts                    |  6 ++++++
 3 files changed, 33 insertions(+)
 create mode 100644 src/server/db/collections/AppliedRoleCollection.ts
 create mode 100644 src/server/db/models/AppliedRole.ts

diff --git a/src/server/db/collections/AppliedRoleCollection.ts b/src/server/db/collections/AppliedRoleCollection.ts
new file mode 100644
index 00000000..350a59e5
--- /dev/null
+++ b/src/server/db/collections/AppliedRoleCollection.ts
@@ -0,0 +1,10 @@
+import { BaseCollection } from './BaseCollection'
+import type { AppliedRole } from '../models/AppliedRole'
+
+class AppliedRoleCollection extends BaseCollection<AppliedRole> {
+  protected override collectionName = 'appliedroles'
+  protected override objectName = 'appliedrole'
+}
+
+const userCollection = new AppliedRoleCollection()
+export default userCollection
diff --git a/src/server/db/models/AppliedRole.ts b/src/server/db/models/AppliedRole.ts
new file mode 100644
index 00000000..000b01fe
--- /dev/null
+++ b/src/server/db/models/AppliedRole.ts
@@ -0,0 +1,17 @@
+import type { User } from './User'
+
+export type AppliedRole = {
+  rank: number
+  department: string
+  role: string
+  status: ApplicationStatus
+  applicant: User
+}
+
+export enum ApplicationStatus {
+  ACCEPTED = 'Accepted',
+  OFFERED = 'Offered',
+  PENDINGREVIEW = 'Pending Review',
+  INTERVIEWED = 'Interviewed',
+  REJECTED = 'Rejected',
+}
diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index 41fec1ac..363995ca 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -1,3 +1,5 @@
+import type { AppliedRole } from './AppliedRole'
+
 export type User = {
   department: string
   email: string
@@ -18,4 +20,8 @@ export type User = {
   phone?: string
   telegram?: string
   dob: string // Store in DD-MM format so that we can get their birthday easily.
+
+  // Applicant fields
+  interviewNotes?: string
+  appliedRoles?: AppliedRole[]
 }

From 63d96464eb271ac4923e7990e9027b34a8613f35 Mon Sep 17 00:00:00 2001
From: benjytan45678 <Benjytan45678@gmail.com>
Date: Sun, 21 May 2023 00:23:41 +0800
Subject: [PATCH 054/223] add calendar functionality

---
 package.json                             |   5 +
 src/components/calendar/Meeting.tsx      |  86 +++++++++++
 src/components/calendar/SideCalendar.tsx | 179 +++++++++++++++++++++++
 src/components/common/TopNavbar.tsx      |   6 +
 src/pages/calendar/index.tsx             |  89 +++++++++++
 yarn.lock                                |  81 +++++++++-
 6 files changed, 444 insertions(+), 2 deletions(-)
 create mode 100644 src/components/calendar/Meeting.tsx
 create mode 100644 src/components/calendar/SideCalendar.tsx
 create mode 100644 src/pages/calendar/index.tsx

diff --git a/package.json b/package.json
index a43c912b..d0be7664 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,9 @@
     "@chakra-ui/react": "^2.6.1",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
+    "@fullcalendar/react": "^6.1.7",
+    "@headlessui/react": "^1.7.14",
+    "@heroicons/react": "v1",
     "@hookform/resolvers": "^2.9.10",
     "@next-auth/prisma-adapter": "1.0.5",
     "@prisma/client": "^4.14.0",
@@ -28,10 +31,12 @@
     "@trpc/server": "^10.26.0",
     "bcryptjs": "^2.4.3",
     "clsx": "^1.2.1",
+    "date-fns": "^2.30.0",
     "dayjs": "^1.11.7",
     "flowbite": "^1.6.5",
     "flowbite-react": "^0.4.4",
     "framer-motion": "^9.0.4",
+    "fullcalendar": "^6.1.7",
     "next": "^13.1.6",
     "next-auth": "^4.22.1",
     "nodemailer": "^6.9.2",
diff --git a/src/components/calendar/Meeting.tsx b/src/components/calendar/Meeting.tsx
new file mode 100644
index 00000000..ff3018d1
--- /dev/null
+++ b/src/components/calendar/Meeting.tsx
@@ -0,0 +1,86 @@
+import { Menu} from '@headlessui/react'
+import {format, parseISO} from 'date-fns'
+import { DotsVerticalIcon } from '@heroicons/react/outline'
+
+export type Meeting = {
+    id: number 
+    title: string | null
+    start: string 
+    end: string
+}
+export type meeting = {
+    meeting: Meeting
+}
+
+function combineClasses(classes: string[]) {
+    return classes.join('')
+}
+
+export default function Meeting({meeting}: meeting) {
+    const startDateTime = parseISO(meeting.start)
+    const endDateTime = parseISO(meeting.end)
+  
+    return (
+      <li className="flex items-center px-4 py-2 space-x-4 group rounded-xl focus-within:bg-green-400 hover:bg-green-400">
+        <div className="flex-auto text-white">
+          <p className="font-bold">{meeting.title}</p>
+          <p className="mt-0.5">
+            <time dateTime={meeting.start}>
+              {format(startDateTime, 'h:mm a')}
+            </time>{' '}
+            -{' '}
+            <time dateTime={meeting.end}>
+              {format(endDateTime, 'h:mm a')}
+            </time>
+          </p>
+        </div>
+        <Menu
+          as="div"
+          className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
+        >
+          <div>
+            <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
+              <span className="sr-only">Open options</span>
+              <DotsVerticalIcon className="w-6 h-6" aria-hidden="true" />
+            </Menu.Button>
+          </div>
+            <Menu.Items className="absolute right-0 z-10 mt-2 origin-top-right bg-white rounded-md shadow-lg w-36 ring-1 ring-black ring-opacity-5 focus:outline-none">
+              <div className="py-1">
+                <Menu.Item>
+                  {({ active }) => (
+                    <button
+                      className={
+                        combineClasses(['block px-4 py-2 text-sm'].concat(
+                            active ? 'bg-gray-100 text-black' : 'text-gray-900'))
+                      }
+                      onClick={() => {
+                        alert("You want to edit meeting")
+                      }}                    
+                    >
+                      Edit Meeting
+                    </button>
+                  )}
+                </Menu.Item>
+                <Menu.Item>
+                  {({ active }) => (
+                    <button
+                      className={
+                        combineClasses(['block px-4 py-2 text-sm'].concat(
+                        active ? 'bg-gray-100 text-black' : 'text-gray-900'))
+                      }
+                      onClick={() => {
+                        alert("You want to cancel meeting")
+                      }}
+                    >
+                      Cancel Meeting
+                    </button>
+                  )}
+                </Menu.Item>
+              </div>
+            </Menu.Items>
+        </Menu>
+      </li>
+    )
+  }
+  
+  
\ No newline at end of file
diff --git a/src/components/calendar/SideCalendar.tsx b/src/components/calendar/SideCalendar.tsx
new file mode 100644
index 00000000..23d7be80
--- /dev/null
+++ b/src/components/calendar/SideCalendar.tsx
@@ -0,0 +1,179 @@
+import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/solid'
+import {
+  add,
+  eachDayOfInterval,
+  endOfMonth,
+  getDay,
+  format,
+  parseISO,
+  isEqual,
+  isSameDay,
+  isSameMonth,
+  isToday,
+  parse,
+  startOfToday,
+} from 'date-fns'
+import { useState } from 'react'
+import Meeting from './Meeting'
+
+export type Meeting = {
+    id: number 
+    title: string | null
+    start: string 
+    end: string
+}
+
+export type Meetings = {
+    meetings: Meeting[]
+}
+
+function classNames(...classes) {
+    return classes.filter(Boolean).join(' ')
+  }
+
+export default function SideCalendar({meetings}: Meetings) {
+  const today = startOfToday()
+  const [selectedDay, setSelectedDay] = useState(today)
+  const [currentMonth, setCurrentMonth] = useState(format(today, 'MMM-yyyy'))
+  const firstDayCurrentMonth = parse(currentMonth, 'MMM-yyyy', new Date())
+
+  const days = eachDayOfInterval({
+    start: firstDayCurrentMonth,
+    end: endOfMonth(firstDayCurrentMonth),
+  })
+
+  function previousMonth() {
+    const firstDayNextMonth = add(firstDayCurrentMonth, { months: -1 })
+    setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
+  }
+
+  function nextMonth() {
+    const firstDayNextMonth = add(firstDayCurrentMonth, { months: 1 })
+    setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
+  }
+
+  const selectedDayMeetings = meetings?.filter((meeting) =>
+    isSameDay(parseISO(meeting.start), selectedDay)
+  ) 
+
+  return (
+    <div className="pt-16 bg-zinc-900 col-span-1">
+      <div className="max-w-md px-4 mx-auto sm:px-7 md:max-w-4xl md:px-6">
+        <div className="md:grid md:grid-rows-2">
+          <div className="md:pr-14">
+            <div className="flex items-center">
+              <h2 className="flex-auto font-semibold text-white text-4xl">
+                {format(firstDayCurrentMonth, 'MMMM yyyy')}
+              </h2>
+              <button
+                type="button"
+                onClick={previousMonth}
+                className="-my-1.5 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
+              >
+                <span className="sr-only">Previous month</span>
+                <ChevronLeftIcon className="w-5 h-5" aria-hidden="true" />
+              </button>
+              <button
+                onClick={nextMonth}
+                type="button"
+                className="-my-1.5 -mr-1.5 ml-2 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
+              >
+                <span className="sr-only">Next month</span>
+                <ChevronRightIcon className="w-5 h-5" aria-hidden="true" />
+              </button>
+            </div>
+            <div className="grid grid-cols-7 mt-10 text-xs leading-6 text-center text-gray-500">
+              <div>S</div>
+              <div>M</div>
+              <div>T</div>
+              <div>W</div>
+              <div>T</div>
+              <div>F</div>
+              <div>S</div>
+            </div>
+            <div className="grid grid-cols-7 mt-2 text-sm">
+              {days.map((day, dayIdx) => (
+                <div
+                  key={day.toString()}
+                  className={classNames(
+                    dayIdx === 0 && colStartClasses[getDay(day)],
+                    'py-1.5'
+                  )}
+                >
+                  <button
+                    type="button"
+                    onClick={() => setSelectedDay(day)}
+                    className={classNames(
+                      !isEqual(day, selectedDay) &&
+                        isToday(day) &&
+                        'text-red-500',
+                      !isEqual(day, selectedDay) &&
+                        !isToday(day) &&
+                        isSameMonth(day, firstDayCurrentMonth) &&
+                        'text-gray-900',
+                      !isEqual(day, selectedDay) &&
+                        !isToday(day) &&
+                        !isSameMonth(day, firstDayCurrentMonth) &&
+                        'text-gray-400',
+                      isEqual(day, selectedDay) && isToday(day) && 'bg-red-500',
+                      isEqual(day, selectedDay) &&
+                        !isToday(day) &&
+                        'bg-blue-400',
+                      !isEqual(day, selectedDay) && 'hover:bg-yellow-400',
+                      (isEqual(day, selectedDay) || isToday(day)) &&
+                        'font-semibold',
+                      'mx-auto flex h-8 w-8 items-center justify-center rounded-full'
+                    )}
+                  >
+                    <time className = "text-white" dateTime={format(day, 'yyyy-MM-dd')}>
+                      {format(day, 'd')}
+                    </time>
+                  </button>
+
+                  <div className="w-1 h-1 mx-auto mt-1">
+                    {meetings?.some((meeting) =>
+                      isSameDay(parseISO(meeting.start), day)
+                    ) && (
+                      <div className="w-1 h-1 rounded-full bg-violet-700"></div>
+                    )}
+                  </div>
+                </div>
+              ))}
+            </div>
+          </div>
+          <section className="divide-y divide-gray-400">
+            <h2 className="font-semibold text-blue-700 text-center">
+              {isSameDay(today, selectedDay)
+              ?'TODAY ' 
+              : ''
+              }
+              <time dateTime={format(selectedDay, 'yyyy-MM-dd')}>
+                {format(selectedDay, 'dd/LL/yyyy')}
+              </time>
+            </h2>
+            <ol className="text-sm leading-6 text-gray-500">
+              {selectedDayMeetings?.length > 0 ? (
+                selectedDayMeetings?.map((meeting) => (
+                  <Meeting meeting={meeting} key={meeting.id}/>
+                ))
+              ) : (
+                <p>No meetings for today.</p>
+              )}
+            </ol>
+          </section>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+
+const colStartClasses = [
+  '',
+  'col-start-2',
+  'col-start-3',
+  'col-start-4',
+  'col-start-5',
+  'col-start-6',
+  'col-start-7',
+]
diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index a87e1ee2..340a808a 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -37,6 +37,9 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
           <Link href="/profile">
             <Dropdown.Item>Profile</Dropdown.Item>
           </Link>
+          <Link href = "/calendar">
+            <Dropdown.Item>Calendar</Dropdown.Item>
+          </Link>
           <Dropdown.Item>
             <div onClick={logout}>Sign Out</div>
           </Dropdown.Item>
@@ -55,6 +58,9 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
         <Navbar.Link href="/events" className="ml-4 text-white">
           Events
         </Navbar.Link>
+        <Navbar.Link href="/calendar" className="ml-4 text-white">
+          Calendar
+        </Navbar.Link>
       </Navbar.Collapse>
     </Navbar>
   )
diff --git a/src/pages/calendar/index.tsx b/src/pages/calendar/index.tsx
new file mode 100644
index 00000000..32a0eee9
--- /dev/null
+++ b/src/pages/calendar/index.tsx
@@ -0,0 +1,89 @@
+import Layout from '~/components/common/Layout'
+import Head from 'next/head'
+import TopNavbar from '~/components/common/TopNavbar'
+import withAuth, {type BaseProps} from '~/utils/withAuth'
+import FullCalendar from '@fullcalendar/react' // must go before plugins
+import dayGridPlugin from '@fullcalendar/daygrid'
+import interactionPlugin from '@fullcalendar/interaction'
+import timeGridPlugin from '@fullcalendar/timegrid'
+import styled from "@emotion/styled";
+import { useState } from 'react'
+import SideCalendar from '~/components/calendar/sideCalendar'
+
+// add styles as css
+export const StyleWrapper = styled.div`
+`
+
+const meetings = [
+  {
+    id: 1,
+    title: 'Meeting 1',
+    start: '2023-05-11T13:00',
+    end: '2023-05-11T14:30',
+  },
+  {
+    id: 2,
+    title: 'Meeting 2',
+    start: '2023-05-20T09:00',
+    end: '2023-05-20T11:30',
+  },
+  {
+    id: 3,
+    title: 'Meeting 3',
+    start: '2023-05-20T17:00',
+    end: '2023-05-20T18:30',
+  },
+  {
+    id: 4,
+    title: 'Meeting 4',
+    start: '2023-06-09T13:00',
+    end: '2023-06-09T14:30',
+  },
+  {
+    id: 5,
+    title: 'Meeting 5',
+    start: '2023-05-13T14:00',
+    end: '2023-05-13T14:30',
+  },
+]
+
+const CalendarPage: React.FC<BaseProps> = ({session}) => {
+    const [events, useEvents] = useState(
+        [
+            { title: 'event 1', start: '2023-05-01T15:30' ,end: '2023-05-01T16:30'},
+            { title: 'event 2', start: '2023-05-02T06:00' , end: '2023-05-02T07:00'}
+        ]
+    );
+  return (
+    <>
+      <Head>
+        <title>Atlas | Calendar</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta name="description" content="The calendar page for Atlas" />
+      </Head>
+      <TopNavbar isAdmin={session.isAdmin} />
+      <div className="grid-container grid grid-cols-5">
+      <SideCalendar meetings={meetings}/>
+      <StyleWrapper className='col-span-4'>
+        <FullCalendar
+            plugins={[ dayGridPlugin, timeGridPlugin, interactionPlugin]}
+            initialView="dayGridMonth"
+            headerToolbar={{
+                start: 'prev,today,next',
+                center: 'dayGridMonth,timeGridWeek,timeGridDay',
+                end: 'title'
+            }}
+            allDaySlot = {false}
+            events = {events}
+            eventClick={(info) => {
+                alert('Event: ' + info.event.title);
+            }}
+
+        />
+    </StyleWrapper>
+    </div>
+    </>
+  )
+}
+
+export default withAuth(CalendarPage, true)
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index f0e0b271..105c91b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -163,7 +163,7 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.20.13":
+"@babel/runtime@^7.20.13", "@babel/runtime@^7.21.0":
   version "7.21.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"
   integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
@@ -1184,6 +1184,59 @@
     aria-hidden "^1.1.3"
     tabbable "^6.0.1"
 
+"@fullcalendar/core@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/core/-/core-6.1.7.tgz#83d8b109fbf0deb1d4c3262ca4b2d70e77a287c4"
+  integrity sha512-Hc63ARSyABlNo10B3NkA0z8ndaDmq5MKpcBB2iQsGQyn8N8cyn/x6V284Je1EwDoKsBlbrZAj+j+efBO+QQf5g==
+  dependencies:
+    preact "~10.12.1"
+
+"@fullcalendar/daygrid@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/daygrid/-/daygrid-6.1.7.tgz#529d5f1989081c5ab9d129fcaf409111b31be976"
+  integrity sha512-IB+QdRcs+TeTlsK8qJFtYZ/2GugmXEFC0C00/n1aLT7GLgFn3ueV1GN0EKvXv9HJ5ai8My65mYbSyQizY/Ishw==
+
+"@fullcalendar/interaction@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/interaction/-/interaction-6.1.7.tgz#f2d86312371b284b46caae8c74b303e1fc7bdd4c"
+  integrity sha512-C2KHSinc9cFUTcGYxRSIj7cBYNSroce+1d2Wa+HKVHguVv4kQuEvm/oPxJpTLXqFjNLfxyxVac7Zd4U0znjFtg==
+
+"@fullcalendar/list@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/list/-/list-6.1.7.tgz#27d1b11984c9e4fc66da9a71b2429d38c427be94"
+  integrity sha512-Fl6jGKylhrk+g/RCISsv66vzpzjCFhd4r3nUDeHTAAE375OYGlVPKpH67YaKxpMrofj82JLIzS3JEzyQBZo0Cg==
+
+"@fullcalendar/multimonth@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/multimonth/-/multimonth-6.1.7.tgz#bec09460746abd96b147306c4b5a342c56dbf049"
+  integrity sha512-x4Z8XjmjlXNElZsVYr+AdNYiGPrYdmG3nxDYjxIDPl1CvH/pAmZinaRlOmVP4wq7ES9RP/9xOlAhe2/RKpsh3w==
+  dependencies:
+    "@fullcalendar/daygrid" "~6.1.7"
+
+"@fullcalendar/react@^6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/react/-/react-6.1.7.tgz#acdfaa84b0b12a9a70b26a6e8d494c14de0d3b44"
+  integrity sha512-Pwe88D4zXwP/XQsYWOa1foroF/OpHSLet5CiE4crnaKvngEtzt3SBDIO01agQOpo+yE1KM/n3yE5ePbdJtVJIQ==
+
+"@fullcalendar/timegrid@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/timegrid/-/timegrid-6.1.7.tgz#1c2dac33a7870928359f17a5e142d26f08022f79"
+  integrity sha512-kVgJVswu96LrCozr+GyYzF+LUZjURC4HyDg11tCfrj2wMTsrYKqUxilTGXuD3daD4T7qp3CLCg5GdD6lbYHI7A==
+  dependencies:
+    "@fullcalendar/daygrid" "~6.1.7"
+
+"@headlessui/react@^1.7.14":
+  version "1.7.14"
+  resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.14.tgz#75f19552c535113640fe8a3a40e71474f49e89c9"
+  integrity sha512-znzdq9PG8rkwcu9oQ2FwIy0ZFtP9Z7ycS+BAqJ3R5EIqC/0bJGvhT7193rFf+45i9nnPsYvCQVW4V/bB9Xc+gA==
+  dependencies:
+    client-only "^0.0.1"
+
+"@heroicons/react@v1":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@heroicons/react/-/react-1.0.6.tgz#35dd26987228b39ef2316db3b1245c42eb19e324"
+  integrity sha512-JJCXydOFWMDpCP4q13iEplA503MQO3xLoZiKum+955ZCtHINWnx26CUxVxxFQu/uLb4LW3ge15ZpzIkXKkJ8oQ==
+
 "@hookform/resolvers@^2.9.10":
   version "2.9.11"
   resolved "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-2.9.11.tgz"
@@ -2010,7 +2063,7 @@ classnames@^2.2.6, classnames@^2.3.2:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
   integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
 
-client-only@0.0.1:
+client-only@0.0.1, client-only@^0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz"
   integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
@@ -2146,6 +2199,13 @@ damerau-levenshtein@^1.0.8:
   resolved "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
+date-fns@^2.30.0:
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
+  integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
+  dependencies:
+    "@babel/runtime" "^7.21.0"
+
 dayjs@^1.11.7:
   version "1.11.7"
   resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"
@@ -2793,6 +2853,18 @@ fsevents@~2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
+fullcalendar@^6.1.7:
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-6.1.7.tgz#f1ab71bd128a584359b4c823ac93646d01c6dd17"
+  integrity sha512-e4KF/wf0gOilgDRAhOOJZrAzzPqDDAGF0SogyM0rTrZvn4HgC3ZL9CfBttc4juMMnmKQGNcGt649+ZnG+zxUTA==
+  dependencies:
+    "@fullcalendar/core" "~6.1.7"
+    "@fullcalendar/daygrid" "~6.1.7"
+    "@fullcalendar/interaction" "~6.1.7"
+    "@fullcalendar/list" "~6.1.7"
+    "@fullcalendar/multimonth" "~6.1.7"
+    "@fullcalendar/timegrid" "~6.1.7"
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -3840,6 +3912,11 @@ preact@^10.6.3:
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.13.2.tgz#2c40c73d57248b57234c4ae6cd9ab9d8186ebc0a"
   integrity sha512-q44QFLhOhty2Bd0Y46fnYW0gD/cbVM9dUVtNTDKPcdXSMA7jfY+Jpd6rk3GB0lcQss0z5s/6CmVP0Z/hV+g6pw==
 
+preact@~10.12.1:
+  version "10.12.1"
+  resolved "https://registry.yarnpkg.com/preact/-/preact-10.12.1.tgz#8f9cb5442f560e532729b7d23d42fd1161354a21"
+  integrity sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"

From ee952e8129493ba2dbf77c2b160890ea1da2ca18 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sun, 21 May 2023 18:26:46 +0800
Subject: [PATCH 055/223] Remove unused bottom navbar and layout

---
 src/components/calendar/SideCalendar.tsx |  2 +-
 src/components/common/BottomNavbar.tsx   | 62 ------------------------
 src/components/common/Layout.tsx         | 14 ------
 src/components/common/TopNavbar.tsx      |  4 +-
 src/pages/calendar/index.tsx             | 51 +++++++++----------
 src/pages/users/index.tsx                | 10 ++--
 6 files changed, 30 insertions(+), 113 deletions(-)
 delete mode 100644 src/components/common/BottomNavbar.tsx
 delete mode 100644 src/components/common/Layout.tsx

diff --git a/src/components/calendar/SideCalendar.tsx b/src/components/calendar/SideCalendar.tsx
index 23d7be80..341fa635 100644
--- a/src/components/calendar/SideCalendar.tsx
+++ b/src/components/calendar/SideCalendar.tsx
@@ -27,7 +27,7 @@ export type Meetings = {
     meetings: Meeting[]
 }
 
-function classNames(...classes) {
+function classNames(...classes: any[]) {
     return classes.filter(Boolean).join(' ')
   }
 
diff --git a/src/components/common/BottomNavbar.tsx b/src/components/common/BottomNavbar.tsx
deleted file mode 100644
index 3e895d01..00000000
--- a/src/components/common/BottomNavbar.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import Image from 'next/image'
-import Link from 'next/link'
-
-const BottomNavBar = () => {
-  return (
-    <section
-      id="bottom-navigation"
-      className="fixed inset-x-0 bottom-0 z-10 block bg-white shadow md:invisible"
-    >
-      <div id="tabs" className="flex justify-between">
-        {TabConfig.map(({ href, src, title }, index) => (
-          <TabButton key={index} href={href} src={src} title={title} />
-        ))}
-      </div>
-    </section>
-  )
-}
-
-export default BottomNavBar
-
-const TabButton = ({ href, src, title }: TabButtonProps) => {
-  return (
-    <div className="inline-block w-full justify-center pt-2 pb-1 text-center hover:text-teal-500 focus:text-teal-500">
-      <Link href={href}>
-        <div>
-          <Image
-            alt="Home"
-            className="mb-1 inline-block"
-            height={25}
-            src={src}
-            width={25}
-          />
-          <span className="block text-xs">{title}</span>
-        </div>
-      </Link>
-    </div>
-  )
-}
-
-type TabButtonProps = {
-  href: string
-  src: string
-  title: string
-}
-
-const TabConfig: TabButtonProps[] = [
-  {
-    href: '/',
-    src: '/mobile/home.svg',
-    title: 'Home',
-  },
-  {
-    href: '/event',
-    src: '/mobile/event.svg',
-    title: 'Event',
-  },
-  {
-    href: '/profile',
-    src: '/mobile/profile.svg',
-    title: 'Profile',
-  },
-]
diff --git a/src/components/common/Layout.tsx b/src/components/common/Layout.tsx
deleted file mode 100644
index 4ffcd6c7..00000000
--- a/src/components/common/Layout.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import BottomNavBar from './BottomNavbar'
-
-const Layout = ({ children }: { children: JSX.Element[] | JSX.Element }) => {
-  return (
-    <>
-      <div className="relative mx-auto mt-8 min-h-screen w-screen flex-col">
-        {children}
-      </div>
-      <BottomNavBar />
-    </>
-  )
-}
-
-export default Layout
diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index 340a808a..b66bc11b 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -37,7 +37,7 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
           <Link href="/profile">
             <Dropdown.Item>Profile</Dropdown.Item>
           </Link>
-          <Link href = "/calendar">
+          <Link href="/calendar">
             <Dropdown.Item>Calendar</Dropdown.Item>
           </Link>
           <Dropdown.Item>
@@ -59,7 +59,7 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
           Events
         </Navbar.Link>
         <Navbar.Link href="/calendar" className="ml-4 text-white">
-          Calendar
+          Recruitment
         </Navbar.Link>
       </Navbar.Collapse>
     </Navbar>
diff --git a/src/pages/calendar/index.tsx b/src/pages/calendar/index.tsx
index 32a0eee9..80fe7e0f 100644
--- a/src/pages/calendar/index.tsx
+++ b/src/pages/calendar/index.tsx
@@ -1,18 +1,16 @@
-import Layout from '~/components/common/Layout'
 import Head from 'next/head'
 import TopNavbar from '~/components/common/TopNavbar'
-import withAuth, {type BaseProps} from '~/utils/withAuth'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
 import FullCalendar from '@fullcalendar/react' // must go before plugins
 import dayGridPlugin from '@fullcalendar/daygrid'
 import interactionPlugin from '@fullcalendar/interaction'
 import timeGridPlugin from '@fullcalendar/timegrid'
-import styled from "@emotion/styled";
+import styled from '@emotion/styled'
 import { useState } from 'react'
-import SideCalendar from '~/components/calendar/sideCalendar'
+import SideCalendar from '~/components/calendar/SideCalendar'
 
 // add styles as css
-export const StyleWrapper = styled.div`
-`
+export const StyleWrapper = styled.div``
 
 const meetings = [
   {
@@ -47,13 +45,11 @@ const meetings = [
   },
 ]
 
-const CalendarPage: React.FC<BaseProps> = ({session}) => {
-    const [events, useEvents] = useState(
-        [
-            { title: 'event 1', start: '2023-05-01T15:30' ,end: '2023-05-01T16:30'},
-            { title: 'event 2', start: '2023-05-02T06:00' , end: '2023-05-02T07:00'}
-        ]
-    );
+const CalendarPage: React.FC<BaseProps> = ({ session }) => {
+  const [events, useEvents] = useState([
+    { title: 'event 1', start: '2023-05-01T15:30', end: '2023-05-01T16:30' },
+    { title: 'event 2', start: '2023-05-02T06:00', end: '2023-05-02T07:00' },
+  ])
   return (
     <>
       <Head>
@@ -63,27 +59,26 @@ const CalendarPage: React.FC<BaseProps> = ({session}) => {
       </Head>
       <TopNavbar isAdmin={session.isAdmin} />
       <div className="grid-container grid grid-cols-5">
-      <SideCalendar meetings={meetings}/>
-      <StyleWrapper className='col-span-4'>
-        <FullCalendar
-            plugins={[ dayGridPlugin, timeGridPlugin, interactionPlugin]}
+        <SideCalendar meetings={meetings} />
+        <StyleWrapper className="col-span-4">
+          <FullCalendar
+            plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
             initialView="dayGridMonth"
             headerToolbar={{
-                start: 'prev,today,next',
-                center: 'dayGridMonth,timeGridWeek,timeGridDay',
-                end: 'title'
+              start: 'prev,today,next',
+              center: 'dayGridMonth,timeGridWeek,timeGridDay',
+              end: 'title',
             }}
-            allDaySlot = {false}
-            events = {events}
+            allDaySlot={false}
+            events={events}
             eventClick={(info) => {
-                alert('Event: ' + info.event.title);
+              alert('Event: ' + info.event.title)
             }}
-
-        />
-    </StyleWrapper>
-    </div>
+          />
+        </StyleWrapper>
+      </div>
     </>
   )
 }
 
-export default withAuth(CalendarPage, true)
\ No newline at end of file
+export default withAuth(CalendarPage, true)
diff --git a/src/pages/users/index.tsx b/src/pages/users/index.tsx
index 3569e37d..448c0c30 100644
--- a/src/pages/users/index.tsx
+++ b/src/pages/users/index.tsx
@@ -1,10 +1,9 @@
-import Layout from '~/components/common/Layout'
 import Head from 'next/head'
 import DataTable from '~/components/users/Table'
 import TopNavbar from '~/components/common/TopNavbar'
-import withAuth, {type BaseProps} from '~/utils/withAuth'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
 
-const AdminUserPage: React.FC<BaseProps> = ({session}) => {
+const AdminUserPage: React.FC<BaseProps> = ({ session }) => {
   return (
     <>
       <Head>
@@ -13,9 +12,8 @@ const AdminUserPage: React.FC<BaseProps> = ({session}) => {
         <meta name="description" content="The login page for Atlas" />
       </Head>
       <TopNavbar isAdmin={session.isAdmin} />
-      <Layout>
-        <DataTable />
-      </Layout>
+
+      <DataTable />
     </>
   )
 }

From 694ae3646deb4659b4bc4dffea2833fab1393406 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sun, 21 May 2023 18:33:46 +0800
Subject: [PATCH 056/223] Refactor out the MainCalendar

---
 src/components/calendar/MainCalendar.tsx |  36 ++++++
 src/components/calendar/Meeting.tsx      | 143 +++++++++++------------
 src/components/calendar/SideCalendar.tsx |  51 ++++----
 src/pages/calendar/index.tsx             |  31 +----
 4 files changed, 133 insertions(+), 128 deletions(-)
 create mode 100644 src/components/calendar/MainCalendar.tsx

diff --git a/src/components/calendar/MainCalendar.tsx b/src/components/calendar/MainCalendar.tsx
new file mode 100644
index 00000000..c41863d1
--- /dev/null
+++ b/src/components/calendar/MainCalendar.tsx
@@ -0,0 +1,36 @@
+import FullCalendar from '@fullcalendar/react' // must go before plugins
+import dayGridPlugin from '@fullcalendar/daygrid'
+import interactionPlugin from '@fullcalendar/interaction'
+import timeGridPlugin from '@fullcalendar/timegrid'
+import styled from '@emotion/styled'
+import { useState } from 'react'
+
+export const StyleWrapper = styled.div``
+
+const MainCalendar = () => {
+  const [events, useEvents] = useState([
+    { title: 'event 1', start: '2023-05-01T15:30', end: '2023-05-01T16:30' },
+    { title: 'event 2', start: '2023-05-02T06:00', end: '2023-05-02T07:00' },
+  ])
+
+  return (
+    <StyleWrapper className="col-span-4">
+      <FullCalendar
+        plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
+        initialView="dayGridMonth"
+        headerToolbar={{
+          start: 'prev,today,next',
+          center: 'dayGridMonth,timeGridWeek,timeGridDay',
+          end: 'title',
+        }}
+        allDaySlot={false}
+        events={events}
+        eventClick={(info) => {
+          alert('Event: ' + info.event.title)
+        }}
+      />
+    </StyleWrapper>
+  )
+}
+
+export default MainCalendar
diff --git a/src/components/calendar/Meeting.tsx b/src/components/calendar/Meeting.tsx
index ff3018d1..7ef3363c 100644
--- a/src/components/calendar/Meeting.tsx
+++ b/src/components/calendar/Meeting.tsx
@@ -1,86 +1,83 @@
-import { Menu} from '@headlessui/react'
-import {format, parseISO} from 'date-fns'
+import { Menu } from '@headlessui/react'
+import { format, parseISO } from 'date-fns'
 import { DotsVerticalIcon } from '@heroicons/react/outline'
 
 export type Meeting = {
-    id: number 
-    title: string | null
-    start: string 
-    end: string
+  id: number
+  title: string | null
+  start: string
+  end: string
 }
 export type meeting = {
-    meeting: Meeting
+  meeting: Meeting
 }
 
 function combineClasses(classes: string[]) {
-    return classes.join('')
+  return classes.join('')
 }
 
-export default function Meeting({meeting}: meeting) {
-    const startDateTime = parseISO(meeting.start)
-    const endDateTime = parseISO(meeting.end)
-  
-    return (
-      <li className="flex items-center px-4 py-2 space-x-4 group rounded-xl focus-within:bg-green-400 hover:bg-green-400">
-        <div className="flex-auto text-white">
-          <p className="font-bold">{meeting.title}</p>
-          <p className="mt-0.5">
-            <time dateTime={meeting.start}>
-              {format(startDateTime, 'h:mm a')}
-            </time>{' '}
-            -{' '}
-            <time dateTime={meeting.end}>
-              {format(endDateTime, 'h:mm a')}
-            </time>
-          </p>
+export default function Meeting({ meeting }: meeting) {
+  const startDateTime = parseISO(meeting.start)
+  const endDateTime = parseISO(meeting.end)
+
+  return (
+    <li className="group flex items-center space-x-4 rounded-xl px-4 py-2 focus-within:bg-green-400 hover:bg-green-400">
+      <div className="flex-auto text-white">
+        <p className="font-bold">{meeting.title}</p>
+        <p className="mt-0.5">
+          <time dateTime={meeting.start}>
+            {format(startDateTime, 'h:mm a')}
+          </time>{' '}
+          - <time dateTime={meeting.end}>{format(endDateTime, 'h:mm a')}</time>
+        </p>
+      </div>
+      <Menu
+        as="div"
+        className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
+      >
+        <div>
+          <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
+            <span className="sr-only">Open options</span>
+            <DotsVerticalIcon className="h-6 w-6" aria-hidden="true" />
+          </Menu.Button>
         </div>
-        <Menu
-          as="div"
-          className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
-        >
-          <div>
-            <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
-              <span className="sr-only">Open options</span>
-              <DotsVerticalIcon className="w-6 h-6" aria-hidden="true" />
-            </Menu.Button>
-          </div>
-            <Menu.Items className="absolute right-0 z-10 mt-2 origin-top-right bg-white rounded-md shadow-lg w-36 ring-1 ring-black ring-opacity-5 focus:outline-none">
-              <div className="py-1">
-                <Menu.Item>
-                  {({ active }) => (
-                    <button
-                      className={
-                        combineClasses(['block px-4 py-2 text-sm'].concat(
-                            active ? 'bg-gray-100 text-black' : 'text-gray-900'))
-                      }
-                      onClick={() => {
-                        alert("You want to edit meeting")
-                      }}                    
-                    >
-                      Edit Meeting
-                    </button>
+        <Menu.Items className="absolute right-0 z-10 mt-2 w-36 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+          <div className="py-1">
+            <Menu.Item>
+              {({ active }) => (
+                <button
+                  className={combineClasses(
+                    ['block px-4 py-2 text-sm'].concat(
+                      active ? 'bg-gray-100 text-black' : 'text-gray-900'
+                    )
                   )}
-                </Menu.Item>
-                <Menu.Item>
-                  {({ active }) => (
-                    <button
-                      className={
-                        combineClasses(['block px-4 py-2 text-sm'].concat(
-                        active ? 'bg-gray-100 text-black' : 'text-gray-900'))
-                      }
-                      onClick={() => {
-                        alert("You want to cancel meeting")
-                      }}
-                    >
-                      Cancel Meeting
-                    </button>
+                  onClick={() => {
+                    alert('You want to edit meeting')
+                  }}
+                >
+                  Edit Meeting
+                </button>
+              )}
+            </Menu.Item>
+            <Menu.Item>
+              {({ active }) => (
+                <button
+                  className={combineClasses(
+                    ['block px-4 py-2 text-sm'].concat(
+                      active ? 'bg-gray-100 text-black' : 'text-gray-900'
+                    )
                   )}
-                </Menu.Item>
-              </div>
-            </Menu.Items>
-        </Menu>
-      </li>
-    )
-  }
-  
-  
\ No newline at end of file
+                  onClick={() => {
+                    alert('You want to cancel meeting')
+                  }}
+                >
+                  Cancel Meeting
+                </button>
+              )}
+            </Menu.Item>
+          </div>
+        </Menu.Items>
+      </Menu>
+    </li>
+  )
+}
diff --git a/src/components/calendar/SideCalendar.tsx b/src/components/calendar/SideCalendar.tsx
index 341fa635..f5a4a7fe 100644
--- a/src/components/calendar/SideCalendar.tsx
+++ b/src/components/calendar/SideCalendar.tsx
@@ -17,21 +17,21 @@ import { useState } from 'react'
 import Meeting from './Meeting'
 
 export type Meeting = {
-    id: number 
-    title: string | null
-    start: string 
-    end: string
+  id: number
+  title: string | null
+  start: string
+  end: string
 }
 
 export type Meetings = {
-    meetings: Meeting[]
+  meetings: Meeting[]
 }
 
 function classNames(...classes: any[]) {
-    return classes.filter(Boolean).join(' ')
-  }
+  return classes.filter(Boolean).join(' ')
+}
 
-export default function SideCalendar({meetings}: Meetings) {
+export default function SideCalendar({ meetings }: Meetings) {
   const today = startOfToday()
   const [selectedDay, setSelectedDay] = useState(today)
   const [currentMonth, setCurrentMonth] = useState(format(today, 'MMM-yyyy'))
@@ -54,15 +54,15 @@ export default function SideCalendar({meetings}: Meetings) {
 
   const selectedDayMeetings = meetings?.filter((meeting) =>
     isSameDay(parseISO(meeting.start), selectedDay)
-  ) 
+  )
 
   return (
-    <div className="pt-16 bg-zinc-900 col-span-1">
-      <div className="max-w-md px-4 mx-auto sm:px-7 md:max-w-4xl md:px-6">
+    <div className="col-span-1 bg-zinc-900 pt-16">
+      <div className="mx-auto max-w-md px-4 sm:px-7 md:max-w-4xl md:px-6">
         <div className="md:grid md:grid-rows-2">
           <div className="md:pr-14">
             <div className="flex items-center">
-              <h2 className="flex-auto font-semibold text-white text-4xl">
+              <h2 className="flex-auto text-4xl font-semibold text-white">
                 {format(firstDayCurrentMonth, 'MMMM yyyy')}
               </h2>
               <button
@@ -71,7 +71,7 @@ export default function SideCalendar({meetings}: Meetings) {
                 className="-my-1.5 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
               >
                 <span className="sr-only">Previous month</span>
-                <ChevronLeftIcon className="w-5 h-5" aria-hidden="true" />
+                <ChevronLeftIcon className="h-5 w-5" aria-hidden="true" />
               </button>
               <button
                 onClick={nextMonth}
@@ -79,10 +79,10 @@ export default function SideCalendar({meetings}: Meetings) {
                 className="-my-1.5 -mr-1.5 ml-2 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
               >
                 <span className="sr-only">Next month</span>
-                <ChevronRightIcon className="w-5 h-5" aria-hidden="true" />
+                <ChevronRightIcon className="h-5 w-5" aria-hidden="true" />
               </button>
             </div>
-            <div className="grid grid-cols-7 mt-10 text-xs leading-6 text-center text-gray-500">
+            <div className="mt-10 grid grid-cols-7 text-center text-xs leading-6 text-gray-500">
               <div>S</div>
               <div>M</div>
               <div>T</div>
@@ -91,7 +91,7 @@ export default function SideCalendar({meetings}: Meetings) {
               <div>F</div>
               <div>S</div>
             </div>
-            <div className="grid grid-cols-7 mt-2 text-sm">
+            <div className="mt-2 grid grid-cols-7 text-sm">
               {days.map((day, dayIdx) => (
                 <div
                   key={day.toString()}
@@ -125,16 +125,19 @@ export default function SideCalendar({meetings}: Meetings) {
                       'mx-auto flex h-8 w-8 items-center justify-center rounded-full'
                     )}
                   >
-                    <time className = "text-white" dateTime={format(day, 'yyyy-MM-dd')}>
+                    <time
+                      className="text-white"
+                      dateTime={format(day, 'yyyy-MM-dd')}
+                    >
                       {format(day, 'd')}
                     </time>
                   </button>
 
-                  <div className="w-1 h-1 mx-auto mt-1">
+                  <div className="mx-auto mt-1 h-1 w-1">
                     {meetings?.some((meeting) =>
                       isSameDay(parseISO(meeting.start), day)
                     ) && (
-                      <div className="w-1 h-1 rounded-full bg-violet-700"></div>
+                      <div className="h-1 w-1 rounded-full bg-violet-700"></div>
                     )}
                   </div>
                 </div>
@@ -142,11 +145,8 @@ export default function SideCalendar({meetings}: Meetings) {
             </div>
           </div>
           <section className="divide-y divide-gray-400">
-            <h2 className="font-semibold text-blue-700 text-center">
-              {isSameDay(today, selectedDay)
-              ?'TODAY ' 
-              : ''
-              }
+            <h2 className="text-center font-semibold text-blue-700">
+              {isSameDay(today, selectedDay) ? 'TODAY ' : ''}
               <time dateTime={format(selectedDay, 'yyyy-MM-dd')}>
                 {format(selectedDay, 'dd/LL/yyyy')}
               </time>
@@ -154,7 +154,7 @@ export default function SideCalendar({meetings}: Meetings) {
             <ol className="text-sm leading-6 text-gray-500">
               {selectedDayMeetings?.length > 0 ? (
                 selectedDayMeetings?.map((meeting) => (
-                  <Meeting meeting={meeting} key={meeting.id}/>
+                  <Meeting meeting={meeting} key={meeting.id} />
                 ))
               ) : (
                 <p>No meetings for today.</p>
@@ -167,7 +167,6 @@ export default function SideCalendar({meetings}: Meetings) {
   )
 }
 
-
 const colStartClasses = [
   '',
   'col-start-2',
diff --git a/src/pages/calendar/index.tsx b/src/pages/calendar/index.tsx
index 80fe7e0f..d995dd8a 100644
--- a/src/pages/calendar/index.tsx
+++ b/src/pages/calendar/index.tsx
@@ -1,16 +1,8 @@
 import Head from 'next/head'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
-import FullCalendar from '@fullcalendar/react' // must go before plugins
-import dayGridPlugin from '@fullcalendar/daygrid'
-import interactionPlugin from '@fullcalendar/interaction'
-import timeGridPlugin from '@fullcalendar/timegrid'
-import styled from '@emotion/styled'
-import { useState } from 'react'
 import SideCalendar from '~/components/calendar/SideCalendar'
-
-// add styles as css
-export const StyleWrapper = styled.div``
+import MainCalendar from '~/components/calendar/MainCalendar'
 
 const meetings = [
   {
@@ -46,10 +38,6 @@ const meetings = [
 ]
 
 const CalendarPage: React.FC<BaseProps> = ({ session }) => {
-  const [events, useEvents] = useState([
-    { title: 'event 1', start: '2023-05-01T15:30', end: '2023-05-01T16:30' },
-    { title: 'event 2', start: '2023-05-02T06:00', end: '2023-05-02T07:00' },
-  ])
   return (
     <>
       <Head>
@@ -60,22 +48,7 @@ const CalendarPage: React.FC<BaseProps> = ({ session }) => {
       <TopNavbar isAdmin={session.isAdmin} />
       <div className="grid-container grid grid-cols-5">
         <SideCalendar meetings={meetings} />
-        <StyleWrapper className="col-span-4">
-          <FullCalendar
-            plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
-            initialView="dayGridMonth"
-            headerToolbar={{
-              start: 'prev,today,next',
-              center: 'dayGridMonth,timeGridWeek,timeGridDay',
-              end: 'title',
-            }}
-            allDaySlot={false}
-            events={events}
-            eventClick={(info) => {
-              alert('Event: ' + info.event.title)
-            }}
-          />
-        </StyleWrapper>
+        <MainCalendar />
       </div>
     </>
   )

From d815f46f3ad634fe6fe23910f226fcb878584a67 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Mon, 29 May 2023 22:39:07 +0800
Subject: [PATCH 057/223] add in firestore

---
 package.json                                |    2 +
 src/pages/api/auth/[...nextauth].ts         |    7 +
 src/server/db/collections/BaseCollection.ts |   56 +
 src/server/db/collections/UserCollection.ts |   10 +
 src/server/db/firebase.ts                   |    9 +
 src/server/db/models/User.ts                |    5 +
 yarn.lock                                   | 1588 ++++++++++++++++++-
 7 files changed, 1656 insertions(+), 21 deletions(-)
 create mode 100644 src/server/db/collections/BaseCollection.ts
 create mode 100644 src/server/db/collections/UserCollection.ts
 create mode 100644 src/server/db/firebase.ts
 create mode 100644 src/server/db/models/User.ts

diff --git a/package.json b/package.json
index d0be7664..fc5ec36f 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,8 @@
     "clsx": "^1.2.1",
     "date-fns": "^2.30.0",
     "dayjs": "^1.11.7",
+    "firebase": "^9.22.1",
+    "firebase-admin": "^11.8.0",
     "flowbite": "^1.6.5",
     "flowbite-react": "^0.4.4",
     "framer-motion": "^9.0.4",
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 357cf656..70c9fb00 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -6,6 +6,9 @@ import { prisma } from '../../../server/db/client'
 import { env } from '../../../env/server.mjs'
 import type { User } from '@prisma/client'
 
+import { db } from '~/server/db/firebase'
+import { collection, addDoc } from 'firebase/firestore'
+
 export const authOptions: NextAuthOptions = {
   callbacks: {
     // We need this to ensure that the client knows when to log in
@@ -42,6 +45,10 @@ export const authOptions: NextAuthOptions = {
             password: string
           }
 
+          await addDoc(collection(db, 'users'), {
+            name: 'John',
+          })
+
           // Step 2: If no credentials are provided, throw an error
           if (!credential || !email || !password) {
             throw new Error('No email or password provided')
diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
new file mode 100644
index 00000000..215317ea
--- /dev/null
+++ b/src/server/db/collections/BaseCollection.ts
@@ -0,0 +1,56 @@
+import { db } from '../firebase'
+import {
+  collection,
+  addDoc,
+  getDoc,
+  doc,
+  query,
+  getDocs,
+  where,
+  type WithFieldValue,
+  type DocumentData,
+  type WhereFilterOp,
+  type FieldPath,
+} from 'firebase/firestore'
+
+type Queries<T> = {
+  fieldPath: keyof T
+  direction: WhereFilterOp
+  value: T[keyof T]
+}
+
+export abstract class BaseCollection<T> {
+  protected abstract collectionName: string
+  protected abstract objectName: string
+
+  get collection() {
+    return collection(db, this.collectionName)
+  }
+
+  async set(payload: T) {
+    return await addDoc(
+      this.collection,
+      payload as WithFieldValue<DocumentData>
+    )
+  }
+
+  async getById(id: string) {
+    const docRef = doc(db, this.collectionName, id)
+    const result = await getDoc(docRef)
+    if (!result.exists) {
+      throw Error(`The ${this.objectName} does not exist`)
+    }
+    return { ...result, id: result.id } as T
+  }
+
+  async queries(queries: Queries<T>[]) {
+    const items = queries.map((q) => {
+      return where(q.fieldPath as string | FieldPath, q.direction, q.value)
+    })
+    const q = query(this.collection, ...items)
+    const snapshots = await getDocs(q)
+    return snapshots.docs.map((doc) => {
+      return { ...doc.data(), id: doc.id } as T
+    })
+  }
+}
diff --git a/src/server/db/collections/UserCollection.ts b/src/server/db/collections/UserCollection.ts
new file mode 100644
index 00000000..a86c2180
--- /dev/null
+++ b/src/server/db/collections/UserCollection.ts
@@ -0,0 +1,10 @@
+import { BaseCollection } from './BaseCollection'
+import type { User } from '../models/User'
+
+class UserCollection extends BaseCollection<User> {
+  protected override collectionName = 'users'
+  protected override objectName = 'user'
+}
+
+const userCollection = new UserCollection()
+export default userCollection
diff --git a/src/server/db/firebase.ts b/src/server/db/firebase.ts
new file mode 100644
index 00000000..9a266c3c
--- /dev/null
+++ b/src/server/db/firebase.ts
@@ -0,0 +1,9 @@
+import { initializeApp } from 'firebase/app'
+import { getFirestore } from 'firebase/firestore'
+
+const firebaseConfig = {
+
+}
+
+const app = initializeApp(firebaseConfig)
+export const db = getFirestore(app)
diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
new file mode 100644
index 00000000..8be8142b
--- /dev/null
+++ b/src/server/db/models/User.ts
@@ -0,0 +1,5 @@
+export type User = {
+  email: string
+  hashedPassword: string
+  name: number
+}
diff --git a/yarn.lock b/yarn.lock
index 105c91b0..19249f8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -156,6 +156,11 @@
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz"
   integrity sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==
 
+"@babel/parser@^7.20.15":
+  version "7.22.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.4.tgz#a770e98fd785c231af9d93f6459d36770993fb32"
+  integrity sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==
+
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
   version "7.20.13"
   resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"
@@ -1144,6 +1149,385 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@fastify/busboy@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-1.2.1.tgz#9c6db24a55f8b803b5222753b24fe3aea2ba9ca3"
+  integrity sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==
+  dependencies:
+    text-decoding "^1.0.0"
+
+"@firebase/analytics-compat@0.2.6":
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.2.6.tgz#50063978c42f13eb800e037e96ac4b17236841f4"
+  integrity sha512-4MqpVLFkGK7NJf/5wPEEP7ePBJatwYpyjgJ+wQHQGHfzaCDgntOnl9rL2vbVGGKCnRqWtZDIWhctB86UWXaX2Q==
+  dependencies:
+    "@firebase/analytics" "0.10.0"
+    "@firebase/analytics-types" "0.8.0"
+    "@firebase/component" "0.6.4"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/analytics-types@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.8.0.tgz#551e744a29adbc07f557306530a2ec86add6d410"
+  integrity sha512-iRP+QKI2+oz3UAh4nPEq14CsEjrjD6a5+fuypjScisAh9kXKFvdJOZJDwk7kikLvWVLGEs9+kIUS4LPQV7VZVw==
+
+"@firebase/analytics@0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.10.0.tgz#9c6986acd573c6c6189ffb52d0fd63c775db26d7"
+  integrity sha512-Locv8gAqx0e+GX/0SI3dzmBY5e9kjVDtD+3zCFLJ0tH2hJwuCAiL+5WkHuxKj92rqQj/rvkBUCfA1ewlX2hehg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/app-check-compat@0.3.7":
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.3.7.tgz#e150f61d653a0f2043a34dcb995616a717161839"
+  integrity sha512-cW682AxsyP1G+Z0/P7pO/WT2CzYlNxoNe5QejVarW2o5ZxeWSSPAiVEwpEpQR/bUlUmdeWThYTMvBWaopdBsqw==
+  dependencies:
+    "@firebase/app-check" "0.8.0"
+    "@firebase/app-check-types" "0.5.0"
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/app-check-interop-types@0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.0.tgz#b27ea1397cb80427f729e4bbf3a562f2052955c4"
+  integrity sha512-xAxHPZPIgFXnI+vb4sbBjZcde7ZluzPPaSK7Lx3/nmuVk4TjZvnL8ONnkd4ERQKL8WePQySU+pRcWkh8rDf5Sg==
+
+"@firebase/app-check-types@0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-types/-/app-check-types-0.5.0.tgz#1b02826213d7ce6a1cf773c329b46ea1c67064f4"
+  integrity sha512-uwSUj32Mlubybw7tedRzR24RP8M8JUVR3NPiMk3/Z4bCmgEKTlQBwMXrehDAZ2wF+TsBq0SN1c6ema71U/JPyQ==
+
+"@firebase/app-check@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.8.0.tgz#b531ec40900af9c3cf1ec63de9094a0ddd733d6a"
+  integrity sha512-dRDnhkcaC2FspMiRK/Vbp+PfsOAEP6ZElGm9iGFJ9fDqHoPs0HOPn7dwpJ51lCFi1+2/7n5pRPGhqF/F03I97g==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/app-compat@0.2.11":
+  version "0.2.11"
+  resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.2.11.tgz#6f9864a5663ba6da3042880f91641bc435addbce"
+  integrity sha512-IzjLh3Z9F4gPo+Ft7lNVxeKlYfKI6fseUmiLaySidcx/Sdro1vOzoBMOr+5OVVpVVMSib9BZ3QtBKZkPZk+Ucw==
+  dependencies:
+    "@firebase/app" "0.9.11"
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/app-types@0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.9.0.tgz#35b5c568341e9e263b29b3d2ba0e9cfc9ec7f01e"
+  integrity sha512-AeweANOIo0Mb8GiYm3xhTEBVCmPwTYAu9Hcd2qSkLuga/6+j9b1Jskl5bpiSQWy9eJ/j5pavxj6eYogmnuzm+Q==
+
+"@firebase/app@0.9.11":
+  version "0.9.11"
+  resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.9.11.tgz#1892645682dd0b1695f4eb79ef21c0ebcc31c6f1"
+  integrity sha512-b6OVXqn2qHXTASLstlu2aW8loHgB7gWcjVWbNKi6pZYZ9Tu3VE+xJuD8NH1br9gDh4ueVnrMBisfBTeZ0Hvlvg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    idb "7.1.1"
+    tslib "^2.1.0"
+
+"@firebase/auth-compat@0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.4.2.tgz#cb65edc2fbd5f72fff32310409f2fd702b5145e7"
+  integrity sha512-Q30e77DWXFmXEt5dg5JbqEDpjw9y3/PcP9LslDPR7fARmAOTIY9MM6HXzm9KC+dlrKH/+p6l8g9ifJiam9mc4A==
+  dependencies:
+    "@firebase/auth" "0.23.2"
+    "@firebase/auth-types" "0.12.0"
+    "@firebase/component" "0.6.4"
+    "@firebase/util" "1.9.3"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/auth-interop-types@0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.2.1.tgz#78884f24fa539e34a06c03612c75f222fcc33742"
+  integrity sha512-VOaGzKp65MY6P5FI84TfYKBXEPi6LmOCSMMzys6o2BN2LOsqy7pCuZCup7NYnfbk5OkkQKzvIfHOzTm0UDpkyg==
+
+"@firebase/auth-types@0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.12.0.tgz#f28e1b68ac3b208ad02a15854c585be6da3e8e79"
+  integrity sha512-pPwaZt+SPOshK8xNoiQlK5XIrS97kFYc3Rc7xmy373QsOJ9MmqXxLaYssP5Kcds4wd2qK//amx/c+A8O2fVeZA==
+
+"@firebase/auth@0.23.2":
+  version "0.23.2"
+  resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.23.2.tgz#9e6d8dd550a28053c1825fb98c7dc9b37119254d"
+  integrity sha512-dM9iJ0R6tI1JczuGSxXmQbXAgtYie0K4WvKcuyuSTCu9V8eEDiz4tfa1sO3txsfvwg7nOY3AjoCyMYEdqZ8hdg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/component@0.6.4":
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.6.4.tgz#8981a6818bd730a7554aa5e0516ffc9b1ae3f33d"
+  integrity sha512-rLMyrXuO9jcAUCaQXCMjCMUsWrba5fzHlNK24xz5j2W6A/SRmK8mZJ/hn7V0fViLbxC0lPMtrK1eYzk6Fg03jA==
+  dependencies:
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/database-compat@0.3.4", "@firebase/database-compat@^0.3.4":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.3.4.tgz#4e57932f7a5ba761cd5ac946ab6b6ab3f660522c"
+  integrity sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/database" "0.14.4"
+    "@firebase/database-types" "0.10.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/database-types@0.10.4", "@firebase/database-types@^0.10.4":
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.10.4.tgz#47ba81113512dab637abace61cfb65f63d645ca7"
+  integrity sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==
+  dependencies:
+    "@firebase/app-types" "0.9.0"
+    "@firebase/util" "1.9.3"
+
+"@firebase/database@0.14.4":
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.14.4.tgz#9e7435a16a540ddfdeb5d99d45618e6ede179aa6"
+  integrity sha512-+Ea/IKGwh42jwdjCyzTmeZeLM3oy1h0mFPsTy6OqCWzcu/KFqRAr5Tt1HRCOBlNOdbh84JPZC47WLU18n2VbxQ==
+  dependencies:
+    "@firebase/auth-interop-types" "0.2.1"
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    faye-websocket "0.11.4"
+    tslib "^2.1.0"
+
+"@firebase/firestore-compat@0.3.10":
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.3.10.tgz#a79330d02d863810a196b60bd33d1bfcb7f78c14"
+  integrity sha512-mPxRwgi8riB0+EXVzwwOBssoBMCR1NtOz8uE0+vPlEzm3qCCDeyWK9Tqu8LBPs2uopWk6GJhy5esDHt0dnUd6A==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/firestore" "3.12.1"
+    "@firebase/firestore-types" "2.5.1"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/firestore-types@2.5.1":
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-2.5.1.tgz#464b2ee057956599ca34de50eae957c30fdbabb7"
+  integrity sha512-xG0CA6EMfYo8YeUxC8FeDzf6W3FX1cLlcAGBYV6Cku12sZRI81oWcu61RSKM66K6kUENP+78Qm8mvroBcm1whw==
+
+"@firebase/firestore@3.12.1":
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-3.12.1.tgz#39eeb357e2d522f4e7f7d837cdaee7cd32cffc68"
+  integrity sha512-TgJup6AIAT9/u7MxdCeES/I96kJx7DLBTokOlW4FiiSCeOzyss9BYBrh1tkkXNIpFn9mUsvT44foZvFsOKp14Q==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    "@firebase/webchannel-wrapper" "0.10.1"
+    "@grpc/grpc-js" "~1.7.0"
+    "@grpc/proto-loader" "^0.6.13"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/functions-compat@0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.3.5.tgz#7a532d3a9764c6d5fbc1ec5541a989a704326647"
+  integrity sha512-uD4jwgwVqdWf6uc3NRKF8cSZ0JwGqSlyhPgackyUPe+GAtnERpS4+Vr66g0b3Gge0ezG4iyHo/EXW/Hjx7QhHw==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/functions" "0.10.0"
+    "@firebase/functions-types" "0.6.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/functions-types@0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.6.0.tgz#ccd7000dc6fc668f5acb4e6a6a042a877a555ef2"
+  integrity sha512-hfEw5VJtgWXIRf92ImLkgENqpL6IWpYaXVYiRkFY1jJ9+6tIhWM7IzzwbevwIIud/jaxKVdRzD7QBWfPmkwCYw==
+
+"@firebase/functions@0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.10.0.tgz#c630ddf12cdf941c25bc8d554e30c3226cd560f6"
+  integrity sha512-2U+fMNxTYhtwSpkkR6WbBcuNMOVaI7MaH3cZ6UAeNfj7AgEwHwMIFLPpC13YNZhno219F0lfxzTAA0N62ndWzA==
+  dependencies:
+    "@firebase/app-check-interop-types" "0.3.0"
+    "@firebase/auth-interop-types" "0.2.1"
+    "@firebase/component" "0.6.4"
+    "@firebase/messaging-interop-types" "0.2.0"
+    "@firebase/util" "1.9.3"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/installations-compat@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@firebase/installations-compat/-/installations-compat-0.2.4.tgz#b5557c897b4cd3635a59887a8bf69c3731aaa952"
+  integrity sha512-LI9dYjp0aT9Njkn9U4JRrDqQ6KXeAmFbRC0E7jI7+hxl5YmRWysq5qgQl22hcWpTk+cm3es66d/apoDU/A9n6Q==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/installations-types" "0.5.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/installations-types@0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.5.0.tgz#2adad64755cd33648519b573ec7ec30f21fb5354"
+  integrity sha512-9DP+RGfzoI2jH7gY4SlzqvZ+hr7gYzPODrbzVD82Y12kScZ6ZpRg/i3j6rleto8vTFC8n6Len4560FnV1w2IRg==
+
+"@firebase/installations@0.6.4":
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.6.4.tgz#20382e33e6062ac5eff4bede8e468ed4c367609e"
+  integrity sha512-u5y88rtsp7NYkCHC3ElbFBrPtieUybZluXyzl7+4BsIz4sqb4vSAuwHEUgCgCeaQhvsnxDEU6icly8U9zsJigA==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/util" "1.9.3"
+    idb "7.0.1"
+    tslib "^2.1.0"
+
+"@firebase/logger@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.4.0.tgz#15ecc03c452525f9d47318ad9491b81d1810f113"
+  integrity sha512-eRKSeykumZ5+cJPdxxJRgAC3G5NknY2GwEbKfymdnXtnT0Ucm4pspfR6GT4MUQEDuJwRVbVcSx85kgJulMoFFA==
+  dependencies:
+    tslib "^2.1.0"
+
+"@firebase/messaging-compat@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.2.4.tgz#323ca48deef77065b4fcda3cfd662c4337dffcfd"
+  integrity sha512-lyFjeUhIsPRYDPNIkYX1LcZMpoVbBWXX4rPl7c/rqc7G+EUea7IEtSt4MxTvh6fDfPuzLn7+FZADfscC+tNMfg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/messaging" "0.12.4"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/messaging-interop-types@0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging-interop-types/-/messaging-interop-types-0.2.0.tgz#6056f8904a696bf0f7fdcf5f2ca8f008e8f6b064"
+  integrity sha512-ujA8dcRuVeBixGR9CtegfpU4YmZf3Lt7QYkcj693FFannwNuZgfAYaTmbJ40dtjB81SAu6tbFPL9YLNT15KmOQ==
+
+"@firebase/messaging@0.12.4":
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.12.4.tgz#ccb49df5ab97d5650c9cf5b8c77ddc34daafcfe0"
+  integrity sha512-6JLZct6zUaex4g7HI3QbzeUrg9xcnmDAPTWpkoMpd/GoSVWH98zDoWXMGrcvHeCAIsLpFMe4MPoZkJbrPhaASw==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/messaging-interop-types" "0.2.0"
+    "@firebase/util" "1.9.3"
+    idb "7.0.1"
+    tslib "^2.1.0"
+
+"@firebase/performance-compat@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.2.4.tgz#95cbf32057b5d9f0c75d804bc50e6ed3ba486274"
+  integrity sha512-nnHUb8uP9G8islzcld/k6Bg5RhX62VpbAb/Anj7IXs/hp32Eb2LqFPZK4sy3pKkBUO5wcrlRWQa6wKOxqlUqsg==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/performance" "0.6.4"
+    "@firebase/performance-types" "0.2.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/performance-types@0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.2.0.tgz#400685f7a3455970817136d9b48ce07a4b9562ff"
+  integrity sha512-kYrbr8e/CYr1KLrLYZZt2noNnf+pRwDq2KK9Au9jHrBMnb0/C9X9yWSXmZkFt4UIdsQknBq8uBB7fsybZdOBTA==
+
+"@firebase/performance@0.6.4":
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.6.4.tgz#0ad766bfcfab4f386f4fe0bef43bbcf505015069"
+  integrity sha512-HfTn/bd8mfy/61vEqaBelNiNnvAbUtME2S25A67Nb34zVuCSCRIX4SseXY6zBnOFj3oLisaEqhVcJmVPAej67g==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/remote-config-compat@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.2.4.tgz#1f494c81a6c9560b1f9ca1b4fbd4bbbe47cf4776"
+  integrity sha512-FKiki53jZirrDFkBHglB3C07j5wBpitAaj8kLME6g8Mx+aq7u9P7qfmuSRytiOItADhWUj7O1JIv7n9q87SuwA==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/remote-config" "0.4.4"
+    "@firebase/remote-config-types" "0.3.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/remote-config-types@0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.3.0.tgz#689900dcdb3e5c059e8499b29db393e4e51314b4"
+  integrity sha512-RtEH4vdcbXZuZWRZbIRmQVBNsE7VDQpet2qFvq6vwKLBIQRQR5Kh58M4ok3A3US8Sr3rubYnaGqZSurCwI8uMA==
+
+"@firebase/remote-config@0.4.4":
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.4.4.tgz#6a496117054de58744bc9f382d2a6d1e14060c65"
+  integrity sha512-x1ioTHGX8ZwDSTOVp8PBLv2/wfwKzb4pxi0gFezS5GCJwbLlloUH4YYZHHS83IPxnua8b6l0IXUaWd0RgbWwzQ==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/installations" "0.6.4"
+    "@firebase/logger" "0.4.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/storage-compat@0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.3.2.tgz#51a97170fd652a516f729f82b97af369e5a2f8d7"
+  integrity sha512-wvsXlLa9DVOMQJckbDNhXKKxRNNewyUhhbXev3t8kSgoCotd1v3MmqhKKz93ePhDnhHnDs7bYHy+Qa8dRY6BXw==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/storage" "0.11.2"
+    "@firebase/storage-types" "0.8.0"
+    "@firebase/util" "1.9.3"
+    tslib "^2.1.0"
+
+"@firebase/storage-types@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.8.0.tgz#f1e40a5361d59240b6e84fac7fbbbb622bfaf707"
+  integrity sha512-isRHcGrTs9kITJC0AVehHfpraWFui39MPaU7Eo8QfWlqW7YPymBmRgjDrlOgFdURh6Cdeg07zmkLP5tzTKRSpg==
+
+"@firebase/storage@0.11.2":
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.11.2.tgz#c5e0316543fe1c4026b8e3910f85ad73f5b77571"
+  integrity sha512-CtvoFaBI4hGXlXbaCHf8humajkbXhs39Nbh6MbNxtwJiCqxPy9iH3D3CCfXAvP0QvAAwmJUTK3+z9a++Kc4nkA==
+  dependencies:
+    "@firebase/component" "0.6.4"
+    "@firebase/util" "1.9.3"
+    node-fetch "2.6.7"
+    tslib "^2.1.0"
+
+"@firebase/util@1.9.3":
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.9.3.tgz#45458dd5cd02d90e55c656e84adf6f3decf4b7ed"
+  integrity sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==
+  dependencies:
+    tslib "^2.1.0"
+
+"@firebase/webchannel-wrapper@0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.10.1.tgz#60bb2aaf129f9e00621f8d698722ddba6ee1f8ac"
+  integrity sha512-Dq5rYfEpdeel0bLVN+nfD1VWmzCkK+pJbSjIawGE+RY4+NIJqhbUDDQjvV0NUK84fMfwxvtFoCtEe70HfZjFcw==
+
 "@floating-ui/core@^1.2.1":
   version "1.2.1"
   resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.1.tgz"
@@ -1225,6 +1609,95 @@
   dependencies:
     "@fullcalendar/daygrid" "~6.1.7"
 
+"@google-cloud/firestore@^6.5.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-6.6.0.tgz#f7fd0d9cf318417b14851ddce941810b1214ab0c"
+  integrity sha512-XDWsmCtQQFs0RoXZaq3fCYe4jRtAAFmW38ezGLKWSjLQ5FNv7jxpBGtdITBM2PDI0tFNCyeogjqsDbI6CIVeuQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    functional-red-black-tree "^1.0.1"
+    google-gax "^3.5.7"
+    protobufjs "^7.0.0"
+
+"@google-cloud/paginator@^3.0.7":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-3.0.7.tgz#fb6f8e24ec841f99defaebf62c75c2e744dd419b"
+  integrity sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ==
+  dependencies:
+    arrify "^2.0.0"
+    extend "^3.0.2"
+
+"@google-cloud/projectify@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-3.0.0.tgz#302b25f55f674854dce65c2532d98919b118a408"
+  integrity sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA==
+
+"@google-cloud/promisify@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-3.0.1.tgz#8d724fb280f47d1ff99953aee0c1669b25238c2e"
+  integrity sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA==
+
+"@google-cloud/storage@^6.9.5":
+  version "6.10.1"
+  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-6.10.1.tgz#7b62b7956668b649bfa3affa471619ce06d297dd"
+  integrity sha512-EtLlT0YbXtrbUxaNbEfTyTytrjELtl4i42flf8COg+Hu5+apdNjsFO9XEY39wshxAuVjLf4fCSm7GTSW+BD3gQ==
+  dependencies:
+    "@google-cloud/paginator" "^3.0.7"
+    "@google-cloud/projectify" "^3.0.0"
+    "@google-cloud/promisify" "^3.0.0"
+    abort-controller "^3.0.0"
+    async-retry "^1.3.3"
+    compressible "^2.0.12"
+    duplexify "^4.0.0"
+    ent "^2.2.0"
+    extend "^3.0.2"
+    gaxios "^5.0.0"
+    google-auth-library "^8.0.1"
+    mime "^3.0.0"
+    mime-types "^2.0.8"
+    p-limit "^3.0.1"
+    retry-request "^5.0.0"
+    teeny-request "^8.0.0"
+    uuid "^8.0.0"
+
+"@grpc/grpc-js@~1.7.0":
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.7.3.tgz#f2ea79f65e31622d7f86d4b4c9ae38f13ccab99a"
+  integrity sha512-H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog==
+  dependencies:
+    "@grpc/proto-loader" "^0.7.0"
+    "@types/node" ">=12.12.47"
+
+"@grpc/grpc-js@~1.8.0":
+  version "1.8.14"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.8.14.tgz#4fe0f9917d6f094cf59245763c275442b182e9ad"
+  integrity sha512-w84maJ6CKl5aApCMzFll0hxtFNT6or9WwMslobKaqWUEf1K+zhlL43bSQhFreyYWIWR+Z0xnVFC1KtLm4ZpM/A==
+  dependencies:
+    "@grpc/proto-loader" "^0.7.0"
+    "@types/node" ">=12.12.47"
+
+"@grpc/proto-loader@^0.6.13":
+  version "0.6.13"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.13.tgz#008f989b72a40c60c96cd4088522f09b05ac66bc"
+  integrity sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g==
+  dependencies:
+    "@types/long" "^4.0.1"
+    lodash.camelcase "^4.3.0"
+    long "^4.0.0"
+    protobufjs "^6.11.3"
+    yargs "^16.2.0"
+
+"@grpc/proto-loader@^0.7.0":
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.7.tgz#d33677a77eea8407f7c66e2abd97589b60eb4b21"
+  integrity sha512-1TIeXOi8TuSCQprPItwoMymZXxWT0CPxUhkrkeCUH+D8U7QDwQ6b7SUz2MaLuWM2llT+J/TVFLmQI5KtML3BhQ==
+  dependencies:
+    "@types/long" "^4.0.1"
+    lodash.camelcase "^4.3.0"
+    long "^4.0.0"
+    protobufjs "^7.0.0"
+    yargs "^17.7.2"
+
 "@headlessui/react@^1.7.14":
   version "1.7.14"
   resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.14.tgz#75f19552c535113640fe8a3a40e71474f49e89c9"
@@ -1301,6 +1774,13 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@jsdoc/salty@^0.2.1":
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.5.tgz#1b2fa5bb8c66485b536d86eee877c263d322f692"
+  integrity sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==
+  dependencies:
+    lodash "^4.17.21"
+
 "@motionone/animation@^10.15.1":
   version "10.15.1"
   resolved "https://registry.npmjs.org/@motionone/animation/-/animation-10.15.1.tgz"
@@ -1508,6 +1988,59 @@
   resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.14.0.tgz#4bed9e6f3d01bb0e4598e76c1726f33579d6a2c3"
   integrity sha512-PDNlhP/1vyTgmNyiucGqGCdXIp7HIkkvKO50si3y3PcceeHvqtiKPaH1iJdz63jCWMVMbj2MElSxXPOeBvEVIQ==
 
+"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
+  integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
+
+"@protobufjs/base64@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
+  integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
+
+"@protobufjs/codegen@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
+  integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
+
+"@protobufjs/eventemitter@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
+  integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
+
+"@protobufjs/fetch@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
+  integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.1"
+    "@protobufjs/inquire" "^1.1.0"
+
+"@protobufjs/float@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
+  integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
+
+"@protobufjs/inquire@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
+  integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
+
+"@protobufjs/path@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
+  integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
+
+"@protobufjs/pool@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
+  integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
+
+"@protobufjs/utf8@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
+  integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
+
 "@rushstack/eslint-patch@^1.1.3":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz"
@@ -1545,6 +2078,11 @@
   resolved "https://registry.yarnpkg.com/@tanstack/table-core/-/table-core-8.9.1.tgz#869410ca1748c45d4e19ccfd4db7e36452611674"
   integrity sha512-2+R83n8vMZND0q3W1lSiF7co9nFbeWbjAErFf27xwbeA9E0wtUu5ZDfgj+TZ6JzdAEQAgfxkk/QNFAKiS8E4MA==
 
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
 "@trpc/client@^10.26.0":
   version "10.26.0"
   resolved "https://registry.yarnpkg.com/@trpc/client/-/client-10.26.0.tgz#eaccff7b101882cbf543931abc1f764b3b17bae6"
@@ -1572,6 +2110,49 @@
   resolved "https://registry.npmjs.org/@types/bcryptjs/-/bcryptjs-2.4.2.tgz"
   integrity sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==
 
+"@types/body-parser@*":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/connect@*":
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/express-serve-static-core@^4.17.33":
+  version "4.17.35"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f"
+  integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+    "@types/send" "*"
+
+"@types/express@^4.17.14":
+  version "4.17.17"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4"
+  integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.33"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
+"@types/glob@*":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
+  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
+  dependencies:
+    "@types/minimatch" "^5.1.2"
+    "@types/node" "*"
+
 "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
@@ -1582,6 +2163,18 @@
   resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
+"@types/jsonwebtoken@^9.0.0":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#9eeb56c76dd555039be2a3972218de5bd3b8d83e"
+  integrity sha512-drE6uz7QBKq1fYqqoFKTDRdFCPHd5TCub75BM+D+cMx7NU9hUz7SESLfC2fSCXVFMO5Yj8sOWHuGqPgjc+fz0Q==
+  dependencies:
+    "@types/node" "*"
+
+"@types/linkify-it@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
+  integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
+
 "@types/lodash.mergewith@4.6.7":
   version "4.6.7"
   resolved "https://registry.npmjs.org/@types/lodash.mergewith/-/lodash.mergewith-4.6.7.tgz"
@@ -1594,11 +2187,49 @@
   resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"
   integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
 
+"@types/long@^4.0.0", "@types/long@^4.0.1":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
+  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
+
+"@types/markdown-it@^12.2.3":
+  version "12.2.3"
+  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
+  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
+  dependencies:
+    "@types/linkify-it" "*"
+    "@types/mdurl" "*"
+
+"@types/mdurl@*":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
+  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
+
+"@types/mime@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
+  integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
+
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+
+"@types/minimatch@^5.1.2":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
+
 "@types/node@*", "@types/node@^18.11.18":
   version "18.14.0"
   resolved "https://registry.npmjs.org/@types/node/-/node-18.14.0.tgz"
   integrity sha512-5EWrvLmglK+imbCJY0+INViFWUHg1AHel1sq4ZVSfdcNqGy9Edv3UB9IIzzg+xPaUcAgZYcfVs2fBcwDeZzU0A==
 
+"@types/node@>=12.12.47", "@types/node@>=13.7.0":
+  version "20.2.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.2.5.tgz#26d295f3570323b2837d322180dfbf1ba156fefb"
+  integrity sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ==
+
 "@types/nodemailer@^6.4.7":
   version "6.4.7"
   resolved "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.7.tgz"
@@ -1630,6 +2261,16 @@
   dependencies:
     "@types/node" "*"
 
+"@types/qs@*":
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+
+"@types/range-parser@*":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+
 "@types/react-dom@^18.2.4":
   version "18.2.4"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.4.tgz#13f25bfbf4e404d26f62ac6e406591451acba9e0"
@@ -1662,6 +2303,14 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/rimraf@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.2.tgz#a63d175b331748e5220ad48c901d7bbf1f44eef8"
+  integrity sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==
+  dependencies:
+    "@types/glob" "*"
+    "@types/node" "*"
+
 "@types/scheduler@*":
   version "0.16.2"
   resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz"
@@ -1672,6 +2321,22 @@
   resolved "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz"
   integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
+"@types/send@*":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301"
+  integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
+"@types/serve-static@*":
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d"
+  integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==
+  dependencies:
+    "@types/mime" "*"
+    "@types/node" "*"
+
 "@typescript-eslint/eslint-plugin@^5.48.1":
   version "5.52.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.52.0.tgz"
@@ -1766,6 +2431,13 @@
   resolved "https://registry.yarnpkg.com/@zag-js/focus-visible/-/focus-visible-0.2.2.tgz#56233480ca1275d3218fb2e10696a33d1a6b9e64"
   integrity sha512-0j2gZq8HiZ51z4zNnSkF1iSkqlwRDvdH+son3wHdoz+7IUdMN/5Exd4TxMJ+gq2Of1DiXReYLL9qqh2PdQ4wgA==
 
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  dependencies:
+    event-target-shim "^5.0.0"
+
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
@@ -1800,6 +2472,13 @@ acorn@^8.0.4, acorn@^8.8.0:
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
 
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
 ajv@^6.10.0, ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
@@ -1915,11 +2594,23 @@ array.prototype.tosorted@^1.1.1:
     es-shim-unscopables "^1.0.0"
     get-intrinsic "^1.1.3"
 
+arrify@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
+  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
+
 ast-types-flow@^0.0.7:
   version "0.0.7"
   resolved "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz"
   integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
 
+async-retry@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280"
+  integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==
+  dependencies:
+    retry "0.13.1"
+
 autoprefixer@^10.4.13:
   version "10.4.13"
   resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz"
@@ -1963,16 +2654,31 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+base64-js@^1.3.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
 bcryptjs@^2.4.3:
   version "2.4.3"
   resolved "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"
   integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==
 
+bignumber.js@^9.0.0:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz#c4df7dc496bd849d4c9464344c1aa74228b4dac6"
+  integrity sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==
+
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
+bluebird@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1981,6 +2687,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
@@ -1998,6 +2711,11 @@ browserslist@^4.21.3, browserslist@^4.21.4:
     node-releases "^2.0.8"
     update-browserslist-db "^1.0.10"
 
+buffer-equal-constant-time@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
+
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
@@ -2026,6 +2744,13 @@ caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.300014
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001456.tgz"
   integrity sha512-XFHJY5dUgmpMV25UqaD4kVq2LsiaU5rS8fb0f17pCoXQiQslzmFgnfOxfvo1bTpTqf7dwG/N/05CnLCnOEKmzA==
 
+catharsis@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121"
+  integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==
+  dependencies:
+    lodash "^4.17.15"
+
 chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
@@ -2077,6 +2802,24 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
 clsx@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz"
@@ -2116,6 +2859,13 @@ commander@^7.2.0:
   resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
+compressible@^2.0.12:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
+  dependencies:
+    mime-db ">= 1.43.0 < 2"
+
 compute-scroll-into-view@1.0.20:
   version "1.0.20"
   resolved "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz"
@@ -2216,6 +2966,13 @@ debounce@^1.2.0:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
@@ -2223,13 +2980,6 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -2258,7 +3008,7 @@ deep-equal@^2.0.5:
     which-collection "^1.0.1"
     which-typed-array "^1.1.9"
 
-deep-is@^0.1.3:
+deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -2344,11 +3094,28 @@ duplexer@^0.1.2:
   resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
+duplexify@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0"
+  integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==
+  dependencies:
+    end-of-stream "^1.4.1"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+    stream-shift "^1.0.0"
+
 easy-bem@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/easy-bem/-/easy-bem-1.1.1.tgz#1bfcc10425498090bcfddc0f9c000aba91399e03"
   integrity sha512-GJRqdiy2h+EXy6a8E6R+ubmqUM08BK0FWNq41k24fup6045biQ8NXxoXimiwegMQvFFV3t1emADdGNL1TlS61A==
 
+ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 electron-to-chromium@^1.4.284:
   version "1.4.302"
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.302.tgz"
@@ -2369,6 +3136,13 @@ encode-utf8@^1.0.3:
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
+end-of-stream@^1.4.1:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
 enhanced-resolve@^5.10.0:
   version "5.12.0"
   resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz"
@@ -2377,6 +3151,16 @@ enhanced-resolve@^5.10.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+ent@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
+
+entities@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
@@ -2473,11 +3257,28 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
+escodegen@^1.13.0:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-config-next@^13.1.6:
   version "13.1.6"
   resolved "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.1.6.tgz"
@@ -2624,6 +3425,11 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
+eslint-visitor-keys@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+
 eslint@^8.31.0:
   version "8.34.0"
   resolved "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz"
@@ -2669,6 +3475,15 @@ eslint@^8.31.0:
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
+espree@^9.0.0:
+  version "9.5.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
+  integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
+  dependencies:
+    acorn "^8.8.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
+
 espree@^9.4.0:
   version "9.4.1"
   resolved "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz"
@@ -2678,6 +3493,11 @@ espree@^9.4.0:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
+esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
 esquery@^1.4.0:
   version "1.4.2"
   resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz"
@@ -2692,7 +3512,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1:
+estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -2707,6 +3527,16 @@ esutils@^2.0.2:
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
+extend@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
@@ -2728,11 +3558,16 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
+fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867"
+  integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==
+
 fastq@^1.6.0:
   version "1.15.0"
   resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"
@@ -2740,6 +3575,13 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
+faye-websocket@0.11.4:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
+  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
+  dependencies:
+    websocket-driver ">=0.5.1"
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
@@ -2775,6 +3617,55 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
+firebase-admin@^11.8.0:
+  version "11.8.0"
+  resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-11.8.0.tgz#4cb57e39e5ad7cbc690c6e073d93be549c7854b3"
+  integrity sha512-RxO0wWDnuqVikXExhVjnhVaaXpziKCad4D1rOX5c1WJdk1jAu9hfE4rbrFKZQZgF1okZS04kgCBIFJro7xn8NQ==
+  dependencies:
+    "@fastify/busboy" "^1.2.1"
+    "@firebase/database-compat" "^0.3.4"
+    "@firebase/database-types" "^0.10.4"
+    "@types/node" ">=12.12.47"
+    jsonwebtoken "^9.0.0"
+    jwks-rsa "^3.0.1"
+    node-forge "^1.3.1"
+    uuid "^9.0.0"
+  optionalDependencies:
+    "@google-cloud/firestore" "^6.5.0"
+    "@google-cloud/storage" "^6.9.5"
+
+firebase@^9.22.1:
+  version "9.22.1"
+  resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.22.1.tgz#9bf49d8cb87eefae6500cc2bd2ec1fddbc1c1ebb"
+  integrity sha512-8x55ZZJwPlctKIhlfXL+KTOpdabp6dDpDwTEmuW1QNbfCkE1ZEuXHgjiQMfTkoeyQO9luV6YwVdgbgCt7yfYCg==
+  dependencies:
+    "@firebase/analytics" "0.10.0"
+    "@firebase/analytics-compat" "0.2.6"
+    "@firebase/app" "0.9.11"
+    "@firebase/app-check" "0.8.0"
+    "@firebase/app-check-compat" "0.3.7"
+    "@firebase/app-compat" "0.2.11"
+    "@firebase/app-types" "0.9.0"
+    "@firebase/auth" "0.23.2"
+    "@firebase/auth-compat" "0.4.2"
+    "@firebase/database" "0.14.4"
+    "@firebase/database-compat" "0.3.4"
+    "@firebase/firestore" "3.12.1"
+    "@firebase/firestore-compat" "0.3.10"
+    "@firebase/functions" "0.10.0"
+    "@firebase/functions-compat" "0.3.5"
+    "@firebase/installations" "0.6.4"
+    "@firebase/installations-compat" "0.2.4"
+    "@firebase/messaging" "0.12.4"
+    "@firebase/messaging-compat" "0.2.4"
+    "@firebase/performance" "0.6.4"
+    "@firebase/performance-compat" "0.2.4"
+    "@firebase/remote-config" "0.4.4"
+    "@firebase/remote-config-compat" "0.2.4"
+    "@firebase/storage" "0.11.2"
+    "@firebase/storage-compat" "0.3.2"
+    "@firebase/util" "1.9.3"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
@@ -2880,17 +3771,40 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
+
 functions-have-names@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
+gaxios@^5.0.0, gaxios@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-5.1.0.tgz#133b77b45532be71eec72012b7e97c2320b6140a"
+  integrity sha512-aezGIjb+/VfsJtIcHGcBSerNEDdfdHeMros+RbYbGpmonKWQCOVOes0LVZhn1lDtIgq55qq0HaxymIoae3Fl/A==
+  dependencies:
+    extend "^3.0.2"
+    https-proxy-agent "^5.0.0"
+    is-stream "^2.0.0"
+    node-fetch "^2.6.7"
+
+gcp-metadata@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.2.0.tgz#b4772e9c5976241f5d3e69c4f446c906d25506ec"
+  integrity sha512-aFhhvvNycky2QyhG+dcfEdHBF0FRbYcf39s6WNHUDysKSrbJ5vuFbjydxBcmewtXeV248GP8dWT3ByPNxsyHCw==
+  dependencies:
+    gaxios "^5.0.0"
+    json-bigint "^1.0.0"
+
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -2960,6 +3874,17 @@ glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -3012,6 +3937,49 @@ globrex@^0.1.2:
   resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
   integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
 
+google-auth-library@^8.0.1, google-auth-library@^8.0.2:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-8.8.0.tgz#2e17494431cef56b571420d483a4debff6c481cd"
+  integrity sha512-0iJn7IDqObDG5Tu9Tn2WemmJ31ksEa96IyK0J0OZCpTh6CrC6FrattwKX87h3qKVuprCJpdOGKc1Xi8V0kMh8Q==
+  dependencies:
+    arrify "^2.0.0"
+    base64-js "^1.3.0"
+    ecdsa-sig-formatter "^1.0.11"
+    fast-text-encoding "^1.0.0"
+    gaxios "^5.0.0"
+    gcp-metadata "^5.2.0"
+    gtoken "^6.1.0"
+    jws "^4.0.0"
+    lru-cache "^6.0.0"
+
+google-gax@^3.5.7:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-3.6.0.tgz#0f4ae350159737fe0aa289815c0d92838b19f6af"
+  integrity sha512-2fyb61vWxUonHiArRNJQmE4tx5oY1ni8VPo08fzII409vDSCWG7apDX4qNOQ2GXXT82gLBn3d3P1Dydh7pWjyw==
+  dependencies:
+    "@grpc/grpc-js" "~1.8.0"
+    "@grpc/proto-loader" "^0.7.0"
+    "@types/long" "^4.0.0"
+    "@types/rimraf" "^3.0.2"
+    abort-controller "^3.0.0"
+    duplexify "^4.0.0"
+    fast-text-encoding "^1.0.3"
+    google-auth-library "^8.0.2"
+    is-stream-ended "^0.1.4"
+    node-fetch "^2.6.1"
+    object-hash "^3.0.0"
+    proto3-json-serializer "^1.0.0"
+    protobufjs "7.2.3"
+    protobufjs-cli "1.1.1"
+    retry-request "^5.0.0"
+
+google-p12-pem@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-4.0.1.tgz#82841798253c65b7dc2a4e5fe9df141db670172a"
+  integrity sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==
+  dependencies:
+    node-forge "^1.3.1"
+
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -3019,6 +3987,11 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
+graceful-fs@^4.1.9:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 graceful-fs@^4.2.4:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
@@ -3029,6 +4002,15 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
+gtoken@^6.1.0:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-6.1.2.tgz#aeb7bdb019ff4c3ba3ac100bbe7b6e74dce0e8bc"
+  integrity sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==
+  dependencies:
+    gaxios "^5.0.1"
+    google-p12-pem "^4.0.0"
+    jws "^4.0.0"
+
 gzip-size@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
@@ -3094,6 +4076,38 @@ hoist-non-react-statics@^3.3.1:
   dependencies:
     react-is "^16.7.0"
 
+http-parser-js@>=0.5.1:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
+  integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
+
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
+https-proxy-agent@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
+idb@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-7.0.1.tgz#d2875b3a2f205d854ee307f6d196f246fea590a7"
+  integrity sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg==
+
+idb@7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.1.tgz#d910ded866d32c7ced9befc5bfdf36f572ced72b"
+  integrity sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==
+
 ignore@^5.2.0:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
@@ -3120,7 +4134,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2:
+inherits@2, inherits@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -3273,6 +4287,16 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
+is-stream-ended@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-stream-ended/-/is-stream-ended-0.1.4.tgz#f50224e95e06bce0e356d440a4827cd35b267eda"
+  integrity sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==
+
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"
@@ -3340,7 +4364,7 @@ isexe@^2.0.0:
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-jose@^4.11.4, jose@^4.14.1:
+jose@^4.10.4, jose@^4.11.4, jose@^4.14.1:
   version "4.14.4"
   resolved "https://registry.yarnpkg.com/jose/-/jose-4.14.4.tgz#59e09204e2670c3164ee24cbfe7115c6f8bff9ca"
   integrity sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g==
@@ -3362,11 +4386,46 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+js2xmlparser@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a"
+  integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==
+  dependencies:
+    xmlcreate "^2.0.4"
+
+jsdoc@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e"
+  integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==
+  dependencies:
+    "@babel/parser" "^7.20.15"
+    "@jsdoc/salty" "^0.2.1"
+    "@types/markdown-it" "^12.2.3"
+    bluebird "^3.7.2"
+    catharsis "^0.9.0"
+    escape-string-regexp "^2.0.0"
+    js2xmlparser "^4.0.2"
+    klaw "^3.0.0"
+    markdown-it "^12.3.2"
+    markdown-it-anchor "^8.4.1"
+    marked "^4.0.10"
+    mkdirp "^1.0.4"
+    requizzle "^0.2.3"
+    strip-json-comments "^3.1.0"
+    underscore "~1.13.2"
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
+json-bigint@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
+  integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==
+  dependencies:
+    bignumber.js "^9.0.0"
+
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
   resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
@@ -3394,6 +4453,16 @@ json5@^2.2.2:
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
+jsonwebtoken@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
+  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
+  dependencies:
+    jws "^3.2.2"
+    lodash "^4.17.21"
+    ms "^2.1.1"
+    semver "^7.3.8"
+
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.3:
   version "3.3.3"
   resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz"
@@ -3402,6 +4471,59 @@ json5@^2.2.2:
     array-includes "^3.1.5"
     object.assign "^4.1.3"
 
+jwa@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jwa@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz#a7e9c3f29dae94027ebcaf49975c9345593410fc"
+  integrity sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jwks-rsa@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-3.0.1.tgz#ba79ddca7ee7520f7bb26b942ef1aee91df8d7e4"
+  integrity sha512-UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw==
+  dependencies:
+    "@types/express" "^4.17.14"
+    "@types/jsonwebtoken" "^9.0.0"
+    debug "^4.3.4"
+    jose "^4.10.4"
+    limiter "^1.1.5"
+    lru-memoizer "^2.1.4"
+
+jws@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+  dependencies:
+    jwa "^1.4.1"
+    safe-buffer "^5.0.1"
+
+jws@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz#2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4"
+  integrity sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==
+  dependencies:
+    jwa "^2.0.0"
+    safe-buffer "^5.0.1"
+
+klaw@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146"
+  integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==
+  dependencies:
+    graceful-fs "^4.1.9"
+
 language-subtag-registry@~0.3.2:
   version "0.3.22"
   resolved "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz"
@@ -3422,16 +4544,36 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 lilconfig@^2.0.5, lilconfig@^2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz"
   integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==
 
+limiter@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
+  integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==
+
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
+linkify-it@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
+  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
+  dependencies:
+    uc.micro "^1.0.1"
+
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -3446,6 +4588,16 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
+
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==
+
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
@@ -3456,11 +4608,21 @@ lodash.mergewith@4.6.2:
   resolved "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"
   integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
-lodash@^4.17.20:
+lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+long@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
+  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
+
+long@^5.0.0:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
+  integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
+
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
@@ -3482,6 +4644,48 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@~4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
+  integrity sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==
+  dependencies:
+    pseudomap "^1.0.1"
+    yallist "^2.0.0"
+
+lru-memoizer@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/lru-memoizer/-/lru-memoizer-2.2.0.tgz#b9d90c91637b4b1a423ef76f3156566691293df8"
+  integrity sha512-QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw==
+  dependencies:
+    lodash.clonedeep "^4.5.0"
+    lru-cache "~4.0.0"
+
+markdown-it-anchor@^8.4.1:
+  version "8.6.7"
+  resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634"
+  integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==
+
+markdown-it@^12.3.2:
+  version "12.3.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
+  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
+  dependencies:
+    argparse "^2.0.1"
+    entities "~2.1.0"
+    linkify-it "^3.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+marked@^4.0.10:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
+  integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==
+
+mdurl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
+
 memoize-one@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz"
@@ -3500,6 +4704,23 @@ micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
+mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-types@^2.0.8:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
+mime@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
+  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
+
 mini-svg-data-uri@^1.4.3:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939"
@@ -3512,11 +4733,23 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^5.0.1:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 mrmime@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz"
@@ -3587,6 +4820,25 @@ next@^13.1.6:
     "@next/swc-win32-ia32-msvc" "13.1.6"
     "@next/swc-win32-x64-msvc" "13.1.6"
 
+node-fetch@2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-fetch@^2.6.1, node-fetch@^2.6.7:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
+  integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-forge@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
+  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
+
 node-releases@^2.0.8:
   version "2.0.10"
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz"
@@ -3695,7 +4947,7 @@ oidc-token-hash@^5.0.3:
   resolved "https://registry.yarnpkg.com/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz#9a229f0a1ce9d4fc89bcaee5478c97a889e7b7b6"
   integrity sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==
 
-once@^1.3.0:
+once@^1.3.0, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
@@ -3726,6 +4978,18 @@ openid-client@^5.4.0:
     object-hash "^2.2.0"
     oidc-token-hash "^5.0.3"
 
+optionator@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"
@@ -3745,7 +5009,7 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2:
+p-limit@^3.0.1, p-limit@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -3922,6 +5186,11 @@ prelude-ls@^1.2.1:
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
+
 prettier-plugin-tailwindcss@^0.2.3:
   version "0.2.3"
   resolved "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.3.tgz"
@@ -3953,6 +5222,71 @@ prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+proto3-json-serializer@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz#1b5703152b6ce811c5cdcc6468032caf53521331"
+  integrity sha512-AwAuY4g9nxx0u52DnSMkqqgyLHaW/XaPLtaAo3y/ZCfeaQB/g4YDH4kb8Wc/mWzWvu0YjOznVnfn373MVZZrgw==
+  dependencies:
+    protobufjs "^7.0.0"
+
+protobufjs-cli@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz#f531201b1c8c7772066aa822bf9a08318b24a704"
+  integrity sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==
+  dependencies:
+    chalk "^4.0.0"
+    escodegen "^1.13.0"
+    espree "^9.0.0"
+    estraverse "^5.1.0"
+    glob "^8.0.0"
+    jsdoc "^4.0.0"
+    minimist "^1.2.0"
+    semver "^7.1.2"
+    tmp "^0.2.1"
+    uglify-js "^3.7.7"
+
+protobufjs@7.2.3, protobufjs@^7.0.0:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.3.tgz#01af019e40d9c6133c49acbb3ff9e30f4f0f70b2"
+  integrity sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/node" ">=13.7.0"
+    long "^5.0.0"
+
+protobufjs@^6.11.3:
+  version "6.11.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
+  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/long" "^4.0.1"
+    "@types/node" ">=13.7.0"
+    long "^4.0.0"
+
+pseudomap@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
+
 punycode@^2.1.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"
@@ -4106,6 +5440,15 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
+readable-stream@^3.1.1:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
@@ -4142,6 +5485,13 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
+requizzle@^0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c"
+  integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==
+  dependencies:
+    lodash "^4.17.21"
+
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
@@ -4165,12 +5515,25 @@ resolve@^2.0.0-next.4:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+retry-request@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-5.0.2.tgz#143d85f90c755af407fcc46b7166a4ba520e44da"
+  integrity sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==
+  dependencies:
+    debug "^4.1.1"
+    extend "^3.0.2"
+
+retry@0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
+  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
+
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^3.0.2:
+rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -4184,6 +5547,11 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
 safe-regex-test@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"
@@ -4205,6 +5573,13 @@ semver@^6.3.0:
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.1.2, semver@^7.3.8:
+  version "7.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
+  integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@^7.3.7:
   version "7.3.8"
   resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"
@@ -4267,6 +5642,11 @@ source-map@^0.5.7:
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
+source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
 stop-iteration-iterator@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz"
@@ -4274,7 +5654,19 @@ stop-iteration-iterator@^1.0.0:
   dependencies:
     internal-slot "^1.0.4"
 
-string-width@^4.1.0, string-width@^4.2.0:
+stream-events@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5"
+  integrity sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==
+  dependencies:
+    stubs "^3.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -4315,6 +5707,13 @@ string.prototype.trimstart@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -4332,6 +5731,11 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+stubs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
+  integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==
+
 styled-jsx@5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz"
@@ -4417,6 +5821,22 @@ tapable@^2.2.0:
   resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
+teeny-request@^8.0.0:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-8.0.3.tgz#5cb9c471ef5e59f2fca8280dc3c5909595e6ca24"
+  integrity sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww==
+  dependencies:
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    node-fetch "^2.6.1"
+    stream-events "^1.0.5"
+    uuid "^9.0.0"
+
+text-decoding@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/text-decoding/-/text-decoding-1.0.0.tgz#38a5692d23b5c2b12942d6e245599cb58b1bc52f"
+  integrity sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
@@ -4435,6 +5855,13 @@ tiny-invariant@^1.0.6:
   resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz"
   integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
+tmp@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
@@ -4457,6 +5884,11 @@ totalist@^1.0.0:
   resolved "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz"
   integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
 
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
 tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"
@@ -4496,6 +5928,13 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
+  dependencies:
+    prelude-ls "~1.1.2"
+
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
@@ -4515,6 +5954,16 @@ typescript@^4.9.4:
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
+uc.micro@^1.0.1, uc.micro@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
+
+uglify-js@^3.7.7:
+  version "3.17.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
+  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"
@@ -4525,6 +5974,11 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
+underscore@~1.13.2:
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
+  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
+
 update-browserslist-db@^1.0.10:
   version "1.0.10"
   resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"
@@ -4565,16 +6019,26 @@ use-sync-external-store@^1.2.0:
   resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
 
-util-deprecate@^1.0.2:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-uuid@^8.3.2:
+uuid@^8.0.0, uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+
 webpack-bundle-analyzer@4.7.0:
   version "4.7.0"
   resolved "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz"
@@ -4590,6 +6054,28 @@ webpack-bundle-analyzer@4.7.0:
     sirv "^1.0.7"
     ws "^7.3.1"
 
+websocket-driver@>=0.5.1:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
+  dependencies:
+    http-parser-js ">=0.5.1"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
+
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"
@@ -4635,7 +6121,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-word-wrap@^1.2.3:
+word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
@@ -4649,6 +6135,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
@@ -4659,6 +6154,11 @@ ws@^7.3.1:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
+xmlcreate@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be"
+  integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==
+
 xtend@^4.0.2:
   version "4.0.2"
   resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
@@ -4669,6 +6169,16 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
   integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
+yallist@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
+
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"
@@ -4692,6 +6202,16 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
 yargs@^15.3.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
@@ -4709,6 +6229,32 @@ yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
+yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"

From 7b0efc7b43630a31b73ad38453b6b6ea67fe5ae9 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Mon, 29 May 2023 23:07:54 +0800
Subject: [PATCH 058/223] Create a helper class for the base collection

---
 src/server/db/collections/BaseCollection.ts | 54 +++++++++++++++++----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index 215317ea..dfd10f31 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -7,6 +7,9 @@ import {
   query,
   getDocs,
   where,
+  deleteDoc,
+  updateDoc,
+  type Transaction,
   type WithFieldValue,
   type DocumentData,
   type WhereFilterOp,
@@ -23,15 +26,12 @@ export abstract class BaseCollection<T> {
   protected abstract collectionName: string
   protected abstract objectName: string
 
-  get collection() {
-    return collection(db, this.collectionName)
-  }
+  async set(payload: T, id?: string) {
+    const c = id
+      ? collection(db, this.collectionName, id)
+      : collection(db, this.collectionName)
 
-  async set(payload: T) {
-    return await addDoc(
-      this.collection,
-      payload as WithFieldValue<DocumentData>
-    )
+    return await addDoc(c, payload as WithFieldValue<DocumentData>)
   }
 
   async getById(id: string) {
@@ -47,10 +47,46 @@ export abstract class BaseCollection<T> {
     const items = queries.map((q) => {
       return where(q.fieldPath as string | FieldPath, q.direction, q.value)
     })
-    const q = query(this.collection, ...items)
+    const q = query(collection(db, this.collectionName), ...items)
     const snapshots = await getDocs(q)
     return snapshots.docs.map((doc) => {
       return { ...doc.data(), id: doc.id } as T
     })
   }
+
+  async delete(id: string) {
+    await deleteDoc(doc(db, this.collectionName, id))
+  }
+
+  async update(id: string, payload: Partial<T>) {
+    await updateDoc(
+      doc(db, this.collectionName, id),
+      payload as WithFieldValue<DocumentData>
+    )
+  }
+
+  withTransaction(transaction: Transaction) {
+    return {
+      set: (payload: T, id?: string) => {
+        const docRef = id
+          ? doc(db, this.collectionName, id)
+          : doc(db, this.collectionName)
+
+        transaction.set(docRef, payload as WithFieldValue<DocumentData>)
+      },
+      get: async (id: string) => {
+        const result = await transaction.get(doc(db, this.collectionName, id))
+        return { ...result.data, id: result.id }
+      },
+      update: (payload: Partial<T>, id: string) => {
+        transaction.update(
+          doc(db, this.collectionName, id),
+          payload as WithFieldValue<DocumentData>
+        )
+      },
+      delete: (id: string) => {
+        transaction.delete(doc(db, this.collectionName, id))
+      },
+    }
+  }
 }

From 63eae22ecc4f4664113481a2993242a9fca25b83 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Mon, 29 May 2023 23:57:34 +0800
Subject: [PATCH 059/223] Migrate to firebase

---
 src/components/users/SingleUserForm.tsx     |  2 +-
 src/pages/api/auth/[...nextauth].ts         | 42 +++++++++---------
 src/server/db/collections/BaseCollection.ts | 22 +++++++---
 src/server/trpc/router/member/create.ts     | 38 +++++++++--------
 src/server/trpc/router/member/helper.ts     | 47 +++------------------
 5 files changed, 66 insertions(+), 85 deletions(-)

diff --git a/src/components/users/SingleUserForm.tsx b/src/components/users/SingleUserForm.tsx
index 6403b786..178b57a7 100644
--- a/src/components/users/SingleUserForm.tsx
+++ b/src/components/users/SingleUserForm.tsx
@@ -187,7 +187,7 @@ const SingleUserForm = () => {
     } catch (e) {
       toast({
         title: 'Oops, something went wrong!',
-        description: 'An error went wrong while creating the user',
+        description: (e as Error).message,
         status: 'error',
         isClosable: true,
         duration: 9000,
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 70c9fb00..2dd346fb 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -2,12 +2,10 @@ import NextAuth, { type NextAuthOptions } from 'next-auth'
 import CredentialsProvider from 'next-auth/providers/credentials'
 import { compare } from 'bcryptjs'
 
-import { prisma } from '../../../server/db/client'
 import { env } from '../../../env/server.mjs'
-import type { User } from '@prisma/client'
+import type { User } from '~/server/db/models/User'
 
-import { db } from '~/server/db/firebase'
-import { collection, addDoc } from 'firebase/firestore'
+import userCollection from '~/server/db/collections/UserCollection'
 
 export const authOptions: NextAuthOptions = {
   callbacks: {
@@ -45,34 +43,36 @@ export const authOptions: NextAuthOptions = {
             password: string
           }
 
-          await addDoc(collection(db, 'users'), {
-            name: 'John',
-          })
-
           // Step 2: If no credentials are provided, throw an error
           if (!credential || !email || !password) {
             throw new Error('No email or password provided')
           }
 
           // Step 3: Get the user by the email
-          const adapterUser = await prisma.user.findUnique({
-            where: { email },
-          })
-          if (!adapterUser) throw new Error('Invalid email or password')
+          const users = await userCollection.queries([
+            {
+              fieldPath: 'email',
+              direction: '==',
+              value: email,
+            },
+          ])
 
-          // Step 4: Type cast it to the type of User
-          const account = adapterUser as User
+          if (users.length === 0) {
+            throw Error('Invalid email or password')
+          }
 
-          // If the account is found, challenge the hashPassword with the password
-          const success = await compare(password, account.hashedPassword)
-          if (!success) throw new Error('Invalid email or password')
+          const user = users[0] as User
+          const isSuccess = await compare(password, user.hashedPassword)
+          if (!isSuccess) {
+            throw Error('Incorrect password')
+          }
 
           // The user object is passed to the session callback in session.data.user
           return {
-            id: account.id,
-            name: account.name,
-            email: account.email,
-            isAdmin: account.isAdmin,
+            id: user.id as string,
+            name: user.name,
+            email: user.email,
+            isAdmin: user.isAdmin,
           }
         } catch (e) {
           throw new Error((e as Error).message)
diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index dfd10f31..1b39accc 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -1,7 +1,7 @@
 import { db } from '../firebase'
 import {
   collection,
-  addDoc,
+  setDoc,
   getDoc,
   doc,
   query,
@@ -27,11 +27,23 @@ export abstract class BaseCollection<T> {
   protected abstract objectName: string
 
   async set(payload: T, id?: string) {
-    const c = id
-      ? collection(db, this.collectionName, id)
-      : collection(db, this.collectionName)
+    const docRef = id
+      ? doc(db, this.collectionName, id)
+      : doc(db, this.collectionName)
 
-    return await addDoc(c, payload as WithFieldValue<DocumentData>)
+    return await setDoc(docRef, {
+      ...payload,
+      id: id ? id : docRef.id,
+    } as WithFieldValue<DocumentData>)
+  }
+
+  async findById(id: string) {
+    const docRef = doc(db, this.collectionName, id)
+    const result = await getDoc(docRef)
+    if (!result.exists) {
+      return null
+    }
+    return { ...result.data(), id: result.id } as T
   }
 
   async getById(id: string) {
diff --git a/src/server/trpc/router/member/create.ts b/src/server/trpc/router/member/create.ts
index 0c83a2f7..b58cfbdd 100644
--- a/src/server/trpc/router/member/create.ts
+++ b/src/server/trpc/router/member/create.ts
@@ -5,7 +5,6 @@ import { hash } from 'bcryptjs'
 import type { User } from '@prisma/client'
 import {
   checkIfUserExist,
-  createNewUser,
   sendEmail,
   sendMultipleEmails,
   buildUserObject,
@@ -13,6 +12,7 @@ import {
 } from './helper'
 import { LogType } from '@prisma/client'
 import { ErrorTitle } from '../constants/ErrorTitle'
+import userCollection from '~/server/db/collections/UserCollection'
 
 /**
  * Create multiple accounts for many users and send out an
@@ -73,21 +73,25 @@ export const createSingleUser = protectedProcedure
       isAdmin: z.boolean(),
     })
   )
-  .mutation(async ({ ctx, input }) => {
-    try {
-      const { email, id, isAdmin, role, department, name } = input
-      const password = input.password
+  .mutation(async ({ input }) => {
+    const { email, id, isAdmin, role, department, name, password } = input
 
-      await checkIfUserExist(email, ctx.prisma)
-      await createNewUser(name, department, email, id, isAdmin, role, password, ctx.prisma)
-      await sendEmail(email, password)
-    } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          title: ErrorTitle.ERROR_ADDING_SINGLE_USER,
-          message: (e as Error).message,
-          type: LogType.ERROR,
-        },
-      })
-    }
+    const [hashedPassword] = await Promise.all([
+      hash(password, 10),
+      checkIfUserExist(id),
+    ])
+
+    await userCollection.set(
+      {
+        department,
+        email,
+        isAdmin,
+        name,
+        hashedPassword,
+        role,
+      },
+      id
+    )
+
+    await sendEmail(email, hashedPassword)
   })
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index dec00a45..cf61dc35 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -1,11 +1,11 @@
 import { TRPCError } from '@trpc/server'
-import { hash } from 'bcryptjs'
 import nodemailer from 'nodemailer'
 import { env } from '~/env/server.mjs'
 import type { User } from '@prisma/client'
 import { type PrismaClient } from '@prisma/client'
 import dayjs from 'dayjs'
 import type SMTPTransport from 'nodemailer/lib/smtp-transport'
+import userCollection from '~/server/db/collections/UserCollection'
 
 /**
  * Validates whether the user has the necessary permissions
@@ -32,51 +32,17 @@ async function checkUserPermission(id: string, prisma: PrismaClient) {
  * @param email The email of the user
  * @throws {TRPCError} if the user already exists
  */
-async function checkIfUserExist(email: string, prisma: PrismaClient) {
-  const foundUser = await prisma.user.findUnique({ where: { email } })
-  if (foundUser) {
+async function checkIfUserExist(id: string) {
+  const results = await userCollection.findById(id)
+
+  if (results) {
     throw new TRPCError({
       code: 'CONFLICT',
-      message: 'User already exists',
+      message: 'The user already exists',
     })
   }
 }
 
-/**
- * CREATE a new user into the database
- *
- * @param email The email of the user
- * @param id The student id of the user
- * @param isAdmin Whether the user has admin rights
- * @param level The role of the user
- * @param password The password of the user
- */
-async function createNewUser(
-  name: string,
-  department: string,
-  email: string,
-  id: string,
-  isAdmin: boolean,
-  role: string,
-  password: string,
-  prisma: PrismaClient
-) {
-  const hashedPassword = await hash(password, 10)
-
-  await prisma.user.create({
-    data: {
-      batch: 'AY2022/2023',
-      department,
-      name,
-      role,
-      email,
-      id,
-      hashedPassword,
-      isAdmin,
-    },
-  })
-}
-
 /**
  * Sends an email to the user after the account has been generated.
  *
@@ -202,7 +168,6 @@ export {
   createManyUsers,
   checkUserPermission,
   checkIfUserExist,
-  createNewUser,
   sendEmail,
   sendMultipleEmails,
   buildUserObject,

From a8b774e4a7851e4bb0e818e3658991d41b2a6791 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 00:13:03 +0800
Subject: [PATCH 060/223] Update the create multiple users

---
 src/server/db/models/User.ts            |  6 +++-
 src/server/trpc/router/member/create.ts | 45 +++++++++++++++++++------
 src/server/trpc/router/member/helper.ts | 11 +++---
 3 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index 8be8142b..f31429d0 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -1,5 +1,9 @@
 export type User = {
+  department: string
   email: string
   hashedPassword: string
-  name: number
+  isAdmin: boolean
+  id?: string
+  name: string
+  role: string
 }
diff --git a/src/server/trpc/router/member/create.ts b/src/server/trpc/router/member/create.ts
index b58cfbdd..aaaf31f1 100644
--- a/src/server/trpc/router/member/create.ts
+++ b/src/server/trpc/router/member/create.ts
@@ -2,17 +2,14 @@ import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import { randomBytes } from 'crypto'
 import { hash } from 'bcryptjs'
-import type { User } from '@prisma/client'
-import {
-  checkIfUserExist,
-  sendEmail,
-  sendMultipleEmails,
-  buildUserObject,
-  createManyUsers,
-} from './helper'
+
+import { checkIfUserExist, sendEmail, sendMultipleEmails } from './helper'
 import { LogType } from '@prisma/client'
 import { ErrorTitle } from '../constants/ErrorTitle'
 import userCollection from '~/server/db/collections/UserCollection'
+import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
+import { db } from '~/server/db/firebase'
+import type { User } from '~/server/db/models/User'
 
 /**
  * Create multiple accounts for many users and send out an
@@ -46,10 +43,36 @@ export const addMultipleUsers = protectedProcedure
     try {
       const password = randomBytes(10).toString('hex')
       const hashedPassword = await hash(password, 10)
+      const emails: string[] = []
+
+      // Add user logic. Note that each firebase batch only allow up to 500 writes so we need an array for more than 500 users.
+      let batchIndex = 0
+      let counter = 0
+      const batches: WriteBatch[] = [writeBatch(db)]
+      input.forEach((user) => {
+        emails.push(user.nus_email)
+
+        batches[batchIndex]?.set(doc(db, 'users', user.student_id), {
+          department: user.department,
+          email: user.nus_email,
+          hashedPassword,
+          name: user.name,
+          isAdmin: false,
+          id: user.student_id,
+          role: user.role,
+        } as User)
+
+        counter += 1
+
+        if (counter === 499) {
+          batches.push(writeBatch(db))
+          batchIndex += 1
+          counter = 0
+        }
+      })
 
-      const users: User[] = buildUserObject(input, hashedPassword)
-      await createManyUsers(users, ctx.prisma)
-      await sendMultipleEmails(users, password)
+      await Promise.all(batches.map(async (batch) => await batch.commit()))
+      await sendMultipleEmails(emails, password)
     } catch (e) {
       await ctx.prisma.log.create({
         data: {
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index cf61dc35..34b9ee3e 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -144,13 +144,10 @@ function buildUserObject(
  * @param users The array of users object
  * @param password The hashed password
  */
-async function sendMultipleEmails(users: User[], password: string) {
-  const promises: Promise<SMTPTransport.SentMessageInfo>[] = []
-  users.forEach((user) => {
-    const promise = sendEmail(user.email, password)
-    promises.push(promise)
-  })
-  await Promise.all(promises)
+async function sendMultipleEmails(emails: string[], password: string) {
+  await Promise.all(
+    emails.map(async (email) => await sendEmail(email, password))
+  )
 }
 
 /**

From f77148d3732001c22689de0e34b81eabc58a85f4 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 00:28:09 +0800
Subject: [PATCH 061/223] Migrate the getAllAttendance

---
 src/server/db/collections/EventCollection.ts  | 10 ++++++
 src/server/db/models/Event.ts                 | 17 ++++++++++
 .../admin/attendance/getAllAttendance.ts      | 24 +++++++++++++
 .../trpc/router/admin/attendance/index.ts     |  2 +-
 .../trpc/router/admin/attendance/read.ts      | 34 -------------------
 5 files changed, 52 insertions(+), 35 deletions(-)
 create mode 100644 src/server/db/collections/EventCollection.ts
 create mode 100644 src/server/db/models/Event.ts
 create mode 100644 src/server/trpc/router/admin/attendance/getAllAttendance.ts
 delete mode 100644 src/server/trpc/router/admin/attendance/read.ts

diff --git a/src/server/db/collections/EventCollection.ts b/src/server/db/collections/EventCollection.ts
new file mode 100644
index 00000000..cdbddc63
--- /dev/null
+++ b/src/server/db/collections/EventCollection.ts
@@ -0,0 +1,10 @@
+import { BaseCollection } from './BaseCollection'
+import type { Event } from '../models/Event'
+
+class EventCollection extends BaseCollection<Event> {
+  protected override collectionName = 'events'
+  protected override objectName = 'event'
+}
+
+const eventCollection = new EventCollection()
+export default eventCollection
diff --git a/src/server/db/models/Event.ts b/src/server/db/models/Event.ts
new file mode 100644
index 00000000..6b289595
--- /dev/null
+++ b/src/server/db/models/Event.ts
@@ -0,0 +1,17 @@
+import type { Timestamp } from 'firebase/firestore'
+
+type User = {
+  id: string
+  name: string
+}
+
+export type Event = {
+  attendees: User[]
+  endDate: Timestamp
+  hasStarted: boolean
+  id: string
+  invitedAttendees: User[]
+  name: string
+  qrCode?: string
+  startDate: Timestamp
+}
diff --git a/src/server/trpc/router/admin/attendance/getAllAttendance.ts b/src/server/trpc/router/admin/attendance/getAllAttendance.ts
new file mode 100644
index 00000000..2bcb5239
--- /dev/null
+++ b/src/server/trpc/router/admin/attendance/getAllAttendance.ts
@@ -0,0 +1,24 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { TRPCError } from '@trpc/server'
+import eventCollection from '~/server/db/collections/EventCollection'
+
+export const getAllAttendance = protectedProcedure.query(async () => {
+  try {
+    const events = await eventCollection.queries([])
+    return events.map((event) => {
+      return {
+        endDate: event.endDate.toDate(),
+        id: event.id,
+        name: event.name,
+        startDate: event.startDate.toDate(),
+        total_attendees: event.attendees.length,
+        total_users: event.invitedAttendees.length,
+      }
+    })
+  } catch (e) {
+    throw new TRPCError({
+      code: 'INTERNAL_SERVER_ERROR',
+      message: (e as Error).message,
+    })
+  }
+})
diff --git a/src/server/trpc/router/admin/attendance/index.ts b/src/server/trpc/router/admin/attendance/index.ts
index 7da37c84..264c5465 100644
--- a/src/server/trpc/router/admin/attendance/index.ts
+++ b/src/server/trpc/router/admin/attendance/index.ts
@@ -1,5 +1,5 @@
 import { router } from '~/server/trpc/trpc'
-import { getAllAttendance } from './read'
+import { getAllAttendance } from './getAllAttendance'
 
 export const attendanceRouter = router({
   getAllAttendance,
diff --git a/src/server/trpc/router/admin/attendance/read.ts b/src/server/trpc/router/admin/attendance/read.ts
deleted file mode 100644
index fb0c2a01..00000000
--- a/src/server/trpc/router/admin/attendance/read.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { protectedProcedure } from '~/server/trpc/trpc'
-import { TRPCError } from '@trpc/server'
-
-export const getAllAttendance = protectedProcedure.query(async ({ ctx }) => {
-  try {
-    const queries = await ctx.prisma.event.findMany({
-      select: {
-        name: true,
-        startDate: true,
-        endDate: true,
-        id: true,
-        _count: {
-          select: { Attendance: true, attendees: true },
-        },
-      },
-    })
-
-    return queries.map((query) => {
-      return {
-        endDate: query.endDate,
-        name: query.name,
-        id: query.id,
-        startDate: query.startDate,
-        total_attendees: query._count.Attendance,
-        total_users: query._count.attendees,
-      }
-    })
-  } catch (e) {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: (e as Error).message,
-    })
-  }
-})

From a3a3cec6bd943ad3cc5c6a14760f8a1d896c4aef Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 00:56:18 +0800
Subject: [PATCH 062/223] Continue migration

---
 src/pages/events/create.tsx                   |  6 +-
 src/server/db/collections/BaseCollection.ts   |  8 +--
 src/server/trpc/router/_app.ts                |  2 +-
 .../trpc/router/attendance/createEvent.ts     | 58 +++++++++++++++++++
 .../attendance/getAllAttendance.ts            |  0
 .../router/attendance/getAllUsersButSelf.ts   | 29 ++++++++++
 .../router/{admin => }/attendance/index.ts    |  4 ++
 src/server/trpc/router/member/helper.ts       |  1 -
 8 files changed, 99 insertions(+), 9 deletions(-)
 create mode 100644 src/server/trpc/router/attendance/createEvent.ts
 rename src/server/trpc/router/{admin => }/attendance/getAllAttendance.ts (100%)
 create mode 100644 src/server/trpc/router/attendance/getAllUsersButSelf.ts
 rename src/server/trpc/router/{admin => }/attendance/index.ts (52%)

diff --git a/src/pages/events/create.tsx b/src/pages/events/create.tsx
index 0410e85c..cfb8cc4a 100644
--- a/src/pages/events/create.tsx
+++ b/src/pages/events/create.tsx
@@ -60,9 +60,9 @@ const EventPage: React.FC<BaseProps> = ({ session }) => {
     resolver: zodResolver(FormSchema),
   })
 
-  const { data } = trpc.event.getAllUsers.useQuery()
+  const { data } = trpc.attendance.getAllAttendanceButSelf.useQuery()
   const { mutateAsync, isLoading: isSubmitting } =
-    trpc.event.createEvent.useMutation()
+    trpc.attendance.createEvent.useMutation()
 
   const invalidAttendees = attendees.length === 0
   const formSubmit = async (formData: FormSchemaType) => {
@@ -220,4 +220,4 @@ const EventPage: React.FC<BaseProps> = ({ session }) => {
   )
 }
 
-export default withAuth(EventPage, true)
+export default withAuth(EventPage)
diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index 1b39accc..c6036926 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -40,10 +40,10 @@ export abstract class BaseCollection<T> {
   async findById(id: string) {
     const docRef = doc(db, this.collectionName, id)
     const result = await getDoc(docRef)
-    if (!result.exists) {
+    if (!result.exists()) {
       return null
     }
-    return { ...result.data(), id: result.id } as T
+    return { ...result.data(), id: result.id as string } as T
   }
 
   async getById(id: string) {
@@ -52,7 +52,7 @@ export abstract class BaseCollection<T> {
     if (!result.exists) {
       throw Error(`The ${this.objectName} does not exist`)
     }
-    return { ...result, id: result.id } as T
+    return { ...result, id: result.id as string } as T
   }
 
   async queries(queries: Queries<T>[]) {
@@ -62,7 +62,7 @@ export abstract class BaseCollection<T> {
     const q = query(collection(db, this.collectionName), ...items)
     const snapshots = await getDocs(q)
     return snapshots.docs.map((doc) => {
-      return { ...doc.data(), id: doc.id } as T
+      return { ...doc.data(), id: doc.id as string } as T
     })
   }
 
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index 3bb29760..d5bcd2ae 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -4,7 +4,7 @@ import { memberRouter } from './member'
 import { profileRouter } from './profile'
 import { userRouter } from './admin/users'
 import { eventRouter } from './events'
-import { attendanceRouter } from './admin/attendance'
+import { attendanceRouter } from './attendance'
 
 export const appRouter = router({
   auth: authRouter,
diff --git a/src/server/trpc/router/attendance/createEvent.ts b/src/server/trpc/router/attendance/createEvent.ts
new file mode 100644
index 00000000..d3c3ab7a
--- /dev/null
+++ b/src/server/trpc/router/attendance/createEvent.ts
@@ -0,0 +1,58 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { z } from 'zod'
+import { toDataURL } from 'qrcode'
+import { randomUUID } from 'crypto'
+import { LogType } from '@prisma/client'
+import { ErrorTitle } from '../constants/ErrorTitle'
+import { env } from '~/env/server.mjs'
+import eventCollection from '~/server/db/collections/EventCollection'
+import { Timestamp } from 'firebase/firestore'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const createEvent = protectedProcedure
+  .input(
+    z.object({
+      name: z.string(),
+      startDate: z.date(),
+      endDate: z.date(),
+      departments: z.array(z.string()),
+      attendees: z.array(z.string()),
+      isQrRequired: z.boolean(),
+    })
+  )
+  .mutation(async ({ ctx, input }) => {
+    try {
+      let qr_code: string | undefined
+      const id = randomUUID()
+
+      if (input.isQrRequired) {
+        qr_code = await toDataURL(`${env.DOMAIN}/events/${id}`)
+      }
+
+      const users = await Promise.all(
+        input.attendees.map(async (attendee) => {
+          const data = await userCollection.getById(attendee)
+          return { name: data.name, id: data.id as string }
+        })
+      )
+
+      await eventCollection.set({
+        attendees: [],
+        endDate: Timestamp.fromDate(input.endDate),
+        hasStarted: false,
+        id,
+        invitedAttendees: users,
+        name: input.name,
+        startDate: Timestamp.fromDate(input.startDate),
+        qrCode: qr_code,
+      })
+    } catch (e) {
+      await ctx.prisma.log.create({
+        data: {
+          message: (e as Error).message,
+          title: ErrorTitle.ERROR_CREATING_EVENT,
+          type: LogType.ERROR,
+        },
+      })
+    }
+  })
diff --git a/src/server/trpc/router/admin/attendance/getAllAttendance.ts b/src/server/trpc/router/attendance/getAllAttendance.ts
similarity index 100%
rename from src/server/trpc/router/admin/attendance/getAllAttendance.ts
rename to src/server/trpc/router/attendance/getAllAttendance.ts
diff --git a/src/server/trpc/router/attendance/getAllUsersButSelf.ts b/src/server/trpc/router/attendance/getAllUsersButSelf.ts
new file mode 100644
index 00000000..4dca4144
--- /dev/null
+++ b/src/server/trpc/router/attendance/getAllUsersButSelf.ts
@@ -0,0 +1,29 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { TRPCError } from '@trpc/server'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const getAllAttendanceButSelf = protectedProcedure.query(async ({ ctx }) => {
+  try {
+    const users = await userCollection.queries([
+      {
+        fieldPath: 'id',
+        direction: '!=',
+        value: ctx.session.user.id,
+      },
+    ])
+
+    return users.map((user) => {
+      return {
+        department: user.department,
+        id: user.id as string,
+        name: user.name,
+        role: user.role,
+      }
+    })
+  } catch (e) {
+    throw new TRPCError({
+      code: 'INTERNAL_SERVER_ERROR',
+      message: (e as Error).message,
+    })
+  }
+})
diff --git a/src/server/trpc/router/admin/attendance/index.ts b/src/server/trpc/router/attendance/index.ts
similarity index 52%
rename from src/server/trpc/router/admin/attendance/index.ts
rename to src/server/trpc/router/attendance/index.ts
index 264c5465..fa3fda8d 100644
--- a/src/server/trpc/router/admin/attendance/index.ts
+++ b/src/server/trpc/router/attendance/index.ts
@@ -1,6 +1,10 @@
 import { router } from '~/server/trpc/trpc'
 import { getAllAttendance } from './getAllAttendance'
+import { getAllAttendanceButSelf } from './getAllUsersButSelf'
+import { createEvent } from './createEvent'
 
 export const attendanceRouter = router({
+  createEvent,
   getAllAttendance,
+  getAllAttendanceButSelf,
 })
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index 34b9ee3e..b4b21e1a 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -34,7 +34,6 @@ async function checkUserPermission(id: string, prisma: PrismaClient) {
  */
 async function checkIfUserExist(id: string) {
   const results = await userCollection.findById(id)
-
   if (results) {
     throw new TRPCError({
       code: 'CONFLICT',

From 7ae767bf63a2e616567e61943d9c8812d8f04845 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 01:25:52 +0800
Subject: [PATCH 063/223] Fix bugs

---
 src/server/db/collections/BaseCollection.ts   | 16 ++++++++-----
 .../trpc/router/attendance/createEvent.ts     | 23 ++++++++-----------
 src/server/trpc/router/member/helper.ts       |  1 -
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index c6036926..e569157a 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -6,6 +6,7 @@ import {
   doc,
   query,
   getDocs,
+  addDoc,
   where,
   deleteDoc,
   updateDoc,
@@ -26,14 +27,17 @@ export abstract class BaseCollection<T> {
   protected abstract collectionName: string
   protected abstract objectName: string
 
-  async set(payload: T, id?: string) {
-    const docRef = id
-      ? doc(db, this.collectionName, id)
-      : doc(db, this.collectionName)
+  async add(payload: T) {
+    return await addDoc(
+      collection(db, this.collectionName),
+      payload as WithFieldValue<DocumentData>
+    )
+  }
 
+  async set(payload: T, id: string) {
+    const docRef = doc(db, this.collectionName, id)
     return await setDoc(docRef, {
       ...payload,
-      id: id ? id : docRef.id,
     } as WithFieldValue<DocumentData>)
   }
 
@@ -52,7 +56,7 @@ export abstract class BaseCollection<T> {
     if (!result.exists) {
       throw Error(`The ${this.objectName} does not exist`)
     }
-    return { ...result, id: result.id as string } as T
+    return { ...result.data(), id: result.id as string } as T
   }
 
   async queries(queries: Queries<T>[]) {
diff --git a/src/server/trpc/router/attendance/createEvent.ts b/src/server/trpc/router/attendance/createEvent.ts
index d3c3ab7a..29018f17 100644
--- a/src/server/trpc/router/attendance/createEvent.ts
+++ b/src/server/trpc/router/attendance/createEvent.ts
@@ -2,12 +2,11 @@ import { protectedProcedure } from '~/server/trpc/trpc'
 import { z } from 'zod'
 import { toDataURL } from 'qrcode'
 import { randomUUID } from 'crypto'
-import { LogType } from '@prisma/client'
-import { ErrorTitle } from '../constants/ErrorTitle'
 import { env } from '~/env/server.mjs'
 import eventCollection from '~/server/db/collections/EventCollection'
 import { Timestamp } from 'firebase/firestore'
 import userCollection from '~/server/db/collections/UserCollection'
+import type { Event } from '~/server/db/models/Event'
 
 export const createEvent = protectedProcedure
   .input(
@@ -32,11 +31,11 @@ export const createEvent = protectedProcedure
       const users = await Promise.all(
         input.attendees.map(async (attendee) => {
           const data = await userCollection.getById(attendee)
-          return { name: data.name, id: data.id as string }
+          console.log("The data is ", data)
+          return { name: data.name || '', id: data.id as string }
         })
       )
-
-      await eventCollection.set({
+      const payload: Event = {
         attendees: [],
         endDate: Timestamp.fromDate(input.endDate),
         hasStarted: false,
@@ -44,15 +43,11 @@ export const createEvent = protectedProcedure
         invitedAttendees: users,
         name: input.name,
         startDate: Timestamp.fromDate(input.startDate),
-        qrCode: qr_code,
-      })
+        qrCode: qr_code || '',
+      }
+
+      await eventCollection.add(payload)
     } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          message: (e as Error).message,
-          title: ErrorTitle.ERROR_CREATING_EVENT,
-          type: LogType.ERROR,
-        },
-      })
+      console.error('The error is ', (e as Error).message)
     }
   })
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index b4b21e1a..730a4710 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -4,7 +4,6 @@ import { env } from '~/env/server.mjs'
 import type { User } from '@prisma/client'
 import { type PrismaClient } from '@prisma/client'
 import dayjs from 'dayjs'
-import type SMTPTransport from 'nodemailer/lib/smtp-transport'
 import userCollection from '~/server/db/collections/UserCollection'
 
 /**

From 9c36a986a593fbfc1629c1e3df56bf851d542cd8 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 01:46:03 +0800
Subject: [PATCH 064/223] Update the getEventInfo

---
 src/components/attendance/DataTableModal.tsx  |  8 ++---
 src/server/db/models/Event.ts                 |  3 ++
 .../trpc/router/attendance/createEvent.ts     | 11 +++++--
 .../trpc/router/attendance/getEventInfo.ts    | 32 +++++++++++++++++++
 src/server/trpc/router/attendance/index.ts    |  2 ++
 src/types/event/event.type.ts                 | 29 +++++++++--------
 6 files changed, 64 insertions(+), 21 deletions(-)
 create mode 100644 src/server/trpc/router/attendance/getEventInfo.ts

diff --git a/src/components/attendance/DataTableModal.tsx b/src/components/attendance/DataTableModal.tsx
index e0d0f805..d328862a 100644
--- a/src/components/attendance/DataTableModal.tsx
+++ b/src/components/attendance/DataTableModal.tsx
@@ -22,7 +22,7 @@ import { type BodyProps } from '~/types/event/event.type'
 
 const DataTableModal = () => {
   const modal = useContext(EventModalContext)
-  const { data, isLoading } = trpc.event.getEventInfo.useQuery(modal.id)
+  const { data, isLoading } = trpc.attendance.getEventInfo.useQuery(modal.id)
 
   if (!modal.id) {
     return null
@@ -69,7 +69,7 @@ const Body: React.FC<{ data: BodyProps | null | undefined }> = ({ data }) => {
       <p>Department: </p>
       <p>Start Date: {startDate}</p>
       <p>End Date: {endDate}</p>
-      <p>Attendance: {`${data._count.Attendance}/${data._count.attendees}`}</p>
+      <p>Attendance: {`${data.showup}/${data.invitedAttendees.length}`}</p>
       <p>Required Attendees:</p>
       <Table>
         <Thead>
@@ -80,14 +80,14 @@ const Body: React.FC<{ data: BodyProps | null | undefined }> = ({ data }) => {
           <Th color="white">Attendance</Th>
         </Thead>
         <Tbody>
-          {data.attendees.map((attendee, index) => {
+          {data.invitedAttendees.map((attendee, index) => {
             return (
               <Tr key={index}>
                 <Td>{index + 1}</Td>
                 <Td>{attendee.name}</Td>
                 <Td>{attendee.department}</Td>
                 <Td>{attendee.role}</Td>
-                <Td>{data.attended.has(attendee.id) ? 'Yes' : 'No'}</Td>
+                <Td>{attendee.attended ? 'Yes' : 'No'}</Td>
               </Tr>
             )
           })}
diff --git a/src/server/db/models/Event.ts b/src/server/db/models/Event.ts
index 6b289595..08915055 100644
--- a/src/server/db/models/Event.ts
+++ b/src/server/db/models/Event.ts
@@ -1,8 +1,11 @@
 import type { Timestamp } from 'firebase/firestore'
 
 type User = {
+  attended: boolean
+  department: string
   id: string
   name: string
+  role: string
 }
 
 export type Event = {
diff --git a/src/server/trpc/router/attendance/createEvent.ts b/src/server/trpc/router/attendance/createEvent.ts
index 29018f17..2b95348e 100644
--- a/src/server/trpc/router/attendance/createEvent.ts
+++ b/src/server/trpc/router/attendance/createEvent.ts
@@ -19,7 +19,7 @@ export const createEvent = protectedProcedure
       isQrRequired: z.boolean(),
     })
   )
-  .mutation(async ({ ctx, input }) => {
+  .mutation(async ({ input }) => {
     try {
       let qr_code: string | undefined
       const id = randomUUID()
@@ -31,8 +31,13 @@ export const createEvent = protectedProcedure
       const users = await Promise.all(
         input.attendees.map(async (attendee) => {
           const data = await userCollection.getById(attendee)
-          console.log("The data is ", data)
-          return { name: data.name || '', id: data.id as string }
+          return {
+            name: data.name,
+            id: data.id as string,
+            attended: false,
+            department: data.department,
+            role: data.role,
+          }
         })
       )
       const payload: Event = {
diff --git a/src/server/trpc/router/attendance/getEventInfo.ts b/src/server/trpc/router/attendance/getEventInfo.ts
new file mode 100644
index 00000000..96daa79a
--- /dev/null
+++ b/src/server/trpc/router/attendance/getEventInfo.ts
@@ -0,0 +1,32 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { z } from 'zod'
+import { TRPCError } from '@trpc/server'
+import eventCollection from '~/server/db/collections/EventCollection'
+
+/**
+ * @param {string} id The event id
+ */
+export const getEventInfo = protectedProcedure
+  .input(z.string())
+  .query(async ({ input }) => {
+    try {
+      const event = await eventCollection.getById(input)
+      console.log('The event is ', event)
+
+      return {
+        attendees: event.attendees,
+        endDate: event.endDate.toDate(),
+        id: event.id,
+        invitedAttendees: event.invitedAttendees,
+        name: event.name,
+        showup: event.attendees.length,
+        qr_code: event.qrCode,
+        startDate: event.startDate.toDate(),
+      }
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })
diff --git a/src/server/trpc/router/attendance/index.ts b/src/server/trpc/router/attendance/index.ts
index fa3fda8d..60be309f 100644
--- a/src/server/trpc/router/attendance/index.ts
+++ b/src/server/trpc/router/attendance/index.ts
@@ -2,9 +2,11 @@ import { router } from '~/server/trpc/trpc'
 import { getAllAttendance } from './getAllAttendance'
 import { getAllAttendanceButSelf } from './getAllUsersButSelf'
 import { createEvent } from './createEvent'
+import { getEventInfo } from './getEventInfo'
 
 export const attendanceRouter = router({
   createEvent,
   getAllAttendance,
   getAllAttendanceButSelf,
+  getEventInfo,
 })
diff --git a/src/types/event/event.type.ts b/src/types/event/event.type.ts
index 67c421a8..8ca9442e 100644
--- a/src/types/event/event.type.ts
+++ b/src/types/event/event.type.ts
@@ -1,5 +1,3 @@
-import { Attendance } from '@prisma/client'
-
 export type EventInfos = {
   number: string
   name: string
@@ -11,21 +9,24 @@ export type EventInfos = {
 }
 
 export interface BodyProps {
-  _count: {
-    Attendance: number
-    attendees: number
-  }
-  attended: Set<string>
-  name: string
-  id: string
   attendees: {
-    name: string | null
-    department: string | null
+    attended: boolean
+    department: string
+    name: string
     id: string
-    role: string | null
+    role: string
   }[]
   endDate: Date
-  hasStarted: boolean
-  qr_code: string | null
+  id: string
+  invitedAttendees: {
+    attended: boolean
+    department: string
+    name: string
+    id: string
+    role: string
+  }[]
+  name: string
+  showup: number
+  qr_code: string | undefined
   startDate: Date
 }

From bc094cc9b475389477887599e34596eb669ae159 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 01:59:52 +0800
Subject: [PATCH 065/223] Fix up the getEventInfo

---
 src/server/db/models/Event.ts                         |  4 ++--
 src/server/trpc/router/attendance/createEvent.ts      | 11 ++++-------
 src/server/trpc/router/attendance/getAllAttendance.ts |  2 +-
 src/server/trpc/router/attendance/getEventInfo.ts     |  9 ++++++---
 src/server/trpc/router/attendance/markAttendance.ts   |  0
 src/types/event/event.type.ts                         | 10 ++--------
 6 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100644 src/server/trpc/router/attendance/markAttendance.ts

diff --git a/src/server/db/models/Event.ts b/src/server/db/models/Event.ts
index 08915055..8700cd98 100644
--- a/src/server/db/models/Event.ts
+++ b/src/server/db/models/Event.ts
@@ -9,10 +9,10 @@ type User = {
 }
 
 export type Event = {
-  attendees: User[]
+  attendees: number
   endDate: Timestamp
   hasStarted: boolean
-  id: string
+  id?: string
   invitedAttendees: User[]
   name: string
   qrCode?: string
diff --git a/src/server/trpc/router/attendance/createEvent.ts b/src/server/trpc/router/attendance/createEvent.ts
index 2b95348e..eac27dbe 100644
--- a/src/server/trpc/router/attendance/createEvent.ts
+++ b/src/server/trpc/router/attendance/createEvent.ts
@@ -6,7 +6,6 @@ import { env } from '~/env/server.mjs'
 import eventCollection from '~/server/db/collections/EventCollection'
 import { Timestamp } from 'firebase/firestore'
 import userCollection from '~/server/db/collections/UserCollection'
-import type { Event } from '~/server/db/models/Event'
 
 export const createEvent = protectedProcedure
   .input(
@@ -40,18 +39,16 @@ export const createEvent = protectedProcedure
           }
         })
       )
-      const payload: Event = {
-        attendees: [],
+
+      await eventCollection.add({
+        attendees: 0,
         endDate: Timestamp.fromDate(input.endDate),
         hasStarted: false,
-        id,
         invitedAttendees: users,
         name: input.name,
         startDate: Timestamp.fromDate(input.startDate),
         qrCode: qr_code || '',
-      }
-
-      await eventCollection.add(payload)
+      })
     } catch (e) {
       console.error('The error is ', (e as Error).message)
     }
diff --git a/src/server/trpc/router/attendance/getAllAttendance.ts b/src/server/trpc/router/attendance/getAllAttendance.ts
index 2bcb5239..6c70333b 100644
--- a/src/server/trpc/router/attendance/getAllAttendance.ts
+++ b/src/server/trpc/router/attendance/getAllAttendance.ts
@@ -11,7 +11,7 @@ export const getAllAttendance = protectedProcedure.query(async () => {
         id: event.id,
         name: event.name,
         startDate: event.startDate.toDate(),
-        total_attendees: event.attendees.length,
+        total_attendees: event.attendees,
         total_users: event.invitedAttendees.length,
       }
     })
diff --git a/src/server/trpc/router/attendance/getEventInfo.ts b/src/server/trpc/router/attendance/getEventInfo.ts
index 96daa79a..c0e00b03 100644
--- a/src/server/trpc/router/attendance/getEventInfo.ts
+++ b/src/server/trpc/router/attendance/getEventInfo.ts
@@ -10,16 +10,19 @@ export const getEventInfo = protectedProcedure
   .input(z.string())
   .query(async ({ input }) => {
     try {
+      if (!input) return
       const event = await eventCollection.getById(input)
-      console.log('The event is ', event)
+      const attendees = event.invitedAttendees.filter(
+        (attendee) => attendee.attended
+      )
 
       return {
-        attendees: event.attendees,
+        attendees: attendees.length,
         endDate: event.endDate.toDate(),
         id: event.id,
         invitedAttendees: event.invitedAttendees,
         name: event.name,
-        showup: event.attendees.length,
+        showup: event.attendees,
         qr_code: event.qrCode,
         startDate: event.startDate.toDate(),
       }
diff --git a/src/server/trpc/router/attendance/markAttendance.ts b/src/server/trpc/router/attendance/markAttendance.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/types/event/event.type.ts b/src/types/event/event.type.ts
index 8ca9442e..c06a7857 100644
--- a/src/types/event/event.type.ts
+++ b/src/types/event/event.type.ts
@@ -9,15 +9,9 @@ export type EventInfos = {
 }
 
 export interface BodyProps {
-  attendees: {
-    attended: boolean
-    department: string
-    name: string
-    id: string
-    role: string
-  }[]
+  attendees: number,
   endDate: Date
-  id: string
+  id?: string
   invitedAttendees: {
     attended: boolean
     department: string

From ea8f328d93b6dd558bc9ba7a5d146d3c73f36b57 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 07:06:00 +0800
Subject: [PATCH 066/223] Migrate some code over

---
 prisma/schema.prisma                          |  2 +-
 src/env/schema.mjs                            |  8 ++
 src/pages/events/[id].tsx                     |  2 +-
 src/server/db/collections/LogCollection.ts    | 10 +++
 src/server/db/firebase.ts                     |  8 +-
 src/server/db/models/Log.ts                   |  9 +++
 .../trpc/router/attendance/createEvent.ts     |  8 +-
 src/server/trpc/router/attendance/index.ts    |  2 +
 .../trpc/router/attendance/markAttendance.ts  | 37 +++++++++
 src/server/trpc/router/events/index.ts        | 80 -------------------
 10 files changed, 82 insertions(+), 84 deletions(-)
 create mode 100644 src/server/db/collections/LogCollection.ts
 create mode 100644 src/server/db/models/Log.ts

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 3717c9ae..c8f9e140 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -28,7 +28,7 @@ model Departments {
 
 model User {
   batch           String?
-  department      String
+  department      String       @default("")
   discord         String?
   email           String       @unique
   faculty         String?
diff --git a/src/env/schema.mjs b/src/env/schema.mjs
index df140b9c..df7d76bb 100644
--- a/src/env/schema.mjs
+++ b/src/env/schema.mjs
@@ -22,6 +22,14 @@ export const serverSchema = z.object({
   ),
   GMAIL: z.string(),
   GMAIL_PASSWORD: z.string(),
+
+  // Firestore Services
+  APP_ID: z.string(),
+  MESSAGING_SENDER_ID: z.string(),
+  API_KEY: z.string(),
+  AUTH_DOMAIN: z.string(),
+  PROJECT_ID: z.string(),
+  STORAGE_BUCKET: z.string()
 });
 
 /**
diff --git a/src/pages/events/[id].tsx b/src/pages/events/[id].tsx
index b26b55e6..e7b1aebd 100644
--- a/src/pages/events/[id].tsx
+++ b/src/pages/events/[id].tsx
@@ -55,7 +55,7 @@ const ConfirmAttendance: React.FC<BaseProps> = ({ session }) => {
   const eventId = route.query.id as string
   const { data, isLoading, refetch } = trpc.event.getEvent.useQuery(eventId)
   const { mutateAsync, isLoading: loading } =
-    trpc.event.markAttendance.useMutation()
+    trpc.attendance.markAttendance.useMutation()
   dayjs.extend(LocalizedFormat)
 
   const markAttendance = useCallback(async () => {
diff --git a/src/server/db/collections/LogCollection.ts b/src/server/db/collections/LogCollection.ts
new file mode 100644
index 00000000..d0f30761
--- /dev/null
+++ b/src/server/db/collections/LogCollection.ts
@@ -0,0 +1,10 @@
+import { BaseCollection } from './BaseCollection'
+import type { Log } from '../models/Log'
+
+class LogCollection extends BaseCollection<Log> {
+  protected override collectionName = 'logs'
+  protected override objectName = 'log'
+}
+
+const logCollection = new LogCollection()
+export default logCollection
diff --git a/src/server/db/firebase.ts b/src/server/db/firebase.ts
index 9a266c3c..bbaa9044 100644
--- a/src/server/db/firebase.ts
+++ b/src/server/db/firebase.ts
@@ -1,8 +1,14 @@
 import { initializeApp } from 'firebase/app'
 import { getFirestore } from 'firebase/firestore'
+import { env } from '~/env/server.mjs'
 
 const firebaseConfig = {
-
+  apiKey: env.API_KEY,
+  authDomain: env.AUTH_DOMAIN,
+  projectId: env.PROJECT_ID,
+  storageBucket: env.STORAGE_BUCKET,
+  messagingSenderId: env.MESSAGING_SENDER_ID,
+  appId: env.APP_ID,
 }
 
 const app = initializeApp(firebaseConfig)
diff --git a/src/server/db/models/Log.ts b/src/server/db/models/Log.ts
new file mode 100644
index 00000000..d8c9204a
--- /dev/null
+++ b/src/server/db/models/Log.ts
@@ -0,0 +1,9 @@
+import type { Timestamp } from 'firebase/firestore'
+
+export type Log = {
+  createdAt: Timestamp
+  id?: string
+  level: 'INFO' | 'WARNING' | 'ERROR'
+  description: string
+  title: string
+}
diff --git a/src/server/trpc/router/attendance/createEvent.ts b/src/server/trpc/router/attendance/createEvent.ts
index eac27dbe..ae7791ed 100644
--- a/src/server/trpc/router/attendance/createEvent.ts
+++ b/src/server/trpc/router/attendance/createEvent.ts
@@ -6,6 +6,7 @@ import { env } from '~/env/server.mjs'
 import eventCollection from '~/server/db/collections/EventCollection'
 import { Timestamp } from 'firebase/firestore'
 import userCollection from '~/server/db/collections/UserCollection'
+import logCollection from '~/server/db/collections/LogCollection'
 
 export const createEvent = protectedProcedure
   .input(
@@ -50,6 +51,11 @@ export const createEvent = protectedProcedure
         qrCode: qr_code || '',
       })
     } catch (e) {
-      console.error('The error is ', (e as Error).message)
+      await logCollection.add({
+        createdAt: Timestamp.fromDate(new Date()),
+        level: 'INFO',
+        description: (e as Error).message,
+        title: 'Create event failed',
+      })
     }
   })
diff --git a/src/server/trpc/router/attendance/index.ts b/src/server/trpc/router/attendance/index.ts
index 60be309f..6bfca66f 100644
--- a/src/server/trpc/router/attendance/index.ts
+++ b/src/server/trpc/router/attendance/index.ts
@@ -3,10 +3,12 @@ import { getAllAttendance } from './getAllAttendance'
 import { getAllAttendanceButSelf } from './getAllUsersButSelf'
 import { createEvent } from './createEvent'
 import { getEventInfo } from './getEventInfo'
+import { markAttendance } from './markAttendance'
 
 export const attendanceRouter = router({
   createEvent,
   getAllAttendance,
   getAllAttendanceButSelf,
   getEventInfo,
+  markAttendance,
 })
diff --git a/src/server/trpc/router/attendance/markAttendance.ts b/src/server/trpc/router/attendance/markAttendance.ts
index e69de29b..a602604d 100644
--- a/src/server/trpc/router/attendance/markAttendance.ts
+++ b/src/server/trpc/router/attendance/markAttendance.ts
@@ -0,0 +1,37 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { z } from 'zod'
+import { LogType } from '@prisma/client'
+import { TRPCError } from '@trpc/server'
+import eventCollection from '~/server/db/collections/EventCollection'
+
+export const markAttendance = protectedProcedure
+  .input(z.string())
+  .mutation(async ({ ctx, input }) => {
+    try {
+      const user = ctx.session.user
+      const event = await eventCollection.getById(input)
+      event.invitedAttendees = event.invitedAttendees.map((attendee) => {
+        if (attendee.id === user.id) {
+          attendee.attended = true
+        }
+        return attendee
+      })
+
+      await eventCollection.update(input, {
+        attendees: event.attendees + 1,
+        invitedAttendees: event.invitedAttendees,
+      })
+    } catch (e) {
+      await ctx.prisma.log.create({
+        data: {
+          type: LogType.ERROR,
+          title: 'Error signing attendance',
+          message: (e as Error).message,
+        },
+      })
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })
diff --git a/src/server/trpc/router/events/index.ts b/src/server/trpc/router/events/index.ts
index 23f3e874..16ed1f0f 100644
--- a/src/server/trpc/router/events/index.ts
+++ b/src/server/trpc/router/events/index.ts
@@ -1,57 +1,7 @@
 import { router } from '~/server/trpc/trpc'
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { z } from 'zod'
-import { toDataURL } from 'qrcode'
-import { randomUUID } from 'crypto'
-import { LogType } from '@prisma/client'
-import { ErrorTitle } from '../constants/ErrorTitle'
 import { TRPCError } from '@trpc/server'
-import { env } from '~/env/server.mjs'
-
-const createEvent = protectedProcedure
-  .input(
-    z.object({
-      name: z.string(),
-      startDate: z.date(),
-      endDate: z.date(),
-      departments: z.array(z.string()),
-      attendees: z.array(z.string()),
-      isQrRequired: z.boolean(),
-    })
-  )
-  .mutation(async ({ ctx, input }) => {
-    try {
-      let qr_code: string | undefined
-      const id = randomUUID()
-
-      if (input.isQrRequired) {
-        qr_code = await toDataURL(`${env.DOMAIN}/events/${id}`)
-      }
-
-      await ctx.prisma.event.create({
-        data: {
-          attendees: {
-            connect: input.attendees.map((attendee) => {
-              return { id: attendee }
-            }),
-          },
-          id,
-          name: input.name,
-          startDate: input.startDate,
-          endDate: input.endDate,
-          qr_code,
-        },
-      })
-    } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          message: (e as Error).message,
-          title: ErrorTitle.ERROR_CREATING_EVENT,
-          type: LogType.ERROR,
-        },
-      })
-    }
-  })
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -157,38 +107,8 @@ const getEvent = protectedProcedure
     }
   })
 
-const markAttendance = protectedProcedure
-  .input(z.string())
-  .mutation(async ({ ctx, input }) => {
-    try {
-      const user = ctx.session.user
-      const result = await ctx.prisma.attendance.create({
-        data: {
-          id: user.id + input,
-          eventId: input,
-          userId: user.id,
-        },
-      })
-      console.log('Success!', result)
-    } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          type: LogType.ERROR,
-          title: 'Error signing attendance',
-          message: (e as Error).message,
-        },
-      })
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
-
 export const eventRouter = router({
-  createEvent,
   getAllUsers,
   getEvent,
   getEventInfo,
-  markAttendance,
 })

From ad4d5344de7199c1aaee1052c99afd0694c94f09 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 07:21:11 +0800
Subject: [PATCH 067/223] Continue the migration

---
 src/pages/events/[id].tsx                     |   5 +-
 src/server/trpc/router/_app.ts                |   6 +-
 .../trpc/router/attendance/getEventForUser.ts |  38 ++++++
 .../trpc/router/attendance/getEventInfo.ts    |   3 -
 src/server/trpc/router/attendance/index.ts    |   2 +
 .../trpc/router/attendance/markAttendance.ts  |  19 ++-
 src/server/trpc/router/auth.ts                |   6 -
 src/server/trpc/router/events/index.ts        | 114 ------------------
 src/server/trpc/router/users/auth.ts          |   6 +
 .../trpc/router/{auth => users}/post.ts       |   0
 10 files changed, 58 insertions(+), 141 deletions(-)
 create mode 100644 src/server/trpc/router/attendance/getEventForUser.ts
 delete mode 100644 src/server/trpc/router/auth.ts
 delete mode 100644 src/server/trpc/router/events/index.ts
 create mode 100644 src/server/trpc/router/users/auth.ts
 rename src/server/trpc/router/{auth => users}/post.ts (100%)

diff --git a/src/pages/events/[id].tsx b/src/pages/events/[id].tsx
index e7b1aebd..b43cfc32 100644
--- a/src/pages/events/[id].tsx
+++ b/src/pages/events/[id].tsx
@@ -53,7 +53,8 @@ const UserActionRequired: React.FC<UserActionRequiredProp> = ({
 const ConfirmAttendance: React.FC<BaseProps> = ({ session }) => {
   const route = useRouter()
   const eventId = route.query.id as string
-  const { data, isLoading, refetch } = trpc.event.getEvent.useQuery(eventId)
+  const { data, isLoading, refetch } =
+    trpc.attendance.getEventForUser.useQuery(eventId)
   const { mutateAsync, isLoading: loading } =
     trpc.attendance.markAttendance.useMutation()
   dayjs.extend(LocalizedFormat)
@@ -86,7 +87,7 @@ const ConfirmAttendance: React.FC<BaseProps> = ({ session }) => {
                 {data.name}
               </h1>
               <h1 className="mb-2 self-center text-center text-3xl font-medium">
-                {dayjs(data.startDate).format('lll')}
+                {dayjs(data.startDate.toDate()).format('lll')}
               </h1>
               <UserActionRequired
                 isAttendanceRequired={data.isAttendanceRequired}
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index d5bcd2ae..825134d1 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -1,18 +1,16 @@
 import { router } from '../trpc'
-import { authRouter } from './auth'
+import { authRouter } from './users/auth'
 import { memberRouter } from './member'
 import { profileRouter } from './profile'
 import { userRouter } from './admin/users'
-import { eventRouter } from './events'
 import { attendanceRouter } from './attendance'
 
 export const appRouter = router({
+  attendance: attendanceRouter,
   auth: authRouter,
-  event: eventRouter,
   member: memberRouter,
   profile: profileRouter,
   user: userRouter,
-  attendance: attendanceRouter,
 })
 
 export type AppRouter = typeof appRouter
diff --git a/src/server/trpc/router/attendance/getEventForUser.ts b/src/server/trpc/router/attendance/getEventForUser.ts
new file mode 100644
index 00000000..586d9eea
--- /dev/null
+++ b/src/server/trpc/router/attendance/getEventForUser.ts
@@ -0,0 +1,38 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { z } from 'zod'
+import eventCollection from '~/server/db/collections/EventCollection'
+import logCollection from '~/server/db/collections/LogCollection'
+import { Timestamp } from 'firebase/firestore'
+
+export const getEventForUser = protectedProcedure
+  .input(z.string())
+  .query(async ({ ctx, input }) => {
+    try {
+      const event = await eventCollection.getById(input)
+      const user = ctx.session.user
+
+      // Check if the user is within the array of objects and whether the attended flag is true.
+      const hasUserMarkedAttendance =
+        event.invitedAttendees.filter((attendee) => {
+          return attendee.id === user.id && attendee.attended
+        }).length === 1
+
+      // Check whether the user is within the array of objects.
+      const isAttendanceRequired =
+        event.invitedAttendees.filter((attendee) => attendee.id === user.id)
+          .length > 0
+
+      return {
+        ...event,
+        isAttendanceRequired,
+        hasUserMarkedAttendance: hasUserMarkedAttendance !== null,
+      }
+    } catch (e) {
+      await logCollection.add({
+        level: 'WARNING',
+        title: `Error marking attendance for ${ctx.session.user.name}`,
+        description: (e as Error).message,
+        createdAt: Timestamp.fromDate(new Date()),
+      })
+    }
+  })
diff --git a/src/server/trpc/router/attendance/getEventInfo.ts b/src/server/trpc/router/attendance/getEventInfo.ts
index c0e00b03..f47f1aba 100644
--- a/src/server/trpc/router/attendance/getEventInfo.ts
+++ b/src/server/trpc/router/attendance/getEventInfo.ts
@@ -3,9 +3,6 @@ import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import eventCollection from '~/server/db/collections/EventCollection'
 
-/**
- * @param {string} id The event id
- */
 export const getEventInfo = protectedProcedure
   .input(z.string())
   .query(async ({ input }) => {
diff --git a/src/server/trpc/router/attendance/index.ts b/src/server/trpc/router/attendance/index.ts
index 6bfca66f..95ef52c9 100644
--- a/src/server/trpc/router/attendance/index.ts
+++ b/src/server/trpc/router/attendance/index.ts
@@ -4,11 +4,13 @@ import { getAllAttendanceButSelf } from './getAllUsersButSelf'
 import { createEvent } from './createEvent'
 import { getEventInfo } from './getEventInfo'
 import { markAttendance } from './markAttendance'
+import { getEventForUser } from './getEventForUser'
 
 export const attendanceRouter = router({
   createEvent,
   getAllAttendance,
   getAllAttendanceButSelf,
   getEventInfo,
+  getEventForUser,
   markAttendance,
 })
diff --git a/src/server/trpc/router/attendance/markAttendance.ts b/src/server/trpc/router/attendance/markAttendance.ts
index a602604d..e048e04a 100644
--- a/src/server/trpc/router/attendance/markAttendance.ts
+++ b/src/server/trpc/router/attendance/markAttendance.ts
@@ -1,8 +1,8 @@
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { z } from 'zod'
-import { LogType } from '@prisma/client'
-import { TRPCError } from '@trpc/server'
 import eventCollection from '~/server/db/collections/EventCollection'
+import logCollection from '~/server/db/collections/LogCollection'
+import { Timestamp } from 'firebase/firestore'
 
 export const markAttendance = protectedProcedure
   .input(z.string())
@@ -22,16 +22,11 @@ export const markAttendance = protectedProcedure
         invitedAttendees: event.invitedAttendees,
       })
     } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          type: LogType.ERROR,
-          title: 'Error signing attendance',
-          message: (e as Error).message,
-        },
-      })
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
+      await logCollection.add({
+        createdAt: Timestamp.fromDate(new Date()),
+        level: 'WARNING',
+        title: 'Error marking attendance',
+        description: (e as Error).message,
       })
     }
   })
diff --git a/src/server/trpc/router/auth.ts b/src/server/trpc/router/auth.ts
deleted file mode 100644
index 0e18e662..00000000
--- a/src/server/trpc/router/auth.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { router } from '../trpc'
-import { resetPassword } from './auth/post'
-
-export const authRouter = router({
-  resetPassword,
-})
diff --git a/src/server/trpc/router/events/index.ts b/src/server/trpc/router/events/index.ts
deleted file mode 100644
index 16ed1f0f..00000000
--- a/src/server/trpc/router/events/index.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { router } from '~/server/trpc/trpc'
-import { protectedProcedure } from '~/server/trpc/trpc'
-import { z } from 'zod'
-import { TRPCError } from '@trpc/server'
-
-const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
-  try {
-    return await ctx.prisma.user.findMany({
-      select: {
-        department: true,
-        role: true,
-        name: true,
-        id: true,
-      },
-    })
-  } catch (e) {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: (e as Error).message,
-    })
-  }
-})
-
-const getEventInfo = protectedProcedure
-  .input(z.string())
-  .query(async ({ ctx, input }) => {
-    try {
-      const [event, attendance] = await Promise.all([
-        ctx.prisma.event.findUnique({
-          where: { id: input },
-          select: {
-            attendees: {
-              select: { name: true, department: true, role: true, id: true },
-            },
-            _count: { select: { Attendance: true, attendees: true } },
-            endDate: true,
-            id: true,
-            hasStarted: true,
-            name: true,
-            qr_code: true,
-            startDate: true,
-          },
-        }),
-        ctx.prisma.attendance.findMany({
-          where: {
-            eventId: input,
-          },
-        }),
-      ])
-
-      if (!event) {
-        return null
-      }
-
-      const attended = new Set<string>()
-      attendance.forEach((a) => attended.add(a.userId))
-
-      return { ...event, attended }
-    } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
-
-const getEvent = protectedProcedure
-  .input(z.string())
-  .query(async ({ ctx, input }) => {
-    try {
-      const event = await ctx.prisma.event.findUnique({
-        where: { id: input },
-        select: {
-          attendees: true,
-          name: true,
-          startDate: true,
-          hasStarted: true,
-        },
-      })
-
-      if (!event) {
-        return null
-      }
-
-      const user = ctx.session.user
-
-      const hasUserMarkedAttendance = await ctx.prisma.attendance.findFirst({
-        where: {
-          eventId: input,
-          userId: user.id,
-        },
-      })
-
-      const isAttendanceRequired =
-        event.attendees.filter((attendee) => attendee.id === user.id).length > 0
-
-      return {
-        ...event,
-        isAttendanceRequired,
-        hasUserMarkedAttendance: hasUserMarkedAttendance !== null,
-      }
-    } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
-
-export const eventRouter = router({
-  getAllUsers,
-  getEvent,
-  getEventInfo,
-})
diff --git a/src/server/trpc/router/users/auth.ts b/src/server/trpc/router/users/auth.ts
new file mode 100644
index 00000000..04d0d45b
--- /dev/null
+++ b/src/server/trpc/router/users/auth.ts
@@ -0,0 +1,6 @@
+import { router } from '../../trpc'
+import { resetPassword } from './post'
+
+export const authRouter = router({
+  resetPassword,
+})
diff --git a/src/server/trpc/router/auth/post.ts b/src/server/trpc/router/users/post.ts
similarity index 100%
rename from src/server/trpc/router/auth/post.ts
rename to src/server/trpc/router/users/post.ts

From 6f53862357133345d8efac70e0cd636550b6d835 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 07:34:05 +0800
Subject: [PATCH 068/223] Shift the createSingleUser and createMultipleUsers
 out

---
 src/pages/auth/login.tsx                      |   2 +-
 src/server/db/firebase.ts                     |   2 +
 src/server/db/models/User.ts                  |   1 +
 src/server/trpc/router/_app.ts                |   4 +-
 src/server/trpc/router/member/create.ts       | 120 ------------------
 .../trpc/router/member/createMultipleUsers.ts |  67 ++++++++++
 .../trpc/router/member/createSingleUser.ts    |  51 ++++++++
 src/server/trpc/router/member/index.ts        |   5 +-
 src/server/trpc/router/users/auth.ts          |   6 -
 .../trpc/router/{admin => }/users/index.ts    |   2 +
 10 files changed, 128 insertions(+), 132 deletions(-)
 delete mode 100644 src/server/trpc/router/member/create.ts
 create mode 100644 src/server/trpc/router/member/createMultipleUsers.ts
 create mode 100644 src/server/trpc/router/member/createSingleUser.ts
 delete mode 100644 src/server/trpc/router/users/auth.ts
 rename src/server/trpc/router/{admin => }/users/index.ts (96%)

diff --git a/src/pages/auth/login.tsx b/src/pages/auth/login.tsx
index 5c410a76..25f1178f 100644
--- a/src/pages/auth/login.tsx
+++ b/src/pages/auth/login.tsx
@@ -17,7 +17,7 @@ const LoginPage = () => {
   const { status } = useSession()
   const toast = useToast()
   const router = useRouter()
-  const { mutateAsync, isLoading } = trpc.auth.resetPassword.useMutation()
+  const { mutateAsync, isLoading } = trpc.user.resetPassword.useMutation()
   const [loginLoading, setLoginLoading] = useState(false)
   const [email, setEmail] = useState('')
   const [password, setPassword] = useState('')
diff --git a/src/server/db/firebase.ts b/src/server/db/firebase.ts
index bbaa9044..58555e73 100644
--- a/src/server/db/firebase.ts
+++ b/src/server/db/firebase.ts
@@ -1,5 +1,6 @@
 import { initializeApp } from 'firebase/app'
 import { getFirestore } from 'firebase/firestore'
+import { getStorage } from 'firebase/storage'
 import { env } from '~/env/server.mjs'
 
 const firebaseConfig = {
@@ -13,3 +14,4 @@ const firebaseConfig = {
 
 const app = initializeApp(firebaseConfig)
 export const db = getFirestore(app)
+export const storage = getStorage(app)
diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index f31429d0..cbcccb79 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -4,6 +4,7 @@ export type User = {
   hashedPassword: string
   isAdmin: boolean
   id?: string
+  image?: string
   name: string
   role: string
 }
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index 825134d1..76b5d95e 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -1,13 +1,11 @@
 import { router } from '../trpc'
-import { authRouter } from './users/auth'
 import { memberRouter } from './member'
 import { profileRouter } from './profile'
-import { userRouter } from './admin/users'
+import { userRouter } from './users'
 import { attendanceRouter } from './attendance'
 
 export const appRouter = router({
   attendance: attendanceRouter,
-  auth: authRouter,
   member: memberRouter,
   profile: profileRouter,
   user: userRouter,
diff --git a/src/server/trpc/router/member/create.ts b/src/server/trpc/router/member/create.ts
deleted file mode 100644
index aaaf31f1..00000000
--- a/src/server/trpc/router/member/create.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { protectedProcedure } from '../../trpc'
-import { z } from 'zod'
-import { randomBytes } from 'crypto'
-import { hash } from 'bcryptjs'
-
-import { checkIfUserExist, sendEmail, sendMultipleEmails } from './helper'
-import { LogType } from '@prisma/client'
-import { ErrorTitle } from '../constants/ErrorTitle'
-import userCollection from '~/server/db/collections/UserCollection'
-import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
-import { db } from '~/server/db/firebase'
-import type { User } from '~/server/db/models/User'
-
-/**
- * Create multiple accounts for many users and send out an
- * email to the people with the random generated password.
- */
-export const addMultipleUsers = protectedProcedure
-  .input(
-    z.array(
-      z.object({
-        date_of_birth: z.string(),
-        diet: z.string(),
-        department: z.string(),
-        discord: z.string(),
-        faculty: z.string(),
-        gender: z.string(),
-        linkedin: z.string(),
-        major: z.string(),
-        name: z.string(),
-        nus_email: z.string(),
-        personal_email: z.string(),
-        phone: z.string(),
-        race: z.string(),
-        role: z.string(),
-        student_id: z.string(),
-        telegram: z.string(),
-        year: z.string(),
-      })
-    )
-  )
-  .mutation(async ({ ctx, input }) => {
-    try {
-      const password = randomBytes(10).toString('hex')
-      const hashedPassword = await hash(password, 10)
-      const emails: string[] = []
-
-      // Add user logic. Note that each firebase batch only allow up to 500 writes so we need an array for more than 500 users.
-      let batchIndex = 0
-      let counter = 0
-      const batches: WriteBatch[] = [writeBatch(db)]
-      input.forEach((user) => {
-        emails.push(user.nus_email)
-
-        batches[batchIndex]?.set(doc(db, 'users', user.student_id), {
-          department: user.department,
-          email: user.nus_email,
-          hashedPassword,
-          name: user.name,
-          isAdmin: false,
-          id: user.student_id,
-          role: user.role,
-        } as User)
-
-        counter += 1
-
-        if (counter === 499) {
-          batches.push(writeBatch(db))
-          batchIndex += 1
-          counter = 0
-        }
-      })
-
-      await Promise.all(batches.map(async (batch) => await batch.commit()))
-      await sendMultipleEmails(emails, password)
-    } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          title: ErrorTitle.ERROR_ADDING_MULTIPLE_USERS,
-          message: (e as Error).message,
-          type: LogType.ERROR,
-        },
-      })
-    }
-  })
-
-export const createSingleUser = protectedProcedure
-  .input(
-    z.object({
-      department: z.string(),
-      id: z.string(),
-      email: z.string(),
-      name: z.string(),
-      role: z.string(),
-      password: z.string(),
-      isAdmin: z.boolean(),
-    })
-  )
-  .mutation(async ({ input }) => {
-    const { email, id, isAdmin, role, department, name, password } = input
-
-    const [hashedPassword] = await Promise.all([
-      hash(password, 10),
-      checkIfUserExist(id),
-    ])
-
-    await userCollection.set(
-      {
-        department,
-        email,
-        isAdmin,
-        name,
-        hashedPassword,
-        role,
-      },
-      id
-    )
-
-    await sendEmail(email, hashedPassword)
-  })
diff --git a/src/server/trpc/router/member/createMultipleUsers.ts b/src/server/trpc/router/member/createMultipleUsers.ts
new file mode 100644
index 00000000..838a72b5
--- /dev/null
+++ b/src/server/trpc/router/member/createMultipleUsers.ts
@@ -0,0 +1,67 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import { randomBytes } from 'crypto'
+import { hash } from 'bcryptjs'
+
+import { sendMultipleEmails } from './helper'
+import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
+import { db } from '~/server/db/firebase'
+import type { User } from '~/server/db/models/User'
+import logCollection from '~/server/db/collections/LogCollection'
+import { Timestamp } from 'firebase/firestore'
+
+export const createMultipleUsers = protectedProcedure
+  .input(
+    z.array(
+      z.object({
+        department: z.string(),
+        name: z.string(),
+        nus_email: z.string(),
+        role: z.string(),
+        student_id: z.string(),
+      })
+    )
+  )
+  .mutation(async ({ ctx, input }) => {
+    try {
+      const password = randomBytes(10).toString('hex')
+      const hashedPassword = await hash(password, 10)
+      const emails: string[] = []
+
+      // Add user logic. Note that each firebase batch only allow up to 500 writes so we need an array for more than 500 users.
+      let batchIndex = 0
+      let counter = 0
+      const batches: WriteBatch[] = [writeBatch(db)]
+      input.forEach((user) => {
+        emails.push(user.nus_email)
+
+        batches[batchIndex]?.set(doc(db, 'users', user.student_id), {
+          department: user.department,
+          email: user.nus_email,
+          hashedPassword,
+          name: user.name,
+          isAdmin: false,
+          id: user.student_id,
+          role: user.role,
+        } as User)
+
+        counter += 1
+
+        if (counter === 499) {
+          batches.push(writeBatch(db))
+          batchIndex += 1
+          counter = 0
+        }
+      })
+
+      await Promise.all(batches.map(async (batch) => await batch.commit()))
+      await sendMultipleEmails(emails, password)
+    } catch (e) {
+      await logCollection.add({
+        createdAt: Timestamp.fromDate(new Date()),
+        level: 'WARNING',
+        description: (e as Error).message,
+        title: 'Error while uploading multiple users',
+      })
+    }
+  })
diff --git a/src/server/trpc/router/member/createSingleUser.ts b/src/server/trpc/router/member/createSingleUser.ts
new file mode 100644
index 00000000..a1f63903
--- /dev/null
+++ b/src/server/trpc/router/member/createSingleUser.ts
@@ -0,0 +1,51 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import { hash } from 'bcryptjs'
+import { checkIfUserExist, sendEmail } from './helper'
+import userCollection from '~/server/db/collections/UserCollection'
+import logCollection from '~/server/db/collections/LogCollection'
+import { Timestamp } from 'firebase/firestore'
+
+export const createSingleUser = protectedProcedure
+  .input(
+    z.object({
+      department: z.string(),
+      id: z.string(),
+      email: z.string(),
+      name: z.string(),
+      role: z.string(),
+      password: z.string(),
+      isAdmin: z.boolean(),
+    })
+  )
+  .mutation(async ({ input }) => {
+    try {
+      const { email, id, isAdmin, role, department, name, password } = input
+
+      const [hashedPassword] = await Promise.all([
+        hash(password, 10),
+        checkIfUserExist(id),
+      ])
+
+      await userCollection.set(
+        {
+          department,
+          email,
+          isAdmin,
+          name,
+          hashedPassword,
+          role,
+        },
+        id
+      )
+
+      await sendEmail(email, hashedPassword)
+    } catch (e) {
+      await logCollection.add({
+        createdAt: Timestamp.fromDate(new Date()),
+        description: (e as Error).message,
+        title: 'Error creating a single user',
+        level: 'WARNING',
+      })
+    }
+  })
diff --git a/src/server/trpc/router/member/index.ts b/src/server/trpc/router/member/index.ts
index 878d7b17..15c6eff3 100644
--- a/src/server/trpc/router/member/index.ts
+++ b/src/server/trpc/router/member/index.ts
@@ -6,10 +6,11 @@ import {
   updateMemberContacts,
 } from './update'
 import { deleteMemberImage } from './delete'
-import { addMultipleUsers, createSingleUser } from './create'
+import {  createSingleUser } from './createSingleUser'
+import { createMultipleUsers } from './createMultipleUsers'
 
 export const memberRouter = router({
-  addMultipleUsers,
+  createMultipleUsers,
   createSingleUser,
   deleteMemberImage,
   getAllUsers,
diff --git a/src/server/trpc/router/users/auth.ts b/src/server/trpc/router/users/auth.ts
deleted file mode 100644
index 04d0d45b..00000000
--- a/src/server/trpc/router/users/auth.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { router } from '../../trpc'
-import { resetPassword } from './post'
-
-export const authRouter = router({
-  resetPassword,
-})
diff --git a/src/server/trpc/router/admin/users/index.ts b/src/server/trpc/router/users/index.ts
similarity index 96%
rename from src/server/trpc/router/admin/users/index.ts
rename to src/server/trpc/router/users/index.ts
index ffde7068..630887d9 100644
--- a/src/server/trpc/router/admin/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -1,6 +1,7 @@
 import { router } from '~/server/trpc/trpc'
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { TRPCError } from '@trpc/server'
+import { resetPassword } from './post'
 import { z } from 'zod'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
@@ -60,4 +61,5 @@ const getAllUsersForTable = protectedProcedure
 export const userRouter = router({
   getAllUsers,
   getAllUsersForTable,
+  resetPassword,
 })

From b98f617be605743b6b1a8727a055b89f45ede8f0 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 08:13:01 +0800
Subject: [PATCH 069/223] Migrate getAllUsersForTable

---
 package.json                                  |   1 -
 src/components/profile/UploadImageButton.tsx  |  62 +-
 src/pages/api/auth/[...nextauth].ts           |   1 +
 src/server/db/collections/BaseCollection.ts   |  29 +-
 .../router/attendance/getAllUsersButSelf.ts   |   1 +
 .../trpc/router/users/getAllUsersForTable.ts  |  36 +
 src/server/trpc/router/users/index.ts         |  35 +-
 yarn.lock                                     | 931 +-----------------
 8 files changed, 131 insertions(+), 965 deletions(-)
 create mode 100644 src/server/trpc/router/users/getAllUsersForTable.ts

diff --git a/package.json b/package.json
index fc5ec36f..8a8f76c5 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "date-fns": "^2.30.0",
     "dayjs": "^1.11.7",
     "firebase": "^9.22.1",
-    "firebase-admin": "^11.8.0",
     "flowbite": "^1.6.5",
     "flowbite-react": "^0.4.4",
     "framer-motion": "^9.0.4",
diff --git a/src/components/profile/UploadImageButton.tsx b/src/components/profile/UploadImageButton.tsx
index 0d56e992..3b229109 100644
--- a/src/components/profile/UploadImageButton.tsx
+++ b/src/components/profile/UploadImageButton.tsx
@@ -6,6 +6,10 @@ import EditIcon from './EditIcon'
 import { type QueryObserverResult } from '@tanstack/react-query'
 import { Message } from '~/constant/messages'
 
+// TODO: Fix the environment variables.
+import { storage } from '~/server/db/firebase'
+import { ref, uploadBytes, getDownloadURL } from 'firebase/storage'
+
 const UploadImageBtn = ({
   studentId,
   refetch,
@@ -20,36 +24,36 @@ const UploadImageBtn = ({
   const onUpload = () => {
     uploadRef.current?.click()
   }
-  const handleFileSelected = (e: ChangeEvent<HTMLInputElement>): void => {
-    if (e.target.files) {
-      const reader = new FileReader()
-      reader.addEventListener('load', async () => {
-        try {
-          const imageDataURI = reader.result as string
-          const image = imageDataURI as string
-          toast({
-            duration: 1000,
-            title: Message.IMAGE_UPLOAD_LOADING,
-            status: 'loading',
-          })
-          await mutateAsync({ studentId, image })
-          await refetch()
-          toast({
-            duration: 3000,
-            description: Message.IMAGE_UPLOAD_SUCCESS,
-            title: 'Success',
-            status: 'success',
-          })
-        } catch (e) {
-          toast({
-            duration: 3000,
-            description: Message.IMAGE_UPLOAD_ERROR,
-            status: 'error',
-            title: 'Something went wrong',
-          })
-        }
+  const handleFileSelected = async (e: ChangeEvent<HTMLInputElement>) => {
+    try {
+      if (e.target.files) {
+        toast({
+          duration: 1000,
+          title: Message.IMAGE_UPLOAD_LOADING,
+          status: 'loading',
+        })
+        const storageRef = ref(storage, `${studentId}/image/profile_pic`)
+        await uploadBytes(storageRef, e.target.files[0] as File)
+        const image = await getDownloadURL(storageRef)
+        await mutateAsync({
+          studentId,
+          image,
+        })
+        await refetch()
+        toast({
+          duration: 3000,
+          description: Message.IMAGE_UPLOAD_SUCCESS,
+          title: 'Success',
+          status: 'success',
+        })
+      }
+    } catch (e) {
+      toast({
+        duration: 3000,
+        description: Message.IMAGE_UPLOAD_ERROR,
+        status: 'error',
+        title: 'Something went wrong',
       })
-      reader.readAsDataURL(e?.target?.files[0] as Blob)
     }
   }
   return (
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 2dd346fb..93716178 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -51,6 +51,7 @@ export const authOptions: NextAuthOptions = {
           // Step 3: Get the user by the email
           const users = await userCollection.queries([
             {
+              type: "where",
               fieldPath: 'email',
               direction: '==',
               value: email,
diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index e569157a..2c6d7e62 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -15,18 +15,28 @@ import {
   type DocumentData,
   type WhereFilterOp,
   type FieldPath,
+  orderBy,
+  startAt,
+  endAt,
+  limit,
+  getCountFromServer,
 } from 'firebase/firestore'
 
 type Queries<T> = {
-  fieldPath: keyof T
-  direction: WhereFilterOp
-  value: T[keyof T]
+  fieldPath?: keyof T
+  direction?: WhereFilterOp
+  value?: T[keyof T] | number
+  type: 'where' | 'orderBy' | 'limit'
 }
 
 export abstract class BaseCollection<T> {
   protected abstract collectionName: string
   protected abstract objectName: string
 
+  async count() {
+    return await getCountFromServer(collection(db, this.collectionName))
+  }
+
   async add(payload: T) {
     return await addDoc(
       collection(db, this.collectionName),
@@ -61,7 +71,18 @@ export abstract class BaseCollection<T> {
 
   async queries(queries: Queries<T>[]) {
     const items = queries.map((q) => {
-      return where(q.fieldPath as string | FieldPath, q.direction, q.value)
+      switch (q.type) {
+        case 'where':
+          return where(
+            q.fieldPath as string | FieldPath,
+            q.direction as WhereFilterOp,
+            q.value
+          )
+        case 'orderBy':
+          return orderBy(q.fieldPath as string | FieldPath)
+        case 'limit':
+          return limit(q.value as number)
+      }
     })
     const q = query(collection(db, this.collectionName), ...items)
     const snapshots = await getDocs(q)
diff --git a/src/server/trpc/router/attendance/getAllUsersButSelf.ts b/src/server/trpc/router/attendance/getAllUsersButSelf.ts
index 4dca4144..a63b9d0f 100644
--- a/src/server/trpc/router/attendance/getAllUsersButSelf.ts
+++ b/src/server/trpc/router/attendance/getAllUsersButSelf.ts
@@ -6,6 +6,7 @@ export const getAllAttendanceButSelf = protectedProcedure.query(async ({ ctx })
   try {
     const users = await userCollection.queries([
       {
+        type: "where",
         fieldPath: 'id',
         direction: '!=',
         value: ctx.session.user.id,
diff --git a/src/server/trpc/router/users/getAllUsersForTable.ts b/src/server/trpc/router/users/getAllUsersForTable.ts
new file mode 100644
index 00000000..7fdb8fb6
--- /dev/null
+++ b/src/server/trpc/router/users/getAllUsersForTable.ts
@@ -0,0 +1,36 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { TRPCError } from '@trpc/server'
+import { z } from 'zod'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const getAllUsersForTable = protectedProcedure
+  .input(
+    z.object({
+      pageIndex: z.number(),
+      pageSize: z.number(),
+    })
+  )
+  .query(async ({ input }) => {
+    // TODO: Fix up the pagination logic
+    try {
+      const users = (await userCollection.queries([])).map((user) => {
+        return {
+          department: user.department,
+          email: user.email,
+          id: user.id as string,
+          name: user.name,
+          role: user.role,
+        }
+      })
+
+      const total = await userCollection.count()
+      const pageCount = Math.ceil(total.data().count / input.pageSize)
+
+      return { users, pageCount }
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index 630887d9..6eaf3f70 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -2,7 +2,7 @@ import { router } from '~/server/trpc/trpc'
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { TRPCError } from '@trpc/server'
 import { resetPassword } from './post'
-import { z } from 'zod'
+import { getAllUsersForTable } from './getAllUsersForTable'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -25,39 +25,6 @@ const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   }
 })
 
-const getAllUsersForTable = protectedProcedure
-  .input(
-    z.object({
-      pageIndex: z.number(),
-      pageSize: z.number(),
-    })
-  )
-  .query(async ({ ctx, input }) => {
-    try {
-      const users = await ctx.prisma.user.findMany({
-        select: {
-          department: true,
-          email: true,
-          id: true,
-          name: true,
-          role: true,
-        },
-        skip: input.pageIndex * input.pageSize,
-        take: input.pageSize,
-      })
-
-      const total = await ctx.prisma.user.count()
-      const pageCount = Math.ceil(total / input.pageSize)
-
-      return { users, pageCount }
-    } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
-
 export const userRouter = router({
   getAllUsers,
   getAllUsersForTable,
diff --git a/yarn.lock b/yarn.lock
index 19249f8d..558b4b9b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -156,11 +156,6 @@
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz"
   integrity sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==
 
-"@babel/parser@^7.20.15":
-  version "7.22.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.4.tgz#a770e98fd785c231af9d93f6459d36770993fb32"
-  integrity sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==
-
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
   version "7.20.13"
   resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"
@@ -1149,13 +1144,6 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@fastify/busboy@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-1.2.1.tgz#9c6db24a55f8b803b5222753b24fe3aea2ba9ca3"
-  integrity sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==
-  dependencies:
-    text-decoding "^1.0.0"
-
 "@firebase/analytics-compat@0.2.6":
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.2.6.tgz#50063978c42f13eb800e037e96ac4b17236841f4"
@@ -1283,7 +1271,7 @@
     "@firebase/util" "1.9.3"
     tslib "^2.1.0"
 
-"@firebase/database-compat@0.3.4", "@firebase/database-compat@^0.3.4":
+"@firebase/database-compat@0.3.4":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.3.4.tgz#4e57932f7a5ba761cd5ac946ab6b6ab3f660522c"
   integrity sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==
@@ -1295,7 +1283,7 @@
     "@firebase/util" "1.9.3"
     tslib "^2.1.0"
 
-"@firebase/database-types@0.10.4", "@firebase/database-types@^0.10.4":
+"@firebase/database-types@0.10.4":
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.10.4.tgz#47ba81113512dab637abace61cfb65f63d645ca7"
   integrity sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==
@@ -1609,57 +1597,6 @@
   dependencies:
     "@fullcalendar/daygrid" "~6.1.7"
 
-"@google-cloud/firestore@^6.5.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-6.6.0.tgz#f7fd0d9cf318417b14851ddce941810b1214ab0c"
-  integrity sha512-XDWsmCtQQFs0RoXZaq3fCYe4jRtAAFmW38ezGLKWSjLQ5FNv7jxpBGtdITBM2PDI0tFNCyeogjqsDbI6CIVeuQ==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    functional-red-black-tree "^1.0.1"
-    google-gax "^3.5.7"
-    protobufjs "^7.0.0"
-
-"@google-cloud/paginator@^3.0.7":
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-3.0.7.tgz#fb6f8e24ec841f99defaebf62c75c2e744dd419b"
-  integrity sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ==
-  dependencies:
-    arrify "^2.0.0"
-    extend "^3.0.2"
-
-"@google-cloud/projectify@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-3.0.0.tgz#302b25f55f674854dce65c2532d98919b118a408"
-  integrity sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA==
-
-"@google-cloud/promisify@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-3.0.1.tgz#8d724fb280f47d1ff99953aee0c1669b25238c2e"
-  integrity sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA==
-
-"@google-cloud/storage@^6.9.5":
-  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-6.10.1.tgz#7b62b7956668b649bfa3affa471619ce06d297dd"
-  integrity sha512-EtLlT0YbXtrbUxaNbEfTyTytrjELtl4i42flf8COg+Hu5+apdNjsFO9XEY39wshxAuVjLf4fCSm7GTSW+BD3gQ==
-  dependencies:
-    "@google-cloud/paginator" "^3.0.7"
-    "@google-cloud/projectify" "^3.0.0"
-    "@google-cloud/promisify" "^3.0.0"
-    abort-controller "^3.0.0"
-    async-retry "^1.3.3"
-    compressible "^2.0.12"
-    duplexify "^4.0.0"
-    ent "^2.2.0"
-    extend "^3.0.2"
-    gaxios "^5.0.0"
-    google-auth-library "^8.0.1"
-    mime "^3.0.0"
-    mime-types "^2.0.8"
-    p-limit "^3.0.1"
-    retry-request "^5.0.0"
-    teeny-request "^8.0.0"
-    uuid "^8.0.0"
-
 "@grpc/grpc-js@~1.7.0":
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.7.3.tgz#f2ea79f65e31622d7f86d4b4c9ae38f13ccab99a"
@@ -1668,14 +1605,6 @@
     "@grpc/proto-loader" "^0.7.0"
     "@types/node" ">=12.12.47"
 
-"@grpc/grpc-js@~1.8.0":
-  version "1.8.14"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.8.14.tgz#4fe0f9917d6f094cf59245763c275442b182e9ad"
-  integrity sha512-w84maJ6CKl5aApCMzFll0hxtFNT6or9WwMslobKaqWUEf1K+zhlL43bSQhFreyYWIWR+Z0xnVFC1KtLm4ZpM/A==
-  dependencies:
-    "@grpc/proto-loader" "^0.7.0"
-    "@types/node" ">=12.12.47"
-
 "@grpc/proto-loader@^0.6.13":
   version "0.6.13"
   resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.13.tgz#008f989b72a40c60c96cd4088522f09b05ac66bc"
@@ -1774,13 +1703,6 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
-"@jsdoc/salty@^0.2.1":
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.5.tgz#1b2fa5bb8c66485b536d86eee877c263d322f692"
-  integrity sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==
-  dependencies:
-    lodash "^4.17.21"
-
 "@motionone/animation@^10.15.1":
   version "10.15.1"
   resolved "https://registry.npmjs.org/@motionone/animation/-/animation-10.15.1.tgz"
@@ -2078,11 +2000,6 @@
   resolved "https://registry.yarnpkg.com/@tanstack/table-core/-/table-core-8.9.1.tgz#869410ca1748c45d4e19ccfd4db7e36452611674"
   integrity sha512-2+R83n8vMZND0q3W1lSiF7co9nFbeWbjAErFf27xwbeA9E0wtUu5ZDfgj+TZ6JzdAEQAgfxkk/QNFAKiS8E4MA==
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
 "@trpc/client@^10.26.0":
   version "10.26.0"
   resolved "https://registry.yarnpkg.com/@trpc/client/-/client-10.26.0.tgz#eaccff7b101882cbf543931abc1f764b3b17bae6"
@@ -2110,49 +2027,6 @@
   resolved "https://registry.npmjs.org/@types/bcryptjs/-/bcryptjs-2.4.2.tgz"
   integrity sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==
 
-"@types/body-parser@*":
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
-  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
-  dependencies:
-    "@types/connect" "*"
-    "@types/node" "*"
-
-"@types/connect@*":
-  version "3.4.35"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
-  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/express-serve-static-core@^4.17.33":
-  version "4.17.35"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f"
-  integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==
-  dependencies:
-    "@types/node" "*"
-    "@types/qs" "*"
-    "@types/range-parser" "*"
-    "@types/send" "*"
-
-"@types/express@^4.17.14":
-  version "4.17.17"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4"
-  integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
-  dependencies:
-    "@types/body-parser" "*"
-    "@types/express-serve-static-core" "^4.17.33"
-    "@types/qs" "*"
-    "@types/serve-static" "*"
-
-"@types/glob@*":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
-  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
-  dependencies:
-    "@types/minimatch" "^5.1.2"
-    "@types/node" "*"
-
 "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
@@ -2163,18 +2037,6 @@
   resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/jsonwebtoken@^9.0.0":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#9eeb56c76dd555039be2a3972218de5bd3b8d83e"
-  integrity sha512-drE6uz7QBKq1fYqqoFKTDRdFCPHd5TCub75BM+D+cMx7NU9hUz7SESLfC2fSCXVFMO5Yj8sOWHuGqPgjc+fz0Q==
-  dependencies:
-    "@types/node" "*"
-
-"@types/linkify-it@*":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
-  integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
-
 "@types/lodash.mergewith@4.6.7":
   version "4.6.7"
   resolved "https://registry.npmjs.org/@types/lodash.mergewith/-/lodash.mergewith-4.6.7.tgz"
@@ -2187,39 +2049,11 @@
   resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"
   integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
 
-"@types/long@^4.0.0", "@types/long@^4.0.1":
+"@types/long@^4.0.1":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
   integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
-"@types/markdown-it@^12.2.3":
-  version "12.2.3"
-  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
-  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
-  dependencies:
-    "@types/linkify-it" "*"
-    "@types/mdurl" "*"
-
-"@types/mdurl@*":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
-  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
-
-"@types/mime@*":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
-  integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
-
-"@types/mime@^1":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
-  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
-
-"@types/minimatch@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
-  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
-
 "@types/node@*", "@types/node@^18.11.18":
   version "18.14.0"
   resolved "https://registry.npmjs.org/@types/node/-/node-18.14.0.tgz"
@@ -2261,16 +2095,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/qs@*":
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
-  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
-
-"@types/range-parser@*":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
-  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
-
 "@types/react-dom@^18.2.4":
   version "18.2.4"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.4.tgz#13f25bfbf4e404d26f62ac6e406591451acba9e0"
@@ -2303,14 +2127,6 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/rimraf@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.2.tgz#a63d175b331748e5220ad48c901d7bbf1f44eef8"
-  integrity sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==
-  dependencies:
-    "@types/glob" "*"
-    "@types/node" "*"
-
 "@types/scheduler@*":
   version "0.16.2"
   resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz"
@@ -2321,22 +2137,6 @@
   resolved "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz"
   integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
-"@types/send@*":
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301"
-  integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==
-  dependencies:
-    "@types/mime" "^1"
-    "@types/node" "*"
-
-"@types/serve-static@*":
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d"
-  integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==
-  dependencies:
-    "@types/mime" "*"
-    "@types/node" "*"
-
 "@typescript-eslint/eslint-plugin@^5.48.1":
   version "5.52.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.52.0.tgz"
@@ -2431,13 +2231,6 @@
   resolved "https://registry.yarnpkg.com/@zag-js/focus-visible/-/focus-visible-0.2.2.tgz#56233480ca1275d3218fb2e10696a33d1a6b9e64"
   integrity sha512-0j2gZq8HiZ51z4zNnSkF1iSkqlwRDvdH+son3wHdoz+7IUdMN/5Exd4TxMJ+gq2Of1DiXReYLL9qqh2PdQ4wgA==
 
-abort-controller@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
-  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
-  dependencies:
-    event-target-shim "^5.0.0"
-
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
@@ -2472,13 +2265,6 @@ acorn@^8.0.4, acorn@^8.8.0:
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
 
-agent-base@6:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
-
 ajv@^6.10.0, ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
@@ -2594,23 +2380,11 @@ array.prototype.tosorted@^1.1.1:
     es-shim-unscopables "^1.0.0"
     get-intrinsic "^1.1.3"
 
-arrify@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
-  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
-
 ast-types-flow@^0.0.7:
   version "0.0.7"
   resolved "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz"
   integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
 
-async-retry@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280"
-  integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==
-  dependencies:
-    retry "0.13.1"
-
 autoprefixer@^10.4.13:
   version "10.4.13"
   resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz"
@@ -2654,31 +2428,16 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.3.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
 bcryptjs@^2.4.3:
   version "2.4.3"
   resolved "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"
   integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==
 
-bignumber.js@^9.0.0:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz#c4df7dc496bd849d4c9464344c1aa74228b4dac6"
-  integrity sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==
-
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bluebird@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -2687,13 +2446,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
-  dependencies:
-    balanced-match "^1.0.0"
-
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
@@ -2711,11 +2463,6 @@ browserslist@^4.21.3, browserslist@^4.21.4:
     node-releases "^2.0.8"
     update-browserslist-db "^1.0.10"
 
-buffer-equal-constant-time@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
-  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
-
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
@@ -2744,13 +2491,6 @@ caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.300014
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001456.tgz"
   integrity sha512-XFHJY5dUgmpMV25UqaD4kVq2LsiaU5rS8fb0f17pCoXQiQslzmFgnfOxfvo1bTpTqf7dwG/N/05CnLCnOEKmzA==
 
-catharsis@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121"
-  integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==
-  dependencies:
-    lodash "^4.17.15"
-
 chalk@^2.0.0:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
@@ -2859,13 +2599,6 @@ commander@^7.2.0:
   resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
-compressible@^2.0.12:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
-  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
-  dependencies:
-    mime-db ">= 1.43.0 < 2"
-
 compute-scroll-into-view@1.0.20:
   version "1.0.20"
   resolved "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz"
@@ -2966,13 +2699,6 @@ debounce@^1.2.0:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
@@ -2980,6 +2706,13 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -3008,7 +2741,7 @@ deep-equal@^2.0.5:
     which-collection "^1.0.1"
     which-typed-array "^1.1.9"
 
-deep-is@^0.1.3, deep-is@~0.1.3:
+deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -3094,28 +2827,11 @@ duplexer@^0.1.2:
   resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
-duplexify@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0"
-  integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==
-  dependencies:
-    end-of-stream "^1.4.1"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-    stream-shift "^1.0.0"
-
 easy-bem@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/easy-bem/-/easy-bem-1.1.1.tgz#1bfcc10425498090bcfddc0f9c000aba91399e03"
   integrity sha512-GJRqdiy2h+EXy6a8E6R+ubmqUM08BK0FWNq41k24fup6045biQ8NXxoXimiwegMQvFFV3t1emADdGNL1TlS61A==
 
-ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
-  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
-  dependencies:
-    safe-buffer "^5.0.1"
-
 electron-to-chromium@^1.4.284:
   version "1.4.302"
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.302.tgz"
@@ -3136,13 +2852,6 @@ encode-utf8@^1.0.3:
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
-end-of-stream@^1.4.1:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
 enhanced-resolve@^5.10.0:
   version "5.12.0"
   resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz"
@@ -3151,16 +2860,6 @@ enhanced-resolve@^5.10.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-ent@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
-
-entities@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
-  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
-
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
@@ -3257,28 +2956,11 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
-escape-string-regexp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
-  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
-
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escodegen@^1.13.0:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
-  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
 eslint-config-next@^13.1.6:
   version "13.1.6"
   resolved "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.1.6.tgz"
@@ -3425,11 +3107,6 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint-visitor-keys@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
-  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
-
 eslint@^8.31.0:
   version "8.34.0"
   resolved "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz"
@@ -3475,15 +3152,6 @@ eslint@^8.31.0:
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-espree@^9.0.0:
-  version "9.5.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
-  integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
-  dependencies:
-    acorn "^8.8.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
-
 espree@^9.4.0:
   version "9.4.1"
   resolved "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz"
@@ -3493,11 +3161,6 @@ espree@^9.4.0:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
-esprima@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 esquery@^1.4.0:
   version "1.4.2"
   resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz"
@@ -3512,7 +3175,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.1:
   version "4.3.0"
   resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -3527,16 +3190,6 @@ esutils@^2.0.2:
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-event-target-shim@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
-  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
-
-extend@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
@@ -3558,16 +3211,11 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867"
-  integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==
-
 fastq@^1.6.0:
   version "1.15.0"
   resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"
@@ -3617,23 +3265,6 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-firebase-admin@^11.8.0:
-  version "11.8.0"
-  resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-11.8.0.tgz#4cb57e39e5ad7cbc690c6e073d93be549c7854b3"
-  integrity sha512-RxO0wWDnuqVikXExhVjnhVaaXpziKCad4D1rOX5c1WJdk1jAu9hfE4rbrFKZQZgF1okZS04kgCBIFJro7xn8NQ==
-  dependencies:
-    "@fastify/busboy" "^1.2.1"
-    "@firebase/database-compat" "^0.3.4"
-    "@firebase/database-types" "^0.10.4"
-    "@types/node" ">=12.12.47"
-    jsonwebtoken "^9.0.0"
-    jwks-rsa "^3.0.1"
-    node-forge "^1.3.1"
-    uuid "^9.0.0"
-  optionalDependencies:
-    "@google-cloud/firestore" "^6.5.0"
-    "@google-cloud/storage" "^6.9.5"
-
 firebase@^9.22.1:
   version "9.22.1"
   resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.22.1.tgz#9bf49d8cb87eefae6500cc2bd2ec1fddbc1c1ebb"
@@ -3771,34 +3402,11 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
 functions-have-names@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-gaxios@^5.0.0, gaxios@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-5.1.0.tgz#133b77b45532be71eec72012b7e97c2320b6140a"
-  integrity sha512-aezGIjb+/VfsJtIcHGcBSerNEDdfdHeMros+RbYbGpmonKWQCOVOes0LVZhn1lDtIgq55qq0HaxymIoae3Fl/A==
-  dependencies:
-    extend "^3.0.2"
-    https-proxy-agent "^5.0.0"
-    is-stream "^2.0.0"
-    node-fetch "^2.6.7"
-
-gcp-metadata@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.2.0.tgz#b4772e9c5976241f5d3e69c4f446c906d25506ec"
-  integrity sha512-aFhhvvNycky2QyhG+dcfEdHBF0FRbYcf39s6WNHUDysKSrbJ5vuFbjydxBcmewtXeV248GP8dWT3ByPNxsyHCw==
-  dependencies:
-    gaxios "^5.0.0"
-    json-bigint "^1.0.0"
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -3874,17 +3482,6 @@ glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
-  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -3937,49 +3534,6 @@ globrex@^0.1.2:
   resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
   integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
 
-google-auth-library@^8.0.1, google-auth-library@^8.0.2:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-8.8.0.tgz#2e17494431cef56b571420d483a4debff6c481cd"
-  integrity sha512-0iJn7IDqObDG5Tu9Tn2WemmJ31ksEa96IyK0J0OZCpTh6CrC6FrattwKX87h3qKVuprCJpdOGKc1Xi8V0kMh8Q==
-  dependencies:
-    arrify "^2.0.0"
-    base64-js "^1.3.0"
-    ecdsa-sig-formatter "^1.0.11"
-    fast-text-encoding "^1.0.0"
-    gaxios "^5.0.0"
-    gcp-metadata "^5.2.0"
-    gtoken "^6.1.0"
-    jws "^4.0.0"
-    lru-cache "^6.0.0"
-
-google-gax@^3.5.7:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-3.6.0.tgz#0f4ae350159737fe0aa289815c0d92838b19f6af"
-  integrity sha512-2fyb61vWxUonHiArRNJQmE4tx5oY1ni8VPo08fzII409vDSCWG7apDX4qNOQ2GXXT82gLBn3d3P1Dydh7pWjyw==
-  dependencies:
-    "@grpc/grpc-js" "~1.8.0"
-    "@grpc/proto-loader" "^0.7.0"
-    "@types/long" "^4.0.0"
-    "@types/rimraf" "^3.0.2"
-    abort-controller "^3.0.0"
-    duplexify "^4.0.0"
-    fast-text-encoding "^1.0.3"
-    google-auth-library "^8.0.2"
-    is-stream-ended "^0.1.4"
-    node-fetch "^2.6.1"
-    object-hash "^3.0.0"
-    proto3-json-serializer "^1.0.0"
-    protobufjs "7.2.3"
-    protobufjs-cli "1.1.1"
-    retry-request "^5.0.0"
-
-google-p12-pem@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-4.0.1.tgz#82841798253c65b7dc2a4e5fe9df141db670172a"
-  integrity sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==
-  dependencies:
-    node-forge "^1.3.1"
-
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -3987,11 +3541,6 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.9:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
 graceful-fs@^4.2.4:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
@@ -4002,15 +3551,6 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
-gtoken@^6.1.0:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-6.1.2.tgz#aeb7bdb019ff4c3ba3ac100bbe7b6e74dce0e8bc"
-  integrity sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==
-  dependencies:
-    gaxios "^5.0.1"
-    google-p12-pem "^4.0.0"
-    jws "^4.0.0"
-
 gzip-size@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
@@ -4081,23 +3621,6 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
   integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
-  dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
 idb@7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/idb/-/idb-7.0.1.tgz#d2875b3a2f205d854ee307f6d196f246fea590a7"
@@ -4134,7 +3657,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3:
+inherits@2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4287,16 +3810,6 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-stream-ended@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-stream-ended/-/is-stream-ended-0.1.4.tgz#f50224e95e06bce0e356d440a4827cd35b267eda"
-  integrity sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==
-
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"
@@ -4364,7 +3877,7 @@ isexe@^2.0.0:
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-jose@^4.10.4, jose@^4.11.4, jose@^4.14.1:
+jose@^4.11.4, jose@^4.14.1:
   version "4.14.4"
   resolved "https://registry.yarnpkg.com/jose/-/jose-4.14.4.tgz#59e09204e2670c3164ee24cbfe7115c6f8bff9ca"
   integrity sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g==
@@ -4386,46 +3899,11 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-js2xmlparser@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a"
-  integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==
-  dependencies:
-    xmlcreate "^2.0.4"
-
-jsdoc@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e"
-  integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==
-  dependencies:
-    "@babel/parser" "^7.20.15"
-    "@jsdoc/salty" "^0.2.1"
-    "@types/markdown-it" "^12.2.3"
-    bluebird "^3.7.2"
-    catharsis "^0.9.0"
-    escape-string-regexp "^2.0.0"
-    js2xmlparser "^4.0.2"
-    klaw "^3.0.0"
-    markdown-it "^12.3.2"
-    markdown-it-anchor "^8.4.1"
-    marked "^4.0.10"
-    mkdirp "^1.0.4"
-    requizzle "^0.2.3"
-    strip-json-comments "^3.1.0"
-    underscore "~1.13.2"
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-json-bigint@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
-  integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==
-  dependencies:
-    bignumber.js "^9.0.0"
-
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
   resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
@@ -4453,16 +3931,6 @@ json5@^2.2.2:
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-jsonwebtoken@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
-  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
-  dependencies:
-    jws "^3.2.2"
-    lodash "^4.17.21"
-    ms "^2.1.1"
-    semver "^7.3.8"
-
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.3:
   version "3.3.3"
   resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz"
@@ -4471,59 +3939,6 @@ jsonwebtoken@^9.0.0:
     array-includes "^3.1.5"
     object.assign "^4.1.3"
 
-jwa@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
-  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
-  dependencies:
-    buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.11"
-    safe-buffer "^5.0.1"
-
-jwa@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz#a7e9c3f29dae94027ebcaf49975c9345593410fc"
-  integrity sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==
-  dependencies:
-    buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.11"
-    safe-buffer "^5.0.1"
-
-jwks-rsa@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-3.0.1.tgz#ba79ddca7ee7520f7bb26b942ef1aee91df8d7e4"
-  integrity sha512-UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw==
-  dependencies:
-    "@types/express" "^4.17.14"
-    "@types/jsonwebtoken" "^9.0.0"
-    debug "^4.3.4"
-    jose "^4.10.4"
-    limiter "^1.1.5"
-    lru-memoizer "^2.1.4"
-
-jws@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
-  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
-  dependencies:
-    jwa "^1.4.1"
-    safe-buffer "^5.0.1"
-
-jws@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz#2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4"
-  integrity sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==
-  dependencies:
-    jwa "^2.0.0"
-    safe-buffer "^5.0.1"
-
-klaw@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146"
-  integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==
-  dependencies:
-    graceful-fs "^4.1.9"
-
 language-subtag-registry@~0.3.2:
   version "0.3.22"
   resolved "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz"
@@ -4544,36 +3959,16 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 lilconfig@^2.0.5, lilconfig@^2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz"
   integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==
 
-limiter@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
-  integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==
-
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-linkify-it@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
-  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
-  dependencies:
-    uc.micro "^1.0.1"
-
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -4593,11 +3988,6 @@ lodash.camelcase@^4.3.0:
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
   integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
 
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==
-
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
@@ -4608,7 +3998,7 @@ lodash.mergewith@4.6.2:
   resolved "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"
   integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
-lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
+lodash@^4.17.20:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -4644,48 +4034,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@~4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
-  integrity sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==
-  dependencies:
-    pseudomap "^1.0.1"
-    yallist "^2.0.0"
-
-lru-memoizer@^2.1.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/lru-memoizer/-/lru-memoizer-2.2.0.tgz#b9d90c91637b4b1a423ef76f3156566691293df8"
-  integrity sha512-QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw==
-  dependencies:
-    lodash.clonedeep "^4.5.0"
-    lru-cache "~4.0.0"
-
-markdown-it-anchor@^8.4.1:
-  version "8.6.7"
-  resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634"
-  integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==
-
-markdown-it@^12.3.2:
-  version "12.3.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
-  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
-  dependencies:
-    argparse "^2.0.1"
-    entities "~2.1.0"
-    linkify-it "^3.0.1"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
-
-marked@^4.0.10:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
-  integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==
-
-mdurl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
-
 memoize-one@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz"
@@ -4704,23 +4052,6 @@ micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.0.8:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
-mime@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
-  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
-
 mini-svg-data-uri@^1.4.3:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939"
@@ -4733,23 +4064,11 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
-  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 mrmime@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz"
@@ -4827,18 +4146,6 @@ node-fetch@2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@^2.6.1, node-fetch@^2.6.7:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
-  integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-node-forge@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
-  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
-
 node-releases@^2.0.8:
   version "2.0.10"
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz"
@@ -4947,7 +4254,7 @@ oidc-token-hash@^5.0.3:
   resolved "https://registry.yarnpkg.com/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz#9a229f0a1ce9d4fc89bcaee5478c97a889e7b7b6"
   integrity sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==
 
-once@^1.3.0, once@^1.4.0:
+once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
@@ -4978,18 +4285,6 @@ openid-client@^5.4.0:
     object-hash "^2.2.0"
     oidc-token-hash "^5.0.3"
 
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"
@@ -5009,7 +4304,7 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.1, p-limit@^3.0.2:
+p-limit@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -5186,11 +4481,6 @@ prelude-ls@^1.2.1:
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
-
 prettier-plugin-tailwindcss@^0.2.3:
   version "0.2.3"
   resolved "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.3.tgz"
@@ -5222,33 +4512,10 @@ prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
-proto3-json-serializer@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz#1b5703152b6ce811c5cdcc6468032caf53521331"
-  integrity sha512-AwAuY4g9nxx0u52DnSMkqqgyLHaW/XaPLtaAo3y/ZCfeaQB/g4YDH4kb8Wc/mWzWvu0YjOznVnfn373MVZZrgw==
-  dependencies:
-    protobufjs "^7.0.0"
-
-protobufjs-cli@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz#f531201b1c8c7772066aa822bf9a08318b24a704"
-  integrity sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==
-  dependencies:
-    chalk "^4.0.0"
-    escodegen "^1.13.0"
-    espree "^9.0.0"
-    estraverse "^5.1.0"
-    glob "^8.0.0"
-    jsdoc "^4.0.0"
-    minimist "^1.2.0"
-    semver "^7.1.2"
-    tmp "^0.2.1"
-    uglify-js "^3.7.7"
-
-protobufjs@7.2.3, protobufjs@^7.0.0:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.3.tgz#01af019e40d9c6133c49acbb3ff9e30f4f0f70b2"
-  integrity sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==
+protobufjs@^6.11.3:
+  version "6.11.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
+  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -5260,13 +4527,14 @@ protobufjs@7.2.3, protobufjs@^7.0.0:
     "@protobufjs/path" "^1.1.2"
     "@protobufjs/pool" "^1.1.0"
     "@protobufjs/utf8" "^1.1.0"
+    "@types/long" "^4.0.1"
     "@types/node" ">=13.7.0"
-    long "^5.0.0"
+    long "^4.0.0"
 
-protobufjs@^6.11.3:
-  version "6.11.3"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
-  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
+protobufjs@^7.0.0:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.3.tgz#01af019e40d9c6133c49acbb3ff9e30f4f0f70b2"
+  integrity sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -5278,14 +4546,8 @@ protobufjs@^6.11.3:
     "@protobufjs/path" "^1.1.2"
     "@protobufjs/pool" "^1.1.0"
     "@protobufjs/utf8" "^1.1.0"
-    "@types/long" "^4.0.1"
     "@types/node" ">=13.7.0"
-    long "^4.0.0"
-
-pseudomap@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
+    long "^5.0.0"
 
 punycode@^2.1.0:
   version "2.3.0"
@@ -5440,15 +4702,6 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
-readable-stream@^3.1.1:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
@@ -5485,13 +4738,6 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-requizzle@^0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c"
-  integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==
-  dependencies:
-    lodash "^4.17.21"
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
@@ -5515,25 +4761,12 @@ resolve@^2.0.0-next.4:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-retry-request@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-5.0.2.tgz#143d85f90c755af407fcc46b7166a4ba520e44da"
-  integrity sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==
-  dependencies:
-    debug "^4.1.1"
-    extend "^3.0.2"
-
-retry@0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
-  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
-
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -5547,7 +4780,7 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@~5.2.0:
+safe-buffer@>=5.1.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -5573,13 +4806,6 @@ semver@^6.3.0:
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.1.2, semver@^7.3.8:
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
-  integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
-  dependencies:
-    lru-cache "^6.0.0"
-
 semver@^7.3.7:
   version "7.3.8"
   resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"
@@ -5642,11 +4868,6 @@ source-map@^0.5.7:
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
-source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
 stop-iteration-iterator@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz"
@@ -5654,18 +4875,6 @@ stop-iteration-iterator@^1.0.0:
   dependencies:
     internal-slot "^1.0.4"
 
-stream-events@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5"
-  integrity sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==
-  dependencies:
-    stubs "^3.0.0"
-
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -5707,13 +4916,6 @@ string.prototype.trimstart@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -5731,11 +4933,6 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-stubs@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
-  integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==
-
 styled-jsx@5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz"
@@ -5821,22 +5018,6 @@ tapable@^2.2.0:
   resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-teeny-request@^8.0.0:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-8.0.3.tgz#5cb9c471ef5e59f2fca8280dc3c5909595e6ca24"
-  integrity sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww==
-  dependencies:
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    node-fetch "^2.6.1"
-    stream-events "^1.0.5"
-    uuid "^9.0.0"
-
-text-decoding@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/text-decoding/-/text-decoding-1.0.0.tgz#38a5692d23b5c2b12942d6e245599cb58b1bc52f"
-  integrity sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==
-
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
@@ -5855,13 +5036,6 @@ tiny-invariant@^1.0.6:
   resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz"
   integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
-tmp@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
@@ -5928,13 +5102,6 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
-  dependencies:
-    prelude-ls "~1.1.2"
-
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
@@ -5954,16 +5121,6 @@ typescript@^4.9.4:
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
-uc.micro@^1.0.1, uc.micro@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
-
-uglify-js@^3.7.7:
-  version "3.17.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
-  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
-
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"
@@ -5974,11 +5131,6 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-underscore@~1.13.2:
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
-  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
-
 update-browserslist-db@^1.0.10:
   version "1.0.10"
   resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"
@@ -6019,21 +5171,16 @@ use-sync-external-store@^1.2.0:
   resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2:
+util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-uuid@^8.0.0, uuid@^8.3.2:
+uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-uuid@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
-  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
@@ -6121,7 +5268,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-word-wrap@^1.2.3, word-wrap@~1.2.3:
+word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
@@ -6154,11 +5301,6 @@ ws@^7.3.1:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
-xmlcreate@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be"
-  integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==
-
 xtend@^4.0.2:
   version "4.0.2"
   resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
@@ -6174,11 +5316,6 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yallist@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
-
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"

From 1fdb9b6c589c5123aa43c81d727f396808127301 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 08:36:21 +0800
Subject: [PATCH 070/223] Migrate the profile

---
 src/components/profile/ProfileContactInfo.tsx | 18 ++++-----
 src/components/profile/ProfileGrid.tsx        | 14 +++----
 src/components/profile/ProfileInfo.tsx        |  6 +--
 src/components/profile/UploadImageButton.tsx  | 12 ++----
 src/pages/preferences.tsx                     |  2 +-
 src/server/trpc/router/_app.ts                |  2 -
 .../trpc/router/member/createMultipleUsers.ts |  2 +-
 src/server/trpc/router/profile/index.ts       |  6 ---
 .../password.ts => users/changePassword.ts}   | 20 +++-------
 .../trpc/router/users/getUserProfile.ts       | 17 ++++++++
 src/server/trpc/router/users/index.ts         |  6 ++-
 .../users/{post.ts => resetPassword.ts}       | 40 +++++++++----------
 src/server/trpc/router/util/transporter.ts    | 10 +++++
 13 files changed, 80 insertions(+), 75 deletions(-)
 delete mode 100644 src/server/trpc/router/profile/index.ts
 rename src/server/trpc/router/{profile/password.ts => users/changePassword.ts} (69%)
 create mode 100644 src/server/trpc/router/users/getUserProfile.ts
 rename src/server/trpc/router/users/{post.ts => resetPassword.ts} (51%)
 create mode 100644 src/server/trpc/router/util/transporter.ts

diff --git a/src/components/profile/ProfileContactInfo.tsx b/src/components/profile/ProfileContactInfo.tsx
index e565663f..bf0398b8 100644
--- a/src/components/profile/ProfileContactInfo.tsx
+++ b/src/components/profile/ProfileContactInfo.tsx
@@ -13,9 +13,9 @@ import { Message } from '~/constant/messages'
 
 const ProfileContactInfo = (props: {
   studentId: string | null
-  telegram: string | null
-  discord: string | null
-  personal_email: string | null
+  // telegram: string | null
+  // discord: string | null
+  // personal_email: string | null
   email: string
   refetch: () => Promise<QueryObserverResult>
 }) => {
@@ -30,9 +30,9 @@ const ProfileContactInfo = (props: {
 
   // Form validation logic
   const preloadedValues = {
-    telegram: props.telegram ? props.telegram : '',
-    discord: props.discord ? props.discord : '',
-    personal_email: props.personal_email ? props.personal_email : '',
+    // telegram: props.telegram ? props.telegram : '',
+    // discord: props.discord ? props.discord : '',
+    // personal_email: props.personal_email ? props.personal_email : '',
     email: props.email ? props.email : '',
   }
 
@@ -98,7 +98,7 @@ const ProfileContactInfo = (props: {
           boxShadow="0px 3px 3px rgba(0, 0, 0, 0.2)"
           className="flex flex-col gap-3 py-6 px-10"
         >
-          <Box className="flex items-center gap-1">
+          {/* <Box className="flex items-center gap-1">
             <BsTelegram size="20px" className="fill-[#0088cc]" />
             <DynamicInputField
               edit={edit}
@@ -117,7 +117,7 @@ const ProfileContactInfo = (props: {
               field="discord"
               fieldValue={props.discord}
             />
-          </Box>
+          </Box> 
           <Box className="flex items-center gap-1">
             <BsEnvelopeFill size="20px" className="fill-[#54CCFF]" />
             <DynamicInputField
@@ -127,7 +127,7 @@ const ProfileContactInfo = (props: {
               field="personal_email"
               fieldValue={props.personal_email}
             />
-          </Box>
+          </Box> */}
           <Box className="flex items-center gap-1">
             <BsEnvelopeFill size="20px" className="fill-[#97AEFF]" />
             <DynamicInputField
diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index c32f2a17..c614097b 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -13,13 +13,13 @@ const ProfileGrid = ({
   session: Session
 }) => {
   const { data, isError, isLoading, refetch } =
-    trpc.member.getMemberProfile.useQuery(studentId)
+    trpc.user.getUserProfile.useQuery(studentId)
 
   if (isLoading) {
     return <LoadingScreen />
   }
 
-  if (!data || !data.user || isError) {
+  if (!data || isError) {
     return <p className="text-3xl">Something is wrong</p>
   }
 
@@ -28,9 +28,9 @@ const ProfileGrid = ({
       <div className="row-span-3 h-full w-3/4 max-w-md bg-[#01003D] md:place-self-end">
         <ProfileCard
           refetch={refetch}
-          name={data.user.name}
-          dept={data.user.department}
-          role={data.user.role}
+          name={data.name}
+          dept={data.department}
+          role={data.role}
           studentId={studentId}
           session={session}
         />
@@ -38,12 +38,12 @@ const ProfileGrid = ({
       <div className="col-span-2 w-3/4">
         <ProfileContactInfo
           studentId={studentId}
-          {...data.user}
+          {...data}
           refetch={refetch}
         />
       </div>
       <div className="col-span-2 row-span-2 mb-10 w-3/4">
-        <ProfileInfo {...data.user} />
+        {/* <ProfileInfo {...data} /> */}
       </div>
     </div>
   )
diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index ad896f75..a9956c0c 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -7,7 +7,7 @@ type ProfilePageType = {
   year: string | null
   faculty: string | null
   major: string | null
-  projects: Projects[]
+  // projects: Projects[]
 }
 
 const ProfileInfo = (props: ProfilePageType) => {
@@ -61,7 +61,7 @@ const ProfileInfo = (props: ProfilePageType) => {
                 {props.major}
               </Td>
             </Tr>
-            <Tr>
+            {/* <Tr>
               <Td textColor="#002D70" className="font-medium">
                 PROJECTS
               </Td>
@@ -76,7 +76,7 @@ const ProfileInfo = (props: ProfilePageType) => {
                   </Td>
                 )
               })}
-            </Tr>
+            </Tr> */}
           </Tbody>
         </Table>
       </TableContainer>
diff --git a/src/components/profile/UploadImageButton.tsx b/src/components/profile/UploadImageButton.tsx
index 3b229109..930cd86d 100644
--- a/src/components/profile/UploadImageButton.tsx
+++ b/src/components/profile/UploadImageButton.tsx
@@ -7,8 +7,7 @@ import { type QueryObserverResult } from '@tanstack/react-query'
 import { Message } from '~/constant/messages'
 
 // TODO: Fix the environment variables.
-import { storage } from '~/server/db/firebase'
-import { ref, uploadBytes, getDownloadURL } from 'firebase/storage'
+
 
 const UploadImageBtn = ({
   studentId,
@@ -32,13 +31,8 @@ const UploadImageBtn = ({
           title: Message.IMAGE_UPLOAD_LOADING,
           status: 'loading',
         })
-        const storageRef = ref(storage, `${studentId}/image/profile_pic`)
-        await uploadBytes(storageRef, e.target.files[0] as File)
-        const image = await getDownloadURL(storageRef)
-        await mutateAsync({
-          studentId,
-          image,
-        })
+
+
         await refetch()
         toast({
           duration: 3000,
diff --git a/src/pages/preferences.tsx b/src/pages/preferences.tsx
index 89acfbc9..7da64f52 100644
--- a/src/pages/preferences.tsx
+++ b/src/pages/preferences.tsx
@@ -10,7 +10,7 @@ import Link from 'next/link'
 
 const ChangePasswordPage = () => {
   const toast = useToast()
-  const { mutateAsync, isLoading } = trpc.profile.changePassword.useMutation()
+  const { mutateAsync, isLoading } = trpc.user.changePassword.useMutation()
   const { status } = useSession({ required: true })
   const [oldPassword, setOldPassword] = useState('')
   const [password, setPassword] = useState('')
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index 76b5d95e..f38a257f 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -1,13 +1,11 @@
 import { router } from '../trpc'
 import { memberRouter } from './member'
-import { profileRouter } from './profile'
 import { userRouter } from './users'
 import { attendanceRouter } from './attendance'
 
 export const appRouter = router({
   attendance: attendanceRouter,
   member: memberRouter,
-  profile: profileRouter,
   user: userRouter,
 })
 
diff --git a/src/server/trpc/router/member/createMultipleUsers.ts b/src/server/trpc/router/member/createMultipleUsers.ts
index 838a72b5..74832888 100644
--- a/src/server/trpc/router/member/createMultipleUsers.ts
+++ b/src/server/trpc/router/member/createMultipleUsers.ts
@@ -22,7 +22,7 @@ export const createMultipleUsers = protectedProcedure
       })
     )
   )
-  .mutation(async ({ ctx, input }) => {
+  .mutation(async ({ input }) => {
     try {
       const password = randomBytes(10).toString('hex')
       const hashedPassword = await hash(password, 10)
diff --git a/src/server/trpc/router/profile/index.ts b/src/server/trpc/router/profile/index.ts
deleted file mode 100644
index ea732215..00000000
--- a/src/server/trpc/router/profile/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { router } from '~/server/trpc/trpc'
-import changePassword from './password'
-
-export const profileRouter = router({
-  changePassword,
-})
diff --git a/src/server/trpc/router/profile/password.ts b/src/server/trpc/router/users/changePassword.ts
similarity index 69%
rename from src/server/trpc/router/profile/password.ts
rename to src/server/trpc/router/users/changePassword.ts
index 9d8356e2..3b82e9ca 100644
--- a/src/server/trpc/router/profile/password.ts
+++ b/src/server/trpc/router/users/changePassword.ts
@@ -2,8 +2,9 @@ import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import { compare, hash } from 'bcryptjs'
+import userCollection from '~/server/db/collections/UserCollection'
 
-export default protectedProcedure
+export const changePassword = protectedProcedure
   .input(
     z.object({
       oldPassword: z.string(),
@@ -16,17 +17,7 @@ export default protectedProcedure
       const { id } = ctx.session.user
 
       // Throw an error if we are unable to find the user
-      const foundUser = await ctx.prisma.user.findUnique({
-        where: { id },
-        select: { hashedPassword: true },
-      })
-
-      if (!foundUser) {
-        throw new TRPCError({
-          code: 'UNAUTHORIZED',
-          message: 'Oops, something went wrong!',
-        })
-      }
+      const foundUser = await userCollection.getById(id)
 
       // Verify if the current password is correct
       const success = await compare(oldPassword, foundUser.hashedPassword)
@@ -38,9 +29,8 @@ export default protectedProcedure
       }
 
       const newPassword = await hash(password, 10)
-      await ctx.prisma.user.update({
-        data: { hashedPassword: newPassword },
-        where: { id },
+      await userCollection.update(id, {
+        hashedPassword: newPassword,
       })
     } catch (e) {
       // Throw an error if there is an issue with updating of password
diff --git a/src/server/trpc/router/users/getUserProfile.ts b/src/server/trpc/router/users/getUserProfile.ts
new file mode 100644
index 00000000..f0764146
--- /dev/null
+++ b/src/server/trpc/router/users/getUserProfile.ts
@@ -0,0 +1,17 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import { TRPCError } from '@trpc/server'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const getUserProfile = protectedProcedure
+  .input(z.string())
+  .query(async ({ ctx }) => {
+    try {
+      return await userCollection.getById(ctx.session.user.id)
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index 6eaf3f70..5a884dbb 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -1,8 +1,10 @@
 import { router } from '~/server/trpc/trpc'
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { TRPCError } from '@trpc/server'
-import { resetPassword } from './post'
+import { resetPassword } from './resetPassword'
+import { changePassword } from './changePassword'
 import { getAllUsersForTable } from './getAllUsersForTable'
+import { getUserProfile } from './getUserProfile'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -26,7 +28,9 @@ const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
 })
 
 export const userRouter = router({
+  changePassword,
   getAllUsers,
   getAllUsersForTable,
+  getUserProfile,
   resetPassword,
 })
diff --git a/src/server/trpc/router/users/post.ts b/src/server/trpc/router/users/resetPassword.ts
similarity index 51%
rename from src/server/trpc/router/users/post.ts
rename to src/server/trpc/router/users/resetPassword.ts
index 5e4743e8..ff946d55 100644
--- a/src/server/trpc/router/users/post.ts
+++ b/src/server/trpc/router/users/resetPassword.ts
@@ -1,37 +1,33 @@
 import { publicProcedure } from '../../trpc'
 import { z } from 'zod'
-import { TRPCError } from '@trpc/server'
-import nodemailer from 'nodemailer'
 import { env } from '~/env/server.mjs'
+import { transporter } from '../util/transporter'
+import userCollection from '~/server/db/collections/UserCollection'
+import logCollection from '~/server/db/collections/LogCollection'
+import { Timestamp } from 'firebase/firestore'
 
 export const resetPassword = publicProcedure
   .input(z.string())
-  .mutation(async ({ ctx, input }) => {
+  .mutation(async ({ input: email }) => {
     try {
-      const email = input
-      const foundUser = await ctx.prisma.user.findFirst({
-        where: {
-          email,
+      const foundUser = await userCollection.queries([
+        {
+          type: 'where',
+          fieldPath: 'email',
+          direction: '==',
+          value: email,
         },
-      })
+      ])
 
       // Do not tell the user if the account cannot be found for security reasons
-      if (!foundUser) return
-
-      const transporter = nodemailer.createTransport({
-        service: 'gmail',
-        auth: {
-          user: env.GMAIL,
-          pass: env.GMAIL_PASSWORD,
-        },
-      })
+      if (!foundUser.length) return
 
       await transporter.sendMail({
         from: env.GMAIL,
         to: email,
         subject: 'Reset Password',
         html: `
-            Hi ${foundUser.name || 'user'},
+            Hi ${foundUser[0]?.name || 'user'},
             <br />
             <p>A request to reset your account's password has been made. 
             If you did not make this request, please ignore the email.
@@ -42,9 +38,11 @@ export const resetPassword = publicProcedure
           `,
       })
     } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
+      await logCollection.add({
+        level: 'WARNING',
+        title: 'Error resetting password',
+        description: (e as Error).message,
+        createdAt: Timestamp.fromDate(new Date()),
       })
     }
   })
diff --git a/src/server/trpc/router/util/transporter.ts b/src/server/trpc/router/util/transporter.ts
new file mode 100644
index 00000000..a198256e
--- /dev/null
+++ b/src/server/trpc/router/util/transporter.ts
@@ -0,0 +1,10 @@
+import nodemailer from 'nodemailer'
+import { env } from '~/env/server.mjs'
+
+export const transporter = nodemailer.createTransport({
+  service: 'gmail',
+  auth: {
+    user: env.GMAIL,
+    pass: env.GMAIL_PASSWORD,
+  },
+})

From b8308df9860b1dab5e06ae3f0b6ab4fe7383ea76 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 09:37:52 +0800
Subject: [PATCH 071/223] Integrate in the google storage

---
 src/components/profile/UploadImageButton.tsx     | 12 +++++++++---
 src/components/users/CreateMultipleUsers.tsx     |  2 +-
 src/env/schema.mjs                               | 16 ++++++++++++++--
 src/server/trpc/router/member/index.ts           |  6 +++---
 .../createManyUsers.ts}                          |  4 ++--
 src/server/trpc/router/users/index.ts            |  2 ++
 src/utils/storage.ts                             | 15 +++++++++++++++
 7 files changed, 46 insertions(+), 11 deletions(-)
 rename src/server/trpc/router/{member/createMultipleUsers.ts => users/createManyUsers.ts} (94%)
 create mode 100644 src/utils/storage.ts

diff --git a/src/components/profile/UploadImageButton.tsx b/src/components/profile/UploadImageButton.tsx
index 930cd86d..35b214bb 100644
--- a/src/components/profile/UploadImageButton.tsx
+++ b/src/components/profile/UploadImageButton.tsx
@@ -7,7 +7,8 @@ import { type QueryObserverResult } from '@tanstack/react-query'
 import { Message } from '~/constant/messages'
 
 // TODO: Fix the environment variables.
-
+import { storage } from '~/utils/storage'
+import { ref, uploadBytes, getDownloadURL } from 'firebase/storage'
 
 const UploadImageBtn = ({
   studentId,
@@ -31,8 +32,13 @@ const UploadImageBtn = ({
           title: Message.IMAGE_UPLOAD_LOADING,
           status: 'loading',
         })
-
-
+        const storageRef = ref(storage, `${studentId}/image/profile_pic`)
+        await uploadBytes(storageRef, e.target.files[0] as File)
+        const image = await getDownloadURL(storageRef)
+        await mutateAsync({
+          studentId,
+          image,
+        })
         await refetch()
         toast({
           duration: 3000,
diff --git a/src/components/users/CreateMultipleUsers.tsx b/src/components/users/CreateMultipleUsers.tsx
index af2bad68..fdd0c603 100644
--- a/src/components/users/CreateMultipleUsers.tsx
+++ b/src/components/users/CreateMultipleUsers.tsx
@@ -11,7 +11,7 @@ const CreateMultipleUsers = () => {
   const toast = useToast()
   const [users, setUsers] = useState<AddUsersType[]>([])
 
-  const { isLoading, mutateAsync } = trpc.member.addMultipleUsers.useMutation()
+  const { isLoading, mutateAsync } = trpc.user.createManyUsers.useMutation()
 
   const handleFile = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
     if (e.target.files && e.target.files.length && e.target.files[0]) {
diff --git a/src/env/schema.mjs b/src/env/schema.mjs
index df7d76bb..952589b0 100644
--- a/src/env/schema.mjs
+++ b/src/env/schema.mjs
@@ -37,7 +37,14 @@ export const serverSchema = z.object({
  * This way you can ensure the app isn't built with invalid env vars.
  * To expose them to the client, prefix them with `NEXT_PUBLIC_`.
  */
-export const clientSchema = z.object({});
+export const clientSchema = z.object({
+  NEXT_PUBLIC_APP_ID: z.string(),
+  NEXT_PUBLIC_MESSAGING_SENDER_ID: z.string(),
+  NEXT_PUBLIC_API_KEY: z.string(),
+  NEXT_PUBLIC_AUTH_DOMAIN: z.string(),
+  NEXT_PUBLIC_PROJECT_ID: z.string(),
+  NEXT_PUBLIC_STORAGE_BUCKET: z.string()
+});
 
 /**
  * You can't destruct `process.env` as a regular object, so you have to do
@@ -46,5 +53,10 @@ export const clientSchema = z.object({});
  * @type {{ [k in keyof z.infer<typeof clientSchema>]: z.infer<typeof clientSchema>[k] | undefined }}
  */
 export const clientEnv = {
-  // NEXT_PUBLIC_CLIENTVAR: process.env.NEXT_PUBLIC_CLIENTVAR,
+  NEXT_PUBLIC_APP_ID: process.env.NEXT_PUBLIC_APP_ID,
+  NEXT_PUBLIC_MESSAGING_SENDER_ID: process.env.NEXT_PUBLIC_MESSAGING_SENDER_ID,
+  NEXT_PUBLIC_API_KEY: process.env.NEXT_PUBLIC_API_KEY,
+  NEXT_PUBLIC_AUTH_DOMAIN: process.env.NEXT_PUBLIC_AUTH_DOMAIN,
+  NEXT_PUBLIC_PROJECT_ID: process.env.NEXT_PUBLIC_PROJECT_ID,
+  NEXT_PUBLIC_STORAGE_BUCKET: process.env.NEXT_PUBLIC_STORAGE_BUCKET
 };
diff --git a/src/server/trpc/router/member/index.ts b/src/server/trpc/router/member/index.ts
index 15c6eff3..aa37d709 100644
--- a/src/server/trpc/router/member/index.ts
+++ b/src/server/trpc/router/member/index.ts
@@ -6,11 +6,11 @@ import {
   updateMemberContacts,
 } from './update'
 import { deleteMemberImage } from './delete'
-import {  createSingleUser } from './createSingleUser'
-import { createMultipleUsers } from './createMultipleUsers'
+import { createSingleUser } from './createSingleUser'
+import { createManyUsers } from '../users/createManyUsers'
 
 export const memberRouter = router({
-  createMultipleUsers,
+  createManyUsers,
   createSingleUser,
   deleteMemberImage,
   getAllUsers,
diff --git a/src/server/trpc/router/member/createMultipleUsers.ts b/src/server/trpc/router/users/createManyUsers.ts
similarity index 94%
rename from src/server/trpc/router/member/createMultipleUsers.ts
rename to src/server/trpc/router/users/createManyUsers.ts
index 74832888..04803a4e 100644
--- a/src/server/trpc/router/member/createMultipleUsers.ts
+++ b/src/server/trpc/router/users/createManyUsers.ts
@@ -3,14 +3,14 @@ import { z } from 'zod'
 import { randomBytes } from 'crypto'
 import { hash } from 'bcryptjs'
 
-import { sendMultipleEmails } from './helper'
+import { sendMultipleEmails } from '../member/helper'
 import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
 import { db } from '~/server/db/firebase'
 import type { User } from '~/server/db/models/User'
 import logCollection from '~/server/db/collections/LogCollection'
 import { Timestamp } from 'firebase/firestore'
 
-export const createMultipleUsers = protectedProcedure
+export const createManyUsers = protectedProcedure
   .input(
     z.array(
       z.object({
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index 5a884dbb..0d580d03 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -5,6 +5,7 @@ import { resetPassword } from './resetPassword'
 import { changePassword } from './changePassword'
 import { getAllUsersForTable } from './getAllUsersForTable'
 import { getUserProfile } from './getUserProfile'
+import { createManyUsers } from './createManyUsers'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -29,6 +30,7 @@ const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
 
 export const userRouter = router({
   changePassword,
+  createManyUsers,
   getAllUsers,
   getAllUsersForTable,
   getUserProfile,
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
new file mode 100644
index 00000000..20a8adc7
--- /dev/null
+++ b/src/utils/storage.ts
@@ -0,0 +1,15 @@
+import { initializeApp } from 'firebase/app'
+import { getStorage } from 'firebase/storage'
+import { env } from '~/env/client.mjs'
+
+const firebaseConfig = {
+  apiKey: env.NEXT_PUBLIC_API_KEY,
+  authDomain: env.NEXT_PUBLIC_AUTH_DOMAIN,
+  projectId: env.NEXT_PUBLIC_PROJECT_ID,
+  storageBucket: env.NEXT_PUBLIC_STORAGE_BUCKET,
+  messagingSenderId: env.NEXT_PUBLIC_MESSAGING_SENDER_ID,
+  appId: env.NEXT_PUBLIC_APP_ID,
+}
+
+const app = initializeApp(firebaseConfig)
+export const storage = getStorage(app)

From 2941ae3e6b4e0ed47464be07e0f6b2a658279767 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 09:57:02 +0800
Subject: [PATCH 072/223] Migrate the getUserImage and updateUserImage

---
 src/components/profile/ProfileCard.tsx        | 14 +++-
 src/components/profile/UploadImageButton.tsx  | 65 ++++++++++---------
 src/server/trpc/router/member/index.ts        |  4 +-
 src/server/trpc/router/users/getUserImage.ts  |  9 +++
 src/server/trpc/router/users/index.ts         |  4 ++
 .../update.ts => users/updateUserImage.ts}    | 15 ++---
 6 files changed, 65 insertions(+), 46 deletions(-)
 create mode 100644 src/server/trpc/router/users/getUserImage.ts
 rename src/server/trpc/router/{member/update.ts => users/updateUserImage.ts} (84%)

diff --git a/src/components/profile/ProfileCard.tsx b/src/components/profile/ProfileCard.tsx
index becab063..2dabd918 100644
--- a/src/components/profile/ProfileCard.tsx
+++ b/src/components/profile/ProfileCard.tsx
@@ -25,14 +25,18 @@ const ProfileCard = ({
   const router = useRouter()
   const redirectToResetPassword = () => router.push('/auth/forgetpassword')
 
-  const { isLoading, data } = trpc.member.getMemberImage.useQuery(studentId)
+  const {
+    isLoading,
+    data,
+    refetch: refetchImage,
+  } = trpc.user.getUserImage.useQuery(studentId)
 
   return (
     <Box className="mb-10 flex flex-col items-center">
       <Box className="relative">
         <Image
           alt="profile-pic"
-          src={isLoading || !data || !data.image ? DEFAULT_IMAGE : data.image}
+          src={isLoading || !data ? DEFAULT_IMAGE : data}
           fallbackSrc={DEFAULT_IMAGE}
           objectFit="cover"
           borderRadius="full"
@@ -40,7 +44,11 @@ const ProfileCard = ({
         />
         {session?.user?.id === studentId ? (
           <Box className="absolute bottom-0 right-0">
-            <UploadImageBtn refetch={refetch} studentId={studentId} />
+            <UploadImageBtn
+              refetchImage={refetchImage}
+              refetch={refetch}
+              studentId={studentId}
+            />
           </Box>
         ) : null}
       </Box>
diff --git a/src/components/profile/UploadImageButton.tsx b/src/components/profile/UploadImageButton.tsx
index 35b214bb..4f15002c 100644
--- a/src/components/profile/UploadImageButton.tsx
+++ b/src/components/profile/UploadImageButton.tsx
@@ -1,4 +1,4 @@
-import { type ChangeEvent, useRef } from 'react'
+import { type ChangeEvent, useRef, useCallback } from 'react'
 import { trpc } from '../../utils/trpc'
 import { IconContext } from 'react-icons'
 import { Button, useToast } from '@chakra-ui/react'
@@ -13,49 +13,54 @@ import { ref, uploadBytes, getDownloadURL } from 'firebase/storage'
 const UploadImageBtn = ({
   studentId,
   refetch,
+  refetchImage
 }: {
   studentId: string
   refetch: () => Promise<QueryObserverResult>
+  refetchImage: () => Promise<QueryObserverResult>
 }) => {
   const toast = useToast()
   // trigger a click event on the file input element when button is clicked
   const uploadRef = useRef<HTMLInputElement>(null)
-  const { mutateAsync } = trpc.member.updateMemberImage.useMutation()
+  const { mutateAsync } = trpc.user.updateUserImage.useMutation()
   const onUpload = () => {
     uploadRef.current?.click()
   }
-  const handleFileSelected = async (e: ChangeEvent<HTMLInputElement>) => {
-    try {
-      if (e.target.files) {
-        toast({
-          duration: 1000,
-          title: Message.IMAGE_UPLOAD_LOADING,
-          status: 'loading',
-        })
-        const storageRef = ref(storage, `${studentId}/image/profile_pic`)
-        await uploadBytes(storageRef, e.target.files[0] as File)
-        const image = await getDownloadURL(storageRef)
-        await mutateAsync({
-          studentId,
-          image,
-        })
-        await refetch()
+  const handleFileSelected = useCallback(
+    async (e: ChangeEvent<HTMLInputElement>) => {
+      try {
+        if (e.target.files) {
+          toast({
+            duration: 1000,
+            title: Message.IMAGE_UPLOAD_LOADING,
+            status: 'loading',
+          })
+          const storageRef = ref(storage, `${studentId}/image/profile_pic`)
+          await uploadBytes(storageRef, e.target.files[0] as File)
+          const image = await getDownloadURL(storageRef)
+          await mutateAsync({
+            studentId,
+            image,
+          })
+          await refetchImage()
+          toast({
+            duration: 3000,
+            description: Message.IMAGE_UPLOAD_SUCCESS,
+            title: 'Success',
+            status: 'success',
+          })
+        }
+      } catch (e) {
         toast({
           duration: 3000,
-          description: Message.IMAGE_UPLOAD_SUCCESS,
-          title: 'Success',
-          status: 'success',
+          description: Message.IMAGE_UPLOAD_ERROR,
+          status: 'error',
+          title: 'Something went wrong',
         })
       }
-    } catch (e) {
-      toast({
-        duration: 3000,
-        description: Message.IMAGE_UPLOAD_ERROR,
-        status: 'error',
-        title: 'Something went wrong',
-      })
-    }
-  }
+    },
+    [refetch, studentId, mutateAsync, toast]
+  )
   return (
     <Button
       variant="ghost"
diff --git a/src/server/trpc/router/member/index.ts b/src/server/trpc/router/member/index.ts
index aa37d709..8e9f975b 100644
--- a/src/server/trpc/router/member/index.ts
+++ b/src/server/trpc/router/member/index.ts
@@ -1,10 +1,9 @@
 import { router } from '~/server/trpc/trpc'
 import { getMemberProfile, getMemberImage, getRoles, getAllUsers } from './read'
 import {
-  updateMemberImage,
   updateProfile,
   updateMemberContacts,
-} from './update'
+} from '../users/updateUserImage'
 import { deleteMemberImage } from './delete'
 import { createSingleUser } from './createSingleUser'
 import { createManyUsers } from '../users/createManyUsers'
@@ -17,7 +16,6 @@ export const memberRouter = router({
   getMemberImage,
   getMemberProfile,
   getRoles,
-  updateMemberImage,
   updateProfile,
   updateMemberContacts,
 })
diff --git a/src/server/trpc/router/users/getUserImage.ts b/src/server/trpc/router/users/getUserImage.ts
new file mode 100644
index 00000000..16d624e6
--- /dev/null
+++ b/src/server/trpc/router/users/getUserImage.ts
@@ -0,0 +1,9 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const getUserImage = protectedProcedure
+  .input(z.string())
+  .query(async ({ input }) => {
+    return (await userCollection.getById(input)).image
+  })
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index 0d580d03..63c70539 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -6,6 +6,8 @@ import { changePassword } from './changePassword'
 import { getAllUsersForTable } from './getAllUsersForTable'
 import { getUserProfile } from './getUserProfile'
 import { createManyUsers } from './createManyUsers'
+import { updateUserImage } from './updateUserImage'
+import { getUserImage } from './getUserImage'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -33,6 +35,8 @@ export const userRouter = router({
   createManyUsers,
   getAllUsers,
   getAllUsersForTable,
+  getUserImage,
   getUserProfile,
   resetPassword,
+  updateUserImage
 })
diff --git a/src/server/trpc/router/member/update.ts b/src/server/trpc/router/users/updateUserImage.ts
similarity index 84%
rename from src/server/trpc/router/member/update.ts
rename to src/server/trpc/router/users/updateUserImage.ts
index 80219db1..7011fb91 100644
--- a/src/server/trpc/router/member/update.ts
+++ b/src/server/trpc/router/users/updateUserImage.ts
@@ -1,24 +1,19 @@
 import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
+import userCollection from '~/server/db/collections/UserCollection'
 
-export const updateMemberImage = protectedProcedure
+export const updateUserImage = protectedProcedure
   .input(
     z.object({
       image: z.string(),
       studentId: z.string(),
     })
   )
-  .mutation(async ({ ctx, input }) => {
-    const user = await ctx.prisma.user.update({
-      where: {
-        id: input.studentId,
-      },
-      data: {
-        image: input.image,
-      },
+  .mutation(async ({ input }) => {
+    await userCollection.update(input.studentId, {
+      image: input.image,
     })
-    return user
   })
 
 export const updateProfile = protectedProcedure

From c68b8801543fa0c5238cb01aac0fc50fb5083c4e Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 10:27:36 +0800
Subject: [PATCH 073/223] Add in a Storage Service

---
 src/components/profile/ProfileCard.tsx        | 13 +++-------
 src/components/profile/ProfileGrid.tsx        |  7 +-----
 src/components/profile/UploadImageButton.tsx  | 19 +++++++--------
 src/components/users/ProfileModal.tsx         |  8 ++++---
 src/components/users/SingleUserForm.tsx       |  2 +-
 src/server/trpc/router/member/delete.ts       | 24 -------------------
 src/server/trpc/router/member/index.ts        | 11 ++++-----
 .../{member => users}/createSingleUser.ts     |  2 +-
 .../trpc/router/users/deleteUserImage.ts      | 21 ++++++++++++++++
 src/server/trpc/router/users/index.ts         |  6 ++++-
 src/utils/storage.ts                          | 23 ++++++++++++++++--
 11 files changed, 70 insertions(+), 66 deletions(-)
 delete mode 100644 src/server/trpc/router/member/delete.ts
 rename src/server/trpc/router/{member => users}/createSingleUser.ts (95%)
 create mode 100644 src/server/trpc/router/users/deleteUserImage.ts

diff --git a/src/components/profile/ProfileCard.tsx b/src/components/profile/ProfileCard.tsx
index 2dabd918..5d87535a 100644
--- a/src/components/profile/ProfileCard.tsx
+++ b/src/components/profile/ProfileCard.tsx
@@ -3,7 +3,6 @@ import { Box, Button, Image, Text } from '@chakra-ui/react'
 import type { Session } from 'next-auth'
 import { useRouter } from 'next/router'
 import UploadImageBtn from './UploadImageButton'
-import { type QueryObserverResult } from '@tanstack/react-query'
 
 const DEFAULT_IMAGE = '/fintech_logo.png'
 
@@ -13,14 +12,12 @@ const ProfileCard = ({
   role,
   studentId,
   session,
-  refetch,
 }: {
   name: string | null
   dept: string | null
   role: string | null
   studentId: string
   session: Session
-  refetch: () => Promise<QueryObserverResult>
 }) => {
   const router = useRouter()
   const redirectToResetPassword = () => router.push('/auth/forgetpassword')
@@ -42,15 +39,11 @@ const ProfileCard = ({
           borderRadius="full"
           boxSize="170px"
         />
-        {session?.user?.id === studentId ? (
+        {session?.user?.id === studentId ?? (
           <Box className="absolute bottom-0 right-0">
-            <UploadImageBtn
-              refetchImage={refetchImage}
-              refetch={refetch}
-              studentId={studentId}
-            />
+            <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
           </Box>
-        ) : null}
+        )}
       </Box>
       <Box className="flex flex-col items-center py-2">
         <Text textColor="##FFFFFF" className="text-2xl font-medium">
diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index c614097b..260518e2 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -27,7 +27,6 @@ const ProfileGrid = ({
     <div className="m-10 grid grid-cols-1 grid-rows-3 place-items-center gap-y-6 md:grid-cols-3">
       <div className="row-span-3 h-full w-3/4 max-w-md bg-[#01003D] md:place-self-end">
         <ProfileCard
-          refetch={refetch}
           name={data.name}
           dept={data.department}
           role={data.role}
@@ -36,11 +35,7 @@ const ProfileGrid = ({
         />
       </div>
       <div className="col-span-2 w-3/4">
-        <ProfileContactInfo
-          studentId={studentId}
-          {...data}
-          refetch={refetch}
-        />
+        <ProfileContactInfo studentId={studentId} {...data} refetch={refetch} />
       </div>
       <div className="col-span-2 row-span-2 mb-10 w-3/4">
         {/* <ProfileInfo {...data} /> */}
diff --git a/src/components/profile/UploadImageButton.tsx b/src/components/profile/UploadImageButton.tsx
index 4f15002c..265b8cfe 100644
--- a/src/components/profile/UploadImageButton.tsx
+++ b/src/components/profile/UploadImageButton.tsx
@@ -5,18 +5,13 @@ import { Button, useToast } from '@chakra-ui/react'
 import EditIcon from './EditIcon'
 import { type QueryObserverResult } from '@tanstack/react-query'
 import { Message } from '~/constant/messages'
-
-// TODO: Fix the environment variables.
-import { storage } from '~/utils/storage'
-import { ref, uploadBytes, getDownloadURL } from 'firebase/storage'
+import { StorageService } from '~/utils/storage'
 
 const UploadImageBtn = ({
   studentId,
-  refetch,
-  refetchImage
+  refetchImage,
 }: {
   studentId: string
-  refetch: () => Promise<QueryObserverResult>
   refetchImage: () => Promise<QueryObserverResult>
 }) => {
   const toast = useToast()
@@ -35,9 +30,11 @@ const UploadImageBtn = ({
             title: Message.IMAGE_UPLOAD_LOADING,
             status: 'loading',
           })
-          const storageRef = ref(storage, `${studentId}/image/profile_pic`)
-          await uploadBytes(storageRef, e.target.files[0] as File)
-          const image = await getDownloadURL(storageRef)
+
+          const image = await StorageService.uploadFile(
+            e.target.files[0] as Blob,
+            `${studentId}/image/profile_pic`
+          )
           await mutateAsync({
             studentId,
             image,
@@ -59,7 +56,7 @@ const UploadImageBtn = ({
         })
       }
     },
-    [refetch, studentId, mutateAsync, toast]
+    [studentId, mutateAsync, toast, refetchImage]
   )
   return (
     <Button
diff --git a/src/components/users/ProfileModal.tsx b/src/components/users/ProfileModal.tsx
index 393d9616..96a577a7 100644
--- a/src/components/users/ProfileModal.tsx
+++ b/src/components/users/ProfileModal.tsx
@@ -34,6 +34,7 @@ import {
 } from '@chakra-ui/react'
 import Image from 'next/image'
 import type { Session } from 'next-auth'
+import { StorageService } from '~/utils/storage'
 
 const defaultImage = '/150.png'
 
@@ -148,7 +149,7 @@ const UploadImageBtn = ({
   const toast = useToast()
   // trigger a click event on the file input element when button is clicked
   const uploadRef = useRef<HTMLInputElement>(null)
-  const { mutateAsync } = trpc.member.updateMemberImage.useMutation()
+  const { mutateAsync } = trpc.user.updateUserImage.useMutation()
   const onUpload = () => {
     uploadRef.current?.click()
   }
@@ -206,7 +207,7 @@ const DeleteImageBtn = ({
   studentId: string
 }) => {
   const toast = useToast()
-  const { mutateAsync } = trpc.member.deleteMemberImage.useMutation({
+  const { mutateAsync } = trpc.user.deleteUserImage.useMutation({
     onSuccess: () => {
       setImage(defaultImage)
     },
@@ -215,7 +216,8 @@ const DeleteImageBtn = ({
   // DELETE IMAGE LOGIC
   const handleDelete = async () => {
     try {
-      await mutateAsync(studentId)
+      await StorageService.deleteFile(`${studentId}/image/profile_pic`)
+      await mutateAsync()
       toast({
         duration: 3000,
         description: 'Image successfully deleted.',
diff --git a/src/components/users/SingleUserForm.tsx b/src/components/users/SingleUserForm.tsx
index 178b57a7..20dbed46 100644
--- a/src/components/users/SingleUserForm.tsx
+++ b/src/components/users/SingleUserForm.tsx
@@ -156,7 +156,7 @@ const roles = [
 
 const SingleUserForm = () => {
   const router = useRouter()
-  const { mutateAsync, isLoading } = trpc.member.createSingleUser.useMutation()
+  const { mutateAsync, isLoading } = trpc.user.createSingleUser.useMutation()
   const toast = useToast()
   const [email, setEmail] = useState('')
   const [name, setName] = useState('')
diff --git a/src/server/trpc/router/member/delete.ts b/src/server/trpc/router/member/delete.ts
deleted file mode 100644
index aa9ad81a..00000000
--- a/src/server/trpc/router/member/delete.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { protectedProcedure } from '../../trpc'
-import { z } from 'zod'
-import { TRPCError } from '@trpc/server'
-
-export const deleteMemberImage = protectedProcedure
-  .input(z.string())
-  .mutation(async ({ ctx, input }) => {
-    try {
-      const user = await ctx.prisma.user.update({
-        where: {
-          id: input,
-        },
-        data: {
-          image: '',
-        },
-      })
-      return user
-    } catch (error) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: 'ERROR DELETING IMAGE' + error,
-      })
-    }
-  })
diff --git a/src/server/trpc/router/member/index.ts b/src/server/trpc/router/member/index.ts
index 8e9f975b..71812b64 100644
--- a/src/server/trpc/router/member/index.ts
+++ b/src/server/trpc/router/member/index.ts
@@ -1,17 +1,14 @@
 import { router } from '~/server/trpc/trpc'
 import { getMemberProfile, getMemberImage, getRoles, getAllUsers } from './read'
-import {
-  updateProfile,
-  updateMemberContacts,
-} from '../users/updateUserImage'
-import { deleteMemberImage } from './delete'
-import { createSingleUser } from './createSingleUser'
+import { updateProfile, updateMemberContacts } from '../users/updateUserImage'
+import { deleteUserImage } from '../users/deleteUserImage'
+import { createSingleUser } from '../users/createSingleUser'
 import { createManyUsers } from '../users/createManyUsers'
 
 export const memberRouter = router({
   createManyUsers,
   createSingleUser,
-  deleteMemberImage,
+  deleteUserImage,
   getAllUsers,
   getMemberImage,
   getMemberProfile,
diff --git a/src/server/trpc/router/member/createSingleUser.ts b/src/server/trpc/router/users/createSingleUser.ts
similarity index 95%
rename from src/server/trpc/router/member/createSingleUser.ts
rename to src/server/trpc/router/users/createSingleUser.ts
index a1f63903..ff594e92 100644
--- a/src/server/trpc/router/member/createSingleUser.ts
+++ b/src/server/trpc/router/users/createSingleUser.ts
@@ -1,7 +1,7 @@
 import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import { hash } from 'bcryptjs'
-import { checkIfUserExist, sendEmail } from './helper'
+import { checkIfUserExist, sendEmail } from '../member/helper'
 import userCollection from '~/server/db/collections/UserCollection'
 import logCollection from '~/server/db/collections/LogCollection'
 import { Timestamp } from 'firebase/firestore'
diff --git a/src/server/trpc/router/users/deleteUserImage.ts b/src/server/trpc/router/users/deleteUserImage.ts
new file mode 100644
index 00000000..ef43c642
--- /dev/null
+++ b/src/server/trpc/router/users/deleteUserImage.ts
@@ -0,0 +1,21 @@
+import { protectedProcedure } from '../../trpc'
+import { Timestamp } from 'firebase/firestore'
+import logCollection from '~/server/db/collections/LogCollection'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const deleteUserImage = protectedProcedure.mutation(
+  async ({ ctx }) => {
+    try {
+      return await userCollection.update(ctx.session.user.id, {
+        image: '',
+      })
+    } catch (e) {
+      await logCollection.add({
+        title: `Error deleting image for ${ctx.session.user.name}`,
+        description: (e as Error).message,
+        level: 'WARNING',
+        createdAt: Timestamp.fromDate(new Date()),
+      })
+    }
+  }
+)
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index 63c70539..bf5650a5 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -8,6 +8,8 @@ import { getUserProfile } from './getUserProfile'
 import { createManyUsers } from './createManyUsers'
 import { updateUserImage } from './updateUserImage'
 import { getUserImage } from './getUserImage'
+import { createSingleUser } from './createSingleUser'
+import { deleteUserImage } from './deleteUserImage'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -33,10 +35,12 @@ const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
 export const userRouter = router({
   changePassword,
   createManyUsers,
+  createSingleUser,
+  deleteUserImage,
   getAllUsers,
   getAllUsersForTable,
   getUserImage,
   getUserProfile,
   resetPassword,
-  updateUserImage
+  updateUserImage,
 })
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
index 20a8adc7..c3cd830b 100644
--- a/src/utils/storage.ts
+++ b/src/utils/storage.ts
@@ -1,5 +1,11 @@
 import { initializeApp } from 'firebase/app'
-import { getStorage } from 'firebase/storage'
+import {
+  ref,
+  getStorage,
+  uploadBytes,
+  getDownloadURL,
+  deleteObject,
+} from 'firebase/storage'
 import { env } from '~/env/client.mjs'
 
 const firebaseConfig = {
@@ -12,4 +18,17 @@ const firebaseConfig = {
 }
 
 const app = initializeApp(firebaseConfig)
-export const storage = getStorage(app)
+export class StorageService {
+  private static storage = getStorage(app)
+
+  static async uploadFile(file: Blob, pathName: string) {
+    const storageRef = ref(this.storage, pathName)
+    await uploadBytes(storageRef, file)
+    return await getDownloadURL(storageRef)
+  }
+
+  static async deleteFile(pathName: string) {
+    const storageRef = ref(this.storage, pathName)
+    await deleteObject(storageRef)
+  }
+}

From 1f582c3ef0c06ea7e9fcf7e4a44bc0f0667e997d Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Tue, 30 May 2023 18:46:10 +0800
Subject: [PATCH 074/223] Complete the migration

---
 prisma/schema.prisma                          |  10 +-
 src/components/profile/ProfileContactInfo.tsx |   2 +-
 src/components/users/EditModal.tsx            |   2 +-
 src/components/users/ProfileModal.tsx         |  63 +++++------
 src/server/db/collections/BaseCollection.ts   |   2 -
 src/server/trpc/router/_app.ts                |   2 -
 src/server/trpc/router/member/index.ts        |  18 ---
 src/server/trpc/router/member/read.ts         | 106 ------------------
 .../trpc/router/users/getUserProfile.ts       |   4 +-
 src/server/trpc/router/users/index.ts         |   4 +
 .../trpc/router/users/updateUserContacts.ts   |  19 ++++
 .../trpc/router/users/updateUserImage.ts      |  52 ---------
 .../trpc/router/users/updateUserProfile.ts    |  20 ++++
 13 files changed, 81 insertions(+), 223 deletions(-)
 delete mode 100644 src/server/trpc/router/member/index.ts
 delete mode 100644 src/server/trpc/router/member/read.ts
 create mode 100644 src/server/trpc/router/users/updateUserContacts.ts
 create mode 100644 src/server/trpc/router/users/updateUserProfile.ts

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index c8f9e140..253e1a04 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -28,7 +28,6 @@ model Departments {
 
 model User {
   batch           String?
-  department      String       @default("")
   discord         String?
   email           String       @unique
   faculty         String?
@@ -42,13 +41,14 @@ model User {
   role            String
   telegram        String?
   total_events    Int?         @default(0)
-  wallet          String?
   year            String?
   isAdmin         Boolean?     @default(false)
+  wallet          String?
+  department      String       @default("")
+  AttendanceTaken Attendance[]
   events          Event[]      @relation("EventToUser")
   projects        Projects[]   @relation("ProjectsToUser")
   Attendance      Attendance[] @relation("attendanceToUser")
-  AttendanceTaken Attendance[]
 }
 
 model Event {
@@ -73,10 +73,10 @@ model Log {
 model Attendance {
   id      String @id
   eventId String
-  user    User   @relation(fields: [userId], references: [id])
+  userId  String
   Event   Event  @relation(fields: [eventId], references: [id])
+  user    User   @relation(fields: [userId], references: [id])
   User    User[] @relation("attendanceToUser")
-  userId  String
 }
 
 enum LogType {
diff --git a/src/components/profile/ProfileContactInfo.tsx b/src/components/profile/ProfileContactInfo.tsx
index bf0398b8..0e87d8b4 100644
--- a/src/components/profile/ProfileContactInfo.tsx
+++ b/src/components/profile/ProfileContactInfo.tsx
@@ -21,7 +21,7 @@ const ProfileContactInfo = (props: {
 }) => {
   const toast = useToast()
   const { isLoading: isSubmitting, mutateAsync } =
-    trpc.member.updateMemberContacts.useMutation()
+    trpc.user.updateUserContacts.useMutation()
 
   const [edit, setEdit] = useState(false)
   const onEdit = () => {
diff --git a/src/components/users/EditModal.tsx b/src/components/users/EditModal.tsx
index f70cf516..a513b77c 100644
--- a/src/components/users/EditModal.tsx
+++ b/src/components/users/EditModal.tsx
@@ -29,7 +29,7 @@ const EditModal: React.FC<editModalProps> = (props) => {
     mode: 'onSubmit',
   })
 
-  const { mutateAsync } = trpc.member.updateProfile.useMutation()
+  const { mutateAsync } = trpc.user.updateUserProfile.useMutation()
   const toast = useToast()
   const onSubmit = async (data: any) => {
     try {
diff --git a/src/components/users/ProfileModal.tsx b/src/components/users/ProfileModal.tsx
index 96a577a7..08f931d6 100644
--- a/src/components/users/ProfileModal.tsx
+++ b/src/components/users/ProfileModal.tsx
@@ -46,7 +46,7 @@ const ProfilePage = ({
   session: Session
 }) => {
   // TRPC USEQUERY HOOK: SET REFETCH TO FALSE TO CACHE THE DATA
-  const { data, isLoading, isError } = trpc.member.getMemberProfile.useQuery(
+  const { data, isLoading, isError } = trpc.user.getUserProfile.useQuery(
     studentId,
     {
       refetchOnWindowFocus: false,
@@ -57,48 +57,43 @@ const ProfilePage = ({
   if (isLoading) return <LoadingScreen />
 
   // IF THERE IS SOMETHING WRONG WITH FETCHING THE USER, THROW AN ERROR
-  if (!data || !data.user || isError) {
+  if (!data || isError) {
     return <p className="text-3xl">Something is wrong</p>
   }
 
   return (
     <div className="mt-4 flex flex-wrap justify-between gap-6">
-      <ProfileInfo {...data.user} />
+      {/* <ProfileInfo {...data} /> */}
       <div className="flex flex-col">
         <ProfilePicture studentId={studentId} session={session} />
-        <ProfileContactInfo {...data.user} />
+        {/* <ProfileContactInfo {...data} /> */}
       </div>
     </div>
   )
 }
 
-const ProfileContactInfo = (props: {
-  telegram: string | null
-  discord: string | null
-  personal_email: string | null
-  email: string
-}) => {
-  return (
-    <Box className="flex flex-col gap-1">
-      <Box className="flex items-center gap-1">
-        <BsTelegram className="fill-[#0088cc]" />
-        <p>{props.telegram}</p>
-      </Box>
-      <Box className="flex items-center gap-1">
-        <BsDiscord className="fill-[#5865F2]" />
-        <p>{props.discord}</p>
-      </Box>
-      <Box className="flex items-center gap-1">
-        <BsEnvelopeFill />
-        <p>{props.personal_email}</p>
-      </Box>
-      <Box className="flex items-center gap-1">
-        <BsEnvelopeFill className="fill-blue-300" />
-        <p>{props.email}</p>
-      </Box>
-    </Box>
-  )
-}
+// const ProfileContactInfo = (props: { email: string }) => {
+//   return (
+//     <Box className="flex flex-col gap-1">
+//       <Box className="flex items-center gap-1">
+//         <BsTelegram className="fill-[#0088cc]" />
+//         <p>{props.telegram}</p>
+//       </Box>
+//       <Box className="flex items-center gap-1">
+//         <BsDiscord className="fill-[#5865F2]" />
+//         <p>{props.discord}</p>
+//       </Box>
+//       <Box className="flex items-center gap-1">
+//         <BsEnvelopeFill />
+//         <p>{props.personal_email}</p>
+//       </Box>
+//       <Box className="flex items-center gap-1">
+//         <BsEnvelopeFill className="fill-blue-300" />
+//         <p>{props.email}</p>
+//       </Box>
+//     </Box>
+//   )
+// }
 
 const ProfilePicture = ({
   studentId,
@@ -109,11 +104,11 @@ const ProfilePicture = ({
 }) => {
   const [image, setImage] = useState(defaultImage)
 
-  trpc.member.getMemberImage.useQuery(studentId, {
+  trpc.user.getUserImage.useQuery(studentId, {
     refetchOnWindowFocus: false,
     onSuccess(data) {
-      if (!data || !data.image) return
-      setImage(data.image)
+      if (!data) return
+      setImage(data)
     },
   })
 
diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index 2c6d7e62..9ae8df89 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -16,8 +16,6 @@ import {
   type WhereFilterOp,
   type FieldPath,
   orderBy,
-  startAt,
-  endAt,
   limit,
   getCountFromServer,
 } from 'firebase/firestore'
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index f38a257f..4e900311 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -1,11 +1,9 @@
 import { router } from '../trpc'
-import { memberRouter } from './member'
 import { userRouter } from './users'
 import { attendanceRouter } from './attendance'
 
 export const appRouter = router({
   attendance: attendanceRouter,
-  member: memberRouter,
   user: userRouter,
 })
 
diff --git a/src/server/trpc/router/member/index.ts b/src/server/trpc/router/member/index.ts
deleted file mode 100644
index 71812b64..00000000
--- a/src/server/trpc/router/member/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { router } from '~/server/trpc/trpc'
-import { getMemberProfile, getMemberImage, getRoles, getAllUsers } from './read'
-import { updateProfile, updateMemberContacts } from '../users/updateUserImage'
-import { deleteUserImage } from '../users/deleteUserImage'
-import { createSingleUser } from '../users/createSingleUser'
-import { createManyUsers } from '../users/createManyUsers'
-
-export const memberRouter = router({
-  createManyUsers,
-  createSingleUser,
-  deleteUserImage,
-  getAllUsers,
-  getMemberImage,
-  getMemberProfile,
-  getRoles,
-  updateProfile,
-  updateMemberContacts,
-})
diff --git a/src/server/trpc/router/member/read.ts b/src/server/trpc/router/member/read.ts
deleted file mode 100644
index 70e0fa23..00000000
--- a/src/server/trpc/router/member/read.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { protectedProcedure } from '../../trpc'
-import { z } from 'zod'
-import { TRPCError } from '@trpc/server'
-
-export const getMemberProfile = protectedProcedure
-  .input(z.string())
-  .query(async ({ ctx, input }) => {
-    try {
-      const user = await ctx.prisma.user.findUnique({
-        where: {
-          id: input,
-        },
-        select: {
-          name: true,
-          gender: true,
-          batch: true,
-          year: true,
-          faculty: true,
-          image: true,
-          telegram: true,
-          discord: true,
-          email: true,
-          personal_email: true,
-          department: true,
-          role: true,
-          major: true,
-          projects: true,
-        },
-      })
-
-      if (!user) {
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'No user found',
-        })
-      }
-
-      return { user }
-    } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
-
-export const getMemberImage = protectedProcedure
-  .input(z.string())
-  .query(async ({ ctx, input }) => {
-    try {
-      const user = await ctx.prisma.user.findUnique({
-        where: {
-          id: input,
-        },
-        select: {
-          image: true,
-        },
-      })
-      return user
-    } catch (error) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: 'error retrieving image' + error,
-      })
-    }
-  })
-
-export const getRoles = protectedProcedure.query(async ({ ctx }) => {
-  try {
-    return await ctx.prisma.user.findMany({
-      where: {},
-      distinct: ['role'],
-      select: { role: true },
-    })
-  } catch (error) {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: 'error retrieving roles' + error,
-    })
-  }
-})
-
-export const getAllUsers = protectedProcedure
-  .input(
-    z.object({
-      roles: z.string(),
-    })
-  )
-  .query(async ({ ctx, input }) => {
-    try {
-      return await ctx.prisma.user.findMany({
-        where: {
-          role: input.roles,
-        },
-        select: {
-          name: true,
-          batch: true,
-        },
-      })
-    } catch (error) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: 'error retrieving users' + error,
-      })
-    }
-  })
diff --git a/src/server/trpc/router/users/getUserProfile.ts b/src/server/trpc/router/users/getUserProfile.ts
index f0764146..65b8c26b 100644
--- a/src/server/trpc/router/users/getUserProfile.ts
+++ b/src/server/trpc/router/users/getUserProfile.ts
@@ -5,9 +5,9 @@ import userCollection from '~/server/db/collections/UserCollection'
 
 export const getUserProfile = protectedProcedure
   .input(z.string())
-  .query(async ({ ctx }) => {
+  .query(async ({ input }) => {
     try {
-      return await userCollection.getById(ctx.session.user.id)
+      return await userCollection.getById(input)
     } catch (e) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index bf5650a5..508ff850 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -10,6 +10,8 @@ import { updateUserImage } from './updateUserImage'
 import { getUserImage } from './getUserImage'
 import { createSingleUser } from './createSingleUser'
 import { deleteUserImage } from './deleteUserImage'
+import { updateUserProfile } from './updateUserProfile'
+import { updateUserContacts } from './updateUserContacts'
 
 const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
   try {
@@ -42,5 +44,7 @@ export const userRouter = router({
   getUserImage,
   getUserProfile,
   resetPassword,
+  updateUserContacts,
   updateUserImage,
+  updateUserProfile,
 })
diff --git a/src/server/trpc/router/users/updateUserContacts.ts b/src/server/trpc/router/users/updateUserContacts.ts
new file mode 100644
index 00000000..8ab98214
--- /dev/null
+++ b/src/server/trpc/router/users/updateUserContacts.ts
@@ -0,0 +1,19 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const updateUserContacts = protectedProcedure
+  .input(
+    z.object({
+      studentId: z.string(),
+      telegram: z.string(),
+      discord: z.string(),
+      personal_email: z.string(),
+      email: z.string(),
+    })
+  )
+  .mutation(async ({ ctx, input }) => {
+    return await userCollection.update(ctx.session.user.id, {
+      email: input.email,
+    })
+  })
diff --git a/src/server/trpc/router/users/updateUserImage.ts b/src/server/trpc/router/users/updateUserImage.ts
index 7011fb91..b81f4e85 100644
--- a/src/server/trpc/router/users/updateUserImage.ts
+++ b/src/server/trpc/router/users/updateUserImage.ts
@@ -1,6 +1,5 @@
 import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
-import { TRPCError } from '@trpc/server'
 import userCollection from '~/server/db/collections/UserCollection'
 
 export const updateUserImage = protectedProcedure
@@ -16,54 +15,3 @@ export const updateUserImage = protectedProcedure
     })
   })
 
-export const updateProfile = protectedProcedure
-  .input(
-    z.object({
-      id: z.string(),
-      name: z.string(),
-      role: z.string(),
-      department: z.string(),
-    })
-  )
-  .mutation(async ({ ctx, input }) => {
-    await ctx.prisma.user.update({
-      where: { id: input.id },
-      data: {
-        department: input.department,
-        name: input.name,
-        role: input.role,
-      },
-    })
-  })
-
-export const updateMemberContacts = protectedProcedure
-  .input(
-    z.object({
-      studentId: z.string(),
-      telegram: z.string(),
-      discord: z.string(),
-      personal_email: z.string(),
-      email: z.string(),
-    })
-  )
-  .mutation(async ({ ctx, input }) => {
-    try {
-      const user = await ctx.prisma.user.update({
-        where: {
-          id: input.studentId,
-        },
-        data: {
-          telegram: input.telegram,
-          discord: input.discord,
-          personal_email: input.personal_email,
-          email: input.email,
-        },
-      })
-      return user
-    } catch (e) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: (e as Error).message,
-      })
-    }
-  })
diff --git a/src/server/trpc/router/users/updateUserProfile.ts b/src/server/trpc/router/users/updateUserProfile.ts
new file mode 100644
index 00000000..9d36492b
--- /dev/null
+++ b/src/server/trpc/router/users/updateUserProfile.ts
@@ -0,0 +1,20 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const updateUserProfile = protectedProcedure
+  .input(
+    z.object({
+      id: z.string(),
+      name: z.string(),
+      role: z.string(),
+      department: z.string(),
+    })
+  )
+  .mutation(async ({ ctx, input }) => {
+    await userCollection.update(ctx.session.user.id, {
+      department: input.department,
+      name: input.name,
+      role: input.role,
+    })
+  })

From 161f5110576e2f3c75346269f0da81a5f561faed Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 31 May 2023 00:24:10 +0800
Subject: [PATCH 075/223] Update the prisma

---
 prisma/schema.prisma | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 253e1a04..838f8c75 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -27,28 +27,32 @@ model Departments {
 }
 
 model User {
+  attendance      Int?            @default(0)
   batch           String?
-  discord         String?
-  email           String       @unique
-  faculty         String?
+  department      String?
+  diet            String?
+  email           String          @unique
+  course          String?
   gender          String?
   hashedPassword  String
-  id              String       @id
+  id              String          @id
   image           String?
-  major           String?
-  name            String
+  linkedin        String?
+  name            String?
+  phone           String?
   personal_email  String?
-  role            String
-  telegram        String?
-  total_events    Int?         @default(0)
+  roles           String?
+  shirt           String?
+  telegram        String?        @default(0)
   year            String?
-  isAdmin         Boolean?     @default(false)
-  wallet          String?
-  department      String       @default("")
+  date_of_birth   DateTime?
+
+  isAdmin         Boolean?        @default(false)
+  announcements   Announcements[]
+  events          Event[]         @relation("EventToUser")
+  projects        Projects[]      @relation("ProjectsToUser")
+  Attendance      Attendance[]    @relation("attendanceToUser")
   AttendanceTaken Attendance[]
-  events          Event[]      @relation("EventToUser")
-  projects        Projects[]   @relation("ProjectsToUser")
-  Attendance      Attendance[] @relation("attendanceToUser")
 }
 
 model Event {

From fc02a798ac80e5b0270f2b8938def441fe905309 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 31 May 2023 23:04:53 +0800
Subject: [PATCH 076/223] Remove prisma completely

---
 package.json                                |  4 -
 prisma/schema.prisma                        | 89 ---------------------
 src/components/profile/ProfileInfo.tsx      |  1 -
 src/components/users/UserTable.tsx          |  2 +-
 src/server/db/client.ts                     | 19 -----
 src/server/trpc/context.ts                  |  2 -
 src/server/trpc/router/member/helper.ts     | 41 +---------
 src/server/trpc/router/users/getAllUsers.ts | 15 ++++
 src/server/trpc/router/users/index.ts       | 24 +-----
 yarn.lock                                   | 29 -------
 10 files changed, 18 insertions(+), 208 deletions(-)
 delete mode 100644 prisma/schema.prisma
 delete mode 100644 src/server/db/client.ts
 create mode 100644 src/server/trpc/router/users/getAllUsers.ts

diff --git a/package.json b/package.json
index 8a8f76c5..aa20c2cc 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,6 @@
   "scripts": {
     "build": "next build",
     "dev": "next dev",
-    "postinstall": "prisma generate",
     "lint": "next lint",
     "start": "next start",
     "analyze": "cross-env ANALYZE=true next build",
@@ -21,8 +20,6 @@
     "@headlessui/react": "^1.7.14",
     "@heroicons/react": "v1",
     "@hookform/resolvers": "^2.9.10",
-    "@next-auth/prisma-adapter": "1.0.5",
-    "@prisma/client": "^4.14.0",
     "@tanstack/react-query": "^4.29.5",
     "@tanstack/react-table": "^8.9.1",
     "@trpc/client": "^10.26.0",
@@ -71,7 +68,6 @@
     "postcss": "^8.4.21",
     "prettier": "^2.8.2",
     "prettier-plugin-tailwindcss": "^0.2.3",
-    "prisma": "^4.14.0",
     "tailwindcss": "^3.2.4",
     "typescript": "^4.9.4"
   },
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
deleted file mode 100644
index 838f8c75..00000000
--- a/prisma/schema.prisma
+++ /dev/null
@@ -1,89 +0,0 @@
-generator client {
-  provider = "prisma-client-js"
-}
-
-datasource db {
-  provider = "postgresql"
-  url      = env("DATABASE_URL")
-}
-
-model Projects {
-  description  String
-  difficulty   Int
-  rating       Int
-  departments  String?
-  project_id   Int          @id
-  name         String
-  team_lead    String
-  created_date DateTime
-  Departments  Departments? @relation(fields: [departments], references: [department_id])
-  User         User[]       @relation("ProjectsToUser")
-}
-
-model Departments {
-  department_id String     @id
-  name          String
-  projects      Projects[]
-}
-
-model User {
-  attendance      Int?            @default(0)
-  batch           String?
-  department      String?
-  diet            String?
-  email           String          @unique
-  course          String?
-  gender          String?
-  hashedPassword  String
-  id              String          @id
-  image           String?
-  linkedin        String?
-  name            String?
-  phone           String?
-  personal_email  String?
-  roles           String?
-  shirt           String?
-  telegram        String?        @default(0)
-  year            String?
-  date_of_birth   DateTime?
-
-  isAdmin         Boolean?        @default(false)
-  announcements   Announcements[]
-  events          Event[]         @relation("EventToUser")
-  projects        Projects[]      @relation("ProjectsToUser")
-  Attendance      Attendance[]    @relation("attendanceToUser")
-  AttendanceTaken Attendance[]
-}
-
-model Event {
-  endDate    DateTime     @db.Date
-  hasStarted Boolean      @default(false)
-  name       String
-  id         String       @id @default(uuid())
-  qr_code    String?
-  startDate  DateTime     @default(now()) @db.Date
-  Attendance Attendance[]
-  attendees  User[]       @relation("EventToUser")
-}
-
-model Log {
-  date    DateTime? @default(now())
-  message String
-  id      String    @id @default(uuid())
-  title   String
-  type    LogType
-}
-
-model Attendance {
-  id      String @id
-  eventId String
-  userId  String
-  Event   Event  @relation(fields: [eventId], references: [id])
-  user    User   @relation(fields: [userId], references: [id])
-  User    User[] @relation("attendanceToUser")
-}
-
-enum LogType {
-  WARNING
-  ERROR
-}
diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index a9956c0c..13263710 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -1,5 +1,4 @@
 import { Box, Table, TableContainer, Tbody, Td, Tr } from '@chakra-ui/react'
-import type { Projects } from '@prisma/client'
 
 type ProfilePageType = {
   gender: string | null
diff --git a/src/components/users/UserTable.tsx b/src/components/users/UserTable.tsx
index 73537260..f885caa8 100644
--- a/src/components/users/UserTable.tsx
+++ b/src/components/users/UserTable.tsx
@@ -29,7 +29,7 @@ const UserTable = ({ session }: { session: Session }) => {
           colorScheme="black"
           onClick={(e) => {
             e.preventDefault()
-            setSelected(data.id)
+            setSelected(data.id as string)
             onOpen()
           }}
         >
diff --git a/src/server/db/client.ts b/src/server/db/client.ts
deleted file mode 100644
index d632301c..00000000
--- a/src/server/db/client.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { PrismaClient } from '@prisma/client'
-
-import { env } from '../../env/server.mjs'
-
-declare global {
-  // eslint-disable-next-line no-var
-  var prisma: PrismaClient | undefined
-}
-
-export const prisma =
-  global.prisma ||
-  new PrismaClient({
-    log:
-      env.NODE_ENV === 'development' ? ['query', 'error', 'warn'] : ['error'],
-  })
-
-if (env.NODE_ENV !== 'production') {
-  global.prisma = prisma
-}
diff --git a/src/server/trpc/context.ts b/src/server/trpc/context.ts
index 76223529..ab99fae1 100644
--- a/src/server/trpc/context.ts
+++ b/src/server/trpc/context.ts
@@ -3,7 +3,6 @@ import { type CreateNextContextOptions } from '@trpc/server/adapters/next'
 import { type Session } from 'next-auth'
 
 import { getServerAuthSession } from '../common/get-server-auth-session'
-import { prisma } from '../db/client'
 
 type CreateContextOptions = {
   session: Session | null
@@ -17,7 +16,6 @@ type CreateContextOptions = {
 export const createContextInner = async (opts: CreateContextOptions) => {
   return {
     session: opts.session,
-    prisma,
   }
 }
 
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index 730a4710..e30194c9 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -1,30 +1,9 @@
 import { TRPCError } from '@trpc/server'
 import nodemailer from 'nodemailer'
 import { env } from '~/env/server.mjs'
-import type { User } from '@prisma/client'
-import { type PrismaClient } from '@prisma/client'
 import dayjs from 'dayjs'
 import userCollection from '~/server/db/collections/UserCollection'
 
-/**
- * Validates whether the user has the necessary permissions
- *
- * @param id The student id of the user
- * @throws {TRPCError} if the user does not have permission
- */
-async function checkUserPermission(id: string, prisma: PrismaClient) {
-  const personMakingRequest = await prisma.user.findUnique({
-    where: { id },
-  })
-
-  if (!personMakingRequest || !personMakingRequest.isAdmin) {
-    throw new TRPCError({
-      code: 'UNAUTHORIZED',
-      message: 'User is not authorized to create a new account',
-    })
-  }
-}
-
 /**
  * Validates whether the user already exists in the database
  *
@@ -148,22 +127,4 @@ async function sendMultipleEmails(emails: string[], password: string) {
   )
 }
 
-/**
- * Creates many users in the database
- *
- * @param users The array of users object
- */
-async function createManyUsers(users: User[], prisma: PrismaClient) {
-  await prisma.user.createMany({
-    data: users,
-  })
-}
-
-export {
-  createManyUsers,
-  checkUserPermission,
-  checkIfUserExist,
-  sendEmail,
-  sendMultipleEmails,
-  buildUserObject,
-}
+export { checkIfUserExist, sendEmail, sendMultipleEmails, buildUserObject }
diff --git a/src/server/trpc/router/users/getAllUsers.ts b/src/server/trpc/router/users/getAllUsers.ts
new file mode 100644
index 00000000..43f7e8a6
--- /dev/null
+++ b/src/server/trpc/router/users/getAllUsers.ts
@@ -0,0 +1,15 @@
+import { protectedProcedure } from '../../trpc'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const getAllUsers = protectedProcedure.query(async () => {
+  const users = await userCollection.queries([])
+  return users.map((user) => {
+    return {
+      department: user.department,
+      email: user.email,
+      id: user.id,
+      name: user.name,
+      role: user.role,
+    }
+  })
+})
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index 508ff850..d96ba604 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -1,6 +1,4 @@
 import { router } from '~/server/trpc/trpc'
-import { protectedProcedure } from '~/server/trpc/trpc'
-import { TRPCError } from '@trpc/server'
 import { resetPassword } from './resetPassword'
 import { changePassword } from './changePassword'
 import { getAllUsersForTable } from './getAllUsersForTable'
@@ -12,27 +10,7 @@ import { createSingleUser } from './createSingleUser'
 import { deleteUserImage } from './deleteUserImage'
 import { updateUserProfile } from './updateUserProfile'
 import { updateUserContacts } from './updateUserContacts'
-
-const getAllUsers = protectedProcedure.query(async ({ ctx }) => {
-  try {
-    const users = await ctx.prisma.user.findMany({
-      select: {
-        department: true,
-        email: true,
-        id: true,
-        name: true,
-        role: true,
-      },
-    })
-
-    return users
-  } catch (e) {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: (e as Error).message,
-    })
-  }
-})
+import { getAllUsers } from './getAllUsers'
 
 export const userRouter = router({
   changePassword,
diff --git a/yarn.lock b/yarn.lock
index 558b4b9b..778c1a95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1756,11 +1756,6 @@
     hey-listen "^1.0.8"
     tslib "^2.3.1"
 
-"@next-auth/prisma-adapter@1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@next-auth/prisma-adapter/-/prisma-adapter-1.0.5.tgz#41a2fc7b44907054b81d456b426164e58becf4ed"
-  integrity sha512-VqMS11IxPXrPGXw6Oul6jcyS/n8GLOWzRMrPr3EMdtD6eOalM6zz05j08PcNiis8QzkfuYnCv49OvufTuaEwYQ==
-
 "@next/bundle-analyzer@^13.1.1":
   version "13.1.6"
   resolved "https://registry.npmjs.org/@next/bundle-analyzer/-/bundle-analyzer-13.1.6.tgz"
@@ -1893,23 +1888,6 @@
   resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz"
   integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==
 
-"@prisma/client@^4.14.0":
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.14.0.tgz#715b3dd045d094b03cb0a7f2991f088d15ae553e"
-  integrity sha512-MK/XaA2sFdfaOa7I9MjNKz6dxeIEdeZlnpNRoF2w3JuRLlFJLkpp6cD3yaqw2nUUhbrn3Iqe3ZpVV+VuGGil7Q==
-  dependencies:
-    "@prisma/engines-version" "4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c"
-
-"@prisma/engines-version@4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c":
-  version "4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c.tgz#0aeca447c4a5f23c83f68b8033e627b60bc01850"
-  integrity sha512-3jum8/YSudeSN0zGW5qkpz+wAN2V/NYCQ+BPjvHYDfWatLWlQkqy99toX0GysDeaUoBIJg1vaz2yKqiA3CFcQw==
-
-"@prisma/engines@4.14.0":
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.14.0.tgz#4bed9e6f3d01bb0e4598e76c1726f33579d6a2c3"
-  integrity sha512-PDNlhP/1vyTgmNyiucGqGCdXIp7HIkkvKO50si3y3PcceeHvqtiKPaH1iJdz63jCWMVMbj2MElSxXPOeBvEVIQ==
-
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
@@ -4496,13 +4474,6 @@ pretty-format@^3.8.0:
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-3.8.0.tgz#bfbed56d5e9a776645f4b1ff7aa1a3ac4fa3c385"
   integrity sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==
 
-prisma@^4.14.0:
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.14.0.tgz#1328308f6b2b4b0f5f1e4839b4d81e817377e179"
-  integrity sha512-+5dMl1uxMQb4RepndY6AwR9xi1cDcaGFICu+ws6/Nmgt93mFPNj8tYxSfTdmfg+rkNrUId9rk/Ac2vTgLe/oXA==
-  dependencies:
-    "@prisma/engines" "4.14.0"
-
 prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"

From 0ea7d05dc6084234a0a8f66248ec69af4525e7e0 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 31 May 2023 23:17:02 +0800
Subject: [PATCH 077/223] Remove database url from the env

---
 src/env/schema.mjs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/env/schema.mjs b/src/env/schema.mjs
index 952589b0..f513916e 100644
--- a/src/env/schema.mjs
+++ b/src/env/schema.mjs
@@ -6,7 +6,6 @@ import {z} from "zod";
  * This way you can ensure the app isn't built with invalid env vars.
  */
 export const serverSchema = z.object({
-  DATABASE_URL: z.string().url(),
   DOMAIN: z.string().url(),
   NODE_ENV: z.enum(["development", "test", "production"]),
   NEXTAUTH_SECRET:

From 2fc80b7b113f1866ab68a2dddb3745ba9eba29f6 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 31 May 2023 21:59:24 +0800
Subject: [PATCH 078/223] Update user model

---
 src/server/db/models/User.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index cbcccb79..41fec1ac 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -4,7 +4,18 @@ export type User = {
   hashedPassword: string
   isAdmin: boolean
   id?: string
-  image?: string
   name: string
   role: string
+
+  // Optional field: User can upload their image later.
+  image?: string
+
+  // Optional fields in create single user.
+  batch?: string
+  diet?: string
+  course?: string
+  linkedin?: string
+  phone?: string
+  telegram?: string
+  dob: string // Store in DD-MM format so that we can get their birthday easily.
 }

From 5b1e8973ad06ad3027f2ba80eed4e62357dab208 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Wed, 31 May 2023 23:26:27 +0800
Subject: [PATCH 079/223] add applicants fields

---
 .../db/collections/AppliedRoleCollection.ts     | 10 ++++++++++
 src/server/db/models/AppliedRole.ts             | 17 +++++++++++++++++
 src/server/db/models/User.ts                    |  6 ++++++
 3 files changed, 33 insertions(+)
 create mode 100644 src/server/db/collections/AppliedRoleCollection.ts
 create mode 100644 src/server/db/models/AppliedRole.ts

diff --git a/src/server/db/collections/AppliedRoleCollection.ts b/src/server/db/collections/AppliedRoleCollection.ts
new file mode 100644
index 00000000..350a59e5
--- /dev/null
+++ b/src/server/db/collections/AppliedRoleCollection.ts
@@ -0,0 +1,10 @@
+import { BaseCollection } from './BaseCollection'
+import type { AppliedRole } from '../models/AppliedRole'
+
+class AppliedRoleCollection extends BaseCollection<AppliedRole> {
+  protected override collectionName = 'appliedroles'
+  protected override objectName = 'appliedrole'
+}
+
+const userCollection = new AppliedRoleCollection()
+export default userCollection
diff --git a/src/server/db/models/AppliedRole.ts b/src/server/db/models/AppliedRole.ts
new file mode 100644
index 00000000..000b01fe
--- /dev/null
+++ b/src/server/db/models/AppliedRole.ts
@@ -0,0 +1,17 @@
+import type { User } from './User'
+
+export type AppliedRole = {
+  rank: number
+  department: string
+  role: string
+  status: ApplicationStatus
+  applicant: User
+}
+
+export enum ApplicationStatus {
+  ACCEPTED = 'Accepted',
+  OFFERED = 'Offered',
+  PENDINGREVIEW = 'Pending Review',
+  INTERVIEWED = 'Interviewed',
+  REJECTED = 'Rejected',
+}
diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index 41fec1ac..363995ca 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -1,3 +1,5 @@
+import type { AppliedRole } from './AppliedRole'
+
 export type User = {
   department: string
   email: string
@@ -18,4 +20,8 @@ export type User = {
   phone?: string
   telegram?: string
   dob: string // Store in DD-MM format so that we can get their birthday easily.
+
+  // Applicant fields
+  interviewNotes?: string
+  appliedRoles?: AppliedRole[]
 }

From 70c757d6364f81d8caf047539e0a096b8d3a6525 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Thu, 1 Jun 2023 00:36:49 +0800
Subject: [PATCH 080/223] Modify the AppliedRole model

---
 .../db/collections/AppliedRoleCollection.ts   |  8 +++----
 src/server/db/models/AppliedRole.ts           | 23 ++++++++-----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/server/db/collections/AppliedRoleCollection.ts b/src/server/db/collections/AppliedRoleCollection.ts
index 350a59e5..ed6ac94e 100644
--- a/src/server/db/collections/AppliedRoleCollection.ts
+++ b/src/server/db/collections/AppliedRoleCollection.ts
@@ -2,9 +2,9 @@ import { BaseCollection } from './BaseCollection'
 import type { AppliedRole } from '../models/AppliedRole'
 
 class AppliedRoleCollection extends BaseCollection<AppliedRole> {
-  protected override collectionName = 'appliedroles'
-  protected override objectName = 'appliedrole'
+  protected override collectionName = 'applied_roles'
+  protected override objectName = 'applied role'
 }
 
-const userCollection = new AppliedRoleCollection()
-export default userCollection
+const appliedRoleCollection = new AppliedRoleCollection()
+export default appliedRoleCollection
diff --git a/src/server/db/models/AppliedRole.ts b/src/server/db/models/AppliedRole.ts
index 000b01fe..80ffadcf 100644
--- a/src/server/db/models/AppliedRole.ts
+++ b/src/server/db/models/AppliedRole.ts
@@ -1,17 +1,14 @@
-import type { User } from './User'
-
-export type AppliedRole = {
-  rank: number
+type Roles = {
+  rank: 1 | 2 | 3
   department: string
   role: string
-  status: ApplicationStatus
-  applicant: User
-}
+  status: 'accepted' | 'offered' | 'pending' | 'interviewed' | 'rejected'
+  interviewNotes: string
+}[]
 
-export enum ApplicationStatus {
-  ACCEPTED = 'Accepted',
-  OFFERED = 'Offered',
-  PENDINGREVIEW = 'Pending Review',
-  INTERVIEWED = 'Interviewed',
-  REJECTED = 'Rejected',
+export type AppliedRole = {
+  email: string
+  id?: string
+  name: string
+  roles: Roles
 }

From 706d87a2d49fdd98c42c7d6243726f73bc6a2a69 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Thu, 1 Jun 2023 20:57:18 +0800
Subject: [PATCH 081/223] Update the Base Collection

---
 src/server/db/collections/BaseCollection.ts | 38 ++++++---------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index 9ae8df89..8ac6bd3d 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -7,26 +7,16 @@ import {
   query,
   getDocs,
   addDoc,
-  where,
   deleteDoc,
   updateDoc,
   type Transaction,
   type WithFieldValue,
   type DocumentData,
-  type WhereFilterOp,
-  type FieldPath,
-  orderBy,
-  limit,
   getCountFromServer,
+  type QueryConstraint,
+  type Query,
 } from 'firebase/firestore'
 
-type Queries<T> = {
-  fieldPath?: keyof T
-  direction?: WhereFilterOp
-  value?: T[keyof T] | number
-  type: 'where' | 'orderBy' | 'limit'
-}
-
 export abstract class BaseCollection<T> {
   protected abstract collectionName: string
   protected abstract objectName: string
@@ -67,22 +57,14 @@ export abstract class BaseCollection<T> {
     return { ...result.data(), id: result.id as string } as T
   }
 
-  async queries(queries: Queries<T>[]) {
-    const items = queries.map((q) => {
-      switch (q.type) {
-        case 'where':
-          return where(
-            q.fieldPath as string | FieldPath,
-            q.direction as WhereFilterOp,
-            q.value
-          )
-        case 'orderBy':
-          return orderBy(q.fieldPath as string | FieldPath)
-        case 'limit':
-          return limit(q.value as number)
-      }
-    })
-    const q = query(collection(db, this.collectionName), ...items)
+  async queries(queries?: QueryConstraint[]) {
+    let q: Query<DocumentData>
+    if (queries) {
+      q = query(collection(db, this.collectionName), ...queries)
+    } else {
+      q = query(collection(db, this.collectionName))
+    }
+
     const snapshots = await getDocs(q)
     return snapshots.docs.map((doc) => {
       return { ...doc.data(), id: doc.id as string } as T

From 51e92e1ada55c12513510fdc3ad61c1b9c9f9ad9 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Thu, 1 Jun 2023 21:04:57 +0800
Subject: [PATCH 082/223] Update the queries

---
 src/pages/api/auth/[...nextauth].ts           |  8 +---
 src/server/db/models/User.ts                  |  2 +-
 .../router/attendance/getAllUsersButSelf.ts   | 46 +++++++++----------
 src/server/trpc/router/users/resetPassword.ts |  9 +---
 4 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 93716178..2b9d8c9a 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -6,6 +6,7 @@ import { env } from '../../../env/server.mjs'
 import type { User } from '~/server/db/models/User'
 
 import userCollection from '~/server/db/collections/UserCollection'
+import { where } from 'firebase/firestore'
 
 export const authOptions: NextAuthOptions = {
   callbacks: {
@@ -50,12 +51,7 @@ export const authOptions: NextAuthOptions = {
 
           // Step 3: Get the user by the email
           const users = await userCollection.queries([
-            {
-              type: "where",
-              fieldPath: 'email',
-              direction: '==',
-              value: email,
-            },
+            where('email', '==', email),
           ])
 
           if (users.length === 0) {
diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index 363995ca..48e0d2c4 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -19,7 +19,7 @@ export type User = {
   linkedin?: string
   phone?: string
   telegram?: string
-  dob: string // Store in DD-MM format so that we can get their birthday easily.
+  dob?: string // Store in DD-MM format so that we can get their birthday easily.
 
   // Applicant fields
   interviewNotes?: string
diff --git a/src/server/trpc/router/attendance/getAllUsersButSelf.ts b/src/server/trpc/router/attendance/getAllUsersButSelf.ts
index a63b9d0f..a52da3c4 100644
--- a/src/server/trpc/router/attendance/getAllUsersButSelf.ts
+++ b/src/server/trpc/router/attendance/getAllUsersButSelf.ts
@@ -1,30 +1,28 @@
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { TRPCError } from '@trpc/server'
 import userCollection from '~/server/db/collections/UserCollection'
+import { where } from 'firebase/firestore'
 
-export const getAllAttendanceButSelf = protectedProcedure.query(async ({ ctx }) => {
-  try {
-    const users = await userCollection.queries([
-      {
-        type: "where",
-        fieldPath: 'id',
-        direction: '!=',
-        value: ctx.session.user.id,
-      },
-    ])
+export const getAllAttendanceButSelf = protectedProcedure.query(
+  async ({ ctx }) => {
+    try {
+      const users = await userCollection.queries([
+        where('id', '!=', ctx.session.user.id),
+      ])
 
-    return users.map((user) => {
-      return {
-        department: user.department,
-        id: user.id as string,
-        name: user.name,
-        role: user.role,
-      }
-    })
-  } catch (e) {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: (e as Error).message,
-    })
+      return users.map((user) => {
+        return {
+          department: user.department,
+          id: user.id as string,
+          name: user.name,
+          role: user.role,
+        }
+      })
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
   }
-})
+)
diff --git a/src/server/trpc/router/users/resetPassword.ts b/src/server/trpc/router/users/resetPassword.ts
index ff946d55..5ea27df8 100644
--- a/src/server/trpc/router/users/resetPassword.ts
+++ b/src/server/trpc/router/users/resetPassword.ts
@@ -4,19 +4,14 @@ import { env } from '~/env/server.mjs'
 import { transporter } from '../util/transporter'
 import userCollection from '~/server/db/collections/UserCollection'
 import logCollection from '~/server/db/collections/LogCollection'
-import { Timestamp } from 'firebase/firestore'
+import { Timestamp, where } from 'firebase/firestore'
 
 export const resetPassword = publicProcedure
   .input(z.string())
   .mutation(async ({ input: email }) => {
     try {
       const foundUser = await userCollection.queries([
-        {
-          type: 'where',
-          fieldPath: 'email',
-          direction: '==',
-          value: email,
-        },
+        where('email', '==', email),
       ])
 
       // Do not tell the user if the account cannot be found for security reasons

From 24bc24276ef5879ace908ce84d0984af45be1e92 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Thu, 1 Jun 2023 21:08:31 +0800
Subject: [PATCH 083/223] Make the interviewNotes optional

---
 src/server/db/models/AppliedRole.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/server/db/models/AppliedRole.ts

diff --git a/src/server/db/models/AppliedRole.ts b/src/server/db/models/AppliedRole.ts
new file mode 100644
index 00000000..e51b27b1
--- /dev/null
+++ b/src/server/db/models/AppliedRole.ts
@@ -0,0 +1,14 @@
+type Roles = {
+  rank: 1 | 2 | 3
+  department: string
+  role: string
+  status: 'accepted' | 'offered' | 'pending' | 'interviewed' | 'rejected'
+  interviewNotes?: string
+}[]
+
+export type AppliedRole = {
+  email: string
+  id?: string
+  name: string
+  roles: Roles
+}

From bf03567696ed827527e9de6d1e2b583ae7a5859e Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Fri, 2 Jun 2023 22:59:53 +0800
Subject: [PATCH 084/223] migration to firestore not including model

---
 firebase.ts                                   | 16 ----
 src/components/recruitment/ApplicantCard.tsx  | 34 +++------
 .../recruitment/AppliedRoleListItem.tsx       | 22 +++++-
 src/components/recruitment/DocumentModal.tsx  | 21 +-----
 .../recruitment/DocumentModalAdd.tsx          |  9 ++-
 src/components/recruitment/NoteModal.tsx      | 14 +---
 src/components/recruitment/StatusPopup.tsx    | 15 ++--
 src/pages/recruitment/index.tsx               |  5 +-
 src/server/trpc/router/recruitment/create.ts  | 69 ------------------
 src/server/trpc/router/recruitment/index.ts   |  2 -
 src/server/trpc/router/recruitment/read.ts    | 73 ++++++++++---------
 src/server/trpc/router/recruitment/update.ts  | 31 +++-----
 src/utils/storage.ts                          | 19 +++++
 13 files changed, 116 insertions(+), 214 deletions(-)
 delete mode 100644 firebase.ts
 delete mode 100644 src/server/trpc/router/recruitment/create.ts

diff --git a/firebase.ts b/firebase.ts
deleted file mode 100644
index 23eab88e..00000000
--- a/firebase.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Import the functions you need from the SDKs you need
-import { initializeApp } from 'firebase/app'
-import { getStorage } from 'firebase/storage'
-
-const firebaseConfig = {
-  apiKey: 'AIzaSyAOUlACTtNKliBsPnGsWnCu0I_76eXDQ-U',
-  authDomain: 'fintech-society.firebaseapp.com',
-  projectId: 'fintech-society',
-  storageBucket: 'fintech-society.appspot.com',
-  messagingSenderId: '181597094279',
-  appId: '1:181597094279:web:f5dd7ebab8e9750337d322',
-}
-
-// Initialize Firebase
-const app = initializeApp(firebaseConfig)
-export const storage = getStorage(app)
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index 01a902a7..e40f2253 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -11,16 +11,9 @@ import {
 import { Avatar } from 'flowbite-react'
 import AppliedRoleListItem from './AppliedRoleListItem'
 import DocumentModal from './DocumentModal'
-import NoteModal from './NoteModal'
-import { trpc } from '~/utils/trpc'
-import type { ApplicantWithAppliedRole } from '~/types/model'
+import type { Applicant } from '~/server/db/models/Applicant'
 
-const ApplicantCard = ({
-  applicant,
-}: {
-  applicant: ApplicantWithAppliedRole
-}) => {
-  const { refetch } = trpc.recruitment.getApplicant.useQuery(applicant.id)
+const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
   return (
     <Card
       maxWidth="sm"
@@ -50,22 +43,19 @@ const ApplicantCard = ({
                 applicantId={applicant.id}
                 applicantName={applicant.name}
               />
-              <NoteModal
-                applicantId={applicant.id}
-                interviewNotes={applicant.interviewNotes}
-                refetch={refetch}
-              />
             </Box>
           </Box>
           <UnorderedList styleType="none">
-            {applicant.appliedRoles.map((appliedRole) => {
-              return (
-                <AppliedRoleListItem
-                  appliedRole={appliedRole}
-                  key={appliedRole.id}
-                />
-              )
-            })}
+            {applicant.appliedRoles
+              .sort((a, b) => a.rank - b.rank)
+              .map((appliedRole) => {
+                return (
+                  <AppliedRoleListItem
+                    appliedRole={appliedRole}
+                    key={appliedRole.id}
+                  />
+                )
+              })}
           </UnorderedList>
         </Stack>
       </CardBody>
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index 3787e565..eb510f1d 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -1,14 +1,28 @@
-import { ListItem, Text } from '@chakra-ui/react'
-import type { AppliedRole } from '@prisma/client'
+import { Box, ListItem, Text } from '@chakra-ui/react'
+import type { AppliedRole } from '~/server/db/models/AppliedRole'
+import { trpc } from '~/utils/trpc'
+import NoteModal from './NoteModal'
 import StatusPopup from './StatusPopup'
 
 const AppliedRoleListItem = ({ appliedRole }: { appliedRole: AppliedRole }) => {
+  const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRole.id)
   return (
     <ListItem className="flex items-center justify-between">
       <Text>
-        {appliedRole.rank}. {appliedRole.departmentId} - {appliedRole.role}
+        {appliedRole.rank}. {appliedRole.department} - {appliedRole.role}
       </Text>
-      <StatusPopup status={appliedRole.status} appliedRoleId={appliedRole.id} />
+      <Box>
+        <StatusPopup
+          status={appliedRole.status}
+          appliedRoleId={appliedRole.id}
+          refetch={refetch}
+        />
+        <NoteModal
+          appliedRoleId={appliedRole.id}
+          interviewNotes={appliedRole.interviewNotes}
+          refetch={refetch}
+        />
+      </Box>
     </ListItem>
   )
 }
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
index a6b44f41..75c573dd 100644
--- a/src/components/recruitment/DocumentModal.tsx
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -11,7 +11,7 @@ import {
 import { getDownloadURL, listAll, ref } from 'firebase/storage'
 import { useEffect, useState } from 'react'
 import { BsFolder2Open } from 'react-icons/bs'
-import { storage } from '~/../firebase'
+import { StorageService } from '~/utils/storage'
 import DocumentModalAdd from './DocumentModalAdd'
 import DocumentModalCard from './DocumentModalCard'
 
@@ -24,23 +24,10 @@ const DocumentModal = ({
 }) => {
   const { isOpen, onOpen, onClose } = useDisclosure()
   const [fileList, setFileList] = useState<string[]>([])
-  const applicantListRef = ref(storage, `${applicantId}/`)
+  const docsFilePath = `${applicantId}/documents/`
 
   // Hook to get the files associated with the applicant
   useEffect(() => {
-    listAll(applicantListRef)
-      .then((res) => {
-        const urlList: string[] = []
-        res.items.forEach((item) => {
-          getDownloadURL(item).then((url) => {
-            urlList.push(url)
-          })
-        })
-        setFileList(urlList)
-      })
-      .catch((err) => {
-        console.log(err)
-      })
     console.log('fileList: ', fileList)
   }, [])
 
@@ -68,10 +55,10 @@ const DocumentModal = ({
           <ModalCloseButton />
           <ModalBody>
             <div className="my-5 mx-10 grid grid-cols-1 place-items-center gap-y-10 lg:grid-cols-2 ">
-              {fileList.map((file) => {
+              {/* {fileList.map((file) => {
                 console.log('file: ', file)
                 return <DocumentModalCard file={file} key={file} />
-              })}
+              })} */}
             </div>
             <DocumentModalAdd applicantId={applicantId} />
           </ModalBody>
diff --git a/src/components/recruitment/DocumentModalAdd.tsx b/src/components/recruitment/DocumentModalAdd.tsx
index 54c51d1a..3450c0ab 100644
--- a/src/components/recruitment/DocumentModalAdd.tsx
+++ b/src/components/recruitment/DocumentModalAdd.tsx
@@ -1,7 +1,7 @@
 import { AddIcon } from '@chakra-ui/icons'
 import { Box, IconButton, Input, useToast } from '@chakra-ui/react'
-import { useEffect, useState } from 'react'
-import { storage } from '../../../firebase'
+import { useState } from 'react'
+import { StorageService } from '~/utils/storage'
 import { ref, uploadBytes } from 'firebase/storage'
 import { uuidv4 } from '@firebase/util'
 import { Message } from '~/constant/messages'
@@ -12,8 +12,9 @@ const DocumentModalAdd = ({ applicantId }: { applicantId: string }) => {
 
   const uploadFile = () => {
     if (file == null) return
-    const fileRef = ref(storage, `${applicantId}/${file.name + uuidv4()}`)
-    uploadBytes(fileRef, file)
+    const filePath = `${applicantId}/documents/${file.name + uuidv4()}`
+
+    StorageService.uploadFile(file, filePath)
       .then(() => {
         toast({
           duration: 2000,
diff --git a/src/components/recruitment/NoteModal.tsx b/src/components/recruitment/NoteModal.tsx
index 20d4c85a..5f56b0e6 100644
--- a/src/components/recruitment/NoteModal.tsx
+++ b/src/components/recruitment/NoteModal.tsx
@@ -19,12 +19,12 @@ import { Message } from '~/constant/messages'
 import type { QueryObserverResult } from '@tanstack/react-query'
 
 const NoteModal = ({
-  applicantId,
+  appliedRoleId,
   interviewNotes,
   refetch,
 }: {
-  applicantId: string
-  interviewNotes: string | null
+  appliedRoleId: string
+  interviewNotes: string | undefined
   refetch: () => Promise<QueryObserverResult>
 }) => {
   const toast = useToast()
@@ -36,12 +36,6 @@ const NoteModal = ({
   )
   const { isOpen, onOpen, onClose } = useDisclosure()
 
-  //TODO: checking inputs
-  useEffect(() => {
-    console.log('notes:', notes)
-    console.log('temp notes:', tempNotes)
-  })
-  //TODO: checking inputs
   useEffect(() => {
     if (interviewNotes) {
       setNotes(interviewNotes)
@@ -57,7 +51,7 @@ const NoteModal = ({
   const updateNotes = async () => {
     await mutateAsync({
       interviewNotes: tempNotes,
-      applicantId: applicantId,
+      appliedRoleId: appliedRoleId,
     })
 
     toast({
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index c9941fa7..2fe084be 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -10,7 +10,7 @@ import {
   UnorderedList,
   useToast,
 } from '@chakra-ui/react'
-import { ApplicationStatus } from '@prisma/client'
+import { ApplicationStatus } from '~/constant/applicationStatus'
 import type { QueryObserverResult } from '@tanstack/react-query'
 import { BsCircleFill } from 'react-icons/bs'
 import { trpc } from '~/utils/trpc'
@@ -18,7 +18,7 @@ import { trpc } from '~/utils/trpc'
 const statusFillMap = {
   [ApplicationStatus.ACCEPTED]: '#46FFDE',
   [ApplicationStatus.OFFERED]: '#0038FF',
-  [ApplicationStatus.PENDINGREVIEW]: '#FFBD3C',
+  [ApplicationStatus.PENDING]: '#FFBD3C',
   [ApplicationStatus.INTERVIEWED]: '#CE44FF',
   [ApplicationStatus.REJECTED]: '#FF0000',
 }
@@ -26,14 +26,14 @@ const statusFillMap = {
 const StatusPopup = ({
   status,
   appliedRoleId,
+  refetch,
 }: {
   appliedRoleId: string
   status: ApplicationStatus
+  refetch: () => Promise<QueryObserverResult>
 }) => {
   const toast = useToast()
-  const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRoleId)
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
-
   const updateStatus = async (status: ApplicationStatus) => {
     try {
       await mutateAsync({
@@ -65,7 +65,6 @@ const StatusPopup = ({
           icon={<BsCircleFill fill={statusFillMap[status]} />}
           bg="None"
           _hover={{ background: 'None' }}
-          marginLeft="2"
         ></IconButton>
       </PopoverTrigger>
       <PopoverContent>
@@ -106,9 +105,7 @@ const StatusPopup = ({
                 _hover={{ background: 'None' }}
                 marginLeft="2"
                 onClick={() =>
-                  updateStatus(
-                    ApplicationStatus.PENDINGREVIEW as ApplicationStatus
-                  )
+                  updateStatus(ApplicationStatus.PENDING as ApplicationStatus)
                 }
               />
               <Text>Pending Review</Text>
@@ -116,7 +113,7 @@ const StatusPopup = ({
             <ListItem className="flex items-center">
               <IconButton
                 aria-label="interviewed status"
-                icon={<BsCircleFill fill="#FF0099" />}
+                icon={<BsCircleFill fill="#CE44FF" />}
                 bg="None"
                 _hover={{ background: 'None' }}
                 marginLeft="2"
diff --git a/src/pages/recruitment/index.tsx b/src/pages/recruitment/index.tsx
index 5567a9cc..0d0ebb83 100644
--- a/src/pages/recruitment/index.tsx
+++ b/src/pages/recruitment/index.tsx
@@ -1,4 +1,3 @@
-import Layout from '~/components/common/Layout'
 import Head from 'next/head'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
@@ -13,9 +12,7 @@ const RecruitmentPage: React.FC<BaseProps> = ({ session }) => {
         <meta name="description" content="The recruitment page for Atlas" />
       </Head>
       <TopNavbar isAdmin={session.isAdmin} />
-      <Layout>
-        <Text className="text-center text-4xl font-bold">Recruitment</Text>
-      </Layout>
+      <Text className="text-center text-4xl font-bold">Recruitment</Text>
     </>
   )
 }
diff --git a/src/server/trpc/router/recruitment/create.ts b/src/server/trpc/router/recruitment/create.ts
deleted file mode 100644
index 4c4ae03f..00000000
--- a/src/server/trpc/router/recruitment/create.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { ApplicationStatus, LogType } from '@prisma/client'
-import { hash } from 'bcryptjs'
-import { randomUUID } from 'crypto'
-import { z } from 'zod'
-import { protectedProcedure } from '~/server/trpc/trpc'
-import { ErrorTitle } from '../constants/ErrorTitle'
-
-export const createSingleApplicant = protectedProcedure
-  .input(
-    z.object({
-      id: z.string(),
-      email: z.string(),
-      password: z.string(),
-      name: z.string(),
-      firstRole: z.string(),
-      firstDepartmentId: z.string(),
-      secondRole: z.string(),
-      secondDepartmentId: z.string(),
-      thirdRole: z.string(),
-      thirdDepartmentId: z.string(),
-    })
-  )
-  .mutation(async ({ ctx, input }) => {
-    const hashedPassword = await hash(input.password, 10)
-    try {
-      await ctx.prisma.user.create({
-        data: {
-          id: input.id,
-          email: input.email,
-          hashedPassword,
-          name: input.name,
-          role: 'Applicant',
-          appliedRoles: {
-            create: [
-              {
-                id: input.id,
-                rank: 1,
-                departmentId: input.firstDepartmentId,
-                role: input.firstRole,
-                status: ApplicationStatus.PENDINGREVIEW,
-              },
-              {
-                id: input.id,
-                rank: 2,
-                departmentId: input.secondDepartmentId,
-                role: input.secondRole,
-                status: ApplicationStatus.PENDINGREVIEW,
-              },
-              {
-                id: input.id,
-                rank: 3,
-                departmentId: input.thirdDepartmentId,
-                role: input.thirdRole,
-                status: ApplicationStatus.PENDINGREVIEW,
-              },
-            ],
-          },
-        },
-      })
-    } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          message: (e as Error).message,
-          title: ErrorTitle.ERROR_CREATING_SINGLE_APPLICANT,
-          type: LogType.ERROR,
-        },
-      })
-    }
-  })
diff --git a/src/server/trpc/router/recruitment/index.ts b/src/server/trpc/router/recruitment/index.ts
index 6f2014bb..47fcb129 100644
--- a/src/server/trpc/router/recruitment/index.ts
+++ b/src/server/trpc/router/recruitment/index.ts
@@ -1,7 +1,6 @@
 import { router } from '~/server/trpc/trpc'
 import { updateAppliedRoleStatus, updateInterviewNotes } from './update'
 import { getAllApplicants, getApplicant, getAppliedRole } from './read'
-import { createSingleApplicant } from './create'
 
 export const recruitmentRouter = router({
   updateAppliedRoleStatus,
@@ -9,5 +8,4 @@ export const recruitmentRouter = router({
   getAllApplicants,
   getApplicant,
   getAppliedRole,
-  createSingleApplicant,
 })
diff --git a/src/server/trpc/router/recruitment/read.ts b/src/server/trpc/router/recruitment/read.ts
index 54a1a6f6..2030fed3 100644
--- a/src/server/trpc/router/recruitment/read.ts
+++ b/src/server/trpc/router/recruitment/read.ts
@@ -1,20 +1,32 @@
 import { TRPCError } from '@trpc/server'
+import { where } from 'firebase/firestore'
 import { z } from 'zod'
+import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
+import userCollection from '~/server/db/collections/UserCollection'
+import type { Applicant } from '~/server/db/models/Applicant'
 import { protectedProcedure } from '~/server/trpc/trpc'
 
-export const getAllApplicants = protectedProcedure.query(async ({ ctx }) => {
+export const getAllApplicants = protectedProcedure.query(async ({}) => {
   try {
-    return await ctx.prisma.user.findMany({
-      where: {
-        role: 'Applicant',
-      },
-      select: {
-        id: true,
-        name: true,
-        interviewNotes: true,
-        appliedRoles: true,
-      },
-    })
+    const applicants = await userCollection.queries([
+      where('role', '==', 'Applicant'),
+    ])
+    const applicantsWithRoles: Applicant[] = []
+
+    for (let i = 0; i < applicants.length; i++) {
+      const applicant = applicants[i]
+      if (applicant) {
+        const appliedRoles = await appliedRoleCollection.queries([
+          where('applicantId', '==', applicant.id),
+        ])
+        applicantsWithRoles.push({
+          id: applicant?.id,
+          name: applicant?.name,
+          appliedRoles: appliedRoles,
+        })
+      }
+    }
+    return applicantsWithRoles
   } catch (error) {
     throw new TRPCError({
       code: 'INTERNAL_SERVER_ERROR',
@@ -25,18 +37,17 @@ export const getAllApplicants = protectedProcedure.query(async ({ ctx }) => {
 
 export const getApplicant = protectedProcedure
   .input(z.string())
-  .query(async ({ ctx, input }) => {
+  .query(async ({ input }) => {
     try {
-      return await ctx.prisma.user.findUnique({
-        where: {
-          id: input,
-        },
-        select: {
-          name: true,
-          interviewNotes: true,
-          appliedRoles: true,
-        },
-      })
+      const applicant = await userCollection.getById(input)
+      const appliedRoles = await appliedRoleCollection.queries([
+        where('applicantId', '==', applicant.id),
+      ])
+      return {
+        id: applicant.id,
+        name: applicant.name,
+        appliedRoles: appliedRoles,
+      }
     } catch (error) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
@@ -47,23 +58,13 @@ export const getApplicant = protectedProcedure
 
 export const getAppliedRole = protectedProcedure
   .input(z.string())
-  .query(async ({ ctx, input }) => {
+  .query(async ({ input }) => {
     try {
-      return await ctx.prisma.appliedRole.findUnique({
-        where: {
-          id: input,
-        },
-        select: {
-          rank: true,
-          departmentId: true,
-          role: true,
-          status: true,
-        },
-      })
+      return await appliedRoleCollection.getById(input)
     } catch (error) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
-        message: 'Error retrieving applicants: ' + error,
+        message: 'Error retrieving applied role: ' + error,
       })
     }
   })
diff --git a/src/server/trpc/router/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
index 38111cef..9c9fc3d6 100644
--- a/src/server/trpc/router/recruitment/update.ts
+++ b/src/server/trpc/router/recruitment/update.ts
@@ -1,26 +1,21 @@
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
-import type { ApplicationStatus } from '@prisma/client'
+import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
+import { ApplicationStatus } from '~/constant/applicationStatus'
 
 export const updateAppliedRoleStatus = protectedProcedure
   .input(
     z.object({
       appliedRoleId: z.string(),
-      status: z.string(),
+      status: z.nativeEnum(ApplicationStatus),
     })
   )
-  .mutation(async ({ ctx, input }) => {
+  .mutation(async ({ input }) => {
     try {
-      const role = await ctx.prisma.appliedRole.update({
-        where: {
-          id: input.appliedRoleId,
-        },
-        data: {
-          status: input.status as ApplicationStatus,
-        },
+      return await appliedRoleCollection.update(input.appliedRoleId, {
+        status: input.status,
       })
-      return role
     } catch (e) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
@@ -32,21 +27,15 @@ export const updateAppliedRoleStatus = protectedProcedure
 export const updateInterviewNotes = protectedProcedure
   .input(
     z.object({
-      applicantId: z.string(),
+      appliedRoleId: z.string(),
       interviewNotes: z.string(),
     })
   )
-  .mutation(async ({ ctx, input }) => {
+  .mutation(async ({ input }) => {
     try {
-      const applicant = await ctx.prisma.user.update({
-        where: {
-          id: input.applicantId,
-        },
-        data: {
-          interviewNotes: input.interviewNotes,
-        },
+      return await appliedRoleCollection.update(input.appliedRoleId, {
+        interviewNotes: input.interviewNotes,
       })
-      return applicant
     } catch (e) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
index c3cd830b..dce9bf19 100644
--- a/src/utils/storage.ts
+++ b/src/utils/storage.ts
@@ -5,6 +5,7 @@ import {
   uploadBytes,
   getDownloadURL,
   deleteObject,
+  listAll,
 } from 'firebase/storage'
 import { env } from '~/env/client.mjs'
 
@@ -31,4 +32,22 @@ export class StorageService {
     const storageRef = ref(this.storage, pathName)
     await deleteObject(storageRef)
   }
+
+  // returns a list of URL associated with the path
+  static async getFiles(pathName: string) {
+    const storageRef = ref(this.storage, pathName)
+    const urlList: string[] = []
+    listAll(storageRef)
+      .then((res) => {
+        res.items.forEach((item) => {
+          getDownloadURL(item).then((url) => {
+            urlList.push(url)
+          })
+        })
+      })
+      .catch((err) => {
+        console.log('Error while retrieving file from firestore: ', err)
+      })
+    return urlList
+  }
 }

From d4e1c852ba47facafa17b611c622564b87378a3c Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Fri, 2 Jun 2023 23:01:29 +0800
Subject: [PATCH 085/223] applicant related models

---
 src/constant/applicationStatus.ts   |  7 +++++++
 src/server/db/models/Applicant.ts   |  8 ++++++++
 src/server/db/models/AppliedRole.ts | 17 +++++++----------
 src/server/db/models/User.ts        |  8 +-------
 4 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 src/constant/applicationStatus.ts
 create mode 100644 src/server/db/models/Applicant.ts

diff --git a/src/constant/applicationStatus.ts b/src/constant/applicationStatus.ts
new file mode 100644
index 00000000..9bcf0cc7
--- /dev/null
+++ b/src/constant/applicationStatus.ts
@@ -0,0 +1,7 @@
+export enum ApplicationStatus {
+  ACCEPTED = 'accepted',
+  OFFERED = 'offered',
+  PENDING = 'pending',
+  INTERVIEWED = 'interviewed',
+  REJECTED = 'rejected',
+}
diff --git a/src/server/db/models/Applicant.ts b/src/server/db/models/Applicant.ts
new file mode 100644
index 00000000..5ad009ad
--- /dev/null
+++ b/src/server/db/models/Applicant.ts
@@ -0,0 +1,8 @@
+import type { AppliedRole } from './AppliedRole'
+
+// Not in firestore collection, piggybacks off User model
+export type Applicant = {
+  id: string
+  name: string
+  appliedRoles: AppliedRole[]
+}
diff --git a/src/server/db/models/AppliedRole.ts b/src/server/db/models/AppliedRole.ts
index 80ffadcf..9abc9567 100644
--- a/src/server/db/models/AppliedRole.ts
+++ b/src/server/db/models/AppliedRole.ts
@@ -1,14 +1,11 @@
-type Roles = {
+import type { ApplicationStatus } from '~/constant/applicationStatus'
+
+export type AppliedRole = {
+  applicantId: string
+  id: string
   rank: 1 | 2 | 3
   department: string
+  interviewNotes?: string
   role: string
-  status: 'accepted' | 'offered' | 'pending' | 'interviewed' | 'rejected'
-  interviewNotes: string
-}[]
-
-export type AppliedRole = {
-  email: string
-  id?: string
-  name: string
-  roles: Roles
+  status: ApplicationStatus
 }
diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index 48e0d2c4..0be6cea3 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -1,11 +1,9 @@
-import type { AppliedRole } from './AppliedRole'
-
 export type User = {
   department: string
   email: string
   hashedPassword: string
   isAdmin: boolean
-  id?: string
+  id: string
   name: string
   role: string
 
@@ -20,8 +18,4 @@ export type User = {
   phone?: string
   telegram?: string
   dob?: string // Store in DD-MM format so that we can get their birthday easily.
-
-  // Applicant fields
-  interviewNotes?: string
-  appliedRoles?: AppliedRole[]
 }

From 146ffdf0bde1d9a572662b2e3d7de951bbd6a6b7 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Fri, 2 Jun 2023 23:59:39 +0800
Subject: [PATCH 086/223] shift applicationStatus to same file as model

---
 src/constant/applicationStatus.ts   |  7 -------
 src/server/db/models/AppliedRole.ts | 10 ++++++++--
 2 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 src/constant/applicationStatus.ts

diff --git a/src/constant/applicationStatus.ts b/src/constant/applicationStatus.ts
deleted file mode 100644
index 9bcf0cc7..00000000
--- a/src/constant/applicationStatus.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export enum ApplicationStatus {
-  ACCEPTED = 'accepted',
-  OFFERED = 'offered',
-  PENDING = 'pending',
-  INTERVIEWED = 'interviewed',
-  REJECTED = 'rejected',
-}
diff --git a/src/server/db/models/AppliedRole.ts b/src/server/db/models/AppliedRole.ts
index 9abc9567..c61b0dcf 100644
--- a/src/server/db/models/AppliedRole.ts
+++ b/src/server/db/models/AppliedRole.ts
@@ -1,5 +1,3 @@
-import type { ApplicationStatus } from '~/constant/applicationStatus'
-
 export type AppliedRole = {
   applicantId: string
   id: string
@@ -9,3 +7,11 @@ export type AppliedRole = {
   role: string
   status: ApplicationStatus
 }
+
+export enum ApplicationStatus {
+  ACCEPTED = 'accepted',
+  OFFERED = 'offered',
+  PENDING = 'pending',
+  INTERVIEWED = 'interviewed',
+  REJECTED = 'rejected',
+}

From 96b7bbf483661cabe056b7ebd13ae37d3f901480 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sat, 3 Jun 2023 17:16:31 +0800
Subject: [PATCH 087/223] change the style of the status page

---
 public/images/question_mark.svg        |   3 +
 public/images/search.svg               |   3 +
 src/pages/application_status/index.tsx | 314 +++++++++++++++----------
 src/pages/tasks/index.tsx              |  47 +++-
 4 files changed, 240 insertions(+), 127 deletions(-)
 create mode 100644 public/images/question_mark.svg
 create mode 100644 public/images/search.svg

diff --git a/public/images/question_mark.svg b/public/images/question_mark.svg
new file mode 100644
index 00000000..7fbf379e
--- /dev/null
+++ b/public/images/question_mark.svg
@@ -0,0 +1,3 @@
+<svg width="13" height="24" viewBox="0 0 13 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.47985 16.8636V16.7358C4.49405 15.3793 4.6361 14.2997 4.90598 13.4972C5.17587 12.6946 5.55939 12.0447 6.05655 11.5476C6.55371 11.0504 7.1503 10.5923 7.84632 10.1733C8.26536 9.91761 8.64178 9.61577 8.97559 9.26776C9.30939 8.91264 9.57218 8.50426 9.76394 8.04261C9.9628 7.58097 10.0622 7.0696 10.0622 6.50852C10.0622 5.8125 9.89888 5.20881 9.57218 4.69744C9.24547 4.18608 8.80868 3.7919 8.26181 3.51491C7.71493 3.23793 7.10769 3.09943 6.44007 3.09943C5.85769 3.09943 5.29661 3.22017 4.75684 3.46165C4.21706 3.70312 3.76607 4.0831 3.40385 4.60156C3.04164 5.12003 2.83212 5.79829 2.7753 6.63636H0.0906427C0.147461 5.42898 0.459961 4.3956 1.02814 3.53622C1.60343 2.67685 2.35982 2.01989 3.29732 1.56534C4.24192 1.11079 5.28951 0.883522 6.44007 0.883522C7.69007 0.883522 8.77672 1.1321 9.70002 1.62926C10.6304 2.12642 11.3477 2.80824 11.852 3.67471C12.3634 4.54119 12.6191 5.52841 12.6191 6.63636C12.6191 7.41761 12.4983 8.12429 12.2568 8.75639C12.0225 9.38849 11.6816 9.95312 11.2341 10.4503C10.7938 10.9474 10.2611 11.3878 9.6361 11.7713C9.0111 12.1619 8.51039 12.5739 8.13397 13.0071C7.75755 13.4332 7.48411 13.9411 7.31365 14.5305C7.1432 15.12 7.05087 15.8551 7.03667 16.7358V16.8636H4.47985ZM5.84348 23.1705C5.31792 23.1705 4.86692 22.9822 4.4905 22.6058C4.11408 22.2294 3.92587 21.7784 3.92587 21.2528C3.92587 20.7273 4.11408 20.2763 4.4905 19.8999C4.86692 19.5234 5.31792 19.3352 5.84348 19.3352C6.36905 19.3352 6.82005 19.5234 7.19647 19.8999C7.57289 20.2763 7.7611 20.7273 7.7611 21.2528C7.7611 21.6009 7.67232 21.9205 7.49476 22.2116C7.32431 22.5028 7.09348 22.7372 6.80229 22.9148C6.5182 23.0852 6.1986 23.1705 5.84348 23.1705Z" fill="black"/>
+</svg>
diff --git a/public/images/search.svg b/public/images/search.svg
new file mode 100644
index 00000000..0d69c935
--- /dev/null
+++ b/public/images/search.svg
@@ -0,0 +1,3 @@
+<svg width="22" height="23" viewBox="0 0 22 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.3275 22.0482L12.8856 14.6124C12.295 15.0845 11.6158 15.4582 10.848 15.7336C10.0802 16.009 9.26312 16.1467 8.39687 16.1467C6.25094 16.1467 4.43496 15.4043 2.94895 13.9195C1.46215 12.4339 0.71875 10.619 0.71875 8.47485C0.71875 6.33066 1.46215 4.51577 2.94895 3.03018C4.43496 1.54538 6.25094 0.802979 8.39687 0.802979C10.5428 0.802979 12.3592 1.54538 13.846 3.03018C15.332 4.51577 16.075 6.33066 16.075 8.47485C16.075 9.3404 15.9372 10.1568 15.6616 10.924C15.3859 11.6911 15.0119 12.3698 14.5394 12.96L21.9812 20.3958L20.3275 22.0482ZM8.39687 13.7862C9.87344 13.7862 11.1287 13.27 12.1627 12.2376C13.1959 11.2045 13.7125 9.95021 13.7125 8.47485C13.7125 6.99949 13.1959 5.74524 12.1627 4.71209C11.1287 3.67973 9.87344 3.16356 8.39687 3.16356C6.92031 3.16356 5.66504 3.67973 4.63105 4.71209C3.59785 5.74524 3.08125 6.99949 3.08125 8.47485C3.08125 9.95021 3.59785 11.2045 4.63105 12.2376C5.66504 13.27 6.92031 13.7862 8.39687 13.7862Z" fill="#D9D9D9"/>
+</svg>
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 45dce51d..44e7fd8c 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -2,10 +2,11 @@ import { useRouter } from 'next/router'
 import { useSession, signIn } from 'next-auth/react'
 import { useState, useCallback } from 'react'
 import Head from 'next/head'
-import { useToast } from '@chakra-ui/react'
+import { Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, useDisclosure, useToast } from '@chakra-ui/react'
 import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { BaseProps } from '~/utils/withAuth'
+import { Button } from 'flowbite-react'
 
 enum PageState {
   LOGIN,
@@ -16,8 +17,34 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
 
   //this part needs backend to update the status
   const application_status = "accepted"
+  const { isOpen, onOpen, onClose } = useDisclosure()
 
   const [pageState, setPageState] = useState(PageState.LOGIN)
+  const roles = [
+    { 
+      id:1,
+      name: 'Software Engineer',
+      status: 'accepted'
+    },
+    { 
+      id:2,
+      name: 'Technical Analyst',
+      status: 'interviewed'
+    },
+    {
+      id:3,
+      name: 'Research Analyst',
+      status: 'rejected'
+    }
+
+
+
+  ]
+  const status =[
+    {status: 'accepty'}
+  ]
+
+  
 
   return (
     <>
@@ -52,135 +79,186 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
               Hi User,
             </h1>
             <h2 className='flex justify-center  mt-3 font-bold text-6xl'>
-              your current status is:
+              your current statuses are:
             </h2>
-            {application_status == 'accepted' && 
-            <h3 className='flex mt-3 justify-center text-5xl'>
-        
-              <Image
-                alt="logo"
-                src="/images/Ellipse 1.svg"
-                height={35}
-                width={35}
-                className='mr-5'              
-              />
-                Accepted
-              </h3>
-            }
-            {application_status == 'offered' && <h3 className='flex justify-center text-[55px]'>
-        
-              <Image
-                alt="logo"
-                src="/images/blue_dot.svg"
-                height={35}
-                width={35}
-                className='mr-5'
-              />
-                Offered
-              </h3>
-            }
-            {application_status == 'pending_review' && <h3 className='flex justify-center text-[55px]'>
-              
-              <Image
-                alt="logo"
-                src="/images/yellow_dot.svg"
-                height={35}
-                width={35}
-                className='mr-5'             
-              />
-                Pending Review
-              </h3>
-            }
-            {application_status == 'interviewed' && <h3 className='flex justify-center text-[55px]'>
-              
-              <Image
-                alt="logo"
-                src="/images/pink_dot.svg"
-                height={35}
-                width={35}
-                className='mr-5'             
-              />
-                Interviewed
-              </h3>
-            }
-            {application_status == 'rejected' && <h3 className='flex justify-center text-[55px]'>
+      
+            {roles.map((item) => ( 
+              <div key={item.id} className="flex  items-center mt-3 ">
+                  <div className="flex-grow">
+                {item.status == 'accepted' && 
+                <h3 className='flex mt-3 justify-center text-5xl'>
+                  {item.name}
+                  <Image
+                    alt="logo"
+                    src="/images/Ellipse 1.svg"
+                    height={35}
+                    width={35}
+                    className='flex flex-col  ml-14'              
+                  />
+                    {/* Accepted */}
+                  </h3>
+                }
               
-              <Image
-                alt="logo"
-                src="/images/red_dot.svg"
-                height={35}
-                width={35}
-                className='mr-5'             
-              />
-                Rejected
-              </h3>
-            }
+                {item.status == 'offered' && <h3 className='flex justify-center text-5xl'>
+                {item.name}
+                  <Image
+                    alt="logo"
+                    src="/images/blue_dot.svg"
+                    height={35}
+                    width={35}
+                    className='flex flex-col ml-14'
+                  />
+                    {/* Offered */}
+                  </h3>
+                }
+                
+                {item.status == 'pending_review' && <h3 className='flex justify-center text-5xl'>
+                {item.name}
+                  <Image
+                    alt="logo"
+                    src="/images/yellow_dot.svg"
+                    height={35}
+                    width={35}
+                    className='ml-14'             
+                  />
+                    {/* Pending Review */}
+                  </h3>
+                }
+                {item.status == 'interviewed' && <h3 className='flex justify-center text-5xl'>
+                {item.name}
+                  <Image
+                    alt="logo"
+                    src="/images/pink_dot.svg"
+                    height={35}
+                    width={35}
+                    className='ml-14'             
+                  />
+                    {/* Interviewed */}
+                  </h3>
+                }
+                {item.status == 'rejected' && <h3 className='flex justify-center text-5xl'>
+                {item.name}
+                  <Image
+                    alt="logo"
+                    src="/images/red_dot.svg"
+                    height={35}
+                    width={35}
+                    className='ml-14'             
+                  />
+                    {/* Rejected */}
+                  </h3>
+                }
+                
+                
+                
+               
+                </div>
+                </div>
+
+
+            ))}
+             <div style={{ position: 'fixed', bottom: '40px', right: '60px' }}>
+              <button 
+                onClick={onOpen}       
+                className="w-20 h-20 rounded-full 
+                       bg-[#FFEBC5]  
+                       hover:bg-[#FFD27C]
+                       text-white
+                       
+                       
+                       ">
+                         <Image
+                    alt="question_mark"
+                    src="/images/question_mark.svg"
+                    height={20}
+                    width={20}
+                    className='ml-7'  
+                  
+                        
+                  />
             
+        </button>
+        </div>
+        <Modal   isOpen={isOpen} onClose={onClose}>
+            <ModalOverlay 
+            bg='none'
+            backdropFilter='auto'
             
-            <div className="flex justify-center items-center mt-5">
-            {application_status != "rejected" &&
-            <button
           
-              className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] flex-col w-357px h-109px items-center bg-opacity-0 border-2 border-[#86C5FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition hover:bg-opacity-80"
-             
-            >
-              <div className='font-[Inter] text-[25px]'>
-                Update 
-                  <div className="relative">
-                  </div>
-                Information
-              </div>
-            </button>
-            }
-            {application_status == "rejected" &&
-            <button
-              disabled = {true}
-              className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] flex-col w-357px h-109px items-center bg-opacity-0 border-2 border-[#BFE0FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition"
+            />
+           
+           
+            <ModalContent 
+        
              
-            >
-              <div className='font-[Inter] text-[25px] text-[#9AA8B6]'>
-                Update 
-                  <div className="relative">
-                  </div>
-                Information
-              </div>
-            </button>
-            }
-
             
-            
-            {(application_status == "accepted" || application_status == "offered") && 
-            <button
-          
-              className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] -ml-5 w-357px h-109px items-center bg-opacity-0 border-2 border-[#86C5FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition hover:bg-opacity-80"
         
             >
-              <div className='font-[Inter] text-[25px]'>
-                Tasks to be
-                  <div className="relative">
-                  </div>
-                Completed
-              </div>
-         
-            </button>
-            }
+                
+            <ModalHeader fontSize='5xl' ></ModalHeader>
+            <ModalCloseButton />
+            <ModalBody fontSize='3xl' >
+              <div className='flex justify-left ml-24'>
+              <Image
+                    alt="logo"
+                    src="/images/Ellipse 1.svg"
+                    height={35}
+                    width={35}
+                    className='flex flex-col mr-5'              
+                  />
+                Accepted</div>
+              <div  className='flex justify-left ml-24'>
+              <Image
+                    alt="logo"
+                    src="/images/blue_dot.svg"
+                    height={35}
+                    width={35}
+                    className='flex flex-col mr-5'
+                  />
+                  Offered</div>
+              <div  className='flex justify-left ml-24'>
+              <Image
+                    alt="logo"
+                    src="/images/yellow_dot.svg"
+                    height={35}
+                    width={35}
+                    className='mr-5'             
+                  />
+                  Pending Review</div>
+              <div className='flex justify-left ml-24'>
+              <Image
+                    alt="logo"
+                    src="/images/pink_dot.svg"
+                    height={35}
+                    width={35}
+                    className='mr-5'             
+                  />Interviewed</div>
+              <div className='flex justify-left ml-24'>
+              <Image
+                    alt="logo"
+                    src="/images/red_dot.svg"
+                    height={35}
+                    width={35}
+                    className='mr-5'             
+                  />Rejected</div>
+
+
+              
             
-            {(application_status != "offered" && application_status != "accepted") &&
-            <button
-            disabled = {true}
-            className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] -ml-5 flex-col w-357px h-109px -ml-5 items-center bg-opacity-0 border-2 border-[#BFE0FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition"
+            </ModalBody>
+
+            <ModalFooter>
+           
+            </ModalFooter>
+        </ModalContent>
+        
+        </Modal>
+      
+       
+
            
-            >
-            <div className='font-[Inter] text-[25px] text-[#9AA8B6]'>
-              Tasks to be
-                <div className="relative">
-                </div>
-              Completed
-            </div>
-          </button>
-            }
             
-            </div>
+          
 
           
           </div>
diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 79d3238f..07339ebc 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -2,10 +2,11 @@ import { useRouter, } from 'next/router'
 import { useSession} from 'next-auth/react'
 import { useState, useCallback, useRef } from 'react'
 import Head from 'next/head'
-import {  Box, Button, Grid, GridItem, Heading, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, Portal, useDisclosure, useToast, Text } from '@chakra-ui/react'
+import {  Box, Button, Grid, GridItem, Heading, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, Portal, useDisclosure, useToast, Text, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
+import { SearchIcon } from '@chakra-ui/icons'
 
 
 
@@ -30,7 +31,7 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
       status: 'Done',
       name: 'Join Telegram Group',
       due: '09/12/23',
-      details: 'User should join the telegram group before they due date.'
+      details: 'User should join the telegram group before their due date.'
     },
     {
         id: 2,
@@ -80,7 +81,16 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
              Tasks
             </h1>
             
-            <Input
+           
+                <InputGroup>
+      <InputLeftElement
+        className="mt-[1%] ml-[8%] mb-4"
+        pointerEvents="none"
+        >
+        <SearchIcon className="SearchIcon" color="gray.300" />
+        
+        </InputLeftElement>
+       <Input
                 placeholder="Search"
                 value={searchQuery}
                 onChange={(e) => setSearchQuery(e.target.value)}
@@ -91,10 +101,14 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
                 borderRadius="30px"
                 className="mt-[1%] ml-[8%] mb-4 text-white"
                 _placeholder={{
-                pl: { base: '65px', lg: '210px' },
+                pl: { base: '65px', lg: '5px' },
                 fontStyle: 'italic',
                 }}
             />
+    </InputGroup>
+              
+                
+              
            <Box
   overflowY="auto"
   maxHeight="40vh"
@@ -184,21 +198,31 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
         
       
         
-       
+        <div  
+        ref={el => {
+            // el can be null - see https://reactjs.org/docs/refs-and-the-dom.html#caveats-with-callback-refs
+            if (!el) return;
+    
+            console.log(el.offsetLeft); // prints 200px
+          }}
+          >
         <GridItem colSpan={1} className="justify-content-center flex flex-col">
          
+         
           <Text
+        
         as="span"
         cursor="pointer"
         _hover={{ textDecoration: 'underline' }}
         className='text-xl text-white'
-        onClick={() => { setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
+        onClick={() => {;setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
        
       >
         {item.name}
       </Text>
      
-          <Modal  isOpen={isOpen} onClose={onClose}>
+    
+          <Modal isCentered={true} isOpen={isOpen} onClose={onClose}>
             <ModalOverlay 
             bg='none'
             backdropFilter='auto'
@@ -206,12 +230,14 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
             backdropBlur='2px'
             />
            
-            
-            <ModalContent 
            
+            <ModalContent 
+        
+             
             
         
             >
+                
             <ModalHeader fontSize='5xl' >{currentName}</ModalHeader>
             <ModalCloseButton />
             <ModalBody fontSize='3xl' >
@@ -225,9 +251,12 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
         </ModalContent>
         
         </Modal>
+      
        
  
         </GridItem>
+        </div>
+        
         <GridItem colSpan={1} className="justify-content-center flex flex-col">
           <h1 className="text-xl text-white">{item.due}</h1>
         </GridItem>

From ba2171a5de3885d43714810704ced1e3b3176b83 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sat, 3 Jun 2023 19:10:27 +0800
Subject: [PATCH 088/223] ranked query for respective department directors
 applicants

---
 src/components/recruitment/ApplicantCard.tsx  | 25 ++++---
 src/components/recruitment/ApplicantGrid.tsx  |  2 +-
 .../recruitment/AppliedRoleListItem.tsx       | 31 ++++----
 src/components/recruitment/DocumentModal.tsx  |  7 +-
 src/components/recruitment/StatusPopup.tsx    |  2 +-
 src/pages/api/auth/[...nextauth].ts           |  3 +
 src/pages/recruitment/applicants.tsx          |  7 +-
 src/server/trpc/router/member/helper.ts       |  1 -
 src/server/trpc/router/recruitment/index.ts   |  8 ++-
 src/server/trpc/router/recruitment/read.ts    | 72 ++++++++++++-------
 src/server/trpc/router/recruitment/update.ts  |  2 +-
 src/types/next-auth.d.ts                      |  1 +
 12 files changed, 100 insertions(+), 61 deletions(-)

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index e40f2253..a26bfea2 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -12,8 +12,13 @@ import { Avatar } from 'flowbite-react'
 import AppliedRoleListItem from './AppliedRoleListItem'
 import DocumentModal from './DocumentModal'
 import type { Applicant } from '~/server/db/models/Applicant'
+import NoteModal from './NoteModal'
+import type { AppliedRole } from '~/server/db/models/AppliedRole'
+import { trpc } from '~/utils/trpc'
 
 const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
+  const appliedRole = applicant.appliedRoles[0] as AppliedRole
+  const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRole.id)
   return (
     <Card
       maxWidth="sm"
@@ -43,19 +48,19 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
                 applicantId={applicant.id}
                 applicantName={applicant.name}
               />
+              <NoteModal
+                appliedRoleId={appliedRole.id}
+                interviewNotes={appliedRole.interviewNotes}
+                refetch={refetch}
+              />
             </Box>
           </Box>
           <UnorderedList styleType="none">
-            {applicant.appliedRoles
-              .sort((a, b) => a.rank - b.rank)
-              .map((appliedRole) => {
-                return (
-                  <AppliedRoleListItem
-                    appliedRole={appliedRole}
-                    key={appliedRole.id}
-                  />
-                )
-              })}
+            <AppliedRoleListItem
+              appliedRole={appliedRole}
+              key={appliedRole.id}
+              refetch={refetch}
+            />
           </UnorderedList>
         </Stack>
       </CardBody>
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 52c0e3a5..418b3a51 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -6,7 +6,7 @@ import InfoPopup from '~/components/recruitment/InfoPopup'
 
 const ApplicantGrid = () => {
   const { search } = useContext(searchContext)
-  const { data } = trpc.recruitment.getAllApplicants.useQuery()
+  const { data } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
   if (!data) return <></>
 
   const filteredData =
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index eb510f1d..1b6ef2ff 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -1,28 +1,25 @@
-import { Box, ListItem, Text } from '@chakra-ui/react'
+import { ListItem, Text } from '@chakra-ui/react'
+import type { QueryObserverResult } from '@tanstack/react-query'
 import type { AppliedRole } from '~/server/db/models/AppliedRole'
-import { trpc } from '~/utils/trpc'
-import NoteModal from './NoteModal'
 import StatusPopup from './StatusPopup'
 
-const AppliedRoleListItem = ({ appliedRole }: { appliedRole: AppliedRole }) => {
-  const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRole.id)
+const AppliedRoleListItem = ({
+  appliedRole,
+  refetch,
+}: {
+  appliedRole: AppliedRole
+  refetch: () => Promise<QueryObserverResult>
+}) => {
   return (
     <ListItem className="flex items-center justify-between">
       <Text>
         {appliedRole.rank}. {appliedRole.department} - {appliedRole.role}
       </Text>
-      <Box>
-        <StatusPopup
-          status={appliedRole.status}
-          appliedRoleId={appliedRole.id}
-          refetch={refetch}
-        />
-        <NoteModal
-          appliedRoleId={appliedRole.id}
-          interviewNotes={appliedRole.interviewNotes}
-          refetch={refetch}
-        />
-      </Box>
+      <StatusPopup
+        status={appliedRole.status}
+        appliedRoleId={appliedRole.id}
+        refetch={refetch}
+      />
     </ListItem>
   )
 }
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
index 75c573dd..1c78f0a4 100644
--- a/src/components/recruitment/DocumentModal.tsx
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -8,12 +8,10 @@ import {
   ModalOverlay,
   useDisclosure,
 } from '@chakra-ui/react'
-import { getDownloadURL, listAll, ref } from 'firebase/storage'
 import { useEffect, useState } from 'react'
 import { BsFolder2Open } from 'react-icons/bs'
 import { StorageService } from '~/utils/storage'
 import DocumentModalAdd from './DocumentModalAdd'
-import DocumentModalCard from './DocumentModalCard'
 
 const DocumentModal = ({
   applicantId,
@@ -28,6 +26,11 @@ const DocumentModal = ({
 
   // Hook to get the files associated with the applicant
   useEffect(() => {
+    const getFilesList = async () => {
+      const fileList = await StorageService.getFiles(docsFilePath)
+      setFileList(fileList)
+    }
+    getFilesList()
     console.log('fileList: ', fileList)
   }, [])
 
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 2fe084be..893bcadc 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -10,7 +10,7 @@ import {
   UnorderedList,
   useToast,
 } from '@chakra-ui/react'
-import { ApplicationStatus } from '~/constant/applicationStatus'
+import { ApplicationStatus } from '~/server/db/models/AppliedRole'
 import type { QueryObserverResult } from '@tanstack/react-query'
 import { BsCircleFill } from 'react-icons/bs'
 import { trpc } from '~/utils/trpc'
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 2b9d8c9a..8d60e538 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -15,6 +15,7 @@ export const authOptions: NextAuthOptions = {
       if (session && session.user && token) {
         session.user.id = token.sub || ''
         session.user.image = token.picture
+        session.user.department = token.department as string
       }
 
       if (token) {
@@ -26,6 +27,7 @@ export const authOptions: NextAuthOptions = {
     async jwt({ token, user }) {
       if (user) {
         token.isAdmin = (user as User).isAdmin as boolean
+        token.department = (user as User).department as string
         token.picture = user.image
       }
       return token
@@ -67,6 +69,7 @@ export const authOptions: NextAuthOptions = {
           // The user object is passed to the session callback in session.data.user
           return {
             id: user.id as string,
+            department: user.department as string,
             name: user.name,
             email: user.email,
             isAdmin: user.isAdmin,
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 4078a37f..1b501ce3 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -5,8 +5,13 @@ import SearchBar from '~/components/common/SearchBar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
 import ApplicantGrid from '~/components/recruitment/ApplicantGrid'
 import SearchProvider from '~/context/recruitment/SearchProvider'
+import type { Session } from 'next-auth'
 
-const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
+const ApplicantsPage: React.FC<BaseProps> = ({
+  session,
+}: {
+  session: Session
+}) => {
   return (
     <>
       <Head>
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index c33eff35..38f6f48f 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -95,7 +95,6 @@ function buildUserObject(
       major: user.major,
       id: user.student_id,
       isAdmin: false,
-      interviewNotes: null,
       name: user.name,
       email: user.nus_email,
       personal_email: user.personal_email,
diff --git a/src/server/trpc/router/recruitment/index.ts b/src/server/trpc/router/recruitment/index.ts
index 47fcb129..0d0ba4f4 100644
--- a/src/server/trpc/router/recruitment/index.ts
+++ b/src/server/trpc/router/recruitment/index.ts
@@ -1,11 +1,15 @@
 import { router } from '~/server/trpc/trpc'
 import { updateAppliedRoleStatus, updateInterviewNotes } from './update'
-import { getAllApplicants, getApplicant, getAppliedRole } from './read'
+import {
+  getAllApplicantsTopRoleByDept,
+  getApplicant,
+  getAppliedRole,
+} from './read'
 
 export const recruitmentRouter = router({
   updateAppliedRoleStatus,
   updateInterviewNotes,
-  getAllApplicants,
+  getAllApplicantsTopRoleByDept,
   getApplicant,
   getAppliedRole,
 })
diff --git a/src/server/trpc/router/recruitment/read.ts b/src/server/trpc/router/recruitment/read.ts
index 2030fed3..9dfb0ab8 100644
--- a/src/server/trpc/router/recruitment/read.ts
+++ b/src/server/trpc/router/recruitment/read.ts
@@ -1,39 +1,61 @@
 import { TRPCError } from '@trpc/server'
-import { where } from 'firebase/firestore'
+import { limit, orderBy, where } from 'firebase/firestore'
 import { z } from 'zod'
 import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
 import userCollection from '~/server/db/collections/UserCollection'
 import type { Applicant } from '~/server/db/models/Applicant'
+import { ApplicationStatus } from '~/server/db/models/AppliedRole'
 import { protectedProcedure } from '~/server/trpc/trpc'
 
-export const getAllApplicants = protectedProcedure.query(async ({}) => {
-  try {
-    const applicants = await userCollection.queries([
-      where('role', '==', 'Applicant'),
-    ])
-    const applicantsWithRoles: Applicant[] = []
+/**
+ * We retrieve applicants based on the logged in Exco's department.
+ * The applied role retrieved for the applicant corresponds to the
+ * Exco's department and is the highest ranked role that has not been
+ * rejected. So each applicant will have one applied role at any
+ * point in time, from the perspective of a director.
+ * */
+export const getAllApplicantsTopRoleByDept = protectedProcedure.query(
+  async ({ ctx }) => {
+    try {
+      const applicants = await userCollection.queries([
+        where('role', '==', 'Applicant'),
+      ])
+      const applicantsWithRoles: Applicant[] = []
 
-    for (let i = 0; i < applicants.length; i++) {
-      const applicant = applicants[i]
-      if (applicant) {
-        const appliedRoles = await appliedRoleCollection.queries([
-          where('applicantId', '==', applicant.id),
-        ])
-        applicantsWithRoles.push({
-          id: applicant?.id,
-          name: applicant?.name,
-          appliedRoles: appliedRoles,
-        })
+      for (let i = 0; i < applicants.length; i++) {
+        const applicant = applicants[i]
+        if (applicant) {
+          const appliedRoles = await appliedRoleCollection.queries([
+            where('applicantId', '==', applicant.id),
+            where('department', '==', ctx.session.user.department),
+            where('status', 'in', [
+              ApplicationStatus.ACCEPTED,
+              ApplicationStatus.INTERVIEWED,
+              ApplicationStatus.OFFERED,
+              ApplicationStatus.PENDING,
+            ]),
+            orderBy('rank'),
+            limit(1),
+          ])
+          // only add applicants that still have roles
+          if (appliedRoles.length == 1) {
+            applicantsWithRoles.push({
+              id: applicant?.id,
+              name: applicant?.name,
+              appliedRoles: appliedRoles,
+            })
+          }
+        }
       }
+      return applicantsWithRoles
+    } catch (error) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: 'Error retrieving applicants: ' + error,
+      })
     }
-    return applicantsWithRoles
-  } catch (error) {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: 'Error retrieving applicants: ' + error,
-    })
   }
-})
+)
 
 export const getApplicant = protectedProcedure
   .input(z.string())
diff --git a/src/server/trpc/router/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
index 9c9fc3d6..13307c92 100644
--- a/src/server/trpc/router/recruitment/update.ts
+++ b/src/server/trpc/router/recruitment/update.ts
@@ -2,7 +2,7 @@ import { protectedProcedure } from '~/server/trpc/trpc'
 import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
-import { ApplicationStatus } from '~/constant/applicationStatus'
+import { ApplicationStatus } from '~/server/db/models/AppliedRole'
 
 export const updateAppliedRoleStatus = protectedProcedure
   .input(
diff --git a/src/types/next-auth.d.ts b/src/types/next-auth.d.ts
index 6b331ccb..27201997 100644
--- a/src/types/next-auth.d.ts
+++ b/src/types/next-auth.d.ts
@@ -10,6 +10,7 @@ declare module 'next-auth' {
     user?: {
       level?: string
       id: string
+      department: string
     } & DefaultSession['user']
   }
 }

From 014db83cdf330c478e44ac9610f9464a5238f00a Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 31 May 2023 23:33:48 +0800
Subject: [PATCH 089/223] Fix bug where SessionRequired toast is thrown

---
 src/pages/auth/login.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/auth/login.tsx b/src/pages/auth/login.tsx
index 25f1178f..580eb2ea 100644
--- a/src/pages/auth/login.tsx
+++ b/src/pages/auth/login.tsx
@@ -37,7 +37,7 @@ const LoginPage = () => {
       redirect: false,
     })
 
-    if (res && res.error) {
+    if (res && res.error && res.error !== 'SessionRequired') {
       toast({
         description: res.error,
         duration: 3000,
@@ -47,8 +47,6 @@ const LoginPage = () => {
       setLoginLoading(false)
       return
     }
-
-    router.push('/')
   }
 
   const resetPassword = async () => {

From 9e452b8b3a14baf16e032c6cbad3192318a3be2f Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 31 May 2023 23:54:35 +0800
Subject: [PATCH 090/223] Fix the modal using the context

---
 src/components/attendance/DataTable.tsx       |  6 ++--
 src/components/attendance/DataTableModal.tsx  |  4 +--
 src/components/users/EditModal.tsx            | 32 ++++++++++---------
 src/components/users/Table.tsx                | 27 ++++++++++++----
 ...EventModalContext.tsx => ModalContext.tsx} |  4 +--
 .../trpc/router/users/createManyUsers.ts      |  2 +-
 .../trpc/router/users/createSingleUser.ts     |  2 +-
 .../trpc/router/users/getUserProfile.ts       |  1 +
 .../trpc/router/{member => util}/helper.ts    |  0
 9 files changed, 47 insertions(+), 31 deletions(-)
 rename src/context/{events/EventModalContext.tsx => ModalContext.tsx} (64%)
 rename src/server/trpc/router/{member => util}/helper.ts (100%)

diff --git a/src/components/attendance/DataTable.tsx b/src/components/attendance/DataTable.tsx
index 48d6d086..532c2f44 100644
--- a/src/components/attendance/DataTable.tsx
+++ b/src/components/attendance/DataTable.tsx
@@ -19,7 +19,7 @@ import {
   type SortingState,
   getSortedRowModel,
 } from '@tanstack/react-table'
-import { EventModalContext } from '~/context/events/EventModalContext'
+import { ModalContext } from '~/context/ModalContext'
 import DataTableModal from './DataTableModal'
 import { type EventInfos } from '~/types/event/event.type'
 
@@ -184,7 +184,7 @@ const DataTable: React.FC<DataTableProps> = ({ data, columns }) => {
           ))}
         </Tbody>
       </Table>
-      <EventModalContext.Provider
+      <ModalContext.Provider
         value={{
           isOpen,
           id,
@@ -192,7 +192,7 @@ const DataTable: React.FC<DataTableProps> = ({ data, columns }) => {
         }}
       >
         <DataTableModal />
-      </EventModalContext.Provider>
+      </ModalContext.Provider>
     </Box>
   )
 }
diff --git a/src/components/attendance/DataTableModal.tsx b/src/components/attendance/DataTableModal.tsx
index d328862a..acafa698 100644
--- a/src/components/attendance/DataTableModal.tsx
+++ b/src/components/attendance/DataTableModal.tsx
@@ -12,7 +12,7 @@ import {
   Tr,
 } from '@chakra-ui/react'
 import { useContext } from 'react'
-import { EventModalContext } from '~/context/events/EventModalContext'
+import { ModalContext } from '~/context/ModalContext'
 import { trpc } from '~/utils/trpc'
 import LoadingScreen from '../common/LoadingScreen'
 import LocalizedFormat from 'dayjs/plugin/localizedFormat'
@@ -21,7 +21,7 @@ import Image from 'next/image'
 import { type BodyProps } from '~/types/event/event.type'
 
 const DataTableModal = () => {
-  const modal = useContext(EventModalContext)
+  const modal = useContext(ModalContext)
   const { data, isLoading } = trpc.attendance.getEventInfo.useQuery(modal.id)
 
   if (!modal.id) {
diff --git a/src/components/users/EditModal.tsx b/src/components/users/EditModal.tsx
index a513b77c..e50928c2 100644
--- a/src/components/users/EditModal.tsx
+++ b/src/components/users/EditModal.tsx
@@ -17,20 +17,20 @@ import {
 
 import { useForm } from 'react-hook-form'
 import { trpc } from '~/utils/trpc'
+import { useContext } from 'react'
+import { ModalContext } from '~/context/ModalContext'
+import type { User } from '~/server/db/models/User'
 
-interface editModalProps {
-  editIsOpen: boolean
-  editOnClose: () => void
-  data: any
-}
-
-const EditModal: React.FC<editModalProps> = (props) => {
+const EditModal = () => {
+  const modal = useContext(ModalContext)
+  const toast = useToast()
   const { register, handleSubmit } = useForm({
     mode: 'onSubmit',
   })
 
+  const { data, isLoading } = trpc.user.getUserProfile.useQuery(modal.id)
   const { mutateAsync } = trpc.user.updateUserProfile.useMutation()
-  const toast = useToast()
+
   const onSubmit = async (data: any) => {
     try {
       const projData = {
@@ -57,8 +57,10 @@ const EditModal: React.FC<editModalProps> = (props) => {
     }
   }
 
+  if (!modal.id || isLoading) return null
+
   return (
-    <Modal isOpen={props.editIsOpen} onClose={props.editOnClose}>
+    <Modal isOpen={modal.isOpen} onClose={modal.onClose}>
       <ModalOverlay />
       <ModalContent>
         <form onSubmit={handleSubmit((data) => onSubmit(data))}>
@@ -73,7 +75,7 @@ const EditModal: React.FC<editModalProps> = (props) => {
                 {...register('id')}
                 mb={'5'}
                 type="text"
-                defaultValue={props.data.id}
+                defaultValue={(data as User).id}
               />
 
               <FormLabel fontWeight={'semibold'}>Name</FormLabel>
@@ -81,7 +83,7 @@ const EditModal: React.FC<editModalProps> = (props) => {
                 mb={'5'}
                 type="text"
                 {...register('name')}
-                defaultValue={props.data.name}
+                defaultValue={(data as User).name}
               />
 
               <FormLabel fontWeight={'semibold'}>Email address</FormLabel>
@@ -89,14 +91,14 @@ const EditModal: React.FC<editModalProps> = (props) => {
                 mb={'5'}
                 {...register('email')}
                 type="email"
-                defaultValue={props.data.email}
+                defaultValue={(data as User).email}
               />
 
               <FormLabel fontWeight={'semibold'}>Department</FormLabel>
               <Select
                 mb={'5'}
                 {...register('department')}
-                defaultValue={props.data.department}
+                defaultValue={(data as User).department}
               >
                 <option value="EXCO">EXCO</option>
                 <option value="Software Development">
@@ -108,7 +110,7 @@ const EditModal: React.FC<editModalProps> = (props) => {
               <Select
                 mb={'5'}
                 {...register('roles')}
-                defaultValue={props.data.roles}
+                defaultValue={(data as User).role}
               >
                 <option value="President">President</option>
                 <option value="Vice">Vice</option>
@@ -118,7 +120,7 @@ const EditModal: React.FC<editModalProps> = (props) => {
             </FormControl>
           </ModalBody>
           <ModalFooter>
-            <Button variant={'ghost'} mr={3} onClick={props.editOnClose}>
+            <Button variant={'ghost'} mr={3} onClick={modal.onClose}>
               Close
             </Button>
             <Button colorScheme="facebook" type="submit">
diff --git a/src/components/users/Table.tsx b/src/components/users/Table.tsx
index 708d9075..d081b471 100644
--- a/src/components/users/Table.tsx
+++ b/src/components/users/Table.tsx
@@ -12,6 +12,7 @@ import LoadingScreen from '../common/LoadingScreen'
 import Link from 'next/link'
 import { Button, useDisclosure } from '@chakra-ui/react'
 import EditModal from './EditModal'
+import { ModalContext } from '~/context/ModalContext'
 
 type User = {
   name: string | null
@@ -27,6 +28,7 @@ const useColumns = () => {
     onOpen: editOnOpen,
     onClose: editOnClose,
   } = useDisclosure()
+  const [id, setId] = useState('')
 
   return useMemo<ColumnDef<User>[]>(
     () => [
@@ -69,12 +71,23 @@ const useColumns = () => {
             cell: (info) => {
               return (
                 <>
-                  <Button onClick={editOnOpen}>Edit</Button>
-                  <EditModal
-                    editIsOpen={editIsOpen}
-                    editOnClose={editOnClose}
-                    data={info.row.original}
-                  />
+                  <Button
+                    onClick={() => {
+                      setId(info.row.original.id)
+                      editOnOpen()
+                    }}
+                  >
+                    Edit
+                  </Button>
+                  <ModalContext.Provider
+                    value={{
+                      id,
+                      isOpen: editIsOpen,
+                      onClose: editOnClose,
+                    }}
+                  >
+                    <EditModal />
+                  </ModalContext.Provider>
                 </>
               )
             },
@@ -83,7 +96,7 @@ const useColumns = () => {
         ],
       },
     ],
-    [editIsOpen, editOnClose, editOnOpen]
+    [editIsOpen, editOnClose, editOnOpen, id]
   )
 }
 
diff --git a/src/context/events/EventModalContext.tsx b/src/context/ModalContext.tsx
similarity index 64%
rename from src/context/events/EventModalContext.tsx
rename to src/context/ModalContext.tsx
index 83f479b0..112f14a1 100644
--- a/src/context/events/EventModalContext.tsx
+++ b/src/context/ModalContext.tsx
@@ -1,12 +1,12 @@
 import { createContext } from 'react'
 
-type EventModalType = {
+type ModalType = {
   id: string
   isOpen: boolean
   onClose: () => void
 }
 
-export const EventModalContext = createContext<EventModalType>({
+export const ModalContext = createContext<ModalType>({
   id: '',
   isOpen: false,
   onClose: () => {
diff --git a/src/server/trpc/router/users/createManyUsers.ts b/src/server/trpc/router/users/createManyUsers.ts
index 04803a4e..44a6649b 100644
--- a/src/server/trpc/router/users/createManyUsers.ts
+++ b/src/server/trpc/router/users/createManyUsers.ts
@@ -3,7 +3,7 @@ import { z } from 'zod'
 import { randomBytes } from 'crypto'
 import { hash } from 'bcryptjs'
 
-import { sendMultipleEmails } from '../member/helper'
+import { sendMultipleEmails } from '../util/helper'
 import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
 import { db } from '~/server/db/firebase'
 import type { User } from '~/server/db/models/User'
diff --git a/src/server/trpc/router/users/createSingleUser.ts b/src/server/trpc/router/users/createSingleUser.ts
index ff594e92..2b873499 100644
--- a/src/server/trpc/router/users/createSingleUser.ts
+++ b/src/server/trpc/router/users/createSingleUser.ts
@@ -1,7 +1,7 @@
 import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import { hash } from 'bcryptjs'
-import { checkIfUserExist, sendEmail } from '../member/helper'
+import { checkIfUserExist, sendEmail } from '../util/helper'
 import userCollection from '~/server/db/collections/UserCollection'
 import logCollection from '~/server/db/collections/LogCollection'
 import { Timestamp } from 'firebase/firestore'
diff --git a/src/server/trpc/router/users/getUserProfile.ts b/src/server/trpc/router/users/getUserProfile.ts
index 65b8c26b..530efe24 100644
--- a/src/server/trpc/router/users/getUserProfile.ts
+++ b/src/server/trpc/router/users/getUserProfile.ts
@@ -7,6 +7,7 @@ export const getUserProfile = protectedProcedure
   .input(z.string())
   .query(async ({ input }) => {
     try {
+      if (!input) return null
       return await userCollection.getById(input)
     } catch (e) {
       throw new TRPCError({
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/util/helper.ts
similarity index 100%
rename from src/server/trpc/router/member/helper.ts
rename to src/server/trpc/router/util/helper.ts

From 87334808e1ccbcf46374e59ac134a3f5024bec06 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Thu, 1 Jun 2023 00:24:10 +0800
Subject: [PATCH 091/223] Fix the bug on the EditModal

---
 src/components/users/EditModal.tsx      | 104 +++++++++--------
 src/components/users/SingleUserForm.tsx | 145 +-----------------------
 src/constant/roles.ts                   | 143 +++++++++++++++++++++++
 3 files changed, 200 insertions(+), 192 deletions(-)
 create mode 100644 src/constant/roles.ts

diff --git a/src/components/users/EditModal.tsx b/src/components/users/EditModal.tsx
index e50928c2..74f80b98 100644
--- a/src/components/users/EditModal.tsx
+++ b/src/components/users/EditModal.tsx
@@ -14,48 +14,56 @@ import {
   Select,
   useToast,
 } from '@chakra-ui/react'
-
 import { useForm } from 'react-hook-form'
 import { trpc } from '~/utils/trpc'
-import { useContext } from 'react'
+import { useContext, useCallback, useState } from 'react'
 import { ModalContext } from '~/context/ModalContext'
 import type { User } from '~/server/db/models/User'
+import { roles } from '~/constant/roles'
 
 const EditModal = () => {
   const modal = useContext(ModalContext)
   const toast = useToast()
+  const [department, setDepartment] = useState('')
   const { register, handleSubmit } = useForm({
     mode: 'onSubmit',
   })
 
-  const { data, isLoading } = trpc.user.getUserProfile.useQuery(modal.id)
-  const { mutateAsync } = trpc.user.updateUserProfile.useMutation()
+  const { data, isLoading, refetch } = trpc.user.getUserProfile.useQuery(
+    modal.id
+  )
+  const { mutateAsync, isLoading: loading } =
+    trpc.user.updateUserProfile.useMutation()
 
-  const onSubmit = async (data: any) => {
-    try {
-      const projData = {
-        id: data.id,
-        name: data.name,
-        email: data.email,
-        department: data.department,
-        role: data.roles,
+  const onSubmit = useCallback(
+    async (data: Partial<User>) => {
+      try {
+        const projData = {
+          id: data.id as string,
+          name: data.name as string,
+          email: data.email as string,
+          department,
+          role: data.role as string,
+        }
+        await mutateAsync(projData)
+        await refetch()
+        toast({
+          duration: 9000,
+          description: 'User has been successfully updated',
+          title: 'Successfully updated',
+          status: 'success',
+        })
+      } catch (e) {
+        toast({
+          duration: 9000,
+          description: (e as Error).message,
+          title: 'Oops, something went wrong',
+          status: 'error',
+        })
       }
-      await mutateAsync(projData)
-      toast({
-        duration: 9000,
-        description: 'User has been successfully updated',
-        title: 'Successfully updated',
-        status: 'success',
-      })
-    } catch (e) {
-      toast({
-        duration: 9000,
-        description: (e as Error).message,
-        title: 'Oops, something went wrong',
-        status: 'error',
-      })
-    }
-  }
+    },
+    [mutateAsync, toast, department, refetch]
+  )
 
   if (!modal.id || isLoading) return null
 
@@ -94,28 +102,28 @@ const EditModal = () => {
                 defaultValue={(data as User).email}
               />
 
-              <FormLabel fontWeight={'semibold'}>Department</FormLabel>
-              <Select
-                mb={'5'}
-                {...register('department')}
-                defaultValue={(data as User).department}
-              >
-                <option value="EXCO">EXCO</option>
-                <option value="Software Development">
-                  Software Development
-                </option>
-              </Select>
-
               <FormLabel fontWeight={'semibold'}>Role</FormLabel>
               <Select
-                mb={'5'}
-                {...register('roles')}
-                defaultValue={(data as User).role}
+                marginBottom={5}
+                isRequired
+                {...register("role")}
+                onChange={(e) => {
+                  if (!e.target.value) return
+                  const element = roles.filter(
+                    (role) => role.role === e.target.value
+                  )
+                  if (!element || !element.length || !element[0]) return
+                  setDepartment(element[0].department)
+                }}
+                placeholder="Select role"
               >
-                <option value="President">President</option>
-                <option value="Vice">Vice</option>
-                <option value="SWE">SWE</option>
-                <option value="Director">Director</option>
+                {roles.map((role, index) => {
+                  return (
+                    <option key={index} value={role.role}>
+                      {role.role} ({role.department})
+                    </option>
+                  )
+                })}
               </Select>
             </FormControl>
           </ModalBody>
@@ -123,7 +131,7 @@ const EditModal = () => {
             <Button variant={'ghost'} mr={3} onClick={modal.onClose}>
               Close
             </Button>
-            <Button colorScheme="facebook" type="submit">
+            <Button colorScheme="facebook" type="submit" disabled={loading}>
               Submit
             </Button>
           </ModalFooter>
diff --git a/src/components/users/SingleUserForm.tsx b/src/components/users/SingleUserForm.tsx
index 20dbed46..0e740bf6 100644
--- a/src/components/users/SingleUserForm.tsx
+++ b/src/components/users/SingleUserForm.tsx
@@ -9,150 +9,7 @@ import {
 } from '@chakra-ui/react'
 import { useRouter } from 'next/router'
 import { useState, useCallback } from 'react'
-
-const roles = [
-  {
-    department: 'Software Engineering',
-    role: 'Software Engineer',
-  },
-  {
-    department: 'Software Engineering',
-    role: 'Technical Lead',
-  },
-  {
-    department: 'Software Engineering',
-    role: 'UI/UX Designer',
-  },
-  {
-    department: 'Software Engineering',
-    role: 'Head of Design',
-  },
-  {
-    department: 'Software Engineering',
-    role: 'Co-Director',
-  },
-  {
-    department: 'Blockchain',
-    role: 'Co-Director',
-  },
-  {
-    department: 'Blockchain',
-    role: 'Core Developer',
-  },
-  {
-    department: 'Blockchain',
-    role: 'Community Manager',
-  },
-  {
-    department: 'Blockchain',
-    role: 'Developer',
-  },
-  {
-    department: 'Blockchain',
-    role: 'Lead Developer',
-  },
-  {
-    department: 'Blockchain',
-    role: 'Research Analyst',
-  },
-  {
-    department: 'Blockchain',
-    role: 'Research Community Developer',
-  },
-  {
-    department: 'Machine Learning',
-    role: 'Quant Tech Analyst',
-  },
-  ,
-  {
-    department: 'Machine Learning',
-    role: 'Quant Tech Lead',
-  },
-  {
-    department: 'Machine Learning',
-    role: 'Quant wing head',
-  },
-  {
-    department: 'Machine Learning',
-    role: 'Project Tech Analyst',
-  },
-  {
-    department: 'Machine Learning',
-    role: 'Project Tech Lead',
-  },
-  {
-    department: 'Machine Learning',
-    role: 'Tech Analyst/Trainee',
-  },
-  {
-    department: 'Machine Learning',
-    role: 'Training Head',
-  },
-  {
-    department: 'Internal Affairs',
-    role: 'Co-Director',
-  },
-  {
-    department: 'Internal Affairs',
-    role: 'Community Development Executive',
-  },
-  {
-    department: 'Internal Affairs',
-    role: 'Community Development Lead',
-  },
-  {
-    department: 'Internal Affairs',
-    role: 'Finance Executive',
-  },
-  {
-    department: 'Internal Affairs',
-    role: 'Finance Lead',
-  },
-  {
-    department: 'Internal Affairs',
-    role: 'Project Manager Executive',
-  },
-  {
-    department: 'Internal Affairs',
-    role: 'Product Manager',
-  },
-  {
-    department: 'Internal Affairs',
-    role: 'Talent Management Executive',
-  },
-  {
-    department: 'Internal Affairs',
-    role: 'Talent Management Lead',
-  },
-  {
-    department: 'External Relations',
-    role: 'Partnerships Executive',
-  },
-  {
-    department: 'External Relations',
-    role: 'Director',
-  },
-  {
-    department: 'External Relations',
-    role: 'Marketing Executive',
-  },
-  {
-    department: 'External Relations',
-    role: 'Marketing Lead',
-  },
-  {
-    department: 'External Relations',
-    role: 'Partnerships Lead',
-  },
-  {
-    department: 'External Relations',
-    role: 'Finance Executive',
-  },
-  {
-    department: 'External Relations',
-    role: 'Finance Lead',
-  },
-] as { department: string; role: string }[]
+import { roles } from '~/constant/roles'
 
 const SingleUserForm = () => {
   const router = useRouter()
diff --git a/src/constant/roles.ts b/src/constant/roles.ts
new file mode 100644
index 00000000..39f461e2
--- /dev/null
+++ b/src/constant/roles.ts
@@ -0,0 +1,143 @@
+export const roles = [
+  {
+    department: 'Software Engineering',
+    role: 'Software Engineer',
+  },
+  {
+    department: 'Software Engineering',
+    role: 'Technical Lead',
+  },
+  {
+    department: 'Software Engineering',
+    role: 'UI/UX Designer',
+  },
+  {
+    department: 'Software Engineering',
+    role: 'Head of Design',
+  },
+  {
+    department: 'Software Engineering',
+    role: 'Co-Director',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Co-Director',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Core Developer',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Community Manager',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Developer',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Lead Developer',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Research Analyst',
+  },
+  {
+    department: 'Blockchain',
+    role: 'Research Community Developer',
+  },
+  {
+    department: 'Machine Learning',
+    role: 'Quant Tech Analyst',
+  },
+  ,
+  {
+    department: 'Machine Learning',
+    role: 'Quant Tech Lead',
+  },
+  {
+    department: 'Machine Learning',
+    role: 'Quant wing head',
+  },
+  {
+    department: 'Machine Learning',
+    role: 'Project Tech Analyst',
+  },
+  {
+    department: 'Machine Learning',
+    role: 'Project Tech Lead',
+  },
+  {
+    department: 'Machine Learning',
+    role: 'Tech Analyst/Trainee',
+  },
+  {
+    department: 'Machine Learning',
+    role: 'Training Head',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Co-Director',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Community Development Executive',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Community Development Lead',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Finance Executive',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Finance Lead',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Project Manager Executive',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Product Manager',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Talent Management Executive',
+  },
+  {
+    department: 'Internal Affairs',
+    role: 'Talent Management Lead',
+  },
+  {
+    department: 'External Relations',
+    role: 'Partnerships Executive',
+  },
+  {
+    department: 'External Relations',
+    role: 'Director',
+  },
+  {
+    department: 'External Relations',
+    role: 'Marketing Executive',
+  },
+  {
+    department: 'External Relations',
+    role: 'Marketing Lead',
+  },
+  {
+    department: 'External Relations',
+    role: 'Partnerships Lead',
+  },
+  {
+    department: 'External Relations',
+    role: 'Finance Executive',
+  },
+  {
+    department: 'External Relations',
+    role: 'Finance Lead',
+  },
+] as { department: string; role: string }[]

From 5cda7195f494826ed498b659d173b7fadc1658ba Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sat, 3 Jun 2023 22:32:29 +0800
Subject: [PATCH 092/223] Fix some bugs

---
 src/context/events/EventModalContext.tsx      |  15 ++
 src/server/trpc/router/member/helper.ts       | 130 ++++++++++++++++++
 .../trpc/router/users/createSingleUser.ts     |   2 +-
 .../trpc/router/users/getUserProfile.ts       |   1 -
 4 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 src/context/events/EventModalContext.tsx
 create mode 100644 src/server/trpc/router/member/helper.ts

diff --git a/src/context/events/EventModalContext.tsx b/src/context/events/EventModalContext.tsx
new file mode 100644
index 00000000..83f479b0
--- /dev/null
+++ b/src/context/events/EventModalContext.tsx
@@ -0,0 +1,15 @@
+import { createContext } from 'react'
+
+type EventModalType = {
+  id: string
+  isOpen: boolean
+  onClose: () => void
+}
+
+export const EventModalContext = createContext<EventModalType>({
+  id: '',
+  isOpen: false,
+  onClose: () => {
+    return
+  },
+})
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
new file mode 100644
index 00000000..e30194c9
--- /dev/null
+++ b/src/server/trpc/router/member/helper.ts
@@ -0,0 +1,130 @@
+import { TRPCError } from '@trpc/server'
+import nodemailer from 'nodemailer'
+import { env } from '~/env/server.mjs'
+import dayjs from 'dayjs'
+import userCollection from '~/server/db/collections/UserCollection'
+
+/**
+ * Validates whether the user already exists in the database
+ *
+ * @param email The email of the user
+ * @throws {TRPCError} if the user already exists
+ */
+async function checkIfUserExist(id: string) {
+  const results = await userCollection.findById(id)
+  if (results) {
+    throw new TRPCError({
+      code: 'CONFLICT',
+      message: 'The user already exists',
+    })
+  }
+}
+
+/**
+ * Sends an email to the user after the account has been generated.
+ *
+ * @param email The email of the user to be sent
+ * @param password The password of the user
+ */
+async function sendEmail(email: string, password: string) {
+  const transporter = nodemailer.createTransport({
+    service: 'gmail',
+    auth: {
+      user: env.GMAIL,
+      pass: env.GMAIL_PASSWORD,
+    },
+  })
+
+  return transporter.sendMail({
+    from: env.GMAIL,
+    to: email,
+    subject: 'New Account Creation',
+    html: `
+    Hi User,
+    <br />
+    <p> We welcome you to Fintech Society. We hope you enjoy your
+    time here. In order to get you onboard, please login with 
+    the following password and change it immediately. </p>
+    <br />
+    <a href="${env.NEXTAUTH_URL}">HRMS Website</a>
+    <br />
+    The password is <strong>${password}</strong>
+    <br />
+    Thank You. <br /> 
+    Fintech HR
+    `,
+  })
+}
+
+/**
+ * Used in create multiple users to generate a users object
+ *
+ * @param input The input from the frontend
+ * @param hashedPassword The hashed password
+ * @returns An array of user object to be stored in the database
+ */
+function buildUserObject(
+  input: {
+    date_of_birth: string
+    diet: string
+    department: string
+    discord: string
+    faculty: string
+    gender: string
+    linkedin: string
+    major: string
+    name: string
+    nus_email: string
+    personal_email: string
+    phone: string
+    race: string
+    role: string
+    student_id: string
+    telegram: string
+    year: string
+  }[],
+  hashedPassword: string
+) {
+  return input.map((user) => {
+    return {
+      batch: 'AY22/23',
+      department: user.department,
+      date_of_birth: dayjs().toDate(),
+      diet: user.diet,
+      discord: user.discord,
+      faculty: user.faculty,
+      gender: user.gender,
+      hashedPassword,
+      image: null,
+      level: 'member',
+      linkedin: user.linkedin,
+      major: user.major,
+      id: user.student_id,
+      isAdmin: false,
+      name: user.name,
+      email: user.nus_email,
+      personal_email: user.personal_email,
+      phone: user.phone,
+      race: user.race,
+      role: user.role,
+      telegram: user.telegram,
+      total_events: 0,
+      wallet: null,
+      year: user.year,
+    }
+  })
+}
+
+/**
+ * Blasts out multiple emails at the same time
+ *
+ * @param users The array of users object
+ * @param password The hashed password
+ */
+async function sendMultipleEmails(emails: string[], password: string) {
+  await Promise.all(
+    emails.map(async (email) => await sendEmail(email, password))
+  )
+}
+
+export { checkIfUserExist, sendEmail, sendMultipleEmails, buildUserObject }
diff --git a/src/server/trpc/router/users/createSingleUser.ts b/src/server/trpc/router/users/createSingleUser.ts
index 2b873499..ff594e92 100644
--- a/src/server/trpc/router/users/createSingleUser.ts
+++ b/src/server/trpc/router/users/createSingleUser.ts
@@ -1,7 +1,7 @@
 import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import { hash } from 'bcryptjs'
-import { checkIfUserExist, sendEmail } from '../util/helper'
+import { checkIfUserExist, sendEmail } from '../member/helper'
 import userCollection from '~/server/db/collections/UserCollection'
 import logCollection from '~/server/db/collections/LogCollection'
 import { Timestamp } from 'firebase/firestore'
diff --git a/src/server/trpc/router/users/getUserProfile.ts b/src/server/trpc/router/users/getUserProfile.ts
index 530efe24..65b8c26b 100644
--- a/src/server/trpc/router/users/getUserProfile.ts
+++ b/src/server/trpc/router/users/getUserProfile.ts
@@ -7,7 +7,6 @@ export const getUserProfile = protectedProcedure
   .input(z.string())
   .query(async ({ input }) => {
     try {
-      if (!input) return null
       return await userCollection.getById(input)
     } catch (e) {
       throw new TRPCError({

From 5d642654ce492ef5f20f2c4e9035ba5fb82214c2 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sat, 3 Jun 2023 23:19:41 +0800
Subject: [PATCH 093/223] Fix more bugs

---
 src/context/events/EventModalContext.tsx      | 15 -------------
 src/pages/events/[id].tsx                     |  2 +-
 src/server/db/firebase.ts                     |  2 --
 src/server/db/models/Event.ts                 |  2 +-
 .../trpc/router/attendance/createEvent.ts     | 12 +----------
 .../trpc/router/attendance/getEventForUser.ts | 21 ++++++++++++-------
 .../trpc/router/attendance/getEventInfo.ts    |  9 +++++++-
 .../trpc/router/users/getUserProfile.ts       |  1 +
 8 files changed, 25 insertions(+), 39 deletions(-)
 delete mode 100644 src/context/events/EventModalContext.tsx

diff --git a/src/context/events/EventModalContext.tsx b/src/context/events/EventModalContext.tsx
deleted file mode 100644
index 83f479b0..00000000
--- a/src/context/events/EventModalContext.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { createContext } from 'react'
-
-type EventModalType = {
-  id: string
-  isOpen: boolean
-  onClose: () => void
-}
-
-export const EventModalContext = createContext<EventModalType>({
-  id: '',
-  isOpen: false,
-  onClose: () => {
-    return
-  },
-})
diff --git a/src/pages/events/[id].tsx b/src/pages/events/[id].tsx
index b43cfc32..853c1049 100644
--- a/src/pages/events/[id].tsx
+++ b/src/pages/events/[id].tsx
@@ -87,7 +87,7 @@ const ConfirmAttendance: React.FC<BaseProps> = ({ session }) => {
                 {data.name}
               </h1>
               <h1 className="mb-2 self-center text-center text-3xl font-medium">
-                {dayjs(data.startDate.toDate()).format('lll')}
+                {dayjs(data.startDate).format('lll')}
               </h1>
               <UserActionRequired
                 isAttendanceRequired={data.isAttendanceRequired}
diff --git a/src/server/db/firebase.ts b/src/server/db/firebase.ts
index 58555e73..bbaa9044 100644
--- a/src/server/db/firebase.ts
+++ b/src/server/db/firebase.ts
@@ -1,6 +1,5 @@
 import { initializeApp } from 'firebase/app'
 import { getFirestore } from 'firebase/firestore'
-import { getStorage } from 'firebase/storage'
 import { env } from '~/env/server.mjs'
 
 const firebaseConfig = {
@@ -14,4 +13,3 @@ const firebaseConfig = {
 
 const app = initializeApp(firebaseConfig)
 export const db = getFirestore(app)
-export const storage = getStorage(app)
diff --git a/src/server/db/models/Event.ts b/src/server/db/models/Event.ts
index 8700cd98..d6630f1f 100644
--- a/src/server/db/models/Event.ts
+++ b/src/server/db/models/Event.ts
@@ -15,6 +15,6 @@ export type Event = {
   id?: string
   invitedAttendees: User[]
   name: string
-  qrCode?: string
+  qrCode: boolean
   startDate: Timestamp
 }
diff --git a/src/server/trpc/router/attendance/createEvent.ts b/src/server/trpc/router/attendance/createEvent.ts
index ae7791ed..500bb142 100644
--- a/src/server/trpc/router/attendance/createEvent.ts
+++ b/src/server/trpc/router/attendance/createEvent.ts
@@ -1,8 +1,5 @@
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { z } from 'zod'
-import { toDataURL } from 'qrcode'
-import { randomUUID } from 'crypto'
-import { env } from '~/env/server.mjs'
 import eventCollection from '~/server/db/collections/EventCollection'
 import { Timestamp } from 'firebase/firestore'
 import userCollection from '~/server/db/collections/UserCollection'
@@ -21,13 +18,6 @@ export const createEvent = protectedProcedure
   )
   .mutation(async ({ input }) => {
     try {
-      let qr_code: string | undefined
-      const id = randomUUID()
-
-      if (input.isQrRequired) {
-        qr_code = await toDataURL(`${env.DOMAIN}/events/${id}`)
-      }
-
       const users = await Promise.all(
         input.attendees.map(async (attendee) => {
           const data = await userCollection.getById(attendee)
@@ -48,7 +38,7 @@ export const createEvent = protectedProcedure
         invitedAttendees: users,
         name: input.name,
         startDate: Timestamp.fromDate(input.startDate),
-        qrCode: qr_code || '',
+        qrCode: input.isQrRequired,
       })
     } catch (e) {
       await logCollection.add({
diff --git a/src/server/trpc/router/attendance/getEventForUser.ts b/src/server/trpc/router/attendance/getEventForUser.ts
index 586d9eea..7e6d77d0 100644
--- a/src/server/trpc/router/attendance/getEventForUser.ts
+++ b/src/server/trpc/router/attendance/getEventForUser.ts
@@ -12,18 +12,23 @@ export const getEventForUser = protectedProcedure
       const user = ctx.session.user
 
       // Check if the user is within the array of objects and whether the attended flag is true.
-      const hasUserMarkedAttendance =
-        event.invitedAttendees.filter((attendee) => {
-          return attendee.id === user.id && attendee.attended
-        }).length === 1
+      let hasUserMarkedAttendance = false
+      let isAttendanceRequired = false
+      if (event.invitedAttendees) {
+        hasUserMarkedAttendance =
+          event.invitedAttendees.filter((attendee) => {
+            return attendee.id === user.id && attendee.attended
+          }).length === 1
 
-      // Check whether the user is within the array of objects.
-      const isAttendanceRequired =
-        event.invitedAttendees.filter((attendee) => attendee.id === user.id)
-          .length > 0
+        isAttendanceRequired =
+          event.invitedAttendees.filter((attendee) => attendee.id === user.id)
+            .length > 0
+      }
 
       return {
         ...event,
+        startDate: event.startDate.toDate(),
+        endDate: event.endDate.toDate(),
         isAttendanceRequired,
         hasUserMarkedAttendance: hasUserMarkedAttendance !== null,
       }
diff --git a/src/server/trpc/router/attendance/getEventInfo.ts b/src/server/trpc/router/attendance/getEventInfo.ts
index f47f1aba..064f72e0 100644
--- a/src/server/trpc/router/attendance/getEventInfo.ts
+++ b/src/server/trpc/router/attendance/getEventInfo.ts
@@ -2,6 +2,8 @@ import { protectedProcedure } from '~/server/trpc/trpc'
 import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import eventCollection from '~/server/db/collections/EventCollection'
+import { toDataURL } from 'qrcode'
+import { env } from '~/env/server.mjs'
 
 export const getEventInfo = protectedProcedure
   .input(z.string())
@@ -13,6 +15,11 @@ export const getEventInfo = protectedProcedure
         (attendee) => attendee.attended
       )
 
+      let qr_code = undefined
+      if (qr_code) {
+        qr_code = await toDataURL(`${env.DOMAIN}/events/${event.id as string}`)
+      }
+
       return {
         attendees: attendees.length,
         endDate: event.endDate.toDate(),
@@ -20,7 +27,7 @@ export const getEventInfo = protectedProcedure
         invitedAttendees: event.invitedAttendees,
         name: event.name,
         showup: event.attendees,
-        qr_code: event.qrCode,
+        qr_code,
         startDate: event.startDate.toDate(),
       }
     } catch (e) {
diff --git a/src/server/trpc/router/users/getUserProfile.ts b/src/server/trpc/router/users/getUserProfile.ts
index 65b8c26b..530efe24 100644
--- a/src/server/trpc/router/users/getUserProfile.ts
+++ b/src/server/trpc/router/users/getUserProfile.ts
@@ -7,6 +7,7 @@ export const getUserProfile = protectedProcedure
   .input(z.string())
   .query(async ({ input }) => {
     try {
+      if (!input) return null
       return await userCollection.getById(input)
     } catch (e) {
       throw new TRPCError({

From f608ad01264c5a522071ef59a27cbec18fa41b4e Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sat, 3 Jun 2023 23:35:58 +0800
Subject: [PATCH 094/223] Fix the remaining bugs

---
 src/server/db/models/Event.ts                        | 2 +-
 src/server/trpc/router/attendance/createEvent.ts     | 2 +-
 src/server/trpc/router/attendance/getEventForUser.ts | 2 +-
 src/server/trpc/router/attendance/getEventInfo.ts    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/db/models/Event.ts b/src/server/db/models/Event.ts
index d6630f1f..316e4bde 100644
--- a/src/server/db/models/Event.ts
+++ b/src/server/db/models/Event.ts
@@ -15,6 +15,6 @@ export type Event = {
   id?: string
   invitedAttendees: User[]
   name: string
-  qrCode: boolean
+  isQrRequired: boolean
   startDate: Timestamp
 }
diff --git a/src/server/trpc/router/attendance/createEvent.ts b/src/server/trpc/router/attendance/createEvent.ts
index 500bb142..eabaa6fd 100644
--- a/src/server/trpc/router/attendance/createEvent.ts
+++ b/src/server/trpc/router/attendance/createEvent.ts
@@ -38,7 +38,7 @@ export const createEvent = protectedProcedure
         invitedAttendees: users,
         name: input.name,
         startDate: Timestamp.fromDate(input.startDate),
-        qrCode: input.isQrRequired,
+        isQrRequired: input.isQrRequired,
       })
     } catch (e) {
       await logCollection.add({
diff --git a/src/server/trpc/router/attendance/getEventForUser.ts b/src/server/trpc/router/attendance/getEventForUser.ts
index 7e6d77d0..583e23b3 100644
--- a/src/server/trpc/router/attendance/getEventForUser.ts
+++ b/src/server/trpc/router/attendance/getEventForUser.ts
@@ -30,7 +30,7 @@ export const getEventForUser = protectedProcedure
         startDate: event.startDate.toDate(),
         endDate: event.endDate.toDate(),
         isAttendanceRequired,
-        hasUserMarkedAttendance: hasUserMarkedAttendance !== null,
+        hasUserMarkedAttendance,
       }
     } catch (e) {
       await logCollection.add({
diff --git a/src/server/trpc/router/attendance/getEventInfo.ts b/src/server/trpc/router/attendance/getEventInfo.ts
index 064f72e0..5e8c83f4 100644
--- a/src/server/trpc/router/attendance/getEventInfo.ts
+++ b/src/server/trpc/router/attendance/getEventInfo.ts
@@ -16,7 +16,7 @@ export const getEventInfo = protectedProcedure
       )
 
       let qr_code = undefined
-      if (qr_code) {
+      if (event.isQrRequired) {
         qr_code = await toDataURL(`${env.DOMAIN}/events/${event.id as string}`)
       }
 

From cf66588526b5a4ab1c4855b91160ddb15918a2e1 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sat, 3 Jun 2023 23:38:57 +0800
Subject: [PATCH 095/223] Fix User bug

---
 src/server/trpc/router/users/createSingleUser.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/trpc/router/users/createSingleUser.ts b/src/server/trpc/router/users/createSingleUser.ts
index ff594e92..8d547b3d 100644
--- a/src/server/trpc/router/users/createSingleUser.ts
+++ b/src/server/trpc/router/users/createSingleUser.ts
@@ -33,6 +33,7 @@ export const createSingleUser = protectedProcedure
           email,
           isAdmin,
           name,
+          id,
           hashedPassword,
           role,
         },

From a62e4eee29534a537de54985e73d167f063c9f05 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sat, 3 Jun 2023 23:49:19 +0800
Subject: [PATCH 096/223] Update Navbar to use image if there is

---
 src/components/common/TopNavbar.tsx |  5 +++--
 src/pages/api/auth/[...nextauth].ts |  1 +
 src/pages/calendar/index.tsx        |  5 ++++-
 src/pages/events/[id].tsx           |  5 ++++-
 src/pages/events/create.tsx         |  5 ++++-
 src/pages/events/index.tsx          |  5 ++++-
 src/pages/index.tsx                 |  9 ++++++---
 src/pages/profile/index.tsx         | 11 +++++++----
 src/pages/users/create.tsx          |  5 ++++-
 src/pages/users/index.tsx           |  5 ++++-
 10 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index b66bc11b..021814c8 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -5,9 +5,10 @@ import { useCallback } from 'react'
 
 interface TopNavbarProps {
   isAdmin: boolean
+  image: string
 }
 
-const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
+const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin, image }) => {
   const logout = useCallback(async () => {
     await signOut()
   }, [])
@@ -21,7 +22,7 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
         <Dropdown
           arrowIcon={false}
           inline={true}
-          label={<Avatar alt="User-settings" rounded={true} />}
+          label={<Avatar alt="User-settings" img={image} rounded={true} />}
         >
           <Link href="/" className="md:hidden">
             <Dropdown.Item>Home</Dropdown.Item>
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 2b9d8c9a..167237f6 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -70,6 +70,7 @@ export const authOptions: NextAuthOptions = {
             name: user.name,
             email: user.email,
             isAdmin: user.isAdmin,
+            image: user.image || '',
           }
         } catch (e) {
           throw new Error((e as Error).message)
diff --git a/src/pages/calendar/index.tsx b/src/pages/calendar/index.tsx
index d995dd8a..7d1257a7 100644
--- a/src/pages/calendar/index.tsx
+++ b/src/pages/calendar/index.tsx
@@ -45,7 +45,10 @@ const CalendarPage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The calendar page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
       <div className="grid-container grid grid-cols-5">
         <SideCalendar meetings={meetings} />
         <MainCalendar />
diff --git a/src/pages/events/[id].tsx b/src/pages/events/[id].tsx
index 853c1049..e26321ad 100644
--- a/src/pages/events/[id].tsx
+++ b/src/pages/events/[id].tsx
@@ -78,7 +78,10 @@ const ConfirmAttendance: React.FC<BaseProps> = ({ session }) => {
           content="The confirm attendance page for Atlas"
         />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
       <Container>
         <div className="flex w-full flex-col items-start">
           {data ? (
diff --git a/src/pages/events/create.tsx b/src/pages/events/create.tsx
index cfb8cc4a..a802f2ec 100644
--- a/src/pages/events/create.tsx
+++ b/src/pages/events/create.tsx
@@ -105,7 +105,10 @@ const EventPage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The create event page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
       <Container>
         <form onSubmit={handleSubmit(formSubmit)}>
           <h1 className="mb-10 text-center text-2xl font-bold">
diff --git a/src/pages/events/index.tsx b/src/pages/events/index.tsx
index 88b12252..19833f0c 100644
--- a/src/pages/events/index.tsx
+++ b/src/pages/events/index.tsx
@@ -80,7 +80,10 @@ const AttendancePage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The attendance page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
       <div className="px-2 sm:px-6 sm:pt-5 md:px-20 md:pt-5 lg:px-28 lg:pt-5">
         <h1 className="mb-10 text-center text-2xl font-bold">Attendance</h1>
         <VStack align="left" className="mb-10">
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 0be65f09..74faf096 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -4,7 +4,7 @@ import React, { useState } from 'react'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
 import { Box, Circle, Grid, GridItem, Heading, Input } from '@chakra-ui/react'
 
-const HomePage: React.FC<BaseProps> = ({ session }) => { 
+const HomePage: React.FC<BaseProps> = ({ session }) => {
   const [searchQuery, setSearchQuery] = useState('')
   const data = [
     {
@@ -80,7 +80,10 @@ const HomePage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The home page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
       <div className="flex flex-col bg-[#B1A6DB] p-16">
         <h1 className="text-left text-[50px] font-bold leading-none md:text-[88px]">
           Our
@@ -97,7 +100,7 @@ const HomePage: React.FC<BaseProps> = ({ session }) => {
         borderWidth="3px"
         w={{ base: '150px', md: '300px' }}
         border="3px solid #F9813E"
-        borderColor="#F9813E" 
+        borderColor="#F9813E"
         borderRadius="10px"
         className="mt-10 ml-8 mb-4"
         _placeholder={{
diff --git a/src/pages/profile/index.tsx b/src/pages/profile/index.tsx
index 82cfad8b..f44b937c 100644
--- a/src/pages/profile/index.tsx
+++ b/src/pages/profile/index.tsx
@@ -13,10 +13,13 @@ const ProfilePage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The profile page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
-      <Text className="m-8 text-center text-3xl font-semibold underline underline-offset-8"> 
-        Profile 
-      </Text> 
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
+      <Text className="m-8 text-center text-3xl font-semibold underline underline-offset-8">
+        Profile
+      </Text>
       <ProfileGrid session={session} studentId={session?.user?.id as string} />
     </Box>
   )
diff --git a/src/pages/users/create.tsx b/src/pages/users/create.tsx
index 29e7ae5a..84938372 100644
--- a/src/pages/users/create.tsx
+++ b/src/pages/users/create.tsx
@@ -16,7 +16,10 @@ const UserForm: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The create user page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
       <div className="m-auto w-[90%]">
         {/* Heading */}
         <h1 className="mb-5 font-[Inter] text-4xl font-semibold">
diff --git a/src/pages/users/index.tsx b/src/pages/users/index.tsx
index 448c0c30..c08e2e9f 100644
--- a/src/pages/users/index.tsx
+++ b/src/pages/users/index.tsx
@@ -11,7 +11,10 @@ const AdminUserPage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The login page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
 
       <DataTable />
     </>

From 571ab12d8ccf4bb4b6f39b207bc09967669fa161 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sat, 3 Jun 2023 23:58:38 +0800
Subject: [PATCH 097/223] Fix the bug where the profile image cannot be
 uploaded

---
 src/components/profile/ProfileCard.tsx        | 16 ++---
 src/components/profile/ProfileGrid.tsx        |  3 +-
 src/components/profile/ProfileInfo.tsx        | 55 +--------------
 .../trpc/router/users/createManyUsers 2.ts    | 67 +++++++++++++++++++
 .../trpc/router/users/createManyUsers.ts      |  2 +-
 5 files changed, 77 insertions(+), 66 deletions(-)
 create mode 100644 src/server/trpc/router/users/createManyUsers 2.ts

diff --git a/src/components/profile/ProfileCard.tsx b/src/components/profile/ProfileCard.tsx
index 5d87535a..86f45077 100644
--- a/src/components/profile/ProfileCard.tsx
+++ b/src/components/profile/ProfileCard.tsx
@@ -1,6 +1,5 @@
 import { trpc } from '../../utils/trpc'
 import { Box, Button, Image, Text } from '@chakra-ui/react'
-import type { Session } from 'next-auth'
 import { useRouter } from 'next/router'
 import UploadImageBtn from './UploadImageButton'
 
@@ -11,13 +10,11 @@ const ProfileCard = ({
   dept,
   role,
   studentId,
-  session,
 }: {
   name: string | null
   dept: string | null
   role: string | null
   studentId: string
-  session: Session
 }) => {
   const router = useRouter()
   const redirectToResetPassword = () => router.push('/auth/forgetpassword')
@@ -39,17 +36,16 @@ const ProfileCard = ({
           borderRadius="full"
           boxSize="170px"
         />
-        {session?.user?.id === studentId ?? (
-          <Box className="absolute bottom-0 right-0">
-            <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
-          </Box>
-        )}
+
+        <Box className="absolute bottom-0 right-0">
+          <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
+        </Box>
       </Box>
       <Box className="flex flex-col items-center py-2">
-        <Text textColor="##FFFFFF" className="text-2xl font-medium">
+        <Text textColor="#FFFFFF" className="text-2xl font-medium">
           {name}
         </Text>
-        <Text textColor="##FFFFFF">{dept}</Text>
+        <Text textColor="#FFFFFF">{dept}</Text>
         <Text textColor="#FFFFFF">{role}</Text>
       </Box>
       <Button
diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index 260518e2..8aa39b1a 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -31,14 +31,13 @@ const ProfileGrid = ({
           dept={data.department}
           role={data.role}
           studentId={studentId}
-          session={session}
         />
       </div>
       <div className="col-span-2 w-3/4">
         <ProfileContactInfo studentId={studentId} {...data} refetch={refetch} />
       </div>
       <div className="col-span-2 row-span-2 mb-10 w-3/4">
-        {/* <ProfileInfo {...data} /> */}
+        <ProfileInfo batch={data.batch as string} />
       </div>
     </div>
   )
diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index 13263710..32886653 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -1,11 +1,8 @@
 import { Box, Table, TableContainer, Tbody, Td, Tr } from '@chakra-ui/react'
 
 type ProfilePageType = {
-  gender: string | null
-  batch: string | null
-  year: string | null
-  faculty: string | null
-  major: string | null
+  batch: string | undefined
+
   // projects: Projects[]
 }
 
@@ -20,14 +17,6 @@ const ProfileInfo = (props: ProfilePageType) => {
       <TableContainer>
         <Table variant="unstyled" size="sm">
           <Tbody>
-            <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                GENDER
-              </Td>
-              <Td textColor="#002D70" className="font-light">
-                {props.gender}
-              </Td>
-            </Tr>
             <Tr>
               <Td textColor="#002D70" className="font-medium">
                 BATCH
@@ -36,46 +25,6 @@ const ProfileInfo = (props: ProfilePageType) => {
                 {props.batch}
               </Td>
             </Tr>
-            <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                YEAR
-              </Td>
-              <Td textColor="#002D70" className="font-light">
-                {props.year}
-              </Td>
-            </Tr>
-            <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                FACULTY
-              </Td>
-              <Td textColor="#002D70" className="font-light">
-                {props.faculty}
-              </Td>
-            </Tr>
-            <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                MAJOR
-              </Td>
-              <Td textColor="#002D70" className="font-light">
-                {props.major}
-              </Td>
-            </Tr>
-            {/* <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                PROJECTS
-              </Td>
-              {props.projects.map((project: Projects) => {
-                return (
-                  <Td
-                    key={project.project_id}
-                    textColor="#002D70"
-                    className="font-light"
-                  >
-                    {project.name}
-                  </Td>
-                )
-              })}
-            </Tr> */}
           </Tbody>
         </Table>
       </TableContainer>
diff --git a/src/server/trpc/router/users/createManyUsers 2.ts b/src/server/trpc/router/users/createManyUsers 2.ts
new file mode 100644
index 00000000..44a6649b
--- /dev/null
+++ b/src/server/trpc/router/users/createManyUsers 2.ts	
@@ -0,0 +1,67 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import { randomBytes } from 'crypto'
+import { hash } from 'bcryptjs'
+
+import { sendMultipleEmails } from '../util/helper'
+import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
+import { db } from '~/server/db/firebase'
+import type { User } from '~/server/db/models/User'
+import logCollection from '~/server/db/collections/LogCollection'
+import { Timestamp } from 'firebase/firestore'
+
+export const createManyUsers = protectedProcedure
+  .input(
+    z.array(
+      z.object({
+        department: z.string(),
+        name: z.string(),
+        nus_email: z.string(),
+        role: z.string(),
+        student_id: z.string(),
+      })
+    )
+  )
+  .mutation(async ({ input }) => {
+    try {
+      const password = randomBytes(10).toString('hex')
+      const hashedPassword = await hash(password, 10)
+      const emails: string[] = []
+
+      // Add user logic. Note that each firebase batch only allow up to 500 writes so we need an array for more than 500 users.
+      let batchIndex = 0
+      let counter = 0
+      const batches: WriteBatch[] = [writeBatch(db)]
+      input.forEach((user) => {
+        emails.push(user.nus_email)
+
+        batches[batchIndex]?.set(doc(db, 'users', user.student_id), {
+          department: user.department,
+          email: user.nus_email,
+          hashedPassword,
+          name: user.name,
+          isAdmin: false,
+          id: user.student_id,
+          role: user.role,
+        } as User)
+
+        counter += 1
+
+        if (counter === 499) {
+          batches.push(writeBatch(db))
+          batchIndex += 1
+          counter = 0
+        }
+      })
+
+      await Promise.all(batches.map(async (batch) => await batch.commit()))
+      await sendMultipleEmails(emails, password)
+    } catch (e) {
+      await logCollection.add({
+        createdAt: Timestamp.fromDate(new Date()),
+        level: 'WARNING',
+        description: (e as Error).message,
+        title: 'Error while uploading multiple users',
+      })
+    }
+  })
diff --git a/src/server/trpc/router/users/createManyUsers.ts b/src/server/trpc/router/users/createManyUsers.ts
index 44a6649b..04803a4e 100644
--- a/src/server/trpc/router/users/createManyUsers.ts
+++ b/src/server/trpc/router/users/createManyUsers.ts
@@ -3,7 +3,7 @@ import { z } from 'zod'
 import { randomBytes } from 'crypto'
 import { hash } from 'bcryptjs'
 
-import { sendMultipleEmails } from '../util/helper'
+import { sendMultipleEmails } from '../member/helper'
 import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
 import { db } from '~/server/db/firebase'
 import type { User } from '~/server/db/models/User'

From d9362f7fdc7341cceb4fc711ab0ba20f8fd572f5 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 4 Jun 2023 14:23:25 +0800
Subject: [PATCH 098/223] main applicants grid style update

---
 src/components/recruitment/ApplicantCard.tsx       | 8 ++++++--
 src/components/recruitment/AppliedRoleListItem.tsx | 4 ++--
 src/components/recruitment/DocumentModal.tsx       | 9 +++------
 src/components/recruitment/DocumentModalAdd.tsx    | 1 -
 src/components/recruitment/InfoPopup.tsx           | 1 -
 src/context/recruitment/SearchProvider.tsx         | 2 +-
 src/pages/recruitment/applicants.tsx               | 2 +-
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index a26bfea2..b1a0bfa7 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -6,6 +6,7 @@ import {
   Heading,
   Image,
   Stack,
+  Text,
   UnorderedList,
 } from '@chakra-ui/react'
 import { Avatar } from 'flowbite-react'
@@ -21,7 +22,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
   const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRole.id)
   return (
     <Card
-      maxWidth="sm"
+      maxWidth="xs"
       borderRadius="20"
       boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
     >
@@ -35,7 +36,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
         alt="blue wave background"
         borderTopLeftRadius="20"
         borderTopRightRadius="20"
-        boxSize="300px"
+        boxSize="500px"
         position="absolute"
         height="85px"
       />
@@ -55,6 +56,9 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
               />
             </Box>
           </Box>
+          <Text className="text-center" fontSize="xl" fontWeight="medium">
+            {appliedRole.department}
+          </Text>
           <UnorderedList styleType="none">
             <AppliedRoleListItem
               appliedRole={appliedRole}
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index 1b6ef2ff..5a5b4e32 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -1,4 +1,4 @@
-import { ListItem, Text } from '@chakra-ui/react'
+import { Box, ListItem, Text } from '@chakra-ui/react'
 import type { QueryObserverResult } from '@tanstack/react-query'
 import type { AppliedRole } from '~/server/db/models/AppliedRole'
 import StatusPopup from './StatusPopup'
@@ -13,7 +13,7 @@ const AppliedRoleListItem = ({
   return (
     <ListItem className="flex items-center justify-between">
       <Text>
-        {appliedRole.rank}. {appliedRole.department} - {appliedRole.role}
+        {appliedRole.rank}. {appliedRole.role}
       </Text>
       <StatusPopup
         status={appliedRole.status}
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
index 1c78f0a4..1caafe1c 100644
--- a/src/components/recruitment/DocumentModal.tsx
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -11,7 +11,7 @@ import {
 import { useEffect, useState } from 'react'
 import { BsFolder2Open } from 'react-icons/bs'
 import { StorageService } from '~/utils/storage'
-import DocumentModalAdd from './DocumentModalAdd'
+import DocumentModalCard from './DocumentModalCard'
 
 const DocumentModal = ({
   applicantId,
@@ -31,7 +31,6 @@ const DocumentModal = ({
       setFileList(fileList)
     }
     getFilesList()
-    console.log('fileList: ', fileList)
   }, [])
 
   return (
@@ -58,12 +57,10 @@ const DocumentModal = ({
           <ModalCloseButton />
           <ModalBody>
             <div className="my-5 mx-10 grid grid-cols-1 place-items-center gap-y-10 lg:grid-cols-2 ">
-              {/* {fileList.map((file) => {
-                console.log('file: ', file)
+              {fileList.map((file) => {
                 return <DocumentModalCard file={file} key={file} />
-              })} */}
+              })}
             </div>
-            <DocumentModalAdd applicantId={applicantId} />
           </ModalBody>
         </ModalContent>
       </Modal>
diff --git a/src/components/recruitment/DocumentModalAdd.tsx b/src/components/recruitment/DocumentModalAdd.tsx
index 3450c0ab..5a8a78dc 100644
--- a/src/components/recruitment/DocumentModalAdd.tsx
+++ b/src/components/recruitment/DocumentModalAdd.tsx
@@ -2,7 +2,6 @@ import { AddIcon } from '@chakra-ui/icons'
 import { Box, IconButton, Input, useToast } from '@chakra-ui/react'
 import { useState } from 'react'
 import { StorageService } from '~/utils/storage'
-import { ref, uploadBytes } from 'firebase/storage'
 import { uuidv4 } from '@firebase/util'
 import { Message } from '~/constant/messages'
 
diff --git a/src/components/recruitment/InfoPopup.tsx b/src/components/recruitment/InfoPopup.tsx
index d850a5ac..1fe7c122 100644
--- a/src/components/recruitment/InfoPopup.tsx
+++ b/src/components/recruitment/InfoPopup.tsx
@@ -6,7 +6,6 @@ import {
   ListItem,
   Popover,
   PopoverBody,
-  PopoverCloseButton,
   PopoverContent,
   PopoverTrigger,
   Text,
diff --git a/src/context/recruitment/SearchProvider.tsx b/src/context/recruitment/SearchProvider.tsx
index 0405535d..2ef0ef68 100644
--- a/src/context/recruitment/SearchProvider.tsx
+++ b/src/context/recruitment/SearchProvider.tsx
@@ -1,4 +1,4 @@
-import { createContext, Dispatch, SetStateAction, useState } from 'react'
+import { createContext, useState } from 'react'
 
 type SearchContextType = {
   search: string
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 1b501ce3..ecf7b745 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -23,7 +23,7 @@ const ApplicantsPage: React.FC<BaseProps> = ({
         />
       </Head>
       <TopNavbar isAdmin={session.isAdmin} />
-      <Box position="relative" mt="10">
+      <Box position="relative" mt="10" mb="10">
         <Text className="text-center text-4xl font-bold">Applicants</Text>
         <SearchProvider>
           <SearchBar />

From 22f3a17794d245ebc171417799c03bfc1ff4c836 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 4 Jun 2023 15:21:05 +0800
Subject: [PATCH 099/223] Applicant card style changes

---
 src/components/recruitment/ApplicantCard.tsx  | 27 +++++++++----------
 .../recruitment/AppliedRoleListItem.tsx       |  2 +-
 src/components/recruitment/DocumentModal.tsx  |  5 ++--
 src/components/recruitment/NoteModal.tsx      |  5 ++--
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index b1a0bfa7..d760e002 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -43,22 +43,19 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
       <CardBody className="relative" pt="10px">
         <Stack>
           <Avatar alt="User-settings" rounded={true} size="lg" />
-          <Box className="flex justify-center">
-            <Box>
-              <DocumentModal
-                applicantId={applicant.id}
-                applicantName={applicant.name}
-              />
-              <NoteModal
-                appliedRoleId={appliedRole.id}
-                interviewNotes={appliedRole.interviewNotes}
-                refetch={refetch}
-              />
-            </Box>
-          </Box>
-          <Text className="text-center" fontSize="xl" fontWeight="medium">
-            {appliedRole.department}
+          <DocumentModal
+            applicantId={applicant.id}
+            applicantName={applicant.name}
+          />
+          <NoteModal
+            appliedRoleId={appliedRole.id}
+            interviewNotes={appliedRole.interviewNotes}
+            refetch={refetch}
+          />
+          <Text className="text-center">
+            {appliedRole.department.toUpperCase()}
           </Text>
+          <Text>Role Applied:</Text>
           <UnorderedList styleType="none">
             <AppliedRoleListItem
               appliedRole={appliedRole}
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index 5a5b4e32..73ec287b 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -12,7 +12,7 @@ const AppliedRoleListItem = ({
 }) => {
   return (
     <ListItem className="flex items-center justify-between">
-      <Text>
+      <Text fontWeight="medium">
         {appliedRole.rank}. {appliedRole.role}
       </Text>
       <StatusPopup
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
index 1caafe1c..537cb9c7 100644
--- a/src/components/recruitment/DocumentModal.tsx
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -1,4 +1,5 @@
 import {
+  Box,
   IconButton,
   Modal,
   ModalBody,
@@ -34,7 +35,7 @@ const DocumentModal = ({
   }, [])
 
   return (
-    <>
+    <Box className="absolute left-5 top-10">
       <IconButton
         aria-label="Upload documents"
         icon={<BsFolder2Open />}
@@ -64,7 +65,7 @@ const DocumentModal = ({
           </ModalBody>
         </ModalContent>
       </Modal>
-    </>
+    </Box>
   )
 }
 
diff --git a/src/components/recruitment/NoteModal.tsx b/src/components/recruitment/NoteModal.tsx
index 5f56b0e6..8273cad0 100644
--- a/src/components/recruitment/NoteModal.tsx
+++ b/src/components/recruitment/NoteModal.tsx
@@ -1,4 +1,5 @@
 import {
+  Box,
   Button,
   IconButton,
   Input,
@@ -73,7 +74,7 @@ const NoteModal = ({
   }
 
   return (
-    <>
+    <Box className="absolute right-5 top-10">
       <IconButton
         aria-label="Interview notes"
         icon={<BsFileEarmark />}
@@ -120,7 +121,7 @@ const NoteModal = ({
           </ModalFooter>
         </ModalContent>
       </Modal>
-    </>
+    </Box>
   )
 }
 

From 3f0b3df767ae07f2fbb18b5b8166ea51eb81c712 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 4 Jun 2023 15:22:57 +0800
Subject: [PATCH 100/223] Remove unused imports

---
 src/components/recruitment/ApplicantCard.tsx       | 1 -
 src/components/recruitment/AppliedRoleListItem.tsx | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index d760e002..3a7d1a89 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -1,5 +1,4 @@
 import {
-  Box,
   Card,
   CardBody,
   CardHeader,
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index 73ec287b..f93a9989 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -1,4 +1,4 @@
-import { Box, ListItem, Text } from '@chakra-ui/react'
+import { ListItem, Text } from '@chakra-ui/react'
 import type { QueryObserverResult } from '@tanstack/react-query'
 import type { AppliedRole } from '~/server/db/models/AppliedRole'
 import StatusPopup from './StatusPopup'

From 8a05353f6418079f13c830b3eac53d7d018b31c1 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 4 Jun 2023 16:52:43 +0800
Subject: [PATCH 101/223] bug fix application status and tasks page, commented
 out most of the code in the calendar parts so that it can compile

---
 src/components/calendar/MainCalendar.tsx |  12 +-
 src/components/calendar/Meeting.tsx      | 127 ++++-----
 src/components/calendar/SideCalendar.tsx | 311 ++++++++++++-----------
 src/pages/application_status/index.tsx   |  20 +-
 src/pages/tasks/index.tsx                |   7 +-
 5 files changed, 239 insertions(+), 238 deletions(-)

diff --git a/src/components/calendar/MainCalendar.tsx b/src/components/calendar/MainCalendar.tsx
index c41863d1..4196e671 100644
--- a/src/components/calendar/MainCalendar.tsx
+++ b/src/components/calendar/MainCalendar.tsx
@@ -1,7 +1,7 @@
-import FullCalendar from '@fullcalendar/react' // must go before plugins
-import dayGridPlugin from '@fullcalendar/daygrid'
-import interactionPlugin from '@fullcalendar/interaction'
-import timeGridPlugin from '@fullcalendar/timegrid'
+// import FullCalendar from '@fullcalendar/react' // must go before plugins
+// import dayGridPlugin from '@fullcalendar/daygrid'
+// import interactionPlugin from '@fullcalendar/interaction'
+// import timeGridPlugin from '@fullcalendar/timegrid'
 import styled from '@emotion/styled'
 import { useState } from 'react'
 
@@ -15,7 +15,7 @@ const MainCalendar = () => {
 
   return (
     <StyleWrapper className="col-span-4">
-      <FullCalendar
+      {/* <FullCalendar
         plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
         initialView="dayGridMonth"
         headerToolbar={{
@@ -28,7 +28,7 @@ const MainCalendar = () => {
         eventClick={(info) => {
           alert('Event: ' + info.event.title)
         }}
-      />
+      /> */}
     </StyleWrapper>
   )
 }
diff --git a/src/components/calendar/Meeting.tsx b/src/components/calendar/Meeting.tsx
index 7ef3363c..0458d27c 100644
--- a/src/components/calendar/Meeting.tsx
+++ b/src/components/calendar/Meeting.tsx
@@ -1,6 +1,6 @@
-import { Menu } from '@headlessui/react'
-import { format, parseISO } from 'date-fns'
-import { DotsVerticalIcon } from '@heroicons/react/outline'
+// import { Menu } from '@headlessui/react'
+// import { format, parseISO } from 'date-fns'
+// import { DotsVerticalIcon } from '@heroicons/react/outline'
 
 export type Meeting = {
   id: number
@@ -17,67 +17,68 @@ function combineClasses(classes: string[]) {
 }
 
 export default function Meeting({ meeting }: meeting) {
-  const startDateTime = parseISO(meeting.start)
-  const endDateTime = parseISO(meeting.end)
+  // const startDateTime = parseISO(meeting.start)
+  // const endDateTime = parseISO(meeting.end)
 
   return (
-    <li className="group flex items-center space-x-4 rounded-xl px-4 py-2 focus-within:bg-green-400 hover:bg-green-400">
-      <div className="flex-auto text-white">
-        <p className="font-bold">{meeting.title}</p>
-        <p className="mt-0.5">
-          <time dateTime={meeting.start}>
-            {format(startDateTime, 'h:mm a')}
-          </time>{' '}
-          - <time dateTime={meeting.end}>{format(endDateTime, 'h:mm a')}</time>
-        </p>
-      </div>
-      <Menu
-        as="div"
-        className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
-      >
-        <div>
-          <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
-            <span className="sr-only">Open options</span>
-            <DotsVerticalIcon className="h-6 w-6" aria-hidden="true" />
-          </Menu.Button>
-        </div>
-        <Menu.Items className="absolute right-0 z-10 mt-2 w-36 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
-          <div className="py-1">
-            <Menu.Item>
-              {({ active }) => (
-                <button
-                  className={combineClasses(
-                    ['block px-4 py-2 text-sm'].concat(
-                      active ? 'bg-gray-100 text-black' : 'text-gray-900'
-                    )
-                  )}
-                  onClick={() => {
-                    alert('You want to edit meeting')
-                  }}
-                >
-                  Edit Meeting
-                </button>
-              )}
-            </Menu.Item>
-            <Menu.Item>
-              {({ active }) => (
-                <button
-                  className={combineClasses(
-                    ['block px-4 py-2 text-sm'].concat(
-                      active ? 'bg-gray-100 text-black' : 'text-gray-900'
-                    )
-                  )}
-                  onClick={() => {
-                    alert('You want to cancel meeting')
-                  }}
-                >
-                  Cancel Meeting
-                </button>
-              )}
-            </Menu.Item>
-          </div>
-        </Menu.Items>
-      </Menu>
-    </li>
+    <div></div>
+    // <li className="group flex items-center space-x-4 rounded-xl px-4 py-2 focus-within:bg-green-400 hover:bg-green-400">
+    //   <div className="flex-auto text-white">
+    //     <p className="font-bold">{meeting.title}</p>
+    //     <p className="mt-0.5">
+    //       <time dateTime={meeting.start}>
+    //         {format(startDateTime, 'h:mm a')}
+    //       </time>{' '}
+    //       - <time dateTime={meeting.end}>{format(endDateTime, 'h:mm a')}</time>
+    //     </p>
+    //   </div>
+    //   <Menu
+    //     as="div"
+    //     className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
+    //   >
+    //     <div>
+    //       <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
+    //         <span className="sr-only">Open options</span>
+    //         <DotsVerticalIcon className="h-6 w-6" aria-hidden="true" />
+    //       </Menu.Button>
+    //     </div>
+    //     <Menu.Items className="absolute right-0 z-10 mt-2 w-36 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+    //       <div className="py-1">
+    //         <Menu.Item>
+    //           {({ active }) => (
+    //             <button
+    //               className={combineClasses(
+    //                 ['block px-4 py-2 text-sm'].concat(
+    //                   active ? 'bg-gray-100 text-black' : 'text-gray-900'
+    //                 )
+    //               )}
+    //               onClick={() => {
+    //                 alert('You want to edit meeting')
+    //               }}
+    //             >
+    //               Edit Meeting
+    //             </button>
+    //           )}
+    //         </Menu.Item>
+    //         <Menu.Item>
+    //           {({ active }) => (
+    //             <button
+    //               className={combineClasses(
+    //                 ['block px-4 py-2 text-sm'].concat(
+    //                   active ? 'bg-gray-100 text-black' : 'text-gray-900'
+    //                 )
+    //               )}
+    //               onClick={() => {
+    //                 alert('You want to cancel meeting')
+    //               }}
+    //             >
+    //               Cancel Meeting
+    //             </button>
+    //           )}
+    //         </Menu.Item>
+    //       </div>
+    //     </Menu.Items>
+    //   </Menu>
+    // </li>
   )
 }
diff --git a/src/components/calendar/SideCalendar.tsx b/src/components/calendar/SideCalendar.tsx
index f5a4a7fe..5cd91f69 100644
--- a/src/components/calendar/SideCalendar.tsx
+++ b/src/components/calendar/SideCalendar.tsx
@@ -1,18 +1,18 @@
-import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/solid'
-import {
-  add,
-  eachDayOfInterval,
-  endOfMonth,
-  getDay,
-  format,
-  parseISO,
-  isEqual,
-  isSameDay,
-  isSameMonth,
-  isToday,
-  parse,
-  startOfToday,
-} from 'date-fns'
+// import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/solid'
+// import {
+//   add,
+//   eachDayOfInterval,
+//   endOfMonth,
+//   getDay,
+//   format,
+//   parseISO,
+//   isEqual,
+//   isSameDay,
+//   isSameMonth,
+//   isToday,
+//   parse,
+//   startOfToday,
+// } from 'date-fns'
 import { useState } from 'react'
 import Meeting from './Meeting'
 
@@ -32,147 +32,154 @@ function classNames(...classes: any[]) {
 }
 
 export default function SideCalendar({ meetings }: Meetings) {
-  const today = startOfToday()
-  const [selectedDay, setSelectedDay] = useState(today)
-  const [currentMonth, setCurrentMonth] = useState(format(today, 'MMM-yyyy'))
-  const firstDayCurrentMonth = parse(currentMonth, 'MMM-yyyy', new Date())
+  return (
+    <div>
+      </div>
+  )
+  
+}
+  
+//   const today = startOfToday()
+//   const [selectedDay, setSelectedDay] = useState(today)
+//   const [currentMonth, setCurrentMonth] = useState(format(today, 'MMM-yyyy'))
+//   const firstDayCurrentMonth = parse(currentMonth, 'MMM-yyyy', new Date())
 
-  const days = eachDayOfInterval({
-    start: firstDayCurrentMonth,
-    end: endOfMonth(firstDayCurrentMonth),
-  })
+//   const days = eachDayOfInterval({
+//     start: firstDayCurrentMonth,
+//     end: endOfMonth(firstDayCurrentMonth),
+//   })
 
-  function previousMonth() {
-    const firstDayNextMonth = add(firstDayCurrentMonth, { months: -1 })
-    setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
-  }
+//   function previousMonth() {
+//     const firstDayNextMonth = add(firstDayCurrentMonth, { months: -1 })
+//     setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
+//   }
 
-  function nextMonth() {
-    const firstDayNextMonth = add(firstDayCurrentMonth, { months: 1 })
-    setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
-  }
+//   function nextMonth() {
+//     const firstDayNextMonth = add(firstDayCurrentMonth, { months: 1 })
+//     setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
+//   }
 
-  const selectedDayMeetings = meetings?.filter((meeting) =>
-    isSameDay(parseISO(meeting.start), selectedDay)
-  )
+//   const selectedDayMeetings = meetings?.filter((meeting) =>
+//     isSameDay(parseISO(meeting.start), selectedDay)
+//   )
 
-  return (
-    <div className="col-span-1 bg-zinc-900 pt-16">
-      <div className="mx-auto max-w-md px-4 sm:px-7 md:max-w-4xl md:px-6">
-        <div className="md:grid md:grid-rows-2">
-          <div className="md:pr-14">
-            <div className="flex items-center">
-              <h2 className="flex-auto text-4xl font-semibold text-white">
-                {format(firstDayCurrentMonth, 'MMMM yyyy')}
-              </h2>
-              <button
-                type="button"
-                onClick={previousMonth}
-                className="-my-1.5 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
-              >
-                <span className="sr-only">Previous month</span>
-                <ChevronLeftIcon className="h-5 w-5" aria-hidden="true" />
-              </button>
-              <button
-                onClick={nextMonth}
-                type="button"
-                className="-my-1.5 -mr-1.5 ml-2 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
-              >
-                <span className="sr-only">Next month</span>
-                <ChevronRightIcon className="h-5 w-5" aria-hidden="true" />
-              </button>
-            </div>
-            <div className="mt-10 grid grid-cols-7 text-center text-xs leading-6 text-gray-500">
-              <div>S</div>
-              <div>M</div>
-              <div>T</div>
-              <div>W</div>
-              <div>T</div>
-              <div>F</div>
-              <div>S</div>
-            </div>
-            <div className="mt-2 grid grid-cols-7 text-sm">
-              {days.map((day, dayIdx) => (
-                <div
-                  key={day.toString()}
-                  className={classNames(
-                    dayIdx === 0 && colStartClasses[getDay(day)],
-                    'py-1.5'
-                  )}
-                >
-                  <button
-                    type="button"
-                    onClick={() => setSelectedDay(day)}
-                    className={classNames(
-                      !isEqual(day, selectedDay) &&
-                        isToday(day) &&
-                        'text-red-500',
-                      !isEqual(day, selectedDay) &&
-                        !isToday(day) &&
-                        isSameMonth(day, firstDayCurrentMonth) &&
-                        'text-gray-900',
-                      !isEqual(day, selectedDay) &&
-                        !isToday(day) &&
-                        !isSameMonth(day, firstDayCurrentMonth) &&
-                        'text-gray-400',
-                      isEqual(day, selectedDay) && isToday(day) && 'bg-red-500',
-                      isEqual(day, selectedDay) &&
-                        !isToday(day) &&
-                        'bg-blue-400',
-                      !isEqual(day, selectedDay) && 'hover:bg-yellow-400',
-                      (isEqual(day, selectedDay) || isToday(day)) &&
-                        'font-semibold',
-                      'mx-auto flex h-8 w-8 items-center justify-center rounded-full'
-                    )}
-                  >
-                    <time
-                      className="text-white"
-                      dateTime={format(day, 'yyyy-MM-dd')}
-                    >
-                      {format(day, 'd')}
-                    </time>
-                  </button>
+//   return (
+//     <div className="col-span-1 bg-zinc-900 pt-16">
+//       <div className="mx-auto max-w-md px-4 sm:px-7 md:max-w-4xl md:px-6">
+//         <div className="md:grid md:grid-rows-2">
+//           <div className="md:pr-14">
+//             <div className="flex items-center">
+//               <h2 className="flex-auto text-4xl font-semibold text-white">
+//                 {format(firstDayCurrentMonth, 'MMMM yyyy')}
+//               </h2>
+//               <button
+//                 type="button"
+//                 onClick={previousMonth}
+//                 className="-my-1.5 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
+//               >
+//                 <span className="sr-only">Previous month</span>
+//                 <ChevronLeftIcon className="h-5 w-5" aria-hidden="true" />
+//               </button>
+//               <button
+//                 onClick={nextMonth}
+//                 type="button"
+//                 className="-my-1.5 -mr-1.5 ml-2 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
+//               >
+//                 <span className="sr-only">Next month</span>
+//                 <ChevronRightIcon className="h-5 w-5" aria-hidden="true" />
+//               </button>
+//             </div>
+//             <div className="mt-10 grid grid-cols-7 text-center text-xs leading-6 text-gray-500">
+//               <div>S</div>
+//               <div>M</div>
+//               <div>T</div>
+//               <div>W</div>
+//               <div>T</div>
+//               <div>F</div>
+//               <div>S</div>
+//             </div>
+//             <div className="mt-2 grid grid-cols-7 text-sm">
+//               {days.map((day, dayIdx) => (
+//                 <div
+//                   key={day.toString()}
+//                   className={classNames(
+//                     dayIdx === 0 && colStartClasses[getDay(day)],
+//                     'py-1.5'
+//                   )}
+//                 >
+//                   <button
+//                     type="button"
+//                     onClick={() => setSelectedDay(day)}
+//                     className={classNames(
+//                       !isEqual(day, selectedDay) &&
+//                         isToday(day) &&
+//                         'text-red-500',
+//                       !isEqual(day, selectedDay) &&
+//                         !isToday(day) &&
+//                         isSameMonth(day, firstDayCurrentMonth) &&
+//                         'text-gray-900',
+//                       !isEqual(day, selectedDay) &&
+//                         !isToday(day) &&
+//                         !isSameMonth(day, firstDayCurrentMonth) &&
+//                         'text-gray-400',
+//                       isEqual(day, selectedDay) && isToday(day) && 'bg-red-500',
+//                       isEqual(day, selectedDay) &&
+//                         !isToday(day) &&
+//                         'bg-blue-400',
+//                       !isEqual(day, selectedDay) && 'hover:bg-yellow-400',
+//                       (isEqual(day, selectedDay) || isToday(day)) &&
+//                         'font-semibold',
+//                       'mx-auto flex h-8 w-8 items-center justify-center rounded-full'
+//                     )}
+//                   >
+//                     <time
+//                       className="text-white"
+//                       dateTime={format(day, 'yyyy-MM-dd')}
+//                     >
+//                       {format(day, 'd')}
+//                     </time>
+//                   </button>
 
-                  <div className="mx-auto mt-1 h-1 w-1">
-                    {meetings?.some((meeting) =>
-                      isSameDay(parseISO(meeting.start), day)
-                    ) && (
-                      <div className="h-1 w-1 rounded-full bg-violet-700"></div>
-                    )}
-                  </div>
-                </div>
-              ))}
-            </div>
-          </div>
-          <section className="divide-y divide-gray-400">
-            <h2 className="text-center font-semibold text-blue-700">
-              {isSameDay(today, selectedDay) ? 'TODAY ' : ''}
-              <time dateTime={format(selectedDay, 'yyyy-MM-dd')}>
-                {format(selectedDay, 'dd/LL/yyyy')}
-              </time>
-            </h2>
-            <ol className="text-sm leading-6 text-gray-500">
-              {selectedDayMeetings?.length > 0 ? (
-                selectedDayMeetings?.map((meeting) => (
-                  <Meeting meeting={meeting} key={meeting.id} />
-                ))
-              ) : (
-                <p>No meetings for today.</p>
-              )}
-            </ol>
-          </section>
-        </div>
-      </div>
-    </div>
-  )
-}
+//                   <div className="mx-auto mt-1 h-1 w-1">
+//                     {meetings?.some((meeting) =>
+//                       isSameDay(parseISO(meeting.start), day)
+//                     ) && (
+//                       <div className="h-1 w-1 rounded-full bg-violet-700"></div>
+//                     )}
+//                   </div>
+//                 </div>
+//               ))}
+//             </div>
+//           </div>
+//           <section className="divide-y divide-gray-400">
+//             <h2 className="text-center font-semibold text-blue-700">
+//               {isSameDay(today, selectedDay) ? 'TODAY ' : ''}
+//               <time dateTime={format(selectedDay, 'yyyy-MM-dd')}>
+//                 {format(selectedDay, 'dd/LL/yyyy')}
+//               </time>
+//             </h2>
+//             <ol className="text-sm leading-6 text-gray-500">
+//               {selectedDayMeetings?.length > 0 ? (
+//                 selectedDayMeetings?.map((meeting) => (
+//                   <Meeting meeting={meeting} key={meeting.id} />
+//                 ))
+//               ) : (
+//                 <p>No meetings for today.</p>
+//               )}
+//             </ol>
+//           </section>
+//         </div>
+//       </div>
+//     </div>
+//   )
+// }
 
-const colStartClasses = [
-  '',
-  'col-start-2',
-  'col-start-3',
-  'col-start-4',
-  'col-start-5',
-  'col-start-6',
-  'col-start-7',
-]
+// const colStartClasses = [
+//   '',
+//   'col-start-2',
+//   'col-start-3',
+//   'col-start-4',
+//   'col-start-5',
+//   'col-start-6',
+//   'col-start-7',
+// ]
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 44e7fd8c..ea1ef42b 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -13,11 +13,13 @@ enum PageState {
   FORGET_PASSWORD,
 }
 
-const application_status:React.FC<BaseProps> = ({ session }) =>{
+const Application_Status:React.FC<BaseProps> = ({ session }) =>{
 
   //this part needs backend to update the status
   const application_status = "accepted"
-  const { isOpen, onOpen, onClose } = useDisclosure()
+  const [isOpen, setIsOpen] = useState(false)
+  const onOpen = () => setIsOpen(true)
+  const onClose = () => setIsOpen(false)  
 
   const [pageState, setPageState] = useState(PageState.LOGIN)
   const roles = [
@@ -37,15 +39,10 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
       status: 'rejected'
     }
 
-
-
   ]
   const status =[
     {status: 'accepty'}
   ]
-
-  
-
   return (
     <>
       <Head>
@@ -148,14 +145,9 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
                     {/* Rejected */}
                   </h3>
                 }
-                
-                
-                
-               
                 </div>
                 </div>
 
-
             ))}
              <div style={{ position: 'fixed', bottom: '40px', right: '60px' }}>
               <button 
@@ -179,7 +171,7 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
             
         </button>
         </div>
-        <Modal   isOpen={isOpen} onClose={onClose}>
+        <Modal  isOpen={isOpen} onClose={onClose}>
             <ModalOverlay 
             bg='none'
             backdropFilter='auto'
@@ -269,4 +261,4 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
 }
 
 
-export default withAuth(application_status, true)
\ No newline at end of file
+export default withAuth(Application_Status)
\ No newline at end of file
diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 07339ebc..66978196 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -16,7 +16,7 @@ enum PageState {
   FORGET_PASSWORD,
 }
 
-const tasks:React.FC<BaseProps> = ({ session }) => {
+const Tasks:React.FC<BaseProps> = ({ session }) => {
 
   const [searchQuery, setSearchQuery] = useState('')
   const { isOpen, onOpen, onClose } = useDisclosure()
@@ -149,6 +149,7 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
     {/* Data rows */}
     {filteredData.map((item) => (
       <Grid
+      key={item.id}
       className='mt-[2%] ml-[11%]'
       templateColumns={{
         base: 'repeat(3, 1fr)',
@@ -215,7 +216,7 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
         cursor="pointer"
         _hover={{ textDecoration: 'underline' }}
         className='text-xl text-white'
-        onClick={() => {;setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
+        onClick={() => {setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
        
       >
         {item.name}
@@ -276,4 +277,4 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
   )
 }
 
-export default withAuth(tasks, true)
\ No newline at end of file
+export default withAuth(Tasks, true)
\ No newline at end of file

From d4348cc4d2add9385a75772689780e91bd4e2f88 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 4 Jun 2023 17:17:44 +0800
Subject: [PATCH 102/223] include id for createSingleUser

---
 src/server/trpc/router/users/createSingleUser.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/trpc/router/users/createSingleUser.ts b/src/server/trpc/router/users/createSingleUser.ts
index ff594e92..3919571e 100644
--- a/src/server/trpc/router/users/createSingleUser.ts
+++ b/src/server/trpc/router/users/createSingleUser.ts
@@ -29,6 +29,7 @@ export const createSingleUser = protectedProcedure
 
       await userCollection.set(
         {
+          id,
           department,
           email,
           isAdmin,

From 75bcd8a9fe8f82dddbb17c7fc48af3fb7e7e38c0 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 4 Jun 2023 18:09:52 +0800
Subject: [PATCH 103/223] change the calendar components back after updated
 dependencies are installed

---
 prisma/schema.prisma                     |  80 +++---
 src/components/calendar/MainCalendar.tsx |  12 +-
 src/components/calendar/Meeting.tsx      | 128 +++++-----
 src/components/calendar/SideCalendar.tsx | 311 +++++++++++------------
 src/components/common/TopNavbar.tsx      |  15 +-
 src/pages/api/auth/[...nextauth].ts      |   1 +
 src/pages/application_status/index.tsx   |   8 +-
 7 files changed, 286 insertions(+), 269 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 881bfe99..9a7b2dd1 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -7,47 +7,32 @@ datasource db {
   url      = env("DATABASE_URL")
 }
 
-model Projects {
-  description  String
-  difficulty   Int
-  rating       Int
-  departments  String?
-  project_id   Int          @id
-  name         String
-  team_lead    String
-  created_date DateTime
-  Departments  Departments? @relation(fields: [departments], references: [department_id])
-  User         User[]       @relation("ProjectsToUser")
-}
-
-model Departments {
-  department_id String     @id
-  name          String
-  projects      Projects[]
-}
-
 model User {
   batch           String?
-  department      String
   discord         String?
-  email           String       @unique
+  email           String        @unique
   faculty         String?
   gender          String?
   hashedPassword  String
-  id              String       @id
+  id              String        @id
   image           String?
   major           String?
   name            String
   personal_email  String?
   role            String
   telegram        String?
-  total_events    Int?         @default(0)
+  total_events    Int?          @default(0)
   year            String?
-  isAdmin         Boolean?     @default(false)
+  isAdmin         Boolean?      @default(false)
+  wallet          String?
+  departmentId    String?
+  interviewNotes  String?
+  AppliedRole     AppliedRole[]
   AttendanceTaken Attendance[]
-  events          Event[]      @relation("EventToUser")
-  projects        Projects[]   @relation("ProjectsToUser")
-  Attendance      Attendance[] @relation("attendanceToUser")
+  Department      Department?   @relation(fields: [departmentId], references: [department_id])
+  events          Event[]       @relation("EventToUser")
+  Project         Project[]     @relation("ProjectToUser")
+  Attendance      Attendance[]  @relation("attendanceToUser")
 }
 
 model Event {
@@ -78,12 +63,47 @@ model Attendance {
   User    User[] @relation("attendanceToUser")
 }
 
-model EmailTemplates {
-  template String
-  type     String @id @unique
+model AppliedRole {
+  id           String            @id
+  rank         Int
+  departmentId String
+  role         String
+  status       ApplicationStatus
+  applicantId  String
+  User         User              @relation(fields: [applicantId], references: [id])
+  Department   Department        @relation(fields: [departmentId], references: [department_id])
+}
+
+model Department {
+  department_id String        @id
+  name          String
+  AppliedRole   AppliedRole[]
+  Project       Project[]
+  User          User[]
+}
+
+model Project {
+  description  String
+  difficulty   Int
+  rating       Int
+  department   String?
+  project_id   String      @id
+  name         String
+  team_lead    String
+  created_date DateTime
+  Department   Department? @relation(fields: [department], references: [department_id])
+  User         User[]      @relation("ProjectToUser")
 }
 
 enum LogType {
   WARNING
   ERROR
 }
+
+enum ApplicationStatus {
+  ACCEPTED
+  OFFERED
+  PENDINGREVIEW
+  INTERVIEWED
+  REJECTED
+}
diff --git a/src/components/calendar/MainCalendar.tsx b/src/components/calendar/MainCalendar.tsx
index 4196e671..c41863d1 100644
--- a/src/components/calendar/MainCalendar.tsx
+++ b/src/components/calendar/MainCalendar.tsx
@@ -1,7 +1,7 @@
-// import FullCalendar from '@fullcalendar/react' // must go before plugins
-// import dayGridPlugin from '@fullcalendar/daygrid'
-// import interactionPlugin from '@fullcalendar/interaction'
-// import timeGridPlugin from '@fullcalendar/timegrid'
+import FullCalendar from '@fullcalendar/react' // must go before plugins
+import dayGridPlugin from '@fullcalendar/daygrid'
+import interactionPlugin from '@fullcalendar/interaction'
+import timeGridPlugin from '@fullcalendar/timegrid'
 import styled from '@emotion/styled'
 import { useState } from 'react'
 
@@ -15,7 +15,7 @@ const MainCalendar = () => {
 
   return (
     <StyleWrapper className="col-span-4">
-      {/* <FullCalendar
+      <FullCalendar
         plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
         initialView="dayGridMonth"
         headerToolbar={{
@@ -28,7 +28,7 @@ const MainCalendar = () => {
         eventClick={(info) => {
           alert('Event: ' + info.event.title)
         }}
-      /> */}
+      />
     </StyleWrapper>
   )
 }
diff --git a/src/components/calendar/Meeting.tsx b/src/components/calendar/Meeting.tsx
index 0458d27c..288b859b 100644
--- a/src/components/calendar/Meeting.tsx
+++ b/src/components/calendar/Meeting.tsx
@@ -1,6 +1,6 @@
-// import { Menu } from '@headlessui/react'
-// import { format, parseISO } from 'date-fns'
-// import { DotsVerticalIcon } from '@heroicons/react/outline'
+import { Menu } from '@headlessui/react'
+import { format, parseISO } from 'date-fns'
+import { DotsVerticalIcon } from '@heroicons/react/outline'
 
 export type Meeting = {
   id: number
@@ -17,68 +17,68 @@ function combineClasses(classes: string[]) {
 }
 
 export default function Meeting({ meeting }: meeting) {
-  // const startDateTime = parseISO(meeting.start)
-  // const endDateTime = parseISO(meeting.end)
+  const startDateTime = parseISO(meeting.start)
+  const endDateTime = parseISO(meeting.end)
 
   return (
-    <div></div>
-    // <li className="group flex items-center space-x-4 rounded-xl px-4 py-2 focus-within:bg-green-400 hover:bg-green-400">
-    //   <div className="flex-auto text-white">
-    //     <p className="font-bold">{meeting.title}</p>
-    //     <p className="mt-0.5">
-    //       <time dateTime={meeting.start}>
-    //         {format(startDateTime, 'h:mm a')}
-    //       </time>{' '}
-    //       - <time dateTime={meeting.end}>{format(endDateTime, 'h:mm a')}</time>
-    //     </p>
-    //   </div>
-    //   <Menu
-    //     as="div"
-    //     className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
-    //   >
-    //     <div>
-    //       <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
-    //         <span className="sr-only">Open options</span>
-    //         <DotsVerticalIcon className="h-6 w-6" aria-hidden="true" />
-    //       </Menu.Button>
-    //     </div>
-    //     <Menu.Items className="absolute right-0 z-10 mt-2 w-36 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
-    //       <div className="py-1">
-    //         <Menu.Item>
-    //           {({ active }) => (
-    //             <button
-    //               className={combineClasses(
-    //                 ['block px-4 py-2 text-sm'].concat(
-    //                   active ? 'bg-gray-100 text-black' : 'text-gray-900'
-    //                 )
-    //               )}
-    //               onClick={() => {
-    //                 alert('You want to edit meeting')
-    //               }}
-    //             >
-    //               Edit Meeting
-    //             </button>
-    //           )}
-    //         </Menu.Item>
-    //         <Menu.Item>
-    //           {({ active }) => (
-    //             <button
-    //               className={combineClasses(
-    //                 ['block px-4 py-2 text-sm'].concat(
-    //                   active ? 'bg-gray-100 text-black' : 'text-gray-900'
-    //                 )
-    //               )}
-    //               onClick={() => {
-    //                 alert('You want to cancel meeting')
-    //               }}
-    //             >
-    //               Cancel Meeting
-    //             </button>
-    //           )}
-    //         </Menu.Item>
-    //       </div>
-    //     </Menu.Items>
-    //   </Menu>
-    // </li>
+
+    <li className="group flex items-center space-x-4 rounded-xl px-4 py-2 focus-within:bg-green-400 hover:bg-green-400">
+      <div className="flex-auto text-white">
+        <p className="font-bold">{meeting.title}</p>
+        <p className="mt-0.5">
+          <time dateTime={meeting.start}>
+            {format(startDateTime, 'h:mm a')}
+          </time>{' '}
+          - <time dateTime={meeting.end}>{format(endDateTime, 'h:mm a')}</time>
+        </p>
+      </div>
+      <Menu
+        as="div"
+        className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
+      >
+        <div>
+          <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
+            <span className="sr-only">Open options</span>
+            <DotsVerticalIcon className="h-6 w-6" aria-hidden="true" />
+          </Menu.Button>
+        </div>
+        <Menu.Items className="absolute right-0 z-10 mt-2 w-36 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+          <div className="py-1">
+            <Menu.Item>
+              {({ active }) => (
+                <button
+                  className={combineClasses(
+                    ['block px-4 py-2 text-sm'].concat(
+                      active ? 'bg-gray-100 text-black' : 'text-gray-900'
+                    )
+                  )}
+                  onClick={() => {
+                    alert('You want to edit meeting')
+                  }}
+                >
+                  Edit Meeting
+                </button>
+              )}
+            </Menu.Item>
+            <Menu.Item>
+              {({ active }) => (
+                <button
+                  className={combineClasses(
+                    ['block px-4 py-2 text-sm'].concat(
+                      active ? 'bg-gray-100 text-black' : 'text-gray-900'
+                    )
+                  )}
+                  onClick={() => {
+                    alert('You want to cancel meeting')
+                  }}
+                >
+                  Cancel Meeting
+                </button>
+              )}
+            </Menu.Item>
+          </div>
+        </Menu.Items>
+      </Menu>
+    </li>
   )
 }
diff --git a/src/components/calendar/SideCalendar.tsx b/src/components/calendar/SideCalendar.tsx
index 5cd91f69..f260a5aa 100644
--- a/src/components/calendar/SideCalendar.tsx
+++ b/src/components/calendar/SideCalendar.tsx
@@ -1,18 +1,18 @@
-// import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/solid'
-// import {
-//   add,
-//   eachDayOfInterval,
-//   endOfMonth,
-//   getDay,
-//   format,
-//   parseISO,
-//   isEqual,
-//   isSameDay,
-//   isSameMonth,
-//   isToday,
-//   parse,
-//   startOfToday,
-// } from 'date-fns'
+import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/solid'
+import {
+  add,
+  eachDayOfInterval,
+  endOfMonth,
+  getDay,
+  format,
+  parseISO,
+  isEqual,
+  isSameDay,
+  isSameMonth,
+  isToday,
+  parse,
+  startOfToday,
+} from 'date-fns'
 import { useState } from 'react'
 import Meeting from './Meeting'
 
@@ -32,154 +32,151 @@ function classNames(...classes: any[]) {
 }
 
 export default function SideCalendar({ meetings }: Meetings) {
-  return (
-    <div>
-      </div>
-  )
+
   
-}
+
   
-//   const today = startOfToday()
-//   const [selectedDay, setSelectedDay] = useState(today)
-//   const [currentMonth, setCurrentMonth] = useState(format(today, 'MMM-yyyy'))
-//   const firstDayCurrentMonth = parse(currentMonth, 'MMM-yyyy', new Date())
+  const today = startOfToday()
+  const [selectedDay, setSelectedDay] = useState(today)
+  const [currentMonth, setCurrentMonth] = useState(format(today, 'MMM-yyyy'))
+  const firstDayCurrentMonth = parse(currentMonth, 'MMM-yyyy', new Date())
 
-//   const days = eachDayOfInterval({
-//     start: firstDayCurrentMonth,
-//     end: endOfMonth(firstDayCurrentMonth),
-//   })
+  const days = eachDayOfInterval({
+    start: firstDayCurrentMonth,
+    end: endOfMonth(firstDayCurrentMonth),
+  })
 
-//   function previousMonth() {
-//     const firstDayNextMonth = add(firstDayCurrentMonth, { months: -1 })
-//     setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
-//   }
+  function previousMonth() {
+    const firstDayNextMonth = add(firstDayCurrentMonth, { months: -1 })
+    setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
+  }
 
-//   function nextMonth() {
-//     const firstDayNextMonth = add(firstDayCurrentMonth, { months: 1 })
-//     setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
-//   }
+  function nextMonth() {
+    const firstDayNextMonth = add(firstDayCurrentMonth, { months: 1 })
+    setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
+  }
 
-//   const selectedDayMeetings = meetings?.filter((meeting) =>
-//     isSameDay(parseISO(meeting.start), selectedDay)
-//   )
+  const selectedDayMeetings = meetings?.filter((meeting) =>
+    isSameDay(parseISO(meeting.start), selectedDay)
+  )
 
-//   return (
-//     <div className="col-span-1 bg-zinc-900 pt-16">
-//       <div className="mx-auto max-w-md px-4 sm:px-7 md:max-w-4xl md:px-6">
-//         <div className="md:grid md:grid-rows-2">
-//           <div className="md:pr-14">
-//             <div className="flex items-center">
-//               <h2 className="flex-auto text-4xl font-semibold text-white">
-//                 {format(firstDayCurrentMonth, 'MMMM yyyy')}
-//               </h2>
-//               <button
-//                 type="button"
-//                 onClick={previousMonth}
-//                 className="-my-1.5 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
-//               >
-//                 <span className="sr-only">Previous month</span>
-//                 <ChevronLeftIcon className="h-5 w-5" aria-hidden="true" />
-//               </button>
-//               <button
-//                 onClick={nextMonth}
-//                 type="button"
-//                 className="-my-1.5 -mr-1.5 ml-2 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
-//               >
-//                 <span className="sr-only">Next month</span>
-//                 <ChevronRightIcon className="h-5 w-5" aria-hidden="true" />
-//               </button>
-//             </div>
-//             <div className="mt-10 grid grid-cols-7 text-center text-xs leading-6 text-gray-500">
-//               <div>S</div>
-//               <div>M</div>
-//               <div>T</div>
-//               <div>W</div>
-//               <div>T</div>
-//               <div>F</div>
-//               <div>S</div>
-//             </div>
-//             <div className="mt-2 grid grid-cols-7 text-sm">
-//               {days.map((day, dayIdx) => (
-//                 <div
-//                   key={day.toString()}
-//                   className={classNames(
-//                     dayIdx === 0 && colStartClasses[getDay(day)],
-//                     'py-1.5'
-//                   )}
-//                 >
-//                   <button
-//                     type="button"
-//                     onClick={() => setSelectedDay(day)}
-//                     className={classNames(
-//                       !isEqual(day, selectedDay) &&
-//                         isToday(day) &&
-//                         'text-red-500',
-//                       !isEqual(day, selectedDay) &&
-//                         !isToday(day) &&
-//                         isSameMonth(day, firstDayCurrentMonth) &&
-//                         'text-gray-900',
-//                       !isEqual(day, selectedDay) &&
-//                         !isToday(day) &&
-//                         !isSameMonth(day, firstDayCurrentMonth) &&
-//                         'text-gray-400',
-//                       isEqual(day, selectedDay) && isToday(day) && 'bg-red-500',
-//                       isEqual(day, selectedDay) &&
-//                         !isToday(day) &&
-//                         'bg-blue-400',
-//                       !isEqual(day, selectedDay) && 'hover:bg-yellow-400',
-//                       (isEqual(day, selectedDay) || isToday(day)) &&
-//                         'font-semibold',
-//                       'mx-auto flex h-8 w-8 items-center justify-center rounded-full'
-//                     )}
-//                   >
-//                     <time
-//                       className="text-white"
-//                       dateTime={format(day, 'yyyy-MM-dd')}
-//                     >
-//                       {format(day, 'd')}
-//                     </time>
-//                   </button>
+  return (
+    <div className="col-span-1 bg-zinc-900 pt-16">
+      <div className="mx-auto max-w-md px-4 sm:px-7 md:max-w-4xl md:px-6">
+        <div className="md:grid md:grid-rows-2">
+          <div className="md:pr-14">
+            <div className="flex items-center">
+              <h2 className="flex-auto text-4xl font-semibold text-white">
+                {format(firstDayCurrentMonth, 'MMMM yyyy')}
+              </h2>
+              <button
+                type="button"
+                onClick={previousMonth}
+                className="-my-1.5 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
+              >
+                <span className="sr-only">Previous month</span>
+                <ChevronLeftIcon className="h-5 w-5" aria-hidden="true" />
+              </button>
+              <button
+                onClick={nextMonth}
+                type="button"
+                className="-my-1.5 -mr-1.5 ml-2 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
+              >
+                <span className="sr-only">Next month</span>
+                <ChevronRightIcon className="h-5 w-5" aria-hidden="true" />
+              </button>
+            </div>
+            <div className="mt-10 grid grid-cols-7 text-center text-xs leading-6 text-gray-500">
+              <div>S</div>
+              <div>M</div>
+              <div>T</div>
+              <div>W</div>
+              <div>T</div>
+              <div>F</div>
+              <div>S</div>
+            </div>
+            <div className="mt-2 grid grid-cols-7 text-sm">
+              {days.map((day, dayIdx) => (
+                <div
+                  key={day.toString()}
+                  className={classNames(
+                    dayIdx === 0 && colStartClasses[getDay(day)],
+                    'py-1.5'
+                  )}
+                >
+                  <button
+                    type="button"
+                    onClick={() => setSelectedDay(day)}
+                    className={classNames(
+                      !isEqual(day, selectedDay) &&
+                        isToday(day) &&
+                        'text-red-500',
+                      !isEqual(day, selectedDay) &&
+                        !isToday(day) &&
+                        isSameMonth(day, firstDayCurrentMonth) &&
+                        'text-gray-900',
+                      !isEqual(day, selectedDay) &&
+                        !isToday(day) &&
+                        !isSameMonth(day, firstDayCurrentMonth) &&
+                        'text-gray-400',
+                      isEqual(day, selectedDay) && isToday(day) && 'bg-red-500',
+                      isEqual(day, selectedDay) &&
+                        !isToday(day) &&
+                        'bg-blue-400',
+                      !isEqual(day, selectedDay) && 'hover:bg-yellow-400',
+                      (isEqual(day, selectedDay) || isToday(day)) &&
+                        'font-semibold',
+                      'mx-auto flex h-8 w-8 items-center justify-center rounded-full'
+                    )}
+                  >
+                    <time
+                      className="text-white"
+                      dateTime={format(day, 'yyyy-MM-dd')}
+                    >
+                      {format(day, 'd')}
+                    </time>
+                  </button>
 
-//                   <div className="mx-auto mt-1 h-1 w-1">
-//                     {meetings?.some((meeting) =>
-//                       isSameDay(parseISO(meeting.start), day)
-//                     ) && (
-//                       <div className="h-1 w-1 rounded-full bg-violet-700"></div>
-//                     )}
-//                   </div>
-//                 </div>
-//               ))}
-//             </div>
-//           </div>
-//           <section className="divide-y divide-gray-400">
-//             <h2 className="text-center font-semibold text-blue-700">
-//               {isSameDay(today, selectedDay) ? 'TODAY ' : ''}
-//               <time dateTime={format(selectedDay, 'yyyy-MM-dd')}>
-//                 {format(selectedDay, 'dd/LL/yyyy')}
-//               </time>
-//             </h2>
-//             <ol className="text-sm leading-6 text-gray-500">
-//               {selectedDayMeetings?.length > 0 ? (
-//                 selectedDayMeetings?.map((meeting) => (
-//                   <Meeting meeting={meeting} key={meeting.id} />
-//                 ))
-//               ) : (
-//                 <p>No meetings for today.</p>
-//               )}
-//             </ol>
-//           </section>
-//         </div>
-//       </div>
-//     </div>
-//   )
-// }
+                  <div className="mx-auto mt-1 h-1 w-1">
+                    {meetings?.some((meeting) =>
+                      isSameDay(parseISO(meeting.start), day)
+                    ) && (
+                      <div className="h-1 w-1 rounded-full bg-violet-700"></div>
+                    )}
+                  </div>
+                </div>
+              ))}
+            </div>
+          </div>
+          <section className="divide-y divide-gray-400">
+            <h2 className="text-center font-semibold text-blue-700">
+              {isSameDay(today, selectedDay) ? 'TODAY ' : ''}
+              <time dateTime={format(selectedDay, 'yyyy-MM-dd')}>
+                {format(selectedDay, 'dd/LL/yyyy')}
+              </time>
+            </h2>
+            <ol className="text-sm leading-6 text-gray-500">
+              {selectedDayMeetings?.length > 0 ? (
+                selectedDayMeetings?.map((meeting) => (
+                  <Meeting meeting={meeting} key={meeting.id} />
+                ))
+              ) : (
+                <p>No meetings for today.</p>
+              )}
+            </ol>
+          </section>
+        </div>
+      </div>
+    </div>
+  )
+}
 
-// const colStartClasses = [
-//   '',
-//   'col-start-2',
-//   'col-start-3',
-//   'col-start-4',
-//   'col-start-5',
-//   'col-start-6',
-//   'col-start-7',
-// ]
+const colStartClasses = [
+  '',
+  'col-start-2',
+  'col-start-3',
+  'col-start-4',
+  'col-start-5',
+  'col-start-6',
+  'col-start-7',
+]
diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index 14578687..7c64f5da 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -31,9 +31,10 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
               <Dropdown.Item>User</Dropdown.Item>
             </Link>
           )}
-          <Link href="/events" className="md:hidden">
+          {isAdmin && (<Link href="/events" className="md:hidden">
             <Dropdown.Item>Events</Dropdown.Item>
-          </Link>
+          </Link>)
+          }
           <Link href="/profile">
             <Dropdown.Item>Profile</Dropdown.Item>
           </Link>
@@ -55,12 +56,14 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
             Users
           </Navbar.Link>
         )}
-        <Navbar.Link href="/events" className="ml-4 text-white">
+        {isAdmin && (<Navbar.Link href="/events" className="ml-4 text-white">
           Events
-        </Navbar.Link>
-        <Navbar.Link href="/calendar" className="ml-4 text-white">
+        </Navbar.Link>)
+        }
+        {isAdmin && (<Navbar.Link href="/calendar" className="ml-4 text-white">
           Recruitment
-        </Navbar.Link>
+        </Navbar.Link>)
+        }
         <Navbar.Link href="/application_status" className="ml-4 text-white">
           Application Status
         </Navbar.Link>
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 357cf656..0894d845 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -59,6 +59,7 @@ export const authOptions: NextAuthOptions = {
           // If the account is found, challenge the hashPassword with the password
           const success = await compare(password, account.hashedPassword)
           if (!success) throw new Error('Invalid email or password')
+          console.log(account.isAdmin)
 
           // The user object is passed to the session callback in session.data.user
           return {
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index ea1ef42b..39aca4d3 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -1,5 +1,3 @@
-import { useRouter } from 'next/router'
-import { useSession, signIn } from 'next-auth/react'
 import { useState, useCallback } from 'react'
 import Head from 'next/head'
 import { Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, useDisclosure, useToast } from '@chakra-ui/react'
@@ -40,9 +38,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
     }
 
   ]
-  const status =[
-    {status: 'accepty'}
-  ]
+
   return (
     <>
       <Head>
@@ -54,7 +50,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
       <main>
         <div className="relative h-screen w-screen bg-[url('/images/applicants_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
           {/* Nav element containing the logo */}
-       
+          
           <nav className="flex justify-center items-center  px-2 py-2 " >
           
             <Image

From d954b282508301eca92ba0f1e45840eff26b4c6a Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 4 Jun 2023 23:55:51 +0800
Subject: [PATCH 104/223] change some styles for small screens

---
 src/components/common/TopNavbar.tsx    |  19 ++-
 src/pages/application_status/index.tsx |  83 +++++-----
 src/pages/tasks/index.tsx              | 211 ++++++++++---------------
 3 files changed, 132 insertions(+), 181 deletions(-)

diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index f38c261d..f7d64681 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -36,12 +36,14 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin, image }) => {
             <Dropdown.Item>Events</Dropdown.Item>
           </Link>)
           }
-          <Link href="/profile">
+         <Link href="/profile">
             <Dropdown.Item>Profile</Dropdown.Item>
           </Link>
-          <Link href="/calendar">
+        
+          {isAdmin && <Link href="/calendar">
             <Dropdown.Item>Calendar</Dropdown.Item>
           </Link>
+          }
           <Dropdown.Item>
             <div onClick={logout}>Sign Out</div>
           </Dropdown.Item>
@@ -65,12 +67,19 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin, image }) => {
           Recruitment
         </Navbar.Link>)
         }
-        <Navbar.Link href="/application_status" className="ml-4 text-white">
-          Application Status
+        {!isAdmin && <Navbar.Link href="/application_status" className="ml-4 text-white">
+          Status
         </Navbar.Link>
-        <Navbar.Link href="/tasks" className="ml-4 text-white">
+        }
+
+        {!isAdmin && <Navbar.Link href="/tasks" className="ml-4 text-white">
           Tasks
         </Navbar.Link>
+        }
+        {!isAdmin && <Navbar.Link  className="ml-4 text-white">
+          Update Information
+        </Navbar.Link>
+        }
       </Navbar.Collapse>
     </Navbar>
   )
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 39aca4d3..e3fb20cb 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -1,6 +1,6 @@
 import { useState, useCallback } from 'react'
 import Head from 'next/head'
-import { Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, useDisclosure, useToast } from '@chakra-ui/react'
+import { Center, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, useDisclosure, useToast } from '@chakra-ui/react'
 import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { BaseProps } from '~/utils/withAuth'
@@ -46,7 +46,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The login page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar  image={session.user?.image as string} isAdmin={session.isAdmin} />
       <main>
         <div className="relative h-screen w-screen bg-[url('/images/applicants_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
           {/* Nav element containing the logo */}
@@ -63,23 +63,22 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
             />
          
           </nav>
-       
-
+      
           {/* Login */}
           <div className="flex flex-col justify-center gap-8 font-[Inter]">
           
-            <h1 className='flex justify-center font-bold text-8xl mt-4'>
+            <h1 className='flex justify-center font-bold text-4xl md:text-8xl mt-4'>
               Hi User,
             </h1>
-            <h2 className='flex justify-center  mt-3 font-bold text-6xl'>
+            <h2 className='flex justify-center mt-3 font-bold text-2xl md:text-6xl'>
               your current statuses are:
             </h2>
       
             {roles.map((item) => ( 
-              <div key={item.id} className="flex  items-center mt-3 ">
+              <div key={item.id} className="flex items-center mt-3 ">
                   <div className="flex-grow">
                 {item.status == 'accepted' && 
-                <h3 className='flex mt-3 justify-center text-5xl'>
+                <h3 className='flex mt-3 justify-center text-2xl md:text-5xl'>
                   {item.name}
                   <Image
                     alt="logo"
@@ -92,7 +91,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                   </h3>
                 }
               
-                {item.status == 'offered' && <h3 className='flex justify-center text-5xl'>
+                {item.status == 'offered' && <h3 className='flex justify-center text-2xl md:text-5xl'>
                 {item.name}
                   <Image
                     alt="logo"
@@ -105,7 +104,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                   </h3>
                 }
                 
-                {item.status == 'pending_review' && <h3 className='flex justify-center text-5xl'>
+                {item.status == 'pending_review' && <h3 className='flex justify-centertext-2xl md:text-5xl'>
                 {item.name}
                   <Image
                     alt="logo"
@@ -117,7 +116,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     {/* Pending Review */}
                   </h3>
                 }
-                {item.status == 'interviewed' && <h3 className='flex justify-center text-5xl'>
+                {item.status == 'interviewed' && <h3 className='flex justify-center text-2xl md:text-5xl'>
                 {item.name}
                   <Image
                     alt="logo"
@@ -129,7 +128,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     {/* Interviewed */}
                   </h3>
                 }
-                {item.status == 'rejected' && <h3 className='flex justify-center text-5xl'>
+                {item.status == 'rejected' && <h3 className='flex justify-center text-2xl md:text-5xl'>
                 {item.name}
                   <Image
                     alt="logo"
@@ -148,7 +147,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
              <div style={{ position: 'fixed', bottom: '40px', right: '60px' }}>
               <button 
                 onClick={onOpen}       
-                className="w-20 h-20 rounded-full 
+                className="w-16 h-16 md:w-20 md:h-20 rounded-full 
                        bg-[#FFEBC5]  
                        hover:bg-[#FFD27C]
                        text-white
@@ -158,35 +157,30 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                          <Image
                     alt="question_mark"
                     src="/images/question_mark.svg"
-                    height={20}
+                    height='20'
                     width={20}
-                    className='ml-7'  
+                    className='md:ml-7 ml-5'  
                   
                         
                   />
             
         </button>
         </div>
-        <Modal  isOpen={isOpen} onClose={onClose}>
+        <Modal  isOpen={isOpen} onClose={onClose} size="xs">
             <ModalOverlay 
             bg='none'
-            backdropFilter='auto'
-            
-          
+            backdropFilter='auto'         
             />
            
            
-            <ModalContent 
-        
-             
-            
-        
-            >
+            <ModalContent > 
                 
             <ModalHeader fontSize='5xl' ></ModalHeader>
             <ModalCloseButton />
             <ModalBody fontSize='3xl' >
-              <div className='flex justify-left ml-24'>
+          
+            <div className="flex flex-col items-start">
+              <div className='flex items-center'>
               <Image
                     alt="logo"
                     src="/images/Ellipse 1.svg"
@@ -195,7 +189,10 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     className='flex flex-col mr-5'              
                   />
                 Accepted</div>
-              <div  className='flex justify-left ml-24'>
+                </div>
+            
+              <div className="flex flex-col items-start">
+              <div className='flex items-center'>
               <Image
                     alt="logo"
                     src="/images/blue_dot.svg"
@@ -204,7 +201,9 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     className='flex flex-col mr-5'
                   />
                   Offered</div>
-              <div  className='flex justify-left ml-24'>
+                  </div>
+                  <div className="flex flex-col items-start">
+              <div className='flex items-center'>
               <Image
                     alt="logo"
                     src="/images/yellow_dot.svg"
@@ -213,7 +212,9 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     className='mr-5'             
                   />
                   Pending Review</div>
-              <div className='flex justify-left ml-24'>
+                  </div>
+                  <div className="flex flex-col items-start">
+              <div className='flex items-center'>
               <Image
                     alt="logo"
                     src="/images/pink_dot.svg"
@@ -221,34 +222,22 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     width={35}
                     className='mr-5'             
                   />Interviewed</div>
-              <div className='flex justify-left ml-24'>
+                  </div>
+                <div className="flex flex-col items-start">
+              <div className='flex items-center'>
               <Image
                     alt="logo"
                     src="/images/red_dot.svg"
                     height={35}
                     width={35}
                     className='mr-5'             
-                  />Rejected</div>
-
-
-              
-            
+                  />Rejected</div>      
+                </div>
             </ModalBody>
-
             <ModalFooter>
-           
             </ModalFooter>
         </ModalContent>
-        
         </Modal>
-      
-       
-
-           
-            
-          
-
-          
           </div>
         </div>
       </main>
@@ -257,4 +246,4 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
 }
 
 
-export default withAuth(Application_Status)
\ No newline at end of file
+export default withAuth(Application_Status, false)
\ No newline at end of file
diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 66978196..5656b799 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -1,8 +1,8 @@
 import { useRouter, } from 'next/router'
 import { useSession} from 'next-auth/react'
-import { useState, useCallback, useRef } from 'react'
+import { useState, useCallback, useRef, Fragment } from 'react'
 import Head from 'next/head'
-import {  Box, Button, Grid, GridItem, Heading, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, Portal, useDisclosure, useToast, Text, InputGroup, InputLeftElement } from '@chakra-ui/react'
+import {  Box, Button, Grid, GridItem, Heading, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, Portal, useDisclosure, useToast, Text, InputGroup, InputLeftElement, TableContainer, Table, TableCaption, Thead, Tr, Th, Tbody, Td, Tfoot, Center } from '@chakra-ui/react'
 import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
@@ -65,9 +65,9 @@ const Tasks:React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The login page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar  image={session.user?.image as string} isAdmin={session.isAdmin} />
       <main>
-        <div className="relative h-screen w-screen bg-[url('/images/tasks_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
+        <div className="relative h-screen w-screen  bg-[url('/images/tasks_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
           {/* Nav element containing the logo */}
        
 
@@ -82,7 +82,7 @@ const Tasks:React.FC<BaseProps> = ({ session }) => {
             </h1>
             
            
-                <InputGroup>
+                {/* <InputGroup>
       <InputLeftElement
         className="mt-[1%] ml-[8%] mb-4"
         pointerEvents="none"
@@ -101,172 +101,125 @@ const Tasks:React.FC<BaseProps> = ({ session }) => {
                 borderRadius="30px"
                 className="mt-[1%] ml-[8%] mb-4 text-white"
                 _placeholder={{
-                pl: { base: '65px', lg: '5px' },
+                pl: { base: '5px', lg: '3px' },
                 fontStyle: 'italic',
                 }}
             />
-    </InputGroup>
+    </InputGroup> */}
               
                 
               
-           <Box
-  overflowY="auto"
-  maxHeight="40vh"
-  sx={{
-    '&::-webkit-scrollbar': {
-      width: '30px',
-    },
-    '&::-webkit-scrollbar-thumb': {
-      backgroundColor: `#004B90`,
-      borderRadius: '20px',
-      border: '5px solid transparent',
-      backgroundClip: 'content-box',
-    },
-  }}
-  className="p-16"
->
-  <Grid
-  className='ml-[11%]'
-    templateColumns={{
-      base: 'repeat(3, 1fr)',
-      md: 'repeat(3, 1fr)',
-    }}
-    gridGap={{ base: '4' }}
-    gridRowGap={{ base: '4', md: '12' }}
-  >
-    {/* Column headings */}
-    <GridItem colSpan={1} className="justify-content-center flex flex-col">
-      <h1 className="text-xl font-bold text-white">Status</h1>
-    </GridItem>
-    <GridItem colSpan={1} className="justify-content-center flex flex-col">
-      <h1 className="text-xl font-bold text-white">Task</h1>
-    </GridItem>
-    <GridItem colSpan={1} className="justify-content-center flex flex-col">
-      <h1 className="text-xl font-bold text-white">Do By</h1>
-    </GridItem>
-    </Grid>
-
-    {/* Data rows */}
-    {filteredData.map((item) => (
-      <Grid
-      key={item.id}
-      className='mt-[2%] ml-[11%]'
-      templateColumns={{
-        base: 'repeat(3, 1fr)',
-        md: 'repeat(3, 1fr)',
-      }}
-      gridGap={{ base: '4' }}
-      gridRowGap={{ base: '4', md: '12' }}
-
-    >
-      
-        <GridItem colSpan={1} className="justify-content-center flex flex-col">
-          
+              <Center>
+              <div className="max-w-screen-lg mx-auto md:max-w-screen-md">
+
+      <table className="min-w-full divide-y divide-gray-200">
+        <thead className="">
+          <tr>
+            <th
+              scope="col"
+              className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
+            >
+              Status
+            </th>
+            <th
+              scope="col"
+              className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
+            >
+              Task
+            </th>
+            <th
+              scope="col"
+              className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
+            >
+              Do By
+            </th>
+          </tr>
+        </thead>
+        <tbody className="divide-y divide-gray-200">
+        {filteredData.map((item) => (
+           
+      <tr key={item.id}>
+         <td className="px-6 py-4 whitespace-nowrap">
+         
           <h1 className="  text-white">{item.status == "Incomplete" && 
           <button
           disabled = {true}
-          className="flex-col  items-center w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#C51F29] py-1 px-5 font-medium transition"
+          className="flex-col  items-center w-24 md:w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#C51F29] py-1 px-5 font-medium transition"
 
             >
-          <div className='font-[Inter] text-xl text-white'>
+          <div className='font-[Inter] text-xs md:text-xl text-white'>
           {item.status}
           </div>
         </button>
           }
           {item.status == "In Progress" && <button
           disabled = {true}
-          className="flex-col items-center w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#FFBD3C] py-1 px-5 font-medium transition"
+          className="flex-col items-center w-24 md:w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#FFBD3C] py-1 px-5 font-medium transition"
          
             >
-          <div className='font-[Inter] text-xl text-white'>
+          <div className='font-[Inter] text-xs md:text-xl text-white'>
           {item.status}
           </div>
         </button>}
           {item.status == "Done" && <button
           disabled = {true}
-          className="flex-col items-center w-[150px] max-w-20 bg-opacity-100  text-md mx-auto rounded-full  bg-[#00C09D] py-1 px-5 font-medium transition"
+          className="flex-col items-center w-24 md:w-[150px] max-w-20 bg-opacity-100  text-md mx-auto rounded-full  bg-[#00C09D] py-1 px-5 font-medium transition"
          
             >
-          <div className='font-[Inter] text-xl text-white'>
+          <div className='font-[Inter] text-xs md:text-xl text-white'>
           {item.status}
           </div>
         </button>}
           </h1>
-          
-        </GridItem>
-      
-       
-        
-      
-        
-        <div  
-        ref={el => {
-            // el can be null - see https://reactjs.org/docs/refs-and-the-dom.html#caveats-with-callback-refs
-            if (!el) return;
-    
-            console.log(el.offsetLeft); // prints 200px
-          }}
-          >
-        <GridItem colSpan={1} className="justify-content-center flex flex-col">
-         
-         
-          <Text
-        
+          </td>
+          <td>  
+            <Text
         as="span"
         cursor="pointer"
         _hover={{ textDecoration: 'underline' }}
-        className='text-xl text-white'
+        className='md:text-xl text-white'
         onClick={() => {setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
        
       >
         {item.name}
       </Text>
+      </td>
+      <td>  <h1 className="md:text-xl text-white">{item.due}</h1></td>
+          
+          </tr>
+          
+    ))}
+
      
-    
-          <Modal isCentered={true} isOpen={isOpen} onClose={onClose}>
-            <ModalOverlay 
-            bg='none'
-            backdropFilter='auto'
-            
-            backdropBlur='2px'
-            />
-           
-           
-            <ModalContent 
         
-             
-            
-        
-            >
-                
-            <ModalHeader fontSize='5xl' >{currentName}</ModalHeader>
-            <ModalCloseButton />
-            <ModalBody fontSize='3xl' >
-                {currentDetails}
+        </tbody>
+      </table>
+      
+      <Modal isCentered={true} isOpen={isOpen} onClose={onClose}>
+      <ModalOverlay 
+      bg='none'
+      backdropFilter='auto'
+      
+      backdropBlur='2px'
+      />
             
-            </ModalBody>
-
-            <ModalFooter>
-           
-            </ModalFooter>
-        </ModalContent>
-        
-        </Modal>
+      <ModalContent>
+      <ModalHeader fontSize='5xl' >{currentName}</ModalHeader>
+      <ModalCloseButton />
+      <ModalBody fontSize='3xl' >
+          {currentDetails}
       
-       
- 
-        </GridItem>
-        </div>
-        
-        <GridItem colSpan={1} className="justify-content-center flex flex-col">
-          <h1 className="text-xl text-white">{item.due}</h1>
-        </GridItem>
-    </Grid>
+      </ModalBody>
+
+      <ModalFooter>
+     
+      </ModalFooter>
+  </ModalContent>
   
-       
-    ))}
- 
-</Box>
+  </Modal>
+    </div>
+    
+</Center>
             
 
           
@@ -277,4 +230,4 @@ const Tasks:React.FC<BaseProps> = ({ session }) => {
   )
 }
 
-export default withAuth(Tasks, true)
\ No newline at end of file
+export default withAuth(Tasks, false)
\ No newline at end of file

From b9164e011d8730f4a84c235e2d21f79796ed334b Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Mon, 5 Jun 2023 00:07:08 +0800
Subject: [PATCH 105/223] change the icon;s position for mobile

---
 src/pages/application_status/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index e3fb20cb..4d7aef7e 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -144,7 +144,9 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                 </div>
 
             ))}
-             <div style={{ position: 'fixed', bottom: '40px', right: '60px' }}>
+             <div 
+             className='fixed bottom-20 md:right-28 right-6'
+             >
               <button 
                 onClick={onOpen}       
                 className="w-16 h-16 md:w-20 md:h-20 rounded-full 
@@ -160,8 +162,6 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     height='20'
                     width={20}
                     className='md:ml-7 ml-5'  
-                  
-                        
                   />
             
         </button>

From 651b2c0768b58becb8b1330854282676b5adb0dc Mon Sep 17 00:00:00 2001
From: Jess Raphael <jxssraphael11@gmail.com>
Date: Mon, 5 Jun 2023 01:56:53 +0800
Subject: [PATCH 106/223] update user information

---
 src/components/profile/UploadImage.tsx |  52 +++++++
 src/pages/form/updateInfo.tsx          | 181 +++++++++++++++++++++++++
 2 files changed, 233 insertions(+)
 create mode 100644 src/components/profile/UploadImage.tsx
 create mode 100644 src/pages/form/updateInfo.tsx

diff --git a/src/components/profile/UploadImage.tsx b/src/components/profile/UploadImage.tsx
new file mode 100644
index 00000000..22833394
--- /dev/null
+++ b/src/components/profile/UploadImage.tsx
@@ -0,0 +1,52 @@
+import { trpc } from '../../utils/trpc'
+import type { Session } from 'next-auth'
+import LoadingScreen from '../common/LoadingScreen'
+import { Box, Button, Image, Text } from '@chakra-ui/react'
+import UploadImageBtn from './UploadImageButton'
+
+
+const DEFAULT_IMAGE = '/fintech_logo.png'
+
+const UploadImage = ({
+  studentId,
+  session,
+}: {
+  studentId: string
+  session: Session
+}) => {
+  const { data, isError, isLoading, refetch: refetchImage, } =
+  trpc.user.getUserImage.useQuery(studentId)
+
+  if (isLoading) {
+    return <LoadingScreen />
+  }
+
+  if (!data || isError) {
+    return <p className="text-3xl">Something is wrong</p>
+  }
+
+  return (
+    <div className="m-10 grid grid-cols-1 place-items-center gap-y-6 md:grid-cols-3">
+        <div/>
+      <div className="md:place-self-center">
+      <Box className="relative">
+        <Image
+          alt="profile-pic"
+          src={isLoading || !data ? DEFAULT_IMAGE : data}
+          fallbackSrc={DEFAULT_IMAGE}
+          objectFit="cover"
+          borderRadius="full"
+          boxSize="200px"
+        />
+
+          <Box className="absolute bottom-0 right-0">
+            <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
+          </Box>
+
+      </Box>
+      </div>
+    </div>
+  )
+}
+
+export default UploadImage
diff --git a/src/pages/form/updateInfo.tsx b/src/pages/form/updateInfo.tsx
new file mode 100644
index 00000000..52a30df6
--- /dev/null
+++ b/src/pages/form/updateInfo.tsx
@@ -0,0 +1,181 @@
+import {
+  Input,
+  FormLabel,
+  VStack,
+  useToast,
+  Button,
+  Select,
+} from '@chakra-ui/react'
+import { useRouter } from 'next/router'
+import withAuth, { BaseProps }from '~/utils/withAuth'
+import React, { useState, ChangeEvent } from 'react'
+import Head from 'next/head'
+import Container from '~/components/auth/Container'
+import TopNavbar from '~/components/common/TopNavbar'
+import UploadImage from '~/components/profile/UploadImage'
+import { registerVersion } from '@firebase/app'
+import { trpc } from '~/utils/trpc'
+import { useForm } from 'react-hook-form'
+import { z } from 'zod'
+import { zodResolver } from '@hookform/resolvers/zod'
+
+
+const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
+  const router = useRouter()
+  const toast = useToast()
+  const [selectedShirtSize, setShirtSize] = useState<string>()
+  const [submitBefore, setSubmitBefore] = useState(false)
+
+  const options = [
+    { value: 'xs', label: 'XS' },
+    { value: 's', label: 'S' },
+    { value: 'm', label: 'M' },
+    { value: 'l', label: 'L' },
+    { value: 'xl', label: 'XL' },
+  ]
+
+  const handleSelectChange = (event: ChangeEvent<HTMLSelectElement>) => {
+    setShirtSize(event.target.value) // Update the selected value in the state
+  }
+
+
+  //Form Data Integrity
+  const FormSchema = z.object({
+    telehandle: z.string().min(1, { message: 'Invalid name' }),
+    linkedin: z.string().min(1, { message: 'Invalid url' }),
+    shirtSize: z.string().min(1, { message: 'Invalid size' })
+  })
+
+  type FormSchemaType = z.infer<typeof FormSchema>
+
+  const {
+    register,
+    handleSubmit,
+    formState: { errors },
+  } = useForm<FormSchemaType>({
+    resolver: zodResolver(FormSchema),
+  })
+
+  const { mutateAsync, isLoading: isSubmitting } =
+    trpc.user.updateUserProfile.useMutation()
+
+    const formSubmit = async (formData: FormSchemaType) => {
+      try {
+
+        await mutateAsync({
+
+          //toDO: add json attributes
+          telehandle: formData.telehandle,
+          linkedin: formData.linkedin,
+          shirtSize: formData.shirtsize
+
+        })
+        toast({
+          duration: 3000,
+          status: 'success',
+          title: 'Success',
+          description: 'User profile has been successfully updated',
+        })
+      } catch (e) {
+        toast({
+          description: (e as Error).message,
+          duration: 3000,
+          status: 'error',
+          title: 'Oops, an error occured!',
+        })
+      }
+    }
+
+  //toDO: Route to applicant status page created by Zeyu
+  const redirectHome = () => router.push('')
+
+  return (
+    <>
+      <Head>
+        <title>Update Member Information</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta
+          name="description"
+          content="Onboarding memebr particulars for Atlas"
+        />
+      </Head>
+      <TopNavbar isAdmin={session.isAdmin} />
+
+      <Container>
+        <form>
+          <h1 className="mb-10 text-center text-2xl font-bold">
+            Update Member Particulars
+          </h1>
+          
+
+          <div className="justify-center">
+          <UploadImage session={session} studentId={session?.user?.id as string} />
+          </div>
+
+          <VStack align="left">
+
+            <div>
+
+              <FormLabel>Fintech Society Shirt Size</FormLabel>
+              </div>
+
+              <div className="flex justify-center">
+
+              <Select  {...register('shirtSize', { required: true })} value={selectedShirtSize} onChange={handleSelectChange}>
+                <option value="">Select Shirt Size</option>
+                {options.map((option) => (
+                  <option key={option.value} value={option.value}>
+                    {option.label}
+                  </option>
+                ))}
+              </Select>
+            </div>
+            <br/>
+            <div>
+            <FormLabel> Telegram Handle</FormLabel>
+            <Input
+            type='text'
+            disabled={isSubmitting}
+            {...register('telehandle', {required: true})}
+            placeholder='Telegram Handle' />
+            </div>
+            <br/>
+            <div>
+            <FormLabel> Linkedin URL </FormLabel>
+            <Input
+            type='text'
+            disabled={isSubmitting}
+            {...register('linkedin', {required: true})}
+            placeholder='Linkedin URL' />
+            </div>
+            <br/>
+
+            <div className="flex justify-between">
+              <Button
+                bgColor="#FF9900"
+                width={150}
+                textColor="white"
+                onClick={redirectHome}
+              >
+                Back
+              </Button>
+              <Button
+                bgColor="#4365DD"
+                width={150}
+                className="text-white"
+                type="submit"
+                disabled={isSubmitting}
+                onClick={() => setSubmitBefore(true)}
+              >
+                Update
+              </Button>
+            </div>
+
+          </VStack>
+        </form>
+      </Container>
+    </>
+  )
+}
+
+export default withAuth(updateInfoPage)

From 1ea01fc52b5475b1fb82b83610fea7d628f7487e Mon Sep 17 00:00:00 2001
From: Jess Raphael <jxssraphael11@gmail.com>
Date: Mon, 5 Jun 2023 02:37:57 +0800
Subject: [PATCH 107/223] Update Info Form

Added form fields for:
- telegram handle
- linkedin url
- Fintech Society Shirt Size

Integrated with tRPC and Firebase
Modified User Model fields
---
 src/pages/form/updateInfo.tsx                 | 21 ++++++++++++-------
 src/server/db/models/User.ts                  |  1 +
 src/server/trpc/router/users/index.ts         |  2 ++
 .../trpc/router/users/updateUserInfo.ts       | 21 +++++++++++++++++++
 4 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 src/server/trpc/router/users/updateUserInfo.ts

diff --git a/src/pages/form/updateInfo.tsx b/src/pages/form/updateInfo.tsx
index 52a30df6..648fb288 100644
--- a/src/pages/form/updateInfo.tsx
+++ b/src/pages/form/updateInfo.tsx
@@ -26,6 +26,8 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
   const [selectedShirtSize, setShirtSize] = useState<string>()
   const [submitBefore, setSubmitBefore] = useState(false)
 
+  const studentId = session?.user?.id as string
+
   const options = [
     { value: 'xs', label: 'XS' },
     { value: 's', label: 'S' },
@@ -41,7 +43,7 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
 
   //Form Data Integrity
   const FormSchema = z.object({
-    telehandle: z.string().min(1, { message: 'Invalid name' }),
+    telegram: z.string().min(1, { message: 'Invalid name' }),
     linkedin: z.string().min(1, { message: 'Invalid url' }),
     shirtSize: z.string().min(1, { message: 'Invalid size' })
   })
@@ -57,7 +59,7 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
   })
 
   const { mutateAsync, isLoading: isSubmitting } =
-    trpc.user.updateUserProfile.useMutation()
+    trpc.user.updateUserInfo.useMutation()
 
     const formSubmit = async (formData: FormSchemaType) => {
       try {
@@ -65,9 +67,10 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
         await mutateAsync({
 
           //toDO: add json attributes
-          telehandle: formData.telehandle,
+          studentId: studentId,
+          telegram: formData.telegram,
+          shirtSize: formData.shirtSize,
           linkedin: formData.linkedin,
-          shirtSize: formData.shirtsize
 
         })
         toast({
@@ -76,6 +79,10 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
           title: 'Success',
           description: 'User profile has been successfully updated',
         })
+
+        redirectHome()
+
+        
       } catch (e) {
         toast({
           description: (e as Error).message,
@@ -87,7 +94,7 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
     }
 
   //toDO: Route to applicant status page created by Zeyu
-  const redirectHome = () => router.push('')
+  const redirectHome = () => router.push('/events')
 
   return (
     <>
@@ -102,7 +109,7 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
       <TopNavbar isAdmin={session.isAdmin} />
 
       <Container>
-        <form>
+        <form onSubmit={handleSubmit(formSubmit)}>
           <h1 className="mb-10 text-center text-2xl font-bold">
             Update Member Particulars
           </h1>
@@ -136,7 +143,7 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
             <Input
             type='text'
             disabled={isSubmitting}
-            {...register('telehandle', {required: true})}
+            {...register('telegram', {required: true})}
             placeholder='Telegram Handle' />
             </div>
             <br/>
diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index 0be6cea3..d46fd9f2 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -18,4 +18,5 @@ export type User = {
   phone?: string
   telegram?: string
   dob?: string // Store in DD-MM format so that we can get their birthday easily.
+  shirtSize?: string
 }
diff --git a/src/server/trpc/router/users/index.ts b/src/server/trpc/router/users/index.ts
index d96ba604..29e89725 100644
--- a/src/server/trpc/router/users/index.ts
+++ b/src/server/trpc/router/users/index.ts
@@ -11,6 +11,7 @@ import { deleteUserImage } from './deleteUserImage'
 import { updateUserProfile } from './updateUserProfile'
 import { updateUserContacts } from './updateUserContacts'
 import { getAllUsers } from './getAllUsers'
+import { updateUserInfo } from './updateUserInfo'
 
 export const userRouter = router({
   changePassword,
@@ -25,4 +26,5 @@ export const userRouter = router({
   updateUserContacts,
   updateUserImage,
   updateUserProfile,
+  updateUserInfo
 })
diff --git a/src/server/trpc/router/users/updateUserInfo.ts b/src/server/trpc/router/users/updateUserInfo.ts
new file mode 100644
index 00000000..4dd68bca
--- /dev/null
+++ b/src/server/trpc/router/users/updateUserInfo.ts
@@ -0,0 +1,21 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const updateUserInfo = protectedProcedure
+  .input(
+    z.object({
+      studentId: z.string(),
+      telegram: z.string(),
+      shirtSize: z.string(),
+      linkedin: z.string(),
+    })
+  )
+  .mutation(async ({ input }) => {
+    return await userCollection.update(input.studentId, {
+    shirtSize: input.shirtSize,
+    linkedin: input.linkedin,
+    telegram: input.telegram
+
+    })
+  })

From 6a1618f6aa5d48a9bcf88b93247d370942585968 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Mon, 5 Jun 2023 22:36:10 +0800
Subject: [PATCH 108/223] Update User model when applicant gets accepted

---
 src/components/recruitment/ApplicantCard.tsx  |  1 +
 .../recruitment/AppliedRoleListItem.tsx       |  3 +++
 src/components/recruitment/StatusPopup.tsx    |  3 +++
 src/server/trpc/router/recruitment/update.ts  | 21 ++++++++++++++++++-
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index 3a7d1a89..f03f7e36 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -57,6 +57,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
           <Text>Role Applied:</Text>
           <UnorderedList styleType="none">
             <AppliedRoleListItem
+              applicantId={applicant.id}
               appliedRole={appliedRole}
               key={appliedRole.id}
               refetch={refetch}
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index f93a9989..edbe78d0 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -4,9 +4,11 @@ import type { AppliedRole } from '~/server/db/models/AppliedRole'
 import StatusPopup from './StatusPopup'
 
 const AppliedRoleListItem = ({
+  applicantId,
   appliedRole,
   refetch,
 }: {
+  applicantId: string
   appliedRole: AppliedRole
   refetch: () => Promise<QueryObserverResult>
 }) => {
@@ -16,6 +18,7 @@ const AppliedRoleListItem = ({
         {appliedRole.rank}. {appliedRole.role}
       </Text>
       <StatusPopup
+        applicantId={applicantId}
         status={appliedRole.status}
         appliedRoleId={appliedRole.id}
         refetch={refetch}
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 893bcadc..71e05dca 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -24,10 +24,12 @@ const statusFillMap = {
 }
 
 const StatusPopup = ({
+  applicantId,
   status,
   appliedRoleId,
   refetch,
 }: {
+  applicantId: string
   appliedRoleId: string
   status: ApplicationStatus
   refetch: () => Promise<QueryObserverResult>
@@ -37,6 +39,7 @@ const StatusPopup = ({
   const updateStatus = async (status: ApplicationStatus) => {
     try {
       await mutateAsync({
+        applicantId: applicantId,
         status: status,
         appliedRoleId: appliedRoleId,
       })
diff --git a/src/server/trpc/router/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
index 13307c92..6acc6835 100644
--- a/src/server/trpc/router/recruitment/update.ts
+++ b/src/server/trpc/router/recruitment/update.ts
@@ -3,19 +3,25 @@ import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
 import { ApplicationStatus } from '~/server/db/models/AppliedRole'
+import userCollection from '~/server/db/collections/UserCollection'
 
 export const updateAppliedRoleStatus = protectedProcedure
   .input(
     z.object({
+      applicantId: z.string(),
       appliedRoleId: z.string(),
       status: z.nativeEnum(ApplicationStatus),
     })
   )
   .mutation(async ({ input }) => {
     try {
-      return await appliedRoleCollection.update(input.appliedRoleId, {
+      const res = await appliedRoleCollection.update(input.appliedRoleId, {
         status: input.status,
       })
+      if (input.status == ApplicationStatus.ACCEPTED) {
+        updateAcceptedApplicant(input.applicantId, input.appliedRoleId)
+      }
+      return res
     } catch (e) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
@@ -43,3 +49,16 @@ export const updateInterviewNotes = protectedProcedure
       })
     }
   })
+
+// update the current User model's department and role as the applicant is now a FTS member
+const updateAcceptedApplicant = async (
+  applicantId: string,
+  appliedRoleId: string
+) => {
+  const appliedRole = await appliedRoleCollection.findById(appliedRoleId)
+  const user = await userCollection.update(applicantId, {
+    department: appliedRole?.department,
+    role: appliedRole?.role,
+  })
+  return user
+}

From 871d477dbbcb40861f7542ee5481783f271c571c Mon Sep 17 00:00:00 2001
From: Jess Raphael <jxssraphael11@gmail.com>
Date: Tue, 6 Jun 2023 01:13:10 +0800
Subject: [PATCH 109/223] Added new fields for updateInfo

-discord
-dietary
---
 src/pages/calendar/index.tsx                  |  2 +-
 src/pages/form/updateInfo.tsx                 | 30 +++++++++++++++++--
 src/server/db/models/User.ts                  |  3 +-
 .../trpc/router/users/updateUserInfo.ts       |  6 +++-
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/pages/calendar/index.tsx b/src/pages/calendar/index.tsx
index d995dd8a..0ee268bb 100644
--- a/src/pages/calendar/index.tsx
+++ b/src/pages/calendar/index.tsx
@@ -54,4 +54,4 @@ const CalendarPage: React.FC<BaseProps> = ({ session }) => {
   )
 }
 
-export default withAuth(CalendarPage, true)
+export default withAuth(CalendarPage, false)
diff --git a/src/pages/form/updateInfo.tsx b/src/pages/form/updateInfo.tsx
index 648fb288..87b44a3e 100644
--- a/src/pages/form/updateInfo.tsx
+++ b/src/pages/form/updateInfo.tsx
@@ -45,7 +45,9 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
   const FormSchema = z.object({
     telegram: z.string().min(1, { message: 'Invalid name' }),
     linkedin: z.string().min(1, { message: 'Invalid url' }),
-    shirtSize: z.string().min(1, { message: 'Invalid size' })
+    shirtSize: z.string().min(1, { message: 'Invalid size' }),
+    dietary: z.string().min(1, {message:'Invalid dietary requirement'}),
+    discord: z.string().min(1, { message: 'Invalid ID' }),
   })
 
   type FormSchemaType = z.infer<typeof FormSchema>
@@ -71,6 +73,8 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
           telegram: formData.telegram,
           shirtSize: formData.shirtSize,
           linkedin: formData.linkedin,
+          discord: formData.discord,
+          dietary: formData.dietary
 
         })
         toast({
@@ -103,7 +107,7 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta
           name="description"
-          content="Onboarding memebr particulars for Atlas"
+          content="Onboarding member particulars for Atlas"
         />
       </Head>
       <TopNavbar isAdmin={session.isAdmin} />
@@ -157,6 +161,28 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
             </div>
             <br/>
 
+            <div>
+            <FormLabel> Discord Handle </FormLabel>
+            <Input
+            type='text'
+            disabled={isSubmitting}
+            {...register('discord', {required: true})}
+            placeholder='Discord Handle' />
+            </div>
+
+            <br/>
+
+            <div>
+            <FormLabel> Dietary Requirements </FormLabel>
+            <Input
+            type='text'
+            disabled={isSubmitting}
+            {...register('dietary', {required: true})}
+            placeholder='Dietary Requirements (Vegetarian etc)' />
+            </div>
+
+            <br/>
+
             <div className="flex justify-between">
               <Button
                 bgColor="#FF9900"
diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index d46fd9f2..bdfd91be 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -12,11 +12,12 @@ export type User = {
 
   // Optional fields in create single user.
   batch?: string
-  diet?: string
+  dietary?: string
   course?: string
   linkedin?: string
   phone?: string
   telegram?: string
   dob?: string // Store in DD-MM format so that we can get their birthday easily.
   shirtSize?: string
+  discord?: string
 }
diff --git a/src/server/trpc/router/users/updateUserInfo.ts b/src/server/trpc/router/users/updateUserInfo.ts
index 4dd68bca..e4dcb9c1 100644
--- a/src/server/trpc/router/users/updateUserInfo.ts
+++ b/src/server/trpc/router/users/updateUserInfo.ts
@@ -9,13 +9,17 @@ export const updateUserInfo = protectedProcedure
       telegram: z.string(),
       shirtSize: z.string(),
       linkedin: z.string(),
+      discord: z.string(),
+      dietary: z.string()
     })
   )
   .mutation(async ({ input }) => {
     return await userCollection.update(input.studentId, {
     shirtSize: input.shirtSize,
     linkedin: input.linkedin,
-    telegram: input.telegram
+    telegram: input.telegram,
+    discord: input.discord,
+    dietary: input.dietary
 
     })
   })

From 23bb53072f6fc5fe9c3eac9bb94bd8b8180f433a Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Tue, 6 Jun 2023 23:51:08 +0800
Subject: [PATCH 110/223] add filter button

---
 src/components/common/SearchBar.tsx          | 71 +++++++++++++++++++-
 src/components/recruitment/ApplicantGrid.tsx |  5 +-
 src/context/recruitment/SearchProvider.tsx   | 13 ++++
 3 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 0a4d15d0..a6719ff1 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -2,11 +2,42 @@ import React, { useContext, useState } from 'react'
 import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import { SearchIcon } from '@chakra-ui/icons'
 import { searchContext } from '~/context/recruitment/SearchProvider'
+import { ChevronDownIcon } from '@chakra-ui/icons';
 
 const SearchBar = () => {
   const { search, setSearch } = useContext(searchContext)
+  const [showDropdown, setShowDropdown] = useState(false);
+  const [selectedFilter, setSelectedFilter] = useState('');
+  const [showOptions, setShowOptions] = useState(false);
   console.log('searchbar: ', search)
+
+  const handleFilterChange = (filter: React.SetStateAction<string>) => {
+    setSelectedFilter(filter);
+    setShowDropdown(false);
+    // Perform filtering logic or update your data based on the selected filter
+  };
+
+  const renderOptions = () => {
+    if (selectedFilter === 'Roles') {
+      return (
+        <ul className="ml-2">
+          <li className="px-3 py-2 cursor-pointer">Role 1</li>
+          <li className="px-3 py-2 cursor-pointer">Role 2</li>
+        </ul>
+      );
+    }
+    if (selectedFilter === 'Status') {
+      return (
+        <ul className="ml-2">
+          <li className="px-3 py-2 cursor-pointer">Status 1</li>
+          <li className="px-3 py-2 cursor-pointer">Status 2</li>
+        </ul>
+      );
+    }
+    return null;
+  };
   return (
+    
     <InputGroup
       minWidth={'150px'}
       maxWidth={'300px'}
@@ -18,6 +49,7 @@ const SearchBar = () => {
       marginLeft={{ base: 'auto' }}
       marginRight={{ base: 'auto' }}
     >
+      
       <InputLeftElement>
         <SearchIcon />
       </InputLeftElement>
@@ -28,9 +60,44 @@ const SearchBar = () => {
         borderColor="#004586"
         borderRadius="20px"
         onChange={(e) => {
-          setSearch(e.currentTarget.value)
+          setSearch(e.currentTarget.value);
         }}
-      ></Input>
+      />
+       <button
+        type="button"
+        className="ml-2 px-3 py-2 rounded-md bg-gray-200 text-gray-600 relative"
+        onMouseEnter={() => setShowOptions(true)}
+        onMouseLeave={() => {setShowOptions(false), setShowDropdown(true)}}
+       
+        
+      >
+        <ChevronDownIcon />
+        {showOptions && (
+          <div className="absolute top-0 right-0 mt-10 bg-white border border-gray-200 rounded-md shadow-md">
+            {showDropdown ? (
+              <>
+                <button
+                  type="button"
+                  className="px-4 py-2 cursor-pointer"
+                  onClick={() => handleFilterChange('Roles')}
+                >
+                  Roles
+                </button>
+                <button
+                  type="button"
+                  className="px-4 py-2 cursor-pointer"
+                  onClick={() => handleFilterChange('Status')}
+                >
+                  Status
+                </button>
+              </>
+            ) : (
+              renderOptions()
+            )}
+          </div>
+        )}
+      </button>
+     
     </InputGroup>
   )
 }
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 418b3a51..605a1f2b 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,11 +1,12 @@
 import { useContext } from 'react'
-import { searchContext } from '~/context/recruitment/SearchProvider'
+import { filterContext, searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
 import InfoPopup from '~/components/recruitment/InfoPopup'
 
 const ApplicantGrid = () => {
   const { search } = useContext(searchContext)
+  const { filter } = useContext(filterContext)
   const { data } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
   if (!data) return <></>
 
@@ -16,6 +17,8 @@ const ApplicantGrid = () => {
           return applicant.name.toLowerCase().includes(search.toLowerCase())
         })
 
+  
+
   return (
     <>
       <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
diff --git a/src/context/recruitment/SearchProvider.tsx b/src/context/recruitment/SearchProvider.tsx
index 2ef0ef68..c5e57add 100644
--- a/src/context/recruitment/SearchProvider.tsx
+++ b/src/context/recruitment/SearchProvider.tsx
@@ -5,6 +5,11 @@ type SearchContextType = {
   setSearch: (s: string) => void
 }
 
+type filterContextType = {
+  filter: string
+  setFilter: (s: string) => void
+}
+
 export const searchContext = createContext<SearchContextType>({
   search: '',
   setSearch: () => {
@@ -12,6 +17,14 @@ export const searchContext = createContext<SearchContextType>({
   },
 })
 
+export const filterContext = createContext<ContextType>({
+  filter: '',
+  setFilter: () => {
+    return
+  },
+})
+
+
 const SearchProvider = (props: any) => {
   const [search, setSearch] = useState<string>('')
   return (

From 5602811423df28dac0edaf417bd9c6ddb7463e4b Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 7 Jun 2023 09:16:22 +0800
Subject: [PATCH 111/223] Fix the bug where React component is not capital

---
 src/pages/form/updateInfo.tsx | 152 +++++++++++++++++-----------------
 1 file changed, 75 insertions(+), 77 deletions(-)

diff --git a/src/pages/form/updateInfo.tsx b/src/pages/form/updateInfo.tsx
index 87b44a3e..8125b2d3 100644
--- a/src/pages/form/updateInfo.tsx
+++ b/src/pages/form/updateInfo.tsx
@@ -7,20 +7,18 @@ import {
   Select,
 } from '@chakra-ui/react'
 import { useRouter } from 'next/router'
-import withAuth, { BaseProps }from '~/utils/withAuth'
+import withAuth, { BaseProps } from '~/utils/withAuth'
 import React, { useState, ChangeEvent } from 'react'
 import Head from 'next/head'
 import Container from '~/components/auth/Container'
 import TopNavbar from '~/components/common/TopNavbar'
 import UploadImage from '~/components/profile/UploadImage'
-import { registerVersion } from '@firebase/app'
 import { trpc } from '~/utils/trpc'
 import { useForm } from 'react-hook-form'
 import { z } from 'zod'
 import { zodResolver } from '@hookform/resolvers/zod'
 
-
-const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
+const UpdateInfoPage: React.FC<BaseProps> = ({ session }) => {
   const router = useRouter()
   const toast = useToast()
   const [selectedShirtSize, setShirtSize] = useState<string>()
@@ -40,13 +38,12 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
     setShirtSize(event.target.value) // Update the selected value in the state
   }
 
-
   //Form Data Integrity
   const FormSchema = z.object({
     telegram: z.string().min(1, { message: 'Invalid name' }),
     linkedin: z.string().min(1, { message: 'Invalid url' }),
     shirtSize: z.string().min(1, { message: 'Invalid size' }),
-    dietary: z.string().min(1, {message:'Invalid dietary requirement'}),
+    dietary: z.string().min(1, { message: 'Invalid dietary requirement' }),
     discord: z.string().min(1, { message: 'Invalid ID' }),
   })
 
@@ -63,39 +60,34 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
   const { mutateAsync, isLoading: isSubmitting } =
     trpc.user.updateUserInfo.useMutation()
 
-    const formSubmit = async (formData: FormSchemaType) => {
-      try {
-
-        await mutateAsync({
-
-          //toDO: add json attributes
-          studentId: studentId,
-          telegram: formData.telegram,
-          shirtSize: formData.shirtSize,
-          linkedin: formData.linkedin,
-          discord: formData.discord,
-          dietary: formData.dietary
-
-        })
-        toast({
-          duration: 3000,
-          status: 'success',
-          title: 'Success',
-          description: 'User profile has been successfully updated',
-        })
-
-        redirectHome()
-
-        
-      } catch (e) {
-        toast({
-          description: (e as Error).message,
-          duration: 3000,
-          status: 'error',
-          title: 'Oops, an error occured!',
-        })
-      }
+  const formSubmit = async (formData: FormSchemaType) => {
+    try {
+      await mutateAsync({
+        //toDO: add json attributes
+        studentId: studentId,
+        telegram: formData.telegram,
+        shirtSize: formData.shirtSize,
+        linkedin: formData.linkedin,
+        discord: formData.discord,
+        dietary: formData.dietary,
+      })
+      toast({
+        duration: 3000,
+        status: 'success',
+        title: 'Success',
+        description: 'User profile has been successfully updated',
+      })
+
+      redirectHome()
+    } catch (e) {
+      toast({
+        description: (e as Error).message,
+        duration: 3000,
+        status: 'error',
+        title: 'Oops, an error occured!',
+      })
     }
+  }
 
   //toDO: Route to applicant status page created by Zeyu
   const redirectHome = () => router.push('/events')
@@ -117,22 +109,25 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
           <h1 className="mb-10 text-center text-2xl font-bold">
             Update Member Particulars
           </h1>
-          
 
           <div className="justify-center">
-          <UploadImage session={session} studentId={session?.user?.id as string} />
+            <UploadImage
+              session={session}
+              studentId={session?.user?.id as string}
+            />
           </div>
 
           <VStack align="left">
-
             <div>
-
               <FormLabel>Fintech Society Shirt Size</FormLabel>
-              </div>
-
-              <div className="flex justify-center">
+            </div>
 
-              <Select  {...register('shirtSize', { required: true })} value={selectedShirtSize} onChange={handleSelectChange}>
+            <div className="flex justify-center">
+              <Select
+                {...register('shirtSize', { required: true })}
+                value={selectedShirtSize}
+                onChange={handleSelectChange}
+              >
                 <option value="">Select Shirt Size</option>
                 {options.map((option) => (
                   <option key={option.value} value={option.value}>
@@ -141,47 +136,51 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
                 ))}
               </Select>
             </div>
-            <br/>
+            <br />
             <div>
-            <FormLabel> Telegram Handle</FormLabel>
-            <Input
-            type='text'
-            disabled={isSubmitting}
-            {...register('telegram', {required: true})}
-            placeholder='Telegram Handle' />
+              <FormLabel> Telegram Handle</FormLabel>
+              <Input
+                type="text"
+                disabled={isSubmitting}
+                {...register('telegram', { required: true })}
+                placeholder="Telegram Handle"
+              />
             </div>
-            <br/>
+            <br />
             <div>
-            <FormLabel> Linkedin URL </FormLabel>
-            <Input
-            type='text'
-            disabled={isSubmitting}
-            {...register('linkedin', {required: true})}
-            placeholder='Linkedin URL' />
+              <FormLabel> Linkedin URL </FormLabel>
+              <Input
+                type="text"
+                disabled={isSubmitting}
+                {...register('linkedin', { required: true })}
+                placeholder="Linkedin URL"
+              />
             </div>
-            <br/>
+            <br />
 
             <div>
-            <FormLabel> Discord Handle </FormLabel>
-            <Input
-            type='text'
-            disabled={isSubmitting}
-            {...register('discord', {required: true})}
-            placeholder='Discord Handle' />
+              <FormLabel> Discord Handle </FormLabel>
+              <Input
+                type="text"
+                disabled={isSubmitting}
+                {...register('discord', { required: true })}
+                placeholder="Discord Handle"
+              />
             </div>
 
-            <br/>
+            <br />
 
             <div>
-            <FormLabel> Dietary Requirements </FormLabel>
-            <Input
-            type='text'
-            disabled={isSubmitting}
-            {...register('dietary', {required: true})}
-            placeholder='Dietary Requirements (Vegetarian etc)' />
+              <FormLabel> Dietary Requirements </FormLabel>
+              <Input
+                type="text"
+                disabled={isSubmitting}
+                {...register('dietary', { required: true })}
+                placeholder="Dietary Requirements (Vegetarian etc)"
+              />
             </div>
 
-            <br/>
+            <br />
 
             <div className="flex justify-between">
               <Button
@@ -203,7 +202,6 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
                 Update
               </Button>
             </div>
-
           </VStack>
         </form>
       </Container>
@@ -211,4 +209,4 @@ const updateInfoPage: React.FC<BaseProps> = ({ session }) => {
   )
 }
 
-export default withAuth(updateInfoPage)
+export default withAuth(UpdateInfoPage)

From b4995bf7ca3c9e336a96912bdc1cc57702fa1793 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 7 Jun 2023 20:00:45 +0800
Subject: [PATCH 112/223] changed applicant grid

---
 src/components/recruitment/ApplicantGrid.tsx | 31 ++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 src/components/recruitment/ApplicantGrid.tsx

diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
new file mode 100644
index 00000000..418b3a51
--- /dev/null
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -0,0 +1,31 @@
+import { useContext } from 'react'
+import { searchContext } from '~/context/recruitment/SearchProvider'
+import { trpc } from '~/utils/trpc'
+import ApplicantCard from './ApplicantCard'
+import InfoPopup from '~/components/recruitment/InfoPopup'
+
+const ApplicantGrid = () => {
+  const { search } = useContext(searchContext)
+  const { data } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
+  if (!data) return <></>
+
+  const filteredData =
+    search === ''
+      ? data
+      : data?.filter((applicant) => {
+          return applicant.name.toLowerCase().includes(search.toLowerCase())
+        })
+
+  return (
+    <>
+      <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
+        {filteredData?.map((applicant) => {
+          return <ApplicantCard applicant={applicant} key={applicant.id} />
+        })}
+      </div>
+      {filteredData.length > 0 && <InfoPopup />}
+    </>
+  )
+}
+
+export default ApplicantGrid

From 20009e2a544652a19e85be3899f814f12be1e68e Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 7 Jun 2023 22:53:04 +0800
Subject: [PATCH 113/223] random

---
 src/components/recruitment/ApplicantGrid.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 605a1f2b..8460c143 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -13,11 +13,18 @@ const ApplicantGrid = () => {
   const filteredData =
     search === ''
       ? data
-      : data?.filter((applicant) => {
+      : data.filter((applicant) => {
           return applicant.name.toLowerCase().includes(search.toLowerCase())
         })
 
   
+ 
+
+ 
+    
+
+
+  
 
   return (
     <>

From 848035384a17b362a2430338cbb4454651ea337b Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Wed, 7 Jun 2023 23:17:11 +0800
Subject: [PATCH 114/223] Revert "Update User model when applicant gets
 accepted"

This reverts commit 6a1618f6aa5d48a9bcf88b93247d370942585968.
---
 src/components/recruitment/ApplicantCard.tsx  |  1 -
 .../recruitment/AppliedRoleListItem.tsx       |  3 ---
 src/components/recruitment/StatusPopup.tsx    |  3 ---
 src/server/trpc/router/recruitment/update.ts  | 21 +------------------
 4 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index f03f7e36..3a7d1a89 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -57,7 +57,6 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
           <Text>Role Applied:</Text>
           <UnorderedList styleType="none">
             <AppliedRoleListItem
-              applicantId={applicant.id}
               appliedRole={appliedRole}
               key={appliedRole.id}
               refetch={refetch}
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index edbe78d0..f93a9989 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -4,11 +4,9 @@ import type { AppliedRole } from '~/server/db/models/AppliedRole'
 import StatusPopup from './StatusPopup'
 
 const AppliedRoleListItem = ({
-  applicantId,
   appliedRole,
   refetch,
 }: {
-  applicantId: string
   appliedRole: AppliedRole
   refetch: () => Promise<QueryObserverResult>
 }) => {
@@ -18,7 +16,6 @@ const AppliedRoleListItem = ({
         {appliedRole.rank}. {appliedRole.role}
       </Text>
       <StatusPopup
-        applicantId={applicantId}
         status={appliedRole.status}
         appliedRoleId={appliedRole.id}
         refetch={refetch}
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 71e05dca..893bcadc 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -24,12 +24,10 @@ const statusFillMap = {
 }
 
 const StatusPopup = ({
-  applicantId,
   status,
   appliedRoleId,
   refetch,
 }: {
-  applicantId: string
   appliedRoleId: string
   status: ApplicationStatus
   refetch: () => Promise<QueryObserverResult>
@@ -39,7 +37,6 @@ const StatusPopup = ({
   const updateStatus = async (status: ApplicationStatus) => {
     try {
       await mutateAsync({
-        applicantId: applicantId,
         status: status,
         appliedRoleId: appliedRoleId,
       })
diff --git a/src/server/trpc/router/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
index 6acc6835..13307c92 100644
--- a/src/server/trpc/router/recruitment/update.ts
+++ b/src/server/trpc/router/recruitment/update.ts
@@ -3,25 +3,19 @@ import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
 import { ApplicationStatus } from '~/server/db/models/AppliedRole'
-import userCollection from '~/server/db/collections/UserCollection'
 
 export const updateAppliedRoleStatus = protectedProcedure
   .input(
     z.object({
-      applicantId: z.string(),
       appliedRoleId: z.string(),
       status: z.nativeEnum(ApplicationStatus),
     })
   )
   .mutation(async ({ input }) => {
     try {
-      const res = await appliedRoleCollection.update(input.appliedRoleId, {
+      return await appliedRoleCollection.update(input.appliedRoleId, {
         status: input.status,
       })
-      if (input.status == ApplicationStatus.ACCEPTED) {
-        updateAcceptedApplicant(input.applicantId, input.appliedRoleId)
-      }
-      return res
     } catch (e) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
@@ -49,16 +43,3 @@ export const updateInterviewNotes = protectedProcedure
       })
     }
   })
-
-// update the current User model's department and role as the applicant is now a FTS member
-const updateAcceptedApplicant = async (
-  applicantId: string,
-  appliedRoleId: string
-) => {
-  const appliedRole = await appliedRoleCollection.findById(appliedRoleId)
-  const user = await userCollection.update(applicantId, {
-    department: appliedRole?.department,
-    role: appliedRole?.role,
-  })
-  return user
-}

From 5232a764b36f6a0dff1b4f2ccd1a1a549910953b Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 11 Jun 2023 14:09:59 +0800
Subject: [PATCH 115/223] delete Atlas.zip and prisma

---
 Atlas.zip            | Bin 3074 -> 0 bytes
 prisma/schema.prisma |   0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Atlas.zip
 delete mode 100644 prisma/schema.prisma

diff --git a/Atlas.zip b/Atlas.zip
deleted file mode 100644
index 5e7a95b030b6eff75fe1ae2cb1c7bb45fc348ca9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3074
zcmZve2{csw8^_0tHG5M=$TBF(T7<H^wqh`2DO*FmdPBlAGX_KPGO~@eG&Ez$WSeXu
z#E=w5b|GtI5@{-mnh^b^^RGYWfA6{H+<VXY{LXXE=RD8zwY36q?g9V+yZ|*k-LdYB
zP~P>;uk6j|=U>N*7XnZiHEf`lc0z?vq{bfephwI%bpt#;)aWDPe$L2!6V^o!EdAoN
z^bMy-EuSVRSTcTJ#0QbYmUqrWyeG%|&En=9B3pePMW2Ck7;pSdnR=lYXBeD#KP)px
zkt|+F6zM{Kek3quH)y6{FFj7Z?cV=b_EUv+(OpAay?}wikH(iD%7kFK7A9ijOdi{9
z#mdSZD|*fW0K5hP00O^@Rn`1iuA4)%|G0)gBl|G#f`0TKMVQ1pAf<vD^KtB{KNne%
zqw;|>p+3h5#+QZT_I(|PfKJKd)>msH@a%wzB+x-2knb?P`>U>y3HM|mYh`?CO;<$Z
zf$s8~bM*BvDWTq&FMx$6cFZt(L^@ghoMSOQ8!dKqqsoN~>N@)AY4^~V&ev#u#Op<Z
ztY$%o%r1NT*eE+?g!12sq9*1qG9&bs?|bCi^WPt%XdXq#wa2;IR^3~tIba`Cqs{lk
z=f~<>zJZrU-8kG5+(C=9RI#M;N@zquNlk(Gb~~2cDamq$iX{Qbph4f(f3h&`Ssh&#
zEh&kE54$3BxyLWS?TQ=V`Pl)QqCVHj@XGj7pR+1=M5|-1YwpfRDv4XtK?R)_d=9B3
z)tvW5dkzRaPiyvCi~fjE%C8{K!~JTP^JZ;NxcY#-6jU75CGVmks0;JAxv-^A*o~c0
zig5<QCXt6$K6a6>vhn-BFY+hxXEc;32A734+YFi*9(IrPI;A%99#eT@-dHE3`32`(
z2tj{VFkphrLZTWNSJlL<Avi;X^b-2)ePqi@T1Z!6uxR0%bMhO-(;)4u?IEXx*G<-!
ztyXBW<x?nB%&nL8fouL{8^G=EKckvmdp6y_*zW$wFZTwh@xKIKE**|#!Ivy1_m{^W
zG23?}?{c(17jujodBP$=$*5_N@yv$DID~P~(C|jk+C~LodJ!`kBv;VR@pb&EfA~Dm
ziEj}-BE+8SRTB|OKxZU{%Oo+>GJ6XB{_Qnl41_|yrgyT~-JasyQk=agx*)i}Z6JnD
z86Q5EZqN`g&0`EzF`tPORKD03Nki}zA1Z=k)kNeGn#vi1R3m6cSDqIs?%Cez<2Mrz
z9Dr!e5yO>V6g3X&g5@P_XkK-1F|LigTo6qrlZm5}iKa<-(#bfpB;wfv5UXqG)Knd(
zGu8(^o;e@Q*qs({?h;yDC3zuDDz{)X0g|F!rw5h9niXHm(_iI)J4fNPK87I;F6`dR
zP&CC{e}_9s>IbJqlBwyaV;K3m{P!qyx9dyyk9P<A!NFk6^`h)2x5*8bOqU_gGi~JT
z0$TmO8DFWKx<j7I$^0~wk@{Sp{ke*=J1Fha=KPtx$zhJ4Jpu)5JWEC-huTYtsw3nE
z51GGS*YrPdmP9@su!i_kf{4`@oi*KFR`2(zz%e99#dSE%^bs5yf*sxPYYErBn)?|t
zbSlK%zppn?xarnE!op(5!us3zgMyYI+r3}@>~>^e)BEIh???aZeL~}>cV3)Ya^54N
zuIYrFX}#xLN7?ixj$!&8P3HIS_LcdUkB{!jX=h8*#%tLi6~-K1LLgKOG_VnzG20xg
z3tC{TW5QR&1vreKnHq%YWy1-2=XydxGEIoN+Ggve@2h^bXGvTTV!BaGmPkLmld>g!
ziL;lmV*CmkADR|51N!!_;Y@#MSC8?ccxl+}e9xPvlvZF2=d-(sJxS0SkDHUHkHsB2
zvb(ZYtYj#h>q^4iZe*&a2gWcGdl_+{?X9@JUb|SMQwbYiS|1qkIM*ZVl;U0Vpu3O*
zO;XXZ<Y|gYUl^>)!%FIwR)qJEb)YqV?@1-O=uEk_Gowy#GN{zsN;LNb>R5(}D9@Pe
z9`Nb20E1npQ>3cX9b%porN!5H04=#mX}h#`!8~3ubCWwFPSw;YfevPvIl%Wj<prL9
zPE;F;&P=thNya_tI9XDSfJze*g(bb;2MuGr^UEt(%_B-*X4)Py%x!p3_Mw$4eHXN8
z5tQqyqxv7wpTeJR%127N5n0YUzLNOP>RWF$-G-{q_|(<-7}PkS{mjpnsa}CVo;RKR
z&X@+DHpE@KQ@BbBt6_g@r7y0#cfn<l_~0O&aE|Tr%UKW4_ioCc-!5P4m;4I<E%|$+
zPNWx@#odTUM%OF-YI=;G%#}ud3HhG6^hz7If#ze`E8p5r!D`D<JQ>M|frl()z#{@W
zTtDF^G*xIaX>En|=Gw5R$e^xDQ%-W>K-r0NJ!?Xf;W<6!bpOnPboFaSy+?ZzHvLb6
z?aDvDeA)e>v;0z2p&OeZ3&~TMZ}!SlO5p?Hr9E190~KQIfCOw9ALHN2`C-fGSAAal
z8s@Iw1NO5hV$_5GkT_R?-MCczE2db%=lnFFT#2@klie(5DzFH)y!$~!Wyf)W(W9|9
zs|m4X3LKX1G6K&!Q?9zwRWl;n?1lJsMBB&|P(%mKOakMQb;&PI2!>3o@D_&Q%=S53
zv8=gI**6-WAHv~yec)Eb#~FFL+8W*%T#(>u=HXFHU5IkVwdrOwZ8m`5d@q{c?vRfB
z98ybXrdo|V_l7jd1`HF8`()>K=SuyQGvOlYM=niAN<zG(RBU3*KX{(ePMH>)m_@f9
zSCJoAQ1vGGJExyVo=s`>jfiGp5-$^LGxjG$&%f(|r?tLs(e84>2HLB7&ON++^ZSDA
z25TBL6kZg9NFL8$z2vk6#(v9g!Zl7dhVU%-@0|8Na<hW{o8o7-i`U+{>5(U)%0D-K
zvARLPuymkgpNde5Vynd9`ggme`4T!OJ`BMORlu>oJ|bNDfstNQE3nv~Fuv}u&vvW+
zv9R`G`O4~BI)Fn$@B^!SeY!7*F@PR#W-L7YRJzc%wDN`JdDI3BPbf5^3tksF7KjfD
z$Ff(K^q*KwU8}XaFE+bu#${^H>#SQ$l2a^!UXj#@*8sOzR53}mx|br0xTyX2@Ul!7
zc$CXwTfQpCLykTBGWMpWI;2Ki&dhhwoZAIWf5I)#XSxdrvq-JP7gY@^NI|^^U0|Z}
zV1g(1md2$X(*k`fh-nHD`5->-cCH1W=5?MaE#3QuEz!+kKyk!gG1^vEll$3`mOHBA
zc?lh*T%=AaZ=0_<b)C$gre($y<HtO<_BAX@JJ5LkM2Djt7}hU`@vHj_6rV*<vZTDA
z@6GQrH@{z`-+f^=9!AbNOcCu)CVDPbbp|cc%bguH9@1_ht;-+2acQ+0xrKB^x4t+C
z2^G#-mM$L|TX2<0#2OxF_?47>Nj)(qS;4$wGe?=pR3D39k?4U8>P<~)XOhAtKjp+A
z>{m~J(bQL0e;3o#sXpBd3uhhsx;O@EXj<X7wc-Ho*-D@PKa*}Iz5luXB-EYU&Up9-
zD&2hj#r+D4JIS5l;txp!{wBAg#!hnQdiq1=a{eZ_meo#j=WP2!W^?~0w<g_Aa%Xe=
eA=7z(lUuD~YsIyB768D#dAn}5(~X}IAMhWqhdv7c

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
deleted file mode 100644
index e69de29b..00000000

From 3133467babb4971eee35d42a9ba4f3be3cb44c60 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 11 Jun 2023 16:18:00 +0800
Subject: [PATCH 116/223] improve formatting

---
 src/pages/application_status/index.tsx | 376 +++++++++++++------------
 src/pages/tasks/index.tsx              | 328 +++++++++------------
 2 files changed, 328 insertions(+), 376 deletions(-)

diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 4d7aef7e..40ef1f8d 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -1,42 +1,46 @@
-import { useState, useCallback } from 'react'
+import { useState} from 'react'
 import Head from 'next/head'
-import { Center, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, useDisclosure, useToast } from '@chakra-ui/react'
+import {
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+} from '@chakra-ui/react'
 import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { BaseProps } from '~/utils/withAuth'
-import { Button } from 'flowbite-react'
+
 
 enum PageState {
   LOGIN,
   FORGET_PASSWORD,
 }
 
-const Application_Status:React.FC<BaseProps> = ({ session }) =>{
-
+const Application_Status: React.FC<BaseProps> = ({ session }) => {
   //this part needs backend to update the status
-  const application_status = "accepted"
   const [isOpen, setIsOpen] = useState(false)
   const onOpen = () => setIsOpen(true)
-  const onClose = () => setIsOpen(false)  
+  const onClose = () => setIsOpen(false)
 
-  const [pageState, setPageState] = useState(PageState.LOGIN)
   const roles = [
-    { 
-      id:1,
+    {
+      id: 1,
       name: 'Software Engineer',
-      status: 'accepted'
+      status: 'accepted',
     },
-    { 
-      id:2,
+    {
+      id: 2,
       name: 'Technical Analyst',
-      status: 'interviewed'
+      status: 'interviewed',
     },
     {
-      id:3,
+      id: 3,
       name: 'Research Analyst',
-      status: 'rejected'
-    }
-
+      status: 'rejected',
+    },
   ]
 
   return (
@@ -46,198 +50,197 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The login page for Atlas" />
       </Head>
-      <TopNavbar  image={session.user?.image as string} isAdmin={session.isAdmin} />
+      <TopNavbar
+        image={session.user?.image as string}
+        isAdmin={session.isAdmin}
+      />
       <main>
         <div className="relative h-screen w-screen bg-[url('/images/applicants_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
           {/* Nav element containing the logo */}
-          
-          <nav className="flex justify-center items-center  px-2 py-2 " >
-          
+
+          <nav className="flex items-center justify-center  px-2 py-2 ">
             <Image
               alt="logo"
               src="/images/black_logo.svg"
               height={150}
               width={150}
-            
-            
             />
-         
           </nav>
-      
+
           {/* Login */}
           <div className="flex flex-col justify-center gap-8 font-[Inter]">
-          
-            <h1 className='flex justify-center font-bold text-4xl md:text-8xl mt-4'>
+            <h1 className="mt-4 flex justify-center text-4xl font-bold md:text-8xl">
               Hi User,
             </h1>
-            <h2 className='flex justify-center mt-3 font-bold text-2xl md:text-6xl'>
+            <h2 className="mt-3 flex justify-center text-2xl font-bold md:text-6xl">
               your current statuses are:
             </h2>
-      
-            {roles.map((item) => ( 
-              <div key={item.id} className="flex items-center mt-3 ">
-                  <div className="flex-grow">
-                {item.status == 'accepted' && 
-                <h3 className='flex mt-3 justify-center text-2xl md:text-5xl'>
-                  {item.name}
-                  <Image
-                    alt="logo"
-                    src="/images/Ellipse 1.svg"
-                    height={35}
-                    width={35}
-                    className='flex flex-col  ml-14'              
-                  />
-                    {/* Accepted */}
-                  </h3>
-                }
-              
-                {item.status == 'offered' && <h3 className='flex justify-center text-2xl md:text-5xl'>
-                {item.name}
-                  <Image
-                    alt="logo"
-                    src="/images/blue_dot.svg"
-                    height={35}
-                    width={35}
-                    className='flex flex-col ml-14'
-                  />
-                    {/* Offered */}
-                  </h3>
-                }
-                
-                {item.status == 'pending_review' && <h3 className='flex justify-centertext-2xl md:text-5xl'>
-                {item.name}
-                  <Image
-                    alt="logo"
-                    src="/images/yellow_dot.svg"
-                    height={35}
-                    width={35}
-                    className='ml-14'             
-                  />
-                    {/* Pending Review */}
-                  </h3>
-                }
-                {item.status == 'interviewed' && <h3 className='flex justify-center text-2xl md:text-5xl'>
-                {item.name}
-                  <Image
-                    alt="logo"
-                    src="/images/pink_dot.svg"
-                    height={35}
-                    width={35}
-                    className='ml-14'             
-                  />
-                    {/* Interviewed */}
-                  </h3>
-                }
-                {item.status == 'rejected' && <h3 className='flex justify-center text-2xl md:text-5xl'>
-                {item.name}
-                  <Image
-                    alt="logo"
-                    src="/images/red_dot.svg"
-                    height={35}
-                    width={35}
-                    className='ml-14'             
-                  />
-                    {/* Rejected */}
-                  </h3>
-                }
-                </div>
-                </div>
 
+            {roles.map((item) => (
+              <div key={item.id} className="mt-3 flex items-center ">
+                <div className="flex-grow">
+                  {item.status == 'accepted' && (
+                    <h3 className="mt-3 flex justify-center text-2xl md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/Ellipse 1.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14 flex  flex-col"
+                      />
+                      {/* Accepted */}
+                    </h3>
+                  )}
+
+                  {item.status == 'offered' && (
+                    <h3 className="flex justify-center text-2xl md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/blue_dot.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14 flex flex-col"
+                      />
+                      {/* Offered */}
+                    </h3>
+                  )}
+
+                  {item.status == 'pending_review' && (
+                    <h3 className="justify-centertext-2xl flex md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/yellow_dot.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14"
+                      />
+                      {/* Pending Review */}
+                    </h3>
+                  )}
+                  {item.status == 'interviewed' && (
+                    <h3 className="flex justify-center text-2xl md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/pink_dot.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14"
+                      />
+                      {/* Interviewed */}
+                    </h3>
+                  )}
+                  {item.status == 'rejected' && (
+                    <h3 className="flex justify-center text-2xl md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/red_dot.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14"
+                      />
+                      {/* Rejected */}
+                    </h3>
+                  )}
+                </div>
+              </div>
             ))}
-             <div 
-             className='fixed bottom-20 md:right-28 right-6'
-             >
-              <button 
-                onClick={onOpen}       
-                className="w-16 h-16 md:w-20 md:h-20 rounded-full 
-                       bg-[#FFEBC5]  
-                       hover:bg-[#FFD27C]
-                       text-white
+            <div className="fixed bottom-20 right-6 md:right-28">
+              <button
+                onClick={onOpen}
+                className="h-16 w-16 rounded-full bg-[#FFEBC5] text-white 
+                       hover:bg-[#FFD27C]  
+                       md:h-20
+                       md:w-20
                        
                        
-                       ">
-                         <Image
-                    alt="question_mark"
-                    src="/images/question_mark.svg"
-                    height='20'
-                    width={20}
-                    className='md:ml-7 ml-5'  
-                  />
-            
-        </button>
-        </div>
-        <Modal  isOpen={isOpen} onClose={onClose} size="xs">
-            <ModalOverlay 
-            bg='none'
-            backdropFilter='auto'         
-            />
-           
-           
-            <ModalContent > 
-                
-            <ModalHeader fontSize='5xl' ></ModalHeader>
-            <ModalCloseButton />
-            <ModalBody fontSize='3xl' >
-          
-            <div className="flex flex-col items-start">
-              <div className='flex items-center'>
-              <Image
-                    alt="logo"
-                    src="/images/Ellipse 1.svg"
-                    height={35}
-                    width={35}
-                    className='flex flex-col mr-5'              
-                  />
-                Accepted</div>
-                </div>
-            
-              <div className="flex flex-col items-start">
-              <div className='flex items-center'>
-              <Image
-                    alt="logo"
-                    src="/images/blue_dot.svg"
-                    height={35}
-                    width={35}
-                    className='flex flex-col mr-5'
-                  />
-                  Offered</div>
+                       "
+              >
+                <Image
+                  alt="question_mark"
+                  src="/images/question_mark.svg"
+                  height="20"
+                  width={20}
+                  className="ml-5 md:ml-7"
+                />
+              </button>
+            </div>
+            <Modal isOpen={isOpen} onClose={onClose} size="xs">
+              <ModalOverlay bg="none" backdropFilter="auto" />
+
+              <ModalContent>
+                <ModalHeader fontSize="5xl"></ModalHeader>
+                <ModalCloseButton />
+                <ModalBody fontSize="3xl">
+                  <div className="flex flex-col items-start">
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/Ellipse 1.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5 flex flex-col"
+                      />
+                      Accepted
+                    </div>
+                  </div>
+
+                  <div className="flex flex-col items-start">
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/blue_dot.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5 flex flex-col"
+                      />
+                      Offered
+                    </div>
                   </div>
                   <div className="flex flex-col items-start">
-              <div className='flex items-center'>
-              <Image
-                    alt="logo"
-                    src="/images/yellow_dot.svg"
-                    height={35}
-                    width={35}
-                    className='mr-5'             
-                  />
-                  Pending Review</div>
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/yellow_dot.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5"
+                      />
+                      Pending Review
+                    </div>
                   </div>
                   <div className="flex flex-col items-start">
-              <div className='flex items-center'>
-              <Image
-                    alt="logo"
-                    src="/images/pink_dot.svg"
-                    height={35}
-                    width={35}
-                    className='mr-5'             
-                  />Interviewed</div>
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/pink_dot.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5"
+                      />
+                      Interviewed
+                    </div>
                   </div>
-                <div className="flex flex-col items-start">
-              <div className='flex items-center'>
-              <Image
-                    alt="logo"
-                    src="/images/red_dot.svg"
-                    height={35}
-                    width={35}
-                    className='mr-5'             
-                  />Rejected</div>      
-                </div>
-            </ModalBody>
-            <ModalFooter>
-            </ModalFooter>
-        </ModalContent>
-        </Modal>
+                  <div className="flex flex-col items-start">
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/red_dot.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5"
+                      />
+                      Rejected
+                    </div>
+                  </div>
+                </ModalBody>
+                <ModalFooter></ModalFooter>
+              </ModalContent>
+            </Modal>
           </div>
         </div>
       </main>
@@ -245,5 +248,4 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
   )
 }
 
-
-export default withAuth(Application_Status, false)
\ No newline at end of file
+export default withAuth(Application_Status, false)
diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 5656b799..19da6bba 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -1,228 +1,178 @@
-import { useRouter, } from 'next/router'
-import { useSession} from 'next-auth/react'
-import { useState, useCallback, useRef, Fragment } from 'react'
+import { useState} from 'react'
 import Head from 'next/head'
-import {  Box, Button, Grid, GridItem, Heading, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, Portal, useDisclosure, useToast, Text, InputGroup, InputLeftElement, TableContainer, Table, TableCaption, Thead, Tr, Th, Tbody, Td, Tfoot, Center } from '@chakra-ui/react'
-import Image from 'next/image'
+import {
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+  useDisclosure,
+  Text,
+  Center,
+} from '@chakra-ui/react'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
-import { SearchIcon } from '@chakra-ui/icons'
-
-
-
-
-enum PageState {
-  LOGIN,
-  FORGET_PASSWORD,
-}
-
-const Tasks:React.FC<BaseProps> = ({ session }) => {
 
+const Tasks: React.FC<BaseProps> = ({ session }) => {
   const [searchQuery, setSearchQuery] = useState('')
   const { isOpen, onOpen, onClose } = useDisclosure()
   const [currentDetails, setCurrentDetails] = useState('')
   const [currentName, setCurrentName] = useState('')
 
-
-
   const data = [
     {
       id: 1,
       status: 'Done',
       name: 'Join Telegram Group',
       due: '09/12/23',
-      details: 'User should join the telegram group before their due date.'
+      details: 'User should join the telegram group before their due date.',
+    },
+    {
+      id: 2,
+      status: 'In Progress',
+      name: 'Have lunch',
+      due: '1/4/24',
+      details: 'Have lunch at school with friends.',
     },
     {
-        id: 2,
-        status: 'In Progress',
-        name: 'Have lunch',
-        due: '1/4/24',
-        details: 'Have lunch at school with friends.'
-      },
-      {
-        id: 3,
-        status: 'Incomplete',
-        name: 'Attend first townhall',
-        due: '23/5/24',
-        details: 'Attend the first townhall to learn more about Fintech Society and its projects.'
-      },
-    
+      id: 3,
+      status: 'Incomplete',
+      name: 'Attend first townhall',
+      due: '23/5/24',
+      details:
+        'Attend the first townhall to learn more about Fintech Society and its projects.',
+    },
   ]
-  
 
   const filteredData = data.filter((item) =>
     item.name.toLowerCase().includes(searchQuery.toLowerCase())
   )
 
-
-
   return (
     <>
-    
       <Head>
         <title>Atlas | Login</title>
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The login page for Atlas" />
       </Head>
-      <TopNavbar  image={session.user?.image as string} isAdmin={session.isAdmin} />
+      <TopNavbar
+        image={session.user?.image as string}
+        isAdmin={session.isAdmin}
+      />
       <main>
         <div className="relative h-screen w-screen  bg-[url('/images/tasks_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
           {/* Nav element containing the logo */}
-       
-
-       
 
           {/* Login */}
           <div className="flex flex-col justify-center gap-8 font-[Inter]">
-           
-          
-            <h1 className='flex justify-center font-bold text-4xl mt-[3%] text-white'>
-             Tasks
+            <h1 className="mt-[3%] flex justify-center text-4xl font-bold text-white">
+              Tasks
             </h1>
-            
-           
-                {/* <InputGroup>
-      <InputLeftElement
-        className="mt-[1%] ml-[8%] mb-4"
-        pointerEvents="none"
-        >
-        <SearchIcon className="SearchIcon" color="gray.300" />
-        
-        </InputLeftElement>
-       <Input
-                placeholder="Search"
-                value={searchQuery}
-                onChange={(e) => setSearchQuery(e.target.value)}
-                borderWidth="3px"
-                w={{ base: '150px', md: '300px' }}
-                border="3px solid #F9813E"
-                borderColor="#9BAFC2" 
-                borderRadius="30px"
-                className="mt-[1%] ml-[8%] mb-4 text-white"
-                _placeholder={{
-                pl: { base: '5px', lg: '3px' },
-                fontStyle: 'italic',
-                }}
-            />
-    </InputGroup> */}
-              
-                
-              
-              <Center>
-              <div className="max-w-screen-lg mx-auto md:max-w-screen-md">
-
-      <table className="min-w-full divide-y divide-gray-200">
-        <thead className="">
-          <tr>
-            <th
-              scope="col"
-              className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-            >
-              Status
-            </th>
-            <th
-              scope="col"
-              className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-            >
-              Task
-            </th>
-            <th
-              scope="col"
-              className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-            >
-              Do By
-            </th>
-          </tr>
-        </thead>
-        <tbody className="divide-y divide-gray-200">
-        {filteredData.map((item) => (
-           
-      <tr key={item.id}>
-         <td className="px-6 py-4 whitespace-nowrap">
-         
-          <h1 className="  text-white">{item.status == "Incomplete" && 
-          <button
-          disabled = {true}
-          className="flex-col  items-center w-24 md:w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#C51F29] py-1 px-5 font-medium transition"
-
-            >
-          <div className='font-[Inter] text-xs md:text-xl text-white'>
-          {item.status}
-          </div>
-        </button>
-          }
-          {item.status == "In Progress" && <button
-          disabled = {true}
-          className="flex-col items-center w-24 md:w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#FFBD3C] py-1 px-5 font-medium transition"
-         
-            >
-          <div className='font-[Inter] text-xs md:text-xl text-white'>
-          {item.status}
-          </div>
-        </button>}
-          {item.status == "Done" && <button
-          disabled = {true}
-          className="flex-col items-center w-24 md:w-[150px] max-w-20 bg-opacity-100  text-md mx-auto rounded-full  bg-[#00C09D] py-1 px-5 font-medium transition"
-         
-            >
-          <div className='font-[Inter] text-xs md:text-xl text-white'>
-          {item.status}
-          </div>
-        </button>}
-          </h1>
-          </td>
-          <td>  
-            <Text
-        as="span"
-        cursor="pointer"
-        _hover={{ textDecoration: 'underline' }}
-        className='md:text-xl text-white'
-        onClick={() => {setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
-       
-      >
-        {item.name}
-      </Text>
-      </td>
-      <td>  <h1 className="md:text-xl text-white">{item.due}</h1></td>
-          
-          </tr>
-          
-    ))}
-
-     
-        
-        </tbody>
-      </table>
-      
-      <Modal isCentered={true} isOpen={isOpen} onClose={onClose}>
-      <ModalOverlay 
-      bg='none'
-      backdropFilter='auto'
-      
-      backdropBlur='2px'
-      />
-            
-      <ModalContent>
-      <ModalHeader fontSize='5xl' >{currentName}</ModalHeader>
-      <ModalCloseButton />
-      <ModalBody fontSize='3xl' >
-          {currentDetails}
-      
-      </ModalBody>
-
-      <ModalFooter>
-     
-      </ModalFooter>
-  </ModalContent>
-  
-  </Modal>
-    </div>
-    
-</Center>
-            
-
-          
+            <Center>
+              <div className="mx-auto max-w-screen-lg md:max-w-screen-md">
+                <table className="min-w-full divide-y divide-gray-200">
+                  <thead className="">
+                    <tr>
+                      <th
+                        scope="col"
+                        className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500"
+                      >
+                        Status
+                      </th>
+                      <th
+                        scope="col"
+                        className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500"
+                      >
+                        Task
+                      </th>
+                      <th
+                        scope="col"
+                        className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500"
+                      >
+                        Do By
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody className="divide-y divide-gray-200">
+                    {filteredData.map((item) => (
+                      <tr key={item.id}>
+                        <td className="whitespace-nowrap px-6 py-4">
+                          <h1 className="  text-white">
+                            {item.status == 'Incomplete' && (
+                              <button
+                                disabled={true}
+                                className="text-md  mx-auto w-24 flex-col items-center  rounded-full bg-[#C51F29] bg-opacity-100  py-1 px-5 font-medium transition md:w-[150px]"
+                              >
+                                <div className="font-[Inter] text-xs text-white md:text-xl">
+                                  {item.status}
+                                </div>
+                              </button>
+                            )}
+                            {item.status == 'In Progress' && (
+                              <button
+                                disabled={true}
+                                className="text-md mx-auto w-24 flex-col items-center  rounded-full bg-[#FFBD3C] bg-opacity-100  py-1 px-5 font-medium transition md:w-[150px]"
+                              >
+                                <div className="font-[Inter] text-xs text-white md:text-xl">
+                                  {item.status}
+                                </div>
+                              </button>
+                            )}
+                            {item.status == 'Done' && (
+                              <button
+                                disabled={true}
+                                className="max-w-20 text-md mx-auto w-24 flex-col items-center  rounded-full bg-[#00C09D] bg-opacity-100  py-1 px-5 font-medium transition md:w-[150px]"
+                              >
+                                <div className="font-[Inter] text-xs text-white md:text-xl">
+                                  {item.status}
+                                </div>
+                              </button>
+                            )}
+                          </h1>
+                        </td>
+                        <td>
+                          <Text
+                            as="span"
+                            cursor="pointer"
+                            _hover={{ textDecoration: 'underline' }}
+                            className="text-white md:text-xl"
+                            onClick={() => {
+                              setCurrentName(item.name)
+                              setCurrentDetails(item.details)
+                              onOpen()
+                            }}
+                          >
+                            {item.name}
+                          </Text>
+                        </td>
+                        <td>
+                          {' '}
+                          <h1 className="text-white md:text-xl">{item.due}</h1>
+                        </td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+
+                <Modal isCentered={true} isOpen={isOpen} onClose={onClose}>
+                  <ModalOverlay
+                    bg="none"
+                    backdropFilter="auto"
+                    backdropBlur="2px"
+                  />
+
+                  <ModalContent>
+                    <ModalHeader fontSize="5xl">{currentName}</ModalHeader>
+                    <ModalCloseButton />
+                    <ModalBody fontSize="3xl">{currentDetails}</ModalBody>
+
+                    <ModalFooter></ModalFooter>
+                  </ModalContent>
+                </Modal>
+              </div>
+            </Center>
           </div>
         </div>
       </main>
@@ -230,4 +180,4 @@ const Tasks:React.FC<BaseProps> = ({ session }) => {
   )
 }
 
-export default withAuth(Tasks, false)
\ No newline at end of file
+export default withAuth(Tasks, false)

From 832249c03f23d9fd0fd80de61cd9a809afef4af3 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 11 Jun 2023 21:37:45 +0800
Subject: [PATCH 117/223] add the buttons for applicants to accept or reject
 their offers

---
 src/pages/application_status/index.tsx | 152 ++++++++++++++++++++++---
 1 file changed, 137 insertions(+), 15 deletions(-)

diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 40ef1f8d..ddbfdb9a 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -1,6 +1,7 @@
-import { useState} from 'react'
+import { useState } from 'react'
 import Head from 'next/head'
 import {
+  Button,
   Modal,
   ModalBody,
   ModalCloseButton,
@@ -13,7 +14,6 @@ import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { BaseProps } from '~/utils/withAuth'
 
-
 enum PageState {
   LOGIN,
   FORGET_PASSWORD,
@@ -22,8 +22,17 @@ enum PageState {
 const Application_Status: React.FC<BaseProps> = ({ session }) => {
   //this part needs backend to update the status
   const [isOpen, setIsOpen] = useState(false)
+  const [isAcceptOpen, setIsAcceptOpen] = useState(false)
+  const [isRejectOpen, setIsRejectOpen] = useState(false)
+  const onOpenAccept = () => setIsAcceptOpen(true)
+  const onCloseAccept = () => setIsAcceptOpen(false)
+  const onOpenReject = () => setIsRejectOpen(true)
+  const onCloseReject = () => setIsRejectOpen(false)
   const onOpen = () => setIsOpen(true)
   const onClose = () => setIsOpen(false)
+  //better to fetch from backend
+  const [isRejected, setIsRejected] = useState(false)
+  const [isAccepted, setIsAccepted] = useState(false)
 
   const roles = [
     {
@@ -80,17 +89,132 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
               <div key={item.id} className="mt-3 flex items-center ">
                 <div className="flex-grow">
                   {item.status == 'accepted' && (
-                    <h3 className="mt-3 flex justify-center text-2xl md:text-5xl">
-                      {item.name}
-                      <Image
-                        alt="logo"
-                        src="/images/Ellipse 1.svg"
-                        height={35}
-                        width={35}
-                        className="ml-14 flex  flex-col"
-                      />
-                      {/* Accepted */}
-                    </h3>
+                    <div className="flex justify-center">
+                      <h3 className="mt-3  flex justify-center text-2xl md:text-5xl">
+                        {item.name}
+                        <Image
+                          alt="logo"
+                          src="/images/Ellipse 1.svg"
+                          height={35}
+                          width={35}
+                          className="ml-14 flex  flex-col"
+                        />
+                      </h3>
+
+                      {isAccepted || isRejected ? (
+                        <div></div>
+                      ) : (
+                        <div className="ml-14 flex">
+                          <button
+                            onClick={onOpenAccept}
+                            className=" ml-5  rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                          >
+                            Accept
+                          </button>
+                          <button
+                            onClick={onOpenReject}
+                            className="ml-5  rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                          >
+                            Reject
+                          </button>
+                        </div>
+                      )}
+                      <Modal
+                        isOpen={isAcceptOpen}
+                        onClose={onCloseAccept}
+                        size="xs"
+                      >
+                        <ModalOverlay bg="none" backdropFilter="auto" />
+                        <ModalContent>
+                          <ModalHeader fontSize="5xl"></ModalHeader>
+                          <ModalCloseButton />
+                          <ModalBody fontSize="3xl ">
+                            <div className=" flex-col justify-center">
+                              <div className="items-center">
+                                Confirm Acceptance?
+                                <button
+                                  onClick={() => {
+                                    onCloseAccept()
+                                    setIsAccepted(true)
+                                  }}
+                                  className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                                >
+                                  Confirm
+                                </button>
+                                <button
+                                  onClick={onCloseAccept}
+                                  className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                                >
+                                  Cancel
+                                </button>
+                              </div>
+                            </div>
+                          </ModalBody>
+                          <ModalFooter></ModalFooter>
+                        </ModalContent>
+                      </Modal>
+                      <Modal
+                        isOpen={isRejectOpen}
+                        onClose={onCloseReject}
+                        size="xs"
+                      >
+                        <ModalOverlay bg="none" backdropFilter="auto" />
+                        <ModalContent>
+                          <ModalHeader fontSize="5xl"></ModalHeader>
+                          <ModalCloseButton />
+                          <ModalBody fontSize="3xl">
+                            <div className="flex flex-col items-start">
+                              <div className="items-center">
+                                Confirm Rejection?
+                                <button
+                                  onClick={() => {
+                                    onCloseReject()
+                                    setIsRejected(true)
+                                  }}
+                                  className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                                >
+                                  Confirm
+                                </button>
+                                <button
+                                  onClick={onCloseReject}
+                                  className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                                >
+                                  Cancel
+                                </button>
+                              </div>
+                            </div>
+                          </ModalBody>
+                          <ModalFooter></ModalFooter>
+                        </ModalContent>
+                      </Modal>
+                    </div>
+
+                    /* <div>
+      <h3 className="text-2xl inline  justify-center md:text-5xl">
+        {item.name}
+      
+      <Image
+        alt="logo"
+        src="/images/Ellipse 1.svg"
+        height={35}
+        width={35}
+        className="ml-14"
+      />
+   </h3>
+   <span className="inline-flex items-baseline">
+        <button
+          className="bg-green-500 inline hover:bg-green-600 text-white text-2xl py-2 px-4 font-bold rounded"
+        
+        >
+          Accept
+        </button>
+        <button
+          className="ml-2 bg-red-500 inline hover:bg-red-600 text-white text-2xl py-2 px-4 font-bold rounded"
+        >
+          Reject
+        </button>
+        </span>
+        </div> */
                   )}
 
                   {item.status == 'offered' && (
@@ -156,8 +280,6 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                        hover:bg-[#FFD27C]  
                        md:h-20
                        md:w-20
-                       
-                       
                        "
               >
                 <Image

From b3f32bca1a4b61f7ed7e23f2ad079ebbbabaa21c Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 11 Jun 2023 22:58:45 +0800
Subject: [PATCH 118/223] commented some code to debug

---
 src/components/recruitment/ApplicantGrid.tsx |  15 +-
 src/context/recruitment/SearchProvider.tsx   |   2 +-
 src/pages/application_status/index.tsx       | 373 +++++++++++++++++++
 3 files changed, 377 insertions(+), 13 deletions(-)
 create mode 100644 src/pages/application_status/index.tsx

diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 8460c143..124a40dc 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,31 +1,22 @@
 import { useContext } from 'react'
-import { filterContext, searchContext } from '~/context/recruitment/SearchProvider'
+import {searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
 import InfoPopup from '~/components/recruitment/InfoPopup'
 
 const ApplicantGrid = () => {
   const { search } = useContext(searchContext)
-  const { filter } = useContext(filterContext)
+  // const { filter } = useContext(filterContext)
   const { data } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
   if (!data) return <></>
 
   const filteredData =
     search === ''
       ? data
-      : data.filter((applicant) => {
+      : data?.filter((applicant) => {
           return applicant.name.toLowerCase().includes(search.toLowerCase())
         })
 
-  
- 
-
- 
-    
-
-
-  
-
   return (
     <>
       <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
diff --git a/src/context/recruitment/SearchProvider.tsx b/src/context/recruitment/SearchProvider.tsx
index c5e57add..56df28a7 100644
--- a/src/context/recruitment/SearchProvider.tsx
+++ b/src/context/recruitment/SearchProvider.tsx
@@ -17,7 +17,7 @@ export const searchContext = createContext<SearchContextType>({
   },
 })
 
-export const filterContext = createContext<ContextType>({
+export const filterContext = createContext<filterContextType>({
   filter: '',
   setFilter: () => {
     return
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
new file mode 100644
index 00000000..aaa723fe
--- /dev/null
+++ b/src/pages/application_status/index.tsx
@@ -0,0 +1,373 @@
+import { useState } from 'react'
+import {
+  Button,
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+} from '@chakra-ui/react'
+import Image from 'next/image'
+import TopNavbar from '~/components/common/TopNavbar'
+import withAuth, { BaseProps } from '~/utils/withAuth'
+import React from 'react'
+
+enum PageState {
+  LOGIN,
+  FORGET_PASSWORD,
+}
+
+const Application_Status: React.FC<BaseProps> = ({ session }) => {
+  //this part needs backend to update the status
+  const [isOpen, setIsOpen] = useState(false)
+  const [isAcceptOpen, setIsAcceptOpen] = useState(false)
+  const [isRejectOpen, setIsRejectOpen] = useState(false)
+  const onOpenAccept = () => setIsAcceptOpen(true)
+  const onCloseAccept = () => setIsAcceptOpen(false)
+  const onOpenReject = () => setIsRejectOpen(true)
+  const onCloseReject = () => setIsRejectOpen(false)
+  const onOpen = () => setIsOpen(true)
+  const onClose = () => setIsOpen(false)
+  //better to fetch from backend
+  const [isRejected, setIsRejected] = useState(false)
+  const [isAccepted, setIsAccepted] = useState(false)
+
+  const roles = [
+    {
+      id: 1,
+      name: 'Software Engineer',
+      status: 'accepted',
+    },
+    {
+      id: 2,
+      name: 'Technical Analyst',
+      status: 'interviewed',
+    },
+    {
+      id: 3,
+      name: 'Research Analyst',
+      status: 'rejected',
+    },
+  ]
+
+  return (
+    <>
+      <Head>
+        <title>Atlas | Login</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta name="description" content="The login page for Atlas" />
+      </Head>
+      <TopNavbar
+        image={session.user?.image as string}
+        isAdmin={session.isAdmin}
+      />
+      <main>
+        <div className="relative h-screen w-screen bg-[url('/images/applicants_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
+          {/* Nav element containing the logo */}
+
+          <nav className="flex items-center justify-center  px-2 py-2 ">
+            <Image
+              alt="logo"
+              src="/images/black_logo.svg"
+              height={150}
+              width={150}
+            />
+          </nav>
+
+          {/* Login */}
+          <div className="flex flex-col justify-center gap-8 font-[Inter]">
+            <h1 className="mt-4 flex justify-center text-4xl font-bold md:text-8xl">
+              Hi User,
+            </h1>
+            <h2 className="mt-3 flex justify-center text-2xl font-bold md:text-6xl">
+              your current statuses are:
+            </h2>
+
+            {roles.map((item) => (
+              <div key={item.id} className="mt-3 flex items-center ">
+                <div className="flex-grow">
+                  {item.status == 'accepted' && (
+                    <div className="flex justify-center">
+                      <h3 className="mt-3  flex justify-center text-2xl md:text-5xl">
+                        {item.name}
+                        <Image
+                          alt="logo"
+                          src="/images/Ellipse 1.svg"
+                          height={35}
+                          width={35}
+                          className="ml-14 flex  flex-col"
+                        />
+                      </h3>
+
+                      {isAccepted || isRejected ? (
+                        <div></div>
+                      ) : (
+                        <div className="ml-14 flex">
+                          <button
+                            onClick={onOpenAccept}
+                            className=" ml-5  rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                          >
+                            Accept
+                          </button>
+                          <button
+                            onClick={onOpenReject}
+                            className="ml-5  rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                          >
+                            Reject
+                          </button>
+                        </div>
+                      )}
+                      <Modal
+                        isOpen={isAcceptOpen}
+                        onClose={onCloseAccept}
+                        size="xs"
+                      >
+                        <ModalOverlay bg="none" backdropFilter="auto" />
+                        <ModalContent>
+                          <ModalHeader fontSize="5xl"></ModalHeader>
+                          <ModalCloseButton />
+                          <ModalBody fontSize="3xl ">
+                            <div className=" flex-col justify-center">
+                              <div className="items-center">
+                                Confirm Acceptance?
+                                <button
+                                  onClick={() => {
+                                    onCloseAccept()
+                                    setIsAccepted(true)
+                                  }}
+                                  className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                                >
+                                  Confirm
+                                </button>
+                                <button
+                                  onClick={onCloseAccept}
+                                  className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                                >
+                                  Cancel
+                                </button>
+                              </div>
+                            </div>
+                          </ModalBody>
+                          <ModalFooter></ModalFooter>
+                        </ModalContent>
+                      </Modal>
+                      <Modal
+                        isOpen={isRejectOpen}
+                        onClose={onCloseReject}
+                        size="xs"
+                      >
+                        <ModalOverlay bg="none" backdropFilter="auto" />
+                        <ModalContent>
+                          <ModalHeader fontSize="5xl"></ModalHeader>
+                          <ModalCloseButton />
+                          <ModalBody fontSize="3xl">
+                            <div className="flex flex-col items-start">
+                              <div className="items-center">
+                                Confirm Rejection?
+                                <button
+                                  onClick={() => {
+                                    onCloseReject()
+                                    setIsRejected(true)
+                                  }}
+                                  className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                                >
+                                  Confirm
+                                </button>
+                                <button
+                                  onClick={onCloseReject}
+                                  className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                                >
+                                  Cancel
+                                </button>
+                              </div>
+                            </div>
+                          </ModalBody>
+                          <ModalFooter></ModalFooter>
+                        </ModalContent>
+                      </Modal>
+                    </div>
+
+                    /* <div>
+      <h3 className="text-2xl inline  justify-center md:text-5xl">
+        {item.name}
+      
+      <Image
+        alt="logo"
+        src="/images/Ellipse 1.svg"
+        height={35}
+        width={35}
+        className="ml-14"
+      />
+   </h3>
+   <span className="inline-flex items-baseline">
+        <button
+          className="bg-green-500 inline hover:bg-green-600 text-white text-2xl py-2 px-4 font-bold rounded"
+        
+        >
+          Accept
+        </button>
+        <button
+          className="ml-2 bg-red-500 inline hover:bg-red-600 text-white text-2xl py-2 px-4 font-bold rounded"
+        >
+          Reject
+        </button>
+        </span>
+        </div> */
+                  )}
+
+                  {item.status == 'offered' && (
+                    <h3 className="flex justify-center text-2xl md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/blue_dot.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14 flex flex-col"
+                      />
+                      {/* Offered */}
+                    </h3>
+                  )}
+
+                  {item.status == 'pending_review' && (
+                    <h3 className="justify-centertext-2xl flex md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/yellow_dot.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14"
+                      />
+                      {/* Pending Review */}
+                    </h3>
+                  )}
+                  {item.status == 'interviewed' && (
+                    <h3 className="flex justify-center text-2xl md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/pink_dot.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14"
+                      />
+                      {/* Interviewed */}
+                    </h3>
+                  )}
+                  {item.status == 'rejected' && (
+                    <h3 className="flex justify-center text-2xl md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/red_dot.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14"
+                      />
+                      {/* Rejected */}
+                    </h3>
+                  )}
+                </div>
+              </div>
+            ))}
+            <div className="fixed bottom-20 right-6 md:right-28">
+              <button
+                onClick={onOpen}
+                className="h-16 w-16 rounded-full bg-[#FFEBC5] text-white 
+                       hover:bg-[#FFD27C]  
+                       md:h-20
+                       md:w-20
+                       "
+              >
+                <Image
+                  alt="question_mark"
+                  src="/images/question_mark.svg"
+                  height="20"
+                  width={20}
+                  className="ml-5 md:ml-7"
+                />
+              </button>
+            </div>
+            <Modal isOpen={isOpen} onClose={onClose} size="xs">
+              <ModalOverlay bg="none" backdropFilter="auto" />
+
+              <ModalContent>
+                <ModalHeader fontSize="5xl"></ModalHeader>
+                <ModalCloseButton />
+                <ModalBody fontSize="3xl">
+                  <div className="flex flex-col items-start">
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/Ellipse 1.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5 flex flex-col"
+                      />
+                      Accepted
+                    </div>
+                  </div>
+
+                  <div className="flex flex-col items-start">
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/blue_dot.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5 flex flex-col"
+                      />
+                      Offered
+                    </div>
+                  </div>
+                  <div className="flex flex-col items-start">
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/yellow_dot.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5"
+                      />
+                      Pending Review
+                    </div>
+                  </div>
+                  <div className="flex flex-col items-start">
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/pink_dot.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5"
+                      />
+                      Interviewed
+                    </div>
+                  </div>
+                  <div className="flex flex-col items-start">
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/red_dot.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5"
+                      />
+                      Rejected
+                    </div>
+                  </div>
+                </ModalBody>
+                <ModalFooter></ModalFooter>
+              </ModalContent>
+            </Modal>
+          </div>
+        </div>
+      </main>
+    </>
+  )
+}
+
+export default withAuth(Application_Status, false)

From eb65498ec3239c7bcdf7d63fc2adea79d58cf250 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Mon, 12 Jun 2023 19:54:53 +0800
Subject: [PATCH 119/223] make the button design responsive

---
 src/pages/application_status/index.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index ddbfdb9a..876a7f29 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -90,34 +90,34 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                 <div className="flex-grow">
                   {item.status == 'accepted' && (
                     <div className="flex justify-center">
-                      <h3 className="mt-3  flex justify-center text-2xl md:text-5xl">
+                      <span className="mt-3  flex  text-2xl md:text-5xl">
                         {item.name}
                         <Image
                           alt="logo"
                           src="/images/Ellipse 1.svg"
                           height={35}
                           width={35}
-                          className="ml-14 flex  flex-col"
+                          className="md:ml-14 ml-2 flex  flex-col"
                         />
-                      </h3>
+                      </span>
 
                       {isAccepted || isRejected ? (
                         <div></div>
                       ) : (
-                        <div className="ml-14 flex">
+                        <div className="md:ml-14 ml-3 flex ">
                           <button
                             onClick={onOpenAccept}
-                            className=" ml-5  rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                            className=" md:ml-5  rounded bg-green-500 md:py-2 md:px-4 md:text-2xl font-bold text-white hover:bg-green-600"
                           >
                             Accept
                           </button>
                           <button
                             onClick={onOpenReject}
-                            className="ml-5  rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                            className="md:ml-5 ml-3 rounded bg-red-500 md:py-2 md:px-4  md:text-2xl font-bold text-white hover:bg-red-600"
                           >
                             Reject
                           </button>
-                        </div>
+                       </div>
                       )}
                       <Modal
                         isOpen={isAcceptOpen}
@@ -273,7 +273,7 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                 </div>
               </div>
             ))}
-            <div className="fixed bottom-20 right-6 md:right-28">
+            <div className="fixed bottom-10 right-6 md:right-20">
               <button
                 onClick={onOpen}
                 className="h-16 w-16 rounded-full bg-[#FFEBC5] text-white 

From 8a3d06a3d63b3b24397d4e334293b35df70e0de8 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sat, 17 Jun 2023 17:46:14 +0800
Subject: [PATCH 120/223] add number of applicants for the recruitment page

---
 src/components/common/SearchBar.tsx          | 231 ++++++++++++++++++-
 src/components/recruitment/ApplicantCard.tsx |   1 +
 src/components/recruitment/ApplicantGrid.tsx |  56 ++++-
 src/context/recruitment/SearchProvider.tsx   |  24 +-
 src/server/trpc/router/recruitment/read.ts   |  18 +-
 5 files changed, 301 insertions(+), 29 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index a6719ff1..2d597658 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -3,34 +3,231 @@ import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import { SearchIcon } from '@chakra-ui/icons'
 import { searchContext } from '~/context/recruitment/SearchProvider'
 import { ChevronDownIcon } from '@chakra-ui/icons';
+import { useSession } from 'next-auth/react';
+
 
 const SearchBar = () => {
-  const { search, setSearch } = useContext(searchContext)
+  const roles = [
+    {
+      department: 'Software Development',
+      role: 'Software Engineer',
+    },
+    {
+      department: 'Software Development',
+      role: 'Technical Lead',
+    },
+    {
+      department: 'Software Development',
+      role: 'UI/UX Designer',
+    },
+    {
+      department: 'Software Development',
+      role: 'Head of Design',
+    },
+    {
+      department: 'Software Development',
+      role: 'Co-Director',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Co-Director',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Core Developer',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Community Manager',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Developer',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Lead Developer',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Research Analyst',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Research Community Developer',
+    },
+    {
+      department: 'Machine Learning',
+      role: 'Quant Tech Analyst',
+    },
+    ,
+    {
+      department: 'Machine Learning',
+      role: 'Quant Tech Lead',
+    },
+    {
+      department: 'Machine Learning',
+      role: 'Quant wing head',
+    },
+    {
+      department: 'Machine Learning',
+      role: 'Project Tech Analyst',
+    },
+    {
+      department: 'Machine Learning',
+      role: 'Project Tech Lead',
+    },
+    {
+      department: 'Machine Learning',
+      role: 'Tech Analyst/Trainee',
+    },
+    {
+      department: 'Machine Learning',
+      role: 'Training Head',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Co-Director',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Community Development Executive',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Community Development Lead',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Finance Executive',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Finance Lead',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Project Manager Executive',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Product Manager',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Talent Management Executive',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Talent Management Lead',
+    },
+    {
+      department: 'External Relations',
+      role: 'Partnerships Executive',
+    },
+    {
+      department: 'External Relations',
+      role: 'Director',
+    },
+    {
+      department: 'External Relations',
+      role: 'Marketing Executive',
+    },
+    {
+      department: 'External Relations',
+      role: 'Marketing Lead',
+    },
+    {
+      department: 'External Relations',
+      role: 'Partnerships Lead',
+    },
+    {
+      department: 'External Relations',
+      role: 'Finance Executive',
+    },
+    {
+      department: 'External Relations',
+      role: 'Finance Lead',
+    },
+  ] as { department: string; role: string }[]
+  const ctx = useSession()
+  const department = ctx.data?.user?.department
+  console.log(department)
+  const filteredRoles = roles.filter((combination) => combination.department === department)
+  const { search, filter, setFilter, setSearch } = useContext(searchContext)
   const [showDropdown, setShowDropdown] = useState(false);
-  const [selectedFilter, setSelectedFilter] = useState('');
+  console.log(filteredRoles)
+
+
+  const [selectedFilter, setSelectedFilter] = useState('')
   const [showOptions, setShowOptions] = useState(false);
   console.log('searchbar: ', search)
 
-  const handleFilterChange = (filter: React.SetStateAction<string>) => {
+  const handleFilterChange = (filter: string) => {
     setSelectedFilter(filter);
     setShowDropdown(false);
     // Perform filtering logic or update your data based on the selected filter
   };
 
+ 
+
   const renderOptions = () => {
     if (selectedFilter === 'Roles') {
       return (
         <ul className="ml-2">
-          <li className="px-3 py-2 cursor-pointer">Role 1</li>
-          <li className="px-3 py-2 cursor-pointer">Role 2</li>
+           {filteredRoles.map((role) =>   
+          <button 
+          key={role.role}
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter(role.role)}}
+          className="px-3 py-2 cursor-pointer">{role.role}
+          </button>)
+          }
+
+          {/* <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('designer')}}
+          className="px-3 py-2 cursor-pointer">Designer</button>
+          <button 
+           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('designer manager')}}
+          className="px-3 py-2 cursor-pointer">Designer Manager</button>
+          <button 
+           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('technical lead')}}
+          className="px-3 py-2 cursor-pointer">Technical Lead</button>
+          <button 
+           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('software engineer')}}
+          className="px-3 py-2 cursor-pointer">Software Engineer</button> */}
         </ul>
       );
     }
     if (selectedFilter === 'Status') {
       return (
         <ul className="ml-2">
-          <li className="px-3 py-2 cursor-pointer">Status 1</li>
-          <li className="px-3 py-2 cursor-pointer">Status 2</li>
+          <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('accepted')}}
+          className="px-3 py-2 cursor-pointer">Accepted</button>
+          <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('offered')}}
+          className="px-3 py-2 cursor-pointer">Offered</button>
+           <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('pending')}}
+          className="px-3 py-2 cursor-pointer">Pending Review</button>
+           <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('interviewed')}}
+          className="px-3 py-2 cursor-pointer">Interviewed</button>
+           <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('rejected')}}
+          className="px-3 py-2 cursor-pointer">Rejected</button>
+        </ul>
+      );
+    }
+    if (selectedFilter === 'Flags') {
+      return (
+        <ul className="ml-2">
+          <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('flagged')}}
+          className="px-3 py-2 cursor-pointer">Flagged</button>
+          <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('unflagged')}}
+          className="px-3 py-2 cursor-pointer">Unflagged</button>
         </ul>
       );
     }
@@ -43,7 +240,7 @@ const SearchBar = () => {
       maxWidth={'300px'}
       position="absolute"
       top={{ lg: '0' }}
-      right={{ lg: '12', base: '0' }}
+      right={{ lg: '20', base: '0' }}
       left={{ lg: 'unset', base: '0' }}
       marginTop={{ lg: 'unset', base: '5' }}
       marginLeft={{ base: 'auto' }}
@@ -73,9 +270,10 @@ const SearchBar = () => {
       >
         <ChevronDownIcon />
         {showOptions && (
-          <div className="absolute top-0 right-0 mt-10 bg-white border border-gray-200 rounded-md shadow-md">
+          <div className="absolute top-0 left-0 mt-10 bg-white border border-gray-200 rounded-md shadow-md">
             {showDropdown ? (
               <>
+               
                 <button
                   type="button"
                   className="px-4 py-2 cursor-pointer"
@@ -90,6 +288,20 @@ const SearchBar = () => {
                 >
                   Status
                 </button>
+                <button
+                  type="button"
+                  className="px-4 py-2 cursor-pointer"
+                  onClick={() => handleFilterChange('Flags')}
+                >
+                  Flags
+                </button>
+                <button
+                  type="button"
+                  className="px-4 py-2 mb-2 cursor-pointer rounded font-bold bg-gray-200"
+                  onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('')}}
+                >
+                  Clear
+                </button>
               </>
             ) : (
               renderOptions()
@@ -98,6 +310,7 @@ const SearchBar = () => {
         )}
       </button>
      
+     
     </InputGroup>
   )
 }
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index 3a7d1a89..b8a0fbb3 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -26,6 +26,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
       boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
     >
       <CardHeader paddingBottom="0" zIndex={1}>
+        <span>flag</span>
         <Heading size="md" textAlign="center" textColor="white">
           {applicant.name}
         </Heading>
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 124a40dc..4c1cd4b9 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -3,28 +3,66 @@ import {searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
 import InfoPopup from '~/components/recruitment/InfoPopup'
+import applicants from '~/pages/recruitment/applicants'
+import { Button, VStack } from '@chakra-ui/react'
 
 const ApplicantGrid = () => {
-  const { search } = useContext(searchContext)
-  // const { filter } = useContext(filterContext)
+  const { filter, search } = useContext(searchContext)
+
   const { data } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
   if (!data) return <></>
 
+  // const filteredData =
+  //   search === ''
+  //     ? data
+  //     : data?.filter((applicant) => {
+  //         return applicant.name.toLowerCase().includes(search.toLowerCase())
+  //       })
+
   const filteredData =
-    search === ''
-      ? data
-      : data?.filter((applicant) => {
-          return applicant.name.toLowerCase().includes(search.toLowerCase())
-        })
+        filter === ''
+          ? (search ==='' ? data : 
+          data?.filter((applicant) => {
+            return applicant.name.toLowerCase().includes(search.toLowerCase())
+          })) 
+          :  
+          (search === '' ?        
+          data?.filter((applicant) => {
+              return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) || 
+              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()))
+            }) :
+            data?.filter((applicant) => {
+              return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) || 
+              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()))
+            }).filter((remaining) => {
+              return remaining.name.toLowerCase().includes(search.toLowerCase())
+            })
+            
+          )
+
+  const totalNumber = filteredData.length
+
 
   return (
     <>
-      <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
-        {filteredData?.map((applicant) => {
+   <div>
+      <div className='mb-2 mt-20 lg:mt-1 md:mt-1 font-bold ml-20 lg:text-xl'>
+      Number of Applicants: {totalNumber}
+      </div>
+      <div className="mb-10  my-10 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
+      
+        {filteredData?.map((applicant, index) => {
+          
           return <ApplicantCard applicant={applicant} key={applicant.id} />
+           
         })}
       </div>
+      </div>
+      
+      
       {filteredData.length > 0 && <InfoPopup />}
+   
+     
     </>
   )
 }
diff --git a/src/context/recruitment/SearchProvider.tsx b/src/context/recruitment/SearchProvider.tsx
index 56df28a7..e053d342 100644
--- a/src/context/recruitment/SearchProvider.tsx
+++ b/src/context/recruitment/SearchProvider.tsx
@@ -1,36 +1,46 @@
+import { filter } from '@chakra-ui/react'
 import { createContext, useState } from 'react'
 
 type SearchContextType = {
   search: string
   setSearch: (s: string) => void
-}
-
-type filterContextType = {
   filter: string
   setFilter: (s: string) => void
 }
 
+// type filterContextType = {
+//   filter: string
+//   setFilter: (s: string) => void
+// }
+
 export const searchContext = createContext<SearchContextType>({
   search: '',
   setSearch: () => {
     return
   },
-})
-
-export const filterContext = createContext<filterContextType>({
   filter: '',
   setFilter: () => {
     return
   },
 })
 
+// export const filterContext = createContext<filterContextType>({
+//   filter: '',
+//   setFilter: () => {
+//     return
+//   },
+// })
+
 
 const SearchProvider = (props: any) => {
   const [search, setSearch] = useState<string>('')
+  const [filter, setFilter] = useState<string>('')
   return (
-    <searchContext.Provider value={{ search, setSearch }}>
+    // <filterContext.Provider value={{ filter, setFilter }}>
+    <searchContext.Provider value={{ search, filter, setFilter, setSearch }}>
       {props.children}
     </searchContext.Provider>
+    // </filterContext.Provider>
   )
 }
 
diff --git a/src/server/trpc/router/recruitment/read.ts b/src/server/trpc/router/recruitment/read.ts
index 9dfb0ab8..8be343f8 100644
--- a/src/server/trpc/router/recruitment/read.ts
+++ b/src/server/trpc/router/recruitment/read.ts
@@ -1,6 +1,7 @@
+import { filter } from '@chakra-ui/react'
 import { TRPCError } from '@trpc/server'
 import { limit, orderBy, where } from 'firebase/firestore'
-import { z } from 'zod'
+import { object, z } from 'zod'
 import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
 import userCollection from '~/server/db/collections/UserCollection'
 import type { Applicant } from '~/server/db/models/Applicant'
@@ -14,12 +15,21 @@ import { protectedProcedure } from '~/server/trpc/trpc'
  * rejected. So each applicant will have one applied role at any
  * point in time, from the perspective of a director.
  * */
-export const getAllApplicantsTopRoleByDept = protectedProcedure.query(
+export const getAllApplicantsTopRoleByDept = protectedProcedure
+//.input(z.object({
+//   filter: z.string(),
+//   search: z.string()
+// }))
+.query(
   async ({ ctx }) => {
     try {
-      const applicants = await userCollection.queries([
+      const filtersForUsers = [
         where('role', '==', 'Applicant'),
-      ])
+      ]
+      // if (input.search && input.search.length) {
+      //   filtersForUsers.push(where('name', '==', input.search))
+      // }
+      const applicants = await userCollection.queries(filtersForUsers)
       const applicantsWithRoles: Applicant[] = []
 
       for (let i = 0; i < applicants.length; i++) {

From 769318f9f278e5773d5ab761b8805ddd3c57fa27 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sat, 17 Jun 2023 19:58:11 +0800
Subject: [PATCH 121/223] add seen and unseen button to the card

---
 src/components/common/SearchBar.tsx          |  4 +-
 src/components/recruitment/ApplicantCard.tsx | 44 +++++++++++++++++++-
 src/components/recruitment/ApplicantGrid.tsx |  6 ++-
 src/server/db/models/AppliedRole.ts          |  1 +
 src/server/trpc/router/recruitment/index.ts  |  3 +-
 src/server/trpc/router/recruitment/update.ts | 22 ++++++++++
 6 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 2d597658..8af11106 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -223,10 +223,10 @@ const SearchBar = () => {
       return (
         <ul className="ml-2">
           <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('flagged')}}
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('true')}}
           className="px-3 py-2 cursor-pointer">Flagged</button>
           <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('unflagged')}}
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('false')}}
           className="px-3 py-2 cursor-pointer">Unflagged</button>
         </ul>
       );
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index b8a0fbb3..3547009d 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -3,10 +3,12 @@ import {
   CardBody,
   CardHeader,
   Heading,
+  Icon,
   Image,
   Stack,
   Text,
   UnorderedList,
+  useToast,
 } from '@chakra-ui/react'
 import { Avatar } from 'flowbite-react'
 import AppliedRoleListItem from './AppliedRoleListItem'
@@ -15,10 +17,39 @@ import type { Applicant } from '~/server/db/models/Applicant'
 import NoteModal from './NoteModal'
 import type { AppliedRole } from '~/server/db/models/AppliedRole'
 import { trpc } from '~/utils/trpc'
+import { ViewIcon, ViewOffIcon } from '@chakra-ui/icons'
+import { ApplicationStatus } from '~/server/db/models/AppliedRole'
+import { useState } from 'react'
 
 const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
   const appliedRole = applicant.appliedRoles[0] as AppliedRole
+  const [isFlagged, setIsFlagged] = useState(appliedRole.flag)
+  const appliedRoleId = appliedRole.id
   const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRole.id)
+  const toast = useToast()
+  const { mutateAsync } = trpc.recruitment.updateAppliedRoleFlag.useMutation()
+  const updateFlag = async (flag: boolean) => {
+    try {
+      await mutateAsync({
+        flag: flag,
+        appliedRoleId: appliedRoleId,
+      })
+      await refetch()
+      toast({
+        duration: 2000,
+        status: 'success',
+        title: 'Success',
+        description: "Applicant's flag updated successfully!",
+      })
+    } catch (e) {
+      toast({
+        description: (e as Error).message,
+        duration: 2000,
+        status: 'error',
+        title: 'Oops, an error occurred!',
+      })
+    }
+  }
   return (
     <Card
       maxWidth="xs"
@@ -26,8 +57,19 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
       boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
     >
       <CardHeader paddingBottom="0" zIndex={1}>
-        <span>flag</span>
         <Heading size="md" textAlign="center" textColor="white">
+          
+            {isFlagged ? 
+            <button className='absolute left-2'
+            onClick={() => {updateFlag(false), setIsFlagged(false)}}>
+              <ViewIcon></ViewIcon>
+              </button>
+            :  <button className='absolute left-2'
+            onClick={() => {updateFlag(true), setIsFlagged(true)}}>
+              <ViewOffIcon></ViewOffIcon>
+              </button>
+            }
+         
           {applicant.name}
         </Heading>
       </CardHeader>
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 4c1cd4b9..af694d3c 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -29,11 +29,13 @@ const ApplicantGrid = () => {
           (search === '' ?        
           data?.filter((applicant) => {
               return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) || 
-              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()))
+              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
+              applicant.appliedRoles.some((role) => role.flag.toString() === filter))
             }) :
             data?.filter((applicant) => {
               return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) || 
-              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()))
+              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
+              applicant.appliedRoles.some((role) => role.flag.toString() === filter))
             }).filter((remaining) => {
               return remaining.name.toLowerCase().includes(search.toLowerCase())
             })
diff --git a/src/server/db/models/AppliedRole.ts b/src/server/db/models/AppliedRole.ts
index c61b0dcf..fb6d4d45 100644
--- a/src/server/db/models/AppliedRole.ts
+++ b/src/server/db/models/AppliedRole.ts
@@ -6,6 +6,7 @@ export type AppliedRole = {
   interviewNotes?: string
   role: string
   status: ApplicationStatus
+  flag: boolean
 }
 
 export enum ApplicationStatus {
diff --git a/src/server/trpc/router/recruitment/index.ts b/src/server/trpc/router/recruitment/index.ts
index 0d0ba4f4..e5234aeb 100644
--- a/src/server/trpc/router/recruitment/index.ts
+++ b/src/server/trpc/router/recruitment/index.ts
@@ -1,5 +1,5 @@
 import { router } from '~/server/trpc/trpc'
-import { updateAppliedRoleStatus, updateInterviewNotes } from './update'
+import { updateAppliedRoleStatus, updateInterviewNotes, updateAppliedRoleFlag } from './update'
 import {
   getAllApplicantsTopRoleByDept,
   getApplicant,
@@ -9,6 +9,7 @@ import {
 export const recruitmentRouter = router({
   updateAppliedRoleStatus,
   updateInterviewNotes,
+  updateAppliedRoleFlag,
   getAllApplicantsTopRoleByDept,
   getApplicant,
   getAppliedRole,
diff --git a/src/server/trpc/router/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
index 13307c92..c0496067 100644
--- a/src/server/trpc/router/recruitment/update.ts
+++ b/src/server/trpc/router/recruitment/update.ts
@@ -43,3 +43,25 @@ export const updateInterviewNotes = protectedProcedure
       })
     }
   })
+
+  export const updateAppliedRoleFlag = protectedProcedure
+  .input(
+    z.object({
+      appliedRoleId: z.string(),
+      flag: z.boolean(),
+    })
+  )
+  .mutation(async ({ input }) => {
+    try {
+      return await appliedRoleCollection.update(input.appliedRoleId, {
+        flag: input.flag,
+      })
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })
+
+

From 9223dfc0f3d90141f42f4319209fcde568ed8506 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sat, 17 Jun 2023 20:28:27 +0800
Subject: [PATCH 122/223] add departments to each of the role applied on the
 applicant page

---
 src/pages/application_status/index.tsx | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 876a7f29..c8667e85 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -37,16 +37,19 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
   const roles = [
     {
       id: 1,
+      department: 'Software Engineering',
       name: 'Software Engineer',
       status: 'accepted',
     },
     {
       id: 2,
+      department: 'Machine Learning',
       name: 'Technical Analyst',
       status: 'interviewed',
     },
     {
       id: 3,
+      department: 'Blockchain',
       name: 'Research Analyst',
       status: 'rejected',
     },
@@ -90,8 +93,8 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                 <div className="flex-grow">
                   {item.status == 'accepted' && (
                     <div className="flex justify-center">
-                      <span className="mt-3  flex  text-2xl md:text-5xl">
-                        {item.name}
+                      <span className="mt-3  flex  text-2xl md:text-4xl">
+                        {item.department} - {item.name}
                         <Image
                           alt="logo"
                           src="/images/Ellipse 1.svg"
@@ -218,8 +221,8 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                   )}
 
                   {item.status == 'offered' && (
-                    <h3 className="flex justify-center text-2xl md:text-5xl">
-                      {item.name}
+                    <h3 className="flex justify-center text-2xl md:text-4xl">
+                        {item.department} - {item.name}
                       <Image
                         alt="logo"
                         src="/images/blue_dot.svg"
@@ -232,8 +235,8 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                   )}
 
                   {item.status == 'pending_review' && (
-                    <h3 className="justify-centertext-2xl flex md:text-5xl">
-                      {item.name}
+                    <h3 className="justify-centertext-2xl flex md:text-4xl">
+                        {item.department} - {item.name}
                       <Image
                         alt="logo"
                         src="/images/yellow_dot.svg"
@@ -245,8 +248,8 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                     </h3>
                   )}
                   {item.status == 'interviewed' && (
-                    <h3 className="flex justify-center text-2xl md:text-5xl">
-                      {item.name}
+                    <h3 className="flex justify-center text-2xl md:text-4xl">
+                       {item.department} - {item.name}
                       <Image
                         alt="logo"
                         src="/images/pink_dot.svg"
@@ -258,8 +261,8 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                     </h3>
                   )}
                   {item.status == 'rejected' && (
-                    <h3 className="flex justify-center text-2xl md:text-5xl">
-                      {item.name}
+                    <h3 className="flex justify-center text-2xl md:text-4xl">
+                     {item.department} - {item.name}
                       <Image
                         alt="logo"
                         src="/images/red_dot.svg"

From cf74b28ccb97d678b5a29af08580cb00f1c270e4 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 14:42:04 +0800
Subject: [PATCH 123/223] enable refetch after filter is set so that the
 updated values are shown

---
 src/components/common/SearchBar.tsx          | 166 ++++++++++++-------
 src/components/recruitment/ApplicantGrid.tsx |  17 +-
 2 files changed, 119 insertions(+), 64 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 8af11106..872e64b5 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -2,9 +2,8 @@ import React, { useContext, useState } from 'react'
 import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import { SearchIcon } from '@chakra-ui/icons'
 import { searchContext } from '~/context/recruitment/SearchProvider'
-import { ChevronDownIcon } from '@chakra-ui/icons';
-import { useSession } from 'next-auth/react';
-
+import { ChevronDownIcon } from '@chakra-ui/icons'
+import { useSession } from 'next-auth/react'
 
 const SearchBar = () => {
   const roles = [
@@ -153,35 +152,40 @@ const SearchBar = () => {
   const ctx = useSession()
   const department = ctx.data?.user?.department
   console.log(department)
-  const filteredRoles = roles.filter((combination) => combination.department === department)
+  const filteredRoles = roles.filter(
+    (combination) => combination.department === department
+  )
   const { search, filter, setFilter, setSearch } = useContext(searchContext)
-  const [showDropdown, setShowDropdown] = useState(false);
+  const [showDropdown, setShowDropdown] = useState(false)
   console.log(filteredRoles)
 
-
   const [selectedFilter, setSelectedFilter] = useState('')
-  const [showOptions, setShowOptions] = useState(false);
+  const [showOptions, setShowOptions] = useState(false)
   console.log('searchbar: ', search)
 
   const handleFilterChange = (filter: string) => {
-    setSelectedFilter(filter);
-    setShowDropdown(false);
+    setSelectedFilter(filter)
+    setShowDropdown(false)
     // Perform filtering logic or update your data based on the selected filter
-  };
-
- 
+  }
 
   const renderOptions = () => {
     if (selectedFilter === 'Roles') {
       return (
         <ul className="ml-2">
-           {filteredRoles.map((role) =>   
-          <button 
-          key={role.role}
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter(role.role)}}
-          className="px-3 py-2 cursor-pointer">{role.role}
-          </button>)
-          }
+          {filteredRoles.map((role) => (
+            <button
+              key={role.role}
+              onClick={() => {
+                setShowOptions(false),
+                  setShowDropdown(true),
+                  setFilter(role.role)
+              }}
+              className="cursor-pointer px-3 py-2"
+            >
+              {role.role}
+            </button>
+          ))}
 
           {/* <button 
           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('designer')}}
@@ -196,45 +200,85 @@ const SearchBar = () => {
            onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('software engineer')}}
           className="px-3 py-2 cursor-pointer">Software Engineer</button> */}
         </ul>
-      );
+      )
     }
     if (selectedFilter === 'Status') {
       return (
         <ul className="ml-2">
-          <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('accepted')}}
-          className="px-3 py-2 cursor-pointer">Accepted</button>
-          <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('offered')}}
-          className="px-3 py-2 cursor-pointer">Offered</button>
-           <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('pending')}}
-          className="px-3 py-2 cursor-pointer">Pending Review</button>
-           <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('interviewed')}}
-          className="px-3 py-2 cursor-pointer">Interviewed</button>
-           <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('rejected')}}
-          className="px-3 py-2 cursor-pointer">Rejected</button>
+          <button
+            onClick={() => {
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter('accepted')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Accepted
+          </button>
+          <button
+            onClick={() => {
+              setShowOptions(false), setShowDropdown(true), setFilter('offered')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Offered
+          </button>
+          <button
+            onClick={() => {
+              setShowOptions(false), setShowDropdown(true), setFilter('pending')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Pending Review
+          </button>
+          <button
+            onClick={() => {
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter('interviewed')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Interviewed
+          </button>
+          <button
+            onClick={() => {
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter('rejected')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Rejected
+          </button>
         </ul>
-      );
+      )
     }
     if (selectedFilter === 'Flags') {
       return (
         <ul className="ml-2">
-          <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('true')}}
-          className="px-3 py-2 cursor-pointer">Flagged</button>
-          <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('false')}}
-          className="px-3 py-2 cursor-pointer">Unflagged</button>
+          <button
+            onClick={() => {
+              setShowOptions(false), setShowDropdown(true), setFilter('true')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Seen
+          </button>
+          <button
+            onClick={() => {
+              setShowOptions(false), setShowDropdown(true), setFilter('false')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Unseen
+          </button>
         </ul>
-      );
+      )
     }
-    return null;
-  };
+    return null
+  }
   return (
-    
     <InputGroup
       minWidth={'150px'}
       maxWidth={'300px'}
@@ -246,7 +290,6 @@ const SearchBar = () => {
       marginLeft={{ base: 'auto' }}
       marginRight={{ base: 'auto' }}
     >
-      
       <InputLeftElement>
         <SearchIcon />
       </InputLeftElement>
@@ -257,48 +300,49 @@ const SearchBar = () => {
         borderColor="#004586"
         borderRadius="20px"
         onChange={(e) => {
-          setSearch(e.currentTarget.value);
+          setSearch(e.currentTarget.value)
         }}
       />
-       <button
+      <button
         type="button"
-        className="ml-2 px-3 py-2 rounded-md bg-gray-200 text-gray-600 relative"
+        className="relative ml-2 rounded-md bg-gray-200 px-3 py-2 text-gray-600"
         onMouseEnter={() => setShowOptions(true)}
-        onMouseLeave={() => {setShowOptions(false), setShowDropdown(true)}}
-       
-        
+        onMouseLeave={() => {
+          setShowOptions(false), setShowDropdown(true)
+        }}
       >
         <ChevronDownIcon />
         {showOptions && (
-          <div className="absolute top-0 left-0 mt-10 bg-white border border-gray-200 rounded-md shadow-md">
+          <div className="absolute top-0 left-0 mt-10 rounded-md border border-gray-200 bg-white shadow-md">
             {showDropdown ? (
               <>
-               
                 <button
                   type="button"
-                  className="px-4 py-2 cursor-pointer"
+                  className="cursor-pointer px-4 py-2"
                   onClick={() => handleFilterChange('Roles')}
                 >
                   Roles
                 </button>
                 <button
                   type="button"
-                  className="px-4 py-2 cursor-pointer"
+                  className="cursor-pointer px-4 py-2"
                   onClick={() => handleFilterChange('Status')}
                 >
                   Status
                 </button>
                 <button
                   type="button"
-                  className="px-4 py-2 cursor-pointer"
+                  className="cursor-pointer px-4 py-2"
                   onClick={() => handleFilterChange('Flags')}
                 >
                   Flags
                 </button>
                 <button
                   type="button"
-                  className="px-4 py-2 mb-2 cursor-pointer rounded font-bold bg-gray-200"
-                  onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('')}}
+                  className="mb-2 cursor-pointer rounded bg-gray-200 px-4 py-2 font-bold"
+                  onClick={() => {
+                    setShowOptions(false), setShowDropdown(true), setFilter('')
+                  }}
                 >
                   Clear
                 </button>
@@ -309,8 +353,6 @@ const SearchBar = () => {
           </div>
         )}
       </button>
-     
-     
     </InputGroup>
   )
 }
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index af694d3c..37fb85a9 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,4 +1,4 @@
-import { useContext } from 'react'
+import { useContext, useEffect, useRef, useState } from 'react'
 import {searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
@@ -8,10 +8,21 @@ import { Button, VStack } from '@chakra-ui/react'
 
 const ApplicantGrid = () => {
   const { filter, search } = useContext(searchContext)
+  const {
+    data,
+    refetch: refetchAllApplicantsTopRoleByDept,
+  } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery();
+  
+  useEffect(() => {
+    refetchAllApplicantsTopRoleByDept();
+  }, [filter]);
+
+ 
 
-  const { data } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
   if (!data) return <></>
 
+ 
+
   // const filteredData =
   //   search === ''
   //     ? data
@@ -42,6 +53,8 @@ const ApplicantGrid = () => {
             
           )
 
+
+
   const totalNumber = filteredData.length
 
 

From c8429f820ed09e5180936705cb0525acb7cee4af Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 17:03:48 +0800
Subject: [PATCH 124/223] add items under navbar to indicate the current
 filters applied, as well as allowing multiple filters

---
 src/components/common/SearchBar.tsx          |  34 +++--
 src/components/recruitment/ApplicantGrid.tsx | 132 ++++++++++++-------
 2 files changed, 107 insertions(+), 59 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 872e64b5..83d7a9eb 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -151,11 +151,13 @@ const SearchBar = () => {
   ] as { department: string; role: string }[]
   const ctx = useSession()
   const department = ctx.data?.user?.department
-  console.log(department)
   const filteredRoles = roles.filter(
     (combination) => combination.department === department
   )
   const { search, filter, setFilter, setSearch } = useContext(searchContext)
+  const filterArray = filter.split(',')
+  const firstElement = filterArray.shift()
+  console.log(filterArray)
   const [showDropdown, setShowDropdown] = useState(false)
   console.log(filteredRoles)
 
@@ -179,7 +181,7 @@ const SearchBar = () => {
               onClick={() => {
                 setShowOptions(false),
                   setShowDropdown(true),
-                  setFilter(role.role)
+                  setFilter(filter.concat(',' + role.role))
               }}
               className="cursor-pointer px-3 py-2"
             >
@@ -209,7 +211,7 @@ const SearchBar = () => {
             onClick={() => {
               setShowOptions(false),
                 setShowDropdown(true),
-                setFilter('accepted')
+                setFilter(filter.concat(',accepted'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -217,7 +219,7 @@ const SearchBar = () => {
           </button>
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter('offered')
+              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',offered'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -225,7 +227,7 @@ const SearchBar = () => {
           </button>
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter('pending')
+              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',pending'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -235,7 +237,7 @@ const SearchBar = () => {
             onClick={() => {
               setShowOptions(false),
                 setShowDropdown(true),
-                setFilter('interviewed')
+                setFilter(filter.concat(',interviewed'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -245,7 +247,7 @@ const SearchBar = () => {
             onClick={() => {
               setShowOptions(false),
                 setShowDropdown(true),
-                setFilter('rejected')
+                setFilter(filter.concat(',rejected'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -259,7 +261,7 @@ const SearchBar = () => {
         <ul className="ml-2">
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter('true')
+              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',true'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -267,7 +269,7 @@ const SearchBar = () => {
           </button>
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter('false')
+              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',false'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -350,9 +352,23 @@ const SearchBar = () => {
             ) : (
               renderOptions()
             )}
+        
           </div>
         )}
       </button>
+      <div className='grid grid-cols-2 absolute top-0 gap-x-1 gap-y-1 left-0 mt-10'>
+      {filterArray.map((value) => {
+        return (
+         <div className='rounded-full text-center border border-gray-200 bg-white shadow-md '>
+          {value}
+         </div>
+        )
+      }
+        )}
+        </div>
+      
+     
+    
     </InputGroup>
   )
 }
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 37fb85a9..d8686c87 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,5 +1,5 @@
 import { useContext, useEffect, useRef, useState } from 'react'
-import {searchContext } from '~/context/recruitment/SearchProvider'
+import { searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
 import InfoPopup from '~/components/recruitment/InfoPopup'
@@ -8,76 +8,108 @@ import { Button, VStack } from '@chakra-ui/react'
 
 const ApplicantGrid = () => {
   const { filter, search } = useContext(searchContext)
-  const {
-    data,
-    refetch: refetchAllApplicantsTopRoleByDept,
-  } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery();
-  
-  useEffect(() => {
-    refetchAllApplicantsTopRoleByDept();
-  }, [filter]);
+  const { data, refetch: refetchAllApplicantsTopRoleByDept } =
+    trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
 
- 
+  useEffect(() => {
+    console.log(filter)
+    refetchAllApplicantsTopRoleByDept()
+  }, [filter])
 
   if (!data) return <></>
 
- 
-
   // const filteredData =
   //   search === ''
   //     ? data
   //     : data?.filter((applicant) => {
   //         return applicant.name.toLowerCase().includes(search.toLowerCase())
   //       })
+  const filterArray = filter.split(',')
+  const removedFirst = filterArray.shift()
+  console.log(filterArray)
+
+  // const filteredData =
+  //       filter === ''
+  //         ? (search ==='' ? data :
+  //         data?.filter((applicant) => {
+  //           return applicant.name.toLowerCase().includes(search.toLowerCase())
+  //         }))
+  //         :
+  //         (search === '' ?
+  //         data?.filter((applicant) => {
+  //             return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) ||
+  //             applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
+  //             applicant.appliedRoles.some((role) => role.flag.toString() === filter))
+  //           }) :
+  //           data?.filter((applicant) => {
+  //             return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) ||
+  //             applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
+  //             applicant.appliedRoles.some((role) => role.flag.toString() === filter))
+  //           }).filter((remaining) => {
+  //             return remaining.name.toLowerCase().includes(search.toLowerCase())
+  //           })
+
+  //         )
 
   const filteredData =
-        filter === ''
-          ? (search ==='' ? data : 
-          data?.filter((applicant) => {
+    filterArray.length === 0
+      ? search === ''
+        ? data
+        : data?.filter((applicant) => {
             return applicant.name.toLowerCase().includes(search.toLowerCase())
-          })) 
-          :  
-          (search === '' ?        
-          data?.filter((applicant) => {
-              return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) || 
-              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
-              applicant.appliedRoles.some((role) => role.flag.toString() === filter))
-            }) :
-            data?.filter((applicant) => {
-              return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) || 
-              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
-              applicant.appliedRoles.some((role) => role.flag.toString() === filter))
-            }).filter((remaining) => {
-              return remaining.name.toLowerCase().includes(search.toLowerCase())
+          })
+      : search === ''
+      ? data?.filter((applicant) => {
+          return filterArray.every((filter) => {
+            return (
+              applicant.appliedRoles.some(
+                (role) => role.role.toLowerCase() === filter.toLowerCase()
+              ) ||
+              applicant.appliedRoles.some(
+                (role) => role.status.toLowerCase() === filter.toLowerCase()
+              ) ||
+              applicant.appliedRoles.some(
+                (role) => role.flag.toString() === filter
+              )
+            )
+          })
+        })
+      : data
+          ?.filter((applicant) => {
+            return filterArray.every((filter) => {
+              return (
+                applicant.appliedRoles.some(
+                  (role) => role.role.toLowerCase() === filter.toLowerCase()
+                ) ||
+                applicant.appliedRoles.some(
+                  (role) => role.status.toLowerCase() === filter.toLowerCase()
+                ) ||
+                applicant.appliedRoles.some(
+                  (role) => role.flag.toString() === filter
+                )
+              )
             })
-            
-          )
-
-
+          })
+          .filter((remaining) => {
+            return remaining.name.toLowerCase().includes(search.toLowerCase())
+          })
 
   const totalNumber = filteredData.length
 
-
   return (
     <>
-   <div>
-      <div className='mb-2 mt-20 lg:mt-1 md:mt-1 font-bold ml-20 lg:text-xl'>
-      Number of Applicants: {totalNumber}
+      <div>
+        <div className="mb-2 mt-20 ml-20 font-bold md:mt-1 lg:mt-1 lg:text-xl">
+          Number of Applicants: {totalNumber}
+        </div>
+        <div className="my-10  mx-20 mb-10 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
+          {filteredData?.map((applicant, index) => {
+            return <ApplicantCard applicant={applicant} key={applicant.id} />
+          })}
+        </div>
       </div>
-      <div className="mb-10  my-10 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
-      
-        {filteredData?.map((applicant, index) => {
-          
-          return <ApplicantCard applicant={applicant} key={applicant.id} />
-           
-        })}
-      </div>
-      </div>
-      
-      
+
       {filteredData.length > 0 && <InfoPopup />}
-   
-     
     </>
   )
 }

From b9b864d72b4dcaed6e22a918afe5076508fb791b Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 17:07:47 +0800
Subject: [PATCH 125/223] improve code quality

---
 src/pages/tasks/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 19da6bba..b2cae754 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -99,7 +99,7 @@ const Tasks: React.FC<BaseProps> = ({ session }) => {
                     {filteredData.map((item) => (
                       <tr key={item.id}>
                         <td className="whitespace-nowrap px-6 py-4">
-                          <h1 className="  text-white">
+                          <h1 className="text-white">
                             {item.status == 'Incomplete' && (
                               <button
                                 disabled={true}

From 85082661096147efa77862dd715d4bfe5b33a889 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 17:13:50 +0800
Subject: [PATCH 126/223] fix minor bugs

---
 src/components/common/SearchBar.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 83d7a9eb..a6ba965b 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -356,11 +356,11 @@ const SearchBar = () => {
           </div>
         )}
       </button>
-      <div className='grid grid-cols-2 absolute top-0 gap-x-1 gap-y-1 left-0 mt-10'>
+      <div className='grid grid-cols-2 flex flex-col absolute top-0 gap-x-1 gap-y-1 left-0 mt-10'>
       {filterArray.map((value) => {
         return (
-         <div className='rounded-full text-center border border-gray-200 bg-white shadow-md '>
-          {value}
+         <div className='w-30  rounded-full flex flex-col text-center border border-gray-200 bg-white shadow-md '>
+          {value === 'true' ? 'seen' : value === 'false' ? 'unseen' : value}
          </div>
         )
       }

From b0e374bf6101c65fbed83e5071cfb660345f3db8 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 21:27:21 +0800
Subject: [PATCH 127/223] add tags to the filters

---
 src/components/common/SearchBar.tsx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index a6ba965b..6109c95a 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -356,7 +356,7 @@ const SearchBar = () => {
           </div>
         )}
       </button>
-      <div className='grid grid-cols-2 flex flex-col absolute top-0 gap-x-1 gap-y-1 left-0 mt-10'>
+      {/* <div className='grid grid-cols-2 flex flex-col absolute top-0 gap-x-1 gap-y-1 left-0 mt-10'>
       {filterArray.map((value) => {
         return (
          <div className='w-30  rounded-full flex flex-col text-center border border-gray-200 bg-white shadow-md '>
@@ -365,7 +365,17 @@ const SearchBar = () => {
         )
       }
         )}
-        </div>
+        </div> */}
+
+        <div className='flex flex-wrap absolute  mx-6 top-0 left-0 mt-10' >
+  {filterArray.map((value) => {
+    return (
+      <div className='w-30 rounded-full flex flex-col text-center border border-gray-200 bg-white shadow-md'>
+        {value === 'true' ? 'seen' : value === 'false' ? 'unseen' : value}
+      </div>
+    )
+  })}
+</div>
       
      
     

From e8ce3c1fcad4fedbf90d948ad3a32fe65bb2c35b Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 22:19:24 +0800
Subject: [PATCH 128/223] fix bugs for yarn build

---
 src/components/common/SearchBar.tsx    | 38 +++++++++++++++-----------
 src/pages/application_status/index.tsx |  3 +-
 src/types/model.ts                     |  2 +-
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 6109c95a..496fc92b 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -219,7 +219,9 @@ const SearchBar = () => {
           </button>
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',offered'))
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter(filter.concat(',offered'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -227,7 +229,9 @@ const SearchBar = () => {
           </button>
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',pending'))
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter(filter.concat(',pending'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -261,7 +265,9 @@ const SearchBar = () => {
         <ul className="ml-2">
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',true'))
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter(filter.concat(',true'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -269,7 +275,9 @@ const SearchBar = () => {
           </button>
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',false'))
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter(filter.concat(',false'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -352,7 +360,6 @@ const SearchBar = () => {
             ) : (
               renderOptions()
             )}
-        
           </div>
         )}
       </button>
@@ -367,18 +374,17 @@ const SearchBar = () => {
         )}
         </div> */}
 
-        <div className='flex flex-wrap absolute  mx-6 top-0 left-0 mt-10' >
-  {filterArray.map((value) => {
-    return (
-      <div className='w-30 rounded-full flex flex-col text-center border border-gray-200 bg-white shadow-md'>
-        {value === 'true' ? 'seen' : value === 'false' ? 'unseen' : value}
+      <div className="absolute top-0 left-0  mx-6 mt-10 flex flex-wrap">
+        {filterArray.map((value) => {
+          return (
+            <div 
+            key={value}
+            className="w-30 flex flex-col rounded-full border border-gray-200 bg-white text-center shadow-md">
+              {value === 'true' ? 'seen' : value === 'false' ? 'unseen' : value}
+            </div>
+          )
+        })}
       </div>
-    )
-  })}
-</div>
-      
-     
-    
     </InputGroup>
   )
 }
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index aaa723fe..14f42503 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -13,6 +13,7 @@ import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { BaseProps } from '~/utils/withAuth'
 import React from 'react'
+import Head from 'next/head'
 
 enum PageState {
   LOGIN,
@@ -60,7 +61,7 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
         <meta name="description" content="The login page for Atlas" />
       </Head>
       <TopNavbar
-        image={session.user?.image as string}
+        // image={session.user?.image as string}
         isAdmin={session.isAdmin}
       />
       <main>
diff --git a/src/types/model.ts b/src/types/model.ts
index d36946e4..8e35042e 100644
--- a/src/types/model.ts
+++ b/src/types/model.ts
@@ -1,4 +1,4 @@
-import type { AppliedRole } from '@prisma/client'
+import { AppliedRole } from "~/server/db/models/AppliedRole"
 
 export type ApplicantWithAppliedRole = {
   id: string

From 4336c73358d9e8c992229fb38ae8470f5f3b264c Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 23:02:20 +0800
Subject: [PATCH 129/223] a

---
 src/components/recruitment/ApplicantGrid.tsx | 23 +++++++-------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index d8686c87..6f4162cb 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,10 +1,9 @@
-import { useContext, useEffect, useRef, useState } from 'react'
+import { useContext, useEffect} from 'react'
 import { searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
 import InfoPopup from '~/components/recruitment/InfoPopup'
-import applicants from '~/pages/recruitment/applicants'
-import { Button, VStack } from '@chakra-ui/react'
+
 
 const ApplicantGrid = () => {
   const { filter, search } = useContext(searchContext)
@@ -18,12 +17,6 @@ const ApplicantGrid = () => {
 
   if (!data) return <></>
 
-  // const filteredData =
-  //   search === ''
-  //     ? data
-  //     : data?.filter((applicant) => {
-  //         return applicant.name.toLowerCase().includes(search.toLowerCase())
-  //       })
   const filterArray = filter.split(',')
   const removedFirst = filterArray.shift()
   console.log(filterArray)
@@ -63,13 +56,13 @@ const ApplicantGrid = () => {
           return filterArray.every((filter) => {
             return (
               applicant.appliedRoles.some(
-                (role) => role.role.toLowerCase() === filter.toLowerCase()
+                (role) => role?.role.toLowerCase() === filter.toLowerCase()
               ) ||
               applicant.appliedRoles.some(
-                (role) => role.status.toLowerCase() === filter.toLowerCase()
+                (role) => role?.status.toLowerCase() === filter.toLowerCase()
               ) ||
               applicant.appliedRoles.some(
-                (role) => role.flag.toString() === filter
+                (role) => role?.flag.toString() === filter
               )
             )
           })
@@ -79,13 +72,13 @@ const ApplicantGrid = () => {
             return filterArray.every((filter) => {
               return (
                 applicant.appliedRoles.some(
-                  (role) => role.role.toLowerCase() === filter.toLowerCase()
+                  (role) => role?.role.toLowerCase() === filter.toLowerCase()
                 ) ||
                 applicant.appliedRoles.some(
-                  (role) => role.status.toLowerCase() === filter.toLowerCase()
+                  (role) => role?.status.toLowerCase() === filter.toLowerCase()
                 ) ||
                 applicant.appliedRoles.some(
-                  (role) => role.flag.toString() === filter
+                  (role) => role?.flag.toString() === filter
                 )
               )
             })

From 896c899745b0d9e6f1e0bd89cfb72c24e8aff298 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Mon, 19 Jun 2023 20:48:28 +0800
Subject: [PATCH 130/223] make the status color turn red once the user rejects
 the offer, but the backend does not update and needs to be integrated

---
 src/pages/application_status/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index c8667e85..1e754542 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -97,7 +97,9 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                         {item.department} - {item.name}
                         <Image
                           alt="logo"
-                          src="/images/Ellipse 1.svg"
+                          src={isRejected?
+                            "/images/red_dot.svg": 
+                            "/images/Ellipse 1.svg"}
                           height={35}
                           width={35}
                           className="md:ml-14 ml-2 flex  flex-col"

From 05e38585fbd527a632b9bcb9d52830fba116955f Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Mon, 19 Jun 2023 21:54:30 +0800
Subject: [PATCH 131/223] fix the bug of circle color not updating

---
 src/components/recruitment/StatusPopup.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 893bcadc..a79151b2 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -14,6 +14,10 @@ import { ApplicationStatus } from '~/server/db/models/AppliedRole'
 import type { QueryObserverResult } from '@tanstack/react-query'
 import { BsCircleFill } from 'react-icons/bs'
 import { trpc } from '~/utils/trpc'
+import Router from 'next/router'
+import { useState } from 'react'
+
+
 
 const statusFillMap = {
   [ApplicationStatus.ACCEPTED]: '#46FFDE',
@@ -34,6 +38,7 @@ const StatusPopup = ({
 }) => {
   const toast = useToast()
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
+  const [currentStatus, setCurrentStatus] = useState(status);
   const updateStatus = async (status: ApplicationStatus) => {
     try {
       await mutateAsync({
@@ -41,12 +46,15 @@ const StatusPopup = ({
         appliedRoleId: appliedRoleId,
       })
       await refetch()
+      setCurrentStatus(status)
       toast({
         duration: 2000,
         status: 'success',
         title: 'Success',
         description: 'Application status updated successfully!',
       })
+     
+
     } catch (e) {
       toast({
         description: (e as Error).message,
@@ -62,7 +70,7 @@ const StatusPopup = ({
       <PopoverTrigger>
         <IconButton
           aria-label="status"
-          icon={<BsCircleFill fill={statusFillMap[status]} />}
+          icon={<BsCircleFill fill={statusFillMap[currentStatus]} />}
           bg="None"
           _hover={{ background: 'None' }}
         ></IconButton>

From 680125ec602c8bf9a87daf1fb6868f623d5551a3 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Mon, 19 Jun 2023 22:26:46 +0800
Subject: [PATCH 132/223] a

---
 src/components/recruitment/StatusPopup.tsx | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index a79151b2..f8d065ff 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -1,6 +1,13 @@
 import {
   IconButton,
   ListItem,
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
   Popover,
   PopoverBody,
   PopoverCloseButton,
@@ -39,6 +46,7 @@ const StatusPopup = ({
   const toast = useToast()
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
   const [currentStatus, setCurrentStatus] = useState(status);
+  isAcceptOpen, 
   const updateStatus = async (status: ApplicationStatus) => {
     try {
       await mutateAsync({
@@ -149,6 +157,41 @@ const StatusPopup = ({
           </UnorderedList>
         </PopoverBody>
       </PopoverContent>
+
+      <Modal
+          isOpen={isAcceptOpen}
+          onClose={onCloseAccept}
+          size="xs"
+        >
+          <ModalOverlay bg="none" backdropFilter="auto" />
+          <ModalContent>
+            <ModalHeader fontSize="5xl"></ModalHeader>
+            <ModalCloseButton />
+            <ModalBody fontSize="3xl ">
+              <div className=" flex-col justify-center">
+                <div className="items-center">
+                  Confirm Acceptance?
+                  <button
+                    onClick={() => {
+                      onCloseAccept()
+                      setIsAccepted(true)
+                    }}
+                    className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                  >
+                    Confirm
+                  </button>
+                  <button
+                    onClick={onCloseAccept}
+                    className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                  >
+                    Cancel
+                  </button>
+                </div>
+              </div>
+            </ModalBody>
+            <ModalFooter></ModalFooter>
+          </ModalContent>
+        </Modal>
     </Popover>
   )
 }

From 3f11d37fb2da80cb6b377fab5d3c8181cdf3207f Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Tue, 20 Jun 2023 22:49:13 +0800
Subject: [PATCH 133/223] Emails for status update of accept or reject

---
 src/components/recruitment/ApplicantCard.tsx  | 29 +++---
 .../recruitment/AppliedRoleListItem.tsx       |  7 +-
 src/components/recruitment/StatusPopup.tsx    | 18 ++--
 src/server/db/models/Applicant.ts             |  1 +
 src/server/trpc/router/member/helper.ts       | 11 ++-
 src/server/trpc/router/recruitment/helper.ts  | 89 +++++++++++++++++++
 src/server/trpc/router/recruitment/read.ts    | 19 ++--
 src/server/trpc/router/recruitment/update.ts  | 27 +++++-
 .../trpc/router/users/createSingleUser.ts     |  4 +-
 9 files changed, 167 insertions(+), 38 deletions(-)
 create mode 100644 src/server/trpc/router/recruitment/helper.ts

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index 3547009d..b6e9b325 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -58,18 +58,26 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
     >
       <CardHeader paddingBottom="0" zIndex={1}>
         <Heading size="md" textAlign="center" textColor="white">
-          
-            {isFlagged ? 
-            <button className='absolute left-2'
-            onClick={() => {updateFlag(false), setIsFlagged(false)}}>
+          {isFlagged ? (
+            <button
+              className="absolute left-2"
+              onClick={() => {
+                updateFlag(false), setIsFlagged(false)
+              }}
+            >
               <ViewIcon></ViewIcon>
-              </button>
-            :  <button className='absolute left-2'
-            onClick={() => {updateFlag(true), setIsFlagged(true)}}>
+            </button>
+          ) : (
+            <button
+              className="absolute left-2"
+              onClick={() => {
+                updateFlag(true), setIsFlagged(true)
+              }}
+            >
               <ViewOffIcon></ViewOffIcon>
-              </button>
-            }
-         
+            </button>
+          )}
+
           {applicant.name}
         </Heading>
       </CardHeader>
@@ -100,6 +108,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
           <Text>Role Applied:</Text>
           <UnorderedList styleType="none">
             <AppliedRoleListItem
+              applicant={applicant}
               appliedRole={appliedRole}
               key={appliedRole.id}
               refetch={refetch}
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index f93a9989..44eb69bd 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -1,12 +1,15 @@
 import { ListItem, Text } from '@chakra-ui/react'
 import type { QueryObserverResult } from '@tanstack/react-query'
+import type { Applicant } from '~/server/db/models/Applicant'
 import type { AppliedRole } from '~/server/db/models/AppliedRole'
 import StatusPopup from './StatusPopup'
 
 const AppliedRoleListItem = ({
+  applicant,
   appliedRole,
   refetch,
 }: {
+  applicant: Applicant
   appliedRole: AppliedRole
   refetch: () => Promise<QueryObserverResult>
 }) => {
@@ -16,8 +19,8 @@ const AppliedRoleListItem = ({
         {appliedRole.rank}. {appliedRole.role}
       </Text>
       <StatusPopup
-        status={appliedRole.status}
-        appliedRoleId={appliedRole.id}
+        applicant={applicant}
+        appliedRole={appliedRole}
         refetch={refetch}
       />
     </ListItem>
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 893bcadc..c4db7f94 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -14,6 +14,8 @@ import { ApplicationStatus } from '~/server/db/models/AppliedRole'
 import type { QueryObserverResult } from '@tanstack/react-query'
 import { BsCircleFill } from 'react-icons/bs'
 import { trpc } from '~/utils/trpc'
+import type { Applicant } from '~/server/db/models/Applicant'
+import type { AppliedRole } from '~/server/db/models/AppliedRole'
 
 const statusFillMap = {
   [ApplicationStatus.ACCEPTED]: '#46FFDE',
@@ -24,12 +26,12 @@ const statusFillMap = {
 }
 
 const StatusPopup = ({
-  status,
-  appliedRoleId,
+  applicant,
+  appliedRole,
   refetch,
 }: {
-  appliedRoleId: string
-  status: ApplicationStatus
+  applicant: Applicant
+  appliedRole: AppliedRole
   refetch: () => Promise<QueryObserverResult>
 }) => {
   const toast = useToast()
@@ -38,7 +40,11 @@ const StatusPopup = ({
     try {
       await mutateAsync({
         status: status,
-        appliedRoleId: appliedRoleId,
+        appliedRoleId: appliedRole.id,
+        name: applicant.name,
+        email: applicant.email,
+        appliedRole: appliedRole.role,
+        appliedDepartment: appliedRole.department,
       })
       await refetch()
       toast({
@@ -62,7 +68,7 @@ const StatusPopup = ({
       <PopoverTrigger>
         <IconButton
           aria-label="status"
-          icon={<BsCircleFill fill={statusFillMap[status]} />}
+          icon={<BsCircleFill fill={statusFillMap[appliedRole.status]} />}
           bg="None"
           _hover={{ background: 'None' }}
         ></IconButton>
diff --git a/src/server/db/models/Applicant.ts b/src/server/db/models/Applicant.ts
index 5ad009ad..91a9ed34 100644
--- a/src/server/db/models/Applicant.ts
+++ b/src/server/db/models/Applicant.ts
@@ -3,6 +3,7 @@ import type { AppliedRole } from './AppliedRole'
 // Not in firestore collection, piggybacks off User model
 export type Applicant = {
   id: string
+  email: string
   name: string
   appliedRoles: AppliedRole[]
 }
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index 38f6f48f..60a76ad8 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -26,7 +26,7 @@ async function checkIfUserExist(id: string) {
  * @param email The email of the user to be sent
  * @param password The password of the user
  */
-async function sendEmail(email: string, password: string) {
+async function sendNewUserEmail(email: string, password: string) {
   const transporter = nodemailer.createTransport({
     service: 'gmail',
     auth: {
@@ -115,8 +115,13 @@ function buildUserObject(
  */
 async function sendMultipleEmails(emails: string[], password: string) {
   await Promise.all(
-    emails.map(async (email) => await sendEmail(email, password))
+    emails.map(async (email) => await sendNewUserEmail(email, password))
   )
 }
 
-export { checkIfUserExist, sendEmail, sendMultipleEmails, buildUserObject }
+export {
+  checkIfUserExist,
+  sendNewUserEmail,
+  sendMultipleEmails,
+  buildUserObject,
+}
diff --git a/src/server/trpc/router/recruitment/helper.ts b/src/server/trpc/router/recruitment/helper.ts
new file mode 100644
index 00000000..54e222db
--- /dev/null
+++ b/src/server/trpc/router/recruitment/helper.ts
@@ -0,0 +1,89 @@
+import nodemailer from 'nodemailer'
+import { env } from '~/env/server.mjs'
+
+/**
+ * Sends an email to the applicant after getting accepted
+ *
+ * @param email The email of the applicant to be sent
+ * @param name The name of the applicant
+ * @param appliedRole The applied role of the applicant
+ * @param appliedDepartmnet The accompanying department for the applied role
+ */
+export async function sendAcceptanceEmail(
+  email: string,
+  name: string,
+  appliedRole: string,
+  appliedDepartment: string
+) {
+  const transporter = nodemailer.createTransport({
+    service: 'gmail',
+    auth: {
+      user: env.GMAIL,
+      pass: env.GMAIL_PASSWORD,
+    },
+  })
+
+  return transporter.sendMail({
+    from: env.GMAIL,
+    to: email,
+    subject: `Congratulations you've been accepted as ${appliedRole} in the ${appliedDepartment} department!`,
+    html: `
+    Dear ${name},
+    <br />
+    <p> Due to your outstanding performance in the interview, we
+    have accepted you for the role of ${appliedRole} in the 
+    ${appliedDepartment} department! If you would like
+    to accept this role, please do so at the HRMS website.
+    </p>
+    <a href="${env.NEXTAUTH_URL}">HRMS Website</a>
+    <br />
+    Thank You. <br /> 
+    Fintech HR
+    `,
+  })
+}
+
+/**
+ * Sends an email to the applicant after getting rejected
+ *
+ * @param email The email of the applicant to be sent
+ * @param name The name of the applicant
+ * @param appliedRole The applied role of the applicant
+ * @param appliedDepartmnet The accompanying department for the applied role
+ */
+export async function sendRejectionEmail(
+  email: string,
+  name: string,
+  appliedRole: string,
+  appliedDepartment: string
+) {
+  const transporter = nodemailer.createTransport({
+    service: 'gmail',
+    auth: {
+      user: env.GMAIL,
+      pass: env.GMAIL_PASSWORD,
+    },
+  })
+
+  return transporter.sendMail({
+    from: env.GMAIL,
+    to: email,
+    subject: `Thanks for your interest in Fintech Society`,
+    html: `
+    Dear ${name},
+    <br />
+    <p> Thank you for your application to Fintech Society for 
+    the role of ${appliedRole} in the ${appliedDepartment} 
+    department. Though your performance was great, we have 
+    decided to pursue other applicants who appear to match 
+    our needs and requirements more closely at this time. 
+    Thank you again for your interest and please do not 
+    hesitate to re-apply again in the future!
+    </p>
+    <a href="${env.NEXTAUTH_URL}">HRMS Website</a>
+    <br />
+    Thank You. <br /> 
+    Fintech HR
+    `,
+  })
+}
diff --git a/src/server/trpc/router/recruitment/read.ts b/src/server/trpc/router/recruitment/read.ts
index 8be343f8..ed631e66 100644
--- a/src/server/trpc/router/recruitment/read.ts
+++ b/src/server/trpc/router/recruitment/read.ts
@@ -16,16 +16,13 @@ import { protectedProcedure } from '~/server/trpc/trpc'
  * point in time, from the perspective of a director.
  * */
 export const getAllApplicantsTopRoleByDept = protectedProcedure
-//.input(z.object({
-//   filter: z.string(),
-//   search: z.string()
-// }))
-.query(
-  async ({ ctx }) => {
+  //.input(z.object({
+  //   filter: z.string(),
+  //   search: z.string()
+  // }))
+  .query(async ({ ctx }) => {
     try {
-      const filtersForUsers = [
-        where('role', '==', 'Applicant'),
-      ]
+      const filtersForUsers = [where('role', '==', 'Applicant')]
       // if (input.search && input.search.length) {
       //   filtersForUsers.push(where('name', '==', input.search))
       // }
@@ -51,6 +48,7 @@ export const getAllApplicantsTopRoleByDept = protectedProcedure
           if (appliedRoles.length == 1) {
             applicantsWithRoles.push({
               id: applicant?.id,
+              email: applicant?.email,
               name: applicant?.name,
               appliedRoles: appliedRoles,
             })
@@ -64,8 +62,7 @@ export const getAllApplicantsTopRoleByDept = protectedProcedure
         message: 'Error retrieving applicants: ' + error,
       })
     }
-  }
-)
+  })
 
 export const getApplicant = protectedProcedure
   .input(z.string())
diff --git a/src/server/trpc/router/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
index c0496067..0ac65320 100644
--- a/src/server/trpc/router/recruitment/update.ts
+++ b/src/server/trpc/router/recruitment/update.ts
@@ -3,19 +3,40 @@ import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
 import { ApplicationStatus } from '~/server/db/models/AppliedRole'
+import { sendAcceptanceEmail, sendRejectionEmail } from './helper'
 
 export const updateAppliedRoleStatus = protectedProcedure
   .input(
     z.object({
       appliedRoleId: z.string(),
       status: z.nativeEnum(ApplicationStatus),
+      name: z.string(),
+      email: z.string(),
+      appliedRole: z.string(),
+      appliedDepartment: z.string(),
     })
   )
   .mutation(async ({ input }) => {
     try {
-      return await appliedRoleCollection.update(input.appliedRoleId, {
+      await appliedRoleCollection.update(input.appliedRoleId, {
         status: input.status,
       })
+      // send email to notify applicants that are accepted / rejected
+      if (input.status === ApplicationStatus.ACCEPTED) {
+        await sendAcceptanceEmail(
+          input.email,
+          input.name,
+          input.appliedRole,
+          input.appliedDepartment
+        )
+      } else if (input.status === ApplicationStatus.REJECTED) {
+        await sendRejectionEmail(
+          input.email,
+          input.name,
+          input.appliedRole,
+          input.appliedDepartment
+        )
+      }
     } catch (e) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
@@ -44,7 +65,7 @@ export const updateInterviewNotes = protectedProcedure
     }
   })
 
-  export const updateAppliedRoleFlag = protectedProcedure
+export const updateAppliedRoleFlag = protectedProcedure
   .input(
     z.object({
       appliedRoleId: z.string(),
@@ -63,5 +84,3 @@ export const updateInterviewNotes = protectedProcedure
       })
     }
   })
-
-
diff --git a/src/server/trpc/router/users/createSingleUser.ts b/src/server/trpc/router/users/createSingleUser.ts
index 3919571e..247171cb 100644
--- a/src/server/trpc/router/users/createSingleUser.ts
+++ b/src/server/trpc/router/users/createSingleUser.ts
@@ -1,7 +1,7 @@
 import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import { hash } from 'bcryptjs'
-import { checkIfUserExist, sendEmail } from '../member/helper'
+import { checkIfUserExist, sendNewUserEmail } from '../member/helper'
 import userCollection from '~/server/db/collections/UserCollection'
 import logCollection from '~/server/db/collections/LogCollection'
 import { Timestamp } from 'firebase/firestore'
@@ -40,7 +40,7 @@ export const createSingleUser = protectedProcedure
         id
       )
 
-      await sendEmail(email, hashedPassword)
+      await sendNewUserEmail(email, hashedPassword)
     } catch (e) {
       await logCollection.add({
         createdAt: Timestamp.fromDate(new Date()),

From f63ed0b0c00496938d720787577b5e0b2bc426c7 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Tue, 20 Jun 2023 23:00:16 +0800
Subject: [PATCH 134/223] add confirmation popup(not finished)

---
 src/components/recruitment/StatusPopup.tsx | 31 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index f8d065ff..4586576a 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -46,7 +46,12 @@ const StatusPopup = ({
   const toast = useToast()
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
   const [currentStatus, setCurrentStatus] = useState(status);
-  isAcceptOpen, 
+  const [isAcceptOpen, setIsAcceptOpen] = useState(false)
+  const onOpenAccept = () => setIsAcceptOpen(true)
+  const onCloseAccept = (inputStatus: ApplicationStatus) => {
+    setIsAcceptOpen(false)
+    updateStatus(inputStatus as ApplicationStatus)
+  }
   const updateStatus = async (status: ApplicationStatus) => {
     try {
       await mutateAsync({
@@ -94,9 +99,12 @@ const StatusPopup = ({
                 bg="None"
                 _hover={{ background: 'None' }}
                 marginLeft="2"
-                onClick={() =>
+                onClick={() => {
+                  setIsAcceptOpen(true)
+                  setCurrentStatus(ApplicationStatus.ACCEPTED as ApplicationStatus)
                   updateStatus(ApplicationStatus.ACCEPTED as ApplicationStatus)
                 }
+                }
               />
               <Text>Accepted</Text>
             </ListItem>
@@ -107,9 +115,12 @@ const StatusPopup = ({
                 bg="None"
                 _hover={{ background: 'None' }}
                 marginLeft="2"
-                onClick={() =>
+                onClick={() => {
+                  setIsAcceptOpen(true)
+                  setCurrentStatus(ApplicationStatus.OFFERED as ApplicationStatus)
                   updateStatus(ApplicationStatus.OFFERED as ApplicationStatus)
                 }
+                }
               />
               <Text>Offered</Text>
             </ListItem>
@@ -120,9 +131,12 @@ const StatusPopup = ({
                 bg="None"
                 _hover={{ background: 'None' }}
                 marginLeft="2"
-                onClick={() =>
+                onClick={() => {
+                  setIsAcceptOpen(true)
+                  setCurrentStatus(ApplicationStatus.PENDING as ApplicationStatus)
                   updateStatus(ApplicationStatus.PENDING as ApplicationStatus)
                 }
+                }
               />
               <Text>Pending Review</Text>
             </ListItem>
@@ -133,10 +147,13 @@ const StatusPopup = ({
                 bg="None"
                 _hover={{ background: 'None' }}
                 marginLeft="2"
-                onClick={() =>
+                onClick={() => {
+                  setIsAcceptOpen(true)
+                  setCurrentStatus(ApplicationStatus.INTERVIEWED as ApplicationStatus)
                   updateStatus(
                     ApplicationStatus.INTERVIEWED as ApplicationStatus
                   )
+                  }
                 }
               />
               <Text>Interviewed</Text>
@@ -160,7 +177,7 @@ const StatusPopup = ({
 
       <Modal
           isOpen={isAcceptOpen}
-          onClose={onCloseAccept}
+          onClose={() => setIsAcceptOpen(false)}
           size="xs"
         >
           <ModalOverlay bg="none" backdropFilter="auto" />
@@ -174,7 +191,7 @@ const StatusPopup = ({
                   <button
                     onClick={() => {
                       onCloseAccept()
-                      setIsAccepted(true)
+                    
                     }}
                     className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
                   >

From afcc4e403277e1b07ebdd544bc64b6c22d002705 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 21 Jun 2023 20:40:42 +0800
Subject: [PATCH 135/223] add a waiting toast while the update is not complete,
 and fix the color bug. Also add a confirmation alert before updating status

---
 src/components/recruitment/StatusPopup.tsx | 54 +++++++++++++---------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index bf149246..88cd906c 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -46,15 +46,24 @@ const StatusPopup = ({
 }) => {
   const toast = useToast()
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
-  const [currentStatus, setCurrentStatus] = useState(status);
+  const [currentStatus, setCurrentStatus] = useState(appliedRole.status);
+  const [statusInModal, setStatusInModal] = useState(appliedRole.status)
   const [isAcceptOpen, setIsAcceptOpen] = useState(false)
-  const onOpenAccept = () => setIsAcceptOpen(true)
+  // const onOpenAccept = () => setIsAcceptOpen(true)
   const onCloseAccept = (inputStatus: ApplicationStatus) => {
     setIsAcceptOpen(false)
     updateStatus(inputStatus as ApplicationStatus)
   }
   const updateStatus = async (status: ApplicationStatus) => {
     try {
+    
+      const firstToast = toast({
+        duration: null,
+        status: 'loading',
+        title: 'Updating',
+        description: 'Waiting to update...'
+     
+      });
       await mutateAsync({
         status: status,
         appliedRoleId: appliedRole.id,
@@ -64,7 +73,8 @@ const StatusPopup = ({
         appliedDepartment: appliedRole.department,
       })
       await refetch()
-      setCurrentStatus(status)
+      setCurrentStatus(status);
+      toast.close(firstToast)
       toast({
         duration: 2000,
         status: 'success',
@@ -89,7 +99,7 @@ const StatusPopup = ({
         <IconButton
           aria-label="status"
 
-          icon={<BsCircleFill fill={statusFillMap[appliedRole.status]} />}
+          icon={<BsCircleFill fill={statusFillMap[currentStatus]} />}
 
           bg="None"
           _hover={{ background: 'None' }}
@@ -108,8 +118,8 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setCurrentStatus(ApplicationStatus.ACCEPTED as ApplicationStatus)
-                  updateStatus(ApplicationStatus.ACCEPTED as ApplicationStatus)
+                  setStatusInModal(ApplicationStatus.ACCEPTED as ApplicationStatus)
+               
                 }
                 }
               />
@@ -124,8 +134,8 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setCurrentStatus(ApplicationStatus.OFFERED as ApplicationStatus)
-                  updateStatus(ApplicationStatus.OFFERED as ApplicationStatus)
+                  setStatusInModal(ApplicationStatus.OFFERED as ApplicationStatus)
+                 
                 }
                 }
               />
@@ -140,8 +150,8 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setCurrentStatus(ApplicationStatus.PENDING as ApplicationStatus)
-                  updateStatus(ApplicationStatus.PENDING as ApplicationStatus)
+                  setStatusInModal(ApplicationStatus.PENDING as ApplicationStatus)
+                 
                 }
                 }
               />
@@ -156,10 +166,8 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setCurrentStatus(ApplicationStatus.INTERVIEWED as ApplicationStatus)
-                  updateStatus(
-                    ApplicationStatus.INTERVIEWED as ApplicationStatus
-                  )
+                  setStatusInModal(ApplicationStatus.INTERVIEWED as ApplicationStatus)
+                 
                   }
                 }
               />
@@ -172,8 +180,11 @@ const StatusPopup = ({
                 bg="None"
                 _hover={{ background: 'None' }}
                 marginLeft="2"
-                onClick={() =>
-                  updateStatus(ApplicationStatus.REJECTED as ApplicationStatus)
+                onClick={() => {
+                  setIsAcceptOpen(true)
+                  setStatusInModal(ApplicationStatus.REJECTED as ApplicationStatus)
+            
+                }
                 }
               />
               <Text>Rejected</Text>
@@ -191,21 +202,22 @@ const StatusPopup = ({
           <ModalContent>
             <ModalHeader fontSize="5xl"></ModalHeader>
             <ModalCloseButton />
-            <ModalBody fontSize="3xl ">
+            <ModalBody fontSize="2xl ">
               <div className=" flex-col justify-center">
                 <div className="items-center">
-                  Confirm Acceptance?
+                  Confirm Status Update?
                   <button
                     onClick={() => {
-                      onCloseAccept()
-                    
+                      onCloseAccept(statusInModal)
                     }}
                     className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
                   >
                     Confirm
                   </button>
                   <button
-                    onClick={onCloseAccept}
+                    onClick={() => {
+                      setIsAcceptOpen(false)
+                    }}
                     className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
                   >
                     Cancel

From 9226df49075ecea3c02a0a7ed7a163da897f20f7 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 21 Jun 2023 21:22:15 +0800
Subject: [PATCH 136/223] fix the filter tags' positions, and add waiting toast
 to the update flag button

---
 src/components/common/SearchBar.tsx          |  12 +-
 src/components/recruitment/ApplicantCard.tsx |  12 +-
 src/components/recruitment/ApplicantGrid.tsx |  27 +---
 src/components/recruitment/StatusPopup.tsx   | 122 +++++++++----------
 4 files changed, 73 insertions(+), 100 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 496fc92b..e03eb8a9 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -160,11 +160,8 @@ const SearchBar = () => {
   console.log(filterArray)
   const [showDropdown, setShowDropdown] = useState(false)
   console.log(filteredRoles)
-
   const [selectedFilter, setSelectedFilter] = useState('')
   const [showOptions, setShowOptions] = useState(false)
-  console.log('searchbar: ', search)
-
   const handleFilterChange = (filter: string) => {
     setSelectedFilter(filter)
     setShowDropdown(false)
@@ -374,12 +371,13 @@ const SearchBar = () => {
         )}
         </div> */}
 
-      <div className="absolute top-0 left-0  mx-6 mt-10 flex flex-wrap">
+      <div className="absolute top-0 left-0 max-w-[250px] mt-10 flex flex-wrap">
         {filterArray.map((value) => {
           return (
-            <div 
-            key={value}
-            className="w-30 flex flex-col rounded-full border border-gray-200 bg-white text-center shadow-md">
+            <div
+              key={value}
+              className="mx-1 my-1 px-2 flex flex-col  rounded-full border border-gray-200 bg-white text-center shadow-md"
+            >
               {value === 'true' ? 'seen' : value === 'false' ? 'unseen' : value}
             </div>
           )
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index b6e9b325..b31ca751 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -30,11 +30,19 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleFlag.useMutation()
   const updateFlag = async (flag: boolean) => {
     try {
+      const firstToast = toast({
+        duration: null,
+        status: 'loading',
+        title: 'Updating',
+        description: 'Waiting to update...',
+      })
       await mutateAsync({
         flag: flag,
         appliedRoleId: appliedRoleId,
       })
       await refetch()
+      setIsFlagged(flag)
+      toast.close(firstToast)
       toast({
         duration: 2000,
         status: 'success',
@@ -62,7 +70,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
             <button
               className="absolute left-2"
               onClick={() => {
-                updateFlag(false), setIsFlagged(false)
+                updateFlag(false)
               }}
             >
               <ViewIcon></ViewIcon>
@@ -71,7 +79,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
             <button
               className="absolute left-2"
               onClick={() => {
-                updateFlag(true), setIsFlagged(true)
+                updateFlag(true)
               }}
             >
               <ViewOffIcon></ViewOffIcon>
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 6f4162cb..13362aef 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,10 +1,9 @@
-import { useContext, useEffect} from 'react'
+import { useContext, useEffect } from 'react'
 import { searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
 import InfoPopup from '~/components/recruitment/InfoPopup'
 
-
 const ApplicantGrid = () => {
   const { filter, search } = useContext(searchContext)
   const { data, refetch: refetchAllApplicantsTopRoleByDept } =
@@ -19,30 +18,6 @@ const ApplicantGrid = () => {
 
   const filterArray = filter.split(',')
   const removedFirst = filterArray.shift()
-  console.log(filterArray)
-
-  // const filteredData =
-  //       filter === ''
-  //         ? (search ==='' ? data :
-  //         data?.filter((applicant) => {
-  //           return applicant.name.toLowerCase().includes(search.toLowerCase())
-  //         }))
-  //         :
-  //         (search === '' ?
-  //         data?.filter((applicant) => {
-  //             return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) ||
-  //             applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
-  //             applicant.appliedRoles.some((role) => role.flag.toString() === filter))
-  //           }) :
-  //           data?.filter((applicant) => {
-  //             return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) ||
-  //             applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
-  //             applicant.appliedRoles.some((role) => role.flag.toString() === filter))
-  //           }).filter((remaining) => {
-  //             return remaining.name.toLowerCase().includes(search.toLowerCase())
-  //           })
-
-  //         )
 
   const filteredData =
     filterArray.length === 0
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 88cd906c..aedc7513 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -26,7 +26,6 @@ import { useState } from 'react'
 import type { Applicant } from '~/server/db/models/Applicant'
 import type { AppliedRole } from '~/server/db/models/AppliedRole'
 
-
 const statusFillMap = {
   [ApplicationStatus.ACCEPTED]: '#46FFDE',
   [ApplicationStatus.OFFERED]: '#0038FF',
@@ -46,24 +45,21 @@ const StatusPopup = ({
 }) => {
   const toast = useToast()
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
-  const [currentStatus, setCurrentStatus] = useState(appliedRole.status);
+  const [currentStatus, setCurrentStatus] = useState(appliedRole.status)
   const [statusInModal, setStatusInModal] = useState(appliedRole.status)
   const [isAcceptOpen, setIsAcceptOpen] = useState(false)
-  // const onOpenAccept = () => setIsAcceptOpen(true)
   const onCloseAccept = (inputStatus: ApplicationStatus) => {
     setIsAcceptOpen(false)
     updateStatus(inputStatus as ApplicationStatus)
   }
   const updateStatus = async (status: ApplicationStatus) => {
     try {
-    
       const firstToast = toast({
         duration: null,
         status: 'loading',
         title: 'Updating',
-        description: 'Waiting to update...'
-     
-      });
+        description: 'Waiting to update...',
+      })
       await mutateAsync({
         status: status,
         appliedRoleId: appliedRole.id,
@@ -73,7 +69,7 @@ const StatusPopup = ({
         appliedDepartment: appliedRole.department,
       })
       await refetch()
-      setCurrentStatus(status);
+      setCurrentStatus(status)
       toast.close(firstToast)
       toast({
         duration: 2000,
@@ -81,8 +77,6 @@ const StatusPopup = ({
         title: 'Success',
         description: 'Application status updated successfully!',
       })
-     
-
     } catch (e) {
       toast({
         description: (e as Error).message,
@@ -98,9 +92,7 @@ const StatusPopup = ({
       <PopoverTrigger>
         <IconButton
           aria-label="status"
-
           icon={<BsCircleFill fill={statusFillMap[currentStatus]} />}
-
           bg="None"
           _hover={{ background: 'None' }}
         ></IconButton>
@@ -118,10 +110,10 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setStatusInModal(ApplicationStatus.ACCEPTED as ApplicationStatus)
-               
-                }
-                }
+                  setStatusInModal(
+                    ApplicationStatus.ACCEPTED as ApplicationStatus
+                  )
+                }}
               />
               <Text>Accepted</Text>
             </ListItem>
@@ -134,10 +126,10 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setStatusInModal(ApplicationStatus.OFFERED as ApplicationStatus)
-                 
-                }
-                }
+                  setStatusInModal(
+                    ApplicationStatus.OFFERED as ApplicationStatus
+                  )
+                }}
               />
               <Text>Offered</Text>
             </ListItem>
@@ -150,10 +142,10 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setStatusInModal(ApplicationStatus.PENDING as ApplicationStatus)
-                 
-                }
-                }
+                  setStatusInModal(
+                    ApplicationStatus.PENDING as ApplicationStatus
+                  )
+                }}
               />
               <Text>Pending Review</Text>
             </ListItem>
@@ -166,10 +158,10 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setStatusInModal(ApplicationStatus.INTERVIEWED as ApplicationStatus)
-                 
-                  }
-                }
+                  setStatusInModal(
+                    ApplicationStatus.INTERVIEWED as ApplicationStatus
+                  )
+                }}
               />
               <Text>Interviewed</Text>
             </ListItem>
@@ -182,10 +174,10 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setStatusInModal(ApplicationStatus.REJECTED as ApplicationStatus)
-            
-                }
-                }
+                  setStatusInModal(
+                    ApplicationStatus.REJECTED as ApplicationStatus
+                  )
+                }}
               />
               <Text>Rejected</Text>
             </ListItem>
@@ -194,40 +186,40 @@ const StatusPopup = ({
       </PopoverContent>
 
       <Modal
-          isOpen={isAcceptOpen}
-          onClose={() => setIsAcceptOpen(false)}
-          size="xs"
-        >
-          <ModalOverlay bg="none" backdropFilter="auto" />
-          <ModalContent>
-            <ModalHeader fontSize="5xl"></ModalHeader>
-            <ModalCloseButton />
-            <ModalBody fontSize="2xl ">
-              <div className=" flex-col justify-center">
-                <div className="items-center">
-                  Confirm Status Update?
-                  <button
-                    onClick={() => {
-                      onCloseAccept(statusInModal)
-                    }}
-                    className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
-                  >
-                    Confirm
-                  </button>
-                  <button
-                    onClick={() => {
-                      setIsAcceptOpen(false)
-                    }}
-                    className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
-                  >
-                    Cancel
-                  </button>
-                </div>
+        isOpen={isAcceptOpen}
+        onClose={() => setIsAcceptOpen(false)}
+        size="xs"
+      >
+        <ModalOverlay bg="none" backdropFilter="auto" />
+        <ModalContent>
+          <ModalHeader fontSize="5xl"></ModalHeader>
+          <ModalCloseButton />
+          <ModalBody fontSize="2xl ">
+            <div className=" flex-col justify-center">
+              <div className="items-center">
+                Confirm Status Update?
+                <button
+                  onClick={() => {
+                    onCloseAccept(statusInModal)
+                  }}
+                  className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                >
+                  Confirm
+                </button>
+                <button
+                  onClick={() => {
+                    setIsAcceptOpen(false)
+                  }}
+                  className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                >
+                  Cancel
+                </button>
               </div>
-            </ModalBody>
-            <ModalFooter></ModalFooter>
-          </ModalContent>
-        </Modal>
+            </div>
+          </ModalBody>
+          <ModalFooter></ModalFooter>
+        </ModalContent>
+      </Modal>
     </Popover>
   )
 }

From b013106997723c66b3bf48792146999cbeee1cbe Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 21 Jun 2023 21:40:04 +0800
Subject: [PATCH 137/223] make UI work on small screen

---
 src/components/common/SearchBar.tsx          | 26 +-------------------
 src/components/recruitment/ApplicantGrid.tsx |  2 +-
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index e03eb8a9..087d058e 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -185,19 +185,6 @@ const SearchBar = () => {
               {role.role}
             </button>
           ))}
-
-          {/* <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('designer')}}
-          className="px-3 py-2 cursor-pointer">Designer</button>
-          <button 
-           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('designer manager')}}
-          className="px-3 py-2 cursor-pointer">Designer Manager</button>
-          <button 
-           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('technical lead')}}
-          className="px-3 py-2 cursor-pointer">Technical Lead</button>
-          <button 
-           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('software engineer')}}
-          className="px-3 py-2 cursor-pointer">Software Engineer</button> */}
         </ul>
       )
     }
@@ -360,18 +347,7 @@ const SearchBar = () => {
           </div>
         )}
       </button>
-      {/* <div className='grid grid-cols-2 flex flex-col absolute top-0 gap-x-1 gap-y-1 left-0 mt-10'>
-      {filterArray.map((value) => {
-        return (
-         <div className='w-30  rounded-full flex flex-col text-center border border-gray-200 bg-white shadow-md '>
-          {value === 'true' ? 'seen' : value === 'false' ? 'unseen' : value}
-         </div>
-        )
-      }
-        )}
-        </div> */}
-
-      <div className="absolute top-0 left-0 max-w-[250px] mt-10 flex flex-wrap">
+      <div className="absolute top-6 md:top-0 left-0 max-w-[250px] mt-10 flex flex-wrap">
         {filterArray.map((value) => {
           return (
             <div
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 13362aef..f458b9b8 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -67,7 +67,7 @@ const ApplicantGrid = () => {
   return (
     <>
       <div>
-        <div className="mb-2 mt-20 ml-20 font-bold md:mt-1 lg:mt-1 lg:text-xl">
+        <div className=" mb-2 mt-16 mb-2 ml-20 font-bold md:mt-1 lg:mt-1 lg:text-xl">
           Number of Applicants: {totalNumber}
         </div>
         <div className="my-10  mx-20 mb-10 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">

From 9ec0c0090cdad47ceee4df76115df36b885059cc Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Fri, 23 Jun 2023 13:38:12 +0800
Subject: [PATCH 138/223] solve merge conflict

---
 src/components/profile/ProfileInfo.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index e1d0211e..9075b0e3 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -25,8 +25,6 @@ const ProfileInfo = (props: ProfilePageType) => {
                 {props.batch}
               </Td>
             </Tr>
-<<<<<<< HEAD
-=======
             <Tr>
               <Td textColor="#002D70" className="font-medium">
                 YEAR
@@ -67,7 +65,7 @@ const ProfileInfo = (props: ProfilePageType) => {
                 )
               })}
             </Tr> */}
->>>>>>> director-page
+
           </Tbody>
         </Table>
       </TableContainer>

From 255c4a0cbe4d67b8cc4e09fdc088a292e0bde4b1 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Fri, 23 Jun 2023 13:39:34 +0800
Subject: [PATCH 139/223] solve a bug

---
 src/components/profile/ProfileInfo.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index 9075b0e3..beb3322a 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -1,7 +1,11 @@
 import { Box, Table, TableContainer, Tbody, Td, Tr } from '@chakra-ui/react'
 
 type ProfilePageType = {
-  batch: string | undefined
+  gender: string | null
+  batch: string | null
+  year: string | null
+  faculty: string | null
+  major: string | null
 
   // projects: Projects[]
 }

From b73df34df6cb0d335fb156e04e35e244322069b7 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Fri, 23 Jun 2023 13:41:10 +0800
Subject: [PATCH 140/223] test

---
 src/components/profile/ProfileInfo.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index 48adc98b..1d6cb136 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -6,7 +6,7 @@ type ProfilePageType = {
   year: string | null
   faculty: string | null
   major: string | null
-  // projects: Projects[]
+
 }
 
 const ProfileInfo = (props: ProfilePageType) => {

From 6c8c06c7898c8cd980e3f15af4750308b79a6a50 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Fri, 23 Jun 2023 13:43:44 +0800
Subject: [PATCH 141/223] solve bug

---
 src/components/profile/ProfileGrid.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index 8aa39b1a..260518e2 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -31,13 +31,14 @@ const ProfileGrid = ({
           dept={data.department}
           role={data.role}
           studentId={studentId}
+          session={session}
         />
       </div>
       <div className="col-span-2 w-3/4">
         <ProfileContactInfo studentId={studentId} {...data} refetch={refetch} />
       </div>
       <div className="col-span-2 row-span-2 mb-10 w-3/4">
-        <ProfileInfo batch={data.batch as string} />
+        {/* <ProfileInfo {...data} /> */}
       </div>
     </div>
   )

From ab739a7074d32e7e9e8dce3382cb17e9b33b16c3 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Fri, 23 Jun 2023 13:46:17 +0800
Subject: [PATCH 142/223] solve bug

---
 src/components/profile/ProfileCard.tsx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/profile/ProfileCard.tsx b/src/components/profile/ProfileCard.tsx
index 86f45077..5d87535a 100644
--- a/src/components/profile/ProfileCard.tsx
+++ b/src/components/profile/ProfileCard.tsx
@@ -1,5 +1,6 @@
 import { trpc } from '../../utils/trpc'
 import { Box, Button, Image, Text } from '@chakra-ui/react'
+import type { Session } from 'next-auth'
 import { useRouter } from 'next/router'
 import UploadImageBtn from './UploadImageButton'
 
@@ -10,11 +11,13 @@ const ProfileCard = ({
   dept,
   role,
   studentId,
+  session,
 }: {
   name: string | null
   dept: string | null
   role: string | null
   studentId: string
+  session: Session
 }) => {
   const router = useRouter()
   const redirectToResetPassword = () => router.push('/auth/forgetpassword')
@@ -36,16 +39,17 @@ const ProfileCard = ({
           borderRadius="full"
           boxSize="170px"
         />
-
-        <Box className="absolute bottom-0 right-0">
-          <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
-        </Box>
+        {session?.user?.id === studentId ?? (
+          <Box className="absolute bottom-0 right-0">
+            <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
+          </Box>
+        )}
       </Box>
       <Box className="flex flex-col items-center py-2">
-        <Text textColor="#FFFFFF" className="text-2xl font-medium">
+        <Text textColor="##FFFFFF" className="text-2xl font-medium">
           {name}
         </Text>
-        <Text textColor="#FFFFFF">{dept}</Text>
+        <Text textColor="##FFFFFF">{dept}</Text>
         <Text textColor="#FFFFFF">{role}</Text>
       </Box>
       <Button

From 5e10e86172c27c8875c085cfcebc6fab6ff2bd50 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Fri, 23 Jun 2023 13:52:41 +0800
Subject: [PATCH 143/223] fix bug so that yarn build can work

---
 src/pages/form/updateInfo.tsx                    | 2 +-
 src/pages/recruitment/applicants.tsx             | 2 +-
 src/pages/recruitment/index.tsx                  | 2 +-
 src/server/trpc/router/users/createSingleUser.ts | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/form/updateInfo.tsx b/src/pages/form/updateInfo.tsx
index 8125b2d3..42c6249d 100644
--- a/src/pages/form/updateInfo.tsx
+++ b/src/pages/form/updateInfo.tsx
@@ -102,7 +102,7 @@ const UpdateInfoPage: React.FC<BaseProps> = ({ session }) => {
           content="Onboarding member particulars for Atlas"
         />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar image={session.user?.image as string} isAdmin={session.isAdmin} />
 
       <Container>
         <form onSubmit={handleSubmit(formSubmit)}>
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index ecf7b745..5daf2a55 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -22,7 +22,7 @@ const ApplicantsPage: React.FC<BaseProps> = ({
           content="The applicants page for Atlas recruitment"
         />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar image={session.user?.image as string} isAdmin={session.isAdmin} />
       <Box position="relative" mt="10" mb="10">
         <Text className="text-center text-4xl font-bold">Applicants</Text>
         <SearchProvider>
diff --git a/src/pages/recruitment/index.tsx b/src/pages/recruitment/index.tsx
index 0d0ebb83..d83921fc 100644
--- a/src/pages/recruitment/index.tsx
+++ b/src/pages/recruitment/index.tsx
@@ -11,7 +11,7 @@ const RecruitmentPage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The recruitment page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar image={session.user?.image as string} isAdmin={session.isAdmin} />
       <Text className="text-center text-4xl font-bold">Recruitment</Text>
     </>
   )
diff --git a/src/server/trpc/router/users/createSingleUser.ts b/src/server/trpc/router/users/createSingleUser.ts
index 2facacd4..247171cb 100644
--- a/src/server/trpc/router/users/createSingleUser.ts
+++ b/src/server/trpc/router/users/createSingleUser.ts
@@ -34,7 +34,6 @@ export const createSingleUser = protectedProcedure
           email,
           isAdmin,
           name,
-          id,
           hashedPassword,
           role,
         },

From daba1873867e24763a4a7c0124474db26826c5d1 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Tue, 30 May 2023 22:32:09 +0800
Subject: [PATCH 144/223] add the applicants status page and the tasks page

---
 Atlas.zip                               | Bin 0 -> 3074 bytes
 public/images/Ellipse 1.svg             |   3 +
 public/images/applicants_background.svg |  15 ++
 public/images/black_logo.svg            |   9 +
 public/images/blue_dot.svg              |   3 +
 public/images/pink_dot.svg              |   3 +
 public/images/red_dot.svg               |   3 +
 public/images/tasks_background.svg      |  15 ++
 public/images/yellow_dot.svg            |   3 +
 src/components/common/TopNavbar.tsx     |   6 +
 src/pages/application_status/index.tsx  | 194 ++++++++++++++++++
 src/pages/tasks/index.tsx               | 253 ++++++++++++++++++++++++
 12 files changed, 507 insertions(+)
 create mode 100644 Atlas.zip
 create mode 100644 public/images/Ellipse 1.svg
 create mode 100644 public/images/applicants_background.svg
 create mode 100644 public/images/black_logo.svg
 create mode 100644 public/images/blue_dot.svg
 create mode 100644 public/images/pink_dot.svg
 create mode 100644 public/images/red_dot.svg
 create mode 100644 public/images/tasks_background.svg
 create mode 100644 public/images/yellow_dot.svg
 create mode 100644 src/pages/application_status/index.tsx
 create mode 100644 src/pages/tasks/index.tsx

diff --git a/Atlas.zip b/Atlas.zip
new file mode 100644
index 0000000000000000000000000000000000000000..5e7a95b030b6eff75fe1ae2cb1c7bb45fc348ca9
GIT binary patch
literal 3074
zcmZve2{csw8^_0tHG5M=$TBF(T7<H^wqh`2DO*FmdPBlAGX_KPGO~@eG&Ez$WSeXu
z#E=w5b|GtI5@{-mnh^b^^RGYWfA6{H+<VXY{LXXE=RD8zwY36q?g9V+yZ|*k-LdYB
zP~P>;uk6j|=U>N*7XnZiHEf`lc0z?vq{bfephwI%bpt#;)aWDPe$L2!6V^o!EdAoN
z^bMy-EuSVRSTcTJ#0QbYmUqrWyeG%|&En=9B3pePMW2Ck7;pSdnR=lYXBeD#KP)px
zkt|+F6zM{Kek3quH)y6{FFj7Z?cV=b_EUv+(OpAay?}wikH(iD%7kFK7A9ijOdi{9
z#mdSZD|*fW0K5hP00O^@Rn`1iuA4)%|G0)gBl|G#f`0TKMVQ1pAf<vD^KtB{KNne%
zqw;|>p+3h5#+QZT_I(|PfKJKd)>msH@a%wzB+x-2knb?P`>U>y3HM|mYh`?CO;<$Z
zf$s8~bM*BvDWTq&FMx$6cFZt(L^@ghoMSOQ8!dKqqsoN~>N@)AY4^~V&ev#u#Op<Z
ztY$%o%r1NT*eE+?g!12sq9*1qG9&bs?|bCi^WPt%XdXq#wa2;IR^3~tIba`Cqs{lk
z=f~<>zJZrU-8kG5+(C=9RI#M;N@zquNlk(Gb~~2cDamq$iX{Qbph4f(f3h&`Ssh&#
zEh&kE54$3BxyLWS?TQ=V`Pl)QqCVHj@XGj7pR+1=M5|-1YwpfRDv4XtK?R)_d=9B3
z)tvW5dkzRaPiyvCi~fjE%C8{K!~JTP^JZ;NxcY#-6jU75CGVmks0;JAxv-^A*o~c0
zig5<QCXt6$K6a6>vhn-BFY+hxXEc;32A734+YFi*9(IrPI;A%99#eT@-dHE3`32`(
z2tj{VFkphrLZTWNSJlL<Avi;X^b-2)ePqi@T1Z!6uxR0%bMhO-(;)4u?IEXx*G<-!
ztyXBW<x?nB%&nL8fouL{8^G=EKckvmdp6y_*zW$wFZTwh@xKIKE**|#!Ivy1_m{^W
zG23?}?{c(17jujodBP$=$*5_N@yv$DID~P~(C|jk+C~LodJ!`kBv;VR@pb&EfA~Dm
ziEj}-BE+8SRTB|OKxZU{%Oo+>GJ6XB{_Qnl41_|yrgyT~-JasyQk=agx*)i}Z6JnD
z86Q5EZqN`g&0`EzF`tPORKD03Nki}zA1Z=k)kNeGn#vi1R3m6cSDqIs?%Cez<2Mrz
z9Dr!e5yO>V6g3X&g5@P_XkK-1F|LigTo6qrlZm5}iKa<-(#bfpB;wfv5UXqG)Knd(
zGu8(^o;e@Q*qs({?h;yDC3zuDDz{)X0g|F!rw5h9niXHm(_iI)J4fNPK87I;F6`dR
zP&CC{e}_9s>IbJqlBwyaV;K3m{P!qyx9dyyk9P<A!NFk6^`h)2x5*8bOqU_gGi~JT
z0$TmO8DFWKx<j7I$^0~wk@{Sp{ke*=J1Fha=KPtx$zhJ4Jpu)5JWEC-huTYtsw3nE
z51GGS*YrPdmP9@su!i_kf{4`@oi*KFR`2(zz%e99#dSE%^bs5yf*sxPYYErBn)?|t
zbSlK%zppn?xarnE!op(5!us3zgMyYI+r3}@>~>^e)BEIh???aZeL~}>cV3)Ya^54N
zuIYrFX}#xLN7?ixj$!&8P3HIS_LcdUkB{!jX=h8*#%tLi6~-K1LLgKOG_VnzG20xg
z3tC{TW5QR&1vreKnHq%YWy1-2=XydxGEIoN+Ggve@2h^bXGvTTV!BaGmPkLmld>g!
ziL;lmV*CmkADR|51N!!_;Y@#MSC8?ccxl+}e9xPvlvZF2=d-(sJxS0SkDHUHkHsB2
zvb(ZYtYj#h>q^4iZe*&a2gWcGdl_+{?X9@JUb|SMQwbYiS|1qkIM*ZVl;U0Vpu3O*
zO;XXZ<Y|gYUl^>)!%FIwR)qJEb)YqV?@1-O=uEk_Gowy#GN{zsN;LNb>R5(}D9@Pe
z9`Nb20E1npQ>3cX9b%porN!5H04=#mX}h#`!8~3ubCWwFPSw;YfevPvIl%Wj<prL9
zPE;F;&P=thNya_tI9XDSfJze*g(bb;2MuGr^UEt(%_B-*X4)Py%x!p3_Mw$4eHXN8
z5tQqyqxv7wpTeJR%127N5n0YUzLNOP>RWF$-G-{q_|(<-7}PkS{mjpnsa}CVo;RKR
z&X@+DHpE@KQ@BbBt6_g@r7y0#cfn<l_~0O&aE|Tr%UKW4_ioCc-!5P4m;4I<E%|$+
zPNWx@#odTUM%OF-YI=;G%#}ud3HhG6^hz7If#ze`E8p5r!D`D<JQ>M|frl()z#{@W
zTtDF^G*xIaX>En|=Gw5R$e^xDQ%-W>K-r0NJ!?Xf;W<6!bpOnPboFaSy+?ZzHvLb6
z?aDvDeA)e>v;0z2p&OeZ3&~TMZ}!SlO5p?Hr9E190~KQIfCOw9ALHN2`C-fGSAAal
z8s@Iw1NO5hV$_5GkT_R?-MCczE2db%=lnFFT#2@klie(5DzFH)y!$~!Wyf)W(W9|9
zs|m4X3LKX1G6K&!Q?9zwRWl;n?1lJsMBB&|P(%mKOakMQb;&PI2!>3o@D_&Q%=S53
zv8=gI**6-WAHv~yec)Eb#~FFL+8W*%T#(>u=HXFHU5IkVwdrOwZ8m`5d@q{c?vRfB
z98ybXrdo|V_l7jd1`HF8`()>K=SuyQGvOlYM=niAN<zG(RBU3*KX{(ePMH>)m_@f9
zSCJoAQ1vGGJExyVo=s`>jfiGp5-$^LGxjG$&%f(|r?tLs(e84>2HLB7&ON++^ZSDA
z25TBL6kZg9NFL8$z2vk6#(v9g!Zl7dhVU%-@0|8Na<hW{o8o7-i`U+{>5(U)%0D-K
zvARLPuymkgpNde5Vynd9`ggme`4T!OJ`BMORlu>oJ|bNDfstNQE3nv~Fuv}u&vvW+
zv9R`G`O4~BI)Fn$@B^!SeY!7*F@PR#W-L7YRJzc%wDN`JdDI3BPbf5^3tksF7KjfD
z$Ff(K^q*KwU8}XaFE+bu#${^H>#SQ$l2a^!UXj#@*8sOzR53}mx|br0xTyX2@Ul!7
zc$CXwTfQpCLykTBGWMpWI;2Ki&dhhwoZAIWf5I)#XSxdrvq-JP7gY@^NI|^^U0|Z}
zV1g(1md2$X(*k`fh-nHD`5->-cCH1W=5?MaE#3QuEz!+kKyk!gG1^vEll$3`mOHBA
zc?lh*T%=AaZ=0_<b)C$gre($y<HtO<_BAX@JJ5LkM2Djt7}hU`@vHj_6rV*<vZTDA
z@6GQrH@{z`-+f^=9!AbNOcCu)CVDPbbp|cc%bguH9@1_ht;-+2acQ+0xrKB^x4t+C
z2^G#-mM$L|TX2<0#2OxF_?47>Nj)(qS;4$wGe?=pR3D39k?4U8>P<~)XOhAtKjp+A
z>{m~J(bQL0e;3o#sXpBd3uhhsx;O@EXj<X7wc-Ho*-D@PKa*}Iz5luXB-EYU&Up9-
zD&2hj#r+D4JIS5l;txp!{wBAg#!hnQdiq1=a{eZ_meo#j=WP2!W^?~0w<g_Aa%Xe=
eA=7z(lUuD~YsIyB768D#dAn}5(~X}IAMhWqhdv7c

literal 0
HcmV?d00001

diff --git a/public/images/Ellipse 1.svg b/public/images/Ellipse 1.svg
new file mode 100644
index 00000000..8b4bb861
--- /dev/null
+++ b/public/images/Ellipse 1.svg	
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#46FFDE"/>
+</svg>
diff --git a/public/images/applicants_background.svg b/public/images/applicants_background.svg
new file mode 100644
index 00000000..be2d9c8a
--- /dev/null
+++ b/public/images/applicants_background.svg
@@ -0,0 +1,15 @@
+<svg width="1512" height="982" viewBox="0 0 1512 982" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_2)">
+<path d="M1512 0H0V982H1512V0Z" fill="#DEF4FF"/>
+<path d="M0 731.59L28.056 720.461C55.944 709.168 112.056 686.909 168 697.711C223.944 708.677 280.056 752.867 336 761.541C391.944 770.379 448.056 743.538 504 742.228C559.944 740.919 616.056 764.814 672 777.908C727.944 791.001 784.056 793.292 840 786.909C895.944 780.69 952.056 765.96 1008 744.683C1063.94 723.407 1120.06 695.583 1176 686.909C1231.94 678.071 1288.06 688.546 1344 690.673C1399.94 692.801 1456.06 686.909 1483.94 683.799L1512 680.853V983.637H1483.94C1456.06 983.637 1399.94 983.637 1344 983.637C1288.06 983.637 1231.94 983.637 1176 983.637C1120.06 983.637 1063.94 983.637 1008 983.637C952.056 983.637 895.944 983.637 840 983.637C784.056 983.637 727.944 983.637 672 983.637C616.056 983.637 559.944 983.637 504 983.637C448.056 983.637 391.944 983.637 336 983.637C280.056 983.637 223.944 983.637 168 983.637C112.056 983.637 55.944 983.637 28.056 983.637H0V731.59Z" fill="#97AEFF"/>
+<path d="M0 739.773L28.056 736.5C55.944 733.227 112.056 726.68 168 722.588C223.944 718.497 280.056 716.86 336 713.914C391.944 710.804 448.056 706.549 504 701.803C559.944 697.22 616.056 692.31 672 709.495C727.944 726.68 784.056 765.96 840 768.742C895.944 771.361 952.056 737.646 1008 726.189C1063.94 714.732 1120.06 725.534 1176 745.993C1231.94 766.451 1288.06 796.566 1344 788.546C1399.94 780.69 1456.06 734.863 1483.94 711.95L1512 689.037V983.637H1483.94C1456.06 983.637 1399.94 983.637 1344 983.637C1288.06 983.637 1231.94 983.637 1176 983.637C1120.06 983.637 1063.94 983.637 1008 983.637C952.056 983.637 895.944 983.637 840 983.637C784.056 983.637 727.944 983.637 672 983.637C616.056 983.637 559.944 983.637 504 983.637C448.056 983.637 391.944 983.637 336 983.637C280.056 983.637 223.944 983.637 168 983.637C112.056 983.637 55.944 983.637 28.056 983.637H0V739.773Z" fill="#758DD8"/>
+<path d="M0 805.24L28.056 814.569C55.944 823.734 112.056 842.392 168 843.374C223.944 844.52 280.056 828.153 336 831.918C391.944 835.846 448.056 859.741 504 851.558C559.944 843.374 616.056 803.112 672 782.818C727.944 762.687 784.056 762.687 840 760.559C895.944 758.268 952.056 754.012 1008 769.724C1063.94 785.6 1120.06 821.607 1176 832.736C1231.94 844.029 1288.06 830.281 1344 815.551C1399.94 800.821 1456.06 785.109 1483.94 777.089L1512 769.233V983.637H1483.94C1456.06 983.637 1399.94 983.637 1344 983.637C1288.06 983.637 1231.94 983.637 1176 983.637C1120.06 983.637 1063.94 983.637 1008 983.637C952.056 983.637 895.944 983.637 840 983.637C784.056 983.637 727.944 983.637 672 983.637C616.056 983.637 559.944 983.637 504 983.637C448.056 983.637 391.944 983.637 336 983.637C280.056 983.637 223.944 983.637 168 983.637C112.056 983.637 55.944 983.637 28.056 983.637H0V805.24Z" fill="#546DB2"/>
+<path d="M0 905.077L28.056 896.402C55.944 887.564 112.056 870.216 168 857.286C223.944 844.52 280.056 836.337 336 828.153C391.944 819.97 448.056 811.787 504 824.553C559.944 837.482 616.056 871.198 672 883.473C727.944 895.748 784.056 886.582 840 875.617C895.944 864.651 952.056 852.212 1008 855.977C1063.94 859.741 1120.06 880.036 1176 880.036C1231.94 880.036 1288.06 859.741 1344 845.829C1399.94 831.918 1456.06 824.389 1483.94 820.461L1512 816.697V983.637H1483.94C1456.06 983.637 1399.94 983.637 1344 983.637C1288.06 983.637 1231.94 983.637 1176 983.637C1120.06 983.637 1063.94 983.637 1008 983.637C952.056 983.637 895.944 983.637 840 983.637C784.056 983.637 727.944 983.637 672 983.637C616.056 983.637 559.944 983.637 504 983.637C448.056 983.637 391.944 983.637 336 983.637C280.056 983.637 223.944 983.637 168 983.637C112.056 983.637 55.944 983.637 28.056 983.637H0V905.077Z" fill="#334F8D"/>
+<path d="M0 891.983L28.056 890.838C55.944 889.856 112.056 887.564 168 900.167C223.944 912.769 280.056 939.938 336 953.358C391.944 966.779 448.056 966.124 504 952.213C559.944 938.301 616.056 911.132 672 905.568C727.944 900.167 784.056 916.533 840 926.026C895.944 935.682 952.056 938.301 1008 943.047C1063.94 947.63 1120.06 954.177 1176 957.45C1231.94 960.723 1288.06 960.723 1344 955.486C1399.94 950.412 1456.06 939.938 1483.94 934.864L1512 929.627V983.637H1483.94C1456.06 983.637 1399.94 983.637 1344 983.637C1288.06 983.637 1231.94 983.637 1176 983.637C1120.06 983.637 1063.94 983.637 1008 983.637C952.056 983.637 895.944 983.637 840 983.637C784.056 983.637 727.944 983.637 672 983.637C616.056 983.637 559.944 983.637 504 983.637C448.056 983.637 391.944 983.637 336 983.637C280.056 983.637 223.944 983.637 168 983.637C112.056 983.637 55.944 983.637 28.056 983.637H0V891.983Z" fill="#0B336A"/>
+</g>
+<defs>
+<clipPath id="clip0_1_2">
+<rect width="1512" height="982" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/images/black_logo.svg b/public/images/black_logo.svg
new file mode 100644
index 00000000..6d6c5bbc
--- /dev/null
+++ b/public/images/black_logo.svg
@@ -0,0 +1,9 @@
+<svg width="255" height="113" viewBox="0 0 255 113" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect width="255" height="113" fill="url(#pattern0)"/>
+<defs>
+<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_1493_1048" transform="matrix(0.00331126 0 0 0.00747231 0 -0.00811698)"/>
+</pattern>
+<image id="image0_1493_1048" width="302" height="136" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAS4AAACICAYAAABZcgYEAAAAAXNSR0IArs4c6QAAFRtJREFUeF7tnf1rFMm6x3vyZhJfEs2bujkwhEElboaERkN278Jwf1iQQxb9oWFdXwjci39H/o7l3Ivo7nFhfvCwchD2p4G9bojSRCZrrsoggZvrOeo9Z188V9eYxEO3053qnqquqp5+7+/Awpqpfuqpz/PUd6qrq6sKCj4gAAIgkDIChZT5C3dBAARAQIFwIQlAAARSRwDClbqQwWEQAAEIF3IABEAgdQQgXKkLGRwGARCAcCEHQAAEUkcAwpW6kMFhEAABCBdyAARAIHUEIFypCxkcBgEQgHAhB0AABFJHAMKVupDBYRAAAQgXcgAEQCB1BCBcqQsZHAYBEIBwIQdAAARSRwDClbqQwWEQAAEIF3IABEAgdQQgXKkLGRwGARCAcCEHQAAEUkcAwpW6kMFhEAABCBdyAARAIHUEIFypCxkcBgEQgHAhB0AABFJHAMKVupDBYRAAAQgXcgAEQCB1BCBcqQsZHAYBEIBwIQdAAARSRwDClbqQwWEQAAEIF3IABEAgdQQgXKkLGRwGARCAcCEHQAAEGAQWOxRlcSeJeCBcSYwKfAKBiAmcOrVw+N69q3+hVJtIjUikUxHHDNWBQN4JvPMAkEiNSKRTec8itB8EIibAFq5KpVup1bYi9odbHYSLiwgFQCDzBLxGXB2Konh9HwscCFcs2FEpCCSGAFOUSqUzA43G7V8T4ynhCIQriVGBTyAQDQFStBI5smJhgHBFkyCoBQSSRoAQrcXOpC57gHAlLW3gDwjER4AcaaVy8JJKp+OLN2oGgfQSUNXzw7p+40UWpoogXOnNw1g8n61cGF+uff0/RuXqJxeP6t9/RVu0GItvqNSTgD3KGp/T+jeWqq/TzAvCleboRe876wkU8ij6WMjUmPpbQ3djkXAy4c93WeZjc4y8Ep0YmRMtgzaEK9E5lyjneIsQkUsJClexuNC7vn6VvB3MVHwy1ZgE5U0WXYFwpSSqMx9/fnTlzjf/m4VJeBZyCFdKkjFmN6miparnR5xPqbQuRalux+xr3qu3YzU19cWh1dU//pRFIBCuLEY12DaJzJGIlAnWK1hzEFBVtVvX9c3dP6ZvUalMSCFcMrTyV1ZGkNyjMuRWRPkyNfXFwdXVP/49y7eGeKoYUTKluRpVne/X9Vv/L9sRSqUzexqN27/JXpdmVgnw3f7BUNWLR3U9H+vq8KuYgMxLmAt2R5hQtcEnevUXH/7ZNk6cPjf88O7Nv/mwgUv4BAjRutKj61++5V+SjRIQrmzEMahWyNwaetY5PX128P79P5ETw8i1oKL03k5gsQrWrWis5TGZHHMxlUqlu7a7wyPvkf9uVN7vDNnyC6eq5i8fMUnqDGRp9sJAY/nrRO1xVKlUumrOtgSZF7nuYCF149wzDTJBQ4pRKGa9JpLt7wxRM2onO3X5o0tj9R+uPzf+flSd73/aOhfk2i7kQUFRqvbWt+XypbF6/f31SfhENDJyMCV+KJKAIDU+TKjawBO9+jPhcF77b25XztNGVlYS0H7NvH7h3N+Z/56c1PasrVXJkZf59+bap/9LSG+J8kngbl0J3cc8ITFhueH6QUzmsWFRMcylYnOOYgpEuIwAfjh7/vCPyzeeNYNp2i0WF/rW16+ST96iirW7niAm4aV8j2h0J+VTSgrn/tbQHadcCtfs7Pmx5eUbf1XV+b2ux/4sPtIjLlqHKFYW+tZr8YpW65KFWFa72zyzsMVKyOIH0aIAzqVwzc1d/mBp6drG8Y8/O/DozrcvPU4x8bp9tHDyRmi0vI6FuyXYhkPHj3924NEjs+1xfWxup04tHLl37+pf43IkwfVCtBjBiaUDJSBRzISYmdFGV1aq1o6QovNe7kMF7Os0TeuqVu2JeJPt5KS2b22t6haIOLhHOZ8lGuIk+iTqe2jlyh9dGq3/cN2aYjDqiSNfQmtfEIbzCsTsMOQTPsr8C5kwdgejLGewv5ub04aWlqrmYsvxca1/Y8Oxy2Scv5523ZOT2v61teo/gkieYGxoneRTV3TS3fVZ09NnD96//yfyKWIwyDNgJXfCNT6n9W0sVV9ZsXO9Qc8aAdBGYy3zYfRJf3MOyX0ScJTc4xRMmS5i+6mqao+u67lZBW5CqlS6HOsC8eTVM3ei7EAySRxS2cUORVls2XbFYxGqzefD2fNjPy7fYM3DmOVOzmmHHjRHXB4NiJJ5WkTLwpXLW8fSjDbSWKmSa/uizJGQ+lq4ZgEoXL6xWFfVi0d0/aunRuWuJRmx+CNTaQ5f1M6lWMvkBK0shKtdgsm73u4IrpFk8jz19mh3XrF0prfRuP0mbQ0Q8BeiJQAJwuUTUsouszpD6n+UrHMAydesUhYLnrtmrHbfsjCnMnZ4F+H7HD5mpbzvFVgelMvnxur1m88nJ7WetbWq9AiBfOLnnlObrfz775ZrfzDPM5RdgyXjT6l0ZqDRuP2rsSdXb+/I4J07/0nuXR4YK0VR7GUlxemzg+vOnSQ86zFYGAUsHlZhkpH1t3aezKmfXDyif//+lpv2IRfPer+ovtihqo0x6/ZdBCJt22V3Tsz96+XxnZ2egpuDZV82T0T8SkqZ1P8qS4IUeTooaTLw4gVyjoplXfLJm1S7m0s57Cevgbdw1yBtgW/g1amqNqjL7SsmxYvmcHOXEOvJqC97rqUrvmz4aHvg/MMwmCvhkhl5tAP75Elt6MGD9+u5ZD4zH3/+wcqdb6xfeG6iFqfPHlwXW+fDtUX62XyfMoqTjiMRrmbbRHKdyoky+uHyLBYrfevrNfOd1BOnzw09vHvTz4v1pM/G//u5jRRpt0yaJqJsJhslSZaVhBw29KUVHp2kpR7RyfO5uX87tLT0H15CKBNHbnvL5U/31uvftSxSpbxXyLXV5CFazgqdbHky5H6v9XMdU8Aou4ME4aNtQ1W1Ad25xY31nUwuSHaV5BTPRSM5uP0kLC8JaVxb6jmqzu99qt8SvSVjdpLSjDba2H11SSS7HLbK5Uv76vXr9h7zx49/tv/Ro28dmx0ytuORYUcry8o/Gbu09srUZVzfTn3Ua91MXU62U59panp6YfD+/au0o8dy0adz0cikCpfk6zeetyfWpLqIalE6qiMPpqZ+f3B19c/kqTGGWSExlhlxerze03bH5rWR4BRGXQrnTENGneJHis3MaCMrzkWrGHEJJn9WivlNXKMjW9e6bQh18rHyp/ue1b8jT9PxYsqdV5F4z4/nr+P706cvD9+9e412qyrLjldvELeKLBsyozupH3TarbX1hJkRUBY39wv8zHyAcGVFfvy3Q6bzEWWNbZ1r1juIIh2ypZ4gR1y7zRf61eb5y/ver8CEYZe0SQqOSF0ysedlmMztadvCdfr05aG7d6/RJvylRJfXqKR+n4tGBnirGGgnkVxn467bawTGiyuvU/O+9yVc5fKl0Xqd3K6FKbIygsKKiXvuSmgU7HGr65lGjBGQzCiPdTtOrXfqX744uPpfjkNgcauYVJUNyS+hTkLZV8tOylLpzIFG4zZ5/qBQJ2lTuNwd08YjMFnPEyb7+7m5y+NLS9dYi1CF2LniZl/T3IGW9nBCyC5lmYGbu2nHtczEU3QlY+JOSR5XjuALjZZNGx4v/fN+tELqRtGazUUjAxpxiSYlq7qWztjGhLrXLZFZP2eNF68tXqMYsn1CAsMSrgAm53nt8Ao9w3dx8XAbP6aeH36s3zA3pvQ3xyVVtx/20apLiLVBuDiPwicmtIEnTxxHQvkdkrck2sSENvjkifBJ0VQxoYz27HSZmvr9odXVP9MembfT4dsVLpF0FumUMnNKtDpF6hDx1U8Zr9t8P/bIa3LRp3PRSJ8jLl4CybJrSVaJle+GL6JzOQ6/T5w+N/zw7k33E8G0CleQMYFw8Wgm+HvZzpfgpvh2ze+vnyy7MIXLLWwOGJR5GwhXe4tOfSdb80K/OSdSr2xeithMXJlcNNLfiGuxU1FvdSr6xA5l62XDpCy7sIXLU7wIfw2/3e+8ybbFQhrWqEXEbhZvFWXiIMIocYITlEMyoIKqM2l2RBOg3VFKFMLFES/7DMV225IE4aK1VSafReMeRr4GUXcQNsJoWyQ2ZQIdiUMxVCKYAC0vVcuyi0q4REZemRCuqakvDq6uOtYyOWJyVJ3vf6rfIt9M4D6NVRSpJ3vUdFVVtVvX57c9NgUUzDnP3hCEjRi6WzBVyna+YGpNlhWZBPCaIOe1KjLhomxqx/PNbx7IsOP5QH4vY1fmoQVXuEqlCwONxteOF8xlHCcfojS3N3K/8+n1wyIcB7zyIxmVDBYPqpPw0EQmXIQjopPAwh3G1UgZdjw+kQpXuXxpb71+nXW+pC8evBGgQFyE67W2taZAFbYhE5Cklc1FIznQw+p87mpb6gliHZdX2yQ2TvSbB2Gxk7C72FEqLXczDtPg3RJL1CPUdXn1WUbarhfvKgrFI9OF2k4iQTot9QS0ct6zesqZfbTyKRYuevMpr2gZBR3tZN5u+TiMlfEjweLads7hXUXBXpfhYm0nkSCblnrGT2pDGw+qtDkQmslA59dcFSRIuKR3lmXhp8WV1k5q/CX39KfNW3kxbTvnMMcl2OsyXKztJBJk01LPiRPnhh8+bFnVzhMt63tZsfGa75K1Fdgtj7ux75/I6ZsMplw/j6nzw4/1W+b7gpRPWCMg0VvEILlFlbeC6R1tMW4iROtOLLVFlQAt9Xg8dSJBBCk4Qbc1aHtKsbjQu75+lXVQBzNfx8e1vo2NKnMbbMbW0yZnr7lAgdt5BwPB7biD4BaEjVg6XBCV5k24RJ+ysdiK8mqjHq3rxImtwYcPpU+F4ftWqXQptZp1ZBbZRu61smcfSox2aLdZQeS2w8aHs+cP/7h84xnHcBtx8zzv0pddcofcmY8/P7py5xvpMy5FD2QJHHjIBrkJG3L9UZv3lUCEk6K82qjH3FmVJi48VkK+MXa74F576pR2+N696l94Tnh872fOp43qnJcyXjZn2fcTv8Dbd0w9P/JYv2HtcurHJ2VmRhtdkTtIJTDmYRriJmyYlcdh27ilOHBA6fy577ed7bdvCp3de971/O3lTn//yM7o6IudWm3kXaXyovD8+UjH5uY/TD6NxuxbuaPRFzuKxVrP5tB+Yw9x89P/y9b2wMDvdvbvf2wm4MuXxwrPnv3UZfx/V9cL829DQy+3dV1/qyha5/DxN/0H3u7p6O1VthVF2VxbO7nl8qGgqle6dMNerWaUkUxsrVNRTr6Ta5fWWSy+6O7q6nu3tfW6sLU1UjB8N/7d07PvXV/fwXdG+wyGTduGT1y/jHmt168n7Fy0uFs2X7/+qfDq1YsOg6cRs6GtgcL29htH7v6857edvl83t4tFZavmiwczG5n+C94WNg2/zwkjz5qxbGFjLBz+77/37Nn/qrNza+v1pnUu465nix1j5R/6jHZa+Wrk0S5zo6QR0wdNNlUjLzL5yZ1wZTKKaBQI5IwAhKu9gJu/xlmdR2gPDa4GgfAIQLh8sD15Ujv04EGV3JwPHH1wxCUg4JcAOpw8Odk1O/I14IqEEzAXybr3NEu4z9lyD8IlF09StMBOjl0kpYvFSu/6eo21DszwgYybzFoo7kOGSBooV4nwAbNyZuMvjc4nHgOIljirWEoyjpBjjZDtvxvrpfa/6txqNG7/Zjk+oWqDT3T7IBOXDXNDRusw4OYltL/ZIum43jgIuKvrl3f1+nes3Slk+Rn92PjPHgWWSmd6GS+ey9pOZHkIl1hYIFpinOIuZcdpclLbs7ZWtV4dcsfP/jcpUO59zJq7d/zsahRrxFY4dWrh8L17V8m1blZZmnhSR3DEa2BMn4vFhT7X2wUF1zY3me/XmW9gAD0JohUAxChMzM1d/mBp6doGWRchYOQTYHKBr7sPMG8Jj6nzI4/1W+5j763yhh3u6K7pG62s5TZN7NzlRa6PAnlsdUC4GOjJXzCv99xiixwqZhHwmosqzHyijax8X31OXOzoA+XypdF6/Trj1SB7z377cmOUZixWNkZ3qnrxiK5/9ZRi29Mnq3xp9sKBxrK9+2rLD2a5/Oneev07citqmt1c9OlcNNJHH7cTAmu0fNCL+xJN61Sq7jkoplOOPuBxtL1hwLO/SNwqks6wbHJH+qo636+z99SPOwqh1g/hasXLTZhQIwLjvgmon1w8on//1VPK+3leIx73kzdmWdeEveWnfatIET3ZOS7m/JkHlFzmK4SrmRHHj3+2/9Gjb8lDEsDGt4TEdqHdicmnauTOFuPjWj9l+xsz1rSFxZRdGey8UNUr3br+pfUAoFD+6NJo/QfHbSZTuIqVhd712lXjKSZLeEQFSbRcbEEJo2J0zvdUWZOqYTCHzfAItIyWmpPzb7zmnUoz2mj/9i+vyOUJrr3SXHbNI8wcLzAXi5U+9/qx0uyFga1n3Zse+4u5SZj90Ro5Wl8ydrYozMxowysrjvk67u1seOijtQzhIkSr+ZjZXssTbShQW7sEKKfsUIWB+CPrtrClX7C2Sp6ePnvw/v3pX91CJtsW6/aWMvI3TamqNqjvritTTpy+PPTw7jX3E05FVa/s1fUvmRsqyvqV1PJ5F65cDrOTmozwCwRECeRSuBgrrEWZoRwIgEDMBHInXOQixXL50r56/Tq5LibmcKB6EAABEQJ5Ey771lBVr/To+pd+tkgW4YoyIAACIRLIk3BhPivERIJpEIiSQF6EC6IVZVahLhAImUDGhcs4EMLx6kfG2xtytsA8CCSEQGY7Mvn6RVaPaEpIDsENEIicQAaFy9xWl1zVnME2Rp4nqBAEEkUgY50aopWo7IIzIBASgcwIF+WVjMy0LaTYwywIpJZAJjo3ZfO3TLQrtVkFx0EgZAKp6+CcF2lT156Q4wvzIJBJAqnq6JR3DMmgpKotmcwmNAoEIiKQts7O3J0S7x1GlDGoBgQSQCBVwuXeYI3kl/Vz5BKQK3ABBBJDIFXC1aQmvPlbYijDERAAgUAJpFG4FKVS6VJqtbfl8rmxev0medRUoHBgDARAIJkE0ilcyWQJr0AABCIiAOGKCDSqAQEQCI4AhCs4lrAEAiAQEQEIV0SgUQ0IgEBwBCBcwbGEJRAAgYgIQLgiAo1qQAAEgiMA4QqOJSyBAAhERADCFRFoVAMCIBAcAQhXcCxhCQRAICICEK6IQKMaEACB4AhAuIJjCUsgAAIREYBwRQQa1YAACARHAMIVHEtYAgEQiIjAPwH2+C/yJXnZ9gAAAABJRU5ErkJggg=="/>
+</defs>
+</svg>
diff --git a/public/images/blue_dot.svg b/public/images/blue_dot.svg
new file mode 100644
index 00000000..dd1de551
--- /dev/null
+++ b/public/images/blue_dot.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#0038FF"/>
+</svg>
diff --git a/public/images/pink_dot.svg b/public/images/pink_dot.svg
new file mode 100644
index 00000000..9ba1dc5e
--- /dev/null
+++ b/public/images/pink_dot.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#CE44FF"/>
+</svg>
diff --git a/public/images/red_dot.svg b/public/images/red_dot.svg
new file mode 100644
index 00000000..0153e4a4
--- /dev/null
+++ b/public/images/red_dot.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#FF0000"/>
+</svg>
diff --git a/public/images/tasks_background.svg b/public/images/tasks_background.svg
new file mode 100644
index 00000000..3d9e32b5
--- /dev/null
+++ b/public/images/tasks_background.svg
@@ -0,0 +1,15 @@
+<svg width="1280" height="832" viewBox="0 0 1280 832" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3_2)">
+<path d="M1280 0H0V832H1280V0Z" fill="#0A0950"/>
+<path d="M0 341.12L26.7378 338.347C53.6178 335.573 107.093 330.027 160.427 328.363C213.76 326.837 266.951 329.056 320.284 327.947C373.618 326.837 427.093 322.123 480.427 329.056C533.76 335.989 586.951 354.571 640.284 357.76C693.618 360.949 747.093 349.024 800.427 358.176C853.76 367.467 906.951 397.973 960.284 401.717C1013.62 405.323 1067.09 382.304 1120.43 366.08C1173.76 349.856 1226.95 340.704 1253.4 335.989L1280 331.413V833.387H1253.4C1226.95 833.387 1173.76 833.387 1120.43 833.387C1067.09 833.387 1013.62 833.387 960.284 833.387C906.951 833.387 853.76 833.387 800.427 833.387C747.093 833.387 693.618 833.387 640.284 833.387C586.951 833.387 533.76 833.387 480.427 833.387C427.093 833.387 373.618 833.387 320.284 833.387C266.951 833.387 213.76 833.387 160.427 833.387C107.093 833.387 53.6178 833.387 26.7378 833.387H0V341.12Z" fill="#3120A3"/>
+<path d="M0 520L26.7378 519.584C53.6178 519.029 107.093 518.197 160.427 508.907C213.76 499.616 266.951 482.144 320.284 471.189C373.618 460.373 427.093 456.213 480.427 451.637C533.76 446.923 586.951 441.931 640.284 437.909C693.618 434.027 747.093 431.253 800.427 428.757C853.76 426.123 906.951 423.904 960.284 425.429C1013.62 427.093 1067.09 432.64 1120.43 441.237C1173.76 449.696 1226.95 461.344 1253.4 467.029L1280 472.853V833.387H1253.4C1226.95 833.387 1173.76 833.387 1120.43 833.387C1067.09 833.387 1013.62 833.387 960.284 833.387C906.951 833.387 853.76 833.387 800.427 833.387C747.093 833.387 693.618 833.387 640.284 833.387C586.951 833.387 533.76 833.387 480.427 833.387C427.093 833.387 373.618 833.387 320.284 833.387C266.951 833.387 213.76 833.387 160.427 833.387C107.093 833.387 53.6178 833.387 26.7378 833.387H0V520Z" fill="#4A28B2"/>
+<path d="M0 597.653L26.7378 591.829C53.6178 586.144 107.093 574.496 160.427 565.483C213.76 556.469 266.951 550.091 320.284 543.296C373.618 536.64 427.093 529.707 480.427 533.589C533.76 537.611 586.951 552.309 640.284 566.869C693.618 581.429 747.093 595.851 800.427 600.843C853.76 605.973 906.951 601.813 960.284 602.091C1013.62 602.229 1067.09 606.944 1120.43 592.384C1173.76 577.824 1226.95 543.989 1253.4 527.211L1280 510.293V833.387H1253.4C1226.95 833.387 1173.76 833.387 1120.43 833.387C1067.09 833.387 1013.62 833.387 960.284 833.387C906.951 833.387 853.76 833.387 800.427 833.387C747.093 833.387 693.618 833.387 640.284 833.387C586.951 833.387 533.76 833.387 480.427 833.387C427.093 833.387 373.618 833.387 320.284 833.387C266.951 833.387 213.76 833.387 160.427 833.387C107.093 833.387 53.6178 833.387 26.7378 833.387H0V597.653Z" fill="#6131C1"/>
+<path d="M0 675.307L26.7378 664.213C53.6178 653.12 107.093 630.933 160.427 631.904C213.76 632.736 266.951 656.864 320.284 666.571C373.618 676.277 427.093 671.563 480.427 663.52C533.76 655.477 586.951 643.829 640.284 636.48C693.618 629.131 747.093 625.803 800.427 623.584C853.76 621.227 906.951 619.84 960.284 626.496C1013.62 633.291 1067.09 647.989 1120.43 650.069C1173.76 652.149 1226.95 641.611 1253.4 636.203L1280 630.933V833.387H1253.4C1226.95 833.387 1173.76 833.387 1120.43 833.387C1067.09 833.387 1013.62 833.387 960.284 833.387C906.951 833.387 853.76 833.387 800.427 833.387C747.093 833.387 693.618 833.387 640.284 833.387C586.951 833.387 533.76 833.387 480.427 833.387C427.093 833.387 373.618 833.387 320.284 833.387C266.951 833.387 213.76 833.387 160.427 833.387C107.093 833.387 53.6178 833.387 26.7378 833.387H0V675.307Z" fill="#773AD0"/>
+<path d="M0 766.827L26.7378 767.243C53.6178 767.797 107.093 768.629 160.427 762.944C213.76 757.12 266.951 744.64 320.284 732.576C373.618 720.651 427.093 709.003 480.427 711.776C533.76 714.549 586.951 731.744 640.284 739.509C693.618 747.413 747.093 746.027 800.427 742.144C853.76 738.123 906.951 731.744 960.284 729.803C1013.62 728 1067.09 730.773 1120.43 737.707C1173.76 744.64 1226.95 755.733 1253.4 761.28L1280 766.827V833.387H1253.4C1226.95 833.387 1173.76 833.387 1120.43 833.387C1067.09 833.387 1013.62 833.387 960.284 833.387C906.951 833.387 853.76 833.387 800.427 833.387C747.093 833.387 693.618 833.387 640.284 833.387C586.951 833.387 533.76 833.387 480.427 833.387C427.093 833.387 373.618 833.387 320.284 833.387C266.951 833.387 213.76 833.387 160.427 833.387C107.093 833.387 53.6178 833.387 26.7378 833.387H0V766.827Z" fill="#8D44DF"/>
+</g>
+<defs>
+<clipPath id="clip0_3_2">
+<rect width="1280" height="832" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/images/yellow_dot.svg b/public/images/yellow_dot.svg
new file mode 100644
index 00000000..a1f19386
--- /dev/null
+++ b/public/images/yellow_dot.svg
@@ -0,0 +1,3 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#FFBD3C"/>
+</svg>
diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index b66bc11b..81972dd7 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -61,6 +61,12 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
         <Navbar.Link href="/calendar" className="ml-4 text-white">
           Recruitment
         </Navbar.Link>
+        <Navbar.Link href="/application_status" className="ml-4 text-white">
+          Application status
+        </Navbar.Link>
+        <Navbar.Link href="/tasks" className="ml-4 text-white">
+          Tasks
+        </Navbar.Link>
       </Navbar.Collapse>
     </Navbar>
   )
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
new file mode 100644
index 00000000..c4ff84b5
--- /dev/null
+++ b/src/pages/application_status/index.tsx
@@ -0,0 +1,194 @@
+import { useRouter } from 'next/router'
+import { useSession, signIn } from 'next-auth/react'
+import { useState, useCallback } from 'react'
+import Head from 'next/head'
+import { useToast } from '@chakra-ui/react'
+import Image from 'next/image'
+import TopNavbar from '~/components/common/TopNavbar'
+import withAuth, { BaseProps } from '~/utils/withAuth'
+
+enum PageState {
+  LOGIN,
+  FORGET_PASSWORD,
+}
+
+const application_status:React.FC<BaseProps> = ({ session }) =>{
+
+  //this part needs backend to update the status
+  const application_status = "accepted"
+
+  const [pageState, setPageState] = useState(PageState.LOGIN)
+
+  return (
+    <>
+      <Head>
+        <title>Atlas | Login</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta name="description" content="The login page for Atlas" />
+      </Head>
+      <TopNavbar isAdmin={session.isAdmin} />
+      <main>
+        <div className="relative h-screen w-screen bg-[url('/images/applicants_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
+          {/* Nav element containing the logo */}
+       
+          <nav className="flex justify-center items-center  px-2 py-2 " >
+          
+            <Image
+              alt="logo"
+              src="/images/black_logo.svg"
+              height={150}
+              width={150}
+            
+            
+            />
+         
+          </nav>
+       
+
+          {/* Login */}
+          <div className="flex flex-col justify-center gap-8 font-[Inter]">
+          
+            <h1 className='flex justify-center font-bold text-8xl mt-10'>
+              Hi User,
+            </h1>
+            <h2 className='flex justify-center  mt-3 font-bold text-6xl'>
+              your current status is:
+            </h2>
+            {application_status == 'accepted' && 
+            <h3 className='flex mt-3 justify-center text-5xl'>
+        
+              <Image
+                alt="logo"
+                src="/images/Ellipse 1.svg"
+                height={35}
+                width={35}
+                className='mr-5'              
+              />
+                Accepted
+              </h3>
+            }
+            {application_status == 'offered' && <h3 className='flex justify-center text-[55px]'>
+        
+              <Image
+                alt="logo"
+                src="/images/blue_dot.svg"
+                height={35}
+                width={35}
+                className='mr-5'
+              />
+                Offered
+              </h3>
+            }
+            {application_status == 'pending_review' && <h3 className='flex justify-center text-[55px]'>
+              
+              <Image
+                alt="logo"
+                src="/images/yellow_dot.svg"
+                height={35}
+                width={35}
+                className='mr-5'             
+              />
+                Pending Review
+              </h3>
+            }
+            {application_status == 'interviewed' && <h3 className='flex justify-center text-[55px]'>
+              
+              <Image
+                alt="logo"
+                src="/images/pink_dot.svg"
+                height={35}
+                width={35}
+                className='mr-5'             
+              />
+                Interviewed
+              </h3>
+            }
+            {application_status == 'rejected' && <h3 className='flex justify-center text-[55px]'>
+              
+              <Image
+                alt="logo"
+                src="/images/red_dot.svg"
+                height={35}
+                width={35}
+                className='mr-5'             
+              />
+                Rejected
+              </h3>
+            }
+            
+            
+            <div className="flex justify-center items-center mt-[80px]">
+            {application_status != "rejected" &&
+            <button
+          
+              className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] flex-col w-357px h-109px items-center bg-opacity-0 border-2 border-[#86C5FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition hover:bg-opacity-80"
+             
+            >
+              <div className='font-[Inter] text-[25px]'>
+                Update 
+                  <div className="relative">
+                  </div>
+                Information
+              </div>
+            </button>
+            }
+            {application_status == "rejected" &&
+            <button
+              disabled = {true}
+              className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] flex-col w-357px h-109px items-center bg-opacity-0 border-2 border-[#BFE0FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition"
+             
+            >
+              <div className='font-[Inter] text-[25px] text-[#9AA8B6]'>
+                Update 
+                  <div className="relative">
+                  </div>
+                Information
+              </div>
+            </button>
+            }
+
+            
+            
+            {(application_status == "accepted" || application_status == "offered") && 
+            <button
+          
+              className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] -ml-5 w-357px h-109px items-center bg-opacity-0 border-2 border-[#86C5FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition hover:bg-opacity-80"
+        
+            >
+              <div className='font-[Inter] text-[25px]'>
+                Tasks to be
+                  <div className="relative">
+                  </div>
+                Completed
+              </div>
+         
+            </button>
+            }
+            
+            {(application_status != "offered" && application_status != "accepted") &&
+            <button
+            disabled = {true}
+            className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] -ml-5 flex-col w-357px h-109px -ml-5 items-center bg-opacity-0 border-2 border-[#BFE0FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition"
+           
+            >
+            <div className='font-[Inter] text-[25px] text-[#9AA8B6]'>
+              Tasks to be
+                <div className="relative">
+                </div>
+              Completed
+            </div>
+          </button>
+            }
+            
+            </div>
+
+          
+          </div>
+        </div>
+      </main>
+    </>
+  )
+}
+
+
+export default withAuth(application_status, true)
\ No newline at end of file
diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
new file mode 100644
index 00000000..61fbb37a
--- /dev/null
+++ b/src/pages/tasks/index.tsx
@@ -0,0 +1,253 @@
+import { useRouter, } from 'next/router'
+import { useSession} from 'next-auth/react'
+import { useState, useCallback, useRef } from 'react'
+import Head from 'next/head'
+import {  Box, Button, Grid, GridItem, Heading, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, Portal, useDisclosure, useToast, Text } from '@chakra-ui/react'
+import Image from 'next/image'
+import TopNavbar from '~/components/common/TopNavbar'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
+
+
+
+
+enum PageState {
+  LOGIN,
+  FORGET_PASSWORD,
+}
+
+const tasks:React.FC<BaseProps> = ({ session }) => {
+  const { status } = useSession()
+  //this part needs backend to update the status
+  const [pageState, setPageState] = useState(PageState.LOGIN)
+  const [searchQuery, setSearchQuery] = useState('')
+  const [showModal, setShowModal] = useState(false)
+  const { isOpen, onOpen, onClose } = useDisclosure()
+  const [currentDetails, setCurrentDetails] = useState('')
+  const [currentName, setCurrentName] = useState('')
+
+
+
+  const data = [
+    {
+      id: 1,
+      status: 'Done',
+      name: 'Join Telegram Group',
+      due: '09/12/23',
+      details: 'User should join the telegram group before they due date.'
+    },
+    {
+        id: 2,
+        status: 'In Progress',
+        name: 'Have lunch',
+        due: '1/4/24',
+        details: 'Have lunch at school with friends.'
+      },
+      {
+        id: 3,
+        status: 'Incomplete',
+        name: 'Attend first townhall',
+        due: '23/5/24',
+        details: 'Attend the first townhall to learn more about Fintech Society and its projects.'
+      },
+    
+  ]
+  
+
+  const filteredData = data.filter((item) =>
+    item.name.toLowerCase().includes(searchQuery.toLowerCase())
+  )
+
+
+
+  return (
+    <>
+    
+      <Head>
+        <title>Atlas | Login</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta name="description" content="The login page for Atlas" />
+      </Head>
+      <TopNavbar isAdmin={session.isAdmin} />
+      <main>
+        <div className="relative h-screen w-screen bg-[url('/images/tasks_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
+          {/* Nav element containing the logo */}
+       
+
+       
+
+          {/* Login */}
+          <div className="flex flex-col justify-center gap-8 font-[Inter]">
+           
+          
+            <h1 className='flex justify-center font-bold text-4xl mt-[3%] text-white'>
+             Tasks
+            </h1>
+            
+            <Input
+                placeholder="Search"
+                value={searchQuery}
+                onChange={(e) => setSearchQuery(e.target.value)}
+                borderWidth="3px"
+                w={{ base: '150px', md: '300px' }}
+                border="3px solid #F9813E"
+                borderColor="#9BAFC2" 
+                borderRadius="30px"
+                className="mt-[1%] ml-[8%] mb-4 text-white"
+                _placeholder={{
+                pl: { base: '65px', lg: '210px' },
+                fontStyle: 'italic',
+                }}
+            />
+           <Box
+  overflowY="auto"
+  maxHeight="40vh"
+  sx={{
+    '&::-webkit-scrollbar': {
+      width: '30px',
+    },
+    '&::-webkit-scrollbar-thumb': {
+      backgroundColor: `#004B90`,
+      borderRadius: '20px',
+      border: '5px solid transparent',
+      backgroundClip: 'content-box',
+    },
+  }}
+  className="p-16"
+>
+  <Grid
+  className='ml-[11%]'
+    templateColumns={{
+      base: 'repeat(3, 1fr)',
+      md: 'repeat(3, 1fr)',
+    }}
+    gridGap={{ base: '4' }}
+    gridRowGap={{ base: '4', md: '12' }}
+  >
+    {/* Column headings */}
+    <GridItem colSpan={1} className="justify-content-center flex flex-col">
+      <h1 className="text-lg font-bold text-white">Status</h1>
+    </GridItem>
+    <GridItem colSpan={1} className="justify-content-center flex flex-col">
+      <h1 className="text-lg font-bold text-white">Task</h1>
+    </GridItem>
+    <GridItem colSpan={1} className="justify-content-center flex flex-col">
+      <h1 className="text-lg font-bold text-white">Do By</h1>
+    </GridItem>
+    </Grid>
+
+    {/* Data rows */}
+    {filteredData.map((item) => (
+      <Grid
+      className='mt-[2%] ml-[11%]'
+      templateColumns={{
+        base: 'repeat(3, 1fr)',
+        md: 'repeat(3, 1fr)',
+      }}
+      gridGap={{ base: '4' }}
+      gridRowGap={{ base: '4', md: '12' }}
+
+    >
+      
+        <GridItem colSpan={1} className="justify-content-center flex flex-col">
+          
+          <h1 className="  text-white">{item.status == "Incomplete" && 
+          <button
+          disabled = {true}
+          className="flex-col  items-center w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#C51F29] py-1 px-5 font-medium transition"
+
+            >
+          <div className='font-[Inter] text-xl text-white'>
+          {item.status}
+          </div>
+        </button>
+          }
+          {item.status == "In Progress" && <button
+          disabled = {true}
+          className="flex-col items-center w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#FFBD3C] py-1 px-5 font-medium transition"
+         
+            >
+          <div className='font-[Inter] text-xl text-white'>
+          {item.status}
+          </div>
+        </button>}
+          {item.status == "Done" && <button
+          disabled = {true}
+          className="flex-col items-center w-[150px] max-w-20 bg-opacity-100  text-md mx-auto rounded-full  bg-[#00C09D] py-1 px-5 font-medium transition"
+         
+            >
+          <div className='font-[Inter] text-xl text-white'>
+          {item.status}
+          </div>
+        </button>}
+          </h1>
+          
+        </GridItem>
+      
+       
+        
+      
+        
+       
+        <GridItem colSpan={1} className="justify-content-center flex flex-col">
+         
+          <Text
+        as="span"
+        cursor="pointer"
+        _hover={{ textDecoration: 'underline' }}
+        className='text-xl text-white'
+        onClick={() => { setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
+       
+      >
+        {item.name}
+      </Text>
+     
+          <Modal  isOpen={isOpen} onClose={onClose}>
+            <ModalOverlay 
+            bg='none'
+            backdropFilter='auto'
+            
+            backdropBlur='2px'
+            />
+           
+            
+            <ModalContent 
+           
+            
+        
+            >
+            <ModalHeader fontSize='5xl' >{currentName}</ModalHeader>
+            <ModalCloseButton />
+            <ModalBody fontSize='3xl' >
+                {currentDetails}
+            
+            </ModalBody>
+
+            <ModalFooter>
+           
+            </ModalFooter>
+        </ModalContent>
+        
+        </Modal>
+       
+ 
+        </GridItem>
+        <GridItem colSpan={1} className="justify-content-center flex flex-col">
+          <h1 className="text-xl text-white">{item.due}</h1>
+        </GridItem>
+    </Grid>
+  
+       
+    ))}
+ 
+</Box>
+            
+
+          
+          </div>
+        </div>
+      </main>
+    </>
+  )
+}
+
+export default withAuth(tasks, true)
\ No newline at end of file

From 50e1ffbcf99d1a10a46a1aabdf1f26bff4b1ac4c Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 31 May 2023 08:03:36 +0800
Subject: [PATCH 145/223] make text size more consistent

---
 src/pages/tasks/index.tsx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 61fbb37a..79d3238f 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -16,11 +16,8 @@ enum PageState {
 }
 
 const tasks:React.FC<BaseProps> = ({ session }) => {
-  const { status } = useSession()
-  //this part needs backend to update the status
-  const [pageState, setPageState] = useState(PageState.LOGIN)
+
   const [searchQuery, setSearchQuery] = useState('')
-  const [showModal, setShowModal] = useState(false)
   const { isOpen, onOpen, onClose } = useDisclosure()
   const [currentDetails, setCurrentDetails] = useState('')
   const [currentName, setCurrentName] = useState('')
@@ -125,13 +122,13 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
   >
     {/* Column headings */}
     <GridItem colSpan={1} className="justify-content-center flex flex-col">
-      <h1 className="text-lg font-bold text-white">Status</h1>
+      <h1 className="text-xl font-bold text-white">Status</h1>
     </GridItem>
     <GridItem colSpan={1} className="justify-content-center flex flex-col">
-      <h1 className="text-lg font-bold text-white">Task</h1>
+      <h1 className="text-xl font-bold text-white">Task</h1>
     </GridItem>
     <GridItem colSpan={1} className="justify-content-center flex flex-col">
-      <h1 className="text-lg font-bold text-white">Do By</h1>
+      <h1 className="text-xl font-bold text-white">Do By</h1>
     </GridItem>
     </Grid>
 

From cae48b4c9655a5bf01f4894bd41c849d6f036a9c Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 31 May 2023 22:15:07 +0800
Subject: [PATCH 146/223] improve formatting

---
 src/components/common/TopNavbar.tsx    | 2 +-
 src/pages/application_status/index.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index 81972dd7..14578687 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -62,7 +62,7 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
           Recruitment
         </Navbar.Link>
         <Navbar.Link href="/application_status" className="ml-4 text-white">
-          Application status
+          Application Status
         </Navbar.Link>
         <Navbar.Link href="/tasks" className="ml-4 text-white">
           Tasks
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index c4ff84b5..45dce51d 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -48,7 +48,7 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
           {/* Login */}
           <div className="flex flex-col justify-center gap-8 font-[Inter]">
           
-            <h1 className='flex justify-center font-bold text-8xl mt-10'>
+            <h1 className='flex justify-center font-bold text-8xl mt-4'>
               Hi User,
             </h1>
             <h2 className='flex justify-center  mt-3 font-bold text-6xl'>
@@ -117,7 +117,7 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
             }
             
             
-            <div className="flex justify-center items-center mt-[80px]">
+            <div className="flex justify-center items-center mt-5">
             {application_status != "rejected" &&
             <button
           

From f7f10448b3fba3d89415b333b2a26cf31a3ba660 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sat, 3 Jun 2023 17:16:31 +0800
Subject: [PATCH 147/223] change the style of the status page

---
 public/images/question_mark.svg        |   3 +
 public/images/search.svg               |   3 +
 src/pages/application_status/index.tsx | 314 +++++++++++++++----------
 src/pages/tasks/index.tsx              |  47 +++-
 4 files changed, 240 insertions(+), 127 deletions(-)
 create mode 100644 public/images/question_mark.svg
 create mode 100644 public/images/search.svg

diff --git a/public/images/question_mark.svg b/public/images/question_mark.svg
new file mode 100644
index 00000000..7fbf379e
--- /dev/null
+++ b/public/images/question_mark.svg
@@ -0,0 +1,3 @@
+<svg width="13" height="24" viewBox="0 0 13 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.47985 16.8636V16.7358C4.49405 15.3793 4.6361 14.2997 4.90598 13.4972C5.17587 12.6946 5.55939 12.0447 6.05655 11.5476C6.55371 11.0504 7.1503 10.5923 7.84632 10.1733C8.26536 9.91761 8.64178 9.61577 8.97559 9.26776C9.30939 8.91264 9.57218 8.50426 9.76394 8.04261C9.9628 7.58097 10.0622 7.0696 10.0622 6.50852C10.0622 5.8125 9.89888 5.20881 9.57218 4.69744C9.24547 4.18608 8.80868 3.7919 8.26181 3.51491C7.71493 3.23793 7.10769 3.09943 6.44007 3.09943C5.85769 3.09943 5.29661 3.22017 4.75684 3.46165C4.21706 3.70312 3.76607 4.0831 3.40385 4.60156C3.04164 5.12003 2.83212 5.79829 2.7753 6.63636H0.0906427C0.147461 5.42898 0.459961 4.3956 1.02814 3.53622C1.60343 2.67685 2.35982 2.01989 3.29732 1.56534C4.24192 1.11079 5.28951 0.883522 6.44007 0.883522C7.69007 0.883522 8.77672 1.1321 9.70002 1.62926C10.6304 2.12642 11.3477 2.80824 11.852 3.67471C12.3634 4.54119 12.6191 5.52841 12.6191 6.63636C12.6191 7.41761 12.4983 8.12429 12.2568 8.75639C12.0225 9.38849 11.6816 9.95312 11.2341 10.4503C10.7938 10.9474 10.2611 11.3878 9.6361 11.7713C9.0111 12.1619 8.51039 12.5739 8.13397 13.0071C7.75755 13.4332 7.48411 13.9411 7.31365 14.5305C7.1432 15.12 7.05087 15.8551 7.03667 16.7358V16.8636H4.47985ZM5.84348 23.1705C5.31792 23.1705 4.86692 22.9822 4.4905 22.6058C4.11408 22.2294 3.92587 21.7784 3.92587 21.2528C3.92587 20.7273 4.11408 20.2763 4.4905 19.8999C4.86692 19.5234 5.31792 19.3352 5.84348 19.3352C6.36905 19.3352 6.82005 19.5234 7.19647 19.8999C7.57289 20.2763 7.7611 20.7273 7.7611 21.2528C7.7611 21.6009 7.67232 21.9205 7.49476 22.2116C7.32431 22.5028 7.09348 22.7372 6.80229 22.9148C6.5182 23.0852 6.1986 23.1705 5.84348 23.1705Z" fill="black"/>
+</svg>
diff --git a/public/images/search.svg b/public/images/search.svg
new file mode 100644
index 00000000..0d69c935
--- /dev/null
+++ b/public/images/search.svg
@@ -0,0 +1,3 @@
+<svg width="22" height="23" viewBox="0 0 22 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.3275 22.0482L12.8856 14.6124C12.295 15.0845 11.6158 15.4582 10.848 15.7336C10.0802 16.009 9.26312 16.1467 8.39687 16.1467C6.25094 16.1467 4.43496 15.4043 2.94895 13.9195C1.46215 12.4339 0.71875 10.619 0.71875 8.47485C0.71875 6.33066 1.46215 4.51577 2.94895 3.03018C4.43496 1.54538 6.25094 0.802979 8.39687 0.802979C10.5428 0.802979 12.3592 1.54538 13.846 3.03018C15.332 4.51577 16.075 6.33066 16.075 8.47485C16.075 9.3404 15.9372 10.1568 15.6616 10.924C15.3859 11.6911 15.0119 12.3698 14.5394 12.96L21.9812 20.3958L20.3275 22.0482ZM8.39687 13.7862C9.87344 13.7862 11.1287 13.27 12.1627 12.2376C13.1959 11.2045 13.7125 9.95021 13.7125 8.47485C13.7125 6.99949 13.1959 5.74524 12.1627 4.71209C11.1287 3.67973 9.87344 3.16356 8.39687 3.16356C6.92031 3.16356 5.66504 3.67973 4.63105 4.71209C3.59785 5.74524 3.08125 6.99949 3.08125 8.47485C3.08125 9.95021 3.59785 11.2045 4.63105 12.2376C5.66504 13.27 6.92031 13.7862 8.39687 13.7862Z" fill="#D9D9D9"/>
+</svg>
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 45dce51d..44e7fd8c 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -2,10 +2,11 @@ import { useRouter } from 'next/router'
 import { useSession, signIn } from 'next-auth/react'
 import { useState, useCallback } from 'react'
 import Head from 'next/head'
-import { useToast } from '@chakra-ui/react'
+import { Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, useDisclosure, useToast } from '@chakra-ui/react'
 import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { BaseProps } from '~/utils/withAuth'
+import { Button } from 'flowbite-react'
 
 enum PageState {
   LOGIN,
@@ -16,8 +17,34 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
 
   //this part needs backend to update the status
   const application_status = "accepted"
+  const { isOpen, onOpen, onClose } = useDisclosure()
 
   const [pageState, setPageState] = useState(PageState.LOGIN)
+  const roles = [
+    { 
+      id:1,
+      name: 'Software Engineer',
+      status: 'accepted'
+    },
+    { 
+      id:2,
+      name: 'Technical Analyst',
+      status: 'interviewed'
+    },
+    {
+      id:3,
+      name: 'Research Analyst',
+      status: 'rejected'
+    }
+
+
+
+  ]
+  const status =[
+    {status: 'accepty'}
+  ]
+
+  
 
   return (
     <>
@@ -52,135 +79,186 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
               Hi User,
             </h1>
             <h2 className='flex justify-center  mt-3 font-bold text-6xl'>
-              your current status is:
+              your current statuses are:
             </h2>
-            {application_status == 'accepted' && 
-            <h3 className='flex mt-3 justify-center text-5xl'>
-        
-              <Image
-                alt="logo"
-                src="/images/Ellipse 1.svg"
-                height={35}
-                width={35}
-                className='mr-5'              
-              />
-                Accepted
-              </h3>
-            }
-            {application_status == 'offered' && <h3 className='flex justify-center text-[55px]'>
-        
-              <Image
-                alt="logo"
-                src="/images/blue_dot.svg"
-                height={35}
-                width={35}
-                className='mr-5'
-              />
-                Offered
-              </h3>
-            }
-            {application_status == 'pending_review' && <h3 className='flex justify-center text-[55px]'>
-              
-              <Image
-                alt="logo"
-                src="/images/yellow_dot.svg"
-                height={35}
-                width={35}
-                className='mr-5'             
-              />
-                Pending Review
-              </h3>
-            }
-            {application_status == 'interviewed' && <h3 className='flex justify-center text-[55px]'>
-              
-              <Image
-                alt="logo"
-                src="/images/pink_dot.svg"
-                height={35}
-                width={35}
-                className='mr-5'             
-              />
-                Interviewed
-              </h3>
-            }
-            {application_status == 'rejected' && <h3 className='flex justify-center text-[55px]'>
+      
+            {roles.map((item) => ( 
+              <div key={item.id} className="flex  items-center mt-3 ">
+                  <div className="flex-grow">
+                {item.status == 'accepted' && 
+                <h3 className='flex mt-3 justify-center text-5xl'>
+                  {item.name}
+                  <Image
+                    alt="logo"
+                    src="/images/Ellipse 1.svg"
+                    height={35}
+                    width={35}
+                    className='flex flex-col  ml-14'              
+                  />
+                    {/* Accepted */}
+                  </h3>
+                }
               
-              <Image
-                alt="logo"
-                src="/images/red_dot.svg"
-                height={35}
-                width={35}
-                className='mr-5'             
-              />
-                Rejected
-              </h3>
-            }
+                {item.status == 'offered' && <h3 className='flex justify-center text-5xl'>
+                {item.name}
+                  <Image
+                    alt="logo"
+                    src="/images/blue_dot.svg"
+                    height={35}
+                    width={35}
+                    className='flex flex-col ml-14'
+                  />
+                    {/* Offered */}
+                  </h3>
+                }
+                
+                {item.status == 'pending_review' && <h3 className='flex justify-center text-5xl'>
+                {item.name}
+                  <Image
+                    alt="logo"
+                    src="/images/yellow_dot.svg"
+                    height={35}
+                    width={35}
+                    className='ml-14'             
+                  />
+                    {/* Pending Review */}
+                  </h3>
+                }
+                {item.status == 'interviewed' && <h3 className='flex justify-center text-5xl'>
+                {item.name}
+                  <Image
+                    alt="logo"
+                    src="/images/pink_dot.svg"
+                    height={35}
+                    width={35}
+                    className='ml-14'             
+                  />
+                    {/* Interviewed */}
+                  </h3>
+                }
+                {item.status == 'rejected' && <h3 className='flex justify-center text-5xl'>
+                {item.name}
+                  <Image
+                    alt="logo"
+                    src="/images/red_dot.svg"
+                    height={35}
+                    width={35}
+                    className='ml-14'             
+                  />
+                    {/* Rejected */}
+                  </h3>
+                }
+                
+                
+                
+               
+                </div>
+                </div>
+
+
+            ))}
+             <div style={{ position: 'fixed', bottom: '40px', right: '60px' }}>
+              <button 
+                onClick={onOpen}       
+                className="w-20 h-20 rounded-full 
+                       bg-[#FFEBC5]  
+                       hover:bg-[#FFD27C]
+                       text-white
+                       
+                       
+                       ">
+                         <Image
+                    alt="question_mark"
+                    src="/images/question_mark.svg"
+                    height={20}
+                    width={20}
+                    className='ml-7'  
+                  
+                        
+                  />
             
+        </button>
+        </div>
+        <Modal   isOpen={isOpen} onClose={onClose}>
+            <ModalOverlay 
+            bg='none'
+            backdropFilter='auto'
             
-            <div className="flex justify-center items-center mt-5">
-            {application_status != "rejected" &&
-            <button
           
-              className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] flex-col w-357px h-109px items-center bg-opacity-0 border-2 border-[#86C5FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition hover:bg-opacity-80"
-             
-            >
-              <div className='font-[Inter] text-[25px]'>
-                Update 
-                  <div className="relative">
-                  </div>
-                Information
-              </div>
-            </button>
-            }
-            {application_status == "rejected" &&
-            <button
-              disabled = {true}
-              className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] flex-col w-357px h-109px items-center bg-opacity-0 border-2 border-[#BFE0FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition"
+            />
+           
+           
+            <ModalContent 
+        
              
-            >
-              <div className='font-[Inter] text-[25px] text-[#9AA8B6]'>
-                Update 
-                  <div className="relative">
-                  </div>
-                Information
-              </div>
-            </button>
-            }
-
             
-            
-            {(application_status == "accepted" || application_status == "offered") && 
-            <button
-          
-              className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] -ml-5 w-357px h-109px items-center bg-opacity-0 border-2 border-[#86C5FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition hover:bg-opacity-80"
         
             >
-              <div className='font-[Inter] text-[25px]'>
-                Tasks to be
-                  <div className="relative">
-                  </div>
-                Completed
-              </div>
-         
-            </button>
-            }
+                
+            <ModalHeader fontSize='5xl' ></ModalHeader>
+            <ModalCloseButton />
+            <ModalBody fontSize='3xl' >
+              <div className='flex justify-left ml-24'>
+              <Image
+                    alt="logo"
+                    src="/images/Ellipse 1.svg"
+                    height={35}
+                    width={35}
+                    className='flex flex-col mr-5'              
+                  />
+                Accepted</div>
+              <div  className='flex justify-left ml-24'>
+              <Image
+                    alt="logo"
+                    src="/images/blue_dot.svg"
+                    height={35}
+                    width={35}
+                    className='flex flex-col mr-5'
+                  />
+                  Offered</div>
+              <div  className='flex justify-left ml-24'>
+              <Image
+                    alt="logo"
+                    src="/images/yellow_dot.svg"
+                    height={35}
+                    width={35}
+                    className='mr-5'             
+                  />
+                  Pending Review</div>
+              <div className='flex justify-left ml-24'>
+              <Image
+                    alt="logo"
+                    src="/images/pink_dot.svg"
+                    height={35}
+                    width={35}
+                    className='mr-5'             
+                  />Interviewed</div>
+              <div className='flex justify-left ml-24'>
+              <Image
+                    alt="logo"
+                    src="/images/red_dot.svg"
+                    height={35}
+                    width={35}
+                    className='mr-5'             
+                  />Rejected</div>
+
+
+              
             
-            {(application_status != "offered" && application_status != "accepted") &&
-            <button
-            disabled = {true}
-            className="shadow-[0_4px_4px_rgba(0,0,0,0.25)] -ml-5 flex-col w-357px h-109px -ml-5 items-center bg-opacity-0 border-2 border-[#BFE0FF]  text-md mx-auto rounded-full  bg-[#86C5FF] py-4 px-20 font-medium transition"
+            </ModalBody>
+
+            <ModalFooter>
+           
+            </ModalFooter>
+        </ModalContent>
+        
+        </Modal>
+      
+       
+
            
-            >
-            <div className='font-[Inter] text-[25px] text-[#9AA8B6]'>
-              Tasks to be
-                <div className="relative">
-                </div>
-              Completed
-            </div>
-          </button>
-            }
             
-            </div>
+          
 
           
           </div>
diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 79d3238f..07339ebc 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -2,10 +2,11 @@ import { useRouter, } from 'next/router'
 import { useSession} from 'next-auth/react'
 import { useState, useCallback, useRef } from 'react'
 import Head from 'next/head'
-import {  Box, Button, Grid, GridItem, Heading, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, Portal, useDisclosure, useToast, Text } from '@chakra-ui/react'
+import {  Box, Button, Grid, GridItem, Heading, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, Portal, useDisclosure, useToast, Text, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
+import { SearchIcon } from '@chakra-ui/icons'
 
 
 
@@ -30,7 +31,7 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
       status: 'Done',
       name: 'Join Telegram Group',
       due: '09/12/23',
-      details: 'User should join the telegram group before they due date.'
+      details: 'User should join the telegram group before their due date.'
     },
     {
         id: 2,
@@ -80,7 +81,16 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
              Tasks
             </h1>
             
-            <Input
+           
+                <InputGroup>
+      <InputLeftElement
+        className="mt-[1%] ml-[8%] mb-4"
+        pointerEvents="none"
+        >
+        <SearchIcon className="SearchIcon" color="gray.300" />
+        
+        </InputLeftElement>
+       <Input
                 placeholder="Search"
                 value={searchQuery}
                 onChange={(e) => setSearchQuery(e.target.value)}
@@ -91,10 +101,14 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
                 borderRadius="30px"
                 className="mt-[1%] ml-[8%] mb-4 text-white"
                 _placeholder={{
-                pl: { base: '65px', lg: '210px' },
+                pl: { base: '65px', lg: '5px' },
                 fontStyle: 'italic',
                 }}
             />
+    </InputGroup>
+              
+                
+              
            <Box
   overflowY="auto"
   maxHeight="40vh"
@@ -184,21 +198,31 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
         
       
         
-       
+        <div  
+        ref={el => {
+            // el can be null - see https://reactjs.org/docs/refs-and-the-dom.html#caveats-with-callback-refs
+            if (!el) return;
+    
+            console.log(el.offsetLeft); // prints 200px
+          }}
+          >
         <GridItem colSpan={1} className="justify-content-center flex flex-col">
          
+         
           <Text
+        
         as="span"
         cursor="pointer"
         _hover={{ textDecoration: 'underline' }}
         className='text-xl text-white'
-        onClick={() => { setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
+        onClick={() => {;setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
        
       >
         {item.name}
       </Text>
      
-          <Modal  isOpen={isOpen} onClose={onClose}>
+    
+          <Modal isCentered={true} isOpen={isOpen} onClose={onClose}>
             <ModalOverlay 
             bg='none'
             backdropFilter='auto'
@@ -206,12 +230,14 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
             backdropBlur='2px'
             />
            
-            
-            <ModalContent 
            
+            <ModalContent 
+        
+             
             
         
             >
+                
             <ModalHeader fontSize='5xl' >{currentName}</ModalHeader>
             <ModalCloseButton />
             <ModalBody fontSize='3xl' >
@@ -225,9 +251,12 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
         </ModalContent>
         
         </Modal>
+      
        
  
         </GridItem>
+        </div>
+        
         <GridItem colSpan={1} className="justify-content-center flex flex-col">
           <h1 className="text-xl text-white">{item.due}</h1>
         </GridItem>

From 3809826043b3861a4e1029612c1b860b6bae6196 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 4 Jun 2023 16:52:43 +0800
Subject: [PATCH 148/223] bug fix application status and tasks page, commented
 out most of the code in the calendar parts so that it can compile

---
 src/components/calendar/MainCalendar.tsx |  12 +-
 src/components/calendar/Meeting.tsx      | 127 ++++-----
 src/components/calendar/SideCalendar.tsx | 311 ++++++++++++-----------
 src/pages/application_status/index.tsx   |  20 +-
 src/pages/tasks/index.tsx                |   7 +-
 5 files changed, 239 insertions(+), 238 deletions(-)

diff --git a/src/components/calendar/MainCalendar.tsx b/src/components/calendar/MainCalendar.tsx
index c41863d1..4196e671 100644
--- a/src/components/calendar/MainCalendar.tsx
+++ b/src/components/calendar/MainCalendar.tsx
@@ -1,7 +1,7 @@
-import FullCalendar from '@fullcalendar/react' // must go before plugins
-import dayGridPlugin from '@fullcalendar/daygrid'
-import interactionPlugin from '@fullcalendar/interaction'
-import timeGridPlugin from '@fullcalendar/timegrid'
+// import FullCalendar from '@fullcalendar/react' // must go before plugins
+// import dayGridPlugin from '@fullcalendar/daygrid'
+// import interactionPlugin from '@fullcalendar/interaction'
+// import timeGridPlugin from '@fullcalendar/timegrid'
 import styled from '@emotion/styled'
 import { useState } from 'react'
 
@@ -15,7 +15,7 @@ const MainCalendar = () => {
 
   return (
     <StyleWrapper className="col-span-4">
-      <FullCalendar
+      {/* <FullCalendar
         plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
         initialView="dayGridMonth"
         headerToolbar={{
@@ -28,7 +28,7 @@ const MainCalendar = () => {
         eventClick={(info) => {
           alert('Event: ' + info.event.title)
         }}
-      />
+      /> */}
     </StyleWrapper>
   )
 }
diff --git a/src/components/calendar/Meeting.tsx b/src/components/calendar/Meeting.tsx
index 7ef3363c..0458d27c 100644
--- a/src/components/calendar/Meeting.tsx
+++ b/src/components/calendar/Meeting.tsx
@@ -1,6 +1,6 @@
-import { Menu } from '@headlessui/react'
-import { format, parseISO } from 'date-fns'
-import { DotsVerticalIcon } from '@heroicons/react/outline'
+// import { Menu } from '@headlessui/react'
+// import { format, parseISO } from 'date-fns'
+// import { DotsVerticalIcon } from '@heroicons/react/outline'
 
 export type Meeting = {
   id: number
@@ -17,67 +17,68 @@ function combineClasses(classes: string[]) {
 }
 
 export default function Meeting({ meeting }: meeting) {
-  const startDateTime = parseISO(meeting.start)
-  const endDateTime = parseISO(meeting.end)
+  // const startDateTime = parseISO(meeting.start)
+  // const endDateTime = parseISO(meeting.end)
 
   return (
-    <li className="group flex items-center space-x-4 rounded-xl px-4 py-2 focus-within:bg-green-400 hover:bg-green-400">
-      <div className="flex-auto text-white">
-        <p className="font-bold">{meeting.title}</p>
-        <p className="mt-0.5">
-          <time dateTime={meeting.start}>
-            {format(startDateTime, 'h:mm a')}
-          </time>{' '}
-          - <time dateTime={meeting.end}>{format(endDateTime, 'h:mm a')}</time>
-        </p>
-      </div>
-      <Menu
-        as="div"
-        className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
-      >
-        <div>
-          <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
-            <span className="sr-only">Open options</span>
-            <DotsVerticalIcon className="h-6 w-6" aria-hidden="true" />
-          </Menu.Button>
-        </div>
-        <Menu.Items className="absolute right-0 z-10 mt-2 w-36 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
-          <div className="py-1">
-            <Menu.Item>
-              {({ active }) => (
-                <button
-                  className={combineClasses(
-                    ['block px-4 py-2 text-sm'].concat(
-                      active ? 'bg-gray-100 text-black' : 'text-gray-900'
-                    )
-                  )}
-                  onClick={() => {
-                    alert('You want to edit meeting')
-                  }}
-                >
-                  Edit Meeting
-                </button>
-              )}
-            </Menu.Item>
-            <Menu.Item>
-              {({ active }) => (
-                <button
-                  className={combineClasses(
-                    ['block px-4 py-2 text-sm'].concat(
-                      active ? 'bg-gray-100 text-black' : 'text-gray-900'
-                    )
-                  )}
-                  onClick={() => {
-                    alert('You want to cancel meeting')
-                  }}
-                >
-                  Cancel Meeting
-                </button>
-              )}
-            </Menu.Item>
-          </div>
-        </Menu.Items>
-      </Menu>
-    </li>
+    <div></div>
+    // <li className="group flex items-center space-x-4 rounded-xl px-4 py-2 focus-within:bg-green-400 hover:bg-green-400">
+    //   <div className="flex-auto text-white">
+    //     <p className="font-bold">{meeting.title}</p>
+    //     <p className="mt-0.5">
+    //       <time dateTime={meeting.start}>
+    //         {format(startDateTime, 'h:mm a')}
+    //       </time>{' '}
+    //       - <time dateTime={meeting.end}>{format(endDateTime, 'h:mm a')}</time>
+    //     </p>
+    //   </div>
+    //   <Menu
+    //     as="div"
+    //     className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
+    //   >
+    //     <div>
+    //       <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
+    //         <span className="sr-only">Open options</span>
+    //         <DotsVerticalIcon className="h-6 w-6" aria-hidden="true" />
+    //       </Menu.Button>
+    //     </div>
+    //     <Menu.Items className="absolute right-0 z-10 mt-2 w-36 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+    //       <div className="py-1">
+    //         <Menu.Item>
+    //           {({ active }) => (
+    //             <button
+    //               className={combineClasses(
+    //                 ['block px-4 py-2 text-sm'].concat(
+    //                   active ? 'bg-gray-100 text-black' : 'text-gray-900'
+    //                 )
+    //               )}
+    //               onClick={() => {
+    //                 alert('You want to edit meeting')
+    //               }}
+    //             >
+    //               Edit Meeting
+    //             </button>
+    //           )}
+    //         </Menu.Item>
+    //         <Menu.Item>
+    //           {({ active }) => (
+    //             <button
+    //               className={combineClasses(
+    //                 ['block px-4 py-2 text-sm'].concat(
+    //                   active ? 'bg-gray-100 text-black' : 'text-gray-900'
+    //                 )
+    //               )}
+    //               onClick={() => {
+    //                 alert('You want to cancel meeting')
+    //               }}
+    //             >
+    //               Cancel Meeting
+    //             </button>
+    //           )}
+    //         </Menu.Item>
+    //       </div>
+    //     </Menu.Items>
+    //   </Menu>
+    // </li>
   )
 }
diff --git a/src/components/calendar/SideCalendar.tsx b/src/components/calendar/SideCalendar.tsx
index f5a4a7fe..5cd91f69 100644
--- a/src/components/calendar/SideCalendar.tsx
+++ b/src/components/calendar/SideCalendar.tsx
@@ -1,18 +1,18 @@
-import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/solid'
-import {
-  add,
-  eachDayOfInterval,
-  endOfMonth,
-  getDay,
-  format,
-  parseISO,
-  isEqual,
-  isSameDay,
-  isSameMonth,
-  isToday,
-  parse,
-  startOfToday,
-} from 'date-fns'
+// import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/solid'
+// import {
+//   add,
+//   eachDayOfInterval,
+//   endOfMonth,
+//   getDay,
+//   format,
+//   parseISO,
+//   isEqual,
+//   isSameDay,
+//   isSameMonth,
+//   isToday,
+//   parse,
+//   startOfToday,
+// } from 'date-fns'
 import { useState } from 'react'
 import Meeting from './Meeting'
 
@@ -32,147 +32,154 @@ function classNames(...classes: any[]) {
 }
 
 export default function SideCalendar({ meetings }: Meetings) {
-  const today = startOfToday()
-  const [selectedDay, setSelectedDay] = useState(today)
-  const [currentMonth, setCurrentMonth] = useState(format(today, 'MMM-yyyy'))
-  const firstDayCurrentMonth = parse(currentMonth, 'MMM-yyyy', new Date())
+  return (
+    <div>
+      </div>
+  )
+  
+}
+  
+//   const today = startOfToday()
+//   const [selectedDay, setSelectedDay] = useState(today)
+//   const [currentMonth, setCurrentMonth] = useState(format(today, 'MMM-yyyy'))
+//   const firstDayCurrentMonth = parse(currentMonth, 'MMM-yyyy', new Date())
 
-  const days = eachDayOfInterval({
-    start: firstDayCurrentMonth,
-    end: endOfMonth(firstDayCurrentMonth),
-  })
+//   const days = eachDayOfInterval({
+//     start: firstDayCurrentMonth,
+//     end: endOfMonth(firstDayCurrentMonth),
+//   })
 
-  function previousMonth() {
-    const firstDayNextMonth = add(firstDayCurrentMonth, { months: -1 })
-    setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
-  }
+//   function previousMonth() {
+//     const firstDayNextMonth = add(firstDayCurrentMonth, { months: -1 })
+//     setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
+//   }
 
-  function nextMonth() {
-    const firstDayNextMonth = add(firstDayCurrentMonth, { months: 1 })
-    setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
-  }
+//   function nextMonth() {
+//     const firstDayNextMonth = add(firstDayCurrentMonth, { months: 1 })
+//     setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
+//   }
 
-  const selectedDayMeetings = meetings?.filter((meeting) =>
-    isSameDay(parseISO(meeting.start), selectedDay)
-  )
+//   const selectedDayMeetings = meetings?.filter((meeting) =>
+//     isSameDay(parseISO(meeting.start), selectedDay)
+//   )
 
-  return (
-    <div className="col-span-1 bg-zinc-900 pt-16">
-      <div className="mx-auto max-w-md px-4 sm:px-7 md:max-w-4xl md:px-6">
-        <div className="md:grid md:grid-rows-2">
-          <div className="md:pr-14">
-            <div className="flex items-center">
-              <h2 className="flex-auto text-4xl font-semibold text-white">
-                {format(firstDayCurrentMonth, 'MMMM yyyy')}
-              </h2>
-              <button
-                type="button"
-                onClick={previousMonth}
-                className="-my-1.5 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
-              >
-                <span className="sr-only">Previous month</span>
-                <ChevronLeftIcon className="h-5 w-5" aria-hidden="true" />
-              </button>
-              <button
-                onClick={nextMonth}
-                type="button"
-                className="-my-1.5 -mr-1.5 ml-2 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
-              >
-                <span className="sr-only">Next month</span>
-                <ChevronRightIcon className="h-5 w-5" aria-hidden="true" />
-              </button>
-            </div>
-            <div className="mt-10 grid grid-cols-7 text-center text-xs leading-6 text-gray-500">
-              <div>S</div>
-              <div>M</div>
-              <div>T</div>
-              <div>W</div>
-              <div>T</div>
-              <div>F</div>
-              <div>S</div>
-            </div>
-            <div className="mt-2 grid grid-cols-7 text-sm">
-              {days.map((day, dayIdx) => (
-                <div
-                  key={day.toString()}
-                  className={classNames(
-                    dayIdx === 0 && colStartClasses[getDay(day)],
-                    'py-1.5'
-                  )}
-                >
-                  <button
-                    type="button"
-                    onClick={() => setSelectedDay(day)}
-                    className={classNames(
-                      !isEqual(day, selectedDay) &&
-                        isToday(day) &&
-                        'text-red-500',
-                      !isEqual(day, selectedDay) &&
-                        !isToday(day) &&
-                        isSameMonth(day, firstDayCurrentMonth) &&
-                        'text-gray-900',
-                      !isEqual(day, selectedDay) &&
-                        !isToday(day) &&
-                        !isSameMonth(day, firstDayCurrentMonth) &&
-                        'text-gray-400',
-                      isEqual(day, selectedDay) && isToday(day) && 'bg-red-500',
-                      isEqual(day, selectedDay) &&
-                        !isToday(day) &&
-                        'bg-blue-400',
-                      !isEqual(day, selectedDay) && 'hover:bg-yellow-400',
-                      (isEqual(day, selectedDay) || isToday(day)) &&
-                        'font-semibold',
-                      'mx-auto flex h-8 w-8 items-center justify-center rounded-full'
-                    )}
-                  >
-                    <time
-                      className="text-white"
-                      dateTime={format(day, 'yyyy-MM-dd')}
-                    >
-                      {format(day, 'd')}
-                    </time>
-                  </button>
+//   return (
+//     <div className="col-span-1 bg-zinc-900 pt-16">
+//       <div className="mx-auto max-w-md px-4 sm:px-7 md:max-w-4xl md:px-6">
+//         <div className="md:grid md:grid-rows-2">
+//           <div className="md:pr-14">
+//             <div className="flex items-center">
+//               <h2 className="flex-auto text-4xl font-semibold text-white">
+//                 {format(firstDayCurrentMonth, 'MMMM yyyy')}
+//               </h2>
+//               <button
+//                 type="button"
+//                 onClick={previousMonth}
+//                 className="-my-1.5 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
+//               >
+//                 <span className="sr-only">Previous month</span>
+//                 <ChevronLeftIcon className="h-5 w-5" aria-hidden="true" />
+//               </button>
+//               <button
+//                 onClick={nextMonth}
+//                 type="button"
+//                 className="-my-1.5 -mr-1.5 ml-2 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
+//               >
+//                 <span className="sr-only">Next month</span>
+//                 <ChevronRightIcon className="h-5 w-5" aria-hidden="true" />
+//               </button>
+//             </div>
+//             <div className="mt-10 grid grid-cols-7 text-center text-xs leading-6 text-gray-500">
+//               <div>S</div>
+//               <div>M</div>
+//               <div>T</div>
+//               <div>W</div>
+//               <div>T</div>
+//               <div>F</div>
+//               <div>S</div>
+//             </div>
+//             <div className="mt-2 grid grid-cols-7 text-sm">
+//               {days.map((day, dayIdx) => (
+//                 <div
+//                   key={day.toString()}
+//                   className={classNames(
+//                     dayIdx === 0 && colStartClasses[getDay(day)],
+//                     'py-1.5'
+//                   )}
+//                 >
+//                   <button
+//                     type="button"
+//                     onClick={() => setSelectedDay(day)}
+//                     className={classNames(
+//                       !isEqual(day, selectedDay) &&
+//                         isToday(day) &&
+//                         'text-red-500',
+//                       !isEqual(day, selectedDay) &&
+//                         !isToday(day) &&
+//                         isSameMonth(day, firstDayCurrentMonth) &&
+//                         'text-gray-900',
+//                       !isEqual(day, selectedDay) &&
+//                         !isToday(day) &&
+//                         !isSameMonth(day, firstDayCurrentMonth) &&
+//                         'text-gray-400',
+//                       isEqual(day, selectedDay) && isToday(day) && 'bg-red-500',
+//                       isEqual(day, selectedDay) &&
+//                         !isToday(day) &&
+//                         'bg-blue-400',
+//                       !isEqual(day, selectedDay) && 'hover:bg-yellow-400',
+//                       (isEqual(day, selectedDay) || isToday(day)) &&
+//                         'font-semibold',
+//                       'mx-auto flex h-8 w-8 items-center justify-center rounded-full'
+//                     )}
+//                   >
+//                     <time
+//                       className="text-white"
+//                       dateTime={format(day, 'yyyy-MM-dd')}
+//                     >
+//                       {format(day, 'd')}
+//                     </time>
+//                   </button>
 
-                  <div className="mx-auto mt-1 h-1 w-1">
-                    {meetings?.some((meeting) =>
-                      isSameDay(parseISO(meeting.start), day)
-                    ) && (
-                      <div className="h-1 w-1 rounded-full bg-violet-700"></div>
-                    )}
-                  </div>
-                </div>
-              ))}
-            </div>
-          </div>
-          <section className="divide-y divide-gray-400">
-            <h2 className="text-center font-semibold text-blue-700">
-              {isSameDay(today, selectedDay) ? 'TODAY ' : ''}
-              <time dateTime={format(selectedDay, 'yyyy-MM-dd')}>
-                {format(selectedDay, 'dd/LL/yyyy')}
-              </time>
-            </h2>
-            <ol className="text-sm leading-6 text-gray-500">
-              {selectedDayMeetings?.length > 0 ? (
-                selectedDayMeetings?.map((meeting) => (
-                  <Meeting meeting={meeting} key={meeting.id} />
-                ))
-              ) : (
-                <p>No meetings for today.</p>
-              )}
-            </ol>
-          </section>
-        </div>
-      </div>
-    </div>
-  )
-}
+//                   <div className="mx-auto mt-1 h-1 w-1">
+//                     {meetings?.some((meeting) =>
+//                       isSameDay(parseISO(meeting.start), day)
+//                     ) && (
+//                       <div className="h-1 w-1 rounded-full bg-violet-700"></div>
+//                     )}
+//                   </div>
+//                 </div>
+//               ))}
+//             </div>
+//           </div>
+//           <section className="divide-y divide-gray-400">
+//             <h2 className="text-center font-semibold text-blue-700">
+//               {isSameDay(today, selectedDay) ? 'TODAY ' : ''}
+//               <time dateTime={format(selectedDay, 'yyyy-MM-dd')}>
+//                 {format(selectedDay, 'dd/LL/yyyy')}
+//               </time>
+//             </h2>
+//             <ol className="text-sm leading-6 text-gray-500">
+//               {selectedDayMeetings?.length > 0 ? (
+//                 selectedDayMeetings?.map((meeting) => (
+//                   <Meeting meeting={meeting} key={meeting.id} />
+//                 ))
+//               ) : (
+//                 <p>No meetings for today.</p>
+//               )}
+//             </ol>
+//           </section>
+//         </div>
+//       </div>
+//     </div>
+//   )
+// }
 
-const colStartClasses = [
-  '',
-  'col-start-2',
-  'col-start-3',
-  'col-start-4',
-  'col-start-5',
-  'col-start-6',
-  'col-start-7',
-]
+// const colStartClasses = [
+//   '',
+//   'col-start-2',
+//   'col-start-3',
+//   'col-start-4',
+//   'col-start-5',
+//   'col-start-6',
+//   'col-start-7',
+// ]
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 44e7fd8c..ea1ef42b 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -13,11 +13,13 @@ enum PageState {
   FORGET_PASSWORD,
 }
 
-const application_status:React.FC<BaseProps> = ({ session }) =>{
+const Application_Status:React.FC<BaseProps> = ({ session }) =>{
 
   //this part needs backend to update the status
   const application_status = "accepted"
-  const { isOpen, onOpen, onClose } = useDisclosure()
+  const [isOpen, setIsOpen] = useState(false)
+  const onOpen = () => setIsOpen(true)
+  const onClose = () => setIsOpen(false)  
 
   const [pageState, setPageState] = useState(PageState.LOGIN)
   const roles = [
@@ -37,15 +39,10 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
       status: 'rejected'
     }
 
-
-
   ]
   const status =[
     {status: 'accepty'}
   ]
-
-  
-
   return (
     <>
       <Head>
@@ -148,14 +145,9 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
                     {/* Rejected */}
                   </h3>
                 }
-                
-                
-                
-               
                 </div>
                 </div>
 
-
             ))}
              <div style={{ position: 'fixed', bottom: '40px', right: '60px' }}>
               <button 
@@ -179,7 +171,7 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
             
         </button>
         </div>
-        <Modal   isOpen={isOpen} onClose={onClose}>
+        <Modal  isOpen={isOpen} onClose={onClose}>
             <ModalOverlay 
             bg='none'
             backdropFilter='auto'
@@ -269,4 +261,4 @@ const application_status:React.FC<BaseProps> = ({ session }) =>{
 }
 
 
-export default withAuth(application_status, true)
\ No newline at end of file
+export default withAuth(Application_Status)
\ No newline at end of file
diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 07339ebc..66978196 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -16,7 +16,7 @@ enum PageState {
   FORGET_PASSWORD,
 }
 
-const tasks:React.FC<BaseProps> = ({ session }) => {
+const Tasks:React.FC<BaseProps> = ({ session }) => {
 
   const [searchQuery, setSearchQuery] = useState('')
   const { isOpen, onOpen, onClose } = useDisclosure()
@@ -149,6 +149,7 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
     {/* Data rows */}
     {filteredData.map((item) => (
       <Grid
+      key={item.id}
       className='mt-[2%] ml-[11%]'
       templateColumns={{
         base: 'repeat(3, 1fr)',
@@ -215,7 +216,7 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
         cursor="pointer"
         _hover={{ textDecoration: 'underline' }}
         className='text-xl text-white'
-        onClick={() => {;setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
+        onClick={() => {setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
        
       >
         {item.name}
@@ -276,4 +277,4 @@ const tasks:React.FC<BaseProps> = ({ session }) => {
   )
 }
 
-export default withAuth(tasks, true)
\ No newline at end of file
+export default withAuth(Tasks, true)
\ No newline at end of file

From 29e209aa3ea7289483507424151f10f023257280 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 4 Jun 2023 18:09:52 +0800
Subject: [PATCH 149/223] change the calendar components back after updated
 dependencies are installed

---
 src/components/calendar/MainCalendar.tsx |  12 +-
 src/components/calendar/Meeting.tsx      | 128 +++++-----
 src/components/calendar/SideCalendar.tsx | 311 +++++++++++------------
 src/components/common/TopNavbar.tsx      |  15 +-
 src/pages/application_status/index.tsx   |   8 +-
 5 files changed, 235 insertions(+), 239 deletions(-)

diff --git a/src/components/calendar/MainCalendar.tsx b/src/components/calendar/MainCalendar.tsx
index 4196e671..c41863d1 100644
--- a/src/components/calendar/MainCalendar.tsx
+++ b/src/components/calendar/MainCalendar.tsx
@@ -1,7 +1,7 @@
-// import FullCalendar from '@fullcalendar/react' // must go before plugins
-// import dayGridPlugin from '@fullcalendar/daygrid'
-// import interactionPlugin from '@fullcalendar/interaction'
-// import timeGridPlugin from '@fullcalendar/timegrid'
+import FullCalendar from '@fullcalendar/react' // must go before plugins
+import dayGridPlugin from '@fullcalendar/daygrid'
+import interactionPlugin from '@fullcalendar/interaction'
+import timeGridPlugin from '@fullcalendar/timegrid'
 import styled from '@emotion/styled'
 import { useState } from 'react'
 
@@ -15,7 +15,7 @@ const MainCalendar = () => {
 
   return (
     <StyleWrapper className="col-span-4">
-      {/* <FullCalendar
+      <FullCalendar
         plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
         initialView="dayGridMonth"
         headerToolbar={{
@@ -28,7 +28,7 @@ const MainCalendar = () => {
         eventClick={(info) => {
           alert('Event: ' + info.event.title)
         }}
-      /> */}
+      />
     </StyleWrapper>
   )
 }
diff --git a/src/components/calendar/Meeting.tsx b/src/components/calendar/Meeting.tsx
index 0458d27c..288b859b 100644
--- a/src/components/calendar/Meeting.tsx
+++ b/src/components/calendar/Meeting.tsx
@@ -1,6 +1,6 @@
-// import { Menu } from '@headlessui/react'
-// import { format, parseISO } from 'date-fns'
-// import { DotsVerticalIcon } from '@heroicons/react/outline'
+import { Menu } from '@headlessui/react'
+import { format, parseISO } from 'date-fns'
+import { DotsVerticalIcon } from '@heroicons/react/outline'
 
 export type Meeting = {
   id: number
@@ -17,68 +17,68 @@ function combineClasses(classes: string[]) {
 }
 
 export default function Meeting({ meeting }: meeting) {
-  // const startDateTime = parseISO(meeting.start)
-  // const endDateTime = parseISO(meeting.end)
+  const startDateTime = parseISO(meeting.start)
+  const endDateTime = parseISO(meeting.end)
 
   return (
-    <div></div>
-    // <li className="group flex items-center space-x-4 rounded-xl px-4 py-2 focus-within:bg-green-400 hover:bg-green-400">
-    //   <div className="flex-auto text-white">
-    //     <p className="font-bold">{meeting.title}</p>
-    //     <p className="mt-0.5">
-    //       <time dateTime={meeting.start}>
-    //         {format(startDateTime, 'h:mm a')}
-    //       </time>{' '}
-    //       - <time dateTime={meeting.end}>{format(endDateTime, 'h:mm a')}</time>
-    //     </p>
-    //   </div>
-    //   <Menu
-    //     as="div"
-    //     className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
-    //   >
-    //     <div>
-    //       <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
-    //         <span className="sr-only">Open options</span>
-    //         <DotsVerticalIcon className="h-6 w-6" aria-hidden="true" />
-    //       </Menu.Button>
-    //     </div>
-    //     <Menu.Items className="absolute right-0 z-10 mt-2 w-36 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
-    //       <div className="py-1">
-    //         <Menu.Item>
-    //           {({ active }) => (
-    //             <button
-    //               className={combineClasses(
-    //                 ['block px-4 py-2 text-sm'].concat(
-    //                   active ? 'bg-gray-100 text-black' : 'text-gray-900'
-    //                 )
-    //               )}
-    //               onClick={() => {
-    //                 alert('You want to edit meeting')
-    //               }}
-    //             >
-    //               Edit Meeting
-    //             </button>
-    //           )}
-    //         </Menu.Item>
-    //         <Menu.Item>
-    //           {({ active }) => (
-    //             <button
-    //               className={combineClasses(
-    //                 ['block px-4 py-2 text-sm'].concat(
-    //                   active ? 'bg-gray-100 text-black' : 'text-gray-900'
-    //                 )
-    //               )}
-    //               onClick={() => {
-    //                 alert('You want to cancel meeting')
-    //               }}
-    //             >
-    //               Cancel Meeting
-    //             </button>
-    //           )}
-    //         </Menu.Item>
-    //       </div>
-    //     </Menu.Items>
-    //   </Menu>
-    // </li>
+
+    <li className="group flex items-center space-x-4 rounded-xl px-4 py-2 focus-within:bg-green-400 hover:bg-green-400">
+      <div className="flex-auto text-white">
+        <p className="font-bold">{meeting.title}</p>
+        <p className="mt-0.5">
+          <time dateTime={meeting.start}>
+            {format(startDateTime, 'h:mm a')}
+          </time>{' '}
+          - <time dateTime={meeting.end}>{format(endDateTime, 'h:mm a')}</time>
+        </p>
+      </div>
+      <Menu
+        as="div"
+        className="relative opacity-0 focus-within:opacity-100 group-hover:opacity-100"
+      >
+        <div>
+          <Menu.Button className="-m-2 flex items-center rounded-full p-1.5 text-gray-500 hover:text-gray-600">
+            <span className="sr-only">Open options</span>
+            <DotsVerticalIcon className="h-6 w-6" aria-hidden="true" />
+          </Menu.Button>
+        </div>
+        <Menu.Items className="absolute right-0 z-10 mt-2 w-36 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+          <div className="py-1">
+            <Menu.Item>
+              {({ active }) => (
+                <button
+                  className={combineClasses(
+                    ['block px-4 py-2 text-sm'].concat(
+                      active ? 'bg-gray-100 text-black' : 'text-gray-900'
+                    )
+                  )}
+                  onClick={() => {
+                    alert('You want to edit meeting')
+                  }}
+                >
+                  Edit Meeting
+                </button>
+              )}
+            </Menu.Item>
+            <Menu.Item>
+              {({ active }) => (
+                <button
+                  className={combineClasses(
+                    ['block px-4 py-2 text-sm'].concat(
+                      active ? 'bg-gray-100 text-black' : 'text-gray-900'
+                    )
+                  )}
+                  onClick={() => {
+                    alert('You want to cancel meeting')
+                  }}
+                >
+                  Cancel Meeting
+                </button>
+              )}
+            </Menu.Item>
+          </div>
+        </Menu.Items>
+      </Menu>
+    </li>
   )
 }
diff --git a/src/components/calendar/SideCalendar.tsx b/src/components/calendar/SideCalendar.tsx
index 5cd91f69..f260a5aa 100644
--- a/src/components/calendar/SideCalendar.tsx
+++ b/src/components/calendar/SideCalendar.tsx
@@ -1,18 +1,18 @@
-// import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/solid'
-// import {
-//   add,
-//   eachDayOfInterval,
-//   endOfMonth,
-//   getDay,
-//   format,
-//   parseISO,
-//   isEqual,
-//   isSameDay,
-//   isSameMonth,
-//   isToday,
-//   parse,
-//   startOfToday,
-// } from 'date-fns'
+import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/react/solid'
+import {
+  add,
+  eachDayOfInterval,
+  endOfMonth,
+  getDay,
+  format,
+  parseISO,
+  isEqual,
+  isSameDay,
+  isSameMonth,
+  isToday,
+  parse,
+  startOfToday,
+} from 'date-fns'
 import { useState } from 'react'
 import Meeting from './Meeting'
 
@@ -32,154 +32,151 @@ function classNames(...classes: any[]) {
 }
 
 export default function SideCalendar({ meetings }: Meetings) {
-  return (
-    <div>
-      </div>
-  )
+
   
-}
+
   
-//   const today = startOfToday()
-//   const [selectedDay, setSelectedDay] = useState(today)
-//   const [currentMonth, setCurrentMonth] = useState(format(today, 'MMM-yyyy'))
-//   const firstDayCurrentMonth = parse(currentMonth, 'MMM-yyyy', new Date())
+  const today = startOfToday()
+  const [selectedDay, setSelectedDay] = useState(today)
+  const [currentMonth, setCurrentMonth] = useState(format(today, 'MMM-yyyy'))
+  const firstDayCurrentMonth = parse(currentMonth, 'MMM-yyyy', new Date())
 
-//   const days = eachDayOfInterval({
-//     start: firstDayCurrentMonth,
-//     end: endOfMonth(firstDayCurrentMonth),
-//   })
+  const days = eachDayOfInterval({
+    start: firstDayCurrentMonth,
+    end: endOfMonth(firstDayCurrentMonth),
+  })
 
-//   function previousMonth() {
-//     const firstDayNextMonth = add(firstDayCurrentMonth, { months: -1 })
-//     setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
-//   }
+  function previousMonth() {
+    const firstDayNextMonth = add(firstDayCurrentMonth, { months: -1 })
+    setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
+  }
 
-//   function nextMonth() {
-//     const firstDayNextMonth = add(firstDayCurrentMonth, { months: 1 })
-//     setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
-//   }
+  function nextMonth() {
+    const firstDayNextMonth = add(firstDayCurrentMonth, { months: 1 })
+    setCurrentMonth(format(firstDayNextMonth, 'MMM-yyyy'))
+  }
 
-//   const selectedDayMeetings = meetings?.filter((meeting) =>
-//     isSameDay(parseISO(meeting.start), selectedDay)
-//   )
+  const selectedDayMeetings = meetings?.filter((meeting) =>
+    isSameDay(parseISO(meeting.start), selectedDay)
+  )
 
-//   return (
-//     <div className="col-span-1 bg-zinc-900 pt-16">
-//       <div className="mx-auto max-w-md px-4 sm:px-7 md:max-w-4xl md:px-6">
-//         <div className="md:grid md:grid-rows-2">
-//           <div className="md:pr-14">
-//             <div className="flex items-center">
-//               <h2 className="flex-auto text-4xl font-semibold text-white">
-//                 {format(firstDayCurrentMonth, 'MMMM yyyy')}
-//               </h2>
-//               <button
-//                 type="button"
-//                 onClick={previousMonth}
-//                 className="-my-1.5 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
-//               >
-//                 <span className="sr-only">Previous month</span>
-//                 <ChevronLeftIcon className="h-5 w-5" aria-hidden="true" />
-//               </button>
-//               <button
-//                 onClick={nextMonth}
-//                 type="button"
-//                 className="-my-1.5 -mr-1.5 ml-2 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
-//               >
-//                 <span className="sr-only">Next month</span>
-//                 <ChevronRightIcon className="h-5 w-5" aria-hidden="true" />
-//               </button>
-//             </div>
-//             <div className="mt-10 grid grid-cols-7 text-center text-xs leading-6 text-gray-500">
-//               <div>S</div>
-//               <div>M</div>
-//               <div>T</div>
-//               <div>W</div>
-//               <div>T</div>
-//               <div>F</div>
-//               <div>S</div>
-//             </div>
-//             <div className="mt-2 grid grid-cols-7 text-sm">
-//               {days.map((day, dayIdx) => (
-//                 <div
-//                   key={day.toString()}
-//                   className={classNames(
-//                     dayIdx === 0 && colStartClasses[getDay(day)],
-//                     'py-1.5'
-//                   )}
-//                 >
-//                   <button
-//                     type="button"
-//                     onClick={() => setSelectedDay(day)}
-//                     className={classNames(
-//                       !isEqual(day, selectedDay) &&
-//                         isToday(day) &&
-//                         'text-red-500',
-//                       !isEqual(day, selectedDay) &&
-//                         !isToday(day) &&
-//                         isSameMonth(day, firstDayCurrentMonth) &&
-//                         'text-gray-900',
-//                       !isEqual(day, selectedDay) &&
-//                         !isToday(day) &&
-//                         !isSameMonth(day, firstDayCurrentMonth) &&
-//                         'text-gray-400',
-//                       isEqual(day, selectedDay) && isToday(day) && 'bg-red-500',
-//                       isEqual(day, selectedDay) &&
-//                         !isToday(day) &&
-//                         'bg-blue-400',
-//                       !isEqual(day, selectedDay) && 'hover:bg-yellow-400',
-//                       (isEqual(day, selectedDay) || isToday(day)) &&
-//                         'font-semibold',
-//                       'mx-auto flex h-8 w-8 items-center justify-center rounded-full'
-//                     )}
-//                   >
-//                     <time
-//                       className="text-white"
-//                       dateTime={format(day, 'yyyy-MM-dd')}
-//                     >
-//                       {format(day, 'd')}
-//                     </time>
-//                   </button>
+  return (
+    <div className="col-span-1 bg-zinc-900 pt-16">
+      <div className="mx-auto max-w-md px-4 sm:px-7 md:max-w-4xl md:px-6">
+        <div className="md:grid md:grid-rows-2">
+          <div className="md:pr-14">
+            <div className="flex items-center">
+              <h2 className="flex-auto text-4xl font-semibold text-white">
+                {format(firstDayCurrentMonth, 'MMMM yyyy')}
+              </h2>
+              <button
+                type="button"
+                onClick={previousMonth}
+                className="-my-1.5 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
+              >
+                <span className="sr-only">Previous month</span>
+                <ChevronLeftIcon className="h-5 w-5" aria-hidden="true" />
+              </button>
+              <button
+                onClick={nextMonth}
+                type="button"
+                className="-my-1.5 -mr-1.5 ml-2 flex flex-none items-center justify-center p-1.5 text-gray-400 hover:text-gray-500"
+              >
+                <span className="sr-only">Next month</span>
+                <ChevronRightIcon className="h-5 w-5" aria-hidden="true" />
+              </button>
+            </div>
+            <div className="mt-10 grid grid-cols-7 text-center text-xs leading-6 text-gray-500">
+              <div>S</div>
+              <div>M</div>
+              <div>T</div>
+              <div>W</div>
+              <div>T</div>
+              <div>F</div>
+              <div>S</div>
+            </div>
+            <div className="mt-2 grid grid-cols-7 text-sm">
+              {days.map((day, dayIdx) => (
+                <div
+                  key={day.toString()}
+                  className={classNames(
+                    dayIdx === 0 && colStartClasses[getDay(day)],
+                    'py-1.5'
+                  )}
+                >
+                  <button
+                    type="button"
+                    onClick={() => setSelectedDay(day)}
+                    className={classNames(
+                      !isEqual(day, selectedDay) &&
+                        isToday(day) &&
+                        'text-red-500',
+                      !isEqual(day, selectedDay) &&
+                        !isToday(day) &&
+                        isSameMonth(day, firstDayCurrentMonth) &&
+                        'text-gray-900',
+                      !isEqual(day, selectedDay) &&
+                        !isToday(day) &&
+                        !isSameMonth(day, firstDayCurrentMonth) &&
+                        'text-gray-400',
+                      isEqual(day, selectedDay) && isToday(day) && 'bg-red-500',
+                      isEqual(day, selectedDay) &&
+                        !isToday(day) &&
+                        'bg-blue-400',
+                      !isEqual(day, selectedDay) && 'hover:bg-yellow-400',
+                      (isEqual(day, selectedDay) || isToday(day)) &&
+                        'font-semibold',
+                      'mx-auto flex h-8 w-8 items-center justify-center rounded-full'
+                    )}
+                  >
+                    <time
+                      className="text-white"
+                      dateTime={format(day, 'yyyy-MM-dd')}
+                    >
+                      {format(day, 'd')}
+                    </time>
+                  </button>
 
-//                   <div className="mx-auto mt-1 h-1 w-1">
-//                     {meetings?.some((meeting) =>
-//                       isSameDay(parseISO(meeting.start), day)
-//                     ) && (
-//                       <div className="h-1 w-1 rounded-full bg-violet-700"></div>
-//                     )}
-//                   </div>
-//                 </div>
-//               ))}
-//             </div>
-//           </div>
-//           <section className="divide-y divide-gray-400">
-//             <h2 className="text-center font-semibold text-blue-700">
-//               {isSameDay(today, selectedDay) ? 'TODAY ' : ''}
-//               <time dateTime={format(selectedDay, 'yyyy-MM-dd')}>
-//                 {format(selectedDay, 'dd/LL/yyyy')}
-//               </time>
-//             </h2>
-//             <ol className="text-sm leading-6 text-gray-500">
-//               {selectedDayMeetings?.length > 0 ? (
-//                 selectedDayMeetings?.map((meeting) => (
-//                   <Meeting meeting={meeting} key={meeting.id} />
-//                 ))
-//               ) : (
-//                 <p>No meetings for today.</p>
-//               )}
-//             </ol>
-//           </section>
-//         </div>
-//       </div>
-//     </div>
-//   )
-// }
+                  <div className="mx-auto mt-1 h-1 w-1">
+                    {meetings?.some((meeting) =>
+                      isSameDay(parseISO(meeting.start), day)
+                    ) && (
+                      <div className="h-1 w-1 rounded-full bg-violet-700"></div>
+                    )}
+                  </div>
+                </div>
+              ))}
+            </div>
+          </div>
+          <section className="divide-y divide-gray-400">
+            <h2 className="text-center font-semibold text-blue-700">
+              {isSameDay(today, selectedDay) ? 'TODAY ' : ''}
+              <time dateTime={format(selectedDay, 'yyyy-MM-dd')}>
+                {format(selectedDay, 'dd/LL/yyyy')}
+              </time>
+            </h2>
+            <ol className="text-sm leading-6 text-gray-500">
+              {selectedDayMeetings?.length > 0 ? (
+                selectedDayMeetings?.map((meeting) => (
+                  <Meeting meeting={meeting} key={meeting.id} />
+                ))
+              ) : (
+                <p>No meetings for today.</p>
+              )}
+            </ol>
+          </section>
+        </div>
+      </div>
+    </div>
+  )
+}
 
-// const colStartClasses = [
-//   '',
-//   'col-start-2',
-//   'col-start-3',
-//   'col-start-4',
-//   'col-start-5',
-//   'col-start-6',
-//   'col-start-7',
-// ]
+const colStartClasses = [
+  '',
+  'col-start-2',
+  'col-start-3',
+  'col-start-4',
+  'col-start-5',
+  'col-start-6',
+  'col-start-7',
+]
diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index 14578687..7c64f5da 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -31,9 +31,10 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
               <Dropdown.Item>User</Dropdown.Item>
             </Link>
           )}
-          <Link href="/events" className="md:hidden">
+          {isAdmin && (<Link href="/events" className="md:hidden">
             <Dropdown.Item>Events</Dropdown.Item>
-          </Link>
+          </Link>)
+          }
           <Link href="/profile">
             <Dropdown.Item>Profile</Dropdown.Item>
           </Link>
@@ -55,12 +56,14 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
             Users
           </Navbar.Link>
         )}
-        <Navbar.Link href="/events" className="ml-4 text-white">
+        {isAdmin && (<Navbar.Link href="/events" className="ml-4 text-white">
           Events
-        </Navbar.Link>
-        <Navbar.Link href="/calendar" className="ml-4 text-white">
+        </Navbar.Link>)
+        }
+        {isAdmin && (<Navbar.Link href="/calendar" className="ml-4 text-white">
           Recruitment
-        </Navbar.Link>
+        </Navbar.Link>)
+        }
         <Navbar.Link href="/application_status" className="ml-4 text-white">
           Application Status
         </Navbar.Link>
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index ea1ef42b..39aca4d3 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -1,5 +1,3 @@
-import { useRouter } from 'next/router'
-import { useSession, signIn } from 'next-auth/react'
 import { useState, useCallback } from 'react'
 import Head from 'next/head'
 import { Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, useDisclosure, useToast } from '@chakra-ui/react'
@@ -40,9 +38,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
     }
 
   ]
-  const status =[
-    {status: 'accepty'}
-  ]
+
   return (
     <>
       <Head>
@@ -54,7 +50,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
       <main>
         <div className="relative h-screen w-screen bg-[url('/images/applicants_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
           {/* Nav element containing the logo */}
-       
+          
           <nav className="flex justify-center items-center  px-2 py-2 " >
           
             <Image

From b0fcf81370775404bb19d152a688d42d5a2692f4 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sat, 3 Jun 2023 23:49:19 +0800
Subject: [PATCH 150/223] Update Navbar to use image if there is

---
 src/components/common/TopNavbar.tsx |  5 +++--
 src/pages/api/auth/[...nextauth].ts |  1 +
 src/pages/calendar/index.tsx        |  5 ++++-
 src/pages/events/[id].tsx           |  5 ++++-
 src/pages/events/create.tsx         |  5 ++++-
 src/pages/events/index.tsx          |  5 ++++-
 src/pages/index.tsx                 |  9 ++++++---
 src/pages/profile/index.tsx         | 11 +++++++----
 src/pages/users/create.tsx          |  5 ++++-
 src/pages/users/index.tsx           |  5 ++++-
 10 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index 7c64f5da..f38c261d 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -5,9 +5,10 @@ import { useCallback } from 'react'
 
 interface TopNavbarProps {
   isAdmin: boolean
+  image: string
 }
 
-const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
+const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin, image }) => {
   const logout = useCallback(async () => {
     await signOut()
   }, [])
@@ -21,7 +22,7 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin }) => {
         <Dropdown
           arrowIcon={false}
           inline={true}
-          label={<Avatar alt="User-settings" rounded={true} />}
+          label={<Avatar alt="User-settings" img={image} rounded={true} />}
         >
           <Link href="/" className="md:hidden">
             <Dropdown.Item>Home</Dropdown.Item>
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 2b9d8c9a..167237f6 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -70,6 +70,7 @@ export const authOptions: NextAuthOptions = {
             name: user.name,
             email: user.email,
             isAdmin: user.isAdmin,
+            image: user.image || '',
           }
         } catch (e) {
           throw new Error((e as Error).message)
diff --git a/src/pages/calendar/index.tsx b/src/pages/calendar/index.tsx
index 0ee268bb..1526db9d 100644
--- a/src/pages/calendar/index.tsx
+++ b/src/pages/calendar/index.tsx
@@ -45,7 +45,10 @@ const CalendarPage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The calendar page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
       <div className="grid-container grid grid-cols-5">
         <SideCalendar meetings={meetings} />
         <MainCalendar />
diff --git a/src/pages/events/[id].tsx b/src/pages/events/[id].tsx
index 853c1049..e26321ad 100644
--- a/src/pages/events/[id].tsx
+++ b/src/pages/events/[id].tsx
@@ -78,7 +78,10 @@ const ConfirmAttendance: React.FC<BaseProps> = ({ session }) => {
           content="The confirm attendance page for Atlas"
         />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
       <Container>
         <div className="flex w-full flex-col items-start">
           {data ? (
diff --git a/src/pages/events/create.tsx b/src/pages/events/create.tsx
index cfb8cc4a..a802f2ec 100644
--- a/src/pages/events/create.tsx
+++ b/src/pages/events/create.tsx
@@ -105,7 +105,10 @@ const EventPage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The create event page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
       <Container>
         <form onSubmit={handleSubmit(formSubmit)}>
           <h1 className="mb-10 text-center text-2xl font-bold">
diff --git a/src/pages/events/index.tsx b/src/pages/events/index.tsx
index 88b12252..19833f0c 100644
--- a/src/pages/events/index.tsx
+++ b/src/pages/events/index.tsx
@@ -80,7 +80,10 @@ const AttendancePage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The attendance page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
       <div className="px-2 sm:px-6 sm:pt-5 md:px-20 md:pt-5 lg:px-28 lg:pt-5">
         <h1 className="mb-10 text-center text-2xl font-bold">Attendance</h1>
         <VStack align="left" className="mb-10">
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 0be65f09..74faf096 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -4,7 +4,7 @@ import React, { useState } from 'react'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
 import { Box, Circle, Grid, GridItem, Heading, Input } from '@chakra-ui/react'
 
-const HomePage: React.FC<BaseProps> = ({ session }) => { 
+const HomePage: React.FC<BaseProps> = ({ session }) => {
   const [searchQuery, setSearchQuery] = useState('')
   const data = [
     {
@@ -80,7 +80,10 @@ const HomePage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The home page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
       <div className="flex flex-col bg-[#B1A6DB] p-16">
         <h1 className="text-left text-[50px] font-bold leading-none md:text-[88px]">
           Our
@@ -97,7 +100,7 @@ const HomePage: React.FC<BaseProps> = ({ session }) => {
         borderWidth="3px"
         w={{ base: '150px', md: '300px' }}
         border="3px solid #F9813E"
-        borderColor="#F9813E" 
+        borderColor="#F9813E"
         borderRadius="10px"
         className="mt-10 ml-8 mb-4"
         _placeholder={{
diff --git a/src/pages/profile/index.tsx b/src/pages/profile/index.tsx
index 82cfad8b..f44b937c 100644
--- a/src/pages/profile/index.tsx
+++ b/src/pages/profile/index.tsx
@@ -13,10 +13,13 @@ const ProfilePage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The profile page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
-      <Text className="m-8 text-center text-3xl font-semibold underline underline-offset-8"> 
-        Profile 
-      </Text> 
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
+      <Text className="m-8 text-center text-3xl font-semibold underline underline-offset-8">
+        Profile
+      </Text>
       <ProfileGrid session={session} studentId={session?.user?.id as string} />
     </Box>
   )
diff --git a/src/pages/users/create.tsx b/src/pages/users/create.tsx
index 29e7ae5a..84938372 100644
--- a/src/pages/users/create.tsx
+++ b/src/pages/users/create.tsx
@@ -16,7 +16,10 @@ const UserForm: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The create user page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
       <div className="m-auto w-[90%]">
         {/* Heading */}
         <h1 className="mb-5 font-[Inter] text-4xl font-semibold">
diff --git a/src/pages/users/index.tsx b/src/pages/users/index.tsx
index 448c0c30..c08e2e9f 100644
--- a/src/pages/users/index.tsx
+++ b/src/pages/users/index.tsx
@@ -11,7 +11,10 @@ const AdminUserPage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The login page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
 
       <DataTable />
     </>

From de6d3d9d8a4d84eb5443dc1870ef21444e64812e Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sat, 3 Jun 2023 23:58:38 +0800
Subject: [PATCH 151/223] Fix the bug where the profile image cannot be
 uploaded

---
 src/components/profile/ProfileCard.tsx        | 16 ++---
 src/components/profile/ProfileGrid.tsx        |  3 +-
 src/components/profile/ProfileInfo.tsx        | 55 +--------------
 .../trpc/router/users/createManyUsers 2.ts    | 67 +++++++++++++++++++
 .../trpc/router/users/createManyUsers.ts      |  2 +-
 5 files changed, 77 insertions(+), 66 deletions(-)
 create mode 100644 src/server/trpc/router/users/createManyUsers 2.ts

diff --git a/src/components/profile/ProfileCard.tsx b/src/components/profile/ProfileCard.tsx
index 5d87535a..86f45077 100644
--- a/src/components/profile/ProfileCard.tsx
+++ b/src/components/profile/ProfileCard.tsx
@@ -1,6 +1,5 @@
 import { trpc } from '../../utils/trpc'
 import { Box, Button, Image, Text } from '@chakra-ui/react'
-import type { Session } from 'next-auth'
 import { useRouter } from 'next/router'
 import UploadImageBtn from './UploadImageButton'
 
@@ -11,13 +10,11 @@ const ProfileCard = ({
   dept,
   role,
   studentId,
-  session,
 }: {
   name: string | null
   dept: string | null
   role: string | null
   studentId: string
-  session: Session
 }) => {
   const router = useRouter()
   const redirectToResetPassword = () => router.push('/auth/forgetpassword')
@@ -39,17 +36,16 @@ const ProfileCard = ({
           borderRadius="full"
           boxSize="170px"
         />
-        {session?.user?.id === studentId ?? (
-          <Box className="absolute bottom-0 right-0">
-            <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
-          </Box>
-        )}
+
+        <Box className="absolute bottom-0 right-0">
+          <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
+        </Box>
       </Box>
       <Box className="flex flex-col items-center py-2">
-        <Text textColor="##FFFFFF" className="text-2xl font-medium">
+        <Text textColor="#FFFFFF" className="text-2xl font-medium">
           {name}
         </Text>
-        <Text textColor="##FFFFFF">{dept}</Text>
+        <Text textColor="#FFFFFF">{dept}</Text>
         <Text textColor="#FFFFFF">{role}</Text>
       </Box>
       <Button
diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index 260518e2..8aa39b1a 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -31,14 +31,13 @@ const ProfileGrid = ({
           dept={data.department}
           role={data.role}
           studentId={studentId}
-          session={session}
         />
       </div>
       <div className="col-span-2 w-3/4">
         <ProfileContactInfo studentId={studentId} {...data} refetch={refetch} />
       </div>
       <div className="col-span-2 row-span-2 mb-10 w-3/4">
-        {/* <ProfileInfo {...data} /> */}
+        <ProfileInfo batch={data.batch as string} />
       </div>
     </div>
   )
diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index 13263710..32886653 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -1,11 +1,8 @@
 import { Box, Table, TableContainer, Tbody, Td, Tr } from '@chakra-ui/react'
 
 type ProfilePageType = {
-  gender: string | null
-  batch: string | null
-  year: string | null
-  faculty: string | null
-  major: string | null
+  batch: string | undefined
+
   // projects: Projects[]
 }
 
@@ -20,14 +17,6 @@ const ProfileInfo = (props: ProfilePageType) => {
       <TableContainer>
         <Table variant="unstyled" size="sm">
           <Tbody>
-            <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                GENDER
-              </Td>
-              <Td textColor="#002D70" className="font-light">
-                {props.gender}
-              </Td>
-            </Tr>
             <Tr>
               <Td textColor="#002D70" className="font-medium">
                 BATCH
@@ -36,46 +25,6 @@ const ProfileInfo = (props: ProfilePageType) => {
                 {props.batch}
               </Td>
             </Tr>
-            <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                YEAR
-              </Td>
-              <Td textColor="#002D70" className="font-light">
-                {props.year}
-              </Td>
-            </Tr>
-            <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                FACULTY
-              </Td>
-              <Td textColor="#002D70" className="font-light">
-                {props.faculty}
-              </Td>
-            </Tr>
-            <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                MAJOR
-              </Td>
-              <Td textColor="#002D70" className="font-light">
-                {props.major}
-              </Td>
-            </Tr>
-            {/* <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                PROJECTS
-              </Td>
-              {props.projects.map((project: Projects) => {
-                return (
-                  <Td
-                    key={project.project_id}
-                    textColor="#002D70"
-                    className="font-light"
-                  >
-                    {project.name}
-                  </Td>
-                )
-              })}
-            </Tr> */}
           </Tbody>
         </Table>
       </TableContainer>
diff --git a/src/server/trpc/router/users/createManyUsers 2.ts b/src/server/trpc/router/users/createManyUsers 2.ts
new file mode 100644
index 00000000..44a6649b
--- /dev/null
+++ b/src/server/trpc/router/users/createManyUsers 2.ts	
@@ -0,0 +1,67 @@
+import { protectedProcedure } from '../../trpc'
+import { z } from 'zod'
+import { randomBytes } from 'crypto'
+import { hash } from 'bcryptjs'
+
+import { sendMultipleEmails } from '../util/helper'
+import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
+import { db } from '~/server/db/firebase'
+import type { User } from '~/server/db/models/User'
+import logCollection from '~/server/db/collections/LogCollection'
+import { Timestamp } from 'firebase/firestore'
+
+export const createManyUsers = protectedProcedure
+  .input(
+    z.array(
+      z.object({
+        department: z.string(),
+        name: z.string(),
+        nus_email: z.string(),
+        role: z.string(),
+        student_id: z.string(),
+      })
+    )
+  )
+  .mutation(async ({ input }) => {
+    try {
+      const password = randomBytes(10).toString('hex')
+      const hashedPassword = await hash(password, 10)
+      const emails: string[] = []
+
+      // Add user logic. Note that each firebase batch only allow up to 500 writes so we need an array for more than 500 users.
+      let batchIndex = 0
+      let counter = 0
+      const batches: WriteBatch[] = [writeBatch(db)]
+      input.forEach((user) => {
+        emails.push(user.nus_email)
+
+        batches[batchIndex]?.set(doc(db, 'users', user.student_id), {
+          department: user.department,
+          email: user.nus_email,
+          hashedPassword,
+          name: user.name,
+          isAdmin: false,
+          id: user.student_id,
+          role: user.role,
+        } as User)
+
+        counter += 1
+
+        if (counter === 499) {
+          batches.push(writeBatch(db))
+          batchIndex += 1
+          counter = 0
+        }
+      })
+
+      await Promise.all(batches.map(async (batch) => await batch.commit()))
+      await sendMultipleEmails(emails, password)
+    } catch (e) {
+      await logCollection.add({
+        createdAt: Timestamp.fromDate(new Date()),
+        level: 'WARNING',
+        description: (e as Error).message,
+        title: 'Error while uploading multiple users',
+      })
+    }
+  })
diff --git a/src/server/trpc/router/users/createManyUsers.ts b/src/server/trpc/router/users/createManyUsers.ts
index 44a6649b..04803a4e 100644
--- a/src/server/trpc/router/users/createManyUsers.ts
+++ b/src/server/trpc/router/users/createManyUsers.ts
@@ -3,7 +3,7 @@ import { z } from 'zod'
 import { randomBytes } from 'crypto'
 import { hash } from 'bcryptjs'
 
-import { sendMultipleEmails } from '../util/helper'
+import { sendMultipleEmails } from '../member/helper'
 import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
 import { db } from '~/server/db/firebase'
 import type { User } from '~/server/db/models/User'

From 53b14c6cdddc003e5e196922eaa0f6504938c333 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 4 Jun 2023 23:55:51 +0800
Subject: [PATCH 152/223] change some styles for small screens

---
 src/components/common/TopNavbar.tsx    |  19 ++-
 src/pages/application_status/index.tsx |  83 +++++-----
 src/pages/tasks/index.tsx              | 211 ++++++++++---------------
 3 files changed, 132 insertions(+), 181 deletions(-)

diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index f38c261d..f7d64681 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -36,12 +36,14 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin, image }) => {
             <Dropdown.Item>Events</Dropdown.Item>
           </Link>)
           }
-          <Link href="/profile">
+         <Link href="/profile">
             <Dropdown.Item>Profile</Dropdown.Item>
           </Link>
-          <Link href="/calendar">
+        
+          {isAdmin && <Link href="/calendar">
             <Dropdown.Item>Calendar</Dropdown.Item>
           </Link>
+          }
           <Dropdown.Item>
             <div onClick={logout}>Sign Out</div>
           </Dropdown.Item>
@@ -65,12 +67,19 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin, image }) => {
           Recruitment
         </Navbar.Link>)
         }
-        <Navbar.Link href="/application_status" className="ml-4 text-white">
-          Application Status
+        {!isAdmin && <Navbar.Link href="/application_status" className="ml-4 text-white">
+          Status
         </Navbar.Link>
-        <Navbar.Link href="/tasks" className="ml-4 text-white">
+        }
+
+        {!isAdmin && <Navbar.Link href="/tasks" className="ml-4 text-white">
           Tasks
         </Navbar.Link>
+        }
+        {!isAdmin && <Navbar.Link  className="ml-4 text-white">
+          Update Information
+        </Navbar.Link>
+        }
       </Navbar.Collapse>
     </Navbar>
   )
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 39aca4d3..e3fb20cb 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -1,6 +1,6 @@
 import { useState, useCallback } from 'react'
 import Head from 'next/head'
-import { Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, useDisclosure, useToast } from '@chakra-ui/react'
+import { Center, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, useDisclosure, useToast } from '@chakra-ui/react'
 import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { BaseProps } from '~/utils/withAuth'
@@ -46,7 +46,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The login page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar  image={session.user?.image as string} isAdmin={session.isAdmin} />
       <main>
         <div className="relative h-screen w-screen bg-[url('/images/applicants_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
           {/* Nav element containing the logo */}
@@ -63,23 +63,22 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
             />
          
           </nav>
-       
-
+      
           {/* Login */}
           <div className="flex flex-col justify-center gap-8 font-[Inter]">
           
-            <h1 className='flex justify-center font-bold text-8xl mt-4'>
+            <h1 className='flex justify-center font-bold text-4xl md:text-8xl mt-4'>
               Hi User,
             </h1>
-            <h2 className='flex justify-center  mt-3 font-bold text-6xl'>
+            <h2 className='flex justify-center mt-3 font-bold text-2xl md:text-6xl'>
               your current statuses are:
             </h2>
       
             {roles.map((item) => ( 
-              <div key={item.id} className="flex  items-center mt-3 ">
+              <div key={item.id} className="flex items-center mt-3 ">
                   <div className="flex-grow">
                 {item.status == 'accepted' && 
-                <h3 className='flex mt-3 justify-center text-5xl'>
+                <h3 className='flex mt-3 justify-center text-2xl md:text-5xl'>
                   {item.name}
                   <Image
                     alt="logo"
@@ -92,7 +91,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                   </h3>
                 }
               
-                {item.status == 'offered' && <h3 className='flex justify-center text-5xl'>
+                {item.status == 'offered' && <h3 className='flex justify-center text-2xl md:text-5xl'>
                 {item.name}
                   <Image
                     alt="logo"
@@ -105,7 +104,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                   </h3>
                 }
                 
-                {item.status == 'pending_review' && <h3 className='flex justify-center text-5xl'>
+                {item.status == 'pending_review' && <h3 className='flex justify-centertext-2xl md:text-5xl'>
                 {item.name}
                   <Image
                     alt="logo"
@@ -117,7 +116,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     {/* Pending Review */}
                   </h3>
                 }
-                {item.status == 'interviewed' && <h3 className='flex justify-center text-5xl'>
+                {item.status == 'interviewed' && <h3 className='flex justify-center text-2xl md:text-5xl'>
                 {item.name}
                   <Image
                     alt="logo"
@@ -129,7 +128,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     {/* Interviewed */}
                   </h3>
                 }
-                {item.status == 'rejected' && <h3 className='flex justify-center text-5xl'>
+                {item.status == 'rejected' && <h3 className='flex justify-center text-2xl md:text-5xl'>
                 {item.name}
                   <Image
                     alt="logo"
@@ -148,7 +147,7 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
              <div style={{ position: 'fixed', bottom: '40px', right: '60px' }}>
               <button 
                 onClick={onOpen}       
-                className="w-20 h-20 rounded-full 
+                className="w-16 h-16 md:w-20 md:h-20 rounded-full 
                        bg-[#FFEBC5]  
                        hover:bg-[#FFD27C]
                        text-white
@@ -158,35 +157,30 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                          <Image
                     alt="question_mark"
                     src="/images/question_mark.svg"
-                    height={20}
+                    height='20'
                     width={20}
-                    className='ml-7'  
+                    className='md:ml-7 ml-5'  
                   
                         
                   />
             
         </button>
         </div>
-        <Modal  isOpen={isOpen} onClose={onClose}>
+        <Modal  isOpen={isOpen} onClose={onClose} size="xs">
             <ModalOverlay 
             bg='none'
-            backdropFilter='auto'
-            
-          
+            backdropFilter='auto'         
             />
            
            
-            <ModalContent 
-        
-             
-            
-        
-            >
+            <ModalContent > 
                 
             <ModalHeader fontSize='5xl' ></ModalHeader>
             <ModalCloseButton />
             <ModalBody fontSize='3xl' >
-              <div className='flex justify-left ml-24'>
+          
+            <div className="flex flex-col items-start">
+              <div className='flex items-center'>
               <Image
                     alt="logo"
                     src="/images/Ellipse 1.svg"
@@ -195,7 +189,10 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     className='flex flex-col mr-5'              
                   />
                 Accepted</div>
-              <div  className='flex justify-left ml-24'>
+                </div>
+            
+              <div className="flex flex-col items-start">
+              <div className='flex items-center'>
               <Image
                     alt="logo"
                     src="/images/blue_dot.svg"
@@ -204,7 +201,9 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     className='flex flex-col mr-5'
                   />
                   Offered</div>
-              <div  className='flex justify-left ml-24'>
+                  </div>
+                  <div className="flex flex-col items-start">
+              <div className='flex items-center'>
               <Image
                     alt="logo"
                     src="/images/yellow_dot.svg"
@@ -213,7 +212,9 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     className='mr-5'             
                   />
                   Pending Review</div>
-              <div className='flex justify-left ml-24'>
+                  </div>
+                  <div className="flex flex-col items-start">
+              <div className='flex items-center'>
               <Image
                     alt="logo"
                     src="/images/pink_dot.svg"
@@ -221,34 +222,22 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     width={35}
                     className='mr-5'             
                   />Interviewed</div>
-              <div className='flex justify-left ml-24'>
+                  </div>
+                <div className="flex flex-col items-start">
+              <div className='flex items-center'>
               <Image
                     alt="logo"
                     src="/images/red_dot.svg"
                     height={35}
                     width={35}
                     className='mr-5'             
-                  />Rejected</div>
-
-
-              
-            
+                  />Rejected</div>      
+                </div>
             </ModalBody>
-
             <ModalFooter>
-           
             </ModalFooter>
         </ModalContent>
-        
         </Modal>
-      
-       
-
-           
-            
-          
-
-          
           </div>
         </div>
       </main>
@@ -257,4 +246,4 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
 }
 
 
-export default withAuth(Application_Status)
\ No newline at end of file
+export default withAuth(Application_Status, false)
\ No newline at end of file
diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 66978196..5656b799 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -1,8 +1,8 @@
 import { useRouter, } from 'next/router'
 import { useSession} from 'next-auth/react'
-import { useState, useCallback, useRef } from 'react'
+import { useState, useCallback, useRef, Fragment } from 'react'
 import Head from 'next/head'
-import {  Box, Button, Grid, GridItem, Heading, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, Portal, useDisclosure, useToast, Text, InputGroup, InputLeftElement } from '@chakra-ui/react'
+import {  Box, Button, Grid, GridItem, Heading, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, Portal, useDisclosure, useToast, Text, InputGroup, InputLeftElement, TableContainer, Table, TableCaption, Thead, Tr, Th, Tbody, Td, Tfoot, Center } from '@chakra-ui/react'
 import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
@@ -65,9 +65,9 @@ const Tasks:React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The login page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar  image={session.user?.image as string} isAdmin={session.isAdmin} />
       <main>
-        <div className="relative h-screen w-screen bg-[url('/images/tasks_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
+        <div className="relative h-screen w-screen  bg-[url('/images/tasks_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
           {/* Nav element containing the logo */}
        
 
@@ -82,7 +82,7 @@ const Tasks:React.FC<BaseProps> = ({ session }) => {
             </h1>
             
            
-                <InputGroup>
+                {/* <InputGroup>
       <InputLeftElement
         className="mt-[1%] ml-[8%] mb-4"
         pointerEvents="none"
@@ -101,172 +101,125 @@ const Tasks:React.FC<BaseProps> = ({ session }) => {
                 borderRadius="30px"
                 className="mt-[1%] ml-[8%] mb-4 text-white"
                 _placeholder={{
-                pl: { base: '65px', lg: '5px' },
+                pl: { base: '5px', lg: '3px' },
                 fontStyle: 'italic',
                 }}
             />
-    </InputGroup>
+    </InputGroup> */}
               
                 
               
-           <Box
-  overflowY="auto"
-  maxHeight="40vh"
-  sx={{
-    '&::-webkit-scrollbar': {
-      width: '30px',
-    },
-    '&::-webkit-scrollbar-thumb': {
-      backgroundColor: `#004B90`,
-      borderRadius: '20px',
-      border: '5px solid transparent',
-      backgroundClip: 'content-box',
-    },
-  }}
-  className="p-16"
->
-  <Grid
-  className='ml-[11%]'
-    templateColumns={{
-      base: 'repeat(3, 1fr)',
-      md: 'repeat(3, 1fr)',
-    }}
-    gridGap={{ base: '4' }}
-    gridRowGap={{ base: '4', md: '12' }}
-  >
-    {/* Column headings */}
-    <GridItem colSpan={1} className="justify-content-center flex flex-col">
-      <h1 className="text-xl font-bold text-white">Status</h1>
-    </GridItem>
-    <GridItem colSpan={1} className="justify-content-center flex flex-col">
-      <h1 className="text-xl font-bold text-white">Task</h1>
-    </GridItem>
-    <GridItem colSpan={1} className="justify-content-center flex flex-col">
-      <h1 className="text-xl font-bold text-white">Do By</h1>
-    </GridItem>
-    </Grid>
-
-    {/* Data rows */}
-    {filteredData.map((item) => (
-      <Grid
-      key={item.id}
-      className='mt-[2%] ml-[11%]'
-      templateColumns={{
-        base: 'repeat(3, 1fr)',
-        md: 'repeat(3, 1fr)',
-      }}
-      gridGap={{ base: '4' }}
-      gridRowGap={{ base: '4', md: '12' }}
-
-    >
-      
-        <GridItem colSpan={1} className="justify-content-center flex flex-col">
-          
+              <Center>
+              <div className="max-w-screen-lg mx-auto md:max-w-screen-md">
+
+      <table className="min-w-full divide-y divide-gray-200">
+        <thead className="">
+          <tr>
+            <th
+              scope="col"
+              className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
+            >
+              Status
+            </th>
+            <th
+              scope="col"
+              className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
+            >
+              Task
+            </th>
+            <th
+              scope="col"
+              className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
+            >
+              Do By
+            </th>
+          </tr>
+        </thead>
+        <tbody className="divide-y divide-gray-200">
+        {filteredData.map((item) => (
+           
+      <tr key={item.id}>
+         <td className="px-6 py-4 whitespace-nowrap">
+         
           <h1 className="  text-white">{item.status == "Incomplete" && 
           <button
           disabled = {true}
-          className="flex-col  items-center w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#C51F29] py-1 px-5 font-medium transition"
+          className="flex-col  items-center w-24 md:w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#C51F29] py-1 px-5 font-medium transition"
 
             >
-          <div className='font-[Inter] text-xl text-white'>
+          <div className='font-[Inter] text-xs md:text-xl text-white'>
           {item.status}
           </div>
         </button>
           }
           {item.status == "In Progress" && <button
           disabled = {true}
-          className="flex-col items-center w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#FFBD3C] py-1 px-5 font-medium transition"
+          className="flex-col items-center w-24 md:w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#FFBD3C] py-1 px-5 font-medium transition"
          
             >
-          <div className='font-[Inter] text-xl text-white'>
+          <div className='font-[Inter] text-xs md:text-xl text-white'>
           {item.status}
           </div>
         </button>}
           {item.status == "Done" && <button
           disabled = {true}
-          className="flex-col items-center w-[150px] max-w-20 bg-opacity-100  text-md mx-auto rounded-full  bg-[#00C09D] py-1 px-5 font-medium transition"
+          className="flex-col items-center w-24 md:w-[150px] max-w-20 bg-opacity-100  text-md mx-auto rounded-full  bg-[#00C09D] py-1 px-5 font-medium transition"
          
             >
-          <div className='font-[Inter] text-xl text-white'>
+          <div className='font-[Inter] text-xs md:text-xl text-white'>
           {item.status}
           </div>
         </button>}
           </h1>
-          
-        </GridItem>
-      
-       
-        
-      
-        
-        <div  
-        ref={el => {
-            // el can be null - see https://reactjs.org/docs/refs-and-the-dom.html#caveats-with-callback-refs
-            if (!el) return;
-    
-            console.log(el.offsetLeft); // prints 200px
-          }}
-          >
-        <GridItem colSpan={1} className="justify-content-center flex flex-col">
-         
-         
-          <Text
-        
+          </td>
+          <td>  
+            <Text
         as="span"
         cursor="pointer"
         _hover={{ textDecoration: 'underline' }}
-        className='text-xl text-white'
+        className='md:text-xl text-white'
         onClick={() => {setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
        
       >
         {item.name}
       </Text>
+      </td>
+      <td>  <h1 className="md:text-xl text-white">{item.due}</h1></td>
+          
+          </tr>
+          
+    ))}
+
      
-    
-          <Modal isCentered={true} isOpen={isOpen} onClose={onClose}>
-            <ModalOverlay 
-            bg='none'
-            backdropFilter='auto'
-            
-            backdropBlur='2px'
-            />
-           
-           
-            <ModalContent 
         
-             
-            
-        
-            >
-                
-            <ModalHeader fontSize='5xl' >{currentName}</ModalHeader>
-            <ModalCloseButton />
-            <ModalBody fontSize='3xl' >
-                {currentDetails}
+        </tbody>
+      </table>
+      
+      <Modal isCentered={true} isOpen={isOpen} onClose={onClose}>
+      <ModalOverlay 
+      bg='none'
+      backdropFilter='auto'
+      
+      backdropBlur='2px'
+      />
             
-            </ModalBody>
-
-            <ModalFooter>
-           
-            </ModalFooter>
-        </ModalContent>
-        
-        </Modal>
+      <ModalContent>
+      <ModalHeader fontSize='5xl' >{currentName}</ModalHeader>
+      <ModalCloseButton />
+      <ModalBody fontSize='3xl' >
+          {currentDetails}
       
-       
- 
-        </GridItem>
-        </div>
-        
-        <GridItem colSpan={1} className="justify-content-center flex flex-col">
-          <h1 className="text-xl text-white">{item.due}</h1>
-        </GridItem>
-    </Grid>
+      </ModalBody>
+
+      <ModalFooter>
+     
+      </ModalFooter>
+  </ModalContent>
   
-       
-    ))}
- 
-</Box>
+  </Modal>
+    </div>
+    
+</Center>
             
 
           
@@ -277,4 +230,4 @@ const Tasks:React.FC<BaseProps> = ({ session }) => {
   )
 }
 
-export default withAuth(Tasks, true)
\ No newline at end of file
+export default withAuth(Tasks, false)
\ No newline at end of file

From bd3d1ae678c581002b22e25ab94bf1fcf280a64e Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Mon, 5 Jun 2023 00:07:08 +0800
Subject: [PATCH 153/223] change the icon;s position for mobile

---
 src/pages/application_status/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index e3fb20cb..4d7aef7e 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -144,7 +144,9 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                 </div>
 
             ))}
-             <div style={{ position: 'fixed', bottom: '40px', right: '60px' }}>
+             <div 
+             className='fixed bottom-20 md:right-28 right-6'
+             >
               <button 
                 onClick={onOpen}       
                 className="w-16 h-16 md:w-20 md:h-20 rounded-full 
@@ -160,8 +162,6 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
                     height='20'
                     width={20}
                     className='md:ml-7 ml-5'  
-                  
-                        
                   />
             
         </button>

From 58d0ceae92a800dbbc4cfc6113d365c0172c592d Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 7 Jun 2023 20:00:45 +0800
Subject: [PATCH 154/223] changed applicant grid

---
 src/components/recruitment/ApplicantGrid.tsx | 31 ++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 src/components/recruitment/ApplicantGrid.tsx

diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
new file mode 100644
index 00000000..418b3a51
--- /dev/null
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -0,0 +1,31 @@
+import { useContext } from 'react'
+import { searchContext } from '~/context/recruitment/SearchProvider'
+import { trpc } from '~/utils/trpc'
+import ApplicantCard from './ApplicantCard'
+import InfoPopup from '~/components/recruitment/InfoPopup'
+
+const ApplicantGrid = () => {
+  const { search } = useContext(searchContext)
+  const { data } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
+  if (!data) return <></>
+
+  const filteredData =
+    search === ''
+      ? data
+      : data?.filter((applicant) => {
+          return applicant.name.toLowerCase().includes(search.toLowerCase())
+        })
+
+  return (
+    <>
+      <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
+        {filteredData?.map((applicant) => {
+          return <ApplicantCard applicant={applicant} key={applicant.id} />
+        })}
+      </div>
+      {filteredData.length > 0 && <InfoPopup />}
+    </>
+  )
+}
+
+export default ApplicantGrid

From c9b79033e86101ac1a3a52b7a48ef1e3ede1c5a1 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 11 Jun 2023 14:09:59 +0800
Subject: [PATCH 155/223] delete Atlas.zip and prisma

---
 Atlas.zip | Bin 3074 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Atlas.zip

diff --git a/Atlas.zip b/Atlas.zip
deleted file mode 100644
index 5e7a95b030b6eff75fe1ae2cb1c7bb45fc348ca9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3074
zcmZve2{csw8^_0tHG5M=$TBF(T7<H^wqh`2DO*FmdPBlAGX_KPGO~@eG&Ez$WSeXu
z#E=w5b|GtI5@{-mnh^b^^RGYWfA6{H+<VXY{LXXE=RD8zwY36q?g9V+yZ|*k-LdYB
zP~P>;uk6j|=U>N*7XnZiHEf`lc0z?vq{bfephwI%bpt#;)aWDPe$L2!6V^o!EdAoN
z^bMy-EuSVRSTcTJ#0QbYmUqrWyeG%|&En=9B3pePMW2Ck7;pSdnR=lYXBeD#KP)px
zkt|+F6zM{Kek3quH)y6{FFj7Z?cV=b_EUv+(OpAay?}wikH(iD%7kFK7A9ijOdi{9
z#mdSZD|*fW0K5hP00O^@Rn`1iuA4)%|G0)gBl|G#f`0TKMVQ1pAf<vD^KtB{KNne%
zqw;|>p+3h5#+QZT_I(|PfKJKd)>msH@a%wzB+x-2knb?P`>U>y3HM|mYh`?CO;<$Z
zf$s8~bM*BvDWTq&FMx$6cFZt(L^@ghoMSOQ8!dKqqsoN~>N@)AY4^~V&ev#u#Op<Z
ztY$%o%r1NT*eE+?g!12sq9*1qG9&bs?|bCi^WPt%XdXq#wa2;IR^3~tIba`Cqs{lk
z=f~<>zJZrU-8kG5+(C=9RI#M;N@zquNlk(Gb~~2cDamq$iX{Qbph4f(f3h&`Ssh&#
zEh&kE54$3BxyLWS?TQ=V`Pl)QqCVHj@XGj7pR+1=M5|-1YwpfRDv4XtK?R)_d=9B3
z)tvW5dkzRaPiyvCi~fjE%C8{K!~JTP^JZ;NxcY#-6jU75CGVmks0;JAxv-^A*o~c0
zig5<QCXt6$K6a6>vhn-BFY+hxXEc;32A734+YFi*9(IrPI;A%99#eT@-dHE3`32`(
z2tj{VFkphrLZTWNSJlL<Avi;X^b-2)ePqi@T1Z!6uxR0%bMhO-(;)4u?IEXx*G<-!
ztyXBW<x?nB%&nL8fouL{8^G=EKckvmdp6y_*zW$wFZTwh@xKIKE**|#!Ivy1_m{^W
zG23?}?{c(17jujodBP$=$*5_N@yv$DID~P~(C|jk+C~LodJ!`kBv;VR@pb&EfA~Dm
ziEj}-BE+8SRTB|OKxZU{%Oo+>GJ6XB{_Qnl41_|yrgyT~-JasyQk=agx*)i}Z6JnD
z86Q5EZqN`g&0`EzF`tPORKD03Nki}zA1Z=k)kNeGn#vi1R3m6cSDqIs?%Cez<2Mrz
z9Dr!e5yO>V6g3X&g5@P_XkK-1F|LigTo6qrlZm5}iKa<-(#bfpB;wfv5UXqG)Knd(
zGu8(^o;e@Q*qs({?h;yDC3zuDDz{)X0g|F!rw5h9niXHm(_iI)J4fNPK87I;F6`dR
zP&CC{e}_9s>IbJqlBwyaV;K3m{P!qyx9dyyk9P<A!NFk6^`h)2x5*8bOqU_gGi~JT
z0$TmO8DFWKx<j7I$^0~wk@{Sp{ke*=J1Fha=KPtx$zhJ4Jpu)5JWEC-huTYtsw3nE
z51GGS*YrPdmP9@su!i_kf{4`@oi*KFR`2(zz%e99#dSE%^bs5yf*sxPYYErBn)?|t
zbSlK%zppn?xarnE!op(5!us3zgMyYI+r3}@>~>^e)BEIh???aZeL~}>cV3)Ya^54N
zuIYrFX}#xLN7?ixj$!&8P3HIS_LcdUkB{!jX=h8*#%tLi6~-K1LLgKOG_VnzG20xg
z3tC{TW5QR&1vreKnHq%YWy1-2=XydxGEIoN+Ggve@2h^bXGvTTV!BaGmPkLmld>g!
ziL;lmV*CmkADR|51N!!_;Y@#MSC8?ccxl+}e9xPvlvZF2=d-(sJxS0SkDHUHkHsB2
zvb(ZYtYj#h>q^4iZe*&a2gWcGdl_+{?X9@JUb|SMQwbYiS|1qkIM*ZVl;U0Vpu3O*
zO;XXZ<Y|gYUl^>)!%FIwR)qJEb)YqV?@1-O=uEk_Gowy#GN{zsN;LNb>R5(}D9@Pe
z9`Nb20E1npQ>3cX9b%porN!5H04=#mX}h#`!8~3ubCWwFPSw;YfevPvIl%Wj<prL9
zPE;F;&P=thNya_tI9XDSfJze*g(bb;2MuGr^UEt(%_B-*X4)Py%x!p3_Mw$4eHXN8
z5tQqyqxv7wpTeJR%127N5n0YUzLNOP>RWF$-G-{q_|(<-7}PkS{mjpnsa}CVo;RKR
z&X@+DHpE@KQ@BbBt6_g@r7y0#cfn<l_~0O&aE|Tr%UKW4_ioCc-!5P4m;4I<E%|$+
zPNWx@#odTUM%OF-YI=;G%#}ud3HhG6^hz7If#ze`E8p5r!D`D<JQ>M|frl()z#{@W
zTtDF^G*xIaX>En|=Gw5R$e^xDQ%-W>K-r0NJ!?Xf;W<6!bpOnPboFaSy+?ZzHvLb6
z?aDvDeA)e>v;0z2p&OeZ3&~TMZ}!SlO5p?Hr9E190~KQIfCOw9ALHN2`C-fGSAAal
z8s@Iw1NO5hV$_5GkT_R?-MCczE2db%=lnFFT#2@klie(5DzFH)y!$~!Wyf)W(W9|9
zs|m4X3LKX1G6K&!Q?9zwRWl;n?1lJsMBB&|P(%mKOakMQb;&PI2!>3o@D_&Q%=S53
zv8=gI**6-WAHv~yec)Eb#~FFL+8W*%T#(>u=HXFHU5IkVwdrOwZ8m`5d@q{c?vRfB
z98ybXrdo|V_l7jd1`HF8`()>K=SuyQGvOlYM=niAN<zG(RBU3*KX{(ePMH>)m_@f9
zSCJoAQ1vGGJExyVo=s`>jfiGp5-$^LGxjG$&%f(|r?tLs(e84>2HLB7&ON++^ZSDA
z25TBL6kZg9NFL8$z2vk6#(v9g!Zl7dhVU%-@0|8Na<hW{o8o7-i`U+{>5(U)%0D-K
zvARLPuymkgpNde5Vynd9`ggme`4T!OJ`BMORlu>oJ|bNDfstNQE3nv~Fuv}u&vvW+
zv9R`G`O4~BI)Fn$@B^!SeY!7*F@PR#W-L7YRJzc%wDN`JdDI3BPbf5^3tksF7KjfD
z$Ff(K^q*KwU8}XaFE+bu#${^H>#SQ$l2a^!UXj#@*8sOzR53}mx|br0xTyX2@Ul!7
zc$CXwTfQpCLykTBGWMpWI;2Ki&dhhwoZAIWf5I)#XSxdrvq-JP7gY@^NI|^^U0|Z}
zV1g(1md2$X(*k`fh-nHD`5->-cCH1W=5?MaE#3QuEz!+kKyk!gG1^vEll$3`mOHBA
zc?lh*T%=AaZ=0_<b)C$gre($y<HtO<_BAX@JJ5LkM2Djt7}hU`@vHj_6rV*<vZTDA
z@6GQrH@{z`-+f^=9!AbNOcCu)CVDPbbp|cc%bguH9@1_ht;-+2acQ+0xrKB^x4t+C
z2^G#-mM$L|TX2<0#2OxF_?47>Nj)(qS;4$wGe?=pR3D39k?4U8>P<~)XOhAtKjp+A
z>{m~J(bQL0e;3o#sXpBd3uhhsx;O@EXj<X7wc-Ho*-D@PKa*}Iz5luXB-EYU&Up9-
zD&2hj#r+D4JIS5l;txp!{wBAg#!hnQdiq1=a{eZ_meo#j=WP2!W^?~0w<g_Aa%Xe=
eA=7z(lUuD~YsIyB768D#dAn}5(~X}IAMhWqhdv7c


From 7ace220938b1df3008d6d05dc1116c581f3b7a00 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 11 Jun 2023 16:18:00 +0800
Subject: [PATCH 156/223] improve formatting

---
 src/pages/application_status/index.tsx | 376 +++++++++++++------------
 src/pages/tasks/index.tsx              | 328 +++++++++------------
 2 files changed, 328 insertions(+), 376 deletions(-)

diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 4d7aef7e..40ef1f8d 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -1,42 +1,46 @@
-import { useState, useCallback } from 'react'
+import { useState} from 'react'
 import Head from 'next/head'
-import { Center, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, useDisclosure, useToast } from '@chakra-ui/react'
+import {
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+} from '@chakra-ui/react'
 import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { BaseProps } from '~/utils/withAuth'
-import { Button } from 'flowbite-react'
+
 
 enum PageState {
   LOGIN,
   FORGET_PASSWORD,
 }
 
-const Application_Status:React.FC<BaseProps> = ({ session }) =>{
-
+const Application_Status: React.FC<BaseProps> = ({ session }) => {
   //this part needs backend to update the status
-  const application_status = "accepted"
   const [isOpen, setIsOpen] = useState(false)
   const onOpen = () => setIsOpen(true)
-  const onClose = () => setIsOpen(false)  
+  const onClose = () => setIsOpen(false)
 
-  const [pageState, setPageState] = useState(PageState.LOGIN)
   const roles = [
-    { 
-      id:1,
+    {
+      id: 1,
       name: 'Software Engineer',
-      status: 'accepted'
+      status: 'accepted',
     },
-    { 
-      id:2,
+    {
+      id: 2,
       name: 'Technical Analyst',
-      status: 'interviewed'
+      status: 'interviewed',
     },
     {
-      id:3,
+      id: 3,
       name: 'Research Analyst',
-      status: 'rejected'
-    }
-
+      status: 'rejected',
+    },
   ]
 
   return (
@@ -46,198 +50,197 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The login page for Atlas" />
       </Head>
-      <TopNavbar  image={session.user?.image as string} isAdmin={session.isAdmin} />
+      <TopNavbar
+        image={session.user?.image as string}
+        isAdmin={session.isAdmin}
+      />
       <main>
         <div className="relative h-screen w-screen bg-[url('/images/applicants_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
           {/* Nav element containing the logo */}
-          
-          <nav className="flex justify-center items-center  px-2 py-2 " >
-          
+
+          <nav className="flex items-center justify-center  px-2 py-2 ">
             <Image
               alt="logo"
               src="/images/black_logo.svg"
               height={150}
               width={150}
-            
-            
             />
-         
           </nav>
-      
+
           {/* Login */}
           <div className="flex flex-col justify-center gap-8 font-[Inter]">
-          
-            <h1 className='flex justify-center font-bold text-4xl md:text-8xl mt-4'>
+            <h1 className="mt-4 flex justify-center text-4xl font-bold md:text-8xl">
               Hi User,
             </h1>
-            <h2 className='flex justify-center mt-3 font-bold text-2xl md:text-6xl'>
+            <h2 className="mt-3 flex justify-center text-2xl font-bold md:text-6xl">
               your current statuses are:
             </h2>
-      
-            {roles.map((item) => ( 
-              <div key={item.id} className="flex items-center mt-3 ">
-                  <div className="flex-grow">
-                {item.status == 'accepted' && 
-                <h3 className='flex mt-3 justify-center text-2xl md:text-5xl'>
-                  {item.name}
-                  <Image
-                    alt="logo"
-                    src="/images/Ellipse 1.svg"
-                    height={35}
-                    width={35}
-                    className='flex flex-col  ml-14'              
-                  />
-                    {/* Accepted */}
-                  </h3>
-                }
-              
-                {item.status == 'offered' && <h3 className='flex justify-center text-2xl md:text-5xl'>
-                {item.name}
-                  <Image
-                    alt="logo"
-                    src="/images/blue_dot.svg"
-                    height={35}
-                    width={35}
-                    className='flex flex-col ml-14'
-                  />
-                    {/* Offered */}
-                  </h3>
-                }
-                
-                {item.status == 'pending_review' && <h3 className='flex justify-centertext-2xl md:text-5xl'>
-                {item.name}
-                  <Image
-                    alt="logo"
-                    src="/images/yellow_dot.svg"
-                    height={35}
-                    width={35}
-                    className='ml-14'             
-                  />
-                    {/* Pending Review */}
-                  </h3>
-                }
-                {item.status == 'interviewed' && <h3 className='flex justify-center text-2xl md:text-5xl'>
-                {item.name}
-                  <Image
-                    alt="logo"
-                    src="/images/pink_dot.svg"
-                    height={35}
-                    width={35}
-                    className='ml-14'             
-                  />
-                    {/* Interviewed */}
-                  </h3>
-                }
-                {item.status == 'rejected' && <h3 className='flex justify-center text-2xl md:text-5xl'>
-                {item.name}
-                  <Image
-                    alt="logo"
-                    src="/images/red_dot.svg"
-                    height={35}
-                    width={35}
-                    className='ml-14'             
-                  />
-                    {/* Rejected */}
-                  </h3>
-                }
-                </div>
-                </div>
 
+            {roles.map((item) => (
+              <div key={item.id} className="mt-3 flex items-center ">
+                <div className="flex-grow">
+                  {item.status == 'accepted' && (
+                    <h3 className="mt-3 flex justify-center text-2xl md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/Ellipse 1.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14 flex  flex-col"
+                      />
+                      {/* Accepted */}
+                    </h3>
+                  )}
+
+                  {item.status == 'offered' && (
+                    <h3 className="flex justify-center text-2xl md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/blue_dot.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14 flex flex-col"
+                      />
+                      {/* Offered */}
+                    </h3>
+                  )}
+
+                  {item.status == 'pending_review' && (
+                    <h3 className="justify-centertext-2xl flex md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/yellow_dot.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14"
+                      />
+                      {/* Pending Review */}
+                    </h3>
+                  )}
+                  {item.status == 'interviewed' && (
+                    <h3 className="flex justify-center text-2xl md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/pink_dot.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14"
+                      />
+                      {/* Interviewed */}
+                    </h3>
+                  )}
+                  {item.status == 'rejected' && (
+                    <h3 className="flex justify-center text-2xl md:text-5xl">
+                      {item.name}
+                      <Image
+                        alt="logo"
+                        src="/images/red_dot.svg"
+                        height={35}
+                        width={35}
+                        className="ml-14"
+                      />
+                      {/* Rejected */}
+                    </h3>
+                  )}
+                </div>
+              </div>
             ))}
-             <div 
-             className='fixed bottom-20 md:right-28 right-6'
-             >
-              <button 
-                onClick={onOpen}       
-                className="w-16 h-16 md:w-20 md:h-20 rounded-full 
-                       bg-[#FFEBC5]  
-                       hover:bg-[#FFD27C]
-                       text-white
+            <div className="fixed bottom-20 right-6 md:right-28">
+              <button
+                onClick={onOpen}
+                className="h-16 w-16 rounded-full bg-[#FFEBC5] text-white 
+                       hover:bg-[#FFD27C]  
+                       md:h-20
+                       md:w-20
                        
                        
-                       ">
-                         <Image
-                    alt="question_mark"
-                    src="/images/question_mark.svg"
-                    height='20'
-                    width={20}
-                    className='md:ml-7 ml-5'  
-                  />
-            
-        </button>
-        </div>
-        <Modal  isOpen={isOpen} onClose={onClose} size="xs">
-            <ModalOverlay 
-            bg='none'
-            backdropFilter='auto'         
-            />
-           
-           
-            <ModalContent > 
-                
-            <ModalHeader fontSize='5xl' ></ModalHeader>
-            <ModalCloseButton />
-            <ModalBody fontSize='3xl' >
-          
-            <div className="flex flex-col items-start">
-              <div className='flex items-center'>
-              <Image
-                    alt="logo"
-                    src="/images/Ellipse 1.svg"
-                    height={35}
-                    width={35}
-                    className='flex flex-col mr-5'              
-                  />
-                Accepted</div>
-                </div>
-            
-              <div className="flex flex-col items-start">
-              <div className='flex items-center'>
-              <Image
-                    alt="logo"
-                    src="/images/blue_dot.svg"
-                    height={35}
-                    width={35}
-                    className='flex flex-col mr-5'
-                  />
-                  Offered</div>
+                       "
+              >
+                <Image
+                  alt="question_mark"
+                  src="/images/question_mark.svg"
+                  height="20"
+                  width={20}
+                  className="ml-5 md:ml-7"
+                />
+              </button>
+            </div>
+            <Modal isOpen={isOpen} onClose={onClose} size="xs">
+              <ModalOverlay bg="none" backdropFilter="auto" />
+
+              <ModalContent>
+                <ModalHeader fontSize="5xl"></ModalHeader>
+                <ModalCloseButton />
+                <ModalBody fontSize="3xl">
+                  <div className="flex flex-col items-start">
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/Ellipse 1.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5 flex flex-col"
+                      />
+                      Accepted
+                    </div>
+                  </div>
+
+                  <div className="flex flex-col items-start">
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/blue_dot.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5 flex flex-col"
+                      />
+                      Offered
+                    </div>
                   </div>
                   <div className="flex flex-col items-start">
-              <div className='flex items-center'>
-              <Image
-                    alt="logo"
-                    src="/images/yellow_dot.svg"
-                    height={35}
-                    width={35}
-                    className='mr-5'             
-                  />
-                  Pending Review</div>
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/yellow_dot.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5"
+                      />
+                      Pending Review
+                    </div>
                   </div>
                   <div className="flex flex-col items-start">
-              <div className='flex items-center'>
-              <Image
-                    alt="logo"
-                    src="/images/pink_dot.svg"
-                    height={35}
-                    width={35}
-                    className='mr-5'             
-                  />Interviewed</div>
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/pink_dot.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5"
+                      />
+                      Interviewed
+                    </div>
                   </div>
-                <div className="flex flex-col items-start">
-              <div className='flex items-center'>
-              <Image
-                    alt="logo"
-                    src="/images/red_dot.svg"
-                    height={35}
-                    width={35}
-                    className='mr-5'             
-                  />Rejected</div>      
-                </div>
-            </ModalBody>
-            <ModalFooter>
-            </ModalFooter>
-        </ModalContent>
-        </Modal>
+                  <div className="flex flex-col items-start">
+                    <div className="flex items-center">
+                      <Image
+                        alt="logo"
+                        src="/images/red_dot.svg"
+                        height={35}
+                        width={35}
+                        className="mr-5"
+                      />
+                      Rejected
+                    </div>
+                  </div>
+                </ModalBody>
+                <ModalFooter></ModalFooter>
+              </ModalContent>
+            </Modal>
           </div>
         </div>
       </main>
@@ -245,5 +248,4 @@ const Application_Status:React.FC<BaseProps> = ({ session }) =>{
   )
 }
 
-
-export default withAuth(Application_Status, false)
\ No newline at end of file
+export default withAuth(Application_Status, false)
diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 5656b799..19da6bba 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -1,228 +1,178 @@
-import { useRouter, } from 'next/router'
-import { useSession} from 'next-auth/react'
-import { useState, useCallback, useRef, Fragment } from 'react'
+import { useState} from 'react'
 import Head from 'next/head'
-import {  Box, Button, Grid, GridItem, Heading, Input, Modal, ModalBody, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalOverlay, Portal, useDisclosure, useToast, Text, InputGroup, InputLeftElement, TableContainer, Table, TableCaption, Thead, Tr, Th, Tbody, Td, Tfoot, Center } from '@chakra-ui/react'
-import Image from 'next/image'
+import {
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+  useDisclosure,
+  Text,
+  Center,
+} from '@chakra-ui/react'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
-import { SearchIcon } from '@chakra-ui/icons'
-
-
-
-
-enum PageState {
-  LOGIN,
-  FORGET_PASSWORD,
-}
-
-const Tasks:React.FC<BaseProps> = ({ session }) => {
 
+const Tasks: React.FC<BaseProps> = ({ session }) => {
   const [searchQuery, setSearchQuery] = useState('')
   const { isOpen, onOpen, onClose } = useDisclosure()
   const [currentDetails, setCurrentDetails] = useState('')
   const [currentName, setCurrentName] = useState('')
 
-
-
   const data = [
     {
       id: 1,
       status: 'Done',
       name: 'Join Telegram Group',
       due: '09/12/23',
-      details: 'User should join the telegram group before their due date.'
+      details: 'User should join the telegram group before their due date.',
+    },
+    {
+      id: 2,
+      status: 'In Progress',
+      name: 'Have lunch',
+      due: '1/4/24',
+      details: 'Have lunch at school with friends.',
     },
     {
-        id: 2,
-        status: 'In Progress',
-        name: 'Have lunch',
-        due: '1/4/24',
-        details: 'Have lunch at school with friends.'
-      },
-      {
-        id: 3,
-        status: 'Incomplete',
-        name: 'Attend first townhall',
-        due: '23/5/24',
-        details: 'Attend the first townhall to learn more about Fintech Society and its projects.'
-      },
-    
+      id: 3,
+      status: 'Incomplete',
+      name: 'Attend first townhall',
+      due: '23/5/24',
+      details:
+        'Attend the first townhall to learn more about Fintech Society and its projects.',
+    },
   ]
-  
 
   const filteredData = data.filter((item) =>
     item.name.toLowerCase().includes(searchQuery.toLowerCase())
   )
 
-
-
   return (
     <>
-    
       <Head>
         <title>Atlas | Login</title>
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The login page for Atlas" />
       </Head>
-      <TopNavbar  image={session.user?.image as string} isAdmin={session.isAdmin} />
+      <TopNavbar
+        image={session.user?.image as string}
+        isAdmin={session.isAdmin}
+      />
       <main>
         <div className="relative h-screen w-screen  bg-[url('/images/tasks_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
           {/* Nav element containing the logo */}
-       
-
-       
 
           {/* Login */}
           <div className="flex flex-col justify-center gap-8 font-[Inter]">
-           
-          
-            <h1 className='flex justify-center font-bold text-4xl mt-[3%] text-white'>
-             Tasks
+            <h1 className="mt-[3%] flex justify-center text-4xl font-bold text-white">
+              Tasks
             </h1>
-            
-           
-                {/* <InputGroup>
-      <InputLeftElement
-        className="mt-[1%] ml-[8%] mb-4"
-        pointerEvents="none"
-        >
-        <SearchIcon className="SearchIcon" color="gray.300" />
-        
-        </InputLeftElement>
-       <Input
-                placeholder="Search"
-                value={searchQuery}
-                onChange={(e) => setSearchQuery(e.target.value)}
-                borderWidth="3px"
-                w={{ base: '150px', md: '300px' }}
-                border="3px solid #F9813E"
-                borderColor="#9BAFC2" 
-                borderRadius="30px"
-                className="mt-[1%] ml-[8%] mb-4 text-white"
-                _placeholder={{
-                pl: { base: '5px', lg: '3px' },
-                fontStyle: 'italic',
-                }}
-            />
-    </InputGroup> */}
-              
-                
-              
-              <Center>
-              <div className="max-w-screen-lg mx-auto md:max-w-screen-md">
-
-      <table className="min-w-full divide-y divide-gray-200">
-        <thead className="">
-          <tr>
-            <th
-              scope="col"
-              className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-            >
-              Status
-            </th>
-            <th
-              scope="col"
-              className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-            >
-              Task
-            </th>
-            <th
-              scope="col"
-              className="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-            >
-              Do By
-            </th>
-          </tr>
-        </thead>
-        <tbody className="divide-y divide-gray-200">
-        {filteredData.map((item) => (
-           
-      <tr key={item.id}>
-         <td className="px-6 py-4 whitespace-nowrap">
-         
-          <h1 className="  text-white">{item.status == "Incomplete" && 
-          <button
-          disabled = {true}
-          className="flex-col  items-center w-24 md:w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#C51F29] py-1 px-5 font-medium transition"
-
-            >
-          <div className='font-[Inter] text-xs md:text-xl text-white'>
-          {item.status}
-          </div>
-        </button>
-          }
-          {item.status == "In Progress" && <button
-          disabled = {true}
-          className="flex-col items-center w-24 md:w-[150px] bg-opacity-100  text-md mx-auto rounded-full  bg-[#FFBD3C] py-1 px-5 font-medium transition"
-         
-            >
-          <div className='font-[Inter] text-xs md:text-xl text-white'>
-          {item.status}
-          </div>
-        </button>}
-          {item.status == "Done" && <button
-          disabled = {true}
-          className="flex-col items-center w-24 md:w-[150px] max-w-20 bg-opacity-100  text-md mx-auto rounded-full  bg-[#00C09D] py-1 px-5 font-medium transition"
-         
-            >
-          <div className='font-[Inter] text-xs md:text-xl text-white'>
-          {item.status}
-          </div>
-        </button>}
-          </h1>
-          </td>
-          <td>  
-            <Text
-        as="span"
-        cursor="pointer"
-        _hover={{ textDecoration: 'underline' }}
-        className='md:text-xl text-white'
-        onClick={() => {setCurrentName(item.name); setCurrentDetails(item.details); onOpen()}}
-       
-      >
-        {item.name}
-      </Text>
-      </td>
-      <td>  <h1 className="md:text-xl text-white">{item.due}</h1></td>
-          
-          </tr>
-          
-    ))}
-
-     
-        
-        </tbody>
-      </table>
-      
-      <Modal isCentered={true} isOpen={isOpen} onClose={onClose}>
-      <ModalOverlay 
-      bg='none'
-      backdropFilter='auto'
-      
-      backdropBlur='2px'
-      />
-            
-      <ModalContent>
-      <ModalHeader fontSize='5xl' >{currentName}</ModalHeader>
-      <ModalCloseButton />
-      <ModalBody fontSize='3xl' >
-          {currentDetails}
-      
-      </ModalBody>
-
-      <ModalFooter>
-     
-      </ModalFooter>
-  </ModalContent>
-  
-  </Modal>
-    </div>
-    
-</Center>
-            
-
-          
+            <Center>
+              <div className="mx-auto max-w-screen-lg md:max-w-screen-md">
+                <table className="min-w-full divide-y divide-gray-200">
+                  <thead className="">
+                    <tr>
+                      <th
+                        scope="col"
+                        className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500"
+                      >
+                        Status
+                      </th>
+                      <th
+                        scope="col"
+                        className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500"
+                      >
+                        Task
+                      </th>
+                      <th
+                        scope="col"
+                        className="px-6 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500"
+                      >
+                        Do By
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody className="divide-y divide-gray-200">
+                    {filteredData.map((item) => (
+                      <tr key={item.id}>
+                        <td className="whitespace-nowrap px-6 py-4">
+                          <h1 className="  text-white">
+                            {item.status == 'Incomplete' && (
+                              <button
+                                disabled={true}
+                                className="text-md  mx-auto w-24 flex-col items-center  rounded-full bg-[#C51F29] bg-opacity-100  py-1 px-5 font-medium transition md:w-[150px]"
+                              >
+                                <div className="font-[Inter] text-xs text-white md:text-xl">
+                                  {item.status}
+                                </div>
+                              </button>
+                            )}
+                            {item.status == 'In Progress' && (
+                              <button
+                                disabled={true}
+                                className="text-md mx-auto w-24 flex-col items-center  rounded-full bg-[#FFBD3C] bg-opacity-100  py-1 px-5 font-medium transition md:w-[150px]"
+                              >
+                                <div className="font-[Inter] text-xs text-white md:text-xl">
+                                  {item.status}
+                                </div>
+                              </button>
+                            )}
+                            {item.status == 'Done' && (
+                              <button
+                                disabled={true}
+                                className="max-w-20 text-md mx-auto w-24 flex-col items-center  rounded-full bg-[#00C09D] bg-opacity-100  py-1 px-5 font-medium transition md:w-[150px]"
+                              >
+                                <div className="font-[Inter] text-xs text-white md:text-xl">
+                                  {item.status}
+                                </div>
+                              </button>
+                            )}
+                          </h1>
+                        </td>
+                        <td>
+                          <Text
+                            as="span"
+                            cursor="pointer"
+                            _hover={{ textDecoration: 'underline' }}
+                            className="text-white md:text-xl"
+                            onClick={() => {
+                              setCurrentName(item.name)
+                              setCurrentDetails(item.details)
+                              onOpen()
+                            }}
+                          >
+                            {item.name}
+                          </Text>
+                        </td>
+                        <td>
+                          {' '}
+                          <h1 className="text-white md:text-xl">{item.due}</h1>
+                        </td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+
+                <Modal isCentered={true} isOpen={isOpen} onClose={onClose}>
+                  <ModalOverlay
+                    bg="none"
+                    backdropFilter="auto"
+                    backdropBlur="2px"
+                  />
+
+                  <ModalContent>
+                    <ModalHeader fontSize="5xl">{currentName}</ModalHeader>
+                    <ModalCloseButton />
+                    <ModalBody fontSize="3xl">{currentDetails}</ModalBody>
+
+                    <ModalFooter></ModalFooter>
+                  </ModalContent>
+                </Modal>
+              </div>
+            </Center>
           </div>
         </div>
       </main>
@@ -230,4 +180,4 @@ const Tasks:React.FC<BaseProps> = ({ session }) => {
   )
 }
 
-export default withAuth(Tasks, false)
\ No newline at end of file
+export default withAuth(Tasks, false)

From 061cea085bc2c6a7a7e8702ff63db6533c366473 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 11 Jun 2023 21:37:45 +0800
Subject: [PATCH 157/223] add the buttons for applicants to accept or reject
 their offers

---
 src/pages/application_status/index.tsx | 152 ++++++++++++++++++++++---
 1 file changed, 137 insertions(+), 15 deletions(-)

diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 40ef1f8d..ddbfdb9a 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -1,6 +1,7 @@
-import { useState} from 'react'
+import { useState } from 'react'
 import Head from 'next/head'
 import {
+  Button,
   Modal,
   ModalBody,
   ModalCloseButton,
@@ -13,7 +14,6 @@ import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { BaseProps } from '~/utils/withAuth'
 
-
 enum PageState {
   LOGIN,
   FORGET_PASSWORD,
@@ -22,8 +22,17 @@ enum PageState {
 const Application_Status: React.FC<BaseProps> = ({ session }) => {
   //this part needs backend to update the status
   const [isOpen, setIsOpen] = useState(false)
+  const [isAcceptOpen, setIsAcceptOpen] = useState(false)
+  const [isRejectOpen, setIsRejectOpen] = useState(false)
+  const onOpenAccept = () => setIsAcceptOpen(true)
+  const onCloseAccept = () => setIsAcceptOpen(false)
+  const onOpenReject = () => setIsRejectOpen(true)
+  const onCloseReject = () => setIsRejectOpen(false)
   const onOpen = () => setIsOpen(true)
   const onClose = () => setIsOpen(false)
+  //better to fetch from backend
+  const [isRejected, setIsRejected] = useState(false)
+  const [isAccepted, setIsAccepted] = useState(false)
 
   const roles = [
     {
@@ -80,17 +89,132 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
               <div key={item.id} className="mt-3 flex items-center ">
                 <div className="flex-grow">
                   {item.status == 'accepted' && (
-                    <h3 className="mt-3 flex justify-center text-2xl md:text-5xl">
-                      {item.name}
-                      <Image
-                        alt="logo"
-                        src="/images/Ellipse 1.svg"
-                        height={35}
-                        width={35}
-                        className="ml-14 flex  flex-col"
-                      />
-                      {/* Accepted */}
-                    </h3>
+                    <div className="flex justify-center">
+                      <h3 className="mt-3  flex justify-center text-2xl md:text-5xl">
+                        {item.name}
+                        <Image
+                          alt="logo"
+                          src="/images/Ellipse 1.svg"
+                          height={35}
+                          width={35}
+                          className="ml-14 flex  flex-col"
+                        />
+                      </h3>
+
+                      {isAccepted || isRejected ? (
+                        <div></div>
+                      ) : (
+                        <div className="ml-14 flex">
+                          <button
+                            onClick={onOpenAccept}
+                            className=" ml-5  rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                          >
+                            Accept
+                          </button>
+                          <button
+                            onClick={onOpenReject}
+                            className="ml-5  rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                          >
+                            Reject
+                          </button>
+                        </div>
+                      )}
+                      <Modal
+                        isOpen={isAcceptOpen}
+                        onClose={onCloseAccept}
+                        size="xs"
+                      >
+                        <ModalOverlay bg="none" backdropFilter="auto" />
+                        <ModalContent>
+                          <ModalHeader fontSize="5xl"></ModalHeader>
+                          <ModalCloseButton />
+                          <ModalBody fontSize="3xl ">
+                            <div className=" flex-col justify-center">
+                              <div className="items-center">
+                                Confirm Acceptance?
+                                <button
+                                  onClick={() => {
+                                    onCloseAccept()
+                                    setIsAccepted(true)
+                                  }}
+                                  className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                                >
+                                  Confirm
+                                </button>
+                                <button
+                                  onClick={onCloseAccept}
+                                  className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                                >
+                                  Cancel
+                                </button>
+                              </div>
+                            </div>
+                          </ModalBody>
+                          <ModalFooter></ModalFooter>
+                        </ModalContent>
+                      </Modal>
+                      <Modal
+                        isOpen={isRejectOpen}
+                        onClose={onCloseReject}
+                        size="xs"
+                      >
+                        <ModalOverlay bg="none" backdropFilter="auto" />
+                        <ModalContent>
+                          <ModalHeader fontSize="5xl"></ModalHeader>
+                          <ModalCloseButton />
+                          <ModalBody fontSize="3xl">
+                            <div className="flex flex-col items-start">
+                              <div className="items-center">
+                                Confirm Rejection?
+                                <button
+                                  onClick={() => {
+                                    onCloseReject()
+                                    setIsRejected(true)
+                                  }}
+                                  className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                                >
+                                  Confirm
+                                </button>
+                                <button
+                                  onClick={onCloseReject}
+                                  className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                                >
+                                  Cancel
+                                </button>
+                              </div>
+                            </div>
+                          </ModalBody>
+                          <ModalFooter></ModalFooter>
+                        </ModalContent>
+                      </Modal>
+                    </div>
+
+                    /* <div>
+      <h3 className="text-2xl inline  justify-center md:text-5xl">
+        {item.name}
+      
+      <Image
+        alt="logo"
+        src="/images/Ellipse 1.svg"
+        height={35}
+        width={35}
+        className="ml-14"
+      />
+   </h3>
+   <span className="inline-flex items-baseline">
+        <button
+          className="bg-green-500 inline hover:bg-green-600 text-white text-2xl py-2 px-4 font-bold rounded"
+        
+        >
+          Accept
+        </button>
+        <button
+          className="ml-2 bg-red-500 inline hover:bg-red-600 text-white text-2xl py-2 px-4 font-bold rounded"
+        >
+          Reject
+        </button>
+        </span>
+        </div> */
                   )}
 
                   {item.status == 'offered' && (
@@ -156,8 +280,6 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                        hover:bg-[#FFD27C]  
                        md:h-20
                        md:w-20
-                       
-                       
                        "
               >
                 <Image

From 6a9f41d681c91bdfd0f2f82ea71c6538f6c93b10 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Mon, 12 Jun 2023 19:54:53 +0800
Subject: [PATCH 158/223] make the button design responsive

---
 src/pages/application_status/index.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index ddbfdb9a..876a7f29 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -90,34 +90,34 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                 <div className="flex-grow">
                   {item.status == 'accepted' && (
                     <div className="flex justify-center">
-                      <h3 className="mt-3  flex justify-center text-2xl md:text-5xl">
+                      <span className="mt-3  flex  text-2xl md:text-5xl">
                         {item.name}
                         <Image
                           alt="logo"
                           src="/images/Ellipse 1.svg"
                           height={35}
                           width={35}
-                          className="ml-14 flex  flex-col"
+                          className="md:ml-14 ml-2 flex  flex-col"
                         />
-                      </h3>
+                      </span>
 
                       {isAccepted || isRejected ? (
                         <div></div>
                       ) : (
-                        <div className="ml-14 flex">
+                        <div className="md:ml-14 ml-3 flex ">
                           <button
                             onClick={onOpenAccept}
-                            className=" ml-5  rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                            className=" md:ml-5  rounded bg-green-500 md:py-2 md:px-4 md:text-2xl font-bold text-white hover:bg-green-600"
                           >
                             Accept
                           </button>
                           <button
                             onClick={onOpenReject}
-                            className="ml-5  rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                            className="md:ml-5 ml-3 rounded bg-red-500 md:py-2 md:px-4  md:text-2xl font-bold text-white hover:bg-red-600"
                           >
                             Reject
                           </button>
-                        </div>
+                       </div>
                       )}
                       <Modal
                         isOpen={isAcceptOpen}
@@ -273,7 +273,7 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                 </div>
               </div>
             ))}
-            <div className="fixed bottom-20 right-6 md:right-28">
+            <div className="fixed bottom-10 right-6 md:right-20">
               <button
                 onClick={onOpen}
                 className="h-16 w-16 rounded-full bg-[#FFEBC5] text-white 

From 0ccb7598f8ad7016136e6275e50c7030239de873 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sat, 17 Jun 2023 20:28:27 +0800
Subject: [PATCH 159/223] add departments to each of the role applied on the
 applicant page

---
 src/pages/application_status/index.tsx | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 876a7f29..c8667e85 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -37,16 +37,19 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
   const roles = [
     {
       id: 1,
+      department: 'Software Engineering',
       name: 'Software Engineer',
       status: 'accepted',
     },
     {
       id: 2,
+      department: 'Machine Learning',
       name: 'Technical Analyst',
       status: 'interviewed',
     },
     {
       id: 3,
+      department: 'Blockchain',
       name: 'Research Analyst',
       status: 'rejected',
     },
@@ -90,8 +93,8 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                 <div className="flex-grow">
                   {item.status == 'accepted' && (
                     <div className="flex justify-center">
-                      <span className="mt-3  flex  text-2xl md:text-5xl">
-                        {item.name}
+                      <span className="mt-3  flex  text-2xl md:text-4xl">
+                        {item.department} - {item.name}
                         <Image
                           alt="logo"
                           src="/images/Ellipse 1.svg"
@@ -218,8 +221,8 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                   )}
 
                   {item.status == 'offered' && (
-                    <h3 className="flex justify-center text-2xl md:text-5xl">
-                      {item.name}
+                    <h3 className="flex justify-center text-2xl md:text-4xl">
+                        {item.department} - {item.name}
                       <Image
                         alt="logo"
                         src="/images/blue_dot.svg"
@@ -232,8 +235,8 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                   )}
 
                   {item.status == 'pending_review' && (
-                    <h3 className="justify-centertext-2xl flex md:text-5xl">
-                      {item.name}
+                    <h3 className="justify-centertext-2xl flex md:text-4xl">
+                        {item.department} - {item.name}
                       <Image
                         alt="logo"
                         src="/images/yellow_dot.svg"
@@ -245,8 +248,8 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                     </h3>
                   )}
                   {item.status == 'interviewed' && (
-                    <h3 className="flex justify-center text-2xl md:text-5xl">
-                      {item.name}
+                    <h3 className="flex justify-center text-2xl md:text-4xl">
+                       {item.department} - {item.name}
                       <Image
                         alt="logo"
                         src="/images/pink_dot.svg"
@@ -258,8 +261,8 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                     </h3>
                   )}
                   {item.status == 'rejected' && (
-                    <h3 className="flex justify-center text-2xl md:text-5xl">
-                      {item.name}
+                    <h3 className="flex justify-center text-2xl md:text-4xl">
+                     {item.department} - {item.name}
                       <Image
                         alt="logo"
                         src="/images/red_dot.svg"

From cd5f60ef6be79fdc366288a270ecd6b1a5869f5a Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 17:07:47 +0800
Subject: [PATCH 160/223] improve code quality

---
 src/pages/tasks/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 19da6bba..b2cae754 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -99,7 +99,7 @@ const Tasks: React.FC<BaseProps> = ({ session }) => {
                     {filteredData.map((item) => (
                       <tr key={item.id}>
                         <td className="whitespace-nowrap px-6 py-4">
-                          <h1 className="  text-white">
+                          <h1 className="text-white">
                             {item.status == 'Incomplete' && (
                               <button
                                 disabled={true}

From 043167fb1504ab1843ba5ca2b830dee4eaab1b43 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Mon, 19 Jun 2023 20:48:28 +0800
Subject: [PATCH 161/223] make the status color turn red once the user rejects
 the offer, but the backend does not update and needs to be integrated

---
 src/pages/application_status/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index c8667e85..1e754542 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -97,7 +97,9 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                         {item.department} - {item.name}
                         <Image
                           alt="logo"
-                          src="/images/Ellipse 1.svg"
+                          src={isRejected?
+                            "/images/red_dot.svg": 
+                            "/images/Ellipse 1.svg"}
                           height={35}
                           width={35}
                           className="md:ml-14 ml-2 flex  flex-col"

From 1549fc63271f590b5015f0380450be13beb64658 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 14 May 2023 16:07:13 +0800
Subject: [PATCH 162/223] base layout with responsive searchbar

---
 src/components/common/SearchBar.tsx  | 35 ++++++++++++++++++++++++++++
 src/pages/recruitment/applicants.tsx | 28 ++++++++++++++++++++++
 src/pages/recruitment/index.tsx      | 23 ++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 src/components/common/SearchBar.tsx
 create mode 100644 src/pages/recruitment/applicants.tsx
 create mode 100644 src/pages/recruitment/index.tsx

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
new file mode 100644
index 00000000..1912020f
--- /dev/null
+++ b/src/components/common/SearchBar.tsx
@@ -0,0 +1,35 @@
+import React, { useState } from 'react'
+import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
+import { SearchIcon } from '@chakra-ui/icons'
+
+const SearchBar = () => {
+  const [searchQuery, setSearchQuery] = useState('')
+  return (
+    <InputGroup
+      minWidth={'150px'}
+      maxWidth={'300px'}
+      position="absolute"
+      top={{ lg: '0' }}
+      right={{ lg: '12', base: '0' }}
+      left={{ lg: 'unset', base: '0' }}
+      marginTop={{ lg: 'unset', base: '5' }}
+      marginLeft={{ base: 'auto' }}
+      marginRight={{ base: 'auto' }}
+    >
+      <InputLeftElement>
+        <SearchIcon />
+      </InputLeftElement>
+      <Input
+        placeholder="Search"
+        value={searchQuery}
+        onChange={(e) => setSearchQuery(e.target.value)}
+        borderWidth="3px"
+        border="3px solid #004586"
+        borderColor="#004586"
+        borderRadius="20px"
+      ></Input>
+    </InputGroup>
+  )
+}
+
+export default SearchBar
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
new file mode 100644
index 00000000..66dbf9a9
--- /dev/null
+++ b/src/pages/recruitment/applicants.tsx
@@ -0,0 +1,28 @@
+import { Text } from '@chakra-ui/react'
+import Head from 'next/head'
+import Layout from '~/components/common/Layout'
+import TopNavbar from '~/components/common/TopNavbar'
+import SearchBar from '~/components/common/SearchBar'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
+
+const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
+  return (
+    <>
+      <Head>
+        <title>Atlas | Applicants </title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta
+          name="description"
+          content="The applicants page for Atlas recruitment"
+        />
+      </Head>
+      <TopNavbar isAdmin={session.isAdmin} />
+      <Layout>
+        <Text className="text-center text-4xl font-bold">Applicants</Text>
+        <SearchBar />
+      </Layout>
+    </>
+  )
+}
+
+export default withAuth(ApplicantsPage, true)
diff --git a/src/pages/recruitment/index.tsx b/src/pages/recruitment/index.tsx
new file mode 100644
index 00000000..5567a9cc
--- /dev/null
+++ b/src/pages/recruitment/index.tsx
@@ -0,0 +1,23 @@
+import Layout from '~/components/common/Layout'
+import Head from 'next/head'
+import TopNavbar from '~/components/common/TopNavbar'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
+import { Text } from '@chakra-ui/react'
+
+const RecruitmentPage: React.FC<BaseProps> = ({ session }) => {
+  return (
+    <>
+      <Head>
+        <title>Atlas | Recruitment</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta name="description" content="The recruitment page for Atlas" />
+      </Head>
+      <TopNavbar isAdmin={session.isAdmin} />
+      <Layout>
+        <Text className="text-center text-4xl font-bold">Recruitment</Text>
+      </Layout>
+    </>
+  )
+}
+
+export default withAuth(RecruitmentPage, true)

From 11e9279de316f6315927b1f9e1fc05e1300050cd Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Wed, 17 May 2023 22:39:32 +0800
Subject: [PATCH 163/223] create applicants directors page base components

---
 public/images/applicantcard_bg.svg            |  7 ++
 src/components/recruitment/ApplicantCard.tsx  | 71 ++++++++++++++++
 src/components/recruitment/DocumentModal.tsx  | 51 ++++++++++++
 .../recruitment/DocumentModalAddButton.tsx    | 21 +++++
 .../recruitment/DocumentModalCard.tsx         | 18 +++++
 src/components/recruitment/EditModal.tsx      | 80 +++++++++++++++++++
 src/components/recruitment/InfoPopup.tsx      | 80 +++++++++++++++++++
 src/components/recruitment/NoteModal.tsx      | 41 ++++++++++
 src/pages/recruitment/applicants.tsx          |  4 +
 9 files changed, 373 insertions(+)
 create mode 100644 public/images/applicantcard_bg.svg
 create mode 100644 src/components/recruitment/ApplicantCard.tsx
 create mode 100644 src/components/recruitment/DocumentModal.tsx
 create mode 100644 src/components/recruitment/DocumentModalAddButton.tsx
 create mode 100644 src/components/recruitment/DocumentModalCard.tsx
 create mode 100644 src/components/recruitment/EditModal.tsx
 create mode 100644 src/components/recruitment/InfoPopup.tsx
 create mode 100644 src/components/recruitment/NoteModal.tsx

diff --git a/public/images/applicantcard_bg.svg b/public/images/applicantcard_bg.svg
new file mode 100644
index 00000000..db3821ed
--- /dev/null
+++ b/public/images/applicantcard_bg.svg
@@ -0,0 +1,7 @@
+<svg width="228" height="75" viewBox="0 0 228 75" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 7.625L3.47067 7.875C6.916 8.125 13.8573 8.625 20.7733 9.25C27.6893 9.875 34.6307 10.625 41.496 10.25C48.3867 9.875 55.2267 8.375 62.1173 8C68.9827 7.625 75.924 8.375 82.84 9.875C89.756 11.375 96.6973 13.625 103.613 13.625C110.529 13.625 117.471 11.375 124.387 11.25C131.303 11.125 138.244 13.125 145.16 13.875C152.076 14.625 159.017 14.125 165.883 12.875C172.773 11.625 179.613 9.625 186.504 8.75C193.369 7.875 200.311 8.125 207.227 9.75C214.143 11.375 221.084 14.375 224.529 15.875L228 17.375V0H224.529C221.084 0 214.143 0 207.227 0C200.311 0 193.369 0 186.504 0C179.613 0 172.773 0 165.883 0C159.017 0 152.076 0 145.16 0C138.244 0 131.303 0 124.387 0C117.471 0 110.529 0 103.613 0C96.6973 0 89.756 0 82.84 0C75.924 0 68.9827 0 62.1173 0C55.2267 0 48.3867 0 41.496 0C34.6307 0 27.6893 0 20.7733 0C13.8573 0 6.916 0 3.47067 0H0V7.625Z" fill="#69C4F1"/>
+<path d="M0 21.875L3.47067 23C6.916 24.125 13.8573 26.375 20.7733 28.25C27.6893 30.125 34.6307 31.625 41.496 29.375C48.3867 27.125 55.2267 21.125 62.1173 20.125C68.9827 19.125 75.924 23.125 82.84 26.25C89.756 29.375 96.6973 31.625 103.613 32.375C110.529 33.125 117.471 32.375 124.387 30.5C131.303 28.625 138.244 25.625 145.16 26.25C152.076 26.875 159.017 31.125 165.883 31C172.773 30.875 179.613 26.375 186.504 24C193.369 21.625 200.311 21.375 207.227 22.25C214.143 23.125 221.084 25.125 224.529 26.125L228 27.125V17.125L224.529 15.625C221.084 14.125 214.143 11.125 207.227 9.5C200.311 7.875 193.369 7.625 186.504 8.5C179.613 9.375 172.773 11.375 165.883 12.625C159.017 13.875 152.076 14.375 145.16 13.625C138.244 12.875 131.303 10.875 124.387 11C117.471 11.125 110.529 13.375 103.613 13.375C96.6973 13.375 89.756 11.125 82.84 9.625C75.924 8.125 68.9827 7.375 62.1173 7.75C55.2267 8.125 48.3867 9.625 41.496 10C34.6307 10.375 27.6893 9.625 20.7733 9C13.8573 8.375 6.916 7.875 3.47067 7.625L0 7.375V21.875Z" fill="#39B4EE"/>
+<path d="M0 44.375L3.47067 46.875C6.916 49.375 13.8573 54.375 20.7733 57C27.6893 59.625 34.6307 59.875 41.496 57.125C48.3867 54.375 55.2267 48.625 62.1173 46.875C68.9827 45.125 75.924 47.375 82.84 48.25C89.756 49.125 96.6973 48.625 103.613 48.25C110.529 47.875 117.471 47.625 124.387 48.25C131.303 48.875 138.244 50.375 145.16 51.875C152.076 53.375 159.017 54.875 165.883 55C172.773 55.125 179.613 53.875 186.504 51.25C193.369 48.625 200.311 44.625 207.227 46.125C214.143 47.625 221.084 54.625 224.529 58.125L228 61.625V26.875L224.529 25.875C221.084 24.875 214.143 22.875 207.227 22C200.311 21.125 193.369 21.375 186.504 23.75C179.613 26.125 172.773 30.625 165.883 30.75C159.017 30.875 152.076 26.625 145.16 26C138.244 25.375 131.303 28.375 124.387 30.25C117.471 32.125 110.529 32.875 103.613 32.125C96.6973 31.375 89.756 29.125 82.84 26C75.924 22.875 68.9827 18.875 62.1173 19.875C55.2267 20.875 48.3867 26.875 41.496 29.125C34.6307 31.375 27.6893 29.875 20.7733 28C13.8573 26.125 6.916 23.875 3.47067 22.75L0 21.625V44.375Z" fill="#009CD6"/>
+<path d="M0 75.125H3.47067C6.916 75.125 13.8573 75.125 20.7733 75.125C27.6893 75.125 34.6307 75.125 41.496 75.125C48.3867 75.125 55.2267 75.125 62.1173 75.125C68.9827 75.125 75.924 75.125 82.84 75.125C89.756 75.125 96.6973 75.125 103.613 75.125C110.529 75.125 117.471 75.125 124.387 75.125C131.303 75.125 138.244 75.125 145.16 75.125C152.076 75.125 159.017 75.125 165.883 75.125C172.773 75.125 179.613 75.125 186.504 75.125C193.369 75.125 200.311 75.125 207.227 75.125C214.143 75.125 221.084 75.125 224.529 75.125H228V61.375L224.529 57.875C221.084 54.375 214.143 47.375 207.227 45.875C200.311 44.375 193.369 48.375 186.504 51C179.613 53.625 172.773 54.875 165.883 54.75C159.017 54.625 152.076 53.125 145.16 51.625C138.244 50.125 131.303 48.625 124.387 48C117.471 47.375 110.529 47.625 103.613 48C96.6973 48.375 89.756 48.875 82.84 48C75.924 47.125 68.9827 44.875 62.1173 46.625C55.2267 48.375 48.3867 54.125 41.496 56.875C34.6307 59.625 27.6893 59.375 20.7733 56.75C13.8573 54.125 6.916 49.125 3.47067 46.625L0 44.125V75.125Z" fill="#007EAC"/>
+</svg>
+
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
new file mode 100644
index 00000000..5bfd27db
--- /dev/null
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -0,0 +1,71 @@
+import {
+  Box,
+  Card,
+  CardBody,
+  CardHeader,
+  Heading,
+  Image,
+  ListIcon,
+  ListItem,
+  Stack,
+  Text,
+  UnorderedList,
+} from '@chakra-ui/react'
+import { Avatar } from 'flowbite-react'
+import { BsCircleFill } from 'react-icons/bs'
+import DocumentModal from './DocumentModal'
+import EditModal from './EditModal'
+import NoteModal from './NoteModal'
+
+const ApplicantCard = () => {
+  return (
+    <Card
+      maxWidth="sm"
+      borderRadius="20"
+      boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
+    >
+      <CardHeader paddingBottom="0" zIndex={1}>
+        <Heading size="md" textAlign="center" textColor="white">
+          Name
+        </Heading>
+      </CardHeader>
+      <Image
+        src="/images/applicantcard_bg.svg"
+        alt="blue wave background"
+        borderTopLeftRadius="20"
+        borderTopRightRadius="20"
+        boxSize="300px"
+        position="absolute"
+        height="85px"
+      />
+      <CardBody className="relative">
+        <Stack rowGap="3">
+          <Avatar alt="User-settings" rounded={true} />
+          <Box className="absolute top-8 left-0 flex w-full justify-between">
+            <Box>
+              <NoteModal />
+              <DocumentModal />
+            </Box>
+            <EditModal />
+          </Box>
+          <UnorderedList styleType="none" spacing="2">
+            <ListItem className="flex items-center justify-between">
+              <Text>1. SD - Software Engineer</Text>
+              <ListIcon as={BsCircleFill} marginLeft="2" fill="#46FFDE" />
+            </ListItem>
+            <ListItem className="flex items-center justify-between">
+              <Text>2. ML - Role</Text>
+              <ListIcon as={BsCircleFill} marginLeft="2" fill="#FFBD3C" />
+            </ListItem>
+            <ListItem className="flex items-center justify-between">
+              <Text>3. IA - Director</Text>
+              <ListIcon as={BsCircleFill} marginLeft="2" fill="#0038FF" />
+            </ListItem>
+          </UnorderedList>
+        </Stack>
+      </CardBody>
+    </Card>
+  )
+}
+
+export default ApplicantCard
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
new file mode 100644
index 00000000..4c9477c3
--- /dev/null
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -0,0 +1,51 @@
+import {
+  IconButton,
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalHeader,
+  ModalOverlay,
+  useDisclosure,
+} from '@chakra-ui/react'
+import { BsFolder2Open } from 'react-icons/bs'
+import DocumentModalAddButton from './DocumentModalAddButton'
+import DocumentModalCard from './DocumentModalCard'
+
+const DocumentModal = () => {
+  const { isOpen, onOpen, onClose } = useDisclosure()
+  return (
+    <>
+      <IconButton
+        aria-label="Upload documents"
+        icon={<BsFolder2Open />}
+        bg="None"
+        _hover={{ background: 'None' }}
+        onClick={onOpen}
+      />
+      <Modal isOpen={isOpen} onClose={onClose} isCentered>
+        <ModalOverlay />
+        <ModalContent
+          pb={4}
+          backgroundColor="#F1F3FF"
+          borderRadius="20px"
+          boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
+        >
+          <ModalHeader textAlign="center" fontSize="2xl">
+            [Username] Documents
+          </ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>
+            <div className="my-5 mx-10 grid grid-cols-1 place-items-center gap-y-10 lg:grid-cols-2 ">
+              <DocumentModalCard />
+              <DocumentModalCard />
+              <DocumentModalAddButton />
+            </div>
+          </ModalBody>
+        </ModalContent>
+      </Modal>
+    </>
+  )
+}
+
+export default DocumentModal
diff --git a/src/components/recruitment/DocumentModalAddButton.tsx b/src/components/recruitment/DocumentModalAddButton.tsx
new file mode 100644
index 00000000..b6a543ee
--- /dev/null
+++ b/src/components/recruitment/DocumentModalAddButton.tsx
@@ -0,0 +1,21 @@
+import { AddIcon } from '@chakra-ui/icons'
+import { IconButton } from '@chakra-ui/react'
+
+const DocumentModalAddButton = () => {
+  return (
+    <IconButton
+      aria-label="Info popup for applicant detail"
+      icon={<AddIcon />}
+      borderRadius="30px"
+      boxShadow="0px 8px 4px 2px rgba(0, 0, 0, 0.15)"
+      bg="white"
+      _hover={{ background: '#e4e8ff' }}
+      fontSize="40px"
+      p="12"
+      width="120px"
+      height="120px"
+    />
+  )
+}
+
+export default DocumentModalAddButton
diff --git a/src/components/recruitment/DocumentModalCard.tsx b/src/components/recruitment/DocumentModalCard.tsx
new file mode 100644
index 00000000..2fe98acd
--- /dev/null
+++ b/src/components/recruitment/DocumentModalCard.tsx
@@ -0,0 +1,18 @@
+import { Card, CardBody, Text } from '@chakra-ui/react'
+
+const DocumentModalCard = () => {
+  return (
+    <Card
+      borderRadius="30px"
+      boxShadow="0px 8px 4px 2px rgba(0, 0, 0, 0.15)"
+      width="120px"
+      height="120px"
+    >
+      <CardBody>
+        <Text textAlign="center">Transcript</Text>
+      </CardBody>
+    </Card>
+  )
+}
+
+export default DocumentModalCard
diff --git a/src/components/recruitment/EditModal.tsx b/src/components/recruitment/EditModal.tsx
new file mode 100644
index 00000000..299d1fba
--- /dev/null
+++ b/src/components/recruitment/EditModal.tsx
@@ -0,0 +1,80 @@
+import {
+  Button,
+  FormControl,
+  FormLabel,
+  Grid,
+  GridItem,
+  IconButton,
+  Input,
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+  Stack,
+  Text,
+  Textarea,
+  useDisclosure,
+} from '@chakra-ui/react'
+import { Avatar } from 'flowbite-react'
+import { BsPencilSquare } from 'react-icons/bs'
+
+const EditModal = () => {
+  const { isOpen, onOpen, onClose } = useDisclosure()
+  return (
+    <>
+      <IconButton
+        aria-label="Edit details"
+        icon={<BsPencilSquare />}
+        bg="None"
+        _hover={{ background: 'None' }}
+        onClick={onOpen}
+      />
+      <Modal isOpen={isOpen} onClose={onClose} isCentered>
+        <ModalOverlay />
+        <ModalContent
+          pb={4}
+          backgroundColor="#F1F3FF"
+          borderRadius="20px"
+          boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
+        >
+          <ModalHeader textAlign="center">Edit NAME</ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>
+            <Grid templateColumns="repeat(3, 1fr)" gap="6">
+              <GridItem colSpan={2}>
+                <Stack>
+                  <FormControl>
+                    <FormLabel>Application Status</FormLabel>
+                    <Input placeholder="Application Status" />
+                  </FormControl>
+
+                  <FormControl mt={4}>
+                    <FormLabel>Department</FormLabel>
+                    <Input placeholder="Department" />
+                  </FormControl>
+
+                  <FormControl mt={4}>
+                    <FormLabel>Interview Notes</FormLabel>
+                    <Textarea placeholder="Interview Notes" />
+                  </FormControl>
+                </Stack>
+              </GridItem>
+              <GridItem>
+                <Avatar alt="User-settings" rounded={true} size="lg" />
+                <Text textAlign="center">Some long name we try</Text>
+              </GridItem>
+            </Grid>
+          </ModalBody>
+          <ModalFooter>
+            <Button bg="#97AEFF">Save</Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+    </>
+  )
+}
+
+export default EditModal
diff --git a/src/components/recruitment/InfoPopup.tsx b/src/components/recruitment/InfoPopup.tsx
new file mode 100644
index 00000000..b9d3e926
--- /dev/null
+++ b/src/components/recruitment/InfoPopup.tsx
@@ -0,0 +1,80 @@
+import { QuestionIcon } from '@chakra-ui/icons'
+import {
+  Box,
+  Icon,
+  IconButton,
+  ListItem,
+  Popover,
+  PopoverBody,
+  PopoverCloseButton,
+  PopoverContent,
+  PopoverTrigger,
+  Text,
+  UnorderedList,
+} from '@chakra-ui/react'
+import { BsCircleFill } from 'react-icons/bs'
+
+const InfoPopup = () => {
+  return (
+    <Box className="bottom-25 absolute right-20">
+      <Popover placement="left">
+        <PopoverTrigger>
+          <IconButton
+            aria-label="Info popup for applicant detail"
+            icon={<QuestionIcon />}
+            borderRadius="full"
+            bg="None"
+            _hover={{ background: 'None' }}
+            fontSize="50px"
+            stroke="#02005A"
+          />
+        </PopoverTrigger>
+        <PopoverContent>
+          <PopoverCloseButton />
+          <PopoverBody>
+            <UnorderedList styleType="none" spacing="2">
+              <ListItem className="flex items-center">
+                <Icon
+                  as={BsCircleFill}
+                  marginLeft="2"
+                  marginRight="2"
+                  fill="#46FFDE"
+                />
+                <Text>Accepted</Text>
+              </ListItem>
+              <ListItem className="flex items-center">
+                <Icon
+                  as={BsCircleFill}
+                  marginLeft="2"
+                  marginRight="2"
+                  fill="#0038FF"
+                />
+                <Text>Offered</Text>
+              </ListItem>
+              <ListItem className="flex items-center">
+                <Icon
+                  as={BsCircleFill}
+                  marginLeft="2"
+                  marginRight="2"
+                  fill="#FFBD3C"
+                />
+                <Text>Pending Review</Text>
+              </ListItem>
+              <ListItem className="flex items-center">
+                <Icon
+                  as={BsCircleFill}
+                  marginLeft="2"
+                  marginRight="2"
+                  fill="#FF0099"
+                />
+                <Text>Interviewed</Text>
+              </ListItem>
+            </UnorderedList>
+          </PopoverBody>
+        </PopoverContent>
+      </Popover>
+    </Box>
+  )
+}
+
+export default InfoPopup
diff --git a/src/components/recruitment/NoteModal.tsx b/src/components/recruitment/NoteModal.tsx
new file mode 100644
index 00000000..0cc89803
--- /dev/null
+++ b/src/components/recruitment/NoteModal.tsx
@@ -0,0 +1,41 @@
+import {
+  IconButton,
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalHeader,
+  ModalOverlay,
+  useDisclosure,
+} from '@chakra-ui/react'
+import { BsFileEarmark } from 'react-icons/bs'
+
+const NoteModal = () => {
+  const { isOpen, onOpen, onClose } = useDisclosure()
+  return (
+    <>
+      <IconButton
+        aria-label="Interview notes"
+        icon={<BsFileEarmark />}
+        bg="None"
+        _hover={{ background: 'None' }}
+        onClick={onOpen}
+      />
+      <Modal isOpen={isOpen} onClose={onClose} isCentered>
+        <ModalOverlay />
+        <ModalContent
+          pb={4}
+          backgroundColor="#F1F3FF"
+          borderRadius="20px"
+          boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
+        >
+          <ModalHeader textAlign="center">Interview Notes</ModalHeader>
+          <ModalCloseButton />
+          <ModalBody>Notes on notes on notes</ModalBody>
+        </ModalContent>
+      </Modal>
+    </>
+  )
+}
+
+export default NoteModal
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 66dbf9a9..115a534e 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -4,6 +4,8 @@ import Layout from '~/components/common/Layout'
 import TopNavbar from '~/components/common/TopNavbar'
 import SearchBar from '~/components/common/SearchBar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
+import ApplicantGrid from '~/components/recruitment/ApplicantGrid'
+import InfoPopup from '~/components/recruitment/InfoPopup'
 
 const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
   return (
@@ -20,6 +22,8 @@ const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
       <Layout>
         <Text className="text-center text-4xl font-bold">Applicants</Text>
         <SearchBar />
+        <ApplicantGrid />
+        <InfoPopup />
       </Layout>
     </>
   )

From 02053771faf535d325b7c32995e23ae3ab1aea30 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 21 May 2023 21:03:10 +0800
Subject: [PATCH 164/223] schema updates

---
 src/components/profile/ProfileInfo.tsx  | 2 --
 src/server/trpc/router/member/helper.ts | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index 32886653..886bbe42 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -2,8 +2,6 @@ import { Box, Table, TableContainer, Tbody, Td, Tr } from '@chakra-ui/react'
 
 type ProfilePageType = {
   batch: string | undefined
-
-  // projects: Projects[]
 }
 
 const ProfileInfo = (props: ProfilePageType) => {
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index e30194c9..16ab3682 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -96,6 +96,7 @@ function buildUserObject(
       gender: user.gender,
       hashedPassword,
       image: null,
+      interviewNotes: user.interviewNotes,
       level: 'member',
       linkedin: user.linkedin,
       major: user.major,

From 803c4f0338f41dcd830976453a69209929978f53 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 21 May 2023 22:18:33 +0800
Subject: [PATCH 165/223] impl edit recruitment notes and status endpoints

---
 .../trpc/router/admin/recruitment/index.ts    |  7 +++
 .../trpc/router/admin/recruitment/update.ts   | 56 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 src/server/trpc/router/admin/recruitment/index.ts
 create mode 100644 src/server/trpc/router/admin/recruitment/update.ts

diff --git a/src/server/trpc/router/admin/recruitment/index.ts b/src/server/trpc/router/admin/recruitment/index.ts
new file mode 100644
index 00000000..2217fc97
--- /dev/null
+++ b/src/server/trpc/router/admin/recruitment/index.ts
@@ -0,0 +1,7 @@
+import { router } from '~/server/trpc/trpc'
+import { updateAppliedRoleStatus, updateInterviewNotes } from './update'
+
+export const recruitmentRouter = router({
+  updateAppliedRoleStatus,
+  updateInterviewNotes,
+})
diff --git a/src/server/trpc/router/admin/recruitment/update.ts b/src/server/trpc/router/admin/recruitment/update.ts
new file mode 100644
index 00000000..38111cef
--- /dev/null
+++ b/src/server/trpc/router/admin/recruitment/update.ts
@@ -0,0 +1,56 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { z } from 'zod'
+import { TRPCError } from '@trpc/server'
+import type { ApplicationStatus } from '@prisma/client'
+
+export const updateAppliedRoleStatus = protectedProcedure
+  .input(
+    z.object({
+      appliedRoleId: z.string(),
+      status: z.string(),
+    })
+  )
+  .mutation(async ({ ctx, input }) => {
+    try {
+      const role = await ctx.prisma.appliedRole.update({
+        where: {
+          id: input.appliedRoleId,
+        },
+        data: {
+          status: input.status as ApplicationStatus,
+        },
+      })
+      return role
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })
+
+export const updateInterviewNotes = protectedProcedure
+  .input(
+    z.object({
+      applicantId: z.string(),
+      interviewNotes: z.string(),
+    })
+  )
+  .mutation(async ({ ctx, input }) => {
+    try {
+      const applicant = await ctx.prisma.user.update({
+        where: {
+          id: input.applicantId,
+        },
+        data: {
+          interviewNotes: input.interviewNotes,
+        },
+      })
+      return applicant
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })

From 7fa53f3278ba9e2392973a82f207ab787860af5c Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Mon, 22 May 2023 22:43:07 +0800
Subject: [PATCH 166/223] impl applicant endpoints for read

---
 .../trpc/router/admin/recruitment/index.ts    |  3 ++
 .../trpc/router/admin/recruitment/read.ts     | 45 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 src/server/trpc/router/admin/recruitment/read.ts

diff --git a/src/server/trpc/router/admin/recruitment/index.ts b/src/server/trpc/router/admin/recruitment/index.ts
index 2217fc97..6a3255f7 100644
--- a/src/server/trpc/router/admin/recruitment/index.ts
+++ b/src/server/trpc/router/admin/recruitment/index.ts
@@ -1,7 +1,10 @@
 import { router } from '~/server/trpc/trpc'
 import { updateAppliedRoleStatus, updateInterviewNotes } from './update'
+import { getAllApplicants, getApplicant } from './read'
 
 export const recruitmentRouter = router({
   updateAppliedRoleStatus,
   updateInterviewNotes,
+  getAllApplicants,
+  getApplicant,
 })
diff --git a/src/server/trpc/router/admin/recruitment/read.ts b/src/server/trpc/router/admin/recruitment/read.ts
new file mode 100644
index 00000000..43e5c4fa
--- /dev/null
+++ b/src/server/trpc/router/admin/recruitment/read.ts
@@ -0,0 +1,45 @@
+import { TRPCError } from '@trpc/server'
+import { z } from 'zod'
+import { protectedProcedure } from '~/server/trpc/trpc'
+
+export const getAllApplicants = protectedProcedure.query(async ({ ctx }) => {
+  try {
+    return await ctx.prisma.user.findMany({
+      where: {
+        level: 'applicant',
+      },
+      select: {
+        name: true,
+        interviewNotes: true,
+        appliedRoles: true,
+      },
+    })
+  } catch (error) {
+    throw new TRPCError({
+      code: 'INTERNAL_SERVER_ERROR',
+      message: 'Error retrieving applicants: ' + error,
+    })
+  }
+})
+
+export const getApplicant = protectedProcedure
+  .input(z.string())
+  .query(async ({ ctx, input }) => {
+    try {
+      return await ctx.prisma.user.findUnique({
+        where: {
+          id: input,
+        },
+        select: {
+          name: true,
+          interviewNotes: true,
+          appliedRoles: true,
+        },
+      })
+    } catch (error) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: 'Error retrieving applicants: ' + error,
+      })
+    }
+  })

From 803e2c4b8f9333e1acb609b63ac925fc3a10f190 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Thu, 25 May 2023 23:06:03 +0800
Subject: [PATCH 167/223] search fn with redux

---
 src/components/common/SearchBar.tsx           |  9 ++++---
 src/components/recruitment/searchNameSlice.ts | 27 +++++++++++++++++++
 src/pages/recruitment/applicants.tsx          | 12 ++++++++-
 src/store/store.ts                            | 16 +++++++++++
 4 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 src/components/recruitment/searchNameSlice.ts
 create mode 100644 src/store/store.ts

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 1912020f..cb85f032 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -1,9 +1,13 @@
 import React, { useState } from 'react'
 import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import { SearchIcon } from '@chakra-ui/icons'
+import { useDispatch } from 'react-redux'
+import { searchByName } from '../recruitment/searchNameSlice'
+import type { RootState } from '~/store/store'
 
 const SearchBar = () => {
-  const [searchQuery, setSearchQuery] = useState('')
+  const dispatch = useDispatch()
+
   return (
     <InputGroup
       minWidth={'150px'}
@@ -21,9 +25,8 @@ const SearchBar = () => {
       </InputLeftElement>
       <Input
         placeholder="Search"
-        value={searchQuery}
-        onChange={(e) => setSearchQuery(e.target.value)}
         borderWidth="3px"
+        onChange={(e) => dispatch(searchByName(e.target.value))}
         border="3px solid #004586"
         borderColor="#004586"
         borderRadius="20px"
diff --git a/src/components/recruitment/searchNameSlice.ts b/src/components/recruitment/searchNameSlice.ts
new file mode 100644
index 00000000..b73e5c6b
--- /dev/null
+++ b/src/components/recruitment/searchNameSlice.ts
@@ -0,0 +1,27 @@
+import { createSlice } from '@reduxjs/toolkit'
+import type { PayloadAction } from '@reduxjs/toolkit'
+import { RootState } from '~/store/store'
+
+export interface SearchNameSlice {
+  value: string
+}
+
+const initialState: SearchNameSlice = {
+  value: '',
+}
+
+export const searchNameSlice = createSlice({
+  name: 'searchName',
+  initialState,
+  reducers: {
+    searchByName: (state, action: PayloadAction<string>) => {
+      state.value = action.payload
+    },
+  },
+})
+
+export const { searchByName } = searchNameSlice.actions
+
+export const selectSearchValue = (state: RootState) => state.searchName.value
+
+export default searchNameSlice.reducer
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 115a534e..2b512ca7 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -6,8 +6,18 @@ import SearchBar from '~/components/common/SearchBar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
 import ApplicantGrid from '~/components/recruitment/ApplicantGrid'
 import InfoPopup from '~/components/recruitment/InfoPopup'
+import { trpc } from '~/utils/trpc'
+import { useSelector } from 'react-redux'
+import { selectSearchValue } from '~/components/recruitment/searchNameSlice'
 
 const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
+  const { data } = trpc.recruitment.getAllApplicants.useQuery()
+  const searchValue = useSelector(selectSearchValue)
+
+  const filteredData = data?.filter((item) =>
+    searchValue == '' ? item : item.name?.toLowerCase().includes(searchValue)
+  )
+
   return (
     <>
       <Head>
@@ -22,7 +32,7 @@ const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
       <Layout>
         <Text className="text-center text-4xl font-bold">Applicants</Text>
         <SearchBar />
-        <ApplicantGrid />
+        <ApplicantGrid data={filteredData} />
         <InfoPopup />
       </Layout>
     </>
diff --git a/src/store/store.ts b/src/store/store.ts
new file mode 100644
index 00000000..4deb8b5c
--- /dev/null
+++ b/src/store/store.ts
@@ -0,0 +1,16 @@
+import { configureStore } from '@reduxjs/toolkit'
+import dashboardReducer from './admin/dashboard'
+import searchNameReducer from '../components/recruitment/searchNameSlice'
+
+const store = configureStore({
+  reducer: {
+    dashboard: dashboardReducer,
+    searchName: searchNameReducer,
+  },
+})
+
+// Infer the `RootState` and `AppDispatch` types from the store itself
+export type RootState = ReturnType<typeof store.getState>
+// Inferred type: {posts: PostsState, comments: CommentsState, users: UsersState}
+export type AppDispatch = typeof store.dispatch
+export default store

From 9ca15b04ed5752d41ba10caf9195165455a264c3 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Thu, 25 May 2023 23:06:47 +0800
Subject: [PATCH 168/223] components refactor and design change

---
 src/components/recruitment/ApplicantCard.tsx  |  54 ++++---
 .../recruitment/AppliedRoleListItem.tsx       |  16 ++
 src/components/recruitment/DocumentModal.tsx  |   1 +
 src/components/recruitment/EditModal.tsx      |  80 ----------
 src/components/recruitment/InfoPopup.tsx      |   9 ++
 src/components/recruitment/NoteModal.tsx      | 107 ++++++++++++-
 src/components/recruitment/StatusPopup.tsx    | 151 ++++++++++++++++++
 7 files changed, 311 insertions(+), 107 deletions(-)
 create mode 100644 src/components/recruitment/AppliedRoleListItem.tsx
 delete mode 100644 src/components/recruitment/EditModal.tsx
 create mode 100644 src/components/recruitment/StatusPopup.tsx

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index 5bfd27db..a2a425d9 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -5,19 +5,24 @@ import {
   CardHeader,
   Heading,
   Image,
-  ListIcon,
-  ListItem,
   Stack,
-  Text,
   UnorderedList,
 } from '@chakra-ui/react'
+import { User } from '@prisma/client'
 import { Avatar } from 'flowbite-react'
-import { BsCircleFill } from 'react-icons/bs'
+import AppliedRoleListItem from './AppliedRoleListItem'
 import DocumentModal from './DocumentModal'
-import EditModal from './EditModal'
 import NoteModal from './NoteModal'
+import type { AppliedRole } from '@prisma/client'
+import { trpc } from '~/utils/trpc'
+import { ApplicantWithAppliedRole } from '~/types/model'
 
-const ApplicantCard = () => {
+const ApplicantCard = ({
+  applicant,
+}: {
+  applicant: ApplicantWithAppliedRole
+}) => {
+  const { refetch } = trpc.recruitment.getApplicant.useQuery(applicant.id)
   return (
     <Card
       maxWidth="sm"
@@ -38,29 +43,28 @@ const ApplicantCard = () => {
         position="absolute"
         height="85px"
       />
-      <CardBody className="relative">
-        <Stack rowGap="3">
-          <Avatar alt="User-settings" rounded={true} />
-          <Box className="absolute top-8 left-0 flex w-full justify-between">
+      <CardBody className="relative" pt="10px">
+        <Stack>
+          <Avatar alt="User-settings" rounded={true} size="lg" />
+          <Box className="flex justify-center">
             <Box>
-              <NoteModal />
               <DocumentModal />
+              <NoteModal
+                applicantId={applicant.id}
+                interviewNotes={applicant.interviewNotes}
+                refetch={refetch}
+              />
             </Box>
-            <EditModal />
           </Box>
-          <UnorderedList styleType="none" spacing="2">
-            <ListItem className="flex items-center justify-between">
-              <Text>1. SD - Software Engineer</Text>
-              <ListIcon as={BsCircleFill} marginLeft="2" fill="#46FFDE" />
-            </ListItem>
-            <ListItem className="flex items-center justify-between">
-              <Text>2. ML - Role</Text>
-              <ListIcon as={BsCircleFill} marginLeft="2" fill="#FFBD3C" />
-            </ListItem>
-            <ListItem className="flex items-center justify-between">
-              <Text>3. IA - Director</Text>
-              <ListIcon as={BsCircleFill} marginLeft="2" fill="#0038FF" />
-            </ListItem>
+          <UnorderedList styleType="none">
+            {applicant.appliedRoles.map((appliedRole) => {
+              return (
+                <AppliedRoleListItem
+                  appliedRole={appliedRole}
+                  key={appliedRole.id}
+                />
+              )
+            })}
           </UnorderedList>
         </Stack>
       </CardBody>
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
new file mode 100644
index 00000000..3787e565
--- /dev/null
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -0,0 +1,16 @@
+import { ListItem, Text } from '@chakra-ui/react'
+import type { AppliedRole } from '@prisma/client'
+import StatusPopup from './StatusPopup'
+
+const AppliedRoleListItem = ({ appliedRole }: { appliedRole: AppliedRole }) => {
+  return (
+    <ListItem className="flex items-center justify-between">
+      <Text>
+        {appliedRole.rank}. {appliedRole.departmentId} - {appliedRole.role}
+      </Text>
+      <StatusPopup status={appliedRole.status} appliedRoleId={appliedRole.id} />
+    </ListItem>
+  )
+}
+
+export default AppliedRoleListItem
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
index 4c9477c3..5d4a07c3 100644
--- a/src/components/recruitment/DocumentModal.tsx
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -22,6 +22,7 @@ const DocumentModal = () => {
         bg="None"
         _hover={{ background: 'None' }}
         onClick={onOpen}
+        fontSize="23px"
       />
       <Modal isOpen={isOpen} onClose={onClose} isCentered>
         <ModalOverlay />
diff --git a/src/components/recruitment/EditModal.tsx b/src/components/recruitment/EditModal.tsx
deleted file mode 100644
index 299d1fba..00000000
--- a/src/components/recruitment/EditModal.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import {
-  Button,
-  FormControl,
-  FormLabel,
-  Grid,
-  GridItem,
-  IconButton,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Stack,
-  Text,
-  Textarea,
-  useDisclosure,
-} from '@chakra-ui/react'
-import { Avatar } from 'flowbite-react'
-import { BsPencilSquare } from 'react-icons/bs'
-
-const EditModal = () => {
-  const { isOpen, onOpen, onClose } = useDisclosure()
-  return (
-    <>
-      <IconButton
-        aria-label="Edit details"
-        icon={<BsPencilSquare />}
-        bg="None"
-        _hover={{ background: 'None' }}
-        onClick={onOpen}
-      />
-      <Modal isOpen={isOpen} onClose={onClose} isCentered>
-        <ModalOverlay />
-        <ModalContent
-          pb={4}
-          backgroundColor="#F1F3FF"
-          borderRadius="20px"
-          boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
-        >
-          <ModalHeader textAlign="center">Edit NAME</ModalHeader>
-          <ModalCloseButton />
-          <ModalBody>
-            <Grid templateColumns="repeat(3, 1fr)" gap="6">
-              <GridItem colSpan={2}>
-                <Stack>
-                  <FormControl>
-                    <FormLabel>Application Status</FormLabel>
-                    <Input placeholder="Application Status" />
-                  </FormControl>
-
-                  <FormControl mt={4}>
-                    <FormLabel>Department</FormLabel>
-                    <Input placeholder="Department" />
-                  </FormControl>
-
-                  <FormControl mt={4}>
-                    <FormLabel>Interview Notes</FormLabel>
-                    <Textarea placeholder="Interview Notes" />
-                  </FormControl>
-                </Stack>
-              </GridItem>
-              <GridItem>
-                <Avatar alt="User-settings" rounded={true} size="lg" />
-                <Text textAlign="center">Some long name we try</Text>
-              </GridItem>
-            </Grid>
-          </ModalBody>
-          <ModalFooter>
-            <Button bg="#97AEFF">Save</Button>
-          </ModalFooter>
-        </ModalContent>
-      </Modal>
-    </>
-  )
-}
-
-export default EditModal
diff --git a/src/components/recruitment/InfoPopup.tsx b/src/components/recruitment/InfoPopup.tsx
index b9d3e926..e32f0c9b 100644
--- a/src/components/recruitment/InfoPopup.tsx
+++ b/src/components/recruitment/InfoPopup.tsx
@@ -69,6 +69,15 @@ const InfoPopup = () => {
                 />
                 <Text>Interviewed</Text>
               </ListItem>
+              <ListItem className="flex items-center">
+                <Icon
+                  as={BsCircleFill}
+                  marginLeft="2"
+                  marginRight="2"
+                  fill="#FF0000"
+                />
+                <Text>Rejected</Text>
+              </ListItem>
             </UnorderedList>
           </PopoverBody>
         </PopoverContent>
diff --git a/src/components/recruitment/NoteModal.tsx b/src/components/recruitment/NoteModal.tsx
index 0cc89803..29cffa6b 100644
--- a/src/components/recruitment/NoteModal.tsx
+++ b/src/components/recruitment/NoteModal.tsx
@@ -1,17 +1,83 @@
 import {
+  Button,
   IconButton,
+  Input,
   Modal,
   ModalBody,
   ModalCloseButton,
   ModalContent,
+  ModalFooter,
   ModalHeader,
   ModalOverlay,
   useDisclosure,
+  useToast,
 } from '@chakra-ui/react'
+import { useEffect, useState } from 'react'
 import { BsFileEarmark } from 'react-icons/bs'
+import { trpc } from '~/utils/trpc'
+import { Message } from '~/constant/messages'
+import type { QueryObserverResult } from '@tanstack/react-query'
 
-const NoteModal = () => {
+const NoteModal = ({
+  applicantId,
+  interviewNotes,
+  refetch,
+}: {
+  applicantId: string
+  interviewNotes: string | null
+  refetch: () => Promise<QueryObserverResult>
+}) => {
+  interviewNotes = 'hello there testing'
+
+  const toast = useToast()
+  const { mutateAsync } = trpc.recruitment.updateInterviewNotes.useMutation()
+  const [edit, setEdit] = useState(false)
+  const [notes, setNotes] = useState('default notes')
+  const [tempNotes, setTempNotes] = useState('')
   const { isOpen, onOpen, onClose } = useDisclosure()
+
+  //TODO: checking inputs
+  useEffect(() => {
+    console.log('notes:', notes)
+    console.log('temp notes:', tempNotes)
+  })
+  //TODO: checking inputs
+  useEffect(() => {
+    if (interviewNotes) {
+      setNotes(interviewNotes)
+      setTempNotes(interviewNotes)
+    }
+  }, [interviewNotes])
+
+  const resetNotes = () => {
+    setTempNotes(notes)
+    setEdit(false)
+  }
+
+  const updateNotes = async () => {
+    await mutateAsync({
+      interviewNotes: tempNotes,
+      applicantId: applicantId,
+    })
+
+    toast({
+      duration: 3000,
+      status: 'loading',
+      title: 'Loading',
+      description: Message.PERSONAL_INFO_LOADING,
+    })
+
+    await refetch()
+    setEdit(false)
+
+    toast({
+      duration: 3000,
+      status: 'success',
+      title: 'Success',
+      description: Message.PERSONAL_INFO_SUCCESS,
+    })
+  }
+
   return (
     <>
       <IconButton
@@ -20,6 +86,7 @@ const NoteModal = () => {
         bg="None"
         _hover={{ background: 'None' }}
         onClick={onOpen}
+        fontSize="20px"
       />
       <Modal isOpen={isOpen} onClose={onClose} isCentered>
         <ModalOverlay />
@@ -31,7 +98,43 @@ const NoteModal = () => {
         >
           <ModalHeader textAlign="center">Interview Notes</ModalHeader>
           <ModalCloseButton />
-          <ModalBody>Notes on notes on notes</ModalBody>
+          <ModalBody>
+            {tempNotes ? (
+              <Input
+                variant="unstyled"
+                value={tempNotes}
+                onChange={(e) => {
+                  setTempNotes(e.currentTarget.value)
+                  setEdit(true)
+                }}
+              />
+            ) : (
+              <Input
+                variant="unstyled"
+                placeholder="Write notes.."
+                onChange={(e) => {
+                  setTempNotes(e.currentTarget.value)
+                  setEdit(true)
+                }}
+              />
+            )}
+          </ModalBody>
+          <ModalFooter>
+            {edit ? (
+              <>
+                <Button mx="2" bg="#d3d3d3" onClick={resetNotes}>
+                  Cancel
+                </Button>
+                <Button
+                  bg="#97AEFF"
+                  _hover={{ bg: '#adbfff' }}
+                  onClick={updateNotes}
+                >
+                  Save
+                </Button>
+              </>
+            ) : null}
+          </ModalFooter>
         </ModalContent>
       </Modal>
     </>
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
new file mode 100644
index 00000000..c9941fa7
--- /dev/null
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -0,0 +1,151 @@
+import {
+  IconButton,
+  ListItem,
+  Popover,
+  PopoverBody,
+  PopoverCloseButton,
+  PopoverContent,
+  PopoverTrigger,
+  Text,
+  UnorderedList,
+  useToast,
+} from '@chakra-ui/react'
+import { ApplicationStatus } from '@prisma/client'
+import type { QueryObserverResult } from '@tanstack/react-query'
+import { BsCircleFill } from 'react-icons/bs'
+import { trpc } from '~/utils/trpc'
+
+const statusFillMap = {
+  [ApplicationStatus.ACCEPTED]: '#46FFDE',
+  [ApplicationStatus.OFFERED]: '#0038FF',
+  [ApplicationStatus.PENDINGREVIEW]: '#FFBD3C',
+  [ApplicationStatus.INTERVIEWED]: '#CE44FF',
+  [ApplicationStatus.REJECTED]: '#FF0000',
+}
+
+const StatusPopup = ({
+  status,
+  appliedRoleId,
+}: {
+  appliedRoleId: string
+  status: ApplicationStatus
+}) => {
+  const toast = useToast()
+  const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRoleId)
+  const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
+
+  const updateStatus = async (status: ApplicationStatus) => {
+    try {
+      await mutateAsync({
+        status: status,
+        appliedRoleId: appliedRoleId,
+      })
+      await refetch()
+      toast({
+        duration: 2000,
+        status: 'success',
+        title: 'Success',
+        description: 'Application status updated successfully!',
+      })
+    } catch (e) {
+      toast({
+        description: (e as Error).message,
+        duration: 2000,
+        status: 'error',
+        title: 'Oops, an error occurred!',
+      })
+    }
+  }
+
+  return (
+    <Popover>
+      <PopoverTrigger>
+        <IconButton
+          aria-label="status"
+          icon={<BsCircleFill fill={statusFillMap[status]} />}
+          bg="None"
+          _hover={{ background: 'None' }}
+          marginLeft="2"
+        ></IconButton>
+      </PopoverTrigger>
+      <PopoverContent>
+        <PopoverCloseButton />
+        <PopoverBody>
+          <UnorderedList styleType="none">
+            <ListItem className="flex items-center">
+              <IconButton
+                aria-label="accepted status"
+                icon={<BsCircleFill fill="#46FFDE" />}
+                bg="None"
+                _hover={{ background: 'None' }}
+                marginLeft="2"
+                onClick={() =>
+                  updateStatus(ApplicationStatus.ACCEPTED as ApplicationStatus)
+                }
+              />
+              <Text>Accepted</Text>
+            </ListItem>
+            <ListItem className="flex items-center">
+              <IconButton
+                aria-label="offered status"
+                icon={<BsCircleFill fill="#0038FF" />}
+                bg="None"
+                _hover={{ background: 'None' }}
+                marginLeft="2"
+                onClick={() =>
+                  updateStatus(ApplicationStatus.OFFERED as ApplicationStatus)
+                }
+              />
+              <Text>Offered</Text>
+            </ListItem>
+            <ListItem className="flex items-center">
+              <IconButton
+                aria-label="pending review status"
+                icon={<BsCircleFill fill="#FFBD3C" />}
+                bg="None"
+                _hover={{ background: 'None' }}
+                marginLeft="2"
+                onClick={() =>
+                  updateStatus(
+                    ApplicationStatus.PENDINGREVIEW as ApplicationStatus
+                  )
+                }
+              />
+              <Text>Pending Review</Text>
+            </ListItem>
+            <ListItem className="flex items-center">
+              <IconButton
+                aria-label="interviewed status"
+                icon={<BsCircleFill fill="#FF0099" />}
+                bg="None"
+                _hover={{ background: 'None' }}
+                marginLeft="2"
+                onClick={() =>
+                  updateStatus(
+                    ApplicationStatus.INTERVIEWED as ApplicationStatus
+                  )
+                }
+              />
+              <Text>Interviewed</Text>
+            </ListItem>
+            <ListItem className="flex items-center">
+              <IconButton
+                aria-label="rejected status"
+                icon={<BsCircleFill fill="#FF0000" />}
+                bg="None"
+                _hover={{ background: 'None' }}
+                marginLeft="2"
+                onClick={() =>
+                  updateStatus(ApplicationStatus.REJECTED as ApplicationStatus)
+                }
+              />
+              <Text>Rejected</Text>
+            </ListItem>
+          </UnorderedList>
+        </PopoverBody>
+      </PopoverContent>
+    </Popover>
+  )
+}
+
+export default StatusPopup

From 854338ec7b04db055c2d41efc5b820cd6e423be6 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Thu, 25 May 2023 23:08:01 +0800
Subject: [PATCH 169/223] create applicants endpoint

---
 .../trpc/router/admin/recruitment/create.ts   | 64 +++++++++++++++++++
 .../trpc/router/admin/recruitment/index.ts    |  5 +-
 .../trpc/router/admin/recruitment/read.ts     | 24 +++++++
 .../trpc/router/constants/ErrorTitle.ts       |  1 +
 src/types/model.ts                            |  8 +++
 5 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 src/server/trpc/router/admin/recruitment/create.ts
 create mode 100644 src/types/model.ts

diff --git a/src/server/trpc/router/admin/recruitment/create.ts b/src/server/trpc/router/admin/recruitment/create.ts
new file mode 100644
index 00000000..2697ccaf
--- /dev/null
+++ b/src/server/trpc/router/admin/recruitment/create.ts
@@ -0,0 +1,64 @@
+import { ApplicationStatus, LogType } from '@prisma/client'
+import { hash } from 'bcryptjs'
+import { randomUUID } from 'crypto'
+import { z } from 'zod'
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { ErrorTitle } from '../../constants/ErrorTitle'
+
+export const createSingleApplicant = protectedProcedure
+  .input(
+    z.object({
+      email: z.string(),
+      password: z.string(),
+      name: z.string(),
+      firstRole: z.string(),
+      firstDepartmentId: z.string(),
+      secondRole: z.string(),
+      secondDepartmentId: z.string(),
+      thirdRole: z.string(),
+      thirdDepartmentId: z.string(),
+    })
+  )
+  .mutation(async ({ ctx, input }) => {
+    const hashedPassword = await hash(input.password, 10)
+    try {
+      await ctx.prisma.user.create({
+        data: {
+          email: input.email,
+          hashedPassword,
+          name: input.name,
+          level: 'applicant',
+          appliedRoles: {
+            create: [
+              {
+                rank: 1,
+                departmentId: input.firstDepartmentId,
+                role: input.firstRole,
+                status: ApplicationStatus.PENDINGREVIEW,
+              },
+              {
+                rank: 2,
+                departmentId: input.secondDepartmentId,
+                role: input.secondRole,
+                status: ApplicationStatus.PENDINGREVIEW,
+              },
+              {
+                rank: 3,
+                departmentId: input.thirdDepartmentId,
+                role: input.thirdRole,
+                status: ApplicationStatus.PENDINGREVIEW,
+              },
+            ],
+          },
+        },
+      })
+    } catch (e) {
+      await ctx.prisma.log.create({
+        data: {
+          message: (e as Error).message,
+          title: ErrorTitle.ERROR_CREATING_SINGLE_APPLICANT,
+          type: LogType.ERROR,
+        },
+      })
+    }
+  })
diff --git a/src/server/trpc/router/admin/recruitment/index.ts b/src/server/trpc/router/admin/recruitment/index.ts
index 6a3255f7..6f2014bb 100644
--- a/src/server/trpc/router/admin/recruitment/index.ts
+++ b/src/server/trpc/router/admin/recruitment/index.ts
@@ -1,10 +1,13 @@
 import { router } from '~/server/trpc/trpc'
 import { updateAppliedRoleStatus, updateInterviewNotes } from './update'
-import { getAllApplicants, getApplicant } from './read'
+import { getAllApplicants, getApplicant, getAppliedRole } from './read'
+import { createSingleApplicant } from './create'
 
 export const recruitmentRouter = router({
   updateAppliedRoleStatus,
   updateInterviewNotes,
   getAllApplicants,
   getApplicant,
+  getAppliedRole,
+  createSingleApplicant,
 })
diff --git a/src/server/trpc/router/admin/recruitment/read.ts b/src/server/trpc/router/admin/recruitment/read.ts
index 43e5c4fa..4c3340aa 100644
--- a/src/server/trpc/router/admin/recruitment/read.ts
+++ b/src/server/trpc/router/admin/recruitment/read.ts
@@ -9,6 +9,7 @@ export const getAllApplicants = protectedProcedure.query(async ({ ctx }) => {
         level: 'applicant',
       },
       select: {
+        id: true,
         name: true,
         interviewNotes: true,
         appliedRoles: true,
@@ -43,3 +44,26 @@ export const getApplicant = protectedProcedure
       })
     }
   })
+
+export const getAppliedRole = protectedProcedure
+  .input(z.string())
+  .query(async ({ ctx, input }) => {
+    try {
+      return await ctx.prisma.appliedRole.findUnique({
+        where: {
+          id: input,
+        },
+        select: {
+          rank: true,
+          departmentId: true,
+          role: true,
+          status: true,
+        },
+      })
+    } catch (error) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: 'Error retrieving applicants: ' + error,
+      })
+    }
+  })
diff --git a/src/server/trpc/router/constants/ErrorTitle.ts b/src/server/trpc/router/constants/ErrorTitle.ts
index de834110..9bf44c5c 100644
--- a/src/server/trpc/router/constants/ErrorTitle.ts
+++ b/src/server/trpc/router/constants/ErrorTitle.ts
@@ -6,4 +6,5 @@ export enum ErrorTitle {
   ERROR_ADDING_MULTIPLE_USERS = 'ERROR ADDING MULTIPLE USERS',
   ERROR_ADDING_SINGLE_USER = 'ERROR ADDING SINGLE USER',
   ERROR_CREATING_EVENT = 'ERROR CREATING EVENT',
+  ERROR_CREATING_SINGLE_APPLICANT = 'ERROR ADDING SINGLE APPLICANT',
 }
diff --git a/src/types/model.ts b/src/types/model.ts
new file mode 100644
index 00000000..5245fb18
--- /dev/null
+++ b/src/types/model.ts
@@ -0,0 +1,8 @@
+import { AppliedRole, Prisma } from '@prisma/client'
+
+export type ApplicantWithAppliedRole = {
+  id: string
+  name: string | null
+  interviewNotes: string | null
+  appliedRoles: AppliedRole[]
+}

From 619310c6db898fb30eac107ee1200935ba79a571 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Thu, 25 May 2023 23:39:48 +0800
Subject: [PATCH 170/223] remove redux

---
 src/components/common/SearchBar.tsx           |  6 -----
 src/components/recruitment/searchNameSlice.ts | 27 -------------------
 src/pages/recruitment/applicants.tsx          |  8 +-----
 src/store/store.ts                            | 16 -----------
 4 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 src/components/recruitment/searchNameSlice.ts
 delete mode 100644 src/store/store.ts

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index cb85f032..a7d1f6d2 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -1,13 +1,8 @@
 import React, { useState } from 'react'
 import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import { SearchIcon } from '@chakra-ui/icons'
-import { useDispatch } from 'react-redux'
-import { searchByName } from '../recruitment/searchNameSlice'
-import type { RootState } from '~/store/store'
 
 const SearchBar = () => {
-  const dispatch = useDispatch()
-
   return (
     <InputGroup
       minWidth={'150px'}
@@ -26,7 +21,6 @@ const SearchBar = () => {
       <Input
         placeholder="Search"
         borderWidth="3px"
-        onChange={(e) => dispatch(searchByName(e.target.value))}
         border="3px solid #004586"
         borderColor="#004586"
         borderRadius="20px"
diff --git a/src/components/recruitment/searchNameSlice.ts b/src/components/recruitment/searchNameSlice.ts
deleted file mode 100644
index b73e5c6b..00000000
--- a/src/components/recruitment/searchNameSlice.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { createSlice } from '@reduxjs/toolkit'
-import type { PayloadAction } from '@reduxjs/toolkit'
-import { RootState } from '~/store/store'
-
-export interface SearchNameSlice {
-  value: string
-}
-
-const initialState: SearchNameSlice = {
-  value: '',
-}
-
-export const searchNameSlice = createSlice({
-  name: 'searchName',
-  initialState,
-  reducers: {
-    searchByName: (state, action: PayloadAction<string>) => {
-      state.value = action.payload
-    },
-  },
-})
-
-export const { searchByName } = searchNameSlice.actions
-
-export const selectSearchValue = (state: RootState) => state.searchName.value
-
-export default searchNameSlice.reducer
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 2b512ca7..186fc0d8 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -8,15 +8,9 @@ import ApplicantGrid from '~/components/recruitment/ApplicantGrid'
 import InfoPopup from '~/components/recruitment/InfoPopup'
 import { trpc } from '~/utils/trpc'
 import { useSelector } from 'react-redux'
-import { selectSearchValue } from '~/components/recruitment/searchNameSlice'
 
 const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
   const { data } = trpc.recruitment.getAllApplicants.useQuery()
-  const searchValue = useSelector(selectSearchValue)
-
-  const filteredData = data?.filter((item) =>
-    searchValue == '' ? item : item.name?.toLowerCase().includes(searchValue)
-  )
 
   return (
     <>
@@ -32,7 +26,7 @@ const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
       <Layout>
         <Text className="text-center text-4xl font-bold">Applicants</Text>
         <SearchBar />
-        <ApplicantGrid data={filteredData} />
+        <ApplicantGrid data={data} />
         <InfoPopup />
       </Layout>
     </>
diff --git a/src/store/store.ts b/src/store/store.ts
deleted file mode 100644
index 4deb8b5c..00000000
--- a/src/store/store.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { configureStore } from '@reduxjs/toolkit'
-import dashboardReducer from './admin/dashboard'
-import searchNameReducer from '../components/recruitment/searchNameSlice'
-
-const store = configureStore({
-  reducer: {
-    dashboard: dashboardReducer,
-    searchName: searchNameReducer,
-  },
-})
-
-// Infer the `RootState` and `AppDispatch` types from the store itself
-export type RootState = ReturnType<typeof store.getState>
-// Inferred type: {posts: PostsState, comments: CommentsState, users: UsersState}
-export type AppDispatch = typeof store.dispatch
-export default store

From e5efcf11a455b7c3b9bba4d08aae8e0c2eb76552 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Fri, 26 May 2023 14:39:20 +0800
Subject: [PATCH 171/223] remove unused import

---
 src/pages/recruitment/applicants.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 186fc0d8..90fa1f4b 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -7,7 +7,6 @@ import withAuth, { type BaseProps } from '~/utils/withAuth'
 import ApplicantGrid from '~/components/recruitment/ApplicantGrid'
 import InfoPopup from '~/components/recruitment/InfoPopup'
 import { trpc } from '~/utils/trpc'
-import { useSelector } from 'react-redux'
 
 const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
   const { data } = trpc.recruitment.getAllApplicants.useQuery()

From b0a63b822816e8e17ec5abe1e98e5afe32a87617 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Fri, 26 May 2023 15:01:48 +0800
Subject: [PATCH 172/223] update buildUserObject w new schema

---
 src/server/trpc/router/member/helper.ts | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index 16ab3682..44aaac2c 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -66,18 +66,14 @@ async function sendEmail(email: string, password: string) {
 function buildUserObject(
   input: {
     date_of_birth: string
-    diet: string
     department: string
     discord: string
     faculty: string
     gender: string
-    linkedin: string
     major: string
     name: string
     nus_email: string
     personal_email: string
-    phone: string
-    race: string
     role: string
     student_id: string
     telegram: string
@@ -90,23 +86,19 @@ function buildUserObject(
       batch: 'AY22/23',
       department: user.department,
       date_of_birth: dayjs().toDate(),
-      diet: user.diet,
       discord: user.discord,
       faculty: user.faculty,
       gender: user.gender,
       hashedPassword,
       image: null,
-      interviewNotes: user.interviewNotes,
       level: 'member',
-      linkedin: user.linkedin,
       major: user.major,
       id: user.student_id,
       isAdmin: false,
+      interviewNotes: null,
       name: user.name,
       email: user.nus_email,
       personal_email: user.personal_email,
-      phone: user.phone,
-      race: user.race,
       role: user.role,
       telegram: user.telegram,
       total_events: 0,

From c1b2529d0473c8d36bfed722ddb16994d9e556fd Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sat, 27 May 2023 22:06:50 +0800
Subject: [PATCH 173/223] schema update inc department relation

---
 src/server/trpc/router/admin/recruitment/create.ts | 7 ++++++-
 src/server/trpc/router/admin/recruitment/read.ts   | 2 +-
 src/server/trpc/router/member/helper.ts            | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/server/trpc/router/admin/recruitment/create.ts b/src/server/trpc/router/admin/recruitment/create.ts
index 2697ccaf..9f3ff726 100644
--- a/src/server/trpc/router/admin/recruitment/create.ts
+++ b/src/server/trpc/router/admin/recruitment/create.ts
@@ -8,6 +8,7 @@ import { ErrorTitle } from '../../constants/ErrorTitle'
 export const createSingleApplicant = protectedProcedure
   .input(
     z.object({
+      id: z.string(),
       email: z.string(),
       password: z.string(),
       name: z.string(),
@@ -24,25 +25,29 @@ export const createSingleApplicant = protectedProcedure
     try {
       await ctx.prisma.user.create({
         data: {
+          id: input.id,
           email: input.email,
           hashedPassword,
           name: input.name,
-          level: 'applicant',
+          role: 'Applicant',
           appliedRoles: {
             create: [
               {
+                id: input.id,
                 rank: 1,
                 departmentId: input.firstDepartmentId,
                 role: input.firstRole,
                 status: ApplicationStatus.PENDINGREVIEW,
               },
               {
+                id: input.id,
                 rank: 2,
                 departmentId: input.secondDepartmentId,
                 role: input.secondRole,
                 status: ApplicationStatus.PENDINGREVIEW,
               },
               {
+                id: input.id,
                 rank: 3,
                 departmentId: input.thirdDepartmentId,
                 role: input.thirdRole,
diff --git a/src/server/trpc/router/admin/recruitment/read.ts b/src/server/trpc/router/admin/recruitment/read.ts
index 4c3340aa..21ade831 100644
--- a/src/server/trpc/router/admin/recruitment/read.ts
+++ b/src/server/trpc/router/admin/recruitment/read.ts
@@ -6,7 +6,7 @@ export const getAllApplicants = protectedProcedure.query(async ({ ctx }) => {
   try {
     return await ctx.prisma.user.findMany({
       where: {
-        level: 'applicant',
+        role: 'applicant',
       },
       select: {
         id: true,
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index 44aaac2c..c33eff35 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -66,7 +66,7 @@ async function sendEmail(email: string, password: string) {
 function buildUserObject(
   input: {
     date_of_birth: string
-    department: string
+    departmentId: string
     discord: string
     faculty: string
     gender: string
@@ -84,7 +84,7 @@ function buildUserObject(
   return input.map((user) => {
     return {
       batch: 'AY22/23',
-      department: user.department,
+      departmentId: user.departmentId,
       date_of_birth: dayjs().toDate(),
       discord: user.discord,
       faculty: user.faculty,

From 3f4a2ac302de5f1df98be6cd5e26de56d9c3cf53 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 28 May 2023 18:10:50 +0800
Subject: [PATCH 174/223] impl search applicant and edit notes fn

---
 src/components/common/SearchBar.tsx           |  8 +++-
 src/components/recruitment/ApplicantCard.tsx  |  6 +--
 src/components/recruitment/NoteModal.tsx      | 43 +++++++------------
 src/constant/messages.ts                      |  2 +
 src/context/recruitment/SearchProvider.tsx    | 24 +++++++++++
 src/pages/recruitment/applicants.tsx          | 12 +++---
 .../trpc/router/admin/recruitment/read.ts     |  2 +-
 src/types/model.ts                            |  2 +-
 8 files changed, 58 insertions(+), 41 deletions(-)
 create mode 100644 src/context/recruitment/SearchProvider.tsx

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index a7d1f6d2..0a4d15d0 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -1,8 +1,11 @@
-import React, { useState } from 'react'
+import React, { useContext, useState } from 'react'
 import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import { SearchIcon } from '@chakra-ui/icons'
+import { searchContext } from '~/context/recruitment/SearchProvider'
 
 const SearchBar = () => {
+  const { search, setSearch } = useContext(searchContext)
+  console.log('searchbar: ', search)
   return (
     <InputGroup
       minWidth={'150px'}
@@ -24,6 +27,9 @@ const SearchBar = () => {
         border="3px solid #004586"
         borderColor="#004586"
         borderRadius="20px"
+        onChange={(e) => {
+          setSearch(e.currentTarget.value)
+        }}
       ></Input>
     </InputGroup>
   )
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index a2a425d9..be1f1223 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -8,14 +8,12 @@ import {
   Stack,
   UnorderedList,
 } from '@chakra-ui/react'
-import { User } from '@prisma/client'
 import { Avatar } from 'flowbite-react'
 import AppliedRoleListItem from './AppliedRoleListItem'
 import DocumentModal from './DocumentModal'
 import NoteModal from './NoteModal'
-import type { AppliedRole } from '@prisma/client'
 import { trpc } from '~/utils/trpc'
-import { ApplicantWithAppliedRole } from '~/types/model'
+import type { ApplicantWithAppliedRole } from '~/types/model'
 
 const ApplicantCard = ({
   applicant,
@@ -31,7 +29,7 @@ const ApplicantCard = ({
     >
       <CardHeader paddingBottom="0" zIndex={1}>
         <Heading size="md" textAlign="center" textColor="white">
-          Name
+          {applicant.name}
         </Heading>
       </CardHeader>
       <Image
diff --git a/src/components/recruitment/NoteModal.tsx b/src/components/recruitment/NoteModal.tsx
index 29cffa6b..20d4c85a 100644
--- a/src/components/recruitment/NoteModal.tsx
+++ b/src/components/recruitment/NoteModal.tsx
@@ -27,13 +27,13 @@ const NoteModal = ({
   interviewNotes: string | null
   refetch: () => Promise<QueryObserverResult>
 }) => {
-  interviewNotes = 'hello there testing'
-
   const toast = useToast()
   const { mutateAsync } = trpc.recruitment.updateInterviewNotes.useMutation()
   const [edit, setEdit] = useState(false)
-  const [notes, setNotes] = useState('default notes')
-  const [tempNotes, setTempNotes] = useState('')
+  const [notes, setNotes] = useState(interviewNotes ? interviewNotes : '')
+  const [tempNotes, setTempNotes] = useState(
+    interviewNotes ? interviewNotes : ''
+  )
   const { isOpen, onOpen, onClose } = useDisclosure()
 
   //TODO: checking inputs
@@ -61,20 +61,20 @@ const NoteModal = ({
     })
 
     toast({
-      duration: 3000,
+      duration: 2000,
       status: 'loading',
       title: 'Loading',
-      description: Message.PERSONAL_INFO_LOADING,
+      description: Message.APPLICANT_INFO_LOADING,
     })
 
     await refetch()
     setEdit(false)
 
     toast({
-      duration: 3000,
+      duration: 2000,
       status: 'success',
       title: 'Success',
-      description: Message.PERSONAL_INFO_SUCCESS,
+      description: Message.APPLICANT_INFO_SUCCESS,
     })
   }
 
@@ -99,25 +99,14 @@ const NoteModal = ({
           <ModalHeader textAlign="center">Interview Notes</ModalHeader>
           <ModalCloseButton />
           <ModalBody>
-            {tempNotes ? (
-              <Input
-                variant="unstyled"
-                value={tempNotes}
-                onChange={(e) => {
-                  setTempNotes(e.currentTarget.value)
-                  setEdit(true)
-                }}
-              />
-            ) : (
-              <Input
-                variant="unstyled"
-                placeholder="Write notes.."
-                onChange={(e) => {
-                  setTempNotes(e.currentTarget.value)
-                  setEdit(true)
-                }}
-              />
-            )}
+            <Input
+              variant="unstyled"
+              value={tempNotes || ''}
+              onChange={(e) => {
+                setTempNotes(e.currentTarget.value)
+                setEdit(true)
+              }}
+            />
           </ModalBody>
           <ModalFooter>
             {edit ? (
diff --git a/src/constant/messages.ts b/src/constant/messages.ts
index cb2b5c10..e4301b64 100644
--- a/src/constant/messages.ts
+++ b/src/constant/messages.ts
@@ -5,4 +5,6 @@ export enum Message {
   PERSONAL_INFO_ERROR = 'An error occurred while updating your personal information. Please try again. If this error continues, please contact the dev team',
   PERSONAL_INFO_LOADING = 'Your contact info is currently being updated. Please wait for a while.',
   PERSONAL_INFO_SUCCESS = 'Your contact info has been successfully updated.',
+  APPLICANT_INFO_LOADING = 'Applicant info is currently being updated. Please wait for awhile.',
+  APPLICANT_INFO_SUCCESS = 'Applicant info has been successfully updated.',
 }
diff --git a/src/context/recruitment/SearchProvider.tsx b/src/context/recruitment/SearchProvider.tsx
new file mode 100644
index 00000000..0405535d
--- /dev/null
+++ b/src/context/recruitment/SearchProvider.tsx
@@ -0,0 +1,24 @@
+import { createContext, Dispatch, SetStateAction, useState } from 'react'
+
+type SearchContextType = {
+  search: string
+  setSearch: (s: string) => void
+}
+
+export const searchContext = createContext<SearchContextType>({
+  search: '',
+  setSearch: () => {
+    return
+  },
+})
+
+const SearchProvider = (props: any) => {
+  const [search, setSearch] = useState<string>('')
+  return (
+    <searchContext.Provider value={{ search, setSearch }}>
+      {props.children}
+    </searchContext.Provider>
+  )
+}
+
+export default SearchProvider
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 90fa1f4b..54e73311 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -5,12 +5,9 @@ import TopNavbar from '~/components/common/TopNavbar'
 import SearchBar from '~/components/common/SearchBar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
 import ApplicantGrid from '~/components/recruitment/ApplicantGrid'
-import InfoPopup from '~/components/recruitment/InfoPopup'
-import { trpc } from '~/utils/trpc'
+import SearchProvider from '~/context/recruitment/SearchProvider'
 
 const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
-  const { data } = trpc.recruitment.getAllApplicants.useQuery()
-
   return (
     <>
       <Head>
@@ -24,9 +21,10 @@ const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
       <TopNavbar isAdmin={session.isAdmin} />
       <Layout>
         <Text className="text-center text-4xl font-bold">Applicants</Text>
-        <SearchBar />
-        <ApplicantGrid data={data} />
-        <InfoPopup />
+        <SearchProvider>
+          <SearchBar />
+          <ApplicantGrid />
+        </SearchProvider>
       </Layout>
     </>
   )
diff --git a/src/server/trpc/router/admin/recruitment/read.ts b/src/server/trpc/router/admin/recruitment/read.ts
index 21ade831..54a1a6f6 100644
--- a/src/server/trpc/router/admin/recruitment/read.ts
+++ b/src/server/trpc/router/admin/recruitment/read.ts
@@ -6,7 +6,7 @@ export const getAllApplicants = protectedProcedure.query(async ({ ctx }) => {
   try {
     return await ctx.prisma.user.findMany({
       where: {
-        role: 'applicant',
+        role: 'Applicant',
       },
       select: {
         id: true,
diff --git a/src/types/model.ts b/src/types/model.ts
index 5245fb18..e6c03eb2 100644
--- a/src/types/model.ts
+++ b/src/types/model.ts
@@ -1,4 +1,4 @@
-import { AppliedRole, Prisma } from '@prisma/client'
+import type { AppliedRole } from '@prisma/client'
 
 export type ApplicantWithAppliedRole = {
   id: string

From e0703ad9f08db4d10751f89fcc3654b2ac6c9c29 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Mon, 29 May 2023 21:58:28 +0800
Subject: [PATCH 175/223] file upload impl w firebase

---
 firebase.ts                                   | 16 +++++
 src/components/recruitment/ApplicantCard.tsx  |  5 +-
 src/components/recruitment/DocumentModal.tsx  | 44 +++++++++++--
 .../recruitment/DocumentModalAdd.tsx          | 61 +++++++++++++++++++
 .../recruitment/DocumentModalAddButton.tsx    | 21 -------
 .../recruitment/DocumentModalCard.tsx         | 17 ++++--
 src/constant/messages.ts                      |  2 +
 src/types/model.ts                            |  2 +-
 8 files changed, 134 insertions(+), 34 deletions(-)
 create mode 100644 firebase.ts
 create mode 100644 src/components/recruitment/DocumentModalAdd.tsx
 delete mode 100644 src/components/recruitment/DocumentModalAddButton.tsx

diff --git a/firebase.ts b/firebase.ts
new file mode 100644
index 00000000..23eab88e
--- /dev/null
+++ b/firebase.ts
@@ -0,0 +1,16 @@
+// Import the functions you need from the SDKs you need
+import { initializeApp } from 'firebase/app'
+import { getStorage } from 'firebase/storage'
+
+const firebaseConfig = {
+  apiKey: 'AIzaSyAOUlACTtNKliBsPnGsWnCu0I_76eXDQ-U',
+  authDomain: 'fintech-society.firebaseapp.com',
+  projectId: 'fintech-society',
+  storageBucket: 'fintech-society.appspot.com',
+  messagingSenderId: '181597094279',
+  appId: '1:181597094279:web:f5dd7ebab8e9750337d322',
+}
+
+// Initialize Firebase
+const app = initializeApp(firebaseConfig)
+export const storage = getStorage(app)
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index be1f1223..01a902a7 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -46,7 +46,10 @@ const ApplicantCard = ({
           <Avatar alt="User-settings" rounded={true} size="lg" />
           <Box className="flex justify-center">
             <Box>
-              <DocumentModal />
+              <DocumentModal
+                applicantId={applicant.id}
+                applicantName={applicant.name}
+              />
               <NoteModal
                 applicantId={applicant.id}
                 interviewNotes={applicant.interviewNotes}
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
index 5d4a07c3..a6b44f41 100644
--- a/src/components/recruitment/DocumentModal.tsx
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -8,12 +8,42 @@ import {
   ModalOverlay,
   useDisclosure,
 } from '@chakra-ui/react'
+import { getDownloadURL, listAll, ref } from 'firebase/storage'
+import { useEffect, useState } from 'react'
 import { BsFolder2Open } from 'react-icons/bs'
-import DocumentModalAddButton from './DocumentModalAddButton'
+import { storage } from '~/../firebase'
+import DocumentModalAdd from './DocumentModalAdd'
 import DocumentModalCard from './DocumentModalCard'
 
-const DocumentModal = () => {
+const DocumentModal = ({
+  applicantId,
+  applicantName,
+}: {
+  applicantId: string
+  applicantName: string
+}) => {
   const { isOpen, onOpen, onClose } = useDisclosure()
+  const [fileList, setFileList] = useState<string[]>([])
+  const applicantListRef = ref(storage, `${applicantId}/`)
+
+  // Hook to get the files associated with the applicant
+  useEffect(() => {
+    listAll(applicantListRef)
+      .then((res) => {
+        const urlList: string[] = []
+        res.items.forEach((item) => {
+          getDownloadURL(item).then((url) => {
+            urlList.push(url)
+          })
+        })
+        setFileList(urlList)
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+    console.log('fileList: ', fileList)
+  }, [])
+
   return (
     <>
       <IconButton
@@ -33,15 +63,17 @@ const DocumentModal = () => {
           boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
         >
           <ModalHeader textAlign="center" fontSize="2xl">
-            [Username] Documents
+            {applicantName} Documents
           </ModalHeader>
           <ModalCloseButton />
           <ModalBody>
             <div className="my-5 mx-10 grid grid-cols-1 place-items-center gap-y-10 lg:grid-cols-2 ">
-              <DocumentModalCard />
-              <DocumentModalCard />
-              <DocumentModalAddButton />
+              {fileList.map((file) => {
+                console.log('file: ', file)
+                return <DocumentModalCard file={file} key={file} />
+              })}
             </div>
+            <DocumentModalAdd applicantId={applicantId} />
           </ModalBody>
         </ModalContent>
       </Modal>
diff --git a/src/components/recruitment/DocumentModalAdd.tsx b/src/components/recruitment/DocumentModalAdd.tsx
new file mode 100644
index 00000000..54c51d1a
--- /dev/null
+++ b/src/components/recruitment/DocumentModalAdd.tsx
@@ -0,0 +1,61 @@
+import { AddIcon } from '@chakra-ui/icons'
+import { Box, IconButton, Input, useToast } from '@chakra-ui/react'
+import { useEffect, useState } from 'react'
+import { storage } from '../../../firebase'
+import { ref, uploadBytes } from 'firebase/storage'
+import { uuidv4 } from '@firebase/util'
+import { Message } from '~/constant/messages'
+
+const DocumentModalAdd = ({ applicantId }: { applicantId: string }) => {
+  const toast = useToast()
+  const [file, setFile] = useState<File>()
+
+  const uploadFile = () => {
+    if (file == null) return
+    const fileRef = ref(storage, `${applicantId}/${file.name + uuidv4()}`)
+    uploadBytes(fileRef, file)
+      .then(() => {
+        toast({
+          duration: 2000,
+          status: 'success',
+          title: 'Success',
+          description: Message.FILE_UPLOAD_SUCCESS,
+        })
+      })
+      .catch(() => {
+        toast({
+          duration: 2000,
+          status: 'error',
+          title: 'Error',
+          description: Message.FILE_UPLOAD_FAIL,
+        })
+      })
+  }
+
+  return (
+    <Box className="mx-10 mt-10 mb-4 flex">
+      <Input
+        type="file"
+        mr="4"
+        onChange={(e) => {
+          if (e.target.files) setFile(e.target.files[0])
+        }}
+      ></Input>
+      <IconButton
+        aria-label="Info popup for applicant detail"
+        icon={<AddIcon />}
+        borderRadius="30px"
+        boxShadow="0px 4px 4px 2px rgba(0, 0, 0, 0.15)"
+        bg="white"
+        _hover={{ background: '#e4e8ff' }}
+        fontSize="16px"
+        p="4"
+        width="30px"
+        height="30px"
+        onClick={uploadFile}
+      />
+    </Box>
+  )
+}
+
+export default DocumentModalAdd
diff --git a/src/components/recruitment/DocumentModalAddButton.tsx b/src/components/recruitment/DocumentModalAddButton.tsx
deleted file mode 100644
index b6a543ee..00000000
--- a/src/components/recruitment/DocumentModalAddButton.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { AddIcon } from '@chakra-ui/icons'
-import { IconButton } from '@chakra-ui/react'
-
-const DocumentModalAddButton = () => {
-  return (
-    <IconButton
-      aria-label="Info popup for applicant detail"
-      icon={<AddIcon />}
-      borderRadius="30px"
-      boxShadow="0px 8px 4px 2px rgba(0, 0, 0, 0.15)"
-      bg="white"
-      _hover={{ background: '#e4e8ff' }}
-      fontSize="40px"
-      p="12"
-      width="120px"
-      height="120px"
-    />
-  )
-}
-
-export default DocumentModalAddButton
diff --git a/src/components/recruitment/DocumentModalCard.tsx b/src/components/recruitment/DocumentModalCard.tsx
index 2fe98acd..9ef3a0a0 100644
--- a/src/components/recruitment/DocumentModalCard.tsx
+++ b/src/components/recruitment/DocumentModalCard.tsx
@@ -1,17 +1,24 @@
-import { Card, CardBody, Text } from '@chakra-ui/react'
+import { Card, CardBody, IconButton, Text } from '@chakra-ui/react'
 
-const DocumentModalCard = () => {
+const DocumentModalCard = ({ file }: { file: string }) => {
+  const openDocumentInNewTab = () => {
+    window.open(file, '_blank', 'noreferrer')
+  }
   return (
-    <Card
+    <IconButton
+      aria-label={file}
       borderRadius="30px"
       boxShadow="0px 8px 4px 2px rgba(0, 0, 0, 0.15)"
+      bg="white"
+      _hover={{ background: '#e4e8ff' }}
       width="120px"
       height="120px"
+      onClick={() => openDocumentInNewTab()}
     >
       <CardBody>
-        <Text textAlign="center">Transcript</Text>
+        <Text textAlign="center">Document</Text>
       </CardBody>
-    </Card>
+    </IconButton>
   )
 }
 
diff --git a/src/constant/messages.ts b/src/constant/messages.ts
index e4301b64..b9597e65 100644
--- a/src/constant/messages.ts
+++ b/src/constant/messages.ts
@@ -2,6 +2,8 @@ export enum Message {
   IMAGE_UPLOAD_ERROR = 'An error occured while uploading your image. Please try again. If this error continues, please contact the dev team.',
   IMAGE_UPLOAD_LOADING = 'Your image is currently being updated. Please wait for a while.',
   IMAGE_UPLOAD_SUCCESS = 'Your image has been successfully updated. Please refresh to see the updated image.',
+  FILE_UPLOAD_SUCCESS = 'File has been successfully uploaded.',
+  FILE_UPLOAD_FAIL = 'An error occurred while uploading file.',
   PERSONAL_INFO_ERROR = 'An error occurred while updating your personal information. Please try again. If this error continues, please contact the dev team',
   PERSONAL_INFO_LOADING = 'Your contact info is currently being updated. Please wait for a while.',
   PERSONAL_INFO_SUCCESS = 'Your contact info has been successfully updated.',
diff --git a/src/types/model.ts b/src/types/model.ts
index e6c03eb2..d36946e4 100644
--- a/src/types/model.ts
+++ b/src/types/model.ts
@@ -2,7 +2,7 @@ import type { AppliedRole } from '@prisma/client'
 
 export type ApplicantWithAppliedRole = {
   id: string
-  name: string | null
+  name: string
   interviewNotes: string | null
   appliedRoles: AppliedRole[]
 }

From 17c51a41b7faa1ffc239f0ed698aca1635d4e5da Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Tue, 30 May 2023 22:38:37 +0800
Subject: [PATCH 176/223] info popup on hover

---
 src/components/recruitment/InfoPopup.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/recruitment/InfoPopup.tsx b/src/components/recruitment/InfoPopup.tsx
index e32f0c9b..d850a5ac 100644
--- a/src/components/recruitment/InfoPopup.tsx
+++ b/src/components/recruitment/InfoPopup.tsx
@@ -17,7 +17,7 @@ import { BsCircleFill } from 'react-icons/bs'
 const InfoPopup = () => {
   return (
     <Box className="bottom-25 absolute right-20">
-      <Popover placement="left">
+      <Popover placement="left" trigger="hover">
         <PopoverTrigger>
           <IconButton
             aria-label="Info popup for applicant detail"
@@ -29,8 +29,7 @@ const InfoPopup = () => {
             stroke="#02005A"
           />
         </PopoverTrigger>
-        <PopoverContent>
-          <PopoverCloseButton />
+        <PopoverContent rootProps={{ style: { right: 0 } }}>
           <PopoverBody>
             <UnorderedList styleType="none" spacing="2">
               <ListItem className="flex items-center">

From 92e2dce888a8460275f10c522e4c2fe9554a388d Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Wed, 31 May 2023 21:56:11 +0800
Subject: [PATCH 177/223] director page style adjustments

---
 src/pages/recruitment/applicants.tsx                     | 7 +++----
 src/server/trpc/router/{admin => }/recruitment/create.ts | 2 +-
 src/server/trpc/router/{admin => }/recruitment/index.ts  | 0
 src/server/trpc/router/{admin => }/recruitment/read.ts   | 0
 src/server/trpc/router/{admin => }/recruitment/update.ts | 0
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename src/server/trpc/router/{admin => }/recruitment/create.ts (97%)
 rename src/server/trpc/router/{admin => }/recruitment/index.ts (100%)
 rename src/server/trpc/router/{admin => }/recruitment/read.ts (100%)
 rename src/server/trpc/router/{admin => }/recruitment/update.ts (100%)

diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 54e73311..4078a37f 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -1,6 +1,5 @@
-import { Text } from '@chakra-ui/react'
+import { Box, Text } from '@chakra-ui/react'
 import Head from 'next/head'
-import Layout from '~/components/common/Layout'
 import TopNavbar from '~/components/common/TopNavbar'
 import SearchBar from '~/components/common/SearchBar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
@@ -19,13 +18,13 @@ const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
         />
       </Head>
       <TopNavbar isAdmin={session.isAdmin} />
-      <Layout>
+      <Box position="relative" mt="10">
         <Text className="text-center text-4xl font-bold">Applicants</Text>
         <SearchProvider>
           <SearchBar />
           <ApplicantGrid />
         </SearchProvider>
-      </Layout>
+      </Box>
     </>
   )
 }
diff --git a/src/server/trpc/router/admin/recruitment/create.ts b/src/server/trpc/router/recruitment/create.ts
similarity index 97%
rename from src/server/trpc/router/admin/recruitment/create.ts
rename to src/server/trpc/router/recruitment/create.ts
index 9f3ff726..4c4ae03f 100644
--- a/src/server/trpc/router/admin/recruitment/create.ts
+++ b/src/server/trpc/router/recruitment/create.ts
@@ -3,7 +3,7 @@ import { hash } from 'bcryptjs'
 import { randomUUID } from 'crypto'
 import { z } from 'zod'
 import { protectedProcedure } from '~/server/trpc/trpc'
-import { ErrorTitle } from '../../constants/ErrorTitle'
+import { ErrorTitle } from '../constants/ErrorTitle'
 
 export const createSingleApplicant = protectedProcedure
   .input(
diff --git a/src/server/trpc/router/admin/recruitment/index.ts b/src/server/trpc/router/recruitment/index.ts
similarity index 100%
rename from src/server/trpc/router/admin/recruitment/index.ts
rename to src/server/trpc/router/recruitment/index.ts
diff --git a/src/server/trpc/router/admin/recruitment/read.ts b/src/server/trpc/router/recruitment/read.ts
similarity index 100%
rename from src/server/trpc/router/admin/recruitment/read.ts
rename to src/server/trpc/router/recruitment/read.ts
diff --git a/src/server/trpc/router/admin/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
similarity index 100%
rename from src/server/trpc/router/admin/recruitment/update.ts
rename to src/server/trpc/router/recruitment/update.ts

From 4209649ecda744dc62528a043c2f3352564ef34d Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Fri, 2 Jun 2023 22:59:53 +0800
Subject: [PATCH 178/223] migration to firestore not including model

---
 firebase.ts                                   | 16 ----
 src/components/recruitment/ApplicantCard.tsx  | 34 +++------
 .../recruitment/AppliedRoleListItem.tsx       | 22 +++++-
 src/components/recruitment/DocumentModal.tsx  | 21 +-----
 .../recruitment/DocumentModalAdd.tsx          |  9 ++-
 src/components/recruitment/NoteModal.tsx      | 14 +---
 src/components/recruitment/StatusPopup.tsx    | 15 ++--
 src/pages/recruitment/index.tsx               |  5 +-
 src/server/trpc/router/recruitment/create.ts  | 69 ------------------
 src/server/trpc/router/recruitment/index.ts   |  2 -
 src/server/trpc/router/recruitment/read.ts    | 73 ++++++++++---------
 src/server/trpc/router/recruitment/update.ts  | 31 +++-----
 src/utils/storage.ts                          | 19 +++++
 13 files changed, 116 insertions(+), 214 deletions(-)
 delete mode 100644 firebase.ts
 delete mode 100644 src/server/trpc/router/recruitment/create.ts

diff --git a/firebase.ts b/firebase.ts
deleted file mode 100644
index 23eab88e..00000000
--- a/firebase.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Import the functions you need from the SDKs you need
-import { initializeApp } from 'firebase/app'
-import { getStorage } from 'firebase/storage'
-
-const firebaseConfig = {
-  apiKey: 'AIzaSyAOUlACTtNKliBsPnGsWnCu0I_76eXDQ-U',
-  authDomain: 'fintech-society.firebaseapp.com',
-  projectId: 'fintech-society',
-  storageBucket: 'fintech-society.appspot.com',
-  messagingSenderId: '181597094279',
-  appId: '1:181597094279:web:f5dd7ebab8e9750337d322',
-}
-
-// Initialize Firebase
-const app = initializeApp(firebaseConfig)
-export const storage = getStorage(app)
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index 01a902a7..e40f2253 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -11,16 +11,9 @@ import {
 import { Avatar } from 'flowbite-react'
 import AppliedRoleListItem from './AppliedRoleListItem'
 import DocumentModal from './DocumentModal'
-import NoteModal from './NoteModal'
-import { trpc } from '~/utils/trpc'
-import type { ApplicantWithAppliedRole } from '~/types/model'
+import type { Applicant } from '~/server/db/models/Applicant'
 
-const ApplicantCard = ({
-  applicant,
-}: {
-  applicant: ApplicantWithAppliedRole
-}) => {
-  const { refetch } = trpc.recruitment.getApplicant.useQuery(applicant.id)
+const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
   return (
     <Card
       maxWidth="sm"
@@ -50,22 +43,19 @@ const ApplicantCard = ({
                 applicantId={applicant.id}
                 applicantName={applicant.name}
               />
-              <NoteModal
-                applicantId={applicant.id}
-                interviewNotes={applicant.interviewNotes}
-                refetch={refetch}
-              />
             </Box>
           </Box>
           <UnorderedList styleType="none">
-            {applicant.appliedRoles.map((appliedRole) => {
-              return (
-                <AppliedRoleListItem
-                  appliedRole={appliedRole}
-                  key={appliedRole.id}
-                />
-              )
-            })}
+            {applicant.appliedRoles
+              .sort((a, b) => a.rank - b.rank)
+              .map((appliedRole) => {
+                return (
+                  <AppliedRoleListItem
+                    appliedRole={appliedRole}
+                    key={appliedRole.id}
+                  />
+                )
+              })}
           </UnorderedList>
         </Stack>
       </CardBody>
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index 3787e565..eb510f1d 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -1,14 +1,28 @@
-import { ListItem, Text } from '@chakra-ui/react'
-import type { AppliedRole } from '@prisma/client'
+import { Box, ListItem, Text } from '@chakra-ui/react'
+import type { AppliedRole } from '~/server/db/models/AppliedRole'
+import { trpc } from '~/utils/trpc'
+import NoteModal from './NoteModal'
 import StatusPopup from './StatusPopup'
 
 const AppliedRoleListItem = ({ appliedRole }: { appliedRole: AppliedRole }) => {
+  const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRole.id)
   return (
     <ListItem className="flex items-center justify-between">
       <Text>
-        {appliedRole.rank}. {appliedRole.departmentId} - {appliedRole.role}
+        {appliedRole.rank}. {appliedRole.department} - {appliedRole.role}
       </Text>
-      <StatusPopup status={appliedRole.status} appliedRoleId={appliedRole.id} />
+      <Box>
+        <StatusPopup
+          status={appliedRole.status}
+          appliedRoleId={appliedRole.id}
+          refetch={refetch}
+        />
+        <NoteModal
+          appliedRoleId={appliedRole.id}
+          interviewNotes={appliedRole.interviewNotes}
+          refetch={refetch}
+        />
+      </Box>
     </ListItem>
   )
 }
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
index a6b44f41..75c573dd 100644
--- a/src/components/recruitment/DocumentModal.tsx
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -11,7 +11,7 @@ import {
 import { getDownloadURL, listAll, ref } from 'firebase/storage'
 import { useEffect, useState } from 'react'
 import { BsFolder2Open } from 'react-icons/bs'
-import { storage } from '~/../firebase'
+import { StorageService } from '~/utils/storage'
 import DocumentModalAdd from './DocumentModalAdd'
 import DocumentModalCard from './DocumentModalCard'
 
@@ -24,23 +24,10 @@ const DocumentModal = ({
 }) => {
   const { isOpen, onOpen, onClose } = useDisclosure()
   const [fileList, setFileList] = useState<string[]>([])
-  const applicantListRef = ref(storage, `${applicantId}/`)
+  const docsFilePath = `${applicantId}/documents/`
 
   // Hook to get the files associated with the applicant
   useEffect(() => {
-    listAll(applicantListRef)
-      .then((res) => {
-        const urlList: string[] = []
-        res.items.forEach((item) => {
-          getDownloadURL(item).then((url) => {
-            urlList.push(url)
-          })
-        })
-        setFileList(urlList)
-      })
-      .catch((err) => {
-        console.log(err)
-      })
     console.log('fileList: ', fileList)
   }, [])
 
@@ -68,10 +55,10 @@ const DocumentModal = ({
           <ModalCloseButton />
           <ModalBody>
             <div className="my-5 mx-10 grid grid-cols-1 place-items-center gap-y-10 lg:grid-cols-2 ">
-              {fileList.map((file) => {
+              {/* {fileList.map((file) => {
                 console.log('file: ', file)
                 return <DocumentModalCard file={file} key={file} />
-              })}
+              })} */}
             </div>
             <DocumentModalAdd applicantId={applicantId} />
           </ModalBody>
diff --git a/src/components/recruitment/DocumentModalAdd.tsx b/src/components/recruitment/DocumentModalAdd.tsx
index 54c51d1a..3450c0ab 100644
--- a/src/components/recruitment/DocumentModalAdd.tsx
+++ b/src/components/recruitment/DocumentModalAdd.tsx
@@ -1,7 +1,7 @@
 import { AddIcon } from '@chakra-ui/icons'
 import { Box, IconButton, Input, useToast } from '@chakra-ui/react'
-import { useEffect, useState } from 'react'
-import { storage } from '../../../firebase'
+import { useState } from 'react'
+import { StorageService } from '~/utils/storage'
 import { ref, uploadBytes } from 'firebase/storage'
 import { uuidv4 } from '@firebase/util'
 import { Message } from '~/constant/messages'
@@ -12,8 +12,9 @@ const DocumentModalAdd = ({ applicantId }: { applicantId: string }) => {
 
   const uploadFile = () => {
     if (file == null) return
-    const fileRef = ref(storage, `${applicantId}/${file.name + uuidv4()}`)
-    uploadBytes(fileRef, file)
+    const filePath = `${applicantId}/documents/${file.name + uuidv4()}`
+
+    StorageService.uploadFile(file, filePath)
       .then(() => {
         toast({
           duration: 2000,
diff --git a/src/components/recruitment/NoteModal.tsx b/src/components/recruitment/NoteModal.tsx
index 20d4c85a..5f56b0e6 100644
--- a/src/components/recruitment/NoteModal.tsx
+++ b/src/components/recruitment/NoteModal.tsx
@@ -19,12 +19,12 @@ import { Message } from '~/constant/messages'
 import type { QueryObserverResult } from '@tanstack/react-query'
 
 const NoteModal = ({
-  applicantId,
+  appliedRoleId,
   interviewNotes,
   refetch,
 }: {
-  applicantId: string
-  interviewNotes: string | null
+  appliedRoleId: string
+  interviewNotes: string | undefined
   refetch: () => Promise<QueryObserverResult>
 }) => {
   const toast = useToast()
@@ -36,12 +36,6 @@ const NoteModal = ({
   )
   const { isOpen, onOpen, onClose } = useDisclosure()
 
-  //TODO: checking inputs
-  useEffect(() => {
-    console.log('notes:', notes)
-    console.log('temp notes:', tempNotes)
-  })
-  //TODO: checking inputs
   useEffect(() => {
     if (interviewNotes) {
       setNotes(interviewNotes)
@@ -57,7 +51,7 @@ const NoteModal = ({
   const updateNotes = async () => {
     await mutateAsync({
       interviewNotes: tempNotes,
-      applicantId: applicantId,
+      appliedRoleId: appliedRoleId,
     })
 
     toast({
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index c9941fa7..2fe084be 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -10,7 +10,7 @@ import {
   UnorderedList,
   useToast,
 } from '@chakra-ui/react'
-import { ApplicationStatus } from '@prisma/client'
+import { ApplicationStatus } from '~/constant/applicationStatus'
 import type { QueryObserverResult } from '@tanstack/react-query'
 import { BsCircleFill } from 'react-icons/bs'
 import { trpc } from '~/utils/trpc'
@@ -18,7 +18,7 @@ import { trpc } from '~/utils/trpc'
 const statusFillMap = {
   [ApplicationStatus.ACCEPTED]: '#46FFDE',
   [ApplicationStatus.OFFERED]: '#0038FF',
-  [ApplicationStatus.PENDINGREVIEW]: '#FFBD3C',
+  [ApplicationStatus.PENDING]: '#FFBD3C',
   [ApplicationStatus.INTERVIEWED]: '#CE44FF',
   [ApplicationStatus.REJECTED]: '#FF0000',
 }
@@ -26,14 +26,14 @@ const statusFillMap = {
 const StatusPopup = ({
   status,
   appliedRoleId,
+  refetch,
 }: {
   appliedRoleId: string
   status: ApplicationStatus
+  refetch: () => Promise<QueryObserverResult>
 }) => {
   const toast = useToast()
-  const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRoleId)
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
-
   const updateStatus = async (status: ApplicationStatus) => {
     try {
       await mutateAsync({
@@ -65,7 +65,6 @@ const StatusPopup = ({
           icon={<BsCircleFill fill={statusFillMap[status]} />}
           bg="None"
           _hover={{ background: 'None' }}
-          marginLeft="2"
         ></IconButton>
       </PopoverTrigger>
       <PopoverContent>
@@ -106,9 +105,7 @@ const StatusPopup = ({
                 _hover={{ background: 'None' }}
                 marginLeft="2"
                 onClick={() =>
-                  updateStatus(
-                    ApplicationStatus.PENDINGREVIEW as ApplicationStatus
-                  )
+                  updateStatus(ApplicationStatus.PENDING as ApplicationStatus)
                 }
               />
               <Text>Pending Review</Text>
@@ -116,7 +113,7 @@ const StatusPopup = ({
             <ListItem className="flex items-center">
               <IconButton
                 aria-label="interviewed status"
-                icon={<BsCircleFill fill="#FF0099" />}
+                icon={<BsCircleFill fill="#CE44FF" />}
                 bg="None"
                 _hover={{ background: 'None' }}
                 marginLeft="2"
diff --git a/src/pages/recruitment/index.tsx b/src/pages/recruitment/index.tsx
index 5567a9cc..0d0ebb83 100644
--- a/src/pages/recruitment/index.tsx
+++ b/src/pages/recruitment/index.tsx
@@ -1,4 +1,3 @@
-import Layout from '~/components/common/Layout'
 import Head from 'next/head'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
@@ -13,9 +12,7 @@ const RecruitmentPage: React.FC<BaseProps> = ({ session }) => {
         <meta name="description" content="The recruitment page for Atlas" />
       </Head>
       <TopNavbar isAdmin={session.isAdmin} />
-      <Layout>
-        <Text className="text-center text-4xl font-bold">Recruitment</Text>
-      </Layout>
+      <Text className="text-center text-4xl font-bold">Recruitment</Text>
     </>
   )
 }
diff --git a/src/server/trpc/router/recruitment/create.ts b/src/server/trpc/router/recruitment/create.ts
deleted file mode 100644
index 4c4ae03f..00000000
--- a/src/server/trpc/router/recruitment/create.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { ApplicationStatus, LogType } from '@prisma/client'
-import { hash } from 'bcryptjs'
-import { randomUUID } from 'crypto'
-import { z } from 'zod'
-import { protectedProcedure } from '~/server/trpc/trpc'
-import { ErrorTitle } from '../constants/ErrorTitle'
-
-export const createSingleApplicant = protectedProcedure
-  .input(
-    z.object({
-      id: z.string(),
-      email: z.string(),
-      password: z.string(),
-      name: z.string(),
-      firstRole: z.string(),
-      firstDepartmentId: z.string(),
-      secondRole: z.string(),
-      secondDepartmentId: z.string(),
-      thirdRole: z.string(),
-      thirdDepartmentId: z.string(),
-    })
-  )
-  .mutation(async ({ ctx, input }) => {
-    const hashedPassword = await hash(input.password, 10)
-    try {
-      await ctx.prisma.user.create({
-        data: {
-          id: input.id,
-          email: input.email,
-          hashedPassword,
-          name: input.name,
-          role: 'Applicant',
-          appliedRoles: {
-            create: [
-              {
-                id: input.id,
-                rank: 1,
-                departmentId: input.firstDepartmentId,
-                role: input.firstRole,
-                status: ApplicationStatus.PENDINGREVIEW,
-              },
-              {
-                id: input.id,
-                rank: 2,
-                departmentId: input.secondDepartmentId,
-                role: input.secondRole,
-                status: ApplicationStatus.PENDINGREVIEW,
-              },
-              {
-                id: input.id,
-                rank: 3,
-                departmentId: input.thirdDepartmentId,
-                role: input.thirdRole,
-                status: ApplicationStatus.PENDINGREVIEW,
-              },
-            ],
-          },
-        },
-      })
-    } catch (e) {
-      await ctx.prisma.log.create({
-        data: {
-          message: (e as Error).message,
-          title: ErrorTitle.ERROR_CREATING_SINGLE_APPLICANT,
-          type: LogType.ERROR,
-        },
-      })
-    }
-  })
diff --git a/src/server/trpc/router/recruitment/index.ts b/src/server/trpc/router/recruitment/index.ts
index 6f2014bb..47fcb129 100644
--- a/src/server/trpc/router/recruitment/index.ts
+++ b/src/server/trpc/router/recruitment/index.ts
@@ -1,7 +1,6 @@
 import { router } from '~/server/trpc/trpc'
 import { updateAppliedRoleStatus, updateInterviewNotes } from './update'
 import { getAllApplicants, getApplicant, getAppliedRole } from './read'
-import { createSingleApplicant } from './create'
 
 export const recruitmentRouter = router({
   updateAppliedRoleStatus,
@@ -9,5 +8,4 @@ export const recruitmentRouter = router({
   getAllApplicants,
   getApplicant,
   getAppliedRole,
-  createSingleApplicant,
 })
diff --git a/src/server/trpc/router/recruitment/read.ts b/src/server/trpc/router/recruitment/read.ts
index 54a1a6f6..2030fed3 100644
--- a/src/server/trpc/router/recruitment/read.ts
+++ b/src/server/trpc/router/recruitment/read.ts
@@ -1,20 +1,32 @@
 import { TRPCError } from '@trpc/server'
+import { where } from 'firebase/firestore'
 import { z } from 'zod'
+import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
+import userCollection from '~/server/db/collections/UserCollection'
+import type { Applicant } from '~/server/db/models/Applicant'
 import { protectedProcedure } from '~/server/trpc/trpc'
 
-export const getAllApplicants = protectedProcedure.query(async ({ ctx }) => {
+export const getAllApplicants = protectedProcedure.query(async ({}) => {
   try {
-    return await ctx.prisma.user.findMany({
-      where: {
-        role: 'Applicant',
-      },
-      select: {
-        id: true,
-        name: true,
-        interviewNotes: true,
-        appliedRoles: true,
-      },
-    })
+    const applicants = await userCollection.queries([
+      where('role', '==', 'Applicant'),
+    ])
+    const applicantsWithRoles: Applicant[] = []
+
+    for (let i = 0; i < applicants.length; i++) {
+      const applicant = applicants[i]
+      if (applicant) {
+        const appliedRoles = await appliedRoleCollection.queries([
+          where('applicantId', '==', applicant.id),
+        ])
+        applicantsWithRoles.push({
+          id: applicant?.id,
+          name: applicant?.name,
+          appliedRoles: appliedRoles,
+        })
+      }
+    }
+    return applicantsWithRoles
   } catch (error) {
     throw new TRPCError({
       code: 'INTERNAL_SERVER_ERROR',
@@ -25,18 +37,17 @@ export const getAllApplicants = protectedProcedure.query(async ({ ctx }) => {
 
 export const getApplicant = protectedProcedure
   .input(z.string())
-  .query(async ({ ctx, input }) => {
+  .query(async ({ input }) => {
     try {
-      return await ctx.prisma.user.findUnique({
-        where: {
-          id: input,
-        },
-        select: {
-          name: true,
-          interviewNotes: true,
-          appliedRoles: true,
-        },
-      })
+      const applicant = await userCollection.getById(input)
+      const appliedRoles = await appliedRoleCollection.queries([
+        where('applicantId', '==', applicant.id),
+      ])
+      return {
+        id: applicant.id,
+        name: applicant.name,
+        appliedRoles: appliedRoles,
+      }
     } catch (error) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
@@ -47,23 +58,13 @@ export const getApplicant = protectedProcedure
 
 export const getAppliedRole = protectedProcedure
   .input(z.string())
-  .query(async ({ ctx, input }) => {
+  .query(async ({ input }) => {
     try {
-      return await ctx.prisma.appliedRole.findUnique({
-        where: {
-          id: input,
-        },
-        select: {
-          rank: true,
-          departmentId: true,
-          role: true,
-          status: true,
-        },
-      })
+      return await appliedRoleCollection.getById(input)
     } catch (error) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
-        message: 'Error retrieving applicants: ' + error,
+        message: 'Error retrieving applied role: ' + error,
       })
     }
   })
diff --git a/src/server/trpc/router/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
index 38111cef..9c9fc3d6 100644
--- a/src/server/trpc/router/recruitment/update.ts
+++ b/src/server/trpc/router/recruitment/update.ts
@@ -1,26 +1,21 @@
 import { protectedProcedure } from '~/server/trpc/trpc'
 import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
-import type { ApplicationStatus } from '@prisma/client'
+import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
+import { ApplicationStatus } from '~/constant/applicationStatus'
 
 export const updateAppliedRoleStatus = protectedProcedure
   .input(
     z.object({
       appliedRoleId: z.string(),
-      status: z.string(),
+      status: z.nativeEnum(ApplicationStatus),
     })
   )
-  .mutation(async ({ ctx, input }) => {
+  .mutation(async ({ input }) => {
     try {
-      const role = await ctx.prisma.appliedRole.update({
-        where: {
-          id: input.appliedRoleId,
-        },
-        data: {
-          status: input.status as ApplicationStatus,
-        },
+      return await appliedRoleCollection.update(input.appliedRoleId, {
+        status: input.status,
       })
-      return role
     } catch (e) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
@@ -32,21 +27,15 @@ export const updateAppliedRoleStatus = protectedProcedure
 export const updateInterviewNotes = protectedProcedure
   .input(
     z.object({
-      applicantId: z.string(),
+      appliedRoleId: z.string(),
       interviewNotes: z.string(),
     })
   )
-  .mutation(async ({ ctx, input }) => {
+  .mutation(async ({ input }) => {
     try {
-      const applicant = await ctx.prisma.user.update({
-        where: {
-          id: input.applicantId,
-        },
-        data: {
-          interviewNotes: input.interviewNotes,
-        },
+      return await appliedRoleCollection.update(input.appliedRoleId, {
+        interviewNotes: input.interviewNotes,
       })
-      return applicant
     } catch (e) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
index c3cd830b..dce9bf19 100644
--- a/src/utils/storage.ts
+++ b/src/utils/storage.ts
@@ -5,6 +5,7 @@ import {
   uploadBytes,
   getDownloadURL,
   deleteObject,
+  listAll,
 } from 'firebase/storage'
 import { env } from '~/env/client.mjs'
 
@@ -31,4 +32,22 @@ export class StorageService {
     const storageRef = ref(this.storage, pathName)
     await deleteObject(storageRef)
   }
+
+  // returns a list of URL associated with the path
+  static async getFiles(pathName: string) {
+    const storageRef = ref(this.storage, pathName)
+    const urlList: string[] = []
+    listAll(storageRef)
+      .then((res) => {
+        res.items.forEach((item) => {
+          getDownloadURL(item).then((url) => {
+            urlList.push(url)
+          })
+        })
+      })
+      .catch((err) => {
+        console.log('Error while retrieving file from firestore: ', err)
+      })
+    return urlList
+  }
 }

From 63d0e374b1f5c0feb719bd1d9633c2b3acadccde Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sat, 3 Jun 2023 19:10:27 +0800
Subject: [PATCH 179/223] ranked query for respective department directors
 applicants

---
 src/components/recruitment/ApplicantCard.tsx  | 25 ++++---
 .../recruitment/AppliedRoleListItem.tsx       | 31 ++++----
 src/components/recruitment/DocumentModal.tsx  |  7 +-
 src/components/recruitment/StatusPopup.tsx    |  2 +-
 src/pages/api/auth/[...nextauth].ts           |  3 +
 src/pages/recruitment/applicants.tsx          |  7 +-
 src/server/trpc/router/member/helper.ts       |  1 -
 src/server/trpc/router/recruitment/index.ts   |  8 ++-
 src/server/trpc/router/recruitment/read.ts    | 72 ++++++++++++-------
 src/server/trpc/router/recruitment/update.ts  |  2 +-
 src/types/next-auth.d.ts                      |  1 +
 11 files changed, 99 insertions(+), 60 deletions(-)

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index e40f2253..a26bfea2 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -12,8 +12,13 @@ import { Avatar } from 'flowbite-react'
 import AppliedRoleListItem from './AppliedRoleListItem'
 import DocumentModal from './DocumentModal'
 import type { Applicant } from '~/server/db/models/Applicant'
+import NoteModal from './NoteModal'
+import type { AppliedRole } from '~/server/db/models/AppliedRole'
+import { trpc } from '~/utils/trpc'
 
 const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
+  const appliedRole = applicant.appliedRoles[0] as AppliedRole
+  const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRole.id)
   return (
     <Card
       maxWidth="sm"
@@ -43,19 +48,19 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
                 applicantId={applicant.id}
                 applicantName={applicant.name}
               />
+              <NoteModal
+                appliedRoleId={appliedRole.id}
+                interviewNotes={appliedRole.interviewNotes}
+                refetch={refetch}
+              />
             </Box>
           </Box>
           <UnorderedList styleType="none">
-            {applicant.appliedRoles
-              .sort((a, b) => a.rank - b.rank)
-              .map((appliedRole) => {
-                return (
-                  <AppliedRoleListItem
-                    appliedRole={appliedRole}
-                    key={appliedRole.id}
-                  />
-                )
-              })}
+            <AppliedRoleListItem
+              appliedRole={appliedRole}
+              key={appliedRole.id}
+              refetch={refetch}
+            />
           </UnorderedList>
         </Stack>
       </CardBody>
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index eb510f1d..1b6ef2ff 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -1,28 +1,25 @@
-import { Box, ListItem, Text } from '@chakra-ui/react'
+import { ListItem, Text } from '@chakra-ui/react'
+import type { QueryObserverResult } from '@tanstack/react-query'
 import type { AppliedRole } from '~/server/db/models/AppliedRole'
-import { trpc } from '~/utils/trpc'
-import NoteModal from './NoteModal'
 import StatusPopup from './StatusPopup'
 
-const AppliedRoleListItem = ({ appliedRole }: { appliedRole: AppliedRole }) => {
-  const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRole.id)
+const AppliedRoleListItem = ({
+  appliedRole,
+  refetch,
+}: {
+  appliedRole: AppliedRole
+  refetch: () => Promise<QueryObserverResult>
+}) => {
   return (
     <ListItem className="flex items-center justify-between">
       <Text>
         {appliedRole.rank}. {appliedRole.department} - {appliedRole.role}
       </Text>
-      <Box>
-        <StatusPopup
-          status={appliedRole.status}
-          appliedRoleId={appliedRole.id}
-          refetch={refetch}
-        />
-        <NoteModal
-          appliedRoleId={appliedRole.id}
-          interviewNotes={appliedRole.interviewNotes}
-          refetch={refetch}
-        />
-      </Box>
+      <StatusPopup
+        status={appliedRole.status}
+        appliedRoleId={appliedRole.id}
+        refetch={refetch}
+      />
     </ListItem>
   )
 }
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
index 75c573dd..1c78f0a4 100644
--- a/src/components/recruitment/DocumentModal.tsx
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -8,12 +8,10 @@ import {
   ModalOverlay,
   useDisclosure,
 } from '@chakra-ui/react'
-import { getDownloadURL, listAll, ref } from 'firebase/storage'
 import { useEffect, useState } from 'react'
 import { BsFolder2Open } from 'react-icons/bs'
 import { StorageService } from '~/utils/storage'
 import DocumentModalAdd from './DocumentModalAdd'
-import DocumentModalCard from './DocumentModalCard'
 
 const DocumentModal = ({
   applicantId,
@@ -28,6 +26,11 @@ const DocumentModal = ({
 
   // Hook to get the files associated with the applicant
   useEffect(() => {
+    const getFilesList = async () => {
+      const fileList = await StorageService.getFiles(docsFilePath)
+      setFileList(fileList)
+    }
+    getFilesList()
     console.log('fileList: ', fileList)
   }, [])
 
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 2fe084be..893bcadc 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -10,7 +10,7 @@ import {
   UnorderedList,
   useToast,
 } from '@chakra-ui/react'
-import { ApplicationStatus } from '~/constant/applicationStatus'
+import { ApplicationStatus } from '~/server/db/models/AppliedRole'
 import type { QueryObserverResult } from '@tanstack/react-query'
 import { BsCircleFill } from 'react-icons/bs'
 import { trpc } from '~/utils/trpc'
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 167237f6..f4614525 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -15,6 +15,7 @@ export const authOptions: NextAuthOptions = {
       if (session && session.user && token) {
         session.user.id = token.sub || ''
         session.user.image = token.picture
+        session.user.department = token.department as string
       }
 
       if (token) {
@@ -26,6 +27,7 @@ export const authOptions: NextAuthOptions = {
     async jwt({ token, user }) {
       if (user) {
         token.isAdmin = (user as User).isAdmin as boolean
+        token.department = (user as User).department as string
         token.picture = user.image
       }
       return token
@@ -67,6 +69,7 @@ export const authOptions: NextAuthOptions = {
           // The user object is passed to the session callback in session.data.user
           return {
             id: user.id as string,
+            department: user.department as string,
             name: user.name,
             email: user.email,
             isAdmin: user.isAdmin,
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 4078a37f..1b501ce3 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -5,8 +5,13 @@ import SearchBar from '~/components/common/SearchBar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
 import ApplicantGrid from '~/components/recruitment/ApplicantGrid'
 import SearchProvider from '~/context/recruitment/SearchProvider'
+import type { Session } from 'next-auth'
 
-const ApplicantsPage: React.FC<BaseProps> = ({ session }) => {
+const ApplicantsPage: React.FC<BaseProps> = ({
+  session,
+}: {
+  session: Session
+}) => {
   return (
     <>
       <Head>
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index c33eff35..38f6f48f 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -95,7 +95,6 @@ function buildUserObject(
       major: user.major,
       id: user.student_id,
       isAdmin: false,
-      interviewNotes: null,
       name: user.name,
       email: user.nus_email,
       personal_email: user.personal_email,
diff --git a/src/server/trpc/router/recruitment/index.ts b/src/server/trpc/router/recruitment/index.ts
index 47fcb129..0d0ba4f4 100644
--- a/src/server/trpc/router/recruitment/index.ts
+++ b/src/server/trpc/router/recruitment/index.ts
@@ -1,11 +1,15 @@
 import { router } from '~/server/trpc/trpc'
 import { updateAppliedRoleStatus, updateInterviewNotes } from './update'
-import { getAllApplicants, getApplicant, getAppliedRole } from './read'
+import {
+  getAllApplicantsTopRoleByDept,
+  getApplicant,
+  getAppliedRole,
+} from './read'
 
 export const recruitmentRouter = router({
   updateAppliedRoleStatus,
   updateInterviewNotes,
-  getAllApplicants,
+  getAllApplicantsTopRoleByDept,
   getApplicant,
   getAppliedRole,
 })
diff --git a/src/server/trpc/router/recruitment/read.ts b/src/server/trpc/router/recruitment/read.ts
index 2030fed3..9dfb0ab8 100644
--- a/src/server/trpc/router/recruitment/read.ts
+++ b/src/server/trpc/router/recruitment/read.ts
@@ -1,39 +1,61 @@
 import { TRPCError } from '@trpc/server'
-import { where } from 'firebase/firestore'
+import { limit, orderBy, where } from 'firebase/firestore'
 import { z } from 'zod'
 import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
 import userCollection from '~/server/db/collections/UserCollection'
 import type { Applicant } from '~/server/db/models/Applicant'
+import { ApplicationStatus } from '~/server/db/models/AppliedRole'
 import { protectedProcedure } from '~/server/trpc/trpc'
 
-export const getAllApplicants = protectedProcedure.query(async ({}) => {
-  try {
-    const applicants = await userCollection.queries([
-      where('role', '==', 'Applicant'),
-    ])
-    const applicantsWithRoles: Applicant[] = []
+/**
+ * We retrieve applicants based on the logged in Exco's department.
+ * The applied role retrieved for the applicant corresponds to the
+ * Exco's department and is the highest ranked role that has not been
+ * rejected. So each applicant will have one applied role at any
+ * point in time, from the perspective of a director.
+ * */
+export const getAllApplicantsTopRoleByDept = protectedProcedure.query(
+  async ({ ctx }) => {
+    try {
+      const applicants = await userCollection.queries([
+        where('role', '==', 'Applicant'),
+      ])
+      const applicantsWithRoles: Applicant[] = []
 
-    for (let i = 0; i < applicants.length; i++) {
-      const applicant = applicants[i]
-      if (applicant) {
-        const appliedRoles = await appliedRoleCollection.queries([
-          where('applicantId', '==', applicant.id),
-        ])
-        applicantsWithRoles.push({
-          id: applicant?.id,
-          name: applicant?.name,
-          appliedRoles: appliedRoles,
-        })
+      for (let i = 0; i < applicants.length; i++) {
+        const applicant = applicants[i]
+        if (applicant) {
+          const appliedRoles = await appliedRoleCollection.queries([
+            where('applicantId', '==', applicant.id),
+            where('department', '==', ctx.session.user.department),
+            where('status', 'in', [
+              ApplicationStatus.ACCEPTED,
+              ApplicationStatus.INTERVIEWED,
+              ApplicationStatus.OFFERED,
+              ApplicationStatus.PENDING,
+            ]),
+            orderBy('rank'),
+            limit(1),
+          ])
+          // only add applicants that still have roles
+          if (appliedRoles.length == 1) {
+            applicantsWithRoles.push({
+              id: applicant?.id,
+              name: applicant?.name,
+              appliedRoles: appliedRoles,
+            })
+          }
+        }
       }
+      return applicantsWithRoles
+    } catch (error) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: 'Error retrieving applicants: ' + error,
+      })
     }
-    return applicantsWithRoles
-  } catch (error) {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: 'Error retrieving applicants: ' + error,
-    })
   }
-})
+)
 
 export const getApplicant = protectedProcedure
   .input(z.string())
diff --git a/src/server/trpc/router/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
index 9c9fc3d6..13307c92 100644
--- a/src/server/trpc/router/recruitment/update.ts
+++ b/src/server/trpc/router/recruitment/update.ts
@@ -2,7 +2,7 @@ import { protectedProcedure } from '~/server/trpc/trpc'
 import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
-import { ApplicationStatus } from '~/constant/applicationStatus'
+import { ApplicationStatus } from '~/server/db/models/AppliedRole'
 
 export const updateAppliedRoleStatus = protectedProcedure
   .input(
diff --git a/src/types/next-auth.d.ts b/src/types/next-auth.d.ts
index 6b331ccb..27201997 100644
--- a/src/types/next-auth.d.ts
+++ b/src/types/next-auth.d.ts
@@ -10,6 +10,7 @@ declare module 'next-auth' {
     user?: {
       level?: string
       id: string
+      department: string
     } & DefaultSession['user']
   }
 }

From 0750970c8e2c7a5b7886e229f437e3e044552aaf Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 4 Jun 2023 14:23:25 +0800
Subject: [PATCH 180/223] main applicants grid style update

---
 src/components/recruitment/ApplicantCard.tsx       | 8 ++++++--
 src/components/recruitment/AppliedRoleListItem.tsx | 4 ++--
 src/components/recruitment/DocumentModal.tsx       | 9 +++------
 src/components/recruitment/DocumentModalAdd.tsx    | 1 -
 src/components/recruitment/InfoPopup.tsx           | 1 -
 src/context/recruitment/SearchProvider.tsx         | 2 +-
 src/pages/recruitment/applicants.tsx               | 2 +-
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index a26bfea2..b1a0bfa7 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -6,6 +6,7 @@ import {
   Heading,
   Image,
   Stack,
+  Text,
   UnorderedList,
 } from '@chakra-ui/react'
 import { Avatar } from 'flowbite-react'
@@ -21,7 +22,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
   const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRole.id)
   return (
     <Card
-      maxWidth="sm"
+      maxWidth="xs"
       borderRadius="20"
       boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
     >
@@ -35,7 +36,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
         alt="blue wave background"
         borderTopLeftRadius="20"
         borderTopRightRadius="20"
-        boxSize="300px"
+        boxSize="500px"
         position="absolute"
         height="85px"
       />
@@ -55,6 +56,9 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
               />
             </Box>
           </Box>
+          <Text className="text-center" fontSize="xl" fontWeight="medium">
+            {appliedRole.department}
+          </Text>
           <UnorderedList styleType="none">
             <AppliedRoleListItem
               appliedRole={appliedRole}
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index 1b6ef2ff..5a5b4e32 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -1,4 +1,4 @@
-import { ListItem, Text } from '@chakra-ui/react'
+import { Box, ListItem, Text } from '@chakra-ui/react'
 import type { QueryObserverResult } from '@tanstack/react-query'
 import type { AppliedRole } from '~/server/db/models/AppliedRole'
 import StatusPopup from './StatusPopup'
@@ -13,7 +13,7 @@ const AppliedRoleListItem = ({
   return (
     <ListItem className="flex items-center justify-between">
       <Text>
-        {appliedRole.rank}. {appliedRole.department} - {appliedRole.role}
+        {appliedRole.rank}. {appliedRole.role}
       </Text>
       <StatusPopup
         status={appliedRole.status}
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
index 1c78f0a4..1caafe1c 100644
--- a/src/components/recruitment/DocumentModal.tsx
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -11,7 +11,7 @@ import {
 import { useEffect, useState } from 'react'
 import { BsFolder2Open } from 'react-icons/bs'
 import { StorageService } from '~/utils/storage'
-import DocumentModalAdd from './DocumentModalAdd'
+import DocumentModalCard from './DocumentModalCard'
 
 const DocumentModal = ({
   applicantId,
@@ -31,7 +31,6 @@ const DocumentModal = ({
       setFileList(fileList)
     }
     getFilesList()
-    console.log('fileList: ', fileList)
   }, [])
 
   return (
@@ -58,12 +57,10 @@ const DocumentModal = ({
           <ModalCloseButton />
           <ModalBody>
             <div className="my-5 mx-10 grid grid-cols-1 place-items-center gap-y-10 lg:grid-cols-2 ">
-              {/* {fileList.map((file) => {
-                console.log('file: ', file)
+              {fileList.map((file) => {
                 return <DocumentModalCard file={file} key={file} />
-              })} */}
+              })}
             </div>
-            <DocumentModalAdd applicantId={applicantId} />
           </ModalBody>
         </ModalContent>
       </Modal>
diff --git a/src/components/recruitment/DocumentModalAdd.tsx b/src/components/recruitment/DocumentModalAdd.tsx
index 3450c0ab..5a8a78dc 100644
--- a/src/components/recruitment/DocumentModalAdd.tsx
+++ b/src/components/recruitment/DocumentModalAdd.tsx
@@ -2,7 +2,6 @@ import { AddIcon } from '@chakra-ui/icons'
 import { Box, IconButton, Input, useToast } from '@chakra-ui/react'
 import { useState } from 'react'
 import { StorageService } from '~/utils/storage'
-import { ref, uploadBytes } from 'firebase/storage'
 import { uuidv4 } from '@firebase/util'
 import { Message } from '~/constant/messages'
 
diff --git a/src/components/recruitment/InfoPopup.tsx b/src/components/recruitment/InfoPopup.tsx
index d850a5ac..1fe7c122 100644
--- a/src/components/recruitment/InfoPopup.tsx
+++ b/src/components/recruitment/InfoPopup.tsx
@@ -6,7 +6,6 @@ import {
   ListItem,
   Popover,
   PopoverBody,
-  PopoverCloseButton,
   PopoverContent,
   PopoverTrigger,
   Text,
diff --git a/src/context/recruitment/SearchProvider.tsx b/src/context/recruitment/SearchProvider.tsx
index 0405535d..2ef0ef68 100644
--- a/src/context/recruitment/SearchProvider.tsx
+++ b/src/context/recruitment/SearchProvider.tsx
@@ -1,4 +1,4 @@
-import { createContext, Dispatch, SetStateAction, useState } from 'react'
+import { createContext, useState } from 'react'
 
 type SearchContextType = {
   search: string
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index 1b501ce3..ecf7b745 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -23,7 +23,7 @@ const ApplicantsPage: React.FC<BaseProps> = ({
         />
       </Head>
       <TopNavbar isAdmin={session.isAdmin} />
-      <Box position="relative" mt="10">
+      <Box position="relative" mt="10" mb="10">
         <Text className="text-center text-4xl font-bold">Applicants</Text>
         <SearchProvider>
           <SearchBar />

From 43b5c89fe4456f1ae957aeb69c76d9491178d926 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 4 Jun 2023 15:21:05 +0800
Subject: [PATCH 181/223] Applicant card style changes

---
 src/components/recruitment/ApplicantCard.tsx  | 27 +++++++++----------
 .../recruitment/AppliedRoleListItem.tsx       |  2 +-
 src/components/recruitment/DocumentModal.tsx  |  5 ++--
 src/components/recruitment/NoteModal.tsx      |  5 ++--
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index b1a0bfa7..d760e002 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -43,22 +43,19 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
       <CardBody className="relative" pt="10px">
         <Stack>
           <Avatar alt="User-settings" rounded={true} size="lg" />
-          <Box className="flex justify-center">
-            <Box>
-              <DocumentModal
-                applicantId={applicant.id}
-                applicantName={applicant.name}
-              />
-              <NoteModal
-                appliedRoleId={appliedRole.id}
-                interviewNotes={appliedRole.interviewNotes}
-                refetch={refetch}
-              />
-            </Box>
-          </Box>
-          <Text className="text-center" fontSize="xl" fontWeight="medium">
-            {appliedRole.department}
+          <DocumentModal
+            applicantId={applicant.id}
+            applicantName={applicant.name}
+          />
+          <NoteModal
+            appliedRoleId={appliedRole.id}
+            interviewNotes={appliedRole.interviewNotes}
+            refetch={refetch}
+          />
+          <Text className="text-center">
+            {appliedRole.department.toUpperCase()}
           </Text>
+          <Text>Role Applied:</Text>
           <UnorderedList styleType="none">
             <AppliedRoleListItem
               appliedRole={appliedRole}
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index 5a5b4e32..73ec287b 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -12,7 +12,7 @@ const AppliedRoleListItem = ({
 }) => {
   return (
     <ListItem className="flex items-center justify-between">
-      <Text>
+      <Text fontWeight="medium">
         {appliedRole.rank}. {appliedRole.role}
       </Text>
       <StatusPopup
diff --git a/src/components/recruitment/DocumentModal.tsx b/src/components/recruitment/DocumentModal.tsx
index 1caafe1c..537cb9c7 100644
--- a/src/components/recruitment/DocumentModal.tsx
+++ b/src/components/recruitment/DocumentModal.tsx
@@ -1,4 +1,5 @@
 import {
+  Box,
   IconButton,
   Modal,
   ModalBody,
@@ -34,7 +35,7 @@ const DocumentModal = ({
   }, [])
 
   return (
-    <>
+    <Box className="absolute left-5 top-10">
       <IconButton
         aria-label="Upload documents"
         icon={<BsFolder2Open />}
@@ -64,7 +65,7 @@ const DocumentModal = ({
           </ModalBody>
         </ModalContent>
       </Modal>
-    </>
+    </Box>
   )
 }
 
diff --git a/src/components/recruitment/NoteModal.tsx b/src/components/recruitment/NoteModal.tsx
index 5f56b0e6..8273cad0 100644
--- a/src/components/recruitment/NoteModal.tsx
+++ b/src/components/recruitment/NoteModal.tsx
@@ -1,4 +1,5 @@
 import {
+  Box,
   Button,
   IconButton,
   Input,
@@ -73,7 +74,7 @@ const NoteModal = ({
   }
 
   return (
-    <>
+    <Box className="absolute right-5 top-10">
       <IconButton
         aria-label="Interview notes"
         icon={<BsFileEarmark />}
@@ -120,7 +121,7 @@ const NoteModal = ({
           </ModalFooter>
         </ModalContent>
       </Modal>
-    </>
+    </Box>
   )
 }
 

From 2380b5d59d03f81f304231566472c57c90c6efc8 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 4 Jun 2023 15:22:57 +0800
Subject: [PATCH 182/223] Remove unused imports

---
 src/components/recruitment/ApplicantCard.tsx       | 1 -
 src/components/recruitment/AppliedRoleListItem.tsx | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index d760e002..3a7d1a89 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -1,5 +1,4 @@
 import {
-  Box,
   Card,
   CardBody,
   CardHeader,
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index 73ec287b..f93a9989 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -1,4 +1,4 @@
-import { Box, ListItem, Text } from '@chakra-ui/react'
+import { ListItem, Text } from '@chakra-ui/react'
 import type { QueryObserverResult } from '@tanstack/react-query'
 import type { AppliedRole } from '~/server/db/models/AppliedRole'
 import StatusPopup from './StatusPopup'

From 039b0af2140f083be11656baa0988165e6a397f8 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sun, 4 Jun 2023 17:17:44 +0800
Subject: [PATCH 183/223] include id for createSingleUser

---
 src/server/trpc/router/users/createSingleUser.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/trpc/router/users/createSingleUser.ts b/src/server/trpc/router/users/createSingleUser.ts
index 8d547b3d..fcce61cf 100644
--- a/src/server/trpc/router/users/createSingleUser.ts
+++ b/src/server/trpc/router/users/createSingleUser.ts
@@ -29,6 +29,7 @@ export const createSingleUser = protectedProcedure
 
       await userCollection.set(
         {
+          id,
           department,
           email,
           isAdmin,

From 6999fa0d15bc47347d0a718f4611065e03d8e6a3 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Mon, 5 Jun 2023 22:36:10 +0800
Subject: [PATCH 184/223] Update User model when applicant gets accepted

---
 src/components/recruitment/ApplicantCard.tsx  |  1 +
 .../recruitment/AppliedRoleListItem.tsx       |  3 +++
 src/components/recruitment/StatusPopup.tsx    |  3 +++
 src/server/trpc/router/recruitment/update.ts  | 21 ++++++++++++++++++-
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index 3a7d1a89..f03f7e36 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -57,6 +57,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
           <Text>Role Applied:</Text>
           <UnorderedList styleType="none">
             <AppliedRoleListItem
+              applicantId={applicant.id}
               appliedRole={appliedRole}
               key={appliedRole.id}
               refetch={refetch}
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index f93a9989..edbe78d0 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -4,9 +4,11 @@ import type { AppliedRole } from '~/server/db/models/AppliedRole'
 import StatusPopup from './StatusPopup'
 
 const AppliedRoleListItem = ({
+  applicantId,
   appliedRole,
   refetch,
 }: {
+  applicantId: string
   appliedRole: AppliedRole
   refetch: () => Promise<QueryObserverResult>
 }) => {
@@ -16,6 +18,7 @@ const AppliedRoleListItem = ({
         {appliedRole.rank}. {appliedRole.role}
       </Text>
       <StatusPopup
+        applicantId={applicantId}
         status={appliedRole.status}
         appliedRoleId={appliedRole.id}
         refetch={refetch}
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 893bcadc..71e05dca 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -24,10 +24,12 @@ const statusFillMap = {
 }
 
 const StatusPopup = ({
+  applicantId,
   status,
   appliedRoleId,
   refetch,
 }: {
+  applicantId: string
   appliedRoleId: string
   status: ApplicationStatus
   refetch: () => Promise<QueryObserverResult>
@@ -37,6 +39,7 @@ const StatusPopup = ({
   const updateStatus = async (status: ApplicationStatus) => {
     try {
       await mutateAsync({
+        applicantId: applicantId,
         status: status,
         appliedRoleId: appliedRoleId,
       })
diff --git a/src/server/trpc/router/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
index 13307c92..6acc6835 100644
--- a/src/server/trpc/router/recruitment/update.ts
+++ b/src/server/trpc/router/recruitment/update.ts
@@ -3,19 +3,25 @@ import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
 import { ApplicationStatus } from '~/server/db/models/AppliedRole'
+import userCollection from '~/server/db/collections/UserCollection'
 
 export const updateAppliedRoleStatus = protectedProcedure
   .input(
     z.object({
+      applicantId: z.string(),
       appliedRoleId: z.string(),
       status: z.nativeEnum(ApplicationStatus),
     })
   )
   .mutation(async ({ input }) => {
     try {
-      return await appliedRoleCollection.update(input.appliedRoleId, {
+      const res = await appliedRoleCollection.update(input.appliedRoleId, {
         status: input.status,
       })
+      if (input.status == ApplicationStatus.ACCEPTED) {
+        updateAcceptedApplicant(input.applicantId, input.appliedRoleId)
+      }
+      return res
     } catch (e) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
@@ -43,3 +49,16 @@ export const updateInterviewNotes = protectedProcedure
       })
     }
   })
+
+// update the current User model's department and role as the applicant is now a FTS member
+const updateAcceptedApplicant = async (
+  applicantId: string,
+  appliedRoleId: string
+) => {
+  const appliedRole = await appliedRoleCollection.findById(appliedRoleId)
+  const user = await userCollection.update(applicantId, {
+    department: appliedRole?.department,
+    role: appliedRole?.role,
+  })
+  return user
+}

From bf5dd29da7ace9b8ba9fde4028a56faf4bf73b6d Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Tue, 6 Jun 2023 23:51:08 +0800
Subject: [PATCH 185/223] add filter button

---
 src/components/common/SearchBar.tsx          | 71 +++++++++++++++++++-
 src/components/recruitment/ApplicantGrid.tsx |  5 +-
 src/context/recruitment/SearchProvider.tsx   | 13 ++++
 3 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 0a4d15d0..a6719ff1 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -2,11 +2,42 @@ import React, { useContext, useState } from 'react'
 import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import { SearchIcon } from '@chakra-ui/icons'
 import { searchContext } from '~/context/recruitment/SearchProvider'
+import { ChevronDownIcon } from '@chakra-ui/icons';
 
 const SearchBar = () => {
   const { search, setSearch } = useContext(searchContext)
+  const [showDropdown, setShowDropdown] = useState(false);
+  const [selectedFilter, setSelectedFilter] = useState('');
+  const [showOptions, setShowOptions] = useState(false);
   console.log('searchbar: ', search)
+
+  const handleFilterChange = (filter: React.SetStateAction<string>) => {
+    setSelectedFilter(filter);
+    setShowDropdown(false);
+    // Perform filtering logic or update your data based on the selected filter
+  };
+
+  const renderOptions = () => {
+    if (selectedFilter === 'Roles') {
+      return (
+        <ul className="ml-2">
+          <li className="px-3 py-2 cursor-pointer">Role 1</li>
+          <li className="px-3 py-2 cursor-pointer">Role 2</li>
+        </ul>
+      );
+    }
+    if (selectedFilter === 'Status') {
+      return (
+        <ul className="ml-2">
+          <li className="px-3 py-2 cursor-pointer">Status 1</li>
+          <li className="px-3 py-2 cursor-pointer">Status 2</li>
+        </ul>
+      );
+    }
+    return null;
+  };
   return (
+    
     <InputGroup
       minWidth={'150px'}
       maxWidth={'300px'}
@@ -18,6 +49,7 @@ const SearchBar = () => {
       marginLeft={{ base: 'auto' }}
       marginRight={{ base: 'auto' }}
     >
+      
       <InputLeftElement>
         <SearchIcon />
       </InputLeftElement>
@@ -28,9 +60,44 @@ const SearchBar = () => {
         borderColor="#004586"
         borderRadius="20px"
         onChange={(e) => {
-          setSearch(e.currentTarget.value)
+          setSearch(e.currentTarget.value);
         }}
-      ></Input>
+      />
+       <button
+        type="button"
+        className="ml-2 px-3 py-2 rounded-md bg-gray-200 text-gray-600 relative"
+        onMouseEnter={() => setShowOptions(true)}
+        onMouseLeave={() => {setShowOptions(false), setShowDropdown(true)}}
+       
+        
+      >
+        <ChevronDownIcon />
+        {showOptions && (
+          <div className="absolute top-0 right-0 mt-10 bg-white border border-gray-200 rounded-md shadow-md">
+            {showDropdown ? (
+              <>
+                <button
+                  type="button"
+                  className="px-4 py-2 cursor-pointer"
+                  onClick={() => handleFilterChange('Roles')}
+                >
+                  Roles
+                </button>
+                <button
+                  type="button"
+                  className="px-4 py-2 cursor-pointer"
+                  onClick={() => handleFilterChange('Status')}
+                >
+                  Status
+                </button>
+              </>
+            ) : (
+              renderOptions()
+            )}
+          </div>
+        )}
+      </button>
+     
     </InputGroup>
   )
 }
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 418b3a51..605a1f2b 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,11 +1,12 @@
 import { useContext } from 'react'
-import { searchContext } from '~/context/recruitment/SearchProvider'
+import { filterContext, searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
 import InfoPopup from '~/components/recruitment/InfoPopup'
 
 const ApplicantGrid = () => {
   const { search } = useContext(searchContext)
+  const { filter } = useContext(filterContext)
   const { data } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
   if (!data) return <></>
 
@@ -16,6 +17,8 @@ const ApplicantGrid = () => {
           return applicant.name.toLowerCase().includes(search.toLowerCase())
         })
 
+  
+
   return (
     <>
       <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
diff --git a/src/context/recruitment/SearchProvider.tsx b/src/context/recruitment/SearchProvider.tsx
index 2ef0ef68..c5e57add 100644
--- a/src/context/recruitment/SearchProvider.tsx
+++ b/src/context/recruitment/SearchProvider.tsx
@@ -5,6 +5,11 @@ type SearchContextType = {
   setSearch: (s: string) => void
 }
 
+type filterContextType = {
+  filter: string
+  setFilter: (s: string) => void
+}
+
 export const searchContext = createContext<SearchContextType>({
   search: '',
   setSearch: () => {
@@ -12,6 +17,14 @@ export const searchContext = createContext<SearchContextType>({
   },
 })
 
+export const filterContext = createContext<ContextType>({
+  filter: '',
+  setFilter: () => {
+    return
+  },
+})
+
+
 const SearchProvider = (props: any) => {
   const [search, setSearch] = useState<string>('')
   return (

From cd501fba22a2d5a286b2897cd2d87542468e67bc Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 7 Jun 2023 22:53:04 +0800
Subject: [PATCH 186/223] random

---
 src/components/recruitment/ApplicantGrid.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 605a1f2b..8460c143 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -13,11 +13,18 @@ const ApplicantGrid = () => {
   const filteredData =
     search === ''
       ? data
-      : data?.filter((applicant) => {
+      : data.filter((applicant) => {
           return applicant.name.toLowerCase().includes(search.toLowerCase())
         })
 
   
+ 
+
+ 
+    
+
+
+  
 
   return (
     <>

From ed8960086b63e3824bf02c5a76229f0acce464c7 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Wed, 7 Jun 2023 23:17:11 +0800
Subject: [PATCH 187/223] Revert "Update User model when applicant gets
 accepted"

This reverts commit 6a1618f6aa5d48a9bcf88b93247d370942585968.
---
 src/components/recruitment/ApplicantCard.tsx  |  1 -
 .../recruitment/AppliedRoleListItem.tsx       |  3 ---
 src/components/recruitment/StatusPopup.tsx    |  3 ---
 src/server/trpc/router/recruitment/update.ts  | 21 +------------------
 4 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index f03f7e36..3a7d1a89 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -57,7 +57,6 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
           <Text>Role Applied:</Text>
           <UnorderedList styleType="none">
             <AppliedRoleListItem
-              applicantId={applicant.id}
               appliedRole={appliedRole}
               key={appliedRole.id}
               refetch={refetch}
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index edbe78d0..f93a9989 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -4,11 +4,9 @@ import type { AppliedRole } from '~/server/db/models/AppliedRole'
 import StatusPopup from './StatusPopup'
 
 const AppliedRoleListItem = ({
-  applicantId,
   appliedRole,
   refetch,
 }: {
-  applicantId: string
   appliedRole: AppliedRole
   refetch: () => Promise<QueryObserverResult>
 }) => {
@@ -18,7 +16,6 @@ const AppliedRoleListItem = ({
         {appliedRole.rank}. {appliedRole.role}
       </Text>
       <StatusPopup
-        applicantId={applicantId}
         status={appliedRole.status}
         appliedRoleId={appliedRole.id}
         refetch={refetch}
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 71e05dca..893bcadc 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -24,12 +24,10 @@ const statusFillMap = {
 }
 
 const StatusPopup = ({
-  applicantId,
   status,
   appliedRoleId,
   refetch,
 }: {
-  applicantId: string
   appliedRoleId: string
   status: ApplicationStatus
   refetch: () => Promise<QueryObserverResult>
@@ -39,7 +37,6 @@ const StatusPopup = ({
   const updateStatus = async (status: ApplicationStatus) => {
     try {
       await mutateAsync({
-        applicantId: applicantId,
         status: status,
         appliedRoleId: appliedRoleId,
       })
diff --git a/src/server/trpc/router/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
index 6acc6835..13307c92 100644
--- a/src/server/trpc/router/recruitment/update.ts
+++ b/src/server/trpc/router/recruitment/update.ts
@@ -3,25 +3,19 @@ import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
 import { ApplicationStatus } from '~/server/db/models/AppliedRole'
-import userCollection from '~/server/db/collections/UserCollection'
 
 export const updateAppliedRoleStatus = protectedProcedure
   .input(
     z.object({
-      applicantId: z.string(),
       appliedRoleId: z.string(),
       status: z.nativeEnum(ApplicationStatus),
     })
   )
   .mutation(async ({ input }) => {
     try {
-      const res = await appliedRoleCollection.update(input.appliedRoleId, {
+      return await appliedRoleCollection.update(input.appliedRoleId, {
         status: input.status,
       })
-      if (input.status == ApplicationStatus.ACCEPTED) {
-        updateAcceptedApplicant(input.applicantId, input.appliedRoleId)
-      }
-      return res
     } catch (e) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
@@ -49,16 +43,3 @@ export const updateInterviewNotes = protectedProcedure
       })
     }
   })
-
-// update the current User model's department and role as the applicant is now a FTS member
-const updateAcceptedApplicant = async (
-  applicantId: string,
-  appliedRoleId: string
-) => {
-  const appliedRole = await appliedRoleCollection.findById(appliedRoleId)
-  const user = await userCollection.update(applicantId, {
-    department: appliedRole?.department,
-    role: appliedRole?.role,
-  })
-  return user
-}

From cfa60881365463aac54bb947620c863da693e803 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 11 Jun 2023 22:58:45 +0800
Subject: [PATCH 188/223] commented some code to debug

---
 src/components/recruitment/ApplicantGrid.tsx | 15 +++------------
 src/context/recruitment/SearchProvider.tsx   |  2 +-
 src/pages/application_status/index.tsx       |  1 +
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 8460c143..124a40dc 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,31 +1,22 @@
 import { useContext } from 'react'
-import { filterContext, searchContext } from '~/context/recruitment/SearchProvider'
+import {searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
 import InfoPopup from '~/components/recruitment/InfoPopup'
 
 const ApplicantGrid = () => {
   const { search } = useContext(searchContext)
-  const { filter } = useContext(filterContext)
+  // const { filter } = useContext(filterContext)
   const { data } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
   if (!data) return <></>
 
   const filteredData =
     search === ''
       ? data
-      : data.filter((applicant) => {
+      : data?.filter((applicant) => {
           return applicant.name.toLowerCase().includes(search.toLowerCase())
         })
 
-  
- 
-
- 
-    
-
-
-  
-
   return (
     <>
       <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
diff --git a/src/context/recruitment/SearchProvider.tsx b/src/context/recruitment/SearchProvider.tsx
index c5e57add..56df28a7 100644
--- a/src/context/recruitment/SearchProvider.tsx
+++ b/src/context/recruitment/SearchProvider.tsx
@@ -17,7 +17,7 @@ export const searchContext = createContext<SearchContextType>({
   },
 })
 
-export const filterContext = createContext<ContextType>({
+export const filterContext = createContext<filterContextType>({
   filter: '',
   setFilter: () => {
     return
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 1e754542..fe66f6ab 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -13,6 +13,7 @@ import {
 import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { BaseProps } from '~/utils/withAuth'
+import React from 'react'
 
 enum PageState {
   LOGIN,

From ac492de1c0f814ff2ee6ff96f095ab9e1fc3addf Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sat, 17 Jun 2023 17:46:14 +0800
Subject: [PATCH 189/223] add number of applicants for the recruitment page

---
 src/components/common/SearchBar.tsx          | 231 ++++++++++++++++++-
 src/components/recruitment/ApplicantCard.tsx |   1 +
 src/components/recruitment/ApplicantGrid.tsx |  56 ++++-
 src/context/recruitment/SearchProvider.tsx   |  24 +-
 src/server/trpc/router/recruitment/read.ts   |  18 +-
 5 files changed, 301 insertions(+), 29 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index a6719ff1..2d597658 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -3,34 +3,231 @@ import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import { SearchIcon } from '@chakra-ui/icons'
 import { searchContext } from '~/context/recruitment/SearchProvider'
 import { ChevronDownIcon } from '@chakra-ui/icons';
+import { useSession } from 'next-auth/react';
+
 
 const SearchBar = () => {
-  const { search, setSearch } = useContext(searchContext)
+  const roles = [
+    {
+      department: 'Software Development',
+      role: 'Software Engineer',
+    },
+    {
+      department: 'Software Development',
+      role: 'Technical Lead',
+    },
+    {
+      department: 'Software Development',
+      role: 'UI/UX Designer',
+    },
+    {
+      department: 'Software Development',
+      role: 'Head of Design',
+    },
+    {
+      department: 'Software Development',
+      role: 'Co-Director',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Co-Director',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Core Developer',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Community Manager',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Developer',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Lead Developer',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Research Analyst',
+    },
+    {
+      department: 'Blockchain',
+      role: 'Research Community Developer',
+    },
+    {
+      department: 'Machine Learning',
+      role: 'Quant Tech Analyst',
+    },
+    ,
+    {
+      department: 'Machine Learning',
+      role: 'Quant Tech Lead',
+    },
+    {
+      department: 'Machine Learning',
+      role: 'Quant wing head',
+    },
+    {
+      department: 'Machine Learning',
+      role: 'Project Tech Analyst',
+    },
+    {
+      department: 'Machine Learning',
+      role: 'Project Tech Lead',
+    },
+    {
+      department: 'Machine Learning',
+      role: 'Tech Analyst/Trainee',
+    },
+    {
+      department: 'Machine Learning',
+      role: 'Training Head',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Co-Director',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Community Development Executive',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Community Development Lead',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Finance Executive',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Finance Lead',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Project Manager Executive',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Product Manager',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Talent Management Executive',
+    },
+    {
+      department: 'Internal Affairs',
+      role: 'Talent Management Lead',
+    },
+    {
+      department: 'External Relations',
+      role: 'Partnerships Executive',
+    },
+    {
+      department: 'External Relations',
+      role: 'Director',
+    },
+    {
+      department: 'External Relations',
+      role: 'Marketing Executive',
+    },
+    {
+      department: 'External Relations',
+      role: 'Marketing Lead',
+    },
+    {
+      department: 'External Relations',
+      role: 'Partnerships Lead',
+    },
+    {
+      department: 'External Relations',
+      role: 'Finance Executive',
+    },
+    {
+      department: 'External Relations',
+      role: 'Finance Lead',
+    },
+  ] as { department: string; role: string }[]
+  const ctx = useSession()
+  const department = ctx.data?.user?.department
+  console.log(department)
+  const filteredRoles = roles.filter((combination) => combination.department === department)
+  const { search, filter, setFilter, setSearch } = useContext(searchContext)
   const [showDropdown, setShowDropdown] = useState(false);
-  const [selectedFilter, setSelectedFilter] = useState('');
+  console.log(filteredRoles)
+
+
+  const [selectedFilter, setSelectedFilter] = useState('')
   const [showOptions, setShowOptions] = useState(false);
   console.log('searchbar: ', search)
 
-  const handleFilterChange = (filter: React.SetStateAction<string>) => {
+  const handleFilterChange = (filter: string) => {
     setSelectedFilter(filter);
     setShowDropdown(false);
     // Perform filtering logic or update your data based on the selected filter
   };
 
+ 
+
   const renderOptions = () => {
     if (selectedFilter === 'Roles') {
       return (
         <ul className="ml-2">
-          <li className="px-3 py-2 cursor-pointer">Role 1</li>
-          <li className="px-3 py-2 cursor-pointer">Role 2</li>
+           {filteredRoles.map((role) =>   
+          <button 
+          key={role.role}
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter(role.role)}}
+          className="px-3 py-2 cursor-pointer">{role.role}
+          </button>)
+          }
+
+          {/* <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('designer')}}
+          className="px-3 py-2 cursor-pointer">Designer</button>
+          <button 
+           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('designer manager')}}
+          className="px-3 py-2 cursor-pointer">Designer Manager</button>
+          <button 
+           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('technical lead')}}
+          className="px-3 py-2 cursor-pointer">Technical Lead</button>
+          <button 
+           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('software engineer')}}
+          className="px-3 py-2 cursor-pointer">Software Engineer</button> */}
         </ul>
       );
     }
     if (selectedFilter === 'Status') {
       return (
         <ul className="ml-2">
-          <li className="px-3 py-2 cursor-pointer">Status 1</li>
-          <li className="px-3 py-2 cursor-pointer">Status 2</li>
+          <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('accepted')}}
+          className="px-3 py-2 cursor-pointer">Accepted</button>
+          <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('offered')}}
+          className="px-3 py-2 cursor-pointer">Offered</button>
+           <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('pending')}}
+          className="px-3 py-2 cursor-pointer">Pending Review</button>
+           <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('interviewed')}}
+          className="px-3 py-2 cursor-pointer">Interviewed</button>
+           <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('rejected')}}
+          className="px-3 py-2 cursor-pointer">Rejected</button>
+        </ul>
+      );
+    }
+    if (selectedFilter === 'Flags') {
+      return (
+        <ul className="ml-2">
+          <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('flagged')}}
+          className="px-3 py-2 cursor-pointer">Flagged</button>
+          <button 
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('unflagged')}}
+          className="px-3 py-2 cursor-pointer">Unflagged</button>
         </ul>
       );
     }
@@ -43,7 +240,7 @@ const SearchBar = () => {
       maxWidth={'300px'}
       position="absolute"
       top={{ lg: '0' }}
-      right={{ lg: '12', base: '0' }}
+      right={{ lg: '20', base: '0' }}
       left={{ lg: 'unset', base: '0' }}
       marginTop={{ lg: 'unset', base: '5' }}
       marginLeft={{ base: 'auto' }}
@@ -73,9 +270,10 @@ const SearchBar = () => {
       >
         <ChevronDownIcon />
         {showOptions && (
-          <div className="absolute top-0 right-0 mt-10 bg-white border border-gray-200 rounded-md shadow-md">
+          <div className="absolute top-0 left-0 mt-10 bg-white border border-gray-200 rounded-md shadow-md">
             {showDropdown ? (
               <>
+               
                 <button
                   type="button"
                   className="px-4 py-2 cursor-pointer"
@@ -90,6 +288,20 @@ const SearchBar = () => {
                 >
                   Status
                 </button>
+                <button
+                  type="button"
+                  className="px-4 py-2 cursor-pointer"
+                  onClick={() => handleFilterChange('Flags')}
+                >
+                  Flags
+                </button>
+                <button
+                  type="button"
+                  className="px-4 py-2 mb-2 cursor-pointer rounded font-bold bg-gray-200"
+                  onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('')}}
+                >
+                  Clear
+                </button>
               </>
             ) : (
               renderOptions()
@@ -98,6 +310,7 @@ const SearchBar = () => {
         )}
       </button>
      
+     
     </InputGroup>
   )
 }
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index 3a7d1a89..b8a0fbb3 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -26,6 +26,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
       boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
     >
       <CardHeader paddingBottom="0" zIndex={1}>
+        <span>flag</span>
         <Heading size="md" textAlign="center" textColor="white">
           {applicant.name}
         </Heading>
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 124a40dc..4c1cd4b9 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -3,28 +3,66 @@ import {searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
 import InfoPopup from '~/components/recruitment/InfoPopup'
+import applicants from '~/pages/recruitment/applicants'
+import { Button, VStack } from '@chakra-ui/react'
 
 const ApplicantGrid = () => {
-  const { search } = useContext(searchContext)
-  // const { filter } = useContext(filterContext)
+  const { filter, search } = useContext(searchContext)
+
   const { data } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
   if (!data) return <></>
 
+  // const filteredData =
+  //   search === ''
+  //     ? data
+  //     : data?.filter((applicant) => {
+  //         return applicant.name.toLowerCase().includes(search.toLowerCase())
+  //       })
+
   const filteredData =
-    search === ''
-      ? data
-      : data?.filter((applicant) => {
-          return applicant.name.toLowerCase().includes(search.toLowerCase())
-        })
+        filter === ''
+          ? (search ==='' ? data : 
+          data?.filter((applicant) => {
+            return applicant.name.toLowerCase().includes(search.toLowerCase())
+          })) 
+          :  
+          (search === '' ?        
+          data?.filter((applicant) => {
+              return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) || 
+              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()))
+            }) :
+            data?.filter((applicant) => {
+              return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) || 
+              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()))
+            }).filter((remaining) => {
+              return remaining.name.toLowerCase().includes(search.toLowerCase())
+            })
+            
+          )
+
+  const totalNumber = filteredData.length
+
 
   return (
     <>
-      <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
-        {filteredData?.map((applicant) => {
+   <div>
+      <div className='mb-2 mt-20 lg:mt-1 md:mt-1 font-bold ml-20 lg:text-xl'>
+      Number of Applicants: {totalNumber}
+      </div>
+      <div className="mb-10  my-10 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
+      
+        {filteredData?.map((applicant, index) => {
+          
           return <ApplicantCard applicant={applicant} key={applicant.id} />
+           
         })}
       </div>
+      </div>
+      
+      
       {filteredData.length > 0 && <InfoPopup />}
+   
+     
     </>
   )
 }
diff --git a/src/context/recruitment/SearchProvider.tsx b/src/context/recruitment/SearchProvider.tsx
index 56df28a7..e053d342 100644
--- a/src/context/recruitment/SearchProvider.tsx
+++ b/src/context/recruitment/SearchProvider.tsx
@@ -1,36 +1,46 @@
+import { filter } from '@chakra-ui/react'
 import { createContext, useState } from 'react'
 
 type SearchContextType = {
   search: string
   setSearch: (s: string) => void
-}
-
-type filterContextType = {
   filter: string
   setFilter: (s: string) => void
 }
 
+// type filterContextType = {
+//   filter: string
+//   setFilter: (s: string) => void
+// }
+
 export const searchContext = createContext<SearchContextType>({
   search: '',
   setSearch: () => {
     return
   },
-})
-
-export const filterContext = createContext<filterContextType>({
   filter: '',
   setFilter: () => {
     return
   },
 })
 
+// export const filterContext = createContext<filterContextType>({
+//   filter: '',
+//   setFilter: () => {
+//     return
+//   },
+// })
+
 
 const SearchProvider = (props: any) => {
   const [search, setSearch] = useState<string>('')
+  const [filter, setFilter] = useState<string>('')
   return (
-    <searchContext.Provider value={{ search, setSearch }}>
+    // <filterContext.Provider value={{ filter, setFilter }}>
+    <searchContext.Provider value={{ search, filter, setFilter, setSearch }}>
       {props.children}
     </searchContext.Provider>
+    // </filterContext.Provider>
   )
 }
 
diff --git a/src/server/trpc/router/recruitment/read.ts b/src/server/trpc/router/recruitment/read.ts
index 9dfb0ab8..8be343f8 100644
--- a/src/server/trpc/router/recruitment/read.ts
+++ b/src/server/trpc/router/recruitment/read.ts
@@ -1,6 +1,7 @@
+import { filter } from '@chakra-ui/react'
 import { TRPCError } from '@trpc/server'
 import { limit, orderBy, where } from 'firebase/firestore'
-import { z } from 'zod'
+import { object, z } from 'zod'
 import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
 import userCollection from '~/server/db/collections/UserCollection'
 import type { Applicant } from '~/server/db/models/Applicant'
@@ -14,12 +15,21 @@ import { protectedProcedure } from '~/server/trpc/trpc'
  * rejected. So each applicant will have one applied role at any
  * point in time, from the perspective of a director.
  * */
-export const getAllApplicantsTopRoleByDept = protectedProcedure.query(
+export const getAllApplicantsTopRoleByDept = protectedProcedure
+//.input(z.object({
+//   filter: z.string(),
+//   search: z.string()
+// }))
+.query(
   async ({ ctx }) => {
     try {
-      const applicants = await userCollection.queries([
+      const filtersForUsers = [
         where('role', '==', 'Applicant'),
-      ])
+      ]
+      // if (input.search && input.search.length) {
+      //   filtersForUsers.push(where('name', '==', input.search))
+      // }
+      const applicants = await userCollection.queries(filtersForUsers)
       const applicantsWithRoles: Applicant[] = []
 
       for (let i = 0; i < applicants.length; i++) {

From b9de5cdd24636c6225b23b667b74a8ba9d570580 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sat, 17 Jun 2023 19:58:11 +0800
Subject: [PATCH 190/223] add seen and unseen button to the card

---
 src/components/common/SearchBar.tsx          |  4 +-
 src/components/recruitment/ApplicantCard.tsx | 44 +++++++++++++++++++-
 src/components/recruitment/ApplicantGrid.tsx |  6 ++-
 src/server/db/models/AppliedRole.ts          |  1 +
 src/server/trpc/router/recruitment/index.ts  |  3 +-
 src/server/trpc/router/recruitment/update.ts | 22 ++++++++++
 6 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 2d597658..8af11106 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -223,10 +223,10 @@ const SearchBar = () => {
       return (
         <ul className="ml-2">
           <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('flagged')}}
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('true')}}
           className="px-3 py-2 cursor-pointer">Flagged</button>
           <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('unflagged')}}
+          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('false')}}
           className="px-3 py-2 cursor-pointer">Unflagged</button>
         </ul>
       );
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index b8a0fbb3..3547009d 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -3,10 +3,12 @@ import {
   CardBody,
   CardHeader,
   Heading,
+  Icon,
   Image,
   Stack,
   Text,
   UnorderedList,
+  useToast,
 } from '@chakra-ui/react'
 import { Avatar } from 'flowbite-react'
 import AppliedRoleListItem from './AppliedRoleListItem'
@@ -15,10 +17,39 @@ import type { Applicant } from '~/server/db/models/Applicant'
 import NoteModal from './NoteModal'
 import type { AppliedRole } from '~/server/db/models/AppliedRole'
 import { trpc } from '~/utils/trpc'
+import { ViewIcon, ViewOffIcon } from '@chakra-ui/icons'
+import { ApplicationStatus } from '~/server/db/models/AppliedRole'
+import { useState } from 'react'
 
 const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
   const appliedRole = applicant.appliedRoles[0] as AppliedRole
+  const [isFlagged, setIsFlagged] = useState(appliedRole.flag)
+  const appliedRoleId = appliedRole.id
   const { refetch } = trpc.recruitment.getAppliedRole.useQuery(appliedRole.id)
+  const toast = useToast()
+  const { mutateAsync } = trpc.recruitment.updateAppliedRoleFlag.useMutation()
+  const updateFlag = async (flag: boolean) => {
+    try {
+      await mutateAsync({
+        flag: flag,
+        appliedRoleId: appliedRoleId,
+      })
+      await refetch()
+      toast({
+        duration: 2000,
+        status: 'success',
+        title: 'Success',
+        description: "Applicant's flag updated successfully!",
+      })
+    } catch (e) {
+      toast({
+        description: (e as Error).message,
+        duration: 2000,
+        status: 'error',
+        title: 'Oops, an error occurred!',
+      })
+    }
+  }
   return (
     <Card
       maxWidth="xs"
@@ -26,8 +57,19 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
       boxShadow="0px 4px 4px rgba(0, 0, 0, 0.25)"
     >
       <CardHeader paddingBottom="0" zIndex={1}>
-        <span>flag</span>
         <Heading size="md" textAlign="center" textColor="white">
+          
+            {isFlagged ? 
+            <button className='absolute left-2'
+            onClick={() => {updateFlag(false), setIsFlagged(false)}}>
+              <ViewIcon></ViewIcon>
+              </button>
+            :  <button className='absolute left-2'
+            onClick={() => {updateFlag(true), setIsFlagged(true)}}>
+              <ViewOffIcon></ViewOffIcon>
+              </button>
+            }
+         
           {applicant.name}
         </Heading>
       </CardHeader>
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 4c1cd4b9..af694d3c 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -29,11 +29,13 @@ const ApplicantGrid = () => {
           (search === '' ?        
           data?.filter((applicant) => {
               return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) || 
-              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()))
+              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
+              applicant.appliedRoles.some((role) => role.flag.toString() === filter))
             }) :
             data?.filter((applicant) => {
               return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) || 
-              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()))
+              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
+              applicant.appliedRoles.some((role) => role.flag.toString() === filter))
             }).filter((remaining) => {
               return remaining.name.toLowerCase().includes(search.toLowerCase())
             })
diff --git a/src/server/db/models/AppliedRole.ts b/src/server/db/models/AppliedRole.ts
index c61b0dcf..fb6d4d45 100644
--- a/src/server/db/models/AppliedRole.ts
+++ b/src/server/db/models/AppliedRole.ts
@@ -6,6 +6,7 @@ export type AppliedRole = {
   interviewNotes?: string
   role: string
   status: ApplicationStatus
+  flag: boolean
 }
 
 export enum ApplicationStatus {
diff --git a/src/server/trpc/router/recruitment/index.ts b/src/server/trpc/router/recruitment/index.ts
index 0d0ba4f4..e5234aeb 100644
--- a/src/server/trpc/router/recruitment/index.ts
+++ b/src/server/trpc/router/recruitment/index.ts
@@ -1,5 +1,5 @@
 import { router } from '~/server/trpc/trpc'
-import { updateAppliedRoleStatus, updateInterviewNotes } from './update'
+import { updateAppliedRoleStatus, updateInterviewNotes, updateAppliedRoleFlag } from './update'
 import {
   getAllApplicantsTopRoleByDept,
   getApplicant,
@@ -9,6 +9,7 @@ import {
 export const recruitmentRouter = router({
   updateAppliedRoleStatus,
   updateInterviewNotes,
+  updateAppliedRoleFlag,
   getAllApplicantsTopRoleByDept,
   getApplicant,
   getAppliedRole,
diff --git a/src/server/trpc/router/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
index 13307c92..c0496067 100644
--- a/src/server/trpc/router/recruitment/update.ts
+++ b/src/server/trpc/router/recruitment/update.ts
@@ -43,3 +43,25 @@ export const updateInterviewNotes = protectedProcedure
       })
     }
   })
+
+  export const updateAppliedRoleFlag = protectedProcedure
+  .input(
+    z.object({
+      appliedRoleId: z.string(),
+      flag: z.boolean(),
+    })
+  )
+  .mutation(async ({ input }) => {
+    try {
+      return await appliedRoleCollection.update(input.appliedRoleId, {
+        flag: input.flag,
+      })
+    } catch (e) {
+      throw new TRPCError({
+        code: 'INTERNAL_SERVER_ERROR',
+        message: (e as Error).message,
+      })
+    }
+  })
+
+

From 399ff2673191580a26d3722f1275aee464d1309a Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 14:42:04 +0800
Subject: [PATCH 191/223] enable refetch after filter is set so that the
 updated values are shown

---
 src/components/common/SearchBar.tsx          | 166 ++++++++++++-------
 src/components/recruitment/ApplicantGrid.tsx |  17 +-
 2 files changed, 119 insertions(+), 64 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 8af11106..872e64b5 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -2,9 +2,8 @@ import React, { useContext, useState } from 'react'
 import { Input, InputGroup, InputLeftElement } from '@chakra-ui/react'
 import { SearchIcon } from '@chakra-ui/icons'
 import { searchContext } from '~/context/recruitment/SearchProvider'
-import { ChevronDownIcon } from '@chakra-ui/icons';
-import { useSession } from 'next-auth/react';
-
+import { ChevronDownIcon } from '@chakra-ui/icons'
+import { useSession } from 'next-auth/react'
 
 const SearchBar = () => {
   const roles = [
@@ -153,35 +152,40 @@ const SearchBar = () => {
   const ctx = useSession()
   const department = ctx.data?.user?.department
   console.log(department)
-  const filteredRoles = roles.filter((combination) => combination.department === department)
+  const filteredRoles = roles.filter(
+    (combination) => combination.department === department
+  )
   const { search, filter, setFilter, setSearch } = useContext(searchContext)
-  const [showDropdown, setShowDropdown] = useState(false);
+  const [showDropdown, setShowDropdown] = useState(false)
   console.log(filteredRoles)
 
-
   const [selectedFilter, setSelectedFilter] = useState('')
-  const [showOptions, setShowOptions] = useState(false);
+  const [showOptions, setShowOptions] = useState(false)
   console.log('searchbar: ', search)
 
   const handleFilterChange = (filter: string) => {
-    setSelectedFilter(filter);
-    setShowDropdown(false);
+    setSelectedFilter(filter)
+    setShowDropdown(false)
     // Perform filtering logic or update your data based on the selected filter
-  };
-
- 
+  }
 
   const renderOptions = () => {
     if (selectedFilter === 'Roles') {
       return (
         <ul className="ml-2">
-           {filteredRoles.map((role) =>   
-          <button 
-          key={role.role}
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter(role.role)}}
-          className="px-3 py-2 cursor-pointer">{role.role}
-          </button>)
-          }
+          {filteredRoles.map((role) => (
+            <button
+              key={role.role}
+              onClick={() => {
+                setShowOptions(false),
+                  setShowDropdown(true),
+                  setFilter(role.role)
+              }}
+              className="cursor-pointer px-3 py-2"
+            >
+              {role.role}
+            </button>
+          ))}
 
           {/* <button 
           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('designer')}}
@@ -196,45 +200,85 @@ const SearchBar = () => {
            onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('software engineer')}}
           className="px-3 py-2 cursor-pointer">Software Engineer</button> */}
         </ul>
-      );
+      )
     }
     if (selectedFilter === 'Status') {
       return (
         <ul className="ml-2">
-          <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('accepted')}}
-          className="px-3 py-2 cursor-pointer">Accepted</button>
-          <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('offered')}}
-          className="px-3 py-2 cursor-pointer">Offered</button>
-           <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('pending')}}
-          className="px-3 py-2 cursor-pointer">Pending Review</button>
-           <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('interviewed')}}
-          className="px-3 py-2 cursor-pointer">Interviewed</button>
-           <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('rejected')}}
-          className="px-3 py-2 cursor-pointer">Rejected</button>
+          <button
+            onClick={() => {
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter('accepted')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Accepted
+          </button>
+          <button
+            onClick={() => {
+              setShowOptions(false), setShowDropdown(true), setFilter('offered')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Offered
+          </button>
+          <button
+            onClick={() => {
+              setShowOptions(false), setShowDropdown(true), setFilter('pending')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Pending Review
+          </button>
+          <button
+            onClick={() => {
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter('interviewed')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Interviewed
+          </button>
+          <button
+            onClick={() => {
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter('rejected')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Rejected
+          </button>
         </ul>
-      );
+      )
     }
     if (selectedFilter === 'Flags') {
       return (
         <ul className="ml-2">
-          <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('true')}}
-          className="px-3 py-2 cursor-pointer">Flagged</button>
-          <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('false')}}
-          className="px-3 py-2 cursor-pointer">Unflagged</button>
+          <button
+            onClick={() => {
+              setShowOptions(false), setShowDropdown(true), setFilter('true')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Seen
+          </button>
+          <button
+            onClick={() => {
+              setShowOptions(false), setShowDropdown(true), setFilter('false')
+            }}
+            className="cursor-pointer px-3 py-2"
+          >
+            Unseen
+          </button>
         </ul>
-      );
+      )
     }
-    return null;
-  };
+    return null
+  }
   return (
-    
     <InputGroup
       minWidth={'150px'}
       maxWidth={'300px'}
@@ -246,7 +290,6 @@ const SearchBar = () => {
       marginLeft={{ base: 'auto' }}
       marginRight={{ base: 'auto' }}
     >
-      
       <InputLeftElement>
         <SearchIcon />
       </InputLeftElement>
@@ -257,48 +300,49 @@ const SearchBar = () => {
         borderColor="#004586"
         borderRadius="20px"
         onChange={(e) => {
-          setSearch(e.currentTarget.value);
+          setSearch(e.currentTarget.value)
         }}
       />
-       <button
+      <button
         type="button"
-        className="ml-2 px-3 py-2 rounded-md bg-gray-200 text-gray-600 relative"
+        className="relative ml-2 rounded-md bg-gray-200 px-3 py-2 text-gray-600"
         onMouseEnter={() => setShowOptions(true)}
-        onMouseLeave={() => {setShowOptions(false), setShowDropdown(true)}}
-       
-        
+        onMouseLeave={() => {
+          setShowOptions(false), setShowDropdown(true)
+        }}
       >
         <ChevronDownIcon />
         {showOptions && (
-          <div className="absolute top-0 left-0 mt-10 bg-white border border-gray-200 rounded-md shadow-md">
+          <div className="absolute top-0 left-0 mt-10 rounded-md border border-gray-200 bg-white shadow-md">
             {showDropdown ? (
               <>
-               
                 <button
                   type="button"
-                  className="px-4 py-2 cursor-pointer"
+                  className="cursor-pointer px-4 py-2"
                   onClick={() => handleFilterChange('Roles')}
                 >
                   Roles
                 </button>
                 <button
                   type="button"
-                  className="px-4 py-2 cursor-pointer"
+                  className="cursor-pointer px-4 py-2"
                   onClick={() => handleFilterChange('Status')}
                 >
                   Status
                 </button>
                 <button
                   type="button"
-                  className="px-4 py-2 cursor-pointer"
+                  className="cursor-pointer px-4 py-2"
                   onClick={() => handleFilterChange('Flags')}
                 >
                   Flags
                 </button>
                 <button
                   type="button"
-                  className="px-4 py-2 mb-2 cursor-pointer rounded font-bold bg-gray-200"
-                  onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('')}}
+                  className="mb-2 cursor-pointer rounded bg-gray-200 px-4 py-2 font-bold"
+                  onClick={() => {
+                    setShowOptions(false), setShowDropdown(true), setFilter('')
+                  }}
                 >
                   Clear
                 </button>
@@ -309,8 +353,6 @@ const SearchBar = () => {
           </div>
         )}
       </button>
-     
-     
     </InputGroup>
   )
 }
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index af694d3c..37fb85a9 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,4 +1,4 @@
-import { useContext } from 'react'
+import { useContext, useEffect, useRef, useState } from 'react'
 import {searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
@@ -8,10 +8,21 @@ import { Button, VStack } from '@chakra-ui/react'
 
 const ApplicantGrid = () => {
   const { filter, search } = useContext(searchContext)
+  const {
+    data,
+    refetch: refetchAllApplicantsTopRoleByDept,
+  } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery();
+  
+  useEffect(() => {
+    refetchAllApplicantsTopRoleByDept();
+  }, [filter]);
+
+ 
 
-  const { data } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
   if (!data) return <></>
 
+ 
+
   // const filteredData =
   //   search === ''
   //     ? data
@@ -42,6 +53,8 @@ const ApplicantGrid = () => {
             
           )
 
+
+
   const totalNumber = filteredData.length
 
 

From a65eb07caf615196036420975ff190353bf1f77b Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 17:03:48 +0800
Subject: [PATCH 192/223] add items under navbar to indicate the current
 filters applied, as well as allowing multiple filters

---
 src/components/common/SearchBar.tsx          |  34 +++--
 src/components/recruitment/ApplicantGrid.tsx | 132 ++++++++++++-------
 2 files changed, 107 insertions(+), 59 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 872e64b5..83d7a9eb 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -151,11 +151,13 @@ const SearchBar = () => {
   ] as { department: string; role: string }[]
   const ctx = useSession()
   const department = ctx.data?.user?.department
-  console.log(department)
   const filteredRoles = roles.filter(
     (combination) => combination.department === department
   )
   const { search, filter, setFilter, setSearch } = useContext(searchContext)
+  const filterArray = filter.split(',')
+  const firstElement = filterArray.shift()
+  console.log(filterArray)
   const [showDropdown, setShowDropdown] = useState(false)
   console.log(filteredRoles)
 
@@ -179,7 +181,7 @@ const SearchBar = () => {
               onClick={() => {
                 setShowOptions(false),
                   setShowDropdown(true),
-                  setFilter(role.role)
+                  setFilter(filter.concat(',' + role.role))
               }}
               className="cursor-pointer px-3 py-2"
             >
@@ -209,7 +211,7 @@ const SearchBar = () => {
             onClick={() => {
               setShowOptions(false),
                 setShowDropdown(true),
-                setFilter('accepted')
+                setFilter(filter.concat(',accepted'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -217,7 +219,7 @@ const SearchBar = () => {
           </button>
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter('offered')
+              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',offered'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -225,7 +227,7 @@ const SearchBar = () => {
           </button>
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter('pending')
+              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',pending'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -235,7 +237,7 @@ const SearchBar = () => {
             onClick={() => {
               setShowOptions(false),
                 setShowDropdown(true),
-                setFilter('interviewed')
+                setFilter(filter.concat(',interviewed'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -245,7 +247,7 @@ const SearchBar = () => {
             onClick={() => {
               setShowOptions(false),
                 setShowDropdown(true),
-                setFilter('rejected')
+                setFilter(filter.concat(',rejected'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -259,7 +261,7 @@ const SearchBar = () => {
         <ul className="ml-2">
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter('true')
+              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',true'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -267,7 +269,7 @@ const SearchBar = () => {
           </button>
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter('false')
+              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',false'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -350,9 +352,23 @@ const SearchBar = () => {
             ) : (
               renderOptions()
             )}
+        
           </div>
         )}
       </button>
+      <div className='grid grid-cols-2 absolute top-0 gap-x-1 gap-y-1 left-0 mt-10'>
+      {filterArray.map((value) => {
+        return (
+         <div className='rounded-full text-center border border-gray-200 bg-white shadow-md '>
+          {value}
+         </div>
+        )
+      }
+        )}
+        </div>
+      
+     
+    
     </InputGroup>
   )
 }
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 37fb85a9..d8686c87 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,5 +1,5 @@
 import { useContext, useEffect, useRef, useState } from 'react'
-import {searchContext } from '~/context/recruitment/SearchProvider'
+import { searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
 import InfoPopup from '~/components/recruitment/InfoPopup'
@@ -8,76 +8,108 @@ import { Button, VStack } from '@chakra-ui/react'
 
 const ApplicantGrid = () => {
   const { filter, search } = useContext(searchContext)
-  const {
-    data,
-    refetch: refetchAllApplicantsTopRoleByDept,
-  } = trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery();
-  
-  useEffect(() => {
-    refetchAllApplicantsTopRoleByDept();
-  }, [filter]);
+  const { data, refetch: refetchAllApplicantsTopRoleByDept } =
+    trpc.recruitment.getAllApplicantsTopRoleByDept.useQuery()
 
- 
+  useEffect(() => {
+    console.log(filter)
+    refetchAllApplicantsTopRoleByDept()
+  }, [filter])
 
   if (!data) return <></>
 
- 
-
   // const filteredData =
   //   search === ''
   //     ? data
   //     : data?.filter((applicant) => {
   //         return applicant.name.toLowerCase().includes(search.toLowerCase())
   //       })
+  const filterArray = filter.split(',')
+  const removedFirst = filterArray.shift()
+  console.log(filterArray)
+
+  // const filteredData =
+  //       filter === ''
+  //         ? (search ==='' ? data :
+  //         data?.filter((applicant) => {
+  //           return applicant.name.toLowerCase().includes(search.toLowerCase())
+  //         }))
+  //         :
+  //         (search === '' ?
+  //         data?.filter((applicant) => {
+  //             return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) ||
+  //             applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
+  //             applicant.appliedRoles.some((role) => role.flag.toString() === filter))
+  //           }) :
+  //           data?.filter((applicant) => {
+  //             return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) ||
+  //             applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
+  //             applicant.appliedRoles.some((role) => role.flag.toString() === filter))
+  //           }).filter((remaining) => {
+  //             return remaining.name.toLowerCase().includes(search.toLowerCase())
+  //           })
+
+  //         )
 
   const filteredData =
-        filter === ''
-          ? (search ==='' ? data : 
-          data?.filter((applicant) => {
+    filterArray.length === 0
+      ? search === ''
+        ? data
+        : data?.filter((applicant) => {
             return applicant.name.toLowerCase().includes(search.toLowerCase())
-          })) 
-          :  
-          (search === '' ?        
-          data?.filter((applicant) => {
-              return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) || 
-              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
-              applicant.appliedRoles.some((role) => role.flag.toString() === filter))
-            }) :
-            data?.filter((applicant) => {
-              return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) || 
-              applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
-              applicant.appliedRoles.some((role) => role.flag.toString() === filter))
-            }).filter((remaining) => {
-              return remaining.name.toLowerCase().includes(search.toLowerCase())
+          })
+      : search === ''
+      ? data?.filter((applicant) => {
+          return filterArray.every((filter) => {
+            return (
+              applicant.appliedRoles.some(
+                (role) => role.role.toLowerCase() === filter.toLowerCase()
+              ) ||
+              applicant.appliedRoles.some(
+                (role) => role.status.toLowerCase() === filter.toLowerCase()
+              ) ||
+              applicant.appliedRoles.some(
+                (role) => role.flag.toString() === filter
+              )
+            )
+          })
+        })
+      : data
+          ?.filter((applicant) => {
+            return filterArray.every((filter) => {
+              return (
+                applicant.appliedRoles.some(
+                  (role) => role.role.toLowerCase() === filter.toLowerCase()
+                ) ||
+                applicant.appliedRoles.some(
+                  (role) => role.status.toLowerCase() === filter.toLowerCase()
+                ) ||
+                applicant.appliedRoles.some(
+                  (role) => role.flag.toString() === filter
+                )
+              )
             })
-            
-          )
-
-
+          })
+          .filter((remaining) => {
+            return remaining.name.toLowerCase().includes(search.toLowerCase())
+          })
 
   const totalNumber = filteredData.length
 
-
   return (
     <>
-   <div>
-      <div className='mb-2 mt-20 lg:mt-1 md:mt-1 font-bold ml-20 lg:text-xl'>
-      Number of Applicants: {totalNumber}
+      <div>
+        <div className="mb-2 mt-20 ml-20 font-bold md:mt-1 lg:mt-1 lg:text-xl">
+          Number of Applicants: {totalNumber}
+        </div>
+        <div className="my-10  mx-20 mb-10 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
+          {filteredData?.map((applicant, index) => {
+            return <ApplicantCard applicant={applicant} key={applicant.id} />
+          })}
+        </div>
       </div>
-      <div className="mb-10  my-10 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">
-      
-        {filteredData?.map((applicant, index) => {
-          
-          return <ApplicantCard applicant={applicant} key={applicant.id} />
-           
-        })}
-      </div>
-      </div>
-      
-      
+
       {filteredData.length > 0 && <InfoPopup />}
-   
-     
     </>
   )
 }

From 83ff34b57fbe2d518b3fd60eeff546e036a60393 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 17:13:50 +0800
Subject: [PATCH 193/223] fix minor bugs

---
 src/components/common/SearchBar.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 83d7a9eb..a6ba965b 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -356,11 +356,11 @@ const SearchBar = () => {
           </div>
         )}
       </button>
-      <div className='grid grid-cols-2 absolute top-0 gap-x-1 gap-y-1 left-0 mt-10'>
+      <div className='grid grid-cols-2 flex flex-col absolute top-0 gap-x-1 gap-y-1 left-0 mt-10'>
       {filterArray.map((value) => {
         return (
-         <div className='rounded-full text-center border border-gray-200 bg-white shadow-md '>
-          {value}
+         <div className='w-30  rounded-full flex flex-col text-center border border-gray-200 bg-white shadow-md '>
+          {value === 'true' ? 'seen' : value === 'false' ? 'unseen' : value}
          </div>
         )
       }

From 193e2642cbb1f317a188281d5f9dd82840c40a60 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 21:27:21 +0800
Subject: [PATCH 194/223] add tags to the filters

---
 src/components/common/SearchBar.tsx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index a6ba965b..6109c95a 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -356,7 +356,7 @@ const SearchBar = () => {
           </div>
         )}
       </button>
-      <div className='grid grid-cols-2 flex flex-col absolute top-0 gap-x-1 gap-y-1 left-0 mt-10'>
+      {/* <div className='grid grid-cols-2 flex flex-col absolute top-0 gap-x-1 gap-y-1 left-0 mt-10'>
       {filterArray.map((value) => {
         return (
          <div className='w-30  rounded-full flex flex-col text-center border border-gray-200 bg-white shadow-md '>
@@ -365,7 +365,17 @@ const SearchBar = () => {
         )
       }
         )}
-        </div>
+        </div> */}
+
+        <div className='flex flex-wrap absolute  mx-6 top-0 left-0 mt-10' >
+  {filterArray.map((value) => {
+    return (
+      <div className='w-30 rounded-full flex flex-col text-center border border-gray-200 bg-white shadow-md'>
+        {value === 'true' ? 'seen' : value === 'false' ? 'unseen' : value}
+      </div>
+    )
+  })}
+</div>
       
      
     

From 3cba631c0f8313825da0907e7490d20a156775cf Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 22:19:24 +0800
Subject: [PATCH 195/223] fix bugs for yarn build

---
 src/components/common/SearchBar.tsx    | 38 +++++++++++++++-----------
 src/pages/application_status/index.tsx |  3 +-
 src/types/model.ts                     |  2 +-
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 6109c95a..496fc92b 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -219,7 +219,9 @@ const SearchBar = () => {
           </button>
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',offered'))
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter(filter.concat(',offered'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -227,7 +229,9 @@ const SearchBar = () => {
           </button>
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',pending'))
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter(filter.concat(',pending'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -261,7 +265,9 @@ const SearchBar = () => {
         <ul className="ml-2">
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',true'))
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter(filter.concat(',true'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -269,7 +275,9 @@ const SearchBar = () => {
           </button>
           <button
             onClick={() => {
-              setShowOptions(false), setShowDropdown(true), setFilter(filter.concat(',false'))
+              setShowOptions(false),
+                setShowDropdown(true),
+                setFilter(filter.concat(',false'))
             }}
             className="cursor-pointer px-3 py-2"
           >
@@ -352,7 +360,6 @@ const SearchBar = () => {
             ) : (
               renderOptions()
             )}
-        
           </div>
         )}
       </button>
@@ -367,18 +374,17 @@ const SearchBar = () => {
         )}
         </div> */}
 
-        <div className='flex flex-wrap absolute  mx-6 top-0 left-0 mt-10' >
-  {filterArray.map((value) => {
-    return (
-      <div className='w-30 rounded-full flex flex-col text-center border border-gray-200 bg-white shadow-md'>
-        {value === 'true' ? 'seen' : value === 'false' ? 'unseen' : value}
+      <div className="absolute top-0 left-0  mx-6 mt-10 flex flex-wrap">
+        {filterArray.map((value) => {
+          return (
+            <div 
+            key={value}
+            className="w-30 flex flex-col rounded-full border border-gray-200 bg-white text-center shadow-md">
+              {value === 'true' ? 'seen' : value === 'false' ? 'unseen' : value}
+            </div>
+          )
+        })}
       </div>
-    )
-  })}
-</div>
-      
-     
-    
     </InputGroup>
   )
 }
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index fe66f6ab..b3254107 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -14,6 +14,7 @@ import Image from 'next/image'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { BaseProps } from '~/utils/withAuth'
 import React from 'react'
+import Head from 'next/head'
 
 enum PageState {
   LOGIN,
@@ -64,7 +65,7 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
         <meta name="description" content="The login page for Atlas" />
       </Head>
       <TopNavbar
-        image={session.user?.image as string}
+        // image={session.user?.image as string}
         isAdmin={session.isAdmin}
       />
       <main>
diff --git a/src/types/model.ts b/src/types/model.ts
index d36946e4..8e35042e 100644
--- a/src/types/model.ts
+++ b/src/types/model.ts
@@ -1,4 +1,4 @@
-import type { AppliedRole } from '@prisma/client'
+import { AppliedRole } from "~/server/db/models/AppliedRole"
 
 export type ApplicantWithAppliedRole = {
   id: string

From 9402d0380bd2e03d7e431efc3794eff1b9515d16 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sun, 18 Jun 2023 23:02:20 +0800
Subject: [PATCH 196/223] a

---
 src/components/recruitment/ApplicantGrid.tsx | 23 +++++++-------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index d8686c87..6f4162cb 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,10 +1,9 @@
-import { useContext, useEffect, useRef, useState } from 'react'
+import { useContext, useEffect} from 'react'
 import { searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
 import InfoPopup from '~/components/recruitment/InfoPopup'
-import applicants from '~/pages/recruitment/applicants'
-import { Button, VStack } from '@chakra-ui/react'
+
 
 const ApplicantGrid = () => {
   const { filter, search } = useContext(searchContext)
@@ -18,12 +17,6 @@ const ApplicantGrid = () => {
 
   if (!data) return <></>
 
-  // const filteredData =
-  //   search === ''
-  //     ? data
-  //     : data?.filter((applicant) => {
-  //         return applicant.name.toLowerCase().includes(search.toLowerCase())
-  //       })
   const filterArray = filter.split(',')
   const removedFirst = filterArray.shift()
   console.log(filterArray)
@@ -63,13 +56,13 @@ const ApplicantGrid = () => {
           return filterArray.every((filter) => {
             return (
               applicant.appliedRoles.some(
-                (role) => role.role.toLowerCase() === filter.toLowerCase()
+                (role) => role?.role.toLowerCase() === filter.toLowerCase()
               ) ||
               applicant.appliedRoles.some(
-                (role) => role.status.toLowerCase() === filter.toLowerCase()
+                (role) => role?.status.toLowerCase() === filter.toLowerCase()
               ) ||
               applicant.appliedRoles.some(
-                (role) => role.flag.toString() === filter
+                (role) => role?.flag.toString() === filter
               )
             )
           })
@@ -79,13 +72,13 @@ const ApplicantGrid = () => {
             return filterArray.every((filter) => {
               return (
                 applicant.appliedRoles.some(
-                  (role) => role.role.toLowerCase() === filter.toLowerCase()
+                  (role) => role?.role.toLowerCase() === filter.toLowerCase()
                 ) ||
                 applicant.appliedRoles.some(
-                  (role) => role.status.toLowerCase() === filter.toLowerCase()
+                  (role) => role?.status.toLowerCase() === filter.toLowerCase()
                 ) ||
                 applicant.appliedRoles.some(
-                  (role) => role.flag.toString() === filter
+                  (role) => role?.flag.toString() === filter
                 )
               )
             })

From dc6bfd98571a8145cd14ca6b67f01191b5751cde Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Mon, 19 Jun 2023 21:54:30 +0800
Subject: [PATCH 197/223] fix the bug of circle color not updating

---
 src/components/recruitment/StatusPopup.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 893bcadc..a79151b2 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -14,6 +14,10 @@ import { ApplicationStatus } from '~/server/db/models/AppliedRole'
 import type { QueryObserverResult } from '@tanstack/react-query'
 import { BsCircleFill } from 'react-icons/bs'
 import { trpc } from '~/utils/trpc'
+import Router from 'next/router'
+import { useState } from 'react'
+
+
 
 const statusFillMap = {
   [ApplicationStatus.ACCEPTED]: '#46FFDE',
@@ -34,6 +38,7 @@ const StatusPopup = ({
 }) => {
   const toast = useToast()
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
+  const [currentStatus, setCurrentStatus] = useState(status);
   const updateStatus = async (status: ApplicationStatus) => {
     try {
       await mutateAsync({
@@ -41,12 +46,15 @@ const StatusPopup = ({
         appliedRoleId: appliedRoleId,
       })
       await refetch()
+      setCurrentStatus(status)
       toast({
         duration: 2000,
         status: 'success',
         title: 'Success',
         description: 'Application status updated successfully!',
       })
+     
+
     } catch (e) {
       toast({
         description: (e as Error).message,
@@ -62,7 +70,7 @@ const StatusPopup = ({
       <PopoverTrigger>
         <IconButton
           aria-label="status"
-          icon={<BsCircleFill fill={statusFillMap[status]} />}
+          icon={<BsCircleFill fill={statusFillMap[currentStatus]} />}
           bg="None"
           _hover={{ background: 'None' }}
         ></IconButton>

From 32b6195161c9c29a0e6ade3b7dccdd64c295b5a2 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Mon, 19 Jun 2023 22:26:46 +0800
Subject: [PATCH 198/223] a

---
 src/components/recruitment/StatusPopup.tsx | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index a79151b2..f8d065ff 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -1,6 +1,13 @@
 import {
   IconButton,
   ListItem,
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
   Popover,
   PopoverBody,
   PopoverCloseButton,
@@ -39,6 +46,7 @@ const StatusPopup = ({
   const toast = useToast()
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
   const [currentStatus, setCurrentStatus] = useState(status);
+  isAcceptOpen, 
   const updateStatus = async (status: ApplicationStatus) => {
     try {
       await mutateAsync({
@@ -149,6 +157,41 @@ const StatusPopup = ({
           </UnorderedList>
         </PopoverBody>
       </PopoverContent>
+
+      <Modal
+          isOpen={isAcceptOpen}
+          onClose={onCloseAccept}
+          size="xs"
+        >
+          <ModalOverlay bg="none" backdropFilter="auto" />
+          <ModalContent>
+            <ModalHeader fontSize="5xl"></ModalHeader>
+            <ModalCloseButton />
+            <ModalBody fontSize="3xl ">
+              <div className=" flex-col justify-center">
+                <div className="items-center">
+                  Confirm Acceptance?
+                  <button
+                    onClick={() => {
+                      onCloseAccept()
+                      setIsAccepted(true)
+                    }}
+                    className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                  >
+                    Confirm
+                  </button>
+                  <button
+                    onClick={onCloseAccept}
+                    className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                  >
+                    Cancel
+                  </button>
+                </div>
+              </div>
+            </ModalBody>
+            <ModalFooter></ModalFooter>
+          </ModalContent>
+        </Modal>
     </Popover>
   )
 }

From 732a508a0163e77938791458577ac69696719fc8 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Tue, 20 Jun 2023 23:00:16 +0800
Subject: [PATCH 199/223] add confirmation popup(not finished)

---
 src/components/recruitment/StatusPopup.tsx | 31 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index f8d065ff..4586576a 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -46,7 +46,12 @@ const StatusPopup = ({
   const toast = useToast()
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
   const [currentStatus, setCurrentStatus] = useState(status);
-  isAcceptOpen, 
+  const [isAcceptOpen, setIsAcceptOpen] = useState(false)
+  const onOpenAccept = () => setIsAcceptOpen(true)
+  const onCloseAccept = (inputStatus: ApplicationStatus) => {
+    setIsAcceptOpen(false)
+    updateStatus(inputStatus as ApplicationStatus)
+  }
   const updateStatus = async (status: ApplicationStatus) => {
     try {
       await mutateAsync({
@@ -94,9 +99,12 @@ const StatusPopup = ({
                 bg="None"
                 _hover={{ background: 'None' }}
                 marginLeft="2"
-                onClick={() =>
+                onClick={() => {
+                  setIsAcceptOpen(true)
+                  setCurrentStatus(ApplicationStatus.ACCEPTED as ApplicationStatus)
                   updateStatus(ApplicationStatus.ACCEPTED as ApplicationStatus)
                 }
+                }
               />
               <Text>Accepted</Text>
             </ListItem>
@@ -107,9 +115,12 @@ const StatusPopup = ({
                 bg="None"
                 _hover={{ background: 'None' }}
                 marginLeft="2"
-                onClick={() =>
+                onClick={() => {
+                  setIsAcceptOpen(true)
+                  setCurrentStatus(ApplicationStatus.OFFERED as ApplicationStatus)
                   updateStatus(ApplicationStatus.OFFERED as ApplicationStatus)
                 }
+                }
               />
               <Text>Offered</Text>
             </ListItem>
@@ -120,9 +131,12 @@ const StatusPopup = ({
                 bg="None"
                 _hover={{ background: 'None' }}
                 marginLeft="2"
-                onClick={() =>
+                onClick={() => {
+                  setIsAcceptOpen(true)
+                  setCurrentStatus(ApplicationStatus.PENDING as ApplicationStatus)
                   updateStatus(ApplicationStatus.PENDING as ApplicationStatus)
                 }
+                }
               />
               <Text>Pending Review</Text>
             </ListItem>
@@ -133,10 +147,13 @@ const StatusPopup = ({
                 bg="None"
                 _hover={{ background: 'None' }}
                 marginLeft="2"
-                onClick={() =>
+                onClick={() => {
+                  setIsAcceptOpen(true)
+                  setCurrentStatus(ApplicationStatus.INTERVIEWED as ApplicationStatus)
                   updateStatus(
                     ApplicationStatus.INTERVIEWED as ApplicationStatus
                   )
+                  }
                 }
               />
               <Text>Interviewed</Text>
@@ -160,7 +177,7 @@ const StatusPopup = ({
 
       <Modal
           isOpen={isAcceptOpen}
-          onClose={onCloseAccept}
+          onClose={() => setIsAcceptOpen(false)}
           size="xs"
         >
           <ModalOverlay bg="none" backdropFilter="auto" />
@@ -174,7 +191,7 @@ const StatusPopup = ({
                   <button
                     onClick={() => {
                       onCloseAccept()
-                      setIsAccepted(true)
+                    
                     }}
                     className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
                   >

From 6c148a327047d3f229e278086654f7eae23439e1 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Tue, 20 Jun 2023 22:49:13 +0800
Subject: [PATCH 200/223] Emails for status update of accept or reject

---
 src/components/recruitment/ApplicantCard.tsx  | 29 +++---
 .../recruitment/AppliedRoleListItem.tsx       |  7 +-
 src/components/recruitment/StatusPopup.tsx    | 20 +++--
 src/server/db/models/Applicant.ts             |  1 +
 src/server/trpc/router/member/helper.ts       | 11 ++-
 src/server/trpc/router/recruitment/helper.ts  | 89 +++++++++++++++++++
 src/server/trpc/router/recruitment/read.ts    | 19 ++--
 src/server/trpc/router/recruitment/update.ts  | 27 +++++-
 .../trpc/router/users/createSingleUser.ts     |  4 +-
 9 files changed, 166 insertions(+), 41 deletions(-)
 create mode 100644 src/server/trpc/router/recruitment/helper.ts

diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index 3547009d..b6e9b325 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -58,18 +58,26 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
     >
       <CardHeader paddingBottom="0" zIndex={1}>
         <Heading size="md" textAlign="center" textColor="white">
-          
-            {isFlagged ? 
-            <button className='absolute left-2'
-            onClick={() => {updateFlag(false), setIsFlagged(false)}}>
+          {isFlagged ? (
+            <button
+              className="absolute left-2"
+              onClick={() => {
+                updateFlag(false), setIsFlagged(false)
+              }}
+            >
               <ViewIcon></ViewIcon>
-              </button>
-            :  <button className='absolute left-2'
-            onClick={() => {updateFlag(true), setIsFlagged(true)}}>
+            </button>
+          ) : (
+            <button
+              className="absolute left-2"
+              onClick={() => {
+                updateFlag(true), setIsFlagged(true)
+              }}
+            >
               <ViewOffIcon></ViewOffIcon>
-              </button>
-            }
-         
+            </button>
+          )}
+
           {applicant.name}
         </Heading>
       </CardHeader>
@@ -100,6 +108,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
           <Text>Role Applied:</Text>
           <UnorderedList styleType="none">
             <AppliedRoleListItem
+              applicant={applicant}
               appliedRole={appliedRole}
               key={appliedRole.id}
               refetch={refetch}
diff --git a/src/components/recruitment/AppliedRoleListItem.tsx b/src/components/recruitment/AppliedRoleListItem.tsx
index f93a9989..44eb69bd 100644
--- a/src/components/recruitment/AppliedRoleListItem.tsx
+++ b/src/components/recruitment/AppliedRoleListItem.tsx
@@ -1,12 +1,15 @@
 import { ListItem, Text } from '@chakra-ui/react'
 import type { QueryObserverResult } from '@tanstack/react-query'
+import type { Applicant } from '~/server/db/models/Applicant'
 import type { AppliedRole } from '~/server/db/models/AppliedRole'
 import StatusPopup from './StatusPopup'
 
 const AppliedRoleListItem = ({
+  applicant,
   appliedRole,
   refetch,
 }: {
+  applicant: Applicant
   appliedRole: AppliedRole
   refetch: () => Promise<QueryObserverResult>
 }) => {
@@ -16,8 +19,8 @@ const AppliedRoleListItem = ({
         {appliedRole.rank}. {appliedRole.role}
       </Text>
       <StatusPopup
-        status={appliedRole.status}
-        appliedRoleId={appliedRole.id}
+        applicant={applicant}
+        appliedRole={appliedRole}
         refetch={refetch}
       />
     </ListItem>
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 4586576a..4df0f0ba 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -21,10 +21,8 @@ import { ApplicationStatus } from '~/server/db/models/AppliedRole'
 import type { QueryObserverResult } from '@tanstack/react-query'
 import { BsCircleFill } from 'react-icons/bs'
 import { trpc } from '~/utils/trpc'
-import Router from 'next/router'
-import { useState } from 'react'
-
-
+import type { Applicant } from '~/server/db/models/Applicant'
+import type { AppliedRole } from '~/server/db/models/AppliedRole'
 
 const statusFillMap = {
   [ApplicationStatus.ACCEPTED]: '#46FFDE',
@@ -35,12 +33,12 @@ const statusFillMap = {
 }
 
 const StatusPopup = ({
-  status,
-  appliedRoleId,
+  applicant,
+  appliedRole,
   refetch,
 }: {
-  appliedRoleId: string
-  status: ApplicationStatus
+  applicant: Applicant
+  appliedRole: AppliedRole
   refetch: () => Promise<QueryObserverResult>
 }) => {
   const toast = useToast()
@@ -56,7 +54,11 @@ const StatusPopup = ({
     try {
       await mutateAsync({
         status: status,
-        appliedRoleId: appliedRoleId,
+        appliedRoleId: appliedRole.id,
+        name: applicant.name,
+        email: applicant.email,
+        appliedRole: appliedRole.role,
+        appliedDepartment: appliedRole.department,
       })
       await refetch()
       setCurrentStatus(status)
diff --git a/src/server/db/models/Applicant.ts b/src/server/db/models/Applicant.ts
index 5ad009ad..91a9ed34 100644
--- a/src/server/db/models/Applicant.ts
+++ b/src/server/db/models/Applicant.ts
@@ -3,6 +3,7 @@ import type { AppliedRole } from './AppliedRole'
 // Not in firestore collection, piggybacks off User model
 export type Applicant = {
   id: string
+  email: string
   name: string
   appliedRoles: AppliedRole[]
 }
diff --git a/src/server/trpc/router/member/helper.ts b/src/server/trpc/router/member/helper.ts
index 38f6f48f..60a76ad8 100644
--- a/src/server/trpc/router/member/helper.ts
+++ b/src/server/trpc/router/member/helper.ts
@@ -26,7 +26,7 @@ async function checkIfUserExist(id: string) {
  * @param email The email of the user to be sent
  * @param password The password of the user
  */
-async function sendEmail(email: string, password: string) {
+async function sendNewUserEmail(email: string, password: string) {
   const transporter = nodemailer.createTransport({
     service: 'gmail',
     auth: {
@@ -115,8 +115,13 @@ function buildUserObject(
  */
 async function sendMultipleEmails(emails: string[], password: string) {
   await Promise.all(
-    emails.map(async (email) => await sendEmail(email, password))
+    emails.map(async (email) => await sendNewUserEmail(email, password))
   )
 }
 
-export { checkIfUserExist, sendEmail, sendMultipleEmails, buildUserObject }
+export {
+  checkIfUserExist,
+  sendNewUserEmail,
+  sendMultipleEmails,
+  buildUserObject,
+}
diff --git a/src/server/trpc/router/recruitment/helper.ts b/src/server/trpc/router/recruitment/helper.ts
new file mode 100644
index 00000000..54e222db
--- /dev/null
+++ b/src/server/trpc/router/recruitment/helper.ts
@@ -0,0 +1,89 @@
+import nodemailer from 'nodemailer'
+import { env } from '~/env/server.mjs'
+
+/**
+ * Sends an email to the applicant after getting accepted
+ *
+ * @param email The email of the applicant to be sent
+ * @param name The name of the applicant
+ * @param appliedRole The applied role of the applicant
+ * @param appliedDepartmnet The accompanying department for the applied role
+ */
+export async function sendAcceptanceEmail(
+  email: string,
+  name: string,
+  appliedRole: string,
+  appliedDepartment: string
+) {
+  const transporter = nodemailer.createTransport({
+    service: 'gmail',
+    auth: {
+      user: env.GMAIL,
+      pass: env.GMAIL_PASSWORD,
+    },
+  })
+
+  return transporter.sendMail({
+    from: env.GMAIL,
+    to: email,
+    subject: `Congratulations you've been accepted as ${appliedRole} in the ${appliedDepartment} department!`,
+    html: `
+    Dear ${name},
+    <br />
+    <p> Due to your outstanding performance in the interview, we
+    have accepted you for the role of ${appliedRole} in the 
+    ${appliedDepartment} department! If you would like
+    to accept this role, please do so at the HRMS website.
+    </p>
+    <a href="${env.NEXTAUTH_URL}">HRMS Website</a>
+    <br />
+    Thank You. <br /> 
+    Fintech HR
+    `,
+  })
+}
+
+/**
+ * Sends an email to the applicant after getting rejected
+ *
+ * @param email The email of the applicant to be sent
+ * @param name The name of the applicant
+ * @param appliedRole The applied role of the applicant
+ * @param appliedDepartmnet The accompanying department for the applied role
+ */
+export async function sendRejectionEmail(
+  email: string,
+  name: string,
+  appliedRole: string,
+  appliedDepartment: string
+) {
+  const transporter = nodemailer.createTransport({
+    service: 'gmail',
+    auth: {
+      user: env.GMAIL,
+      pass: env.GMAIL_PASSWORD,
+    },
+  })
+
+  return transporter.sendMail({
+    from: env.GMAIL,
+    to: email,
+    subject: `Thanks for your interest in Fintech Society`,
+    html: `
+    Dear ${name},
+    <br />
+    <p> Thank you for your application to Fintech Society for 
+    the role of ${appliedRole} in the ${appliedDepartment} 
+    department. Though your performance was great, we have 
+    decided to pursue other applicants who appear to match 
+    our needs and requirements more closely at this time. 
+    Thank you again for your interest and please do not 
+    hesitate to re-apply again in the future!
+    </p>
+    <a href="${env.NEXTAUTH_URL}">HRMS Website</a>
+    <br />
+    Thank You. <br /> 
+    Fintech HR
+    `,
+  })
+}
diff --git a/src/server/trpc/router/recruitment/read.ts b/src/server/trpc/router/recruitment/read.ts
index 8be343f8..ed631e66 100644
--- a/src/server/trpc/router/recruitment/read.ts
+++ b/src/server/trpc/router/recruitment/read.ts
@@ -16,16 +16,13 @@ import { protectedProcedure } from '~/server/trpc/trpc'
  * point in time, from the perspective of a director.
  * */
 export const getAllApplicantsTopRoleByDept = protectedProcedure
-//.input(z.object({
-//   filter: z.string(),
-//   search: z.string()
-// }))
-.query(
-  async ({ ctx }) => {
+  //.input(z.object({
+  //   filter: z.string(),
+  //   search: z.string()
+  // }))
+  .query(async ({ ctx }) => {
     try {
-      const filtersForUsers = [
-        where('role', '==', 'Applicant'),
-      ]
+      const filtersForUsers = [where('role', '==', 'Applicant')]
       // if (input.search && input.search.length) {
       //   filtersForUsers.push(where('name', '==', input.search))
       // }
@@ -51,6 +48,7 @@ export const getAllApplicantsTopRoleByDept = protectedProcedure
           if (appliedRoles.length == 1) {
             applicantsWithRoles.push({
               id: applicant?.id,
+              email: applicant?.email,
               name: applicant?.name,
               appliedRoles: appliedRoles,
             })
@@ -64,8 +62,7 @@ export const getAllApplicantsTopRoleByDept = protectedProcedure
         message: 'Error retrieving applicants: ' + error,
       })
     }
-  }
-)
+  })
 
 export const getApplicant = protectedProcedure
   .input(z.string())
diff --git a/src/server/trpc/router/recruitment/update.ts b/src/server/trpc/router/recruitment/update.ts
index c0496067..0ac65320 100644
--- a/src/server/trpc/router/recruitment/update.ts
+++ b/src/server/trpc/router/recruitment/update.ts
@@ -3,19 +3,40 @@ import { z } from 'zod'
 import { TRPCError } from '@trpc/server'
 import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
 import { ApplicationStatus } from '~/server/db/models/AppliedRole'
+import { sendAcceptanceEmail, sendRejectionEmail } from './helper'
 
 export const updateAppliedRoleStatus = protectedProcedure
   .input(
     z.object({
       appliedRoleId: z.string(),
       status: z.nativeEnum(ApplicationStatus),
+      name: z.string(),
+      email: z.string(),
+      appliedRole: z.string(),
+      appliedDepartment: z.string(),
     })
   )
   .mutation(async ({ input }) => {
     try {
-      return await appliedRoleCollection.update(input.appliedRoleId, {
+      await appliedRoleCollection.update(input.appliedRoleId, {
         status: input.status,
       })
+      // send email to notify applicants that are accepted / rejected
+      if (input.status === ApplicationStatus.ACCEPTED) {
+        await sendAcceptanceEmail(
+          input.email,
+          input.name,
+          input.appliedRole,
+          input.appliedDepartment
+        )
+      } else if (input.status === ApplicationStatus.REJECTED) {
+        await sendRejectionEmail(
+          input.email,
+          input.name,
+          input.appliedRole,
+          input.appliedDepartment
+        )
+      }
     } catch (e) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
@@ -44,7 +65,7 @@ export const updateInterviewNotes = protectedProcedure
     }
   })
 
-  export const updateAppliedRoleFlag = protectedProcedure
+export const updateAppliedRoleFlag = protectedProcedure
   .input(
     z.object({
       appliedRoleId: z.string(),
@@ -63,5 +84,3 @@ export const updateInterviewNotes = protectedProcedure
       })
     }
   })
-
-
diff --git a/src/server/trpc/router/users/createSingleUser.ts b/src/server/trpc/router/users/createSingleUser.ts
index fcce61cf..2facacd4 100644
--- a/src/server/trpc/router/users/createSingleUser.ts
+++ b/src/server/trpc/router/users/createSingleUser.ts
@@ -1,7 +1,7 @@
 import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import { hash } from 'bcryptjs'
-import { checkIfUserExist, sendEmail } from '../member/helper'
+import { checkIfUserExist, sendNewUserEmail } from '../member/helper'
 import userCollection from '~/server/db/collections/UserCollection'
 import logCollection from '~/server/db/collections/LogCollection'
 import { Timestamp } from 'firebase/firestore'
@@ -41,7 +41,7 @@ export const createSingleUser = protectedProcedure
         id
       )
 
-      await sendEmail(email, hashedPassword)
+      await sendNewUserEmail(email, hashedPassword)
     } catch (e) {
       await logCollection.add({
         createdAt: Timestamp.fromDate(new Date()),

From 8043966221ef18cc9f765bf537126cc223f887e3 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 21 Jun 2023 20:40:42 +0800
Subject: [PATCH 201/223] add a waiting toast while the update is not complete,
 and fix the color bug. Also add a confirmation alert before updating status

---
 src/components/recruitment/StatusPopup.tsx | 52 +++++++++++++---------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 4df0f0ba..6b4ee5bd 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -43,15 +43,24 @@ const StatusPopup = ({
 }) => {
   const toast = useToast()
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
-  const [currentStatus, setCurrentStatus] = useState(status);
+  const [currentStatus, setCurrentStatus] = useState(appliedRole.status);
+  const [statusInModal, setStatusInModal] = useState(appliedRole.status)
   const [isAcceptOpen, setIsAcceptOpen] = useState(false)
-  const onOpenAccept = () => setIsAcceptOpen(true)
+  // const onOpenAccept = () => setIsAcceptOpen(true)
   const onCloseAccept = (inputStatus: ApplicationStatus) => {
     setIsAcceptOpen(false)
     updateStatus(inputStatus as ApplicationStatus)
   }
   const updateStatus = async (status: ApplicationStatus) => {
     try {
+    
+      const firstToast = toast({
+        duration: null,
+        status: 'loading',
+        title: 'Updating',
+        description: 'Waiting to update...'
+     
+      });
       await mutateAsync({
         status: status,
         appliedRoleId: appliedRole.id,
@@ -61,7 +70,8 @@ const StatusPopup = ({
         appliedDepartment: appliedRole.department,
       })
       await refetch()
-      setCurrentStatus(status)
+      setCurrentStatus(status);
+      toast.close(firstToast)
       toast({
         duration: 2000,
         status: 'success',
@@ -103,8 +113,8 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setCurrentStatus(ApplicationStatus.ACCEPTED as ApplicationStatus)
-                  updateStatus(ApplicationStatus.ACCEPTED as ApplicationStatus)
+                  setStatusInModal(ApplicationStatus.ACCEPTED as ApplicationStatus)
+               
                 }
                 }
               />
@@ -119,8 +129,8 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setCurrentStatus(ApplicationStatus.OFFERED as ApplicationStatus)
-                  updateStatus(ApplicationStatus.OFFERED as ApplicationStatus)
+                  setStatusInModal(ApplicationStatus.OFFERED as ApplicationStatus)
+                 
                 }
                 }
               />
@@ -135,8 +145,8 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setCurrentStatus(ApplicationStatus.PENDING as ApplicationStatus)
-                  updateStatus(ApplicationStatus.PENDING as ApplicationStatus)
+                  setStatusInModal(ApplicationStatus.PENDING as ApplicationStatus)
+                 
                 }
                 }
               />
@@ -151,10 +161,8 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setCurrentStatus(ApplicationStatus.INTERVIEWED as ApplicationStatus)
-                  updateStatus(
-                    ApplicationStatus.INTERVIEWED as ApplicationStatus
-                  )
+                  setStatusInModal(ApplicationStatus.INTERVIEWED as ApplicationStatus)
+                 
                   }
                 }
               />
@@ -167,8 +175,11 @@ const StatusPopup = ({
                 bg="None"
                 _hover={{ background: 'None' }}
                 marginLeft="2"
-                onClick={() =>
-                  updateStatus(ApplicationStatus.REJECTED as ApplicationStatus)
+                onClick={() => {
+                  setIsAcceptOpen(true)
+                  setStatusInModal(ApplicationStatus.REJECTED as ApplicationStatus)
+            
+                }
                 }
               />
               <Text>Rejected</Text>
@@ -186,21 +197,22 @@ const StatusPopup = ({
           <ModalContent>
             <ModalHeader fontSize="5xl"></ModalHeader>
             <ModalCloseButton />
-            <ModalBody fontSize="3xl ">
+            <ModalBody fontSize="2xl ">
               <div className=" flex-col justify-center">
                 <div className="items-center">
-                  Confirm Acceptance?
+                  Confirm Status Update?
                   <button
                     onClick={() => {
-                      onCloseAccept()
-                    
+                      onCloseAccept(statusInModal)
                     }}
                     className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
                   >
                     Confirm
                   </button>
                   <button
-                    onClick={onCloseAccept}
+                    onClick={() => {
+                      setIsAcceptOpen(false)
+                    }}
                     className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
                   >
                     Cancel

From e371d193b8787acc975348dda7f745608ff6fe34 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 21 Jun 2023 21:22:15 +0800
Subject: [PATCH 202/223] fix the filter tags' positions, and add waiting toast
 to the update flag button

---
 src/components/common/SearchBar.tsx          |  12 +-
 src/components/recruitment/ApplicantCard.tsx |  12 +-
 src/components/recruitment/ApplicantGrid.tsx |  27 +----
 src/components/recruitment/StatusPopup.tsx   | 119 +++++++++----------
 4 files changed, 73 insertions(+), 97 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index 496fc92b..e03eb8a9 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -160,11 +160,8 @@ const SearchBar = () => {
   console.log(filterArray)
   const [showDropdown, setShowDropdown] = useState(false)
   console.log(filteredRoles)
-
   const [selectedFilter, setSelectedFilter] = useState('')
   const [showOptions, setShowOptions] = useState(false)
-  console.log('searchbar: ', search)
-
   const handleFilterChange = (filter: string) => {
     setSelectedFilter(filter)
     setShowDropdown(false)
@@ -374,12 +371,13 @@ const SearchBar = () => {
         )}
         </div> */}
 
-      <div className="absolute top-0 left-0  mx-6 mt-10 flex flex-wrap">
+      <div className="absolute top-0 left-0 max-w-[250px] mt-10 flex flex-wrap">
         {filterArray.map((value) => {
           return (
-            <div 
-            key={value}
-            className="w-30 flex flex-col rounded-full border border-gray-200 bg-white text-center shadow-md">
+            <div
+              key={value}
+              className="mx-1 my-1 px-2 flex flex-col  rounded-full border border-gray-200 bg-white text-center shadow-md"
+            >
               {value === 'true' ? 'seen' : value === 'false' ? 'unseen' : value}
             </div>
           )
diff --git a/src/components/recruitment/ApplicantCard.tsx b/src/components/recruitment/ApplicantCard.tsx
index b6e9b325..b31ca751 100644
--- a/src/components/recruitment/ApplicantCard.tsx
+++ b/src/components/recruitment/ApplicantCard.tsx
@@ -30,11 +30,19 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleFlag.useMutation()
   const updateFlag = async (flag: boolean) => {
     try {
+      const firstToast = toast({
+        duration: null,
+        status: 'loading',
+        title: 'Updating',
+        description: 'Waiting to update...',
+      })
       await mutateAsync({
         flag: flag,
         appliedRoleId: appliedRoleId,
       })
       await refetch()
+      setIsFlagged(flag)
+      toast.close(firstToast)
       toast({
         duration: 2000,
         status: 'success',
@@ -62,7 +70,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
             <button
               className="absolute left-2"
               onClick={() => {
-                updateFlag(false), setIsFlagged(false)
+                updateFlag(false)
               }}
             >
               <ViewIcon></ViewIcon>
@@ -71,7 +79,7 @@ const ApplicantCard = ({ applicant }: { applicant: Applicant }) => {
             <button
               className="absolute left-2"
               onClick={() => {
-                updateFlag(true), setIsFlagged(true)
+                updateFlag(true)
               }}
             >
               <ViewOffIcon></ViewOffIcon>
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 6f4162cb..13362aef 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -1,10 +1,9 @@
-import { useContext, useEffect} from 'react'
+import { useContext, useEffect } from 'react'
 import { searchContext } from '~/context/recruitment/SearchProvider'
 import { trpc } from '~/utils/trpc'
 import ApplicantCard from './ApplicantCard'
 import InfoPopup from '~/components/recruitment/InfoPopup'
 
-
 const ApplicantGrid = () => {
   const { filter, search } = useContext(searchContext)
   const { data, refetch: refetchAllApplicantsTopRoleByDept } =
@@ -19,30 +18,6 @@ const ApplicantGrid = () => {
 
   const filterArray = filter.split(',')
   const removedFirst = filterArray.shift()
-  console.log(filterArray)
-
-  // const filteredData =
-  //       filter === ''
-  //         ? (search ==='' ? data :
-  //         data?.filter((applicant) => {
-  //           return applicant.name.toLowerCase().includes(search.toLowerCase())
-  //         }))
-  //         :
-  //         (search === '' ?
-  //         data?.filter((applicant) => {
-  //             return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) ||
-  //             applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
-  //             applicant.appliedRoles.some((role) => role.flag.toString() === filter))
-  //           }) :
-  //           data?.filter((applicant) => {
-  //             return (applicant.appliedRoles.some((role) => (role.role.toLowerCase() === filter.toLowerCase())) ||
-  //             applicant.appliedRoles.some((role) =>role.status.toLowerCase() === filter.toLowerCase()) ||
-  //             applicant.appliedRoles.some((role) => role.flag.toString() === filter))
-  //           }).filter((remaining) => {
-  //             return remaining.name.toLowerCase().includes(search.toLowerCase())
-  //           })
-
-  //         )
 
   const filteredData =
     filterArray.length === 0
diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index 6b4ee5bd..d16c77e4 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -43,24 +43,21 @@ const StatusPopup = ({
 }) => {
   const toast = useToast()
   const { mutateAsync } = trpc.recruitment.updateAppliedRoleStatus.useMutation()
-  const [currentStatus, setCurrentStatus] = useState(appliedRole.status);
+  const [currentStatus, setCurrentStatus] = useState(appliedRole.status)
   const [statusInModal, setStatusInModal] = useState(appliedRole.status)
   const [isAcceptOpen, setIsAcceptOpen] = useState(false)
-  // const onOpenAccept = () => setIsAcceptOpen(true)
   const onCloseAccept = (inputStatus: ApplicationStatus) => {
     setIsAcceptOpen(false)
     updateStatus(inputStatus as ApplicationStatus)
   }
   const updateStatus = async (status: ApplicationStatus) => {
     try {
-    
       const firstToast = toast({
         duration: null,
         status: 'loading',
         title: 'Updating',
-        description: 'Waiting to update...'
-     
-      });
+        description: 'Waiting to update...',
+      })
       await mutateAsync({
         status: status,
         appliedRoleId: appliedRole.id,
@@ -70,7 +67,7 @@ const StatusPopup = ({
         appliedDepartment: appliedRole.department,
       })
       await refetch()
-      setCurrentStatus(status);
+      setCurrentStatus(status)
       toast.close(firstToast)
       toast({
         duration: 2000,
@@ -78,8 +75,6 @@ const StatusPopup = ({
         title: 'Success',
         description: 'Application status updated successfully!',
       })
-     
-
     } catch (e) {
       toast({
         description: (e as Error).message,
@@ -113,10 +108,10 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setStatusInModal(ApplicationStatus.ACCEPTED as ApplicationStatus)
-               
-                }
-                }
+                  setStatusInModal(
+                    ApplicationStatus.ACCEPTED as ApplicationStatus
+                  )
+                }}
               />
               <Text>Accepted</Text>
             </ListItem>
@@ -129,10 +124,10 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setStatusInModal(ApplicationStatus.OFFERED as ApplicationStatus)
-                 
-                }
-                }
+                  setStatusInModal(
+                    ApplicationStatus.OFFERED as ApplicationStatus
+                  )
+                }}
               />
               <Text>Offered</Text>
             </ListItem>
@@ -145,10 +140,10 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setStatusInModal(ApplicationStatus.PENDING as ApplicationStatus)
-                 
-                }
-                }
+                  setStatusInModal(
+                    ApplicationStatus.PENDING as ApplicationStatus
+                  )
+                }}
               />
               <Text>Pending Review</Text>
             </ListItem>
@@ -161,10 +156,10 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setStatusInModal(ApplicationStatus.INTERVIEWED as ApplicationStatus)
-                 
-                  }
-                }
+                  setStatusInModal(
+                    ApplicationStatus.INTERVIEWED as ApplicationStatus
+                  )
+                }}
               />
               <Text>Interviewed</Text>
             </ListItem>
@@ -177,10 +172,10 @@ const StatusPopup = ({
                 marginLeft="2"
                 onClick={() => {
                   setIsAcceptOpen(true)
-                  setStatusInModal(ApplicationStatus.REJECTED as ApplicationStatus)
-            
-                }
-                }
+                  setStatusInModal(
+                    ApplicationStatus.REJECTED as ApplicationStatus
+                  )
+                }}
               />
               <Text>Rejected</Text>
             </ListItem>
@@ -189,40 +184,40 @@ const StatusPopup = ({
       </PopoverContent>
 
       <Modal
-          isOpen={isAcceptOpen}
-          onClose={() => setIsAcceptOpen(false)}
-          size="xs"
-        >
-          <ModalOverlay bg="none" backdropFilter="auto" />
-          <ModalContent>
-            <ModalHeader fontSize="5xl"></ModalHeader>
-            <ModalCloseButton />
-            <ModalBody fontSize="2xl ">
-              <div className=" flex-col justify-center">
-                <div className="items-center">
-                  Confirm Status Update?
-                  <button
-                    onClick={() => {
-                      onCloseAccept(statusInModal)
-                    }}
-                    className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
-                  >
-                    Confirm
-                  </button>
-                  <button
-                    onClick={() => {
-                      setIsAcceptOpen(false)
-                    }}
-                    className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
-                  >
-                    Cancel
-                  </button>
-                </div>
+        isOpen={isAcceptOpen}
+        onClose={() => setIsAcceptOpen(false)}
+        size="xs"
+      >
+        <ModalOverlay bg="none" backdropFilter="auto" />
+        <ModalContent>
+          <ModalHeader fontSize="5xl"></ModalHeader>
+          <ModalCloseButton />
+          <ModalBody fontSize="2xl ">
+            <div className=" flex-col justify-center">
+              <div className="items-center">
+                Confirm Status Update?
+                <button
+                  onClick={() => {
+                    onCloseAccept(statusInModal)
+                  }}
+                  className="mt-5 rounded bg-green-500 py-2 px-4 text-2xl font-bold text-white hover:bg-green-600"
+                >
+                  Confirm
+                </button>
+                <button
+                  onClick={() => {
+                    setIsAcceptOpen(false)
+                  }}
+                  className="ml-10 mt-5 rounded bg-red-500 py-2 px-4 text-2xl font-bold text-white hover:bg-red-600"
+                >
+                  Cancel
+                </button>
               </div>
-            </ModalBody>
-            <ModalFooter></ModalFooter>
-          </ModalContent>
-        </Modal>
+            </div>
+          </ModalBody>
+          <ModalFooter></ModalFooter>
+        </ModalContent>
+      </Modal>
     </Popover>
   )
 }

From 2f9bb0dd1548abbc4d4cfc65f80290ea5b6277fb Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Wed, 21 Jun 2023 21:40:04 +0800
Subject: [PATCH 203/223] make UI work on small screen

---
 src/components/common/SearchBar.tsx          | 26 +-------------------
 src/components/recruitment/ApplicantGrid.tsx |  2 +-
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/components/common/SearchBar.tsx b/src/components/common/SearchBar.tsx
index e03eb8a9..087d058e 100644
--- a/src/components/common/SearchBar.tsx
+++ b/src/components/common/SearchBar.tsx
@@ -185,19 +185,6 @@ const SearchBar = () => {
               {role.role}
             </button>
           ))}
-
-          {/* <button 
-          onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('designer')}}
-          className="px-3 py-2 cursor-pointer">Designer</button>
-          <button 
-           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('designer manager')}}
-          className="px-3 py-2 cursor-pointer">Designer Manager</button>
-          <button 
-           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('technical lead')}}
-          className="px-3 py-2 cursor-pointer">Technical Lead</button>
-          <button 
-           onClick={() => {setShowOptions(false), setShowDropdown(true), setFilter('software engineer')}}
-          className="px-3 py-2 cursor-pointer">Software Engineer</button> */}
         </ul>
       )
     }
@@ -360,18 +347,7 @@ const SearchBar = () => {
           </div>
         )}
       </button>
-      {/* <div className='grid grid-cols-2 flex flex-col absolute top-0 gap-x-1 gap-y-1 left-0 mt-10'>
-      {filterArray.map((value) => {
-        return (
-         <div className='w-30  rounded-full flex flex-col text-center border border-gray-200 bg-white shadow-md '>
-          {value === 'true' ? 'seen' : value === 'false' ? 'unseen' : value}
-         </div>
-        )
-      }
-        )}
-        </div> */}
-
-      <div className="absolute top-0 left-0 max-w-[250px] mt-10 flex flex-wrap">
+      <div className="absolute top-6 md:top-0 left-0 max-w-[250px] mt-10 flex flex-wrap">
         {filterArray.map((value) => {
           return (
             <div
diff --git a/src/components/recruitment/ApplicantGrid.tsx b/src/components/recruitment/ApplicantGrid.tsx
index 13362aef..f458b9b8 100644
--- a/src/components/recruitment/ApplicantGrid.tsx
+++ b/src/components/recruitment/ApplicantGrid.tsx
@@ -67,7 +67,7 @@ const ApplicantGrid = () => {
   return (
     <>
       <div>
-        <div className="mb-2 mt-20 ml-20 font-bold md:mt-1 lg:mt-1 lg:text-xl">
+        <div className=" mb-2 mt-16 mb-2 ml-20 font-bold md:mt-1 lg:mt-1 lg:text-xl">
           Number of Applicants: {totalNumber}
         </div>
         <div className="my-10  mx-20 mb-10 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-3 ">

From 33c8579134093915be8c92a1ad0b1c53ad486b91 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Fri, 23 Jun 2023 13:41:10 +0800
Subject: [PATCH 204/223] test

---
 src/components/profile/ProfileInfo.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index 886bbe42..9916a4e0 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -1,7 +1,11 @@
 import { Box, Table, TableContainer, Tbody, Td, Tr } from '@chakra-ui/react'
 
 type ProfilePageType = {
-  batch: string | undefined
+  gender: string | null
+  batch: string | null
+  year: string | null
+  faculty: string | null
+  major: string | null
 }
 
 const ProfileInfo = (props: ProfilePageType) => {

From 8ae0bb5e84fc6b0a7bd21519841cbb58658b722d Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Fri, 23 Jun 2023 13:43:44 +0800
Subject: [PATCH 205/223] solve bug

---
 src/components/profile/ProfileGrid.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index 8aa39b1a..260518e2 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -31,13 +31,14 @@ const ProfileGrid = ({
           dept={data.department}
           role={data.role}
           studentId={studentId}
+          session={session}
         />
       </div>
       <div className="col-span-2 w-3/4">
         <ProfileContactInfo studentId={studentId} {...data} refetch={refetch} />
       </div>
       <div className="col-span-2 row-span-2 mb-10 w-3/4">
-        <ProfileInfo batch={data.batch as string} />
+        {/* <ProfileInfo {...data} /> */}
       </div>
     </div>
   )

From 1ef6e76ee2bc5c86dce0a446ecc7a97471c593f0 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Fri, 23 Jun 2023 13:46:17 +0800
Subject: [PATCH 206/223] solve bug

---
 src/components/profile/ProfileCard.tsx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/profile/ProfileCard.tsx b/src/components/profile/ProfileCard.tsx
index 86f45077..5d87535a 100644
--- a/src/components/profile/ProfileCard.tsx
+++ b/src/components/profile/ProfileCard.tsx
@@ -1,5 +1,6 @@
 import { trpc } from '../../utils/trpc'
 import { Box, Button, Image, Text } from '@chakra-ui/react'
+import type { Session } from 'next-auth'
 import { useRouter } from 'next/router'
 import UploadImageBtn from './UploadImageButton'
 
@@ -10,11 +11,13 @@ const ProfileCard = ({
   dept,
   role,
   studentId,
+  session,
 }: {
   name: string | null
   dept: string | null
   role: string | null
   studentId: string
+  session: Session
 }) => {
   const router = useRouter()
   const redirectToResetPassword = () => router.push('/auth/forgetpassword')
@@ -36,16 +39,17 @@ const ProfileCard = ({
           borderRadius="full"
           boxSize="170px"
         />
-
-        <Box className="absolute bottom-0 right-0">
-          <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
-        </Box>
+        {session?.user?.id === studentId ?? (
+          <Box className="absolute bottom-0 right-0">
+            <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
+          </Box>
+        )}
       </Box>
       <Box className="flex flex-col items-center py-2">
-        <Text textColor="#FFFFFF" className="text-2xl font-medium">
+        <Text textColor="##FFFFFF" className="text-2xl font-medium">
           {name}
         </Text>
-        <Text textColor="#FFFFFF">{dept}</Text>
+        <Text textColor="##FFFFFF">{dept}</Text>
         <Text textColor="#FFFFFF">{role}</Text>
       </Box>
       <Button

From 8a7a10b8daca0db8d901b405a118378c04ef1616 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Fri, 23 Jun 2023 13:52:41 +0800
Subject: [PATCH 207/223] fix bug so that yarn build can work

---
 src/pages/form/updateInfo.tsx                    | 2 +-
 src/pages/recruitment/applicants.tsx             | 2 +-
 src/pages/recruitment/index.tsx                  | 2 +-
 src/server/trpc/router/users/createSingleUser.ts | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/form/updateInfo.tsx b/src/pages/form/updateInfo.tsx
index 8125b2d3..42c6249d 100644
--- a/src/pages/form/updateInfo.tsx
+++ b/src/pages/form/updateInfo.tsx
@@ -102,7 +102,7 @@ const UpdateInfoPage: React.FC<BaseProps> = ({ session }) => {
           content="Onboarding member particulars for Atlas"
         />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar image={session.user?.image as string} isAdmin={session.isAdmin} />
 
       <Container>
         <form onSubmit={handleSubmit(formSubmit)}>
diff --git a/src/pages/recruitment/applicants.tsx b/src/pages/recruitment/applicants.tsx
index ecf7b745..5daf2a55 100644
--- a/src/pages/recruitment/applicants.tsx
+++ b/src/pages/recruitment/applicants.tsx
@@ -22,7 +22,7 @@ const ApplicantsPage: React.FC<BaseProps> = ({
           content="The applicants page for Atlas recruitment"
         />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar image={session.user?.image as string} isAdmin={session.isAdmin} />
       <Box position="relative" mt="10" mb="10">
         <Text className="text-center text-4xl font-bold">Applicants</Text>
         <SearchProvider>
diff --git a/src/pages/recruitment/index.tsx b/src/pages/recruitment/index.tsx
index 0d0ebb83..d83921fc 100644
--- a/src/pages/recruitment/index.tsx
+++ b/src/pages/recruitment/index.tsx
@@ -11,7 +11,7 @@ const RecruitmentPage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The recruitment page for Atlas" />
       </Head>
-      <TopNavbar isAdmin={session.isAdmin} />
+      <TopNavbar image={session.user?.image as string} isAdmin={session.isAdmin} />
       <Text className="text-center text-4xl font-bold">Recruitment</Text>
     </>
   )
diff --git a/src/server/trpc/router/users/createSingleUser.ts b/src/server/trpc/router/users/createSingleUser.ts
index 2facacd4..247171cb 100644
--- a/src/server/trpc/router/users/createSingleUser.ts
+++ b/src/server/trpc/router/users/createSingleUser.ts
@@ -34,7 +34,6 @@ export const createSingleUser = protectedProcedure
           email,
           isAdmin,
           name,
-          id,
           hashedPassword,
           role,
         },

From da34b1a33480b5420c75624f09140754a8bd35a7 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Fri, 23 Jun 2023 16:32:51 +0800
Subject: [PATCH 208/223] Fix some issues after rebase

---
 src/components/recruitment/StatusPopup.tsx | 1 +
 src/pages/application_status/index.tsx     | 3 +--
 src/server/trpc/router/_app.ts             | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/recruitment/StatusPopup.tsx b/src/components/recruitment/StatusPopup.tsx
index d16c77e4..a4c9d6ef 100644
--- a/src/components/recruitment/StatusPopup.tsx
+++ b/src/components/recruitment/StatusPopup.tsx
@@ -23,6 +23,7 @@ import { BsCircleFill } from 'react-icons/bs'
 import { trpc } from '~/utils/trpc'
 import type { Applicant } from '~/server/db/models/Applicant'
 import type { AppliedRole } from '~/server/db/models/AppliedRole'
+import { useState } from 'react'
 
 const statusFillMap = {
   [ApplicationStatus.ACCEPTED]: '#46FFDE',
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index b3254107..be2c71ac 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -1,5 +1,4 @@
 import { useState } from 'react'
-import Head from 'next/head'
 import {
   Button,
   Modal,
@@ -65,7 +64,7 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
         <meta name="description" content="The login page for Atlas" />
       </Head>
       <TopNavbar
-        // image={session.user?.image as string}
+        image={session.user?.image as string}
         isAdmin={session.isAdmin}
       />
       <main>
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index 4e900311..86ddbea5 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -1,9 +1,11 @@
 import { router } from '../trpc'
 import { userRouter } from './users'
 import { attendanceRouter } from './attendance'
+import { recruitmentRouter } from './recruitment'
 
 export const appRouter = router({
   attendance: attendanceRouter,
+  recruitment: recruitmentRouter,
   user: userRouter,
 })
 

From 93aef5929b6aed2db2363980c27568876033e985 Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Fri, 23 Jun 2023 23:56:12 +0800
Subject: [PATCH 209/223] fix scrolling problem

---
 src/components/profile/ProfileInfo.tsx | 20 ----------------
 src/pages/application_status/index.tsx | 32 +++++++++++++-------------
 src/server/trpc/router/_app.ts         |  1 -
 3 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index a99d0565..85e2ca07 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -28,7 +28,6 @@ const ProfileInfo = (props: ProfilePageType) => {
                 {props.batch}
               </Td>
             </Tr>
-<<<<<<< HEAD
             <Tr>
               <Td textColor="#002D70" className="font-medium">
                 YEAR
@@ -53,25 +52,6 @@ const ProfileInfo = (props: ProfilePageType) => {
                 {props.major}
               </Td>
             </Tr>
-            {/* <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                PROJECTS
-              </Td>
-              {props.projects.map((project: Project) => {
-                return (
-                  <Td
-                    key={project.project_id}
-                    textColor="#002D70"
-                    className="font-light"
-                  >
-                    {project.name}
-                  </Td>
-                )
-              })}
-            </Tr> */}
-
-=======
->>>>>>> da34b1a33480b5420c75624f09140754a8bd35a7
           </Tbody>
         </Table>
       </TableContainer>
diff --git a/src/pages/application_status/index.tsx b/src/pages/application_status/index.tsx
index 64adec4f..4d7fd296 100644
--- a/src/pages/application_status/index.tsx
+++ b/src/pages/application_status/index.tsx
@@ -1,7 +1,6 @@
 import { useState } from 'react'
 
 import {
-  Button,
   Modal,
   ModalBody,
   ModalCloseButton,
@@ -43,7 +42,7 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
       id: 1,
       department: 'Software Engineering',
       name: 'Software Engineer',
-      status: 'accepted',
+      status: 'offered',
     },
     {
       id: 2,
@@ -71,7 +70,8 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
         isAdmin={session.isAdmin}
       />
       <main>
-        <div className="relative h-screen w-screen bg-[url('/images/applicants_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
+      <div className="relative bg-scroll w-screen h-screen overflow-x-auto bg-cover bg-no-repeat bg-center bg-fixed bg-[url('/images/applicants_background.svg')]">
+       {/* <div className="relative  bg-scroll h-screen bg-fixed overflow-x bg-[url('/images/applicants_background.svg')] bg-cover  bg-center bg-no-repeat"> */}
           {/* Nav element containing the logo */}
 
           <nav className="flex items-center justify-center  px-2 py-2 ">
@@ -85,33 +85,33 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
 
           {/* Login */}
           <div className="flex flex-col justify-center gap-8 font-[Inter]">
-            <h1 className="mt-4 flex justify-center text-4xl font-bold md:text-8xl">
+            <h1 className="mt-4 flex justify-center text-4xl font-bold lg:text-8xl">
               Hi User,
             </h1>
-            <h2 className="mt-3 flex justify-center text-2xl font-bold md:text-6xl">
+            <h2 className="mt-3 flex justify-center text-2xl font-bold lg:text-6xl">
               your current statuses are:
             </h2>
 
             {roles.map((item) => (
               <div key={item.id} className="mt-3 flex items-center ">
                 <div className="flex-grow">
-                  {item.status == 'accepted' && (
+                  {item.status == 'offered' && (
                     <div className="flex justify-center">
 
-                      <span className="mt-3  flex  text-2xl md:text-4xl">
+                      <span className="mt-3  flex  text-xl lg:text-4xl">
                         {item.department} - {item.name}
                         <Image
                           alt="logo"
                           src={isRejected?
-                            "/images/red_dot.svg": 
-                            "/images/Ellipse 1.svg"}
+                            "/images/red_dot.svg": isAccepted ? 
+                            "images/Ellipse 1.svg" :
+                            "/images/blue_dot.svg"}
                           height={35}
                           width={35}
                           className="md:ml-14 ml-2 flex  flex-col"
                         />
                       </span>
 
-
                       {isAccepted || isRejected ? (
                         <div></div>
                       ) : (
@@ -206,12 +206,12 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                   
                   )}
 
-                  {item.status == 'offered' && (
-                    <h3 className="flex justify-center text-2xl md:text-4xl">
+                  {item.status == 'accepted' && (
+                    <h3 className="flex justify-center text-xl lg:text-4xl">
                         {item.department} - {item.name}
                       <Image
                         alt="logo"
-                        src="/images/blue_dot.svg"
+                        src="/images/Ellipse 1.svg"
                         height={35}
                         width={35}
                         className="ml-14 flex flex-col"
@@ -221,7 +221,7 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                   )}
 
                   {item.status == 'pending_review' && (
-                    <h3 className="justify-centertext-2xl flex md:text-4xl">
+                    <h3 className="justify-centertext-2xl text-xl flex lg:text-4xl">
                         {item.department} - {item.name}
 
                       <Image
@@ -235,7 +235,7 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                     </h3>
                   )}
                   {item.status == 'interviewed' && (
-                    <h3 className="flex justify-center text-2xl md:text-4xl">
+                    <h3 className="flex justify-center text-xl lg:text-4xl">
                        {item.department} - {item.name}
                       <Image
                         alt="logo"
@@ -248,7 +248,7 @@ const Application_Status: React.FC<BaseProps> = ({ session }) => {
                     </h3>
                   )}
                   {item.status == 'rejected' && (
-                    <h3 className="flex justify-center text-2xl md:text-4xl">
+                    <h3 className="flex justify-center text-xl lg:text-4xl">
                      {item.department} - {item.name}
                       <Image
                         alt="logo"
diff --git a/src/server/trpc/router/_app.ts b/src/server/trpc/router/_app.ts
index c7c3cf9e..86ddbea5 100644
--- a/src/server/trpc/router/_app.ts
+++ b/src/server/trpc/router/_app.ts
@@ -1,5 +1,4 @@
 import { router } from '../trpc'
-import { recruitmentRouter } from './recruitment'
 import { userRouter } from './users'
 import { attendanceRouter } from './attendance'
 import { recruitmentRouter } from './recruitment'

From b50ef148c85b07d6ee0fbb7826251e1363b7ef3e Mon Sep 17 00:00:00 2001
From: HAO ZEYU <823549721@qq.com>
Date: Sat, 24 Jun 2023 00:02:11 +0800
Subject: [PATCH 210/223] test

---
 src/pages/tasks/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index b2cae754..91652c24 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -62,7 +62,7 @@ const Tasks: React.FC<BaseProps> = ({ session }) => {
         isAdmin={session.isAdmin}
       />
       <main>
-        <div className="relative h-screen w-screen  bg-[url('/images/tasks_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
+        <div className="relative h-screen w-screen overflow-x-auto bg-[url('/images/tasks_background.svg')] bg-cover bg-fixed bg-center bg-no-repeat">
           {/* Nav element containing the logo */}
 
           {/* Login */}

From fbe0fdeabad2dff733df80c7918208441bb5295c Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Wed, 7 Jun 2023 09:25:56 +0800
Subject: [PATCH 211/223] Rename the file to update-info and fix lint issues

---
 .../form/{updateInfo.tsx => update-info.tsx}    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)
 rename src/pages/form/{updateInfo.tsx => update-info.tsx} (93%)

diff --git a/src/pages/form/updateInfo.tsx b/src/pages/form/update-info.tsx
similarity index 93%
rename from src/pages/form/updateInfo.tsx
rename to src/pages/form/update-info.tsx
index 42c6249d..57a2d398 100644
--- a/src/pages/form/updateInfo.tsx
+++ b/src/pages/form/update-info.tsx
@@ -7,8 +7,8 @@ import {
   Select,
 } from '@chakra-ui/react'
 import { useRouter } from 'next/router'
-import withAuth, { BaseProps } from '~/utils/withAuth'
-import React, { useState, ChangeEvent } from 'react'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
+import React, { useState, type ChangeEvent } from 'react'
 import Head from 'next/head'
 import Container from '~/components/auth/Container'
 import TopNavbar from '~/components/common/TopNavbar'
@@ -22,7 +22,6 @@ const UpdateInfoPage: React.FC<BaseProps> = ({ session }) => {
   const router = useRouter()
   const toast = useToast()
   const [selectedShirtSize, setShirtSize] = useState<string>()
-  const [submitBefore, setSubmitBefore] = useState(false)
 
   const studentId = session?.user?.id as string
 
@@ -49,11 +48,7 @@ const UpdateInfoPage: React.FC<BaseProps> = ({ session }) => {
 
   type FormSchemaType = z.infer<typeof FormSchema>
 
-  const {
-    register,
-    handleSubmit,
-    formState: { errors },
-  } = useForm<FormSchemaType>({
+  const { register, handleSubmit } = useForm<FormSchemaType>({
     resolver: zodResolver(FormSchema),
   })
 
@@ -102,7 +97,10 @@ const UpdateInfoPage: React.FC<BaseProps> = ({ session }) => {
           content="Onboarding member particulars for Atlas"
         />
       </Head>
-      <TopNavbar image={session.user?.image as string} isAdmin={session.isAdmin} />
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
 
       <Container>
         <form onSubmit={handleSubmit(formSubmit)}>
@@ -197,7 +195,6 @@ const UpdateInfoPage: React.FC<BaseProps> = ({ session }) => {
                 className="text-white"
                 type="submit"
                 disabled={isSubmitting}
-                onClick={() => setSubmitBefore(true)}
               >
                 Update
               </Button>

From ade2fcf8714fd4a9f0dba46e302a543238372be5 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sat, 10 Jun 2023 00:26:23 +0800
Subject: [PATCH 212/223] Fix some bugs

---
 src/components/profile/ProfileContactInfo.tsx | 38 +-----------------
 src/pages/api/auth/[...nextauth].ts           |  3 ++
 src/pages/form/update-info.tsx                | 18 +++++----
 src/types/next-auth.d.ts                      |  1 +
 src/utils/withApplicantAuth.tsx               | 39 +++++++++++++++++++
 5 files changed, 54 insertions(+), 45 deletions(-)
 create mode 100644 src/utils/withApplicantAuth.tsx

diff --git a/src/components/profile/ProfileContactInfo.tsx b/src/components/profile/ProfileContactInfo.tsx
index 0e87d8b4..f1b6e846 100644
--- a/src/components/profile/ProfileContactInfo.tsx
+++ b/src/components/profile/ProfileContactInfo.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react'
 import { trpc } from '../../utils/trpc'
 import { type QueryObserverResult } from '@tanstack/react-query'
-import { BsDiscord, BsEnvelopeFill, BsTelegram } from 'react-icons/bs'
+import { BsEnvelopeFill } from 'react-icons/bs'
 import { Box, useToast } from '@chakra-ui/react'
 import { z } from 'zod'
 import { useForm } from 'react-hook-form'
@@ -13,9 +13,6 @@ import { Message } from '~/constant/messages'
 
 const ProfileContactInfo = (props: {
   studentId: string | null
-  // telegram: string | null
-  // discord: string | null
-  // personal_email: string | null
   email: string
   refetch: () => Promise<QueryObserverResult>
 }) => {
@@ -30,9 +27,6 @@ const ProfileContactInfo = (props: {
 
   // Form validation logic
   const preloadedValues = {
-    // telegram: props.telegram ? props.telegram : '',
-    // discord: props.discord ? props.discord : '',
-    // personal_email: props.personal_email ? props.personal_email : '',
     email: props.email ? props.email : '',
   }
 
@@ -98,36 +92,6 @@ const ProfileContactInfo = (props: {
           boxShadow="0px 3px 3px rgba(0, 0, 0, 0.2)"
           className="flex flex-col gap-3 py-6 px-10"
         >
-          {/* <Box className="flex items-center gap-1">
-            <BsTelegram size="20px" className="fill-[#0088cc]" />
-            <DynamicInputField
-              edit={edit}
-              isSubmitting={isSubmitting}
-              register={register}
-              field="telegram"
-              fieldValue={props.telegram}
-            />
-          </Box>
-          <Box className="flex items-center gap-1">
-            <BsDiscord size="20px" className="fill-[#5865F2]" />
-            <DynamicInputField
-              edit={edit}
-              isSubmitting={isSubmitting}
-              register={register}
-              field="discord"
-              fieldValue={props.discord}
-            />
-          </Box> 
-          <Box className="flex items-center gap-1">
-            <BsEnvelopeFill size="20px" className="fill-[#54CCFF]" />
-            <DynamicInputField
-              edit={edit}
-              isSubmitting={isSubmitting}
-              register={register}
-              field="personal_email"
-              fieldValue={props.personal_email}
-            />
-          </Box> */}
           <Box className="flex items-center gap-1">
             <BsEnvelopeFill size="20px" className="fill-[#97AEFF]" />
             <DynamicInputField
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index 3c28cecf..c3572f09 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -20,6 +20,7 @@ export const authOptions: NextAuthOptions = {
 
       if (token) {
         session.isAdmin = token.isAdmin as boolean
+        session.isApplicant = token.isApplicant as boolean
       }
       return session
     },
@@ -28,6 +29,7 @@ export const authOptions: NextAuthOptions = {
       if (user) {
         token.isAdmin = (user as User).isAdmin as boolean
         token.department = (user as User).department as string
+        token.isApplicant = (user as User).role === 'Applicant'
         token.picture = user.image
       }
       return token
@@ -74,6 +76,7 @@ export const authOptions: NextAuthOptions = {
             department: user.department as string,
             name: user.name,
             email: user.email,
+            isApplicant: user.role === 'ROLE',
             isAdmin: user.isAdmin,
             image: user.image || '',
           }
diff --git a/src/pages/form/update-info.tsx b/src/pages/form/update-info.tsx
index 57a2d398..d24cbe7a 100644
--- a/src/pages/form/update-info.tsx
+++ b/src/pages/form/update-info.tsx
@@ -7,7 +7,6 @@ import {
   Select,
 } from '@chakra-ui/react'
 import { useRouter } from 'next/router'
-import withAuth, { type BaseProps } from '~/utils/withAuth'
 import React, { useState, type ChangeEvent } from 'react'
 import Head from 'next/head'
 import Container from '~/components/auth/Container'
@@ -17,6 +16,7 @@ import { trpc } from '~/utils/trpc'
 import { useForm } from 'react-hook-form'
 import { z } from 'zod'
 import { zodResolver } from '@hookform/resolvers/zod'
+import withApplicantAuth, { type BaseProps } from '~/utils/withApplicantAuth'
 
 const UpdateInfoPage: React.FC<BaseProps> = ({ session }) => {
   const router = useRouter()
@@ -56,15 +56,17 @@ const UpdateInfoPage: React.FC<BaseProps> = ({ session }) => {
     trpc.user.updateUserInfo.useMutation()
 
   const formSubmit = async (formData: FormSchemaType) => {
+    const { telegram, shirtSize, linkedin, discord, dietary } = formData
+
     try {
       await mutateAsync({
         //toDO: add json attributes
-        studentId: studentId,
-        telegram: formData.telegram,
-        shirtSize: formData.shirtSize,
-        linkedin: formData.linkedin,
-        discord: formData.discord,
-        dietary: formData.dietary,
+        studentId,
+        telegram,
+        shirtSize,
+        linkedin,
+        discord,
+        dietary,
       })
       toast({
         duration: 3000,
@@ -206,4 +208,4 @@ const UpdateInfoPage: React.FC<BaseProps> = ({ session }) => {
   )
 }
 
-export default withAuth(UpdateInfoPage)
+export default withApplicantAuth(UpdateInfoPage)
diff --git a/src/types/next-auth.d.ts b/src/types/next-auth.d.ts
index 27201997..b3f562e9 100644
--- a/src/types/next-auth.d.ts
+++ b/src/types/next-auth.d.ts
@@ -6,6 +6,7 @@ declare module 'next-auth' {
    */
   interface Session {
     isAdmin: boolean
+    isApplicant: boolean
     level?: string
     user?: {
       level?: string
diff --git a/src/utils/withApplicantAuth.tsx b/src/utils/withApplicantAuth.tsx
new file mode 100644
index 00000000..e69ec1ba
--- /dev/null
+++ b/src/utils/withApplicantAuth.tsx
@@ -0,0 +1,39 @@
+/* eslint-disable */
+import { useSession } from 'next-auth/react'
+import { useEffect } from 'react'
+import LoadingScreen from '~/components/common/LoadingScreen'
+import { useRouter } from 'next/router'
+import { type Session } from 'next-auth'
+
+/**
+ * withApplicantAuth is a wrapper method that ensures that the applicants
+ * are only routed to specific pages.
+ *
+ * @param WrappedComponent The Next Page
+ */
+const withApplicantAuth = (WrappedComponent: any) => {
+  const Wrapper = (props: any) => {
+    const { data: session, status } = useSession({ required: true })
+    const router = useRouter()
+
+    useEffect(() => {
+        // If the user is logged in and no longer an applicant, we can just push him to the home page.
+        if (session && !session.isApplicant) {
+        router.push('/')
+      }
+    }, [router, status, session])
+
+    if (status === 'loading') {
+      return <LoadingScreen />
+    }
+
+    return <WrappedComponent {...props} session={session} />
+  }
+  return Wrapper
+}
+
+export interface BaseProps {
+  session: Session
+}
+
+export default withApplicantAuth

From b44d69e4dfbc8240e126c91baa5277d61db2d9e3 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sun, 11 Jun 2023 12:48:42 +0800
Subject: [PATCH 213/223] Fix the routing for applicants

---
 src/pages/api/auth/[...nextauth].ts | 4 ++--
 src/utils/withAuth.tsx              | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index c3572f09..c6b3c834 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -29,7 +29,7 @@ export const authOptions: NextAuthOptions = {
       if (user) {
         token.isAdmin = (user as User).isAdmin as boolean
         token.department = (user as User).department as string
-        token.isApplicant = (user as User).role === 'Applicant'
+        token.isApplicant = (user as any).isApplicant
         token.picture = user.image
       }
       return token
@@ -76,7 +76,7 @@ export const authOptions: NextAuthOptions = {
             department: user.department as string,
             name: user.name,
             email: user.email,
-            isApplicant: user.role === 'ROLE',
+            isApplicant: user.role === 'Applicant',
             isAdmin: user.isAdmin,
             image: user.image || '',
           }
diff --git a/src/utils/withAuth.tsx b/src/utils/withAuth.tsx
index 9d1b5aae..39aaa6e7 100644
--- a/src/utils/withAuth.tsx
+++ b/src/utils/withAuth.tsx
@@ -22,8 +22,12 @@ const withAuth = (WrappedComponent: any, isAdminRightsNeeded?: boolean) => {
     const router = useRouter()
 
     useEffect(() => {
-      if (isAdminRightsNeeded && session && !session.isAdmin) {
-        router.push('/')
+      if (session) {
+        if (session.isApplicant) {
+          router.push('/form/update-info')
+        } else if (isAdminRightsNeeded && !session.isAdmin) {
+          router.push('/')
+        }
       }
     }, [router, status, session])
 

From ba09cfd00319f9b2044c3b64950c7a39d78838e3 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sun, 11 Jun 2023 13:30:57 +0800
Subject: [PATCH 214/223] Remove duplicate file

---
 .../trpc/router/users/createManyUsers 2.ts    | 67 -------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 src/server/trpc/router/users/createManyUsers 2.ts

diff --git a/src/server/trpc/router/users/createManyUsers 2.ts b/src/server/trpc/router/users/createManyUsers 2.ts
deleted file mode 100644
index 44a6649b..00000000
--- a/src/server/trpc/router/users/createManyUsers 2.ts	
+++ /dev/null
@@ -1,67 +0,0 @@
-import { protectedProcedure } from '../../trpc'
-import { z } from 'zod'
-import { randomBytes } from 'crypto'
-import { hash } from 'bcryptjs'
-
-import { sendMultipleEmails } from '../util/helper'
-import { type WriteBatch, doc, writeBatch } from 'firebase/firestore'
-import { db } from '~/server/db/firebase'
-import type { User } from '~/server/db/models/User'
-import logCollection from '~/server/db/collections/LogCollection'
-import { Timestamp } from 'firebase/firestore'
-
-export const createManyUsers = protectedProcedure
-  .input(
-    z.array(
-      z.object({
-        department: z.string(),
-        name: z.string(),
-        nus_email: z.string(),
-        role: z.string(),
-        student_id: z.string(),
-      })
-    )
-  )
-  .mutation(async ({ input }) => {
-    try {
-      const password = randomBytes(10).toString('hex')
-      const hashedPassword = await hash(password, 10)
-      const emails: string[] = []
-
-      // Add user logic. Note that each firebase batch only allow up to 500 writes so we need an array for more than 500 users.
-      let batchIndex = 0
-      let counter = 0
-      const batches: WriteBatch[] = [writeBatch(db)]
-      input.forEach((user) => {
-        emails.push(user.nus_email)
-
-        batches[batchIndex]?.set(doc(db, 'users', user.student_id), {
-          department: user.department,
-          email: user.nus_email,
-          hashedPassword,
-          name: user.name,
-          isAdmin: false,
-          id: user.student_id,
-          role: user.role,
-        } as User)
-
-        counter += 1
-
-        if (counter === 499) {
-          batches.push(writeBatch(db))
-          batchIndex += 1
-          counter = 0
-        }
-      })
-
-      await Promise.all(batches.map(async (batch) => await batch.commit()))
-      await sendMultipleEmails(emails, password)
-    } catch (e) {
-      await logCollection.add({
-        createdAt: Timestamp.fromDate(new Date()),
-        level: 'WARNING',
-        description: (e as Error).message,
-        title: 'Error while uploading multiple users',
-      })
-    }
-  })

From 7c677580b23531f1174c9a097bdc0a1a3cfc0fce Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sun, 11 Jun 2023 22:37:35 +0800
Subject: [PATCH 215/223] Update the User box

---
 src/components/profile/DynamicInputField.tsx  |   3 +-
 src/components/profile/EditProfileButton.tsx  |   1 -
 src/components/profile/ProfileContactInfo.tsx | 179 ++++++++++++------
 src/components/profile/ProfileGrid.tsx        |  15 +-
 src/components/profile/ProfileInfo.tsx        |  16 +-
 src/pages/profile/index.tsx                   |   2 +-
 .../trpc/router/users/updateUserContacts.ts   |  26 ++-
 7 files changed, 156 insertions(+), 86 deletions(-)

diff --git a/src/components/profile/DynamicInputField.tsx b/src/components/profile/DynamicInputField.tsx
index 417449a8..520b7951 100644
--- a/src/components/profile/DynamicInputField.tsx
+++ b/src/components/profile/DynamicInputField.tsx
@@ -1,4 +1,5 @@
 import { Input, Text } from '@chakra-ui/react'
+import type { UseFormRegister } from 'react-hook-form'
 
 const DynamicInputField = ({
   edit,
@@ -9,7 +10,7 @@ const DynamicInputField = ({
 }: {
   edit: boolean
   isSubmitting: boolean
-  register: any
+  register: UseFormRegister<any>
   field: string
   fieldValue: string | null
 }) => {
diff --git a/src/components/profile/EditProfileButton.tsx b/src/components/profile/EditProfileButton.tsx
index 5e1ceda8..6bb7e5bd 100644
--- a/src/components/profile/EditProfileButton.tsx
+++ b/src/components/profile/EditProfileButton.tsx
@@ -6,7 +6,6 @@ const EditProfileBtn = ({
   onEdit,
   edit,
 }: {
-  studentId: string | null
   onEdit: () => void
   edit: boolean
 }) => {
diff --git a/src/components/profile/ProfileContactInfo.tsx b/src/components/profile/ProfileContactInfo.tsx
index f1b6e846..c98038c8 100644
--- a/src/components/profile/ProfileContactInfo.tsx
+++ b/src/components/profile/ProfileContactInfo.tsx
@@ -1,7 +1,14 @@
-import { useState } from 'react'
+import { useState, useCallback } from 'react'
 import { trpc } from '../../utils/trpc'
 import { type QueryObserverResult } from '@tanstack/react-query'
-import { BsEnvelopeFill } from 'react-icons/bs'
+import {
+  BsEnvelopeFill,
+  BsTelegram,
+  BsDiscord,
+  BsLinkedin,
+} from 'react-icons/bs'
+import { FaTshirt } from 'react-icons/fa'
+import { MdFastfood } from 'react-icons/md'
 import { Box, useToast } from '@chakra-ui/react'
 import { z } from 'zod'
 import { useForm } from 'react-hook-form'
@@ -10,10 +17,22 @@ import EditProfileBtn from './EditProfileButton'
 import SubmitEditBtn from './SubmitEditButton'
 import DynamicInputField from './DynamicInputField'
 import { Message } from '~/constant/messages'
+import type { User } from '~/server/db/models/User'
+
+const FormSchema = z.object({
+  discord: z.string(),
+  dietary: z.string(),
+  email: z.string().email(),
+  linkedin: z.string(),
+  telegram: z.string(),
+  shirtSize: z.string(),
+})
+
+type FormSchemaType = z.infer<typeof FormSchema>
 
 const ProfileContactInfo = (props: {
   studentId: string | null
-  email: string
+  user: User
   refetch: () => Promise<QueryObserverResult>
 }) => {
   const toast = useToast()
@@ -21,70 +40,65 @@ const ProfileContactInfo = (props: {
     trpc.user.updateUserContacts.useMutation()
 
   const [edit, setEdit] = useState(false)
-  const onEdit = () => {
-    setEdit(!edit)
-  }
-
-  // Form validation logic
-  const preloadedValues = {
-    email: props.email ? props.email : '',
-  }
-
-  const FormSchema = z.object({
-    telegram: z.string(),
-    discord: z.string(),
-    personal_email: z.string().email(),
-    email: z.string().email(),
-  })
-
-  type FormSchemaType = z.infer<typeof FormSchema>
+  const onEdit = useCallback(() => setEdit(!edit), [edit])
 
   const { register, handleSubmit } = useForm<FormSchemaType>({
     resolver: zodResolver(FormSchema),
-    defaultValues: preloadedValues,
+    defaultValues: {
+      discord: props.user.discord || '',
+      dietary: props.user.dietary || '',
+      email: props.user.email || '',
+      linkedin: props.user.linkedin || '',
+      shirtSize: props.user.shirtSize || '',
+      telegram: props.user.telegram || '',
+    },
   })
 
-  const formSubmit = async (formData: FormSchemaType) => {
-    try {
-      if (props.studentId) {
-        await mutateAsync({
-          studentId: props.studentId,
-          telegram: formData.telegram,
-          discord: formData.discord,
-          personal_email: formData.personal_email,
-          email: formData.email,
-        })
+  const formSubmit = useCallback(
+    async (formData: FormSchemaType) => {
+      try {
+        if (props.studentId) {
+          toast({
+            duration: 3000,
+            status: 'loading',
+            title: 'Loading',
+            description: Message.PERSONAL_INFO_LOADING,
+          })
 
-        toast({
-          duration: 3000,
-          status: 'loading',
-          title: 'Loading',
-          description: Message.PERSONAL_INFO_LOADING,
-        })
+          await mutateAsync({
+            dietary: formData.dietary,
+            discord: formData.discord,
+            email: formData.email,
+            linkedin: formData.linkedin,
+            shirtSize: formData.shirtSize,
+            telegram: formData.telegram,
+          })
 
-        await props.refetch()
-        setEdit(false)
+          await props.refetch()
+          setEdit(false)
 
+          toast({
+            duration: 3000,
+            status: 'success',
+            title: 'Success',
+            description: Message.PERSONAL_INFO_SUCCESS,
+          })
+        }
+      } catch (e) {
         toast({
           duration: 3000,
-          status: 'success',
-          title: 'Success',
-          description: Message.PERSONAL_INFO_SUCCESS,
+          status: 'error',
+          title: 'Oops, an error occured!',
+          description: (e as Error).message,
         })
       }
-    } catch (e) {
-      toast({
-        duration: 3000,
-        status: 'error',
-        title: 'Oops, an error occured!',
-        description: Message.PERSONAL_INFO_ERROR,
-      })
-    }
-  }
+    },
+    [mutateAsync, props, toast]
+  )
 
   return (
-    <Box className="relative">
-      <EditProfileBtn studentId={props.studentId} onEdit={onEdit} edit={edit} />
+    <div className="relative">
+      <EditProfileBtn onEdit={onEdit} edit={edit} />
       <form onSubmit={handleSubmit(formSubmit)}>
         <Box
           backgroundColor="#F7FCFF"
@@ -99,13 +113,68 @@ const ProfileContactInfo = (props: {
               isSubmitting={isSubmitting}
               register={register}
               field="email"
-              fieldValue={props.email}
+              fieldValue={props.user.email}
+            />
+          </Box>
+
+          <Box className="flex items-center gap-1">
+            <MdFastfood size="20px" className="fill-[#97AEFF]" />
+            <DynamicInputField
+              edit={edit}
+              isSubmitting={isSubmitting}
+              register={register}
+              field="dietary"
+              fieldValue={props.user.dietary as string}
+            />
+          </Box>
+
+          <Box className="flex items-center gap-1">
+            <BsTelegram size="20px" className="fill-[#97AEFF]" />
+            <DynamicInputField
+              edit={edit}
+              isSubmitting={isSubmitting}
+              register={register}
+              field="telegram"
+              fieldValue={props.user.telegram as string}
+            />
+          </Box>
+
+          <Box className="flex items-center gap-1">
+            <BsDiscord size="20px" className="fill-[#97AEFF]" />
+            <DynamicInputField
+              edit={edit}
+              isSubmitting={isSubmitting}
+              register={register}
+              field="discord"
+              fieldValue={props.user.discord as string}
+            />
+          </Box>
+
+          <Box className="flex items-center gap-1">
+            <BsLinkedin size="20px" className="fill-[#97AEFF]" />
+            <DynamicInputField
+              edit={edit}
+              isSubmitting={isSubmitting}
+              register={register}
+              field="linkedin"
+              fieldValue={props.user.linkedin as string}
+            />
+          </Box>
+
+          <Box className="flex items-center gap-1">
+            <FaTshirt size="20px" className="fill-[#97AEFF]" />
+            <DynamicInputField
+              edit={edit}
+              isSubmitting={isSubmitting}
+              register={register}
+              field="shirtSize"
+              fieldValue={props.user.shirtSize as string}
             />
           </Box>
         </Box>
         {edit && <SubmitEditBtn />}
       </form>
-    </Box>
+    </div>
   )
 }
 
diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index 260518e2..08becf72 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -1,17 +1,9 @@
 import { trpc } from '../../utils/trpc'
-import type { Session } from 'next-auth'
 import LoadingScreen from '../common/LoadingScreen'
 import ProfileCard from './ProfileCard'
-import ProfileInfo from './ProfileInfo'
 import ProfileContactInfo from './ProfileContactInfo'
 
-const ProfileGrid = ({
-  studentId,
-  session,
-}: {
-  studentId: string
-  session: Session
-}) => {
+const ProfileGrid = ({ studentId }: { studentId: string }) => {
   const { data, isError, isLoading, refetch } =
     trpc.user.getUserProfile.useQuery(studentId)
 
@@ -35,10 +27,7 @@ const ProfileGrid = ({
         />
       </div>
       <div className="col-span-2 w-3/4">
-        <ProfileContactInfo studentId={studentId} {...data} refetch={refetch} />
-      </div>
-      <div className="col-span-2 row-span-2 mb-10 w-3/4">
-        {/* <ProfileInfo {...data} /> */}
+        <ProfileContactInfo studentId={studentId} user={data} refetch={refetch} />
       </div>
     </div>
   )
diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
index 85e2ca07..d9563332 100644
--- a/src/components/profile/ProfileInfo.tsx
+++ b/src/components/profile/ProfileInfo.tsx
@@ -1,15 +1,7 @@
 import { Box, Table, TableContainer, Tbody, Td, Tr } from '@chakra-ui/react'
+import type { User } from '~/server/db/models/User'
 
-type ProfilePageType = {
-  gender: string | null
-  batch: string | null
-  year: string | null
-  faculty: string | null
-  major: string | null
-
-}
-
-const ProfileInfo = (props: ProfilePageType) => {
+const ProfileInfo = (props: User) => {
   return (
     <Box
       backgroundColor="rgba(242, 235, 255, 0.58)"
@@ -22,10 +14,10 @@ const ProfileInfo = (props: ProfilePageType) => {
           <Tbody>
             <Tr>
               <Td textColor="#002D70" className="font-medium">
-                BATCH
+                Dietary
               </Td>
               <Td textColor="#002D70" className="font-light">
-                {props.batch}
+                {props.dietary}
               </Td>
             </Tr>
             <Tr>
diff --git a/src/pages/profile/index.tsx b/src/pages/profile/index.tsx
index f44b937c..328607a2 100644
--- a/src/pages/profile/index.tsx
+++ b/src/pages/profile/index.tsx
@@ -20,7 +20,7 @@ const ProfilePage: React.FC<BaseProps> = ({ session }) => {
       <Text className="m-8 text-center text-3xl font-semibold underline underline-offset-8">
         Profile
       </Text>
-      <ProfileGrid session={session} studentId={session?.user?.id as string} />
+      <ProfileGrid studentId={session?.user?.id as string} />
     </Box>
   )
 }
diff --git a/src/server/trpc/router/users/updateUserContacts.ts b/src/server/trpc/router/users/updateUserContacts.ts
index 8ab98214..34109391 100644
--- a/src/server/trpc/router/users/updateUserContacts.ts
+++ b/src/server/trpc/router/users/updateUserContacts.ts
@@ -1,19 +1,39 @@
+import { where } from 'firebase/firestore'
 import { protectedProcedure } from '../../trpc'
 import { z } from 'zod'
 import userCollection from '~/server/db/collections/UserCollection'
+import { TRPCError } from '@trpc/server'
+import type { User } from '~/server/db/models/User'
 
 export const updateUserContacts = protectedProcedure
   .input(
     z.object({
-      studentId: z.string(),
-      telegram: z.string(),
+      dietary: z.string(),
       discord: z.string(),
-      personal_email: z.string(),
       email: z.string(),
+      linkedin: z.string(),
+      shirtSize: z.string(),
+      telegram: z.string(),
     })
   )
   .mutation(async ({ ctx, input }) => {
+    // Need to check whether the email exist because we are using it to login.
+    const users = await userCollection.queries([
+      where('email', '==', input.email),
+    ])
+
+    if (users.length && (users[0] as User).id !== ctx.session.user.id) {
+      throw new TRPCError({
+        code: 'CONFLICT',
+        message: 'Email already exists!',
+      })
+    }
+
     return await userCollection.update(ctx.session.user.id, {
+      dietary: input.dietary || '',
+      discord: input.discord || '',
       email: input.email,
+      linkedin: input.linkedin || '',
+      telegram: input.telegram || '',
     })
   })

From c5f3d5763370bde35cca432ec6e89c5c0296f1e9 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sun, 11 Jun 2023 22:59:14 +0800
Subject: [PATCH 216/223] Fix the reset-password page

---
 src/components/profile/ProfileCard.tsx        |  4 +-
 src/components/profile/ProfileContactInfo.tsx | 42 +++++++------------
 src/components/profile/ProfileGrid.tsx        |  4 +-
 .../reset-password.tsx}                       |  0
 4 files changed, 20 insertions(+), 30 deletions(-)
 rename src/pages/{preferences.tsx => profile/reset-password.tsx} (100%)

diff --git a/src/components/profile/ProfileCard.tsx b/src/components/profile/ProfileCard.tsx
index 5d87535a..094a34bb 100644
--- a/src/components/profile/ProfileCard.tsx
+++ b/src/components/profile/ProfileCard.tsx
@@ -20,7 +20,7 @@ const ProfileCard = ({
   session: Session
 }) => {
   const router = useRouter()
-  const redirectToResetPassword = () => router.push('/auth/forgetpassword')
+  const redirectToResetPassword = () => router.push('/profile/reset-password')
 
   const {
     isLoading,
@@ -29,7 +29,7 @@ const ProfileCard = ({
   } = trpc.user.getUserImage.useQuery(studentId)
 
   return (
-    <Box className="mb-10 flex flex-col items-center">
+    <Box className="my-5 flex flex-col items-center">
       <Box className="relative">
         <Image
           alt="profile-pic"
diff --git a/src/components/profile/ProfileContactInfo.tsx b/src/components/profile/ProfileContactInfo.tsx
index c98038c8..789a6092 100644
--- a/src/components/profile/ProfileContactInfo.tsx
+++ b/src/components/profile/ProfileContactInfo.tsx
@@ -31,7 +31,6 @@ const FormSchema = z.object({
 type FormSchemaType = z.infer<typeof FormSchema>
 
 const ProfileContactInfo = (props: {
-  studentId: string | null
   user: User
   refetch: () => Promise<QueryObserverResult>
 }) => {
@@ -57,33 +56,24 @@ const ProfileContactInfo = (props: {
   const formSubmit = useCallback(
     async (formData: FormSchemaType) => {
       try {
-        if (props.studentId) {
-          toast({
-            duration: 3000,
-            status: 'loading',
-            title: 'Loading',
-            description: Message.PERSONAL_INFO_LOADING,
-          })
-
-          await mutateAsync({
-            dietary: formData.dietary,
-            discord: formData.discord,
-            email: formData.email,
-            linkedin: formData.linkedin,
-            shirtSize: formData.shirtSize,
-            telegram: formData.telegram,
-          })
+        await mutateAsync({
+          dietary: formData.dietary,
+          discord: formData.discord,
+          email: formData.email,
+          linkedin: formData.linkedin,
+          shirtSize: formData.shirtSize,
+          telegram: formData.telegram,
+        })
 
-          await props.refetch()
-          setEdit(false)
+        await props.refetch()
+        setEdit(false)
 
-          toast({
-            duration: 3000,
-            status: 'success',
-            title: 'Success',
-            description: Message.PERSONAL_INFO_SUCCESS,
-          })
-        }
+        toast({
+          duration: 3000,
+          status: 'success',
+          title: 'Success',
+          description: Message.PERSONAL_INFO_SUCCESS,
+        })
       } catch (e) {
         toast({
           duration: 3000,
diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index 08becf72..459bcd76 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -17,7 +17,7 @@ const ProfileGrid = ({ studentId }: { studentId: string }) => {
 
   return (
     <div className="m-10 grid grid-cols-1 grid-rows-3 place-items-center gap-y-6 md:grid-cols-3">
-      <div className="row-span-3 h-full w-3/4 max-w-md bg-[#01003D] md:place-self-end">
+      <div className="row-span-3 h-full w-3/4 max-w-md rounded-3xl bg-[#01003D] md:place-self-end">
         <ProfileCard
           name={data.name}
           dept={data.department}
@@ -27,7 +27,7 @@ const ProfileGrid = ({ studentId }: { studentId: string }) => {
         />
       </div>
       <div className="col-span-2 w-3/4">
-        <ProfileContactInfo studentId={studentId} user={data} refetch={refetch} />
+        <ProfileContactInfo user={data} refetch={refetch} />
       </div>
     </div>
   )
diff --git a/src/pages/preferences.tsx b/src/pages/profile/reset-password.tsx
similarity index 100%
rename from src/pages/preferences.tsx
rename to src/pages/profile/reset-password.tsx

From 0451f5318154c79eac45486e3e5539e17da92297 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sun, 18 Jun 2023 19:21:06 +0800
Subject: [PATCH 217/223] Fix the alignment issue

---
 src/components/profile/ProfileGrid.tsx |  6 +--
 src/components/profile/ProfileInfo.tsx | 54 --------------------------
 2 files changed, 3 insertions(+), 57 deletions(-)
 delete mode 100644 src/components/profile/ProfileInfo.tsx

diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index 459bcd76..d13fa525 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -16,8 +16,8 @@ const ProfileGrid = ({ studentId }: { studentId: string }) => {
   }
 
   return (
-    <div className="m-10 grid grid-cols-1 grid-rows-3 place-items-center gap-y-6 md:grid-cols-3">
-      <div className="row-span-3 h-full w-3/4 max-w-md rounded-3xl bg-[#01003D] md:place-self-end">
+    <div className="flex flex-col items-center md:items-start md:flex-row md:justify-evenly">
+      <div className="mb-5 w-3/4 max-w-xs rounded-3xl bg-[#01003D]">
         <ProfileCard
           name={data.name}
           dept={data.department}
@@ -26,7 +26,7 @@ const ProfileGrid = ({ studentId }: { studentId: string }) => {
           session={session}
         />
       </div>
-      <div className="col-span-2 w-3/4">
+      <div className="h-full w-3/4 max-w-xs justify-center md:max-w-xl">
         <ProfileContactInfo user={data} refetch={refetch} />
       </div>
     </div>
diff --git a/src/components/profile/ProfileInfo.tsx b/src/components/profile/ProfileInfo.tsx
deleted file mode 100644
index d9563332..00000000
--- a/src/components/profile/ProfileInfo.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Box, Table, TableContainer, Tbody, Td, Tr } from '@chakra-ui/react'
-import type { User } from '~/server/db/models/User'
-
-const ProfileInfo = (props: User) => {
-  return (
-    <Box
-      backgroundColor="rgba(242, 235, 255, 0.58)"
-      borderRadius="55px"
-      padding={10}
-      className="h-full"
-    >
-      <TableContainer>
-        <Table variant="unstyled" size="sm">
-          <Tbody>
-            <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                Dietary
-              </Td>
-              <Td textColor="#002D70" className="font-light">
-                {props.dietary}
-              </Td>
-            </Tr>
-            <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                YEAR
-              </Td>
-              <Td textColor="#002D70" className="font-light">
-                {props.year}
-              </Td>
-            </Tr>
-            <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                FACULTY
-              </Td>
-              <Td textColor="#002D70" className="font-light">
-                {props.faculty}
-              </Td>
-            </Tr>
-            <Tr>
-              <Td textColor="#002D70" className="font-medium">
-                MAJOR
-              </Td>
-              <Td textColor="#002D70" className="font-light">
-                {props.major}
-              </Td>
-            </Tr>
-          </Tbody>
-        </Table>
-      </TableContainer>
-    </Box>
-  )
-}
-
-export default ProfileInfo

From e6444d4b9fd7f1e816936b4c438ad1fb12eb7058 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sat, 24 Jun 2023 17:20:09 +0800
Subject: [PATCH 218/223] Fix issue

---
 src/components/profile/ProfileCard.tsx | 18 +++++++-----------
 src/components/profile/ProfileGrid.tsx |  3 +--
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/components/profile/ProfileCard.tsx b/src/components/profile/ProfileCard.tsx
index 094a34bb..8d6809a7 100644
--- a/src/components/profile/ProfileCard.tsx
+++ b/src/components/profile/ProfileCard.tsx
@@ -1,6 +1,5 @@
 import { trpc } from '../../utils/trpc'
 import { Box, Button, Image, Text } from '@chakra-ui/react'
-import type { Session } from 'next-auth'
 import { useRouter } from 'next/router'
 import UploadImageBtn from './UploadImageButton'
 
@@ -11,13 +10,11 @@ const ProfileCard = ({
   dept,
   role,
   studentId,
-  session,
 }: {
   name: string | null
   dept: string | null
   role: string | null
   studentId: string
-  session: Session
 }) => {
   const router = useRouter()
   const redirectToResetPassword = () => router.push('/profile/reset-password')
@@ -39,17 +36,16 @@ const ProfileCard = ({
           borderRadius="full"
           boxSize="170px"
         />
-        {session?.user?.id === studentId ?? (
-          <Box className="absolute bottom-0 right-0">
-            <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
-          </Box>
-        )}
+
+        <Box className="absolute bottom-0 right-0">
+          <UploadImageBtn refetchImage={refetchImage} studentId={studentId} />
+        </Box>
       </Box>
       <Box className="flex flex-col items-center py-2">
-        <Text textColor="##FFFFFF" className="text-2xl font-medium">
+        <Text textColor="#FFFFFF" className="text-2xl font-medium">
           {name}
         </Text>
-        <Text textColor="##FFFFFF">{dept}</Text>
+        <Text textColor="#FFFFFF">{dept}</Text>
         <Text textColor="#FFFFFF">{role}</Text>
       </Box>
       <Button
@@ -67,4 +63,4 @@ const ProfileCard = ({
   )
 }
 
-export default ProfileCard
+export default ProfileCard
\ No newline at end of file
diff --git a/src/components/profile/ProfileGrid.tsx b/src/components/profile/ProfileGrid.tsx
index d13fa525..8094d8b5 100644
--- a/src/components/profile/ProfileGrid.tsx
+++ b/src/components/profile/ProfileGrid.tsx
@@ -23,7 +23,6 @@ const ProfileGrid = ({ studentId }: { studentId: string }) => {
           dept={data.department}
           role={data.role}
           studentId={studentId}
-          session={session}
         />
       </div>
       <div className="h-full w-3/4 max-w-xs justify-center md:max-w-xl">
@@ -33,4 +32,4 @@ const ProfileGrid = ({ studentId }: { studentId: string }) => {
   )
 }
 
-export default ProfileGrid
+export default ProfileGrid
\ No newline at end of file

From 77cda1b2356778cafe560e708aecd8b378ab255b Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sat, 24 Jun 2023 17:21:23 +0800
Subject: [PATCH 219/223] Shift the update-info to recruitment

---
 src/pages/form/update-info.tsx | 211 ---------------------------------
 1 file changed, 211 deletions(-)
 delete mode 100644 src/pages/form/update-info.tsx

diff --git a/src/pages/form/update-info.tsx b/src/pages/form/update-info.tsx
deleted file mode 100644
index d24cbe7a..00000000
--- a/src/pages/form/update-info.tsx
+++ /dev/null
@@ -1,211 +0,0 @@
-import {
-  Input,
-  FormLabel,
-  VStack,
-  useToast,
-  Button,
-  Select,
-} from '@chakra-ui/react'
-import { useRouter } from 'next/router'
-import React, { useState, type ChangeEvent } from 'react'
-import Head from 'next/head'
-import Container from '~/components/auth/Container'
-import TopNavbar from '~/components/common/TopNavbar'
-import UploadImage from '~/components/profile/UploadImage'
-import { trpc } from '~/utils/trpc'
-import { useForm } from 'react-hook-form'
-import { z } from 'zod'
-import { zodResolver } from '@hookform/resolvers/zod'
-import withApplicantAuth, { type BaseProps } from '~/utils/withApplicantAuth'
-
-const UpdateInfoPage: React.FC<BaseProps> = ({ session }) => {
-  const router = useRouter()
-  const toast = useToast()
-  const [selectedShirtSize, setShirtSize] = useState<string>()
-
-  const studentId = session?.user?.id as string
-
-  const options = [
-    { value: 'xs', label: 'XS' },
-    { value: 's', label: 'S' },
-    { value: 'm', label: 'M' },
-    { value: 'l', label: 'L' },
-    { value: 'xl', label: 'XL' },
-  ]
-
-  const handleSelectChange = (event: ChangeEvent<HTMLSelectElement>) => {
-    setShirtSize(event.target.value) // Update the selected value in the state
-  }
-
-  //Form Data Integrity
-  const FormSchema = z.object({
-    telegram: z.string().min(1, { message: 'Invalid name' }),
-    linkedin: z.string().min(1, { message: 'Invalid url' }),
-    shirtSize: z.string().min(1, { message: 'Invalid size' }),
-    dietary: z.string().min(1, { message: 'Invalid dietary requirement' }),
-    discord: z.string().min(1, { message: 'Invalid ID' }),
-  })
-
-  type FormSchemaType = z.infer<typeof FormSchema>
-
-  const { register, handleSubmit } = useForm<FormSchemaType>({
-    resolver: zodResolver(FormSchema),
-  })
-
-  const { mutateAsync, isLoading: isSubmitting } =
-    trpc.user.updateUserInfo.useMutation()
-
-  const formSubmit = async (formData: FormSchemaType) => {
-    const { telegram, shirtSize, linkedin, discord, dietary } = formData
-
-    try {
-      await mutateAsync({
-        //toDO: add json attributes
-        studentId,
-        telegram,
-        shirtSize,
-        linkedin,
-        discord,
-        dietary,
-      })
-      toast({
-        duration: 3000,
-        status: 'success',
-        title: 'Success',
-        description: 'User profile has been successfully updated',
-      })
-
-      redirectHome()
-    } catch (e) {
-      toast({
-        description: (e as Error).message,
-        duration: 3000,
-        status: 'error',
-        title: 'Oops, an error occured!',
-      })
-    }
-  }
-
-  //toDO: Route to applicant status page created by Zeyu
-  const redirectHome = () => router.push('/events')
-
-  return (
-    <>
-      <Head>
-        <title>Update Member Information</title>
-        <link rel="icon" href="/favicon.ico" />
-        <meta
-          name="description"
-          content="Onboarding member particulars for Atlas"
-        />
-      </Head>
-      <TopNavbar
-        isAdmin={session.isAdmin}
-        image={session.user?.image as string}
-      />
-
-      <Container>
-        <form onSubmit={handleSubmit(formSubmit)}>
-          <h1 className="mb-10 text-center text-2xl font-bold">
-            Update Member Particulars
-          </h1>
-
-          <div className="justify-center">
-            <UploadImage
-              session={session}
-              studentId={session?.user?.id as string}
-            />
-          </div>
-
-          <VStack align="left">
-            <div>
-              <FormLabel>Fintech Society Shirt Size</FormLabel>
-            </div>
-
-            <div className="flex justify-center">
-              <Select
-                {...register('shirtSize', { required: true })}
-                value={selectedShirtSize}
-                onChange={handleSelectChange}
-              >
-                <option value="">Select Shirt Size</option>
-                {options.map((option) => (
-                  <option key={option.value} value={option.value}>
-                    {option.label}
-                  </option>
-                ))}
-              </Select>
-            </div>
-            <br />
-            <div>
-              <FormLabel> Telegram Handle</FormLabel>
-              <Input
-                type="text"
-                disabled={isSubmitting}
-                {...register('telegram', { required: true })}
-                placeholder="Telegram Handle"
-              />
-            </div>
-            <br />
-            <div>
-              <FormLabel> Linkedin URL </FormLabel>
-              <Input
-                type="text"
-                disabled={isSubmitting}
-                {...register('linkedin', { required: true })}
-                placeholder="Linkedin URL"
-              />
-            </div>
-            <br />
-
-            <div>
-              <FormLabel> Discord Handle </FormLabel>
-              <Input
-                type="text"
-                disabled={isSubmitting}
-                {...register('discord', { required: true })}
-                placeholder="Discord Handle"
-              />
-            </div>
-
-            <br />
-
-            <div>
-              <FormLabel> Dietary Requirements </FormLabel>
-              <Input
-                type="text"
-                disabled={isSubmitting}
-                {...register('dietary', { required: true })}
-                placeholder="Dietary Requirements (Vegetarian etc)"
-              />
-            </div>
-
-            <br />
-
-            <div className="flex justify-between">
-              <Button
-                bgColor="#FF9900"
-                width={150}
-                textColor="white"
-                onClick={redirectHome}
-              >
-                Back
-              </Button>
-              <Button
-                bgColor="#4365DD"
-                width={150}
-                className="text-white"
-                type="submit"
-                disabled={isSubmitting}
-              >
-                Update
-              </Button>
-            </div>
-          </VStack>
-        </form>
-      </Container>
-    </>
-  )
-}
-
-export default withApplicantAuth(UpdateInfoPage)

From 0c9926ad886ff0c14ddd8e31def0ca906a5342c8 Mon Sep 17 00:00:00 2001
From: woowenjun99 <woowenjun99@gmail.com>
Date: Sat, 24 Jun 2023 17:21:30 +0800
Subject: [PATCH 220/223] Shift the update-info to recruitment

---
 src/pages/recruitment/update-info.tsx | 211 ++++++++++++++++++++++++++
 1 file changed, 211 insertions(+)
 create mode 100644 src/pages/recruitment/update-info.tsx

diff --git a/src/pages/recruitment/update-info.tsx b/src/pages/recruitment/update-info.tsx
new file mode 100644
index 00000000..d24cbe7a
--- /dev/null
+++ b/src/pages/recruitment/update-info.tsx
@@ -0,0 +1,211 @@
+import {
+  Input,
+  FormLabel,
+  VStack,
+  useToast,
+  Button,
+  Select,
+} from '@chakra-ui/react'
+import { useRouter } from 'next/router'
+import React, { useState, type ChangeEvent } from 'react'
+import Head from 'next/head'
+import Container from '~/components/auth/Container'
+import TopNavbar from '~/components/common/TopNavbar'
+import UploadImage from '~/components/profile/UploadImage'
+import { trpc } from '~/utils/trpc'
+import { useForm } from 'react-hook-form'
+import { z } from 'zod'
+import { zodResolver } from '@hookform/resolvers/zod'
+import withApplicantAuth, { type BaseProps } from '~/utils/withApplicantAuth'
+
+const UpdateInfoPage: React.FC<BaseProps> = ({ session }) => {
+  const router = useRouter()
+  const toast = useToast()
+  const [selectedShirtSize, setShirtSize] = useState<string>()
+
+  const studentId = session?.user?.id as string
+
+  const options = [
+    { value: 'xs', label: 'XS' },
+    { value: 's', label: 'S' },
+    { value: 'm', label: 'M' },
+    { value: 'l', label: 'L' },
+    { value: 'xl', label: 'XL' },
+  ]
+
+  const handleSelectChange = (event: ChangeEvent<HTMLSelectElement>) => {
+    setShirtSize(event.target.value) // Update the selected value in the state
+  }
+
+  //Form Data Integrity
+  const FormSchema = z.object({
+    telegram: z.string().min(1, { message: 'Invalid name' }),
+    linkedin: z.string().min(1, { message: 'Invalid url' }),
+    shirtSize: z.string().min(1, { message: 'Invalid size' }),
+    dietary: z.string().min(1, { message: 'Invalid dietary requirement' }),
+    discord: z.string().min(1, { message: 'Invalid ID' }),
+  })
+
+  type FormSchemaType = z.infer<typeof FormSchema>
+
+  const { register, handleSubmit } = useForm<FormSchemaType>({
+    resolver: zodResolver(FormSchema),
+  })
+
+  const { mutateAsync, isLoading: isSubmitting } =
+    trpc.user.updateUserInfo.useMutation()
+
+  const formSubmit = async (formData: FormSchemaType) => {
+    const { telegram, shirtSize, linkedin, discord, dietary } = formData
+
+    try {
+      await mutateAsync({
+        //toDO: add json attributes
+        studentId,
+        telegram,
+        shirtSize,
+        linkedin,
+        discord,
+        dietary,
+      })
+      toast({
+        duration: 3000,
+        status: 'success',
+        title: 'Success',
+        description: 'User profile has been successfully updated',
+      })
+
+      redirectHome()
+    } catch (e) {
+      toast({
+        description: (e as Error).message,
+        duration: 3000,
+        status: 'error',
+        title: 'Oops, an error occured!',
+      })
+    }
+  }
+
+  //toDO: Route to applicant status page created by Zeyu
+  const redirectHome = () => router.push('/events')
+
+  return (
+    <>
+      <Head>
+        <title>Update Member Information</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta
+          name="description"
+          content="Onboarding member particulars for Atlas"
+        />
+      </Head>
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
+
+      <Container>
+        <form onSubmit={handleSubmit(formSubmit)}>
+          <h1 className="mb-10 text-center text-2xl font-bold">
+            Update Member Particulars
+          </h1>
+
+          <div className="justify-center">
+            <UploadImage
+              session={session}
+              studentId={session?.user?.id as string}
+            />
+          </div>
+
+          <VStack align="left">
+            <div>
+              <FormLabel>Fintech Society Shirt Size</FormLabel>
+            </div>
+
+            <div className="flex justify-center">
+              <Select
+                {...register('shirtSize', { required: true })}
+                value={selectedShirtSize}
+                onChange={handleSelectChange}
+              >
+                <option value="">Select Shirt Size</option>
+                {options.map((option) => (
+                  <option key={option.value} value={option.value}>
+                    {option.label}
+                  </option>
+                ))}
+              </Select>
+            </div>
+            <br />
+            <div>
+              <FormLabel> Telegram Handle</FormLabel>
+              <Input
+                type="text"
+                disabled={isSubmitting}
+                {...register('telegram', { required: true })}
+                placeholder="Telegram Handle"
+              />
+            </div>
+            <br />
+            <div>
+              <FormLabel> Linkedin URL </FormLabel>
+              <Input
+                type="text"
+                disabled={isSubmitting}
+                {...register('linkedin', { required: true })}
+                placeholder="Linkedin URL"
+              />
+            </div>
+            <br />
+
+            <div>
+              <FormLabel> Discord Handle </FormLabel>
+              <Input
+                type="text"
+                disabled={isSubmitting}
+                {...register('discord', { required: true })}
+                placeholder="Discord Handle"
+              />
+            </div>
+
+            <br />
+
+            <div>
+              <FormLabel> Dietary Requirements </FormLabel>
+              <Input
+                type="text"
+                disabled={isSubmitting}
+                {...register('dietary', { required: true })}
+                placeholder="Dietary Requirements (Vegetarian etc)"
+              />
+            </div>
+
+            <br />
+
+            <div className="flex justify-between">
+              <Button
+                bgColor="#FF9900"
+                width={150}
+                textColor="white"
+                onClick={redirectHome}
+              >
+                Back
+              </Button>
+              <Button
+                bgColor="#4365DD"
+                width={150}
+                className="text-white"
+                type="submit"
+                disabled={isSubmitting}
+              >
+                Update
+              </Button>
+            </div>
+          </VStack>
+        </form>
+      </Container>
+    </>
+  )
+}
+
+export default withApplicantAuth(UpdateInfoPage)

From ed2bcad37e4c85f0d8a6558e367e5be610bf06ef Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Sat, 17 Jun 2023 16:44:51 +0800
Subject: [PATCH 221/223] upload applicants and recruitment page integration

---
 src/components/common/TopNavbar.tsx           |   6 +-
 .../recruitment/CreateMultipleApplicants.tsx  | 106 ++++++++++++++++++
 src/components/users/CreateMultipleUsers.tsx  |   4 +-
 src/context/recruitment/SearchProvider.tsx    |  13 ---
 src/pages/recruitment/create.tsx              |  26 +++++
 src/pages/recruitment/index.tsx               |  30 ++++-
 src/server/db/collections/BaseCollection.ts   |   5 +
 src/server/trpc/router/recruitment/create.ts  |  82 ++++++++++++++
 src/server/trpc/router/recruitment/index.ts   |   2 +
 src/types/admin.type.ts                       |  28 ++++-
 src/types/model.ts                            |   8 --
 11 files changed, 281 insertions(+), 29 deletions(-)
 create mode 100644 src/components/recruitment/CreateMultipleApplicants.tsx
 create mode 100644 src/pages/recruitment/create.tsx
 create mode 100644 src/server/trpc/router/recruitment/create.ts
 delete mode 100644 src/types/model.ts

diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index f7d64681..b1d12bec 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -64,9 +64,11 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin, image }) => {
         </Navbar.Link>)
         }
         {isAdmin && (<Navbar.Link href="/calendar" className="ml-4 text-white">
+        </Navbar.Link>)}
+        <Navbar.Link href="/recruitment" className="ml-4 text-white">
           Recruitment
-        </Navbar.Link>)
-        }
+        </Navbar.Link>
+        
         {!isAdmin && <Navbar.Link href="/application_status" className="ml-4 text-white">
           Status
         </Navbar.Link>
diff --git a/src/components/recruitment/CreateMultipleApplicants.tsx b/src/components/recruitment/CreateMultipleApplicants.tsx
new file mode 100644
index 00000000..1c956272
--- /dev/null
+++ b/src/components/recruitment/CreateMultipleApplicants.tsx
@@ -0,0 +1,106 @@
+import { useToast, Stack, Button } from '@chakra-ui/react'
+import { parse, type ParseResult } from 'papaparse'
+import { trpc } from '~/utils/trpc'
+import type {
+  AddApplicantsType,
+  AddAppliedRolesType,
+  AddApplicantsCSVType,
+} from '~/types/admin.type'
+import { useRouter } from 'next/router'
+import { useState, useCallback } from 'react'
+
+const CreateMultipleApplicants = () => {
+  const router = useRouter()
+  const toast = useToast()
+  const [users, setUsers] = useState<AddApplicantsType[]>([])
+  const [appliedRoles, setAppliedRoles] = useState<AddAppliedRolesType[]>([])
+
+  const { isLoading: isLoadingUsers, mutateAsync: mutateAsyncUsers } =
+    trpc.user.createManyUsers.useMutation()
+  const {
+    isLoading: isLoadingAppliedRoles,
+    mutateAsync: mutateAsyncAppliedRoles,
+  } = trpc.recruitment.createManyAppliedRoles.useMutation()
+
+  const handleFile = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    if (e.target.files && e.target.files.length && e.target.files[0]) {
+      parse(e.target.files[0], {
+        header: true,
+        complete: (results: ParseResult<AddApplicantsCSVType>) => {
+          const usersFromData = results.data.map((item) => {
+            return {
+              department: 'unassigned',
+              name: item['Full Name'],
+              nus_email: item['NUS email (xxx@u.nus.edu)'],
+              role: 'Applicant',
+              student_id: item['Student ID (AXXXXXXXX)'] || '',
+            }
+          })
+          setUsers(usersFromData)
+
+          const appliedRolesFromData = results.data.map((item) => {
+            return {
+              applicantId: item['Student ID (AXXXXXXXX)'],
+              firstRole: item['First Choice Role'],
+              firstDepartment: item['First Choice Department'],
+              secondRole: item['Second Choice Role'],
+              secondDepartment: item['Second Choice Department'],
+            }
+          })
+          setAppliedRoles(appliedRolesFromData)
+        },
+      })
+    }
+  }, [])
+
+  const clickHandler = useCallback(async () => {
+    try {
+      if (!users.length) return
+      await mutateAsyncUsers(users)
+      await mutateAsyncAppliedRoles(appliedRoles)
+      toast({
+        title: 'Successfully Added!',
+        description: 'You have successfully added all the applicants',
+        status: 'success',
+        duration: 9000,
+        isClosable: true,
+      })
+    } catch (e) {
+      toast({
+        title: 'Something went wrong',
+        description: (e as Error).message,
+        status: 'error',
+        duration: 9000,
+        isClosable: true,
+      })
+    }
+  }, [mutateAsyncUsers, mutateAsyncAppliedRoles, toast, users, appliedRoles])
+
+  return (
+    <div className="flex flex-col">
+      <Stack direction={['column']} rowGap={4}>
+        <input accept=".csv" onChange={handleFile} type="file" />
+        <div className="flex flex-row">
+          <Button
+            bg="light.secondary.primary"
+            className="mr-5 text-white"
+            onClick={() => router.back()}
+          >
+            Return
+          </Button>
+          <Button
+            bg="light.secondary.primary"
+            className="text-white"
+            disabled={!users.length}
+            isLoading={isLoadingUsers && isLoadingAppliedRoles}
+            onClick={clickHandler}
+          >
+            Submit File
+          </Button>
+        </div>
+      </Stack>
+    </div>
+  )
+}
+
+export default CreateMultipleApplicants
diff --git a/src/components/users/CreateMultipleUsers.tsx b/src/components/users/CreateMultipleUsers.tsx
index fdd0c603..c2f82eb7 100644
--- a/src/components/users/CreateMultipleUsers.tsx
+++ b/src/components/users/CreateMultipleUsers.tsx
@@ -2,7 +2,7 @@ import { useToast, Stack, Button } from '@chakra-ui/react'
 import { parse, type ParseResult } from 'papaparse'
 import { trpc } from '~/utils/trpc'
 import DataTable from '~/components/users/DataTable'
-import type { AddUsersType, CSVType } from '~/types/admin.type'
+import type { AddUsersType, AddUsersCSVType } from '~/types/admin.type'
 import { useRouter } from 'next/router'
 import { useState, useCallback } from 'react'
 
@@ -17,7 +17,7 @@ const CreateMultipleUsers = () => {
     if (e.target.files && e.target.files.length && e.target.files[0]) {
       parse(e.target.files[0], {
         header: true,
-        complete: (results: ParseResult<CSVType>) => {
+        complete: (results: ParseResult<AddUsersCSVType>) => {
           const items = results.data.map((item) => {
             return {
               date_of_birth: item['Date of Birth'] || '',
diff --git a/src/context/recruitment/SearchProvider.tsx b/src/context/recruitment/SearchProvider.tsx
index e053d342..145c4a6e 100644
--- a/src/context/recruitment/SearchProvider.tsx
+++ b/src/context/recruitment/SearchProvider.tsx
@@ -8,11 +8,6 @@ type SearchContextType = {
   setFilter: (s: string) => void
 }
 
-// type filterContextType = {
-//   filter: string
-//   setFilter: (s: string) => void
-// }
-
 export const searchContext = createContext<SearchContextType>({
   search: '',
   setSearch: () => {
@@ -24,14 +19,6 @@ export const searchContext = createContext<SearchContextType>({
   },
 })
 
-// export const filterContext = createContext<filterContextType>({
-//   filter: '',
-//   setFilter: () => {
-//     return
-//   },
-// })
-
-
 const SearchProvider = (props: any) => {
   const [search, setSearch] = useState<string>('')
   const [filter, setFilter] = useState<string>('')
diff --git a/src/pages/recruitment/create.tsx b/src/pages/recruitment/create.tsx
new file mode 100644
index 00000000..88ae5249
--- /dev/null
+++ b/src/pages/recruitment/create.tsx
@@ -0,0 +1,26 @@
+import { Box } from '@chakra-ui/react'
+import Head from 'next/head'
+import TopNavbar from '~/components/common/TopNavbar'
+import CreateMultipleApplicants from '~/components/recruitment/CreateMultipleApplicants'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
+
+const ApplicantsForm: React.FC<BaseProps> = ({ session }) => {
+  return (
+    <>
+      <Head>
+        <title>Atlas | Create Users</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta name="description" content="The create user page for Atlas" />
+      </Head>
+      <TopNavbar isAdmin={session.isAdmin} image={session.user?.image as string} />
+      <Box className="m-10">
+        <h1 className="mb-5 text-center font-[Inter] text-4xl font-semibold">
+          Create New Applicants
+        </h1>
+        <CreateMultipleApplicants />
+      </Box>
+    </>
+  )
+}
+
+export default withAuth(ApplicantsForm, true)
diff --git a/src/pages/recruitment/index.tsx b/src/pages/recruitment/index.tsx
index d83921fc..9d3cbd98 100644
--- a/src/pages/recruitment/index.tsx
+++ b/src/pages/recruitment/index.tsx
@@ -1,9 +1,11 @@
 import Head from 'next/head'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
-import { Text } from '@chakra-ui/react'
+import { Box, Button, Text } from '@chakra-ui/react'
+import { useRouter } from 'next/router'
 
 const RecruitmentPage: React.FC<BaseProps> = ({ session }) => {
+  const router = useRouter()
   return (
     <>
       <Head>
@@ -11,8 +13,30 @@ const RecruitmentPage: React.FC<BaseProps> = ({ session }) => {
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The recruitment page for Atlas" />
       </Head>
-      <TopNavbar image={session.user?.image as string} isAdmin={session.isAdmin} />
-      <Text className="text-center text-4xl font-bold">Recruitment</Text>
+      <TopNavbar isAdmin={session.isAdmin} image={session.user?.image as string} />
+      <Box className="m-10">
+        <Text className="text-center text-4xl font-bold">Recruitment</Text>
+        <div className="px-2 sm:px-6 sm:pt-5 md:px-20 md:pt-5 lg:px-28 lg:pt-5">
+          <div className="my-20 mx-20 grid grid-cols-1 place-items-center gap-y-10 lg:my-10 lg:grid-cols-2 ">
+            <Button
+              bgColor="#97AEFF"
+              width={215}
+              className="mb-10 text-black"
+              onClick={() => router.push('/recruitment/create')}
+            >
+              Create Applicants
+            </Button>
+            <Button
+              bgColor="#97AEFF"
+              width={215}
+              className="mb-10 text-black"
+              onClick={() => router.push('/recruitment/applicants')}
+            >
+              Manage Applicants
+            </Button>
+          </div>
+        </div>
+      </Box>
     </>
   )
 }
diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index 8ac6bd3d..012e4023 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -48,6 +48,11 @@ export abstract class BaseCollection<T> {
     return { ...result.data(), id: result.id as string } as T
   }
 
+  generateRandomId() {
+    const docRef = doc(collection(db, this.collectionName))
+    return docRef.id
+  }
+
   async getById(id: string) {
     const docRef = doc(db, this.collectionName, id)
     const result = await getDoc(docRef)
diff --git a/src/server/trpc/router/recruitment/create.ts b/src/server/trpc/router/recruitment/create.ts
new file mode 100644
index 00000000..eedc3f48
--- /dev/null
+++ b/src/server/trpc/router/recruitment/create.ts
@@ -0,0 +1,82 @@
+import { doc, Timestamp, writeBatch } from 'firebase/firestore'
+import type { WriteBatch } from 'firebase/firestore'
+import { z } from 'zod'
+import { db } from '~/server/db/firebase'
+import type { AppliedRole } from '~/server/db/models/AppliedRole'
+import { ApplicationStatus } from '~/server/db/models/AppliedRole'
+import logCollection from '~/server/db/collections/LogCollection'
+import { protectedProcedure } from '../../trpc'
+import appliedRoleCollection from '~/server/db/collections/AppliedRoleCollection'
+
+export const createManyAppliedRoles = protectedProcedure
+  .input(
+    z.array(
+      z.object({
+        applicantId: z.string(),
+        firstRole: z.string(),
+        firstDepartment: z.string(),
+        secondRole: z.string(),
+        secondDepartment: z.string(),
+      })
+    )
+  )
+  .mutation(async ({ input }) => {
+    try {
+      // Add AppliedRole logic
+      // Each firebase batch only allow up to 500 writes so we need an array for more than 500 documents
+      let batchIndex = 0
+      let counter = 0
+      const batches: WriteBatch[] = [writeBatch(db)]
+      input.forEach((appliedRole) => {
+        // first choice
+        const appliedRoleOne = {
+          applicantId: appliedRole.applicantId,
+          rank: 1,
+          role: appliedRole.firstRole,
+          department: appliedRole.firstDepartment,
+          status: ApplicationStatus.PENDING,
+        } as AppliedRole
+        batches[batchIndex]?.set(
+          doc(db, 'applied_roles', appliedRoleCollection.generateRandomId()),
+          appliedRoleOne
+        )
+        counter += 1
+
+        // create another batch of 500 if reached limit
+        if (counter === 499) {
+          batches.push(writeBatch(db))
+          batchIndex += 1
+          counter = 0
+        }
+
+        // second choice
+        const appliedRoleTwo = {
+          applicantId: appliedRole.applicantId,
+          rank: 2,
+          role: appliedRole.secondRole,
+          department: appliedRole.secondDepartment,
+          status: ApplicationStatus.PENDING,
+        } as AppliedRole
+        batches[batchIndex]?.set(
+          doc(db, 'applied_roles', appliedRoleCollection.generateRandomId()),
+          appliedRoleTwo
+        )
+        counter += 1
+
+        // create another batch of 500 if reached limit
+        if (counter === 499) {
+          batches.push(writeBatch(db))
+          batchIndex += 1
+          counter = 0
+        }
+      })
+      await Promise.all(batches.map(async (batch) => await batch.commit()))
+    } catch (e) {
+      await logCollection.add({
+        createdAt: Timestamp.fromDate(new Date()),
+        level: 'WARNING',
+        description: (e as Error).message,
+        title: 'Error while creating multiple applied roles',
+      })
+    }
+  })
diff --git a/src/server/trpc/router/recruitment/index.ts b/src/server/trpc/router/recruitment/index.ts
index e5234aeb..19fb659f 100644
--- a/src/server/trpc/router/recruitment/index.ts
+++ b/src/server/trpc/router/recruitment/index.ts
@@ -5,6 +5,7 @@ import {
   getApplicant,
   getAppliedRole,
 } from './read'
+import { createManyAppliedRoles } from './create'
 
 export const recruitmentRouter = router({
   updateAppliedRoleStatus,
@@ -13,4 +14,5 @@ export const recruitmentRouter = router({
   getAllApplicantsTopRoleByDept,
   getApplicant,
   getAppliedRole,
+  createManyAppliedRoles,
 })
diff --git a/src/types/admin.type.ts b/src/types/admin.type.ts
index ea95925f..f6134f0b 100644
--- a/src/types/admin.type.ts
+++ b/src/types/admin.type.ts
@@ -18,7 +18,23 @@ export type AddUsersType = {
   year: string
 }
 
-export type CSVType = {
+export type AddApplicantsType = {
+  student_id: string
+  nus_email: string
+  name: string
+  department: string
+  role: string
+}
+
+export type AddAppliedRolesType = {
+  applicantId: string
+  firstRole: string
+  firstDepartment: string
+  secondRole: string
+  secondDepartment: string
+}
+
+export type AddUsersCSVType = {
   'Full Name': string
   'Date of Birth': string
   'Gender ': string
@@ -39,3 +55,13 @@ export type CSVType = {
   'Shirt size': string
   'Hobbies ': string
 }
+
+export type AddApplicantsCSVType = {
+  'Full Name': string
+  'NUS email (xxx@u.nus.edu)': string
+  'Student ID (AXXXXXXXX)': string
+  'First Choice Role': string
+  'First Choice Department': string
+  'Second Choice Role': string
+  'Second Choice Department': string
+}
diff --git a/src/types/model.ts b/src/types/model.ts
deleted file mode 100644
index 8e35042e..00000000
--- a/src/types/model.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { AppliedRole } from "~/server/db/models/AppliedRole"
-
-export type ApplicantWithAppliedRole = {
-  id: string
-  name: string
-  interviewNotes: string | null
-  appliedRoles: AppliedRole[]
-}

From 54722b3ccb83fcdc9f0fad7e10d7b24032a267f9 Mon Sep 17 00:00:00 2001
From: michaelseyo <76872115+michaelseyo@users.noreply.github.com>
Date: Mon, 19 Jun 2023 20:56:02 +0800
Subject: [PATCH 222/223] standardise applicant department as Unassigned

---
 src/components/recruitment/CreateMultipleApplicants.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/recruitment/CreateMultipleApplicants.tsx b/src/components/recruitment/CreateMultipleApplicants.tsx
index 1c956272..486b1dbf 100644
--- a/src/components/recruitment/CreateMultipleApplicants.tsx
+++ b/src/components/recruitment/CreateMultipleApplicants.tsx
@@ -29,7 +29,7 @@ const CreateMultipleApplicants = () => {
         complete: (results: ParseResult<AddApplicantsCSVType>) => {
           const usersFromData = results.data.map((item) => {
             return {
-              department: 'unassigned',
+              department: 'Unassigned',
               name: item['Full Name'],
               nus_email: item['NUS email (xxx@u.nus.edu)'],
               role: 'Applicant',

From 2bf5302d00fa9d77b48a40507e4bbe118c1c6c11 Mon Sep 17 00:00:00 2001
From: Jess Raphael <jxssraphael11@gmail.com>
Date: Mon, 19 Jun 2023 02:17:40 +0800
Subject: [PATCH 223/223] feat/Tasks

- Create New Task (Admin)
- View all Task (Non admin: assigned to you only)
- View all Task (Admin)
- Frontend & Backend integrated
---
 src/components/common/TopNavbar.tsx           |  62 ++++--
 src/pages/api/auth/[...nextauth].ts           |   2 -
 src/pages/events/create.tsx                   |  17 +-
 src/pages/tasks/createTask.tsx                | 206 ++++++++++++++++++
 src/pages/tasks/index.tsx                     | 173 +++++++--------
 src/server/db/collections/BaseCollection.ts   |   1 +
 src/server/db/collections/TaskCollection.ts   |  10 +
 src/server/db/collections/UserCollection.ts   |  16 ++
 src/server/db/models/Event.ts                 |   5 +-
 src/server/db/models/Task.ts                  |  14 ++
 src/server/db/models/User.ts                  |   3 +
 .../trpc/router/attendance/getEventInfo.ts    |   8 +-
 .../trpc/router/recruitment/createTask.ts     |  63 ++++++
 .../trpc/router/recruitment/getAllTasks.ts    |  23 ++
 .../router/recruitment/getAllTasksOfUser.ts   |  26 +++
 src/server/trpc/router/recruitment/index.ts   |  12 +-
 src/types/event/event.type.ts                 |   4 +-
 src/types/task/task.type.ts                   |   8 +
 18 files changed, 535 insertions(+), 118 deletions(-)
 create mode 100644 src/pages/tasks/createTask.tsx
 create mode 100644 src/server/db/collections/TaskCollection.ts
 create mode 100644 src/server/db/models/Task.ts
 create mode 100644 src/server/trpc/router/recruitment/createTask.ts
 create mode 100644 src/server/trpc/router/recruitment/getAllTasks.ts
 create mode 100644 src/server/trpc/router/recruitment/getAllTasksOfUser.ts
 create mode 100644 src/types/task/task.type.ts

diff --git a/src/components/common/TopNavbar.tsx b/src/components/common/TopNavbar.tsx
index b1d12bec..44d4ed75 100644
--- a/src/components/common/TopNavbar.tsx
+++ b/src/components/common/TopNavbar.tsx
@@ -32,18 +32,26 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin, image }) => {
               <Dropdown.Item>User</Dropdown.Item>
             </Link>
           )}
-          {isAdmin && (<Link href="/events" className="md:hidden">
-            <Dropdown.Item>Events</Dropdown.Item>
-          </Link>)
-          }
-         <Link href="/profile">
+          {isAdmin && (
+            <Link href="/events" className="md:hidden">
+              <Dropdown.Item>Events</Dropdown.Item>
+            </Link>
+          )}
+
+          {isAdmin && (
+            <Link href="/tasks" className="md:hidden">
+              <Dropdown.Item>Tasks</Dropdown.Item>
+            </Link>
+          )}
+          <Link href="/profile">
             <Dropdown.Item>Profile</Dropdown.Item>
           </Link>
-        
-          {isAdmin && <Link href="/calendar">
-            <Dropdown.Item>Calendar</Dropdown.Item>
-          </Link>
-          }
+
+          {isAdmin && (
+            <Link href="/calendar">
+              <Dropdown.Item>Calendar</Dropdown.Item>
+            </Link>
+          )}
           <Dropdown.Item>
             <div onClick={logout}>Sign Out</div>
           </Dropdown.Item>
@@ -74,14 +82,32 @@ const TopNavbar: React.FC<TopNavbarProps> = ({ isAdmin, image }) => {
         </Navbar.Link>
         }
 
-        {!isAdmin && <Navbar.Link href="/tasks" className="ml-4 text-white">
-          Tasks
-        </Navbar.Link>
-        }
-        {!isAdmin && <Navbar.Link  className="ml-4 text-white">
-          Update Information
-        </Navbar.Link>
-        }
+        {isAdmin && (
+          <Navbar.Link href="/tasks" className="ml-4 text-white">
+            Tasks
+          </Navbar.Link>
+        )}
+        {isAdmin && (
+          <Navbar.Link href="/calendar" className="ml-4 text-white">
+            Recruitment
+          </Navbar.Link>
+        )}
+        {!isAdmin && (
+          <Navbar.Link href="/application_status" className="ml-4 text-white">
+            Status
+          </Navbar.Link>
+        )}
+
+        {!isAdmin && (
+          <Navbar.Link href="/tasks" className="ml-4 text-white">
+            Tasks
+          </Navbar.Link>
+        )}
+        {!isAdmin && (
+          <Navbar.Link className="ml-4 text-white">
+            Update Information
+          </Navbar.Link>
+        )}
       </Navbar.Collapse>
     </Navbar>
   )
diff --git a/src/pages/api/auth/[...nextauth].ts b/src/pages/api/auth/[...nextauth].ts
index c6b3c834..2cee6528 100644
--- a/src/pages/api/auth/[...nextauth].ts
+++ b/src/pages/api/auth/[...nextauth].ts
@@ -62,14 +62,12 @@ export const authOptions: NextAuthOptions = {
             throw Error('Invalid email or password')
           }
 
-
           const user = users[0] as User
           const isSuccess = await compare(password, user.hashedPassword)
           if (!isSuccess) {
             throw Error('Incorrect password')
           }
 
-
           // The user object is passed to the session callback in session.data.user
           return {
             id: user.id as string,
diff --git a/src/pages/events/create.tsx b/src/pages/events/create.tsx
index a802f2ec..38c4b0f0 100644
--- a/src/pages/events/create.tsx
+++ b/src/pages/events/create.tsx
@@ -133,20 +133,23 @@ const EventPage: React.FC<BaseProps> = ({ session }) => {
                 <FormLabel>Department</FormLabel>
                 <CheckboxGroup>
                   <Stack spacing={[1, 5]} direction={['row', 'column']}>
-                    <Checkbox value="ml" {...register('dept')}>
+                    <Checkbox value="Machine Learning" {...register('dept')}>
                       Machine Learning
                     </Checkbox>
-                    <Checkbox value="sd" {...register('dept')}>
+                    <Checkbox
+                      value="Software Development"
+                      {...register('dept')}
+                    >
                       Software Development
                     </Checkbox>
-                    <Checkbox value="bc" {...register('dept')}>
+                    <Checkbox value="Blockchain" {...register('dept')}>
                       Blockchain
                     </Checkbox>
-                    <Checkbox value="ir" {...register('dept')}>
-                      Internal Relations
+                    <Checkbox value="Internal Affairs" {...register('dept')}>
+                      Internal Affairs
                     </Checkbox>
-                    <Checkbox value="ea" {...register('dept')}>
-                      External Affairs
+                    <Checkbox value="External Relations" {...register('dept')}>
+                      External Relations
                     </Checkbox>
                   </Stack>
                 </CheckboxGroup>
diff --git a/src/pages/tasks/createTask.tsx b/src/pages/tasks/createTask.tsx
new file mode 100644
index 00000000..46d9e65d
--- /dev/null
+++ b/src/pages/tasks/createTask.tsx
@@ -0,0 +1,206 @@
+import {
+  Input,
+  FormLabel,
+  Checkbox,
+  CheckboxGroup,
+  Stack,
+  VStack,
+  Button,
+  useToast,
+  Text,
+} from '@chakra-ui/react'
+import { z } from 'zod'
+import { zodResolver } from '@hookform/resolvers/zod'
+import { trpc } from '~/utils/trpc'
+import React, { useState } from 'react'
+import { useForm } from 'react-hook-form'
+import Head from 'next/head'
+import LoadingScreen from '~/components/common/LoadingScreen'
+import Container from '~/components/auth/Container'
+import { useRouter } from 'next/router'
+import TopNavbar from '~/components/common/TopNavbar'
+import withAuth, { type BaseProps } from '~/utils/withAuth'
+
+const TaskPage: React.FC<BaseProps> = ({ session }) => {
+  const router = useRouter()
+  const toast = useToast()
+  const [submitBefore, setSubmitBefore] = useState(false) // hacky use for assignees validation
+
+  const { data } = trpc.recruitment.getAllTasks.useQuery()
+
+  const FormSchema = z.object({
+    taskName: z.string().min(1, { message: 'Invalid name' }),
+    description: z.string().min(1, { message: 'Invalid description' }),
+    dept: z
+      .array(
+        z.string({
+          required_error: 'At least one department must be chosen',
+          invalid_type_error: 'At least one department must be chosen',
+        })
+      )
+      .nonempty({
+        message: 'At least one department must be chosen',
+      }),
+
+    due: z.preprocess((arg) => {
+      if (typeof arg == 'string' || arg instanceof Date) return new Date(arg)
+    }, z.date().min(new Date(), { message: 'Invalid date' }).max(new Date('2100'), { message: 'Invalid date' })),
+  })
+
+  type FormSchemaType = z.infer<typeof FormSchema>
+
+  // useForm for state management except assignees which belongs in DataTable (child)
+  const {
+    register,
+    handleSubmit,
+    formState: { errors },
+  } = useForm<FormSchemaType>({
+    resolver: zodResolver(FormSchema),
+  })
+
+  const { mutateAsync, isLoading: isSubmitting } =
+    trpc.recruitment.createTask.useMutation()
+
+  const formSubmit = async (formData: FormSchemaType) => {
+    try {
+      await mutateAsync({
+        taskName: formData.taskName,
+        due: formData.due,
+        departments: formData.dept,
+        description: formData.description,
+      })
+      toast({
+        duration: 3000,
+        status: 'success',
+        title: 'Success',
+        description: 'A new task has been successfully created',
+      })
+    } catch (e) {
+      toast({
+        description: (e as Error).message,
+        duration: 3000,
+        status: 'error',
+        title: 'Oops, an error occured!',
+      })
+    }
+  }
+  const redirectHome = () => router.push('/tasks')
+
+  if (!data) return <LoadingScreen />
+
+  return (
+    <>
+      <Head>
+        <title>Atlas | Create Task</title>
+        <link rel="icon" href="/favicon.ico" />
+        <meta name="description" content="The create task page for Atlas" />
+      </Head>
+      <TopNavbar
+        isAdmin={session.isAdmin}
+        image={session.user?.image as string}
+      />
+      <Container>
+        <form onSubmit={handleSubmit(formSubmit)}>
+          <h1 className="mb-10 text-center text-2xl font-bold">
+            Create New Task
+          </h1>
+          <VStack align="left" spacing="6">
+            <div>
+              <FormLabel>Task Name</FormLabel>
+              <Input
+                type="text"
+                disabled={isSubmitting}
+                {...register('taskName', { required: true })}
+              />
+              {errors.taskName && (
+                <Text color="tomato" className="pt-2">
+                  {errors.taskName.message}
+                </Text>
+              )}
+            </div>
+          </VStack>
+
+          <VStack align="left" spacing="6">
+            <div>
+              <FormLabel>Task Description</FormLabel>
+              <Input
+                type="text"
+                disabled={isSubmitting}
+                {...register('description', { required: true })}
+              />
+              {errors.taskName && (
+                <Text color="tomato" className="pt-2">
+                  {errors.taskName.message}
+                </Text>
+              )}
+            </div>
+            <VStack align="left">
+              <div className="flex">
+                <FormLabel>Department</FormLabel>
+                <CheckboxGroup>
+                  <Stack spacing={[1, 5]} direction={['row', 'column']}>
+                    <Checkbox value="ml" {...register('dept')}>
+                      Machine Learning
+                    </Checkbox>
+                    <Checkbox value="sd" {...register('dept')}>
+                      Software Development
+                    </Checkbox>
+                    <Checkbox value="bc" {...register('dept')}>
+                      Blockchain
+                    </Checkbox>
+                    <Checkbox value="ir" {...register('dept')}>
+                      Internal Relations
+                    </Checkbox>
+                    <Checkbox value="ea" {...register('dept')}>
+                      External Affairs
+                    </Checkbox>
+                  </Stack>
+                </CheckboxGroup>
+              </div>
+            </VStack>
+            <div>
+              <FormLabel>Due Date</FormLabel>
+              <Input
+                placeholder="Select Date and Time"
+                size="md"
+                type="datetime-local"
+                disabled={isSubmitting}
+                {...register('due', { required: true })}
+              />
+              {errors.due && (
+                <Text color="tomato" className="pt-2">
+                  {errors.due.message}
+                </Text>
+              )}
+            </div>
+
+            {/* <DataTable data={data} setAssignees={setAssignees} /> */}
+            {submitBefore}
+            <div className="flex justify-between">
+              <Button
+                bgColor="#FF9900"
+                width={150}
+                textColor="white"
+                onClick={redirectHome}
+              >
+                Back
+              </Button>
+              <Button
+                bgColor="#4365DD"
+                width={150}
+                className="text-white"
+                type="submit"
+                disabled={isSubmitting}
+                onClick={() => setSubmitBefore(true)}
+              >
+                Create Task
+              </Button>
+            </div>
+          </VStack>
+        </form>
+      </Container>
+    </>
+  )
+}
+
+export default withAuth(TaskPage)
diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx
index 91652c24..b96c5a29 100644
--- a/src/pages/tasks/index.tsx
+++ b/src/pages/tasks/index.tsx
@@ -1,5 +1,6 @@
-import { useState} from 'react'
+import { useState, useEffect } from 'react'
 import Head from 'next/head'
+import { trpc } from '~/utils/trpc'
 import {
   Modal,
   ModalBody,
@@ -11,49 +12,42 @@ import {
   useDisclosure,
   Text,
   Center,
+  Button,
 } from '@chakra-ui/react'
+import { AddIcon } from '@chakra-ui/icons'
+import { useRouter } from 'next/router'
 import TopNavbar from '~/components/common/TopNavbar'
 import withAuth, { type BaseProps } from '~/utils/withAuth'
+import { type TaskInfos } from '~/types/task/task.type'
 
 const Tasks: React.FC<BaseProps> = ({ session }) => {
+  const router = useRouter()
   const [searchQuery, setSearchQuery] = useState('')
   const { isOpen, onOpen, onClose } = useDisclosure()
   const [currentDetails, setCurrentDetails] = useState('')
   const [currentName, setCurrentName] = useState('')
+  const [taskInfoData, setTaskInfoData] = useState<TaskInfos[]>([])
 
-  const data = [
-    {
-      id: 1,
-      status: 'Done',
-      name: 'Join Telegram Group',
-      due: '09/12/23',
-      details: 'User should join the telegram group before their due date.',
-    },
-    {
-      id: 2,
-      status: 'In Progress',
-      name: 'Have lunch',
-      due: '1/4/24',
-      details: 'Have lunch at school with friends.',
-    },
-    {
-      id: 3,
-      status: 'Incomplete',
-      name: 'Attend first townhall',
-      due: '23/5/24',
-      details:
-        'Attend the first townhall to learn more about Fintech Society and its projects.',
-    },
-  ]
+  if (!session.isAdmin) {
+    trpc.recruitment.getAllTasksOfUser.useQuery(undefined, {
+      onSuccess: (data: TaskInfos[]) => setTaskInfoData(data),
+    })
+  } else {
+    trpc.recruitment.getAllTasks.useQuery(undefined, {
+      onSuccess: (data: TaskInfos[]) => setTaskInfoData(data),
+    })
+  }
 
-  const filteredData = data.filter((item) =>
-    item.name.toLowerCase().includes(searchQuery.toLowerCase())
-  )
+  const filteredData =
+    taskInfoData &&
+    taskInfoData.filter((item) =>
+      item.taskName.toLowerCase().includes(searchQuery.toLowerCase())
+    )
 
   return (
     <>
       <Head>
-        <title>Atlas | Login</title>
+        <title>Tasks</title>
         <link rel="icon" href="/favicon.ico" />
         <meta name="description" content="The login page for Atlas" />
       </Head>
@@ -70,6 +64,19 @@ const Tasks: React.FC<BaseProps> = ({ session }) => {
             <h1 className="mt-[3%] flex justify-center text-4xl font-bold text-white">
               Tasks
             </h1>
+            <div className="mx-auto  max-w-screen-lg md:max-w-screen-md">
+              {session.isAdmin ? (
+                <Button
+                  bgColor="#97AEFF"
+                  width={215}
+                  className="mb-10 text-black"
+                  onClick={() => router.push('/tasks/createTask')}
+                >
+                  Create Task
+                </Button>
+              ) : null}
+            </div>
+
             <Center>
               <div className="mx-auto max-w-screen-lg md:max-w-screen-md">
                 <table className="min-w-full divide-y divide-gray-200">
@@ -96,63 +103,57 @@ const Tasks: React.FC<BaseProps> = ({ session }) => {
                     </tr>
                   </thead>
                   <tbody className="divide-y divide-gray-200">
-                    {filteredData.map((item) => (
-                      <tr key={item.id}>
-                        <td className="whitespace-nowrap px-6 py-4">
-                          <h1 className="text-white">
-                            {item.status == 'Incomplete' && (
-                              <button
-                                disabled={true}
-                                className="text-md  mx-auto w-24 flex-col items-center  rounded-full bg-[#C51F29] bg-opacity-100  py-1 px-5 font-medium transition md:w-[150px]"
-                              >
-                                <div className="font-[Inter] text-xs text-white md:text-xl">
-                                  {item.status}
-                                </div>
-                              </button>
-                            )}
-                            {item.status == 'In Progress' && (
-                              <button
-                                disabled={true}
-                                className="text-md mx-auto w-24 flex-col items-center  rounded-full bg-[#FFBD3C] bg-opacity-100  py-1 px-5 font-medium transition md:w-[150px]"
-                              >
-                                <div className="font-[Inter] text-xs text-white md:text-xl">
-                                  {item.status}
-                                </div>
-                              </button>
-                            )}
-                            {item.status == 'Done' && (
-                              <button
-                                disabled={true}
-                                className="max-w-20 text-md mx-auto w-24 flex-col items-center  rounded-full bg-[#00C09D] bg-opacity-100  py-1 px-5 font-medium transition md:w-[150px]"
-                              >
-                                <div className="font-[Inter] text-xs text-white md:text-xl">
-                                  {item.status}
-                                </div>
-                              </button>
-                            )}
-                          </h1>
-                        </td>
-                        <td>
-                          <Text
-                            as="span"
-                            cursor="pointer"
-                            _hover={{ textDecoration: 'underline' }}
-                            className="text-white md:text-xl"
-                            onClick={() => {
-                              setCurrentName(item.name)
-                              setCurrentDetails(item.details)
-                              onOpen()
-                            }}
-                          >
-                            {item.name}
-                          </Text>
-                        </td>
-                        <td>
-                          {' '}
-                          <h1 className="text-white md:text-xl">{item.due}</h1>
-                        </td>
-                      </tr>
-                    ))}
+                    {filteredData &&
+                      filteredData.map((item) => (
+                        <tr key={item.id}>
+                          <td className="whitespace-nowrap px-6 py-4">
+                            <h1 className="  text-white">
+                              {item.status == 'Incomplete' && (
+                                <button className="text-md  mx-auto w-24 flex-col items-center  rounded-full bg-[#C51F29] bg-opacity-100  py-1 px-5 font-medium transition md:w-[150px]">
+                                  <div className="font-[Inter] text-xs text-white md:text-xl">
+                                    {item.status}
+                                  </div>
+                                </button>
+                              )}
+                              {item.status == 'In Progress' && (
+                                <button className="text-md mx-auto w-24 flex-col items-center  rounded-full bg-[#FFBD3C] bg-opacity-100  py-1 px-5 font-medium transition md:w-[150px]">
+                                  <div className="font-[Inter] text-xs text-white md:text-xl">
+                                    {item.status}
+                                  </div>
+                                </button>
+                              )}
+                              {item.status == 'Done' && (
+                                <button className="max-w-20 text-md mx-auto w-24 flex-col items-center  rounded-full bg-[#00C09D] bg-opacity-100  py-1 px-5 font-medium transition md:w-[150px]">
+                                  <div className="font-[Inter] text-xs text-white md:text-xl">
+                                    {item.status}
+                                  </div>
+                                </button>
+                              )}
+                            </h1>
+                          </td>
+                          <td>
+                            <Text
+                              as="span"
+                              cursor="pointer"
+                              _hover={{ textDecoration: 'underline' }}
+                              className="text-white md:text-xl"
+                              onClick={() => {
+                                setCurrentName(item.taskName)
+                                setCurrentDetails(item.description)
+                                onOpen()
+                              }}
+                            >
+                              {item.taskName}
+                            </Text>
+                          </td>
+                          <td>
+                            {' '}
+                            <h1 className="text-white md:text-xl">
+                              {new Date(item.due).toLocaleDateString()}
+                            </h1>
+                          </td>
+                        </tr>
+                      ))}
                   </tbody>
                 </table>
 
diff --git a/src/server/db/collections/BaseCollection.ts b/src/server/db/collections/BaseCollection.ts
index 012e4023..bfe360e1 100644
--- a/src/server/db/collections/BaseCollection.ts
+++ b/src/server/db/collections/BaseCollection.ts
@@ -1,6 +1,7 @@
 import { db } from '../firebase'
 import {
   collection,
+  where,
   setDoc,
   getDoc,
   doc,
diff --git a/src/server/db/collections/TaskCollection.ts b/src/server/db/collections/TaskCollection.ts
new file mode 100644
index 00000000..b3b0146b
--- /dev/null
+++ b/src/server/db/collections/TaskCollection.ts
@@ -0,0 +1,10 @@
+import { BaseCollection } from './BaseCollection'
+import type { Task } from '../models/Task'
+
+class TaskCollection extends BaseCollection<Task> {
+  protected override collectionName = 'tasks'
+  protected override objectName = 'task'
+}
+
+const taskCollection = new TaskCollection()
+export default taskCollection
diff --git a/src/server/db/collections/UserCollection.ts b/src/server/db/collections/UserCollection.ts
index a86c2180..98b7ece8 100644
--- a/src/server/db/collections/UserCollection.ts
+++ b/src/server/db/collections/UserCollection.ts
@@ -1,9 +1,25 @@
 import { BaseCollection } from './BaseCollection'
 import type { User } from '../models/User'
+import { where } from 'firebase/firestore'
 
 class UserCollection extends BaseCollection<User> {
   protected override collectionName = 'users'
   protected override objectName = 'user'
+
+  async findByDepartment(departments: string[]) {
+    const querySnapshot = await this.queries([
+      where('department', 'in', departments),
+    ])
+
+    const users = await Promise.all(
+      querySnapshot.map(async (snapshot) => {
+        const user = await this.getById(snapshot.id)
+        return user
+      })
+    )
+
+    return users
+  }
 }
 
 const userCollection = new UserCollection()
diff --git a/src/server/db/models/Event.ts b/src/server/db/models/Event.ts
index 316e4bde..c6425ba8 100644
--- a/src/server/db/models/Event.ts
+++ b/src/server/db/models/Event.ts
@@ -1,7 +1,8 @@
 import type { Timestamp } from 'firebase/firestore'
 
 type User = {
-  attended: boolean
+  attended?: boolean
+  completed?: boolean //For Tasks
   department: string
   id: string
   name: string
@@ -18,3 +19,5 @@ export type Event = {
   isQrRequired: boolean
   startDate: Timestamp
 }
+
+export default User
diff --git a/src/server/db/models/Task.ts b/src/server/db/models/Task.ts
new file mode 100644
index 00000000..644ba9cf
--- /dev/null
+++ b/src/server/db/models/Task.ts
@@ -0,0 +1,14 @@
+import type { Timestamp } from 'firebase/firestore'
+import type User from './Event'
+
+export type Task = {
+  status: string
+  id?: string
+  due: Timestamp
+  taskName: string
+  description: string
+  department: string[]
+  assignedUsers?: User[]
+}
+
+export default Task
diff --git a/src/server/db/models/User.ts b/src/server/db/models/User.ts
index bdfd91be..9d3cc034 100644
--- a/src/server/db/models/User.ts
+++ b/src/server/db/models/User.ts
@@ -1,3 +1,5 @@
+import type Task from './Task'
+
 export type User = {
   department: string
   email: string
@@ -6,6 +8,7 @@ export type User = {
   id: string
   name: string
   role: string
+  pendingTask?: Task[]
 
   // Optional field: User can upload their image later.
   image?: string
diff --git a/src/server/trpc/router/attendance/getEventInfo.ts b/src/server/trpc/router/attendance/getEventInfo.ts
index 5e8c83f4..680ec84c 100644
--- a/src/server/trpc/router/attendance/getEventInfo.ts
+++ b/src/server/trpc/router/attendance/getEventInfo.ts
@@ -24,7 +24,13 @@ export const getEventInfo = protectedProcedure
         attendees: attendees.length,
         endDate: event.endDate.toDate(),
         id: event.id,
-        invitedAttendees: event.invitedAttendees,
+        invitedAttendees: event.invitedAttendees.map((attendee) => ({
+          attended: attendee.attended,
+          department: attendee.department,
+          name: attendee.name,
+          id: attendee.id,
+          role: attendee.role,
+        })),
         name: event.name,
         showup: event.attendees,
         qr_code,
diff --git a/src/server/trpc/router/recruitment/createTask.ts b/src/server/trpc/router/recruitment/createTask.ts
new file mode 100644
index 00000000..4f233835
--- /dev/null
+++ b/src/server/trpc/router/recruitment/createTask.ts
@@ -0,0 +1,63 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { z } from 'zod'
+import taskCollection from '~/server/db/collections/TaskCollection'
+import { Timestamp } from 'firebase/firestore'
+import userCollection from '~/server/db/collections/UserCollection'
+import logCollection from '~/server/db/collections/LogCollection'
+
+export const createTask = protectedProcedure
+  .input(
+    z.object({
+      taskName: z.string(),
+      due: z.date(),
+      departments: z.array(z.string()),
+      description: z.string(),
+    })
+  )
+  .mutation(async ({ input }) => {
+    try {
+      const users = await userCollection.findByDepartment(input.departments)
+
+      const pendingTask = {
+        status: 'Incomplete',
+        due: Timestamp.fromDate(input.due),
+        taskName: input.taskName,
+        description: input.description,
+        department: input.departments,
+        assignedUsers: users,
+      }
+
+      await taskCollection.add(pendingTask)
+
+      const updateUserPromises = users.map(async (user) => {
+        const newPendingTask = {
+          status: 'Incomplete',
+          due: Timestamp.fromDate(input.due),
+          taskName: input.taskName,
+          description: input.description,
+          department: input.departments,
+        }
+
+        let updatedPendingTasks = []
+
+        if (user.pendingTask) {
+          updatedPendingTasks = [...user.pendingTask, newPendingTask]
+        } else {
+          updatedPendingTasks = [newPendingTask]
+        }
+
+        return userCollection.update(user.id, {
+          pendingTask: updatedPendingTasks,
+        })
+      })
+
+      await Promise.all(updateUserPromises)
+    } catch (e) {
+      await logCollection.add({
+        createdAt: Timestamp.fromDate(new Date()),
+        level: 'INFO',
+        description: (e as Error).message,
+        title: 'Create task failed',
+      })
+    }
+  })
diff --git a/src/server/trpc/router/recruitment/getAllTasks.ts b/src/server/trpc/router/recruitment/getAllTasks.ts
new file mode 100644
index 00000000..ae389fe2
--- /dev/null
+++ b/src/server/trpc/router/recruitment/getAllTasks.ts
@@ -0,0 +1,23 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { TRPCError } from '@trpc/server'
+import taskCollection from '~/server/db/collections/TaskCollection'
+
+export const getAllTasks = protectedProcedure.query(async () => {
+  try {
+    const tasks = await taskCollection.queries([])
+    return tasks.map((task) => {
+      return {
+        status: task.status,
+        id: task.id,
+        due: task.due.toDate(),
+        taskName: task.taskName,
+        description: task.description,
+      }
+    })
+  } catch (e) {
+    throw new TRPCError({
+      code: 'INTERNAL_SERVER_ERROR',
+      message: (e as Error).message,
+    })
+  }
+})
diff --git a/src/server/trpc/router/recruitment/getAllTasksOfUser.ts b/src/server/trpc/router/recruitment/getAllTasksOfUser.ts
new file mode 100644
index 00000000..6edc389c
--- /dev/null
+++ b/src/server/trpc/router/recruitment/getAllTasksOfUser.ts
@@ -0,0 +1,26 @@
+import { protectedProcedure } from '~/server/trpc/trpc'
+import { TRPCError } from '@trpc/server'
+import { z } from 'zod'
+import userCollection from '~/server/db/collections/UserCollection'
+
+export const getAllTasksOfUser = protectedProcedure.query(async ({ ctx }) => {
+  try {
+    const userId = ctx.session.user.id
+    const user = await userCollection.getById(userId)
+
+    return user.pendingTask?.map((task) => {
+      return {
+        status: task.status,
+        id: task.id,
+        due: task.due.toDate(),
+        taskName: task.taskName,
+        description: task.description,
+      }
+    })
+  } catch (e) {
+    throw new TRPCError({
+      code: 'INTERNAL_SERVER_ERROR',
+      message: (e as Error).message,
+    })
+  }
+})
diff --git a/src/server/trpc/router/recruitment/index.ts b/src/server/trpc/router/recruitment/index.ts
index 19fb659f..b4fb3a8d 100644
--- a/src/server/trpc/router/recruitment/index.ts
+++ b/src/server/trpc/router/recruitment/index.ts
@@ -1,11 +1,18 @@
 import { router } from '~/server/trpc/trpc'
-import { updateAppliedRoleStatus, updateInterviewNotes, updateAppliedRoleFlag } from './update'
+import {
+  updateAppliedRoleStatus,
+  updateInterviewNotes,
+  updateAppliedRoleFlag,
+} from './update'
 import {
   getAllApplicantsTopRoleByDept,
   getApplicant,
   getAppliedRole,
 } from './read'
 import { createManyAppliedRoles } from './create'
+import { getAllTasks } from './getAllTasks'
+import { getAllTasksOfUser } from './getAllTasksOfUser'
+import { createTask } from './createTask'
 
 export const recruitmentRouter = router({
   updateAppliedRoleStatus,
@@ -15,4 +22,7 @@ export const recruitmentRouter = router({
   getApplicant,
   getAppliedRole,
   createManyAppliedRoles,
+  getAllTasks,
+  createTask,
+  getAllTasksOfUser,
 })
diff --git a/src/types/event/event.type.ts b/src/types/event/event.type.ts
index c06a7857..5fee6b0a 100644
--- a/src/types/event/event.type.ts
+++ b/src/types/event/event.type.ts
@@ -9,11 +9,11 @@ export type EventInfos = {
 }
 
 export interface BodyProps {
-  attendees: number,
+  attendees: number
   endDate: Date
   id?: string
   invitedAttendees: {
-    attended: boolean
+    attended: boolean | undefined
     department: string
     name: string
     id: string
diff --git a/src/types/task/task.type.ts b/src/types/task/task.type.ts
new file mode 100644
index 00000000..01ef940e
--- /dev/null
+++ b/src/types/task/task.type.ts
@@ -0,0 +1,8 @@
+export type TaskInfos = {
+  status: string
+  id: string
+  due: string
+  taskName: string
+  description: string
+  department: string[]
+}