Skip to content

Commit

Permalink
Merge pull request #627 from asuc-octo/remove-banner-redirect-610
Browse files Browse the repository at this point in the history
Remove application banner and redirect
  • Loading branch information
xyntechx authored Oct 7, 2023
2 parents ddc5aba + ead1bc5 commit 82b791d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions frontend/src/Routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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 }
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Common/Layout.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -26,7 +26,7 @@ export default function RootLayout({ footer }: LayoutProps) {

return (
<>
<Banner />
{/* <Banner /> */}
<Navigation />
<Outlet />
{footer && <Footer />}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/Landing.tsx
Original file line number Diff line number Diff line change
@@ -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>
Expand Down

0 comments on commit 82b791d

Please sign in to comment.