Aashna/challenge schedule map qr routes

apps/axiom/src/components/Nav/navIconMap.ts

@@ -28,7 +28,7 @@ export const navIconMap: Partial<
   emails: Mail,
   organizerTeams: Signature,
   groups: PersonStanding,
-  challengePrize: Trophy,
+  challenges: Trophy,
   events: CalendarDays,
   forms: MousePointer2,
   "form-submissions": Inbox,

apps/portal/app/routes/challenges.tsx

@@ -0,0 +1,31 @@
+import type { LoaderFunction } from '@remix-run/node'
+import process from 'node:process'
+import { ChallengesPage } from '@cuhacking/portal/pages/challenges'
+import { useLoaderData } from '@remix-run/react'
+
+export const loader: LoaderFunction = async () => {
+  try {
+    const API_URL = process.env.NODE_ENV === 'development' ? 'http://localhost:8000' : 'https://axiom.cuhacking.ca'
+    const req = await fetch(`${API_URL}/api/challenges`)
+
+    if (!req.ok) {
+      throw new Error('Error')
+    }
+
+    const data = await req.json()
+
+    return data.docs
+  }
+  catch (error) {
+    console.error(`Error fetching challenges`, error)
+    return [{ title: '', pathTitle: '', sponsor: { symbol: { url: '', alt: '' } }, challengeBlock: [] }]
+  }
+}
+
+export default function Challenges() {
+  const data = useLoaderData<typeof loader>()
+
+  return (
+    <ChallengesPage data={data} />
+  )
+}

apps/portal/app/routes/map.tsx

@@ -0,0 +1,29 @@
+import type { LoaderFunction } from '@remix-run/node'
+import process from 'node:process'
+import { MapsPage } from '@cuhacking/portal/pages/map'
+
+export const loader: LoaderFunction = async () => {
+  try {
+    const API_URL = process.env.NODE_ENV === 'development' ? 'http://localhost:8000' : 'https://axiom.cuhacking.ca'
+    const req = await fetch(`${API_URL}/api/challenges`)
+
+    if (!req.ok) {
+      throw new Error('Error')
+    }
+
+    const data = await req.json()
+
+    return data.docs
+  }
+  catch (error) {
+    console.error(`Error fetching challenges`, error)
+  }
+}
+
+export default function Map() {
+  // const data = useLoaderData<typeof loader>()
+
+  return (
+    <MapsPage />
+  )
+}

apps/portal/app/routes/profile.tsx

@@ -2,7 +2,7 @@ import type { UserDetails } from '@cuhacking/portal/types/user'
 import type { LoaderFunction } from '@remix-run/node'
 import process from 'node:process'
 import { ProfilePage } from '@cuhacking/portal/pages/profile'
-import { json, redirect } from '@remix-run/node'
+import { redirect } from '@remix-run/node'
 import { useLoaderData } from '@remix-run/react'
 
 export const loader: LoaderFunction = async ({ request }) => {
@@ -34,7 +34,7 @@ export const loader: LoaderFunction = async ({ request }) => {
       return redirect('/')
     }
 
-    return json({ user, cookie, API_URL })
+    return { user, cookie, API_URL }
   }
   catch {
     return redirect('/')

apps/portal/app/routes/qr.tsx

@@ -0,0 +1,50 @@
+import type { UserDetails } from '@cuhacking/portal/types/user'
+import type { LoaderFunction } from '@remix-run/node'
+import process from 'node:process'
+import { QrPage } from '@cuhacking/portal/pages/qr'
+import { redirect } from '@remix-run/node'
+import { useLoaderData } from '@remix-run/react'
+
+export const loader: LoaderFunction = async ({ request }) => {
+  const cookie = request.headers.get('Cookie')
+
+  const baseUrl
+  = process.env.NODE_ENV === 'development'
+    ? 'http://localhost:8000'
+    : 'https://axiom.cuhacking.ca'
+
+  const API_URL = baseUrl
+  try {
+    const res = await fetch(`${API_URL}/api/users/me`, {
+      credentials: 'include',
+      headers: { Cookie: cookie || '' },
+    })
+
+    if (!res.ok) {
+      throw new Error('Not Authenticated')
+    }
+
+    const { user } = await res.json()
+
+    if (!user) {
+      return redirect('/')
+    }
+
+    if (!user.agreedToTerms) {
+      return redirect('/')
+    }
+
+    return { user, cookie, API_URL }
+  }
+  catch {
+    return redirect('/')
+  }
+}
+
+export default function QR() {
+  const { user } = useLoaderData< { user: UserDetails, cookie: string }>()
+
+  return (
+    <QrPage user={user} />
+  )
+}

apps/portal/app/routes/schedule.tsx

@@ -0,0 +1,42 @@
+import type { LoaderFunction } from '@remix-run/node'
+import process from 'node:process'
+import { SchedulePage } from '@cuhacking/portal/pages/schedule'
+import { useLoaderData } from '@remix-run/react'
+
+export const loader: LoaderFunction = async () => {
+  try {
+    const API_URL
+      = process.env.NODE_ENV === 'development'
+        ? 'http://localhost:8000'
+        : 'https://axiom.cuhacking.ca'
+
+    let allEvents: any[] = []
+    let page = 1
+    let hasNextPage = true
+
+    while (hasNextPage) {
+      const req = await fetch(`${API_URL}/api/events?page=${page}&limit=100`)
+
+      if (!req.ok) {
+        throw new Response('Error fetching events', { status: req.status })
+      }
+
+      const data = await req.json()
+      allEvents = [...allEvents, ...data.docs]
+      hasNextPage = data.hasNextPage
+      page = data.nextPage
+    }
+
+    return allEvents
+  }
+  catch (error) {
+    console.error(`Error fetching events`, error)
+    throw new Response('Internal Server Error', { status: 500 })
+  }
+}
+
+export default function Schedule() {
+  const data = useLoaderData<typeof loader>()
+
+  return <SchedulePage data={data} />
+}

libs/cms/configs/server.ts

@@ -7,7 +7,7 @@ OrganizerTeams,
        } from "@/db/collections"
 
 import {
-        ChallengePrize,
+        Challenges,
         Events,
         Media,
         Emails,
@@ -39,8 +39,8 @@ defaultDepth: 3,
     OrganizerTeams,
     Hardware,
     Events,
-        Hackathons,
-    ChallengePrize,
+    Hackathons,
+    Challenges,
   ],
   blocks:[
    // TeamBlock
@@ -81,8 +81,6 @@ formOverrides: {
   versions: {
     drafts: true
   },
-    // access: {
-    // },
   },
   formSubmissionOverrides:{
     slug: 'form-submissions',