From 70862290600eb9410342bcae30930c9ac77be80e Mon Sep 17 00:00:00 2001
From: xyntechx <xyntechx@gmail.com>
Date: Mon, 2 Oct 2023 19:12:17 -0700
Subject: [PATCH 1/2] Remove application banner and redirect

---
 frontend/src/Routes.tsx                       |  2 -
 frontend/src/components/Common/Banner.tsx     | 23 --------
 frontend/src/components/Common/Layout.tsx     |  2 -
 .../src/components/Landing/LandingModal.tsx   | 55 -------------------
 frontend/src/views/Apply.tsx                  |  4 --
 frontend/src/views/Landing.tsx                |  2 -
 6 files changed, 88 deletions(-)
 delete mode 100644 frontend/src/components/Common/Banner.tsx
 delete mode 100644 frontend/src/components/Landing/LandingModal.tsx
 delete mode 100644 frontend/src/views/Apply.tsx

diff --git a/frontend/src/Routes.tsx b/frontend/src/Routes.tsx
index 4778161f2..36d7d9f0d 100644
--- a/frontend/src/Routes.tsx
+++ b/frontend/src/Routes.tsx
@@ -20,7 +20,6 @@ const ViewSchedule = () => import('./app/Scheduler/ViewSchedule');
 const PrivacyPolicy = () => import('./views/PrivacyPolicy');
 const TermsOfService = () => import('./views/TermsOfService');
 const RedirectLink = () => import('./views/RedirectLink');
-const Apply = () => import('./views/Apply');
 
 function ScheduleRedirect() {
 	const { scheduleId } = useParams();
@@ -50,7 +49,6 @@ const router = createBrowserRouter([
 			{ path: '/legal/privacy', lazy: PrivacyPolicy },
 			{ path: '/legal/terms', lazy: TermsOfService },
 			{ path: '/redirect', lazy: RedirectLink },
-			{ path: '/apply', lazy: Apply }
 		]
 	},
 	{
diff --git a/frontend/src/components/Common/Banner.tsx b/frontend/src/components/Common/Banner.tsx
deleted file mode 100644
index 61295a1f4..000000000
--- a/frontend/src/components/Common/Banner.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { useSelector, useDispatch } from 'react-redux';
-import { Button } from 'bt/custom';
-import { closeBanner } from '../../redux/common/actions';
-
-import close from '../../assets/svg/common/close.svg';
-import { ReduxState } from 'redux/store';
-
-export default function Banner() {
-	const { banner } = useSelector((state: ReduxState) => state.common);
-	const dispatch = useDispatch();
-
-	return banner ? (
-		<div className="banner">
-			<div className="content">
-				<p>Berkeleytime is looking for student designers and developers to join our team!</p>
-				<Button size="sm" href="https://berkeleytime.com/apply">
-					Apply Now
-				</Button>
-			</div>
-			<img src={close} alt="close" onClick={() => dispatch(closeBanner())} />
-		</div>
-	) : null;
-}
diff --git a/frontend/src/components/Common/Layout.tsx b/frontend/src/components/Common/Layout.tsx
index e67cb2b12..c4f80b807 100644
--- a/frontend/src/components/Common/Layout.tsx
+++ b/frontend/src/components/Common/Layout.tsx
@@ -1,7 +1,6 @@
 import { Suspense, useEffect } from 'react';
 import { Outlet, useLocation } from 'react-router-dom';
 import ReactGA from 'react-ga';
-import Banner from './Banner';
 import Navigation from './Navigation';
 import BTLoader from './BTLoader';
 import Footer from './Footer';
@@ -26,7 +25,6 @@ export default function RootLayout({ footer }: LayoutProps) {
 
 	return (
 		<>
-			<Banner />
 			<Navigation />
 			<Outlet />
 			{footer && <Footer />}
diff --git a/frontend/src/components/Landing/LandingModal.tsx b/frontend/src/components/Landing/LandingModal.tsx
deleted file mode 100644
index 5ac92185a..000000000
--- a/frontend/src/components/Landing/LandingModal.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { useCallback, useEffect } from 'react';
-import { Modal } from 'react-bootstrap';
-import { H3, P, Button } from 'bt/custom';
-import closeIcon from 'assets/svg/common/close.svg';
-import schedulerImg from '../../assets/img/landing/scheduler.png';
-
-import { useDispatch, useSelector } from 'react-redux';
-import { ReduxState } from '../../redux/store';
-import { closeLandingModal } from '../../redux/common/actions';
-
-const modal_info = {
-	subtitle: 'NEW!',
-	title: 'Berkeleytime Scheduler',
-	message: 'Try out our new scheduler feature to build your ideal schedule!',
-	button: 'Explore Scheduler',
-	link: '/scheduler',
-	img: schedulerImg
-};
-
-export default function LandingModal() {
-	const { landingModal } = useSelector((state: ReduxState) => state.common);
-	const dispatch = useDispatch();
-
-	const close = useCallback(() => dispatch(closeLandingModal()), [dispatch]);
-
-	useEffect(() => {
-		return () => {
-			close();
-		};
-	}, [close]);
-
-	return (
-		<Modal
-			show={landingModal}
-			onHide={close}
-			className="landing-modal"
-			dialogClassName={'landing-modal-dialog'}
-		>
-			<button className="landing-close-btn" onClick={close}>
-				<img src={closeIcon} alt="close" />
-			</button>
-			<img className="landing-modal-img" src={modal_info['img']} alt="" />
-			<P bold className="mb-2 landing-modal-subtitle">
-				{modal_info['subtitle']}
-			</P>
-			<H3 bold className="mb-2">
-				{modal_info['title']}
-			</H3>
-			<P className="landing-modal-text">{modal_info['message']}</P>
-			<Button className="landing-modal-btn" href={{ as_link: modal_info['link'] }}>
-				{modal_info['button']}
-			</Button>
-		</Modal>
-	);
-}
diff --git a/frontend/src/views/Apply.tsx b/frontend/src/views/Apply.tsx
deleted file mode 100644
index 923b9781b..000000000
--- a/frontend/src/views/Apply.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-export function Component() {
-	window.location.replace('https://airtable.com/appEYeaqwXtphA3Zc/shrtEq1365WZJNN3c');
-	return null;
-}
diff --git a/frontend/src/views/Landing.tsx b/frontend/src/views/Landing.tsx
index 8fdfed413..39ddca31a 100644
--- a/frontend/src/views/Landing.tsx
+++ b/frontend/src/views/Landing.tsx
@@ -1,13 +1,11 @@
 import Explore from 'components/Landing/Explore';
 import Mission from 'components/Landing/Mission';
 import Blurbs from 'components/Landing/Blurbs';
-import LandingModal from 'components/Landing/LandingModal';
 import Jumbotron from 'components/Landing/Jumbotron';
 
 export default function Landing() {
 	return (
 		<>
-			<LandingModal />
 			<div className="landing-jumbo">
 				<Jumbotron />
 			</div>

From 83a1c8194592fdaa4fe16bac71f91442ff422db6 Mon Sep 17 00:00:00 2001
From: xyntechx <xyntechx@gmail.com>
Date: Mon, 2 Oct 2023 20:01:14 -0700
Subject: [PATCH 2/2] Remove application banner and redirect

---
 frontend/src/Routes.tsx                   | 4 ++--
 frontend/src/components/Common/Layout.tsx | 4 ++--
 frontend/src/views/Landing.tsx            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/Routes.tsx b/frontend/src/Routes.tsx
index 4778161f2..71a8516f2 100644
--- a/frontend/src/Routes.tsx
+++ b/frontend/src/Routes.tsx
@@ -20,7 +20,7 @@ const ViewSchedule = () => import('./app/Scheduler/ViewSchedule');
 const PrivacyPolicy = () => import('./views/PrivacyPolicy');
 const TermsOfService = () => import('./views/TermsOfService');
 const RedirectLink = () => import('./views/RedirectLink');
-const Apply = () => import('./views/Apply');
+// const Apply = () => import('./views/Apply');
 
 function ScheduleRedirect() {
 	const { scheduleId } = useParams();
@@ -50,7 +50,7 @@ const router = createBrowserRouter([
 			{ path: '/legal/privacy', lazy: PrivacyPolicy },
 			{ path: '/legal/terms', lazy: TermsOfService },
 			{ path: '/redirect', lazy: RedirectLink },
-			{ path: '/apply', lazy: Apply }
+			// { path: '/apply', lazy: Apply }
 		]
 	},
 	{
diff --git a/frontend/src/components/Common/Layout.tsx b/frontend/src/components/Common/Layout.tsx
index e67cb2b12..21793ca04 100644
--- a/frontend/src/components/Common/Layout.tsx
+++ b/frontend/src/components/Common/Layout.tsx
@@ -1,7 +1,7 @@
 import { Suspense, useEffect } from 'react';
 import { Outlet, useLocation } from 'react-router-dom';
 import ReactGA from 'react-ga';
-import Banner from './Banner';
+// import Banner from './Banner';
 import Navigation from './Navigation';
 import BTLoader from './BTLoader';
 import Footer from './Footer';
@@ -26,7 +26,7 @@ export default function RootLayout({ footer }: LayoutProps) {
 
 	return (
 		<>
-			<Banner />
+			{/* <Banner /> */}
 			<Navigation />
 			<Outlet />
 			{footer && <Footer />}
diff --git a/frontend/src/views/Landing.tsx b/frontend/src/views/Landing.tsx
index 8fdfed413..98736cddc 100644
--- a/frontend/src/views/Landing.tsx
+++ b/frontend/src/views/Landing.tsx
@@ -1,13 +1,13 @@
 import Explore from 'components/Landing/Explore';
 import Mission from 'components/Landing/Mission';
 import Blurbs from 'components/Landing/Blurbs';
-import LandingModal from 'components/Landing/LandingModal';
+// import LandingModal from 'components/Landing/LandingModal';
 import Jumbotron from 'components/Landing/Jumbotron';
 
 export default function Landing() {
 	return (
 		<>
-			<LandingModal />
+			{/* <LandingModal /> */}
 			<div className="landing-jumbo">
 				<Jumbotron />
 			</div>