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

Added Schedule Page #205

Merged
merged 20 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from 17 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
3 changes: 2 additions & 1 deletion apps/site/src/app/(home)/sections/FAQ/FAQ.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ $item-padding-x: 3rem;
padding: $mobile-item-padding-y $mobile-item-padding-x;
}

.faq-header, .faq-header > * {
.faq-header,
.faq-header > * {
font-weight: 600;
}

Expand Down
77 changes: 77 additions & 0 deletions apps/site/src/app/schedule/Assets/Circle.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
@use "bootstrap-utils" as bootstrap;
@use "zothacks-theme" as theme;

.outerCircle {
background-color: theme.$white;
border: 5px solid theme.$lighter-black;
width: 50px;
height: 50px;
border-radius: 50%;
display: flex;
justify-content: center;
align-items: center;
z-index: 1;
bottom: 0;
position: absolute;
}

.innerCircle {
background-color: theme.$red;
min-width: 30px;
min-height: 30px;
border-radius: 50%;
transition-duration: 0.5s;
}

.textContainer {
top: 45px;
left: 20px;
position: absolute;
min-width: 150px;
transform: translateX(-50%);
text-align: center;
display: flex;
flex-direction: column;
align-items: center;
}

.location {
width: 300px;
text-align: center;
padding: 0;
margin: 0;
font-size: 20px;
@include bootstrap.media-breakpoint-down(md) {
font-size: 16px;
IanWearsHat marked this conversation as resolved.
Show resolved Hide resolved
width: 160px;
}
}

.title {
text-align: center;
width: 200px;
}

.time {
text-align: center;
padding: 0;
margin: 0;
font-size: 20px;
IanWearsHat marked this conversation as resolved.
Show resolved Hide resolved
@include bootstrap.media-breakpoint-down(md) {
font-size: 16px;
IanWearsHat marked this conversation as resolved.
Show resolved Hide resolved
}
}

.virtual {
display: flex;
align-items: baseline;
gap: 5px;
text-decoration: none;
color: theme.$purple;
p {
margin: 0;
padding: 0;
font-weight: bold;
font-size: 20px;
IanWearsHat marked this conversation as resolved.
Show resolved Hide resolved
}
}
81 changes: 81 additions & 0 deletions apps/site/src/app/schedule/Assets/Circle.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
"use client";

import Image from "next/image";

import convertTime from "../convertTime";

import styles from "./Circle.module.scss";

import cross from "@/assets/images/map2/cross.svg";
import openNewWindow from "@/assets/icons/open_new_window_purple.svg";
IanWearsHat marked this conversation as resolved.
Show resolved Hide resolved

interface CircleProps {
title: String;
location: String;
startTime: Date;
endTime: Date;
position: object;
up: boolean;
time: number;
virtual: String;
}

const EventCircle: React.FC<CircleProps> = ({
title,
location,
startTime,
endTime,
position,
up,
time,
virtual,
}) => {
let curTime = new Date(time);
return (
<div
className={styles.outerCircle}
style={
title == "Hacking Ends"
? {
...position,
backgroundColor: "transparent",
borderColor: "transparent",
}
: position
}
>
{title == "Hacking Ends" ? (
<Image src={cross} alt="x" />
) : (
<div
className={styles.innerCircle}
style={
curTime >= startTime
? curTime > endTime
? { backgroundColor: "#01a7c5" }
: { backgroundColor: "#ffd600" }
: { backgroundColor: "#bd5a5a" }
}
></div>
)}
<div className={styles.textContainer} style={up ? { top: "-160px" } : {}}>
<h5 className={styles.title}>{title}</h5>
<p className={styles.location}>{location}</p>
<p className={styles.time}>{convertTime(startTime, endTime)}</p>
{virtual && (
<a
href={`${virtual}`}
className={styles.virtual}
target="_blank"
rel="noopener noreferrer"
>
<p>Zoom</p>
<Image src={openNewWindow} alt="open" />
</a>
)}
</div>
</div>
);
};

export default EventCircle;

This file was deleted.

170 changes: 0 additions & 170 deletions apps/site/src/app/schedule/ClipboardSchedule/ClipboardSchedule.tsx

This file was deleted.

1 change: 0 additions & 1 deletion apps/site/src/app/schedule/ClipboardSchedule/index.ts

This file was deleted.

Loading
Loading