From cc718e99b7abc020ef2f43f2afe30ccf9cf451a5 Mon Sep 17 00:00:00 2001 From: Bl20052005 <88120481+Bl20052005@users.noreply.github.com> Date: Thu, 31 Oct 2024 23:11:18 -0700 Subject: [PATCH] added zoom --- .../src/app/schedule/Assets/Circle.module.scss | 14 ++++++++++++++ apps/site/src/app/schedule/Assets/Circle.tsx | 12 ++++++++++++ apps/site/src/app/schedule/DayOne/DayOne.tsx | 1 + apps/site/src/app/schedule/DayThree/DayThree.tsx | 1 + apps/site/src/app/schedule/DayTwo/DayTwo.tsx | 1 + .../src/assets/icons/open_new_window_purple.svg | 4 ++++ 6 files changed, 33 insertions(+) create mode 100644 apps/site/src/assets/icons/open_new_window_purple.svg diff --git a/apps/site/src/app/schedule/Assets/Circle.module.scss b/apps/site/src/app/schedule/Assets/Circle.module.scss index fcd2a0f0..d752cad8 100644 --- a/apps/site/src/app/schedule/Assets/Circle.module.scss +++ b/apps/site/src/app/schedule/Assets/Circle.module.scss @@ -61,3 +61,17 @@ font-size: 16px; } } + +.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; + } +} diff --git a/apps/site/src/app/schedule/Assets/Circle.tsx b/apps/site/src/app/schedule/Assets/Circle.tsx index fd564c52..e4a8d98f 100644 --- a/apps/site/src/app/schedule/Assets/Circle.tsx +++ b/apps/site/src/app/schedule/Assets/Circle.tsx @@ -4,6 +4,7 @@ import styles from "./Circle.module.scss"; import Image from "next/image"; import cross from "@/assets/images/map2/cross.svg"; import convertTime from "../convertTime"; +import openNewWindow from "@/assets/icons/open_new_window_purple.svg"; interface CircleProps { title: String; @@ -13,6 +14,7 @@ interface CircleProps { position: object; up: boolean; time: number; + virtual: String; } const EventCircle: React.FC = ({ @@ -23,6 +25,7 @@ const EventCircle: React.FC = ({ position, up, time, + virtual, }) => { let curTime = new Date(time); return ( @@ -55,6 +58,15 @@ const EventCircle: React.FC = ({
{title}

{location}

+ {virtual && ( + +

Zoom

{" "} + open +
+ )}

{convertTime(startTime, endTime)}

diff --git a/apps/site/src/app/schedule/DayOne/DayOne.tsx b/apps/site/src/app/schedule/DayOne/DayOne.tsx index 99a941b8..07286080 100644 --- a/apps/site/src/app/schedule/DayOne/DayOne.tsx +++ b/apps/site/src/app/schedule/DayOne/DayOne.tsx @@ -52,6 +52,7 @@ const DayOne: React.FC = ({ schedule, time }) => { position={positions[i]} up={i == schedule.length - 1 ? true : false} time={time} + virtual={event?.virtual} /> ))}

Day One

diff --git a/apps/site/src/app/schedule/DayThree/DayThree.tsx b/apps/site/src/app/schedule/DayThree/DayThree.tsx index b38b324c..50cd2e76 100644 --- a/apps/site/src/app/schedule/DayThree/DayThree.tsx +++ b/apps/site/src/app/schedule/DayThree/DayThree.tsx @@ -36,6 +36,7 @@ const DayThree: React.FC = ({ schedule, time }) => { position={positions[i]} up={i == schedule.length - 1 ? true : false} time={time} + virtual={event?.virtual} /> ))}

Day Three

diff --git a/apps/site/src/app/schedule/DayTwo/DayTwo.tsx b/apps/site/src/app/schedule/DayTwo/DayTwo.tsx index 95500e4a..6d4d5481 100644 --- a/apps/site/src/app/schedule/DayTwo/DayTwo.tsx +++ b/apps/site/src/app/schedule/DayTwo/DayTwo.tsx @@ -51,6 +51,7 @@ const DayTwo: React.FC = ({ schedule, time }) => { position={positions[i]} up={i == schedule.length - 1 ? true : false} time={time} + virtual={event?.virtual} /> ))}

Day Two

diff --git a/apps/site/src/assets/icons/open_new_window_purple.svg b/apps/site/src/assets/icons/open_new_window_purple.svg new file mode 100644 index 00000000..9d8e039a --- /dev/null +++ b/apps/site/src/assets/icons/open_new_window_purple.svg @@ -0,0 +1,4 @@ + + + +