Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/judging hub stuff #101

Merged
merged 4 commits into from
Apr 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions app/(pages)/judges/_components/JudgingHub/HubHero.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@

.name_container {
width: 100%;
overflow: hidden;

>h1 {
background: var(--gradient-primary);
Expand Down Expand Up @@ -82,12 +81,6 @@
}
}

.text_bubble_tail {
position: absolute;
bottom: 49.6%;
left: 49.5%;
}

.blurb {
width: 45%;
display: flex;
Expand All @@ -109,6 +102,12 @@
font-size: 1.75rem;
font-weight: 600;
}
.bubble_tail {
position: absolute;
bottom: -8%;
left: -2.5%;
z-index: -1;
}
}
}
}
42 changes: 39 additions & 3 deletions app/(pages)/judges/_components/JudgingHub/HubHero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,46 @@ export default function HubHero({
if (loading) {
return 'loading...';
}

const logOutStyle = {
zIndex: 1,
borderRadius: '15.497px',
background: '#FFC53D',
boxShadow: '0px 3.874px 61.987px 0px rgba(255, 197, 61, 0.16)',
color: '#173A52',
textAlign: 'center',
fontFamily: 'Metropolis',
fontSize: '16px',
fontStyle: 'normal',
fontWeight: 600,
lineHeight: 'normal',
letterSpacing: '0.32px',
width: '357px',
height: '43px',
border: 'none',
alignSelf: 'center',
};

const speechBubbleTail = (
<svg
xmlns="http://www.w3.org/2000/svg"
width="20"
height="20"
viewBox="0 0 20 20"
fill="none"
>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M6.0712 8.81143C5.90657 7.95843 5.82036 7.07751 5.82036 6.17644V-0.0078125H19.644V20.0001C16.2965 20.0001 13.2268 18.8102 10.835 16.8303C8.44879 18.4199 4.62262 19.9309 0 19.0904C1.27323 18.5448 6.18426 15.2707 6.00237 8.7227C6.02438 8.75296 6.04733 8.78253 6.0712 8.81143Z"
fill="white"
/>
</svg>
);

return (
<div className={styles.container}>
<LogoutButton style={{ zIndex: 1 }}>
LOGOUT BUTTON YOU CAN'T MISS THIS
</LogoutButton>
<LogoutButton style={logOutStyle}>Log out</LogoutButton>
<div className={styles.welcome_text}>
<p>Welcome to HackDavis,</p>
<div className={styles.name_container}>
Expand All @@ -39,6 +74,7 @@ export default function HubHero({
<Image src={judgeWig} alt="Judge Wig" className={styles.wig} />
</div>
<div className={styles.blurb}>
<div className={styles.bubble_tail}>{speechBubbleTail}</div>
<p className={styles.intro_text}>You're paired with...</p>
{members.map((member: string, index: number) => (
<p key={index} className={styles.name}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
background: #173A52;
width: 100%;

height: 312px;
padding: 30px 17px 60px 17px;
height: fit-content;
padding: 10% 17px 60px 17px;

.header {
color: #FFF;
Expand All @@ -20,10 +20,10 @@
letter-spacing: 0.36px;
}
.map {
width: 100%;
width: 90%;
height: 100%;
border: 1px solid #000;

background: #D9D9D9;
background: #000;
padding: 10%;
}
}
6 changes: 4 additions & 2 deletions app/(pages)/judges/_components/JudgingHub/TableLocations.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import styles from './TableLocations.module.scss';
import Image from 'next/image';

import map from 'public/judges/hub/map.png';
export default function TableLocations() {
return (
<div className={styles.container}>
<h3 className={styles.header}>Table Locations</h3>
<div className={styles.map}></div>
{/* <h3 className={styles.header}>Table Locations</h3> */}
<Image src={map} alt={'venue map'} className={styles.map} />
</div>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
.categoriesContainer {
display: flex;
flex-direction: row;
justify-content: flex-start;
font-size: 14px;
font-weight: 500;

Expand All @@ -47,5 +46,6 @@
border-radius: 100px;
box-shadow: 0px 2px 16px 0px rgba(0, 0, 0, 0.10);
padding: 5px 7px;
align-self: center;
}
}
Binary file added public/judges/hub/map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.