Skip to content

Commit 2400837

Browse files
lukazuljeviclukazuljevic
committed
add variable the controles if app is open
1 parent 5f1361f commit 2400837

File tree

3 files changed

+79
-59
lines changed

3 files changed

+79
-59
lines changed

‎apps/app/src/router/Router.tsx‎

Lines changed: 77 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ import FloorPlanPage from '@/pages/FloorPlanPage/FloorPlanPage';
3838
import AccreditationScanPage from '@/pages/AccreditationScanPage';
3939
import { GoogleCallback } from '@/pages/GoogleCallbackPage/GoogleCallback';
4040

41-
// import ClosedAppPage from '@/pages/ClosedAppPage';
41+
import ClosedAppPage from '@/pages/ClosedAppPage';
42+
43+
const isAppOpen = false;
4244

4345
const router = createBrowserRouter(
4446
createRoutesFromElements(
@@ -47,69 +49,93 @@ const router = createBrowserRouter(
4749
path={RouteNames.TERMS_AND_CONDITIONS}
4850
element={<TermsAndConditionsPage />}
4951
/>
50-
<Route path={RouteNames.LOGIN} element={<LoginPage />} />
51-
<Route element={<RegistrationLayout />}>
52-
<Route path={RouteNames.REGISTER} element={<RegisterPage />} />
53-
<Route path={RouteNames.PROFILE_AVATARS} element={<AvatarsPage />} />
54-
</Route>
55-
<Route path={RouteNames.CONFIRM_EMAIL} element={<ConfirmEmailPage />} />
56-
<Route path={RouteNames.PASSWORD_RESET} element={<PasswordResetPage />} />
57-
<Route
58-
path={RouteNames.PASSWORD_RESET_WITH_TOKEN}
59-
element={<PasswordResetPage />}
60-
/>
61-
<Route path={RouteNames.NOTIFICATIONS} element={<NotificationsPage />} />
62-
<Route path={RouteNames.RATE_COMPANY} element={<RateCompanyPage />} />
63-
<Route path={RouteNames.RATE_EVENT} element={<RateLecturePage />} />
64-
<Route path={RouteNames.SCANNER} element={<ScannerPage />} />
65-
<Route path={RouteNames.FLOOR_PLAN} element={<FloorPlanPage />} />
66-
<Route element={<NavigationLayout />} errorElement={<>error</>}>
67-
<Route path={RouteNames.HOME} element={<Home />} />
6852

69-
<Route path={RouteNames.PROFILE}>
70-
<Route index element={<ProfilePage />} />
53+
{isAppOpen ? (
54+
<>
55+
<Route path={RouteNames.LOGIN} element={<LoginPage />} />
7156
<Route
72-
path={RouteNames.PROFILE_INTERESTS}
73-
element={<ProfileInterestsPage />}
57+
path={RouteNames.GOOGLE_CALLBACK}
58+
element={<GoogleCallback />}
7459
/>
75-
<Route path={RouteNames.PROFILE_REWARDS} element={<RewardsPage />} />
60+
61+
<Route element={<RegistrationLayout />}>
62+
<Route path={RouteNames.REGISTER} element={<RegisterPage />} />
63+
<Route
64+
path={RouteNames.PROFILE_AVATARS}
65+
element={<AvatarsPage />}
66+
/>
67+
</Route>
68+
7669
<Route
77-
path={RouteNames.PROFILE_RECOMMENDATIONS}
78-
element={<ProfileRecommendationsPage></ProfileRecommendationsPage>}
70+
path={RouteNames.CONFIRM_EMAIL}
71+
element={<ConfirmEmailPage />}
7972
/>
8073
<Route
81-
path={RouteNames.PROFILE_SETTINGS}
82-
element={<SettingsPage />}
74+
path={RouteNames.PASSWORD_RESET}
75+
element={<PasswordResetPage />}
8376
/>
8477
<Route
85-
path={RouteNames.PROFILE_ACHIEVEMENTS}
86-
element={<ProfileAchievementsPage />}
78+
path={RouteNames.PASSWORD_RESET_WITH_TOKEN}
79+
element={<PasswordResetPage />}
8780
/>
8881
<Route
89-
path={RouteNames.PROFILE_LEADERBOARD}
90-
element={<ProfileLeaderboardPage />}
82+
path={RouteNames.NOTIFICATIONS}
83+
element={<NotificationsPage />}
9184
/>
92-
<Route path={RouteNames.PROFILE_RECOMMENDATIONS} element={<></>} />
93-
</Route>
94-
<Route path={RouteNames.COMPANIES} element={<CompaniesPage />} />
95-
<Route path={RouteNames.SCHEDULE} element={<SchedulePage />} />
96-
<Route path={RouteNames.FLY_TALKS} element={<FlyTalksPage />} />
97-
<Route
98-
path={RouteNames.FLY_TALKS_APPLY}
99-
element={<FlyTalksApplyPage />}
100-
/>
101-
<Route path={RouteNames.SHOPPING} element={<ShoppingPage />} />
102-
<Route
103-
path={RouteNames.ACCREDITATION_SCAN}
104-
element={<AccreditationScanPage />}
105-
/>
106-
</Route>
107-
<Route path='/app/test' element={<TestPage />} />
108-
<Route path='*' element={<NotFoundPage />} />
85+
<Route path={RouteNames.RATE_COMPANY} element={<RateCompanyPage />} />
86+
<Route path={RouteNames.RATE_EVENT} element={<RateLecturePage />} />
87+
<Route path={RouteNames.SCANNER} element={<ScannerPage />} />
88+
<Route path={RouteNames.FLOOR_PLAN} element={<FloorPlanPage />} />
10989

110-
<Route path={RouteNames.GOOGLE_CALLBACK} element={<GoogleCallback />} />
90+
<Route element={<NavigationLayout />} errorElement={<>error</>}>
91+
<Route path={RouteNames.HOME} element={<Home />} />
92+
<Route path={RouteNames.PROFILE}>
93+
<Route index element={<ProfilePage />} />
94+
<Route
95+
path={RouteNames.PROFILE_INTERESTS}
96+
element={<ProfileInterestsPage />}
97+
/>
98+
<Route
99+
path={RouteNames.PROFILE_REWARDS}
100+
element={<RewardsPage />}
101+
/>
102+
<Route
103+
path={RouteNames.PROFILE_RECOMMENDATIONS}
104+
element={<ProfileRecommendationsPage />}
105+
/>
106+
<Route
107+
path={RouteNames.PROFILE_SETTINGS}
108+
element={<SettingsPage />}
109+
/>
110+
<Route
111+
path={RouteNames.PROFILE_ACHIEVEMENTS}
112+
element={<ProfileAchievementsPage />}
113+
/>
114+
<Route
115+
path={RouteNames.PROFILE_LEADERBOARD}
116+
element={<ProfileLeaderboardPage />}
117+
/>
118+
</Route>
119+
<Route path={RouteNames.COMPANIES} element={<CompaniesPage />} />
120+
<Route path={RouteNames.SCHEDULE} element={<SchedulePage />} />
121+
<Route path={RouteNames.FLY_TALKS} element={<FlyTalksPage />} />
122+
<Route
123+
path={RouteNames.FLY_TALKS_APPLY}
124+
element={<FlyTalksApplyPage />}
125+
/>
126+
<Route path={RouteNames.SHOPPING} element={<ShoppingPage />} />
127+
<Route
128+
path={RouteNames.ACCREDITATION_SCAN}
129+
element={<AccreditationScanPage />}
130+
/>
131+
</Route>
132+
<Route path='/app/test' element={<TestPage />} />
111133

112-
{/* <Route path='*' element={<ClosedAppPage />} />c */}
134+
<Route path='*' element={<NotFoundPage />} />
135+
</>
136+
) : (
137+
<Route path='*' element={<ClosedAppPage />} />
138+
)}
113139
</React.Fragment>,
114140
),
115141
);

‎apps/sponsor/src/App.tsx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ export const App = () => {
3232
path='/sponsor/materials'
3333
children={<Redirect to={Path.Materials} />}
3434
/>
35-
{/*
36-
<Route
37-
path='/sponsor/stand'
38-
children={<Redirect to={Path.SpotsPage} />}
39-
/>
40-
*/}
4135
</Switch>
4236
<Toaster />
4337
</HelmetProvider>

‎infrastructure/ansible/playbooks/api/roles/api/files/production.enc.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ sops_kms__list_0__map_arn=arn:aws:kms:us-east-1:763640948377:alias/ddays-app
1515
sops_kms__list_0__map_aws_profile=ddays-app
1616
sops_kms__list_0__map_created_at=2024-01-17T23:19:29Z
1717
sops_kms__list_0__map_enc=AQICAHgdcjswtFLRk2r0EsHvbS93T1AaxRGQ/GRNaO0DtK3p7QH2x6u7Sn853Jp5ObqvnZUgAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMmdGLQYhSHC9fA7DRAgEQgDsEVeyn6ahs0a2ULlJ/lbb8AdPEPwL2FlwM/9534AGAAY2pCFm+ybhVatpAPlcst6uPQkcvtP+v0Itk6w==
18-
sops_lastmodified=2025-09-11T15:37:12Z
19-
sops_mac=ENC[AES256_GCM,data:+dD3q1a9NmLIrCBMRqt2+tf+TZqJO8TfY7E1T9LrRhPFy7IKExn4iyup4mIHvN/TfjdODa9VISgJbBENyc4amhUDNvqH7BUZn4s72g6hAbOTSENgOdpW6VgKpmkvWJjZyG6ONjyoeFu0xMC6/NEnHIL+bYkAzOd8teekWP3WCDI=,iv:xBhOOrRAOoMOxqGOkF5G6X309Bxud8AjwGCienoLBQI=,tag:3acAA+05jINIkfIEcFTpJA==,type:str]
18+
sops_lastmodified=2025-12-23T16:32:51Z
19+
sops_mac=ENC[AES256_GCM,data:TD8VImYl4Uv4ugsyiaoCbYS+ocjDf5GiSZb+scd+GJSdJiI8sDezjm8hV0ycCx6aN4AvouaO5qjG6+nThHtfyQdrc36CA76RyP1893hso4W0V5RTTDcSNYqYfZA73VNHHwJ5Ew2DleGxCxFXK26Ytb588cTqoq93NgfrgysORVc=,iv:1hU0/32wDtERleFnWt8gKQ/lnRMhdk5XFYydmGovCAQ=,tag:R0F9M7GbtSpHLc5P4YwsfQ==,type:str]
2020
sops_unencrypted_suffix=_unencrypted
2121
sops_version=3.10.2

0 commit comments

Comments
 (0)