);
}
From b55b4d54c153b4c1a78839b707d72775005cb0bf Mon Sep 17 00:00:00 2001
From: Haylie Tan <141064325+haylietan@users.noreply.github.com>
Date: Wed, 25 Sep 2024 21:08:43 -0700
Subject: [PATCH 09/12] Created blue div at top "View Projects"
---
.../JudgingHub/HubHero.module.scss | 2 +-
.../_components/JudgingHub/JudgingHub.tsx | 2 ++
.../JudgingHub/ViewProjects.module.scss | 28 +++++++++++++++++++
.../_components/JudgingHub/ViewProjects.tsx | 13 +++++++++
4 files changed, 44 insertions(+), 1 deletion(-)
create mode 100644 app/(pages)/(index-page)/_components/JudgingHub/ViewProjects.module.scss
create mode 100644 app/(pages)/(index-page)/_components/JudgingHub/ViewProjects.tsx
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/HubHero.module.scss b/app/(pages)/(index-page)/_components/JudgingHub/HubHero.module.scss
index f2c73dbd..0eabd286 100644
--- a/app/(pages)/(index-page)/_components/JudgingHub/HubHero.module.scss
+++ b/app/(pages)/(index-page)/_components/JudgingHub/HubHero.module.scss
@@ -28,7 +28,7 @@
}
.welcome_text {
- padding: 68px 13px 0px 13px;
+ padding: 50px 5% 0px 5%;
display: flex;
flex-direction: column;
gap: var(--tiny-spacer);
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/JudgingHub.tsx b/app/(pages)/(index-page)/_components/JudgingHub/JudgingHub.tsx
index ccf7a216..4a321b14 100644
--- a/app/(pages)/(index-page)/_components/JudgingHub/JudgingHub.tsx
+++ b/app/(pages)/(index-page)/_components/JudgingHub/JudgingHub.tsx
@@ -4,6 +4,7 @@ import styles from './JudgingHub.module.scss';
import HubHero from './HubHero';
import JudgingList from './JudgingList';
import TableLocations from './TableLocations';
+import ViewProjects from './ViewProjects';
import { useSubmissions } from '@hooks/useSubmissions';
import { useJudgeGroup } from '@hooks/useJudgeGroup';
@@ -13,6 +14,7 @@ export default function JudgingHub() {
const { unjudgedTeams } = useSubmissions();
return (
+
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/ViewProjects.module.scss b/app/(pages)/(index-page)/_components/JudgingHub/ViewProjects.module.scss
new file mode 100644
index 00000000..ce8d5540
--- /dev/null
+++ b/app/(pages)/(index-page)/_components/JudgingHub/ViewProjects.module.scss
@@ -0,0 +1,28 @@
+.container {
+ background-color: #f2f2f7;
+ padding: 68px 5% 0px 5%;
+
+
+ h1 {
+ font-size: 1.5rem;
+ }
+
+ p {
+ font-size: 1.2rem;
+ }
+
+ button {
+ border: solid 1.5px #005271;
+ color: black;
+ background-color: white;
+ border-radius: 8px;
+ margin-top: 4%;
+ width: 100%;
+ }
+
+ .projects {
+ background-color: #9EE7E5;
+ border-radius: 16px;
+ padding: 7%;
+ }
+}
\ No newline at end of file
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/ViewProjects.tsx b/app/(pages)/(index-page)/_components/JudgingHub/ViewProjects.tsx
new file mode 100644
index 00000000..292babfd
--- /dev/null
+++ b/app/(pages)/(index-page)/_components/JudgingHub/ViewProjects.tsx
@@ -0,0 +1,13 @@
+import styles from './ViewProjects.module.scss';
+
+export default function ViewProjects() {
+ return (
+
+
+
π Attention
+
Judging is now live. Please start making your way to the tables.
+
+
+
+ );
+}
\ No newline at end of file
From a21c1e38d9acb4a67846dee6edde5d6673da94e5 Mon Sep 17 00:00:00 2001
From: Haylie Tan <141064325+haylietan@users.noreply.github.com>
Date: Thu, 26 Sep 2024 20:13:48 -0700
Subject: [PATCH 10/12] Removed drop shadow from text and fixed formatting of
text
---
.../_components/JudgingHub/HubHero.module.scss | 2 +-
.../JudgingHub/TableLocations.module.scss | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/HubHero.module.scss b/app/(pages)/(index-page)/_components/JudgingHub/HubHero.module.scss
index 0eabd286..5e580b24 100644
--- a/app/(pages)/(index-page)/_components/JudgingHub/HubHero.module.scss
+++ b/app/(pages)/(index-page)/_components/JudgingHub/HubHero.module.scss
@@ -56,7 +56,7 @@
font-size: 1.6rem;
padding-top: 15px;
padding-left: 10px;
- text-shadow: 4px 4px 4px rgba(0,0,0,0.31);
+ // text-shadow: 4px 4px 4px rgba(0,0,0,0.31);
}
}
}
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/TableLocations.module.scss b/app/(pages)/(index-page)/_components/JudgingHub/TableLocations.module.scss
index fd3d1bc0..d6d0d755 100644
--- a/app/(pages)/(index-page)/_components/JudgingHub/TableLocations.module.scss
+++ b/app/(pages)/(index-page)/_components/JudgingHub/TableLocations.module.scss
@@ -6,20 +6,20 @@
background: #f2f2f7;
width: 100%;
height: fit-content;
- padding-left: 10%;
- padding-right: 10%;
+ padding-left: 7%;
+ padding-right: 7%;
padding-bottom: 10%;
position: relative;
.header {
color: black;
font-family: "Proxima Nova";
- font-size: 1.2rem;
+ font-size: 1.5rem;
font-style: normal;
line-height: 1.2;
letter-spacing: 0.36px;
- font-weight: 500;
- padding: 5%;
+ padding-bottom: 20px;
+ // font-weight: 500;
text-align: left;
}
.map {
@@ -41,9 +41,9 @@
.bunny_hand {
position: absolute;
- bottom: 0;
+ bottom: -10px;
width: auto;
- right:23%;
+ right: 23%;
height: auto;
z-index: 1; /* If necessary */
}
From 63313b42f631f6a15966acf56e428b61c2c69537 Mon Sep 17 00:00:00 2001
From: Haylie Tan <141064325+haylietan@users.noreply.github.com>
Date: Thu, 26 Sep 2024 20:18:07 -0700
Subject: [PATCH 11/12] Fixed floating bunny hand
---
.../_components/JudgingHub/TableLocations.module.scss | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/TableLocations.module.scss b/app/(pages)/(index-page)/_components/JudgingHub/TableLocations.module.scss
index d6d0d755..13547231 100644
--- a/app/(pages)/(index-page)/_components/JudgingHub/TableLocations.module.scss
+++ b/app/(pages)/(index-page)/_components/JudgingHub/TableLocations.module.scss
@@ -10,6 +10,7 @@
padding-right: 7%;
padding-bottom: 10%;
position: relative;
+ overflow: hidden;
.header {
color: black;
@@ -41,6 +42,7 @@
.bunny_hand {
position: absolute;
+ overflow: hidden;
bottom: -10px;
width: auto;
right: 23%;
From 9b025b0b4b6721a10ae183f8720efdd11c83e1ba Mon Sep 17 00:00:00 2001
From: Haylie Tan <141064325+haylietan@users.noreply.github.com>
Date: Mon, 30 Sep 2024 13:08:25 -0700
Subject: [PATCH 12/12] Fixed errors and removed TableLocations file
---
.../_components/JudgingHub/HubHero.tsx | 74 ++---------
.../_components/JudgingHub/JudgingHub.tsx | 8 +-
.../_components/JudgingHub/JudgingList.tsx | 33 +----
.../JudgingHub/ProjectCarousel.module.scss | 110 ----------------
.../JudgingHub/ProjectCarousel.tsx | 118 ------------------
.../_components/JudgingHub/TableLocations.tsx | 32 ++---
.../_components/JudgingHub/ViewProjects.tsx | 12 +-
7 files changed, 30 insertions(+), 357 deletions(-)
delete mode 100644 app/(pages)/(index-page)/_components/JudgingHub/ProjectCarousel.module.scss
delete mode 100644 app/(pages)/(index-page)/_components/JudgingHub/ProjectCarousel.tsx
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/HubHero.tsx b/app/(pages)/(index-page)/_components/JudgingHub/HubHero.tsx
index 87ea7eba..00e730f6 100644
--- a/app/(pages)/(index-page)/_components/JudgingHub/HubHero.tsx
+++ b/app/(pages)/(index-page)/_components/JudgingHub/HubHero.tsx
@@ -1,19 +1,10 @@
import JudgeInt from '@typeDefs/judges';
import styles from './HubHero.module.scss';
-
import Image from 'next/image';
-
import judgeHeroes from '/public/judges/hub/judgingheroes.svg';
-import judgeCow from '/public/judges/hub/judge-cow.svg';
-import judgeWig from '/public/judges/hub/judge-wig.svg';
-import bg_topleft from '/public/judges/hub/topleft.svg';
-import bg_top from '/public/judges/hub/topright.svg';
-import bg_bottom from '/public/judges/hub/bottom.svg';
export default function HubHero({
- user,
loading,
- members,
}: {
user: JudgeInt;
loading: boolean;
@@ -23,60 +14,27 @@ export default function HubHero({
return 'loading...';
}
- const speechBubbleTail = (
-
- );
-
return (
- {/*
Welcome!
*/}
-
Welcome! {/*{user.name}*/}
-
We appreciate you for helping us judge one of California's biggest hackathons!
+
Welcome!
+
+ We appreciate you for helping us judge one of California's biggest
+ hackathons!
+
-
-
-
-
-
-
- {/*
+
+ */}
-
- {/*
- */}
+ />
- {/*
{speechBubbleTail}
-
You're paired with...
+ {/*
You're paired with...
{members.map((member: string, index: number) => (
{member}
@@ -84,18 +42,6 @@ export default function HubHero({
))} */}
- {/*
-
-
*/}
);
}
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/JudgingHub.tsx b/app/(pages)/(index-page)/_components/JudgingHub/JudgingHub.tsx
index 4a321b14..4c785bda 100644
--- a/app/(pages)/(index-page)/_components/JudgingHub/JudgingHub.tsx
+++ b/app/(pages)/(index-page)/_components/JudgingHub/JudgingHub.tsx
@@ -1,22 +1,18 @@
import { useAuth } from '@hooks/useAuth';
-
import styles from './JudgingHub.module.scss';
import HubHero from './HubHero';
-import JudgingList from './JudgingList';
import TableLocations from './TableLocations';
import ViewProjects from './ViewProjects';
-import { useSubmissions } from '@hooks/useSubmissions';
import { useJudgeGroup } from '@hooks/useJudgeGroup';
export default function JudgingHub() {
const { user, loading } = useAuth();
const { members } = useJudgeGroup();
- const { unjudgedTeams } = useSubmissions();
return (
);
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/JudgingList.tsx b/app/(pages)/(index-page)/_components/JudgingHub/JudgingList.tsx
index 82850ff9..ad6e7412 100644
--- a/app/(pages)/(index-page)/_components/JudgingHub/JudgingList.tsx
+++ b/app/(pages)/(index-page)/_components/JudgingHub/JudgingList.tsx
@@ -1,43 +1,16 @@
-import Link from 'next/link';
import styles from './JudgingList.module.scss';
-import ProjectCarousel from './ProjectCarousel';
-export default function JudgingList({ projects }: { projects: object[] }) {
+export default function JudgingList() {
return (
-
While youβre waiting, feel free to...
- {/*
- You have {projects.length} team(s) left to judge:
-
*/}
-
+
While you're waiting, feel free to...
-
π Charge your phone!
+
π Charge your phone!
π Say hi to other judges!
πΏ Grab a snack and water!
-
-
-
- {/*
- View All Projects
-
- */}
);
}
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/ProjectCarousel.module.scss b/app/(pages)/(index-page)/_components/JudgingHub/ProjectCarousel.module.scss
deleted file mode 100644
index dac81b4a..00000000
--- a/app/(pages)/(index-page)/_components/JudgingHub/ProjectCarousel.module.scss
+++ /dev/null
@@ -1,110 +0,0 @@
-.container {
- width: 100%;
- display: flex;
- flex-direction: column;
- gap: 25px;
-
- .viewport {
- overflow: hidden;
- width: 100%;
-
- .projects {
- display: flex;
- flex-direction: row;
- gap: 15px;
- padding: 0px 17px;
-
- .card_container {
- display: flex;
- flex-direction: column;
- width: 45%;
- flex-shrink: 0;
- padding: 10px;
- background-color: var(--background-secondary-light);
- border-radius: var(--b-radius-large);
- gap: var(--tiny-spacer);
-
- >h2 {
- color: var(--hd-orange);
- font-size: 2rem;
- font-weight: 700;
- }
-
- >p {
- color: var(--text-light);
- font-size: 1rem;
- font-weight: 500;
- }
-
- .project_category {
- width: fit-content;
- display: flex;
- padding: 1.876px 11.257px;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- gap: 7.998px;
- border-radius: 15.009px;
- background: #FFF;
- box-shadow: 0px 2px 16px 0px rgba(0, 0, 0, 0.10);
-
- color: #000;
- font-family: "Proxima Nova";
- font-size: 14px;
- font-style: normal;
- font-weight: 500;
- line-height: 125%; /* 17.5px */
- letter-spacing: 0.28px;
- }
- .category_bubble {
- display: flex;
- padding: 2px 4px;
- justify-content: center;
- align-items: center;
- gap: 10px;
- height: 21px;
- width: 26px;
-
- border-radius: 15.009px;
- background: #9EE7E5;
- box-shadow: 0px 2px 16px 0px rgba(0, 0, 0, 0.10);
-
- }
- }
- }
- }
-
- .controls {
- display: flex;
- flex-direction: row;
- align-items: center;
- gap: var(--small-medium-spacer);
- padding: 0px 17px;
-
- >button {
- border: none;
- background: none;
- width: 64px;
- aspect-ratio: 1;
- flex-grow: 0;
- }
-
- .progress {
- position: relative;
- flex-grow: 1;
- height: 6px;
- border-radius: 3px;
- background-color: var(--text-gray-light);
-
- .progress_bar {
- position: absolute;
- width: 20%;
- border-radius: 10px;
- top: 0;
- bottom: 0;
- left: 0%;
- background-color: #1FBBC0;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/ProjectCarousel.tsx b/app/(pages)/(index-page)/_components/JudgingHub/ProjectCarousel.tsx
deleted file mode 100644
index 5b4a777c..00000000
--- a/app/(pages)/(index-page)/_components/JudgingHub/ProjectCarousel.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-'use client';
-
-import Image from 'next/image';
-import { useRef, useCallback } from 'react';
-import styles from './ProjectCarousel.module.scss';
-import useEmblaCarousel from 'embla-carousel-react';
-import { WheelGesturesPlugin } from 'embla-carousel-wheel-gestures';
-import { useCarouselProgress } from '@hooks/useCarouselProgress';
-import Link from 'next/link';
-
-function JudgingCard({ project }: { project: any }) {
- return (
-
-
#{project.number}
-
{project.name}
-
- {project.tracks[0] && (
-
{project.tracks[0]}
- )}
-
- {project.tracks[1] && (
-
{project.tracks[1]}
- )}
-
- {project.tracks.length > 2 && (
-
{`${
- project.tracks.length - 2
- }+`}
- )}
-
- );
-}
-
-export default function JudgingList({ projects }: { projects: object[] }) {
- const progressBarRef = useRef
(null);
-
- const [emblaRef, emblaApi] = useEmblaCarousel(
- {
- loop: false,
- align: 'start',
- dragFree: true,
- skipSnaps: true,
- watchDrag: true,
- },
- [WheelGesturesPlugin()]
- );
-
- const { scrollProgress, handleProgressBarClick } =
- useCarouselProgress(emblaApi);
-
- const onPrevButtonClick = useCallback(() => {
- if (!emblaApi) return;
- emblaApi.scrollPrev();
- }, [emblaApi]);
-
- const onNextButtonClick = useCallback(() => {
- if (!emblaApi) return;
- emblaApi.scrollNext();
- }, [emblaApi]);
-
- return (
-
- {/*
-
- {projects.map((project, index) => (
-
- ))}
-
-
-
-
-
-
event.stopPropagation()}
- />
-
-
-
*/}
-
- );
-}
diff --git a/app/(pages)/(index-page)/_components/JudgingHub/TableLocations.tsx b/app/(pages)/(index-page)/_components/JudgingHub/TableLocations.tsx
index 69d06833..8c0dd572 100644
--- a/app/(pages)/(index-page)/_components/JudgingHub/TableLocations.tsx
+++ b/app/(pages)/(index-page)/_components/JudgingHub/TableLocations.tsx
@@ -1,12 +1,10 @@
import styles from './TableLocations.module.scss';
-import LogoutButton from '../LogoutButton/LogoutButton';
-import Link from 'next/link';
import Image from 'next/image';
import vinyl from '/public/judges/hub/vinyl.svg';
import bunnyHand from '/public/judges/hub/bunny-hand.svg';
import vinylPlayer from '/public/judges/hub/vinyl-player.svg';
export default function TableLocations() {
- const logOutStyle = {
+ /* const logOutStyle = {
zIndex: 1,
borderRadius: '15.497px',
background: '#9EE7E5',
@@ -26,36 +24,24 @@ export default function TableLocations() {
};
const figmaLink =
'https://www.figma.com/proto/9frZI5Kc9f2c8o4ZIZG8fX/Judging-Table-Map?page-id=0:1&type=design&node-id=1-4&viewport=134,164,0.69&t=Jfp4HXeR7nRs3B6R-1&scaling=min-zoom&mode=design';
-
+ */
return (
-
If you have any questions, please ask a HackDavis director (dark blue shirt)!
+
+ If you have any questions, please ask a HackDavis director (dark blue
+ shirt)!
+
-
-
-
-
-
+
+
-
-
- {/*
- Sign out
- */}
+
-
-
π Attention
-
Judging is now live. Please start making your way to the tables.
-
-
+
+
π Attention
+
Judging is now live. Please start making your way to the tables.
+
+