Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.2.0",
"private": true,
"dependencies": {
"@appquality/appquality-design-system": "^1.0.62",
"@appquality/appquality-design-system": "^1.0.67",
"@appquality/craft-blocks": "^0.1.27",
"@datadog/browser-logs": "^3.4.1",
"@reduxjs/toolkit": "^1.8.2",
Expand Down
280 changes: 141 additions & 139 deletions src/Page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,152 +57,154 @@ function Page() {

return (
<SentryWrapper history={history}>
<SiteWideMessages />
<GenericModal />
<Router history={history}>
<Switch>
<SentryRoute
path={`${base}/getting-started/signup`}
component={Signup}
/>
<SentryRoute
path={`${base}/getting-started/confirmation`}
component={SignupSuccess}
/>
<SentryRoute
path={`${base}/getting-started`}
component={GettingStarted}
/>
<SentryRoute path={`/it/getting-started-2`}>
<Redirect to="/it/getting-started" />
</SentryRoute>
<div aria-live="polite">
<SiteWideMessages />
<GenericModal />
<Router history={history}>
<Switch>
<SentryRoute
path={`${base}/getting-started/signup`}
component={Signup}
/>
<SentryRoute
path={`${base}/getting-started/confirmation`}
component={SignupSuccess}
/>
<SentryRoute
path={`${base}/getting-started`}
component={GettingStarted}
/>
<SentryRoute path={`/it/getting-started-2`}>
<Redirect to="/it/getting-started" />
</SentryRoute>

<SentryRoute path={`${base}/login`} component={Login} />
<SentryRoute path={`${base}/login`} component={Login} />

<SentryRoute
path={`*/login`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: `/login`,
}}
/>
)}
/>
<SentryRoute
path={`*/login`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: `/login`,
}}
/>
)}
/>

<SentryRoute path={`${base}/my-dashboard`} component={Dashboard} />
<SentryRoute path={`${base}/my-dashboard`} component={Dashboard} />

<SentryRoute
path={`${base}/personal-equipment`}
component={Devices}
/>
<SentryRoute
path={`/it/i-miei-device`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: "/it/personal-equipment",
}}
/>
)}
/>
<SentryRoute
path={`/es/dispositivos`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: "/es/personal-equipment",
}}
/>
)}
/>
<SentryRoute
path={`${base}/personal-equipment`}
component={Devices}
/>
<SentryRoute
path={`/it/i-miei-device`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: "/it/personal-equipment",
}}
/>
)}
/>
<SentryRoute
path={`/es/dispositivos`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: "/es/personal-equipment",
}}
/>
)}
/>

<SentryRoute path={`/it/la-mia-dashboard`}>
<Redirect to="/it/my-dashboard" />
</SentryRoute>
<SentryRoute path={`/es/tablero`}>
<Redirect to="/es/my-dashboard" />
</SentryRoute>
<SentryRoute path={`/it/la-mia-dashboard`}>
<Redirect to="/it/my-dashboard" />
</SentryRoute>
<SentryRoute path={`/es/tablero`}>
<Redirect to="/es/my-dashboard" />
</SentryRoute>

<SentryRoute path={`${base}/my-bugs`} component={MyBugs} />
<SentryRoute path={`${base}/vdp/:id/:token`} component={VdpPage} />
<SentryRoute
path={`${base}/experience-points`}
component={ExperiencePoints}
/>
<SentryRoute
path={`${base}/it/punti-esperienza`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: "/it/experience-points",
}}
/>
)}
/>
<SentryRoute
path={`${base}/es/puntos-de-experiencia`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: "/es/experience-points",
}}
/>
)}
/>
<SentryRoute
path={`${base}/it/i-miei-bug`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: "/it/my-bugs",
}}
/>
)}
/>
<SentryRoute
path={`${base}/es/errores-cargados`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: "/es/my-bugs",
}}
/>
)}
/>
<SentryRoute path={`${base}/my-bugs`} component={MyBugs} />
<SentryRoute path={`${base}/vdp/:id/:token`} component={VdpPage} />
<SentryRoute
path={`${base}/experience-points`}
component={ExperiencePoints}
/>
<SentryRoute
path={`${base}/it/punti-esperienza`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: "/it/experience-points",
}}
/>
)}
/>
<SentryRoute
path={`${base}/es/puntos-de-experiencia`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: "/es/experience-points",
}}
/>
)}
/>
<SentryRoute
path={`${base}/it/i-miei-bug`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: "/it/my-bugs",
}}
/>
)}
/>
<SentryRoute
path={`${base}/es/errores-cargados`}
component={({ location }: { location: Location }) => (
<Redirect
to={{
...location,
pathname: "/es/my-bugs",
}}
/>
)}
/>

<SentryRoute path={`${base}/my-account`} component={Profile} />
<SentryRoute path={`${base}/payments`} component={Wallet} />
<SentryRoute path={`${base}/leaderboard`} component={Ranking} />
<SentryRoute
path={`${base}/campaign/:id/bugform`}
component={BugForm}
/>
<SentryRoute path={`${base}/thank-you`} component={ThankYouPage} />
{/* TODO Temporary route */}
<SentryRoute
path={`${base}/campaign/:id/preview-selection-form`}
component={PreviewSelectionForm}
/>
<SentryRoute
path={["/goodbye", "/it/goodbye", "/es/goodbye"]}
exact
component={GoodbyePage}
/>
<SentryRoute
path={["/", "/it", "/es"]}
exact
component={() => <Home />}
/>
</Switch>
</Router>
<SentryRoute path={`${base}/my-account`} component={Profile} />
<SentryRoute path={`${base}/payments`} component={Wallet} />
<SentryRoute path={`${base}/leaderboard`} component={Ranking} />
<SentryRoute
path={`${base}/campaign/:id/bugform`}
component={BugForm}
/>
<SentryRoute path={`${base}/thank-you`} component={ThankYouPage} />
{/* TODO Temporary route */}
<SentryRoute
path={`${base}/campaign/:id/preview-selection-form`}
component={PreviewSelectionForm}
/>
<SentryRoute
path={["/goodbye", "/it/goodbye", "/es/goodbye"]}
exact
component={GoodbyePage}
/>
<SentryRoute
path={["/", "/it", "/es"]}
exact
component={() => <Home />}
/>
</Switch>
</Router>
</div>
</SentryWrapper>
);
}
Expand Down
Loading