Merge branch 'main' into arvin-timer

acmucsd · Sep 25, 2023 · e7a6d28 · e7a6d28
2 parents 88a6bbf + 2be251a
commit e7a6d28
Show file tree

Hide file tree

Showing 55 changed files with 141 additions and 76 deletions.
diff --git a/public/assets/acm_logo.png b/public/assets/acm_logo.png
diff --git a/public/assets/acm_logo.svg b/public/assets/acm_logo.svg
diff --git a/public/assets/embeds/discord.svg b/public/assets/embeds/discord.svg
diff --git a/public/assets/embeds/role_icon.svg b/public/assets/embeds/role_icon.svg
diff --git a/public/assets/proj_logo.png b/public/assets/proj_logo.png
diff --git a/public/spr-23/IMG_1517.png b/public/spr-23/IMG_1517.png
diff --git a/public/spr-23/IMG_2630.png b/public/spr-23/IMG_2630.png
diff --git a/public/spr-23/IMG_3041.JPG b/public/spr-23/IMG_3041.JPG
diff --git a/public/spr-23/IMG_3043.JPG b/public/spr-23/IMG_3043.JPG
diff --git a/public/spr-23/IMG_3053.JPG b/public/spr-23/IMG_3053.JPG
diff --git a/public/spr-23/IMG_3055.JPG b/public/spr-23/IMG_3055.JPG
diff --git a/public/spr-23/IMG_3062.JPG b/public/spr-23/IMG_3062.JPG
diff --git a/public/spr-23/IMG_3066.JPG b/public/spr-23/IMG_3066.JPG
diff --git a/public/spr-23/IMG_3069.JPG b/public/spr-23/IMG_3069.JPG
diff --git a/public/spr-23/IMG_3072.JPG b/public/spr-23/IMG_3072.JPG
diff --git a/public/spr-23/IMG_3076.JPG b/public/spr-23/IMG_3076.JPG
diff --git a/public/spr-23/IMG_3083.JPG b/public/spr-23/IMG_3083.JPG
diff --git a/public/spr-23/IMG_3084.JPG b/public/spr-23/IMG_3084.JPG
diff --git a/public/spr-23/IMG_3093.JPG b/public/spr-23/IMG_3093.JPG
diff --git a/public/spr-23/IMG_3103.JPG b/public/spr-23/IMG_3103.JPG
diff --git a/public/spr-23/IMG_3109.JPG b/public/spr-23/IMG_3109.JPG
diff --git a/public/spr-23/IMG_7721.JPG b/public/spr-23/IMG_7721.JPG
diff --git a/public/spr-23/IMG_7724.JPG b/public/spr-23/IMG_7724.JPG
diff --git a/public/spr-23/IMG_7729.JPG b/public/spr-23/IMG_7729.JPG
diff --git a/public/spr-23/IMG_7739.JPG b/public/spr-23/IMG_7739.JPG
diff --git a/public/spr-23/IMG_7768.JPG b/public/spr-23/IMG_7768.JPG
diff --git a/public/spr-23/IMG_7771.JPG b/public/spr-23/IMG_7771.JPG
diff --git a/public/spr-23/Picsart_23-06-06_00-57-03-199.jpg b/public/spr-23/Picsart_23-06-06_00-57-03-199.jpg
diff --git a/public/spr-23/Screenshot_20230605_222451_Gallery.jpg b/public/spr-23/Screenshot_20230605_222451_Gallery.jpg
diff --git a/public/wtr_23/IMG_2364.jpg b/public/wtr_23/IMG_2364.jpg
diff --git a/public/wtr_23/IMG_2366.jpg b/public/wtr_23/IMG_2366.jpg
diff --git a/public/wtr_23/IMG_2367.jpg b/public/wtr_23/IMG_2367.jpg
diff --git a/public/wtr_23/IMG_2372.jpg b/public/wtr_23/IMG_2372.jpg
diff --git a/public/wtr_23/IMG_2388.jpg b/public/wtr_23/IMG_2388.jpg
diff --git a/public/wtr_23/IMG_2390.jpg b/public/wtr_23/IMG_2390.jpg
diff --git a/public/wtr_23/IMG_2392.jpg b/public/wtr_23/IMG_2392.jpg
diff --git a/public/wtr_23/IMG_2395.jpg b/public/wtr_23/IMG_2395.jpg
diff --git a/public/wtr_23/IMG_2397.jpg b/public/wtr_23/IMG_2397.jpg
diff --git a/public/wtr_23/PXL_20230407_002442180.jpg b/public/wtr_23/PXL_20230407_002442180.jpg
diff --git a/public/wtr_23/PXL_20230407_002630504.jpg b/public/wtr_23/PXL_20230407_002630504.jpg
diff --git a/public/wtr_23/PXL_20230407_002733801.MP.jpg b/public/wtr_23/PXL_20230407_002733801.MP.jpg
diff --git a/public/wtr_23/PXL_20230407_003044701.jpg b/public/wtr_23/PXL_20230407_003044701.jpg
diff --git a/public/wtr_23/PXL_20230407_003133700.jpg b/public/wtr_23/PXL_20230407_003133700.jpg
diff --git a/public/wtr_23/PXL_20230407_003149003.jpg b/public/wtr_23/PXL_20230407_003149003.jpg
diff --git a/public/wtr_23/PXL_20230407_003553652.jpg b/public/wtr_23/PXL_20230407_003553652.jpg
diff --git a/src/components/navbar/index.tsx b/src/components/navbar/index.tsx
@@ -2,7 +2,7 @@
 
 import Link from "next/link";
 import { useEffect, useState } from "react";
-import ACMLogo from "../../../public/assets/acm_logo.svg";
+import ProjLogo from "../../../public/assets/proj_logo.png";
 import s from "../navbar/Navbar.module.scss";
 import { Size, useWindowSize } from "../../utils/general";
 
@@ -15,7 +15,7 @@ const NavigationBar: React.FC = () => {
         {/* Navbar ACM Logo */}
         <div className={s.left}>
             <Link href="#">
-              <img src={ACMLogo.src} alt="ACM Logo" />
+              <img src={ProjLogo.src} alt="ACM Logo" />
                 <p>Projects</p>
             </Link>
             <div className={s.divider}>