yay

nwplus · Oct 19, 2024 · 48f1161 · 48f1161
1 parent 41853f1
commit 48f1161
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/assets/hc_background.png b/src/assets/hc_background.png
diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
@@ -8,10 +8,11 @@ import QrCode from '../components/QrCode'
 import { useAuth } from '../utility/Auth'
 // import Hackcamp2023BG from '../components/BackgroundImage'
 import { APPLICATION_STATUS } from '../utility/Constants'
-import backgroundImage from '../assets/cmdf_homebg.svg'
+import backgroundImage from '../assets/hc_background.png'
 import mobileBackgroundImage from '../assets/cmdf_mobilebg.svg'
 import { copyText } from '../utility/Constants'
 import { useHackathon } from '../utility/HackathonProvider'
+import { css } from 'styled-components'
 
 //My Ticket
 const HomeContainer = styled.div`
@@ -38,12 +39,12 @@ const HomeContainerBackground = styled.div`
   ${props =>
     props.backgroundImage &&
     css`
-      background-image: url(${backgroundImage});
+      background-image: url(${props.backgroundImage});
       background-size: cover;
       background-position: right bottom;
 
       ${p => p.theme.mediaQueries.mobile} {
-        background-image: url(${mobileBackgroundImage});
+        background-image: none;
         background-size: cover;
         background-position: center;
       }
@@ -68,7 +69,7 @@ export default withTheme(({ announcements, theme }) => {
 
   return (
     <>
-      <HomeContainerBackground />
+      <HomeContainerBackground backgroundImage={backgroundImage} />
       <HomeContainer>
         {/* {activeHackathon === 'hackcamp' && <Hackcamp2023BG />} */}
         <HackerCountdown />

diff --git a/src/utility/Auth.jsx b/src/utility/Auth.jsx
@@ -81,7 +81,7 @@ export const getRedirectUrl = (redirect, activeHackathon) => {
     case REDIRECT_STATUS.ApplicationNotSubmitted:
       return `/app/${activeHackathon}/application/part-0`
     case REDIRECT_STATUS.ApplicationSubmitted:
-      return `/app/${activeHackathon}`
+      return `/app/${activeHackathon}/application`
     default:
       return `/app/${activeHackathon}/application`
   }

diff --git a/src/utility/Routes.jsx b/src/utility/Routes.jsx
@@ -15,8 +15,9 @@ const NestedRoutes = props => {
   const hackathonFromURL = props.base.split('/')[2].toLowerCase()
 
   useEffect(() => {
-    if (VALID_HACKATHONS.includes(hackathonFromURL) && hackathonFromURL !== activeHackathon) {
+    if (VALID_HACKATHONS.includes(hackathonFromURL)) {
       setActiveHackathon(hackathonFromURL)
+      localStorage.setItem('activeHackathon', activeHackathon)
     }
   }, [props.base, activeHackathon, setActiveHackathon])