From f22b3cd80013ab19b74ac297a5f0ca92a2a1d7ae Mon Sep 17 00:00:00 2001 From: JakeBareng Date: Wed, 20 Sep 2023 12:01:05 -0700 Subject: [PATCH 1/4] removed right margin on mobile view --- frontend/src/app/NavBar.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/NavBar.tsx b/frontend/src/app/NavBar.tsx index bb0362b..89c7386 100644 --- a/frontend/src/app/NavBar.tsx +++ b/frontend/src/app/NavBar.tsx @@ -61,13 +61,14 @@ export class NavBar extends Component
;
; - return
+ return ( +
club-logo
-
+
@@ -78,8 +79,9 @@ export class NavBar extends Component
+
-
; + ); } } From 1d410de1e25e368353f1a5c3dff225d0779a4946 Mon Sep 17 00:00:00 2001 From: Anderson T Date: Fri, 22 Sep 2023 00:17:34 -0700 Subject: [PATCH 2/4] mentor registration closed --- frontend/src/app/hacks/Body.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/app/hacks/Body.tsx b/frontend/src/app/hacks/Body.tsx index 2f909ae..0735495 100644 --- a/frontend/src/app/hacks/Body.tsx +++ b/frontend/src/app/hacks/Body.tsx @@ -20,8 +20,6 @@ export function Body()
Registration is closed! - - We are still looking for Mentors: register now!
From c559a099347f7aa63d81df88d52ca80a583c1b90 Mon Sep 17 00:00:00 2001 From: Anderson T Date: Fri, 22 Sep 2023 00:17:43 -0700 Subject: [PATCH 3/4] timer improvements, sorry rishit --- frontend/src/app/hacks/Timer.tsx | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/hacks/Timer.tsx b/frontend/src/app/hacks/Timer.tsx index a5f7345..961ec08 100644 --- a/frontend/src/app/hacks/Timer.tsx +++ b/frontend/src/app/hacks/Timer.tsx @@ -33,7 +33,9 @@ export class Timer extends Component protected TimeDifference: number; public Tick(): void - { + { + this.UpdateTimeStamp() + setInterval(()=> { this.UpdateTimeStamp(); if(this.TimeDifference > 0) @@ -46,8 +48,8 @@ export class Timer extends Component minutes: number = Math.floor((this.TimeDifference % 3600) / 60), hours: number = Math.floor((this.TimeDifference % 86400) / 3600), days: number = Math.floor(this.TimeDifference / (3600 * 24)); - - this.setState({CurrentTimeStamp: new TimeStamp(days, hours, minutes, seconds)}); + + this.setState({CurrentTimeStamp: new TimeStamp(days, hours, minutes, seconds)} ); } public UNSAFE_componentWillMount() { @@ -57,15 +59,20 @@ export class Timer extends Component render() { - return
- {this.state.CurrentTimeStamp.Days}d {this.state.CurrentTimeStamp.Hours}h {this.state.CurrentTimeStamp.Minutes}m {this.state.CurrentTimeStamp.Seconds}s + return
+ {this.state.CurrentTimeStamp.Days}d {this.state.CurrentTimeStamp.Hours}h {this.state.CurrentTimeStamp.Minutes}m {this.state.CurrentTimeStamp.Seconds}s
} constructor(props: TimerProps) { super(props); + + // I can't figure out how to fix the server time right now, SORRY RISHIT + let date = new Date(); + date.setHours(date.getHours()-7); - this.TimeDifference = Math.abs((this.props.EndTime.valueOf() - new Date().valueOf())) / 1000; + this.TimeDifference = Math.abs((this.props.EndTime.valueOf() - date.valueOf())) / 1000; + //this.TimeDifference = Math.abs((this.props.EndTime.valueOf() - new Date().valueOf())) / 1000; } } \ No newline at end of file From 826932461d3d459639dcee9330b20b1deadb7b4f Mon Sep 17 00:00:00 2001 From: Anderson T Date: Fri, 22 Sep 2023 00:28:18 -0700 Subject: [PATCH 4/4] fix schedule on mobile --- frontend/src/app/hacks/schedule/Body.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/hacks/schedule/Body.tsx b/frontend/src/app/hacks/schedule/Body.tsx index c7e5a32..5cc6973 100644 --- a/frontend/src/app/hacks/schedule/Body.tsx +++ b/frontend/src/app/hacks/schedule/Body.tsx @@ -4,10 +4,11 @@ import {SocialIcons} from "@/app/SocialIcons"; export function Body() { return
+
Schedule
- +