Merge branch 'dev' into template/update

bearhack-ucr · Feb 14, 2024 · 669b38d · 669b38d
2 parents 5435224 + cb08edd
commit 669b38d
Show file tree

Hide file tree

Showing 39 changed files with 395 additions and 110 deletions.
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -24,6 +24,20 @@ jobs:
       - name: Use ACM Linting
         uses: acm-ucr/linting@v2
 
+  images:
+    name: images
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Running Image Conversion
+        uses: acm-ucr/images@v2
+        with:
+          branch: ${{ github.head_ref }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   build:
     name: build
     runs-on: ubuntu-latest

diff --git a/public/UCRLOGO.png b/public/UCRLOGO.png
diff --git a/public/UCRLOGO.webp b/public/UCRLOGO.webp
diff --git a/public/board/AlexZhang.webp b/public/board/AlexZhang.webp
diff --git a/public/board/AmandaLy.webp b/public/board/AmandaLy.webp
diff --git a/public/board/ApySen.webp b/public/board/ApySen.webp
diff --git a/public/board/AustinYang.webp b/public/board/AustinYang.webp
diff --git a/public/board/ChristianMacaluso.webp b/public/board/ChristianMacaluso.webp
diff --git a/public/board/DivyankShah.webp b/public/board/DivyankShah.webp
diff --git a/public/board/EviAguirre.webp b/public/board/EviAguirre.webp
diff --git a/public/board/GaganMannur.webp b/public/board/GaganMannur.webp
diff --git a/public/board/MenthyWu.webp b/public/board/MenthyWu.webp
diff --git a/public/board/PranoyGiri.webp b/public/board/PranoyGiri.webp
diff --git a/public/board/RaidahFairooz.webp b/public/board/RaidahFairooz.webp
diff --git a/public/board/RamaChunduri.webp b/public/board/RamaChunduri.webp
diff --git a/public/board/SachinChopra.webp b/public/board/SachinChopra.webp
diff --git a/public/board/ThomasLi.webp b/public/board/ThomasLi.webp
diff --git a/public/board/YogithaShastri.webp b/public/board/YogithaShastri.webp
diff --git a/public/flyLeft.svg b/public/flyLeft.svg
diff --git a/public/flyRight.svg b/public/flyRight.svg
diff --git a/public/swirlTop.svg b/public/swirlTop.svg
diff --git a/src/app/layout.js b/src/app/layout.js
@@ -26,7 +26,7 @@ export default function RootLayout({ children, session }) {
   return (
     <html lang="en" className="h-full">
       <body
-        className={`${poppins.variable} ${grenze.variable} ${titilliumWeb.variable} flex flex-col lg:flex-row h-full`}
+        className={`${poppins.variable} ${grenze.variable} ${titilliumWeb.variable} bg-bear-dark flex flex-col lg:flex-row h-full`}
       >
         <Session session={session} refetchInterval={5 * 60} className="h-full">
           <div className="flex w-full">

diff --git a/src/components/static/AboutUs.jsx b/src/components/static/AboutUs.jsx
@@ -5,47 +5,51 @@ import Image from "next/image";
 const AboutUs = () => {
   return (
     <div className="w-full h-screen md:h-full text-white bg-black flex flex-col justify-center items-center">
-      <div className="grid grid-cols-2 w-full h-full md:w-1/2 mt-16">
+      <div className="grid grid-cols-2 w-full md:h-full md:w-1/2 md:mt-16 ">
         <Image
           src={Frame}
           alt={"frame"}
-          className="hidden lg:block lg:scale-75 rotate-0"
+          className="scale-50 md:scale-75 rotate-0 "
         />
         <div className="flex justify-end items-start">
           <Image
             src={Frame}
             alt={"frame"}
-            className="hidden lg:block md:scale-75 rotate-90"
+            className="scale-50 md:scale-75 rotate-90"
           />
         </div>
       </div>
 
-      <div className="flex flex-col w-5/6 lg:w-3/12 items-center gap-8 -my-24">
-        <p className="font-header text-xl md:text-5xl flex justify-center !text-center lg:!text-center -mb-1">
+      <div className="flex flex-col w-4/6 md:w-5/12 lg:w-4/12 items-center gap-8 -my-24 md:-my-24">
+        <p className="font-header text-4xl md:text-5xl flex justify-center !text-center lg:!text-center -mb-1">
           About Us
         </p>
-        <div className="h-0.5 w-10/12 bg-gray-300 rounded-full"></div>
-        <p className="font-paragraph text-sm md:text-xl !text-center lg:!text-start mt-1">
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-          eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad
-          minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-          aliquip ex ea commodo consequat. Duis aute irure dolor in
-          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-          pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-          culpa qui officia deserunt mollit anim id est laborum.
+        <div className="h-0.5 w-11/12 bg-gray-300 rounded-full" />
+        <p className="font-paragraph text-base md:text-xl text-center mt-1">
+          Welcome to Bearhack, a medical-technology-focused, in-person,
+          weekend-long event brought to you by BMES (Biomedical Engineering
+          Society). Bearhack invites curious minds to embark on a journey of
+          learning and innovation. This event provides a unique opportunity for
+          participants to choose a project of their liking and dedicate the
+          weekend to exploring and building something new. Whether you&apos;re
+          passionate about a specific medical technology or have been meaning to
+          delve into a particular topic, Bearhack is the perfect platform for
+          you. Form a team of up to 4 people to collaborate and create. The
+          event not only fosters individual growth but also offers the chance to
+          forge new friendships with fellow enthusiasts.
         </p>
       </div>
-      <div className="grid grid-cols-2 w-full h-full md:w-1/2 2xl:w-1/2 -mt-3 mb-16">
+      <div className="grid grid-cols-2 w-full md:h-full md:w-1/2 2xl:w-1/2 mb-10 md:mb-32">
         <Image
           src={Frame}
           alt={"frame"}
-          className="hidden lg:block md:scale-75 -rotate-90"
+          className="scale-50 md:scale-75 -rotate-90"
         />
         <div className="flex justify-end items-start">
           <Image
             src={Frame}
             alt={"frame"}
-            className="hidden lg:block md:scale-75 rotate-180"
+            className="scale-50 md:scale-75 rotate-180"
           />
         </div>
       </div>

diff --git a/src/components/static/Countdown.jsx b/src/components/static/Countdown.jsx
@@ -4,15 +4,15 @@ import { CONFIG } from "@/data/Config";
 
 const Digits = ({ value, unit }) => {
   return (
-    <div className="flex flex-col items-center gap-3 last:hidden sm:last:flex">
+    <div className="flex flex-col items-center gap-4 last:hidden sm:last:flex">
       <div className="flex gap-1 lg:!gap-2">
         {value
           .toString()
           .padStart(2, "0")
           .split("")
           .map((digit, index) => (
             <div
-              className="text-lg lg:text-4xl font-bold text-white bg-bear-teal-100/50 p-[10px] lg:p-3 rounded-lg"
+              className="text-lg lg:text-4xl font-bold text-white bg-bear-teal-100/50 p-3 lg:p-3 rounded-lg"
               key={index}
             >
               {digit}
@@ -50,7 +50,7 @@ const Countdown = () => {
   }, []);
 
   return (
-    <div className="flex gap-3 md:!gap-6 font-paragraph">
+    <div className="flex justify-between font-paragraph w-full">
       {Object.entries(time).map(([unit, value], index) => (
         <Digits key={index} unit={unit} value={value} />
       ))}

diff --git a/src/components/static/FAQ.jsx b/src/components/static/FAQ.jsx
@@ -5,7 +5,7 @@ import ToggleSelection from "./ToggleSelection";
 const FAQ = () => {
   return (
     <div className="w-full h-full flex flex-col items-center bg-bear-dark">
-      <div className="font-header text-xl md:text-5xl text-white flex mb-4 md:mb-20">
+      <div className="font-header text-4xl md:text-5xl text-white flex mb-4 md:mb-20">
         FAQ
       </div>
       <div className="flex w-9/12 z-50 overflow-hidden flex-col">

diff --git a/src/components/static/Footer.jsx b/src/components/static/Footer.jsx
@@ -12,11 +12,11 @@ const Footer = () => {
       <div className="flex flex-col items-center justify-center w-full ">
         <Image src={logo} alt="Logo" className="w-1/6 xl:w-1/12" />
         <div className="text-lg md:text-4xl m-0 p-0">BEARHACK 2024</div>
-        <div className="text-xs md:text-xl m-0 p-0 font-header">
+        <div className="text-xs md:text-xl m-0 p-1 font-header">
           Made with <AiFillHeart className="inline" /> by the Bear Hack team at
-          UCR
+          University of California, Riverside
         </div>
-        <div className="flex mb-8">
+        <div className="flex mb-8 gap-2">
           {CONTACTS.map((contact, index) => (
             <Link
               key={index}