Skip to content
Snippets Groups Projects
Commit 03a2ad78 authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

Merge remote-tracking branch 'origin/dev' into react-query

parents c5620d31 8ba4995f
Branches
No related tags found
1 merge request!116feat(login): stay on page after refresh
Pipeline #72904 failed
...@@ -83,6 +83,8 @@ deploy_rec: ...@@ -83,6 +83,8 @@ deploy_rec:
- oc apply -f k8s/deployments - oc apply -f k8s/deployments
- oc apply -f k8s/services - oc apply -f k8s/services
- oc apply -f k8s/routes - oc apply -f k8s/routes
- oc delete pod -l app=ecolyo-agent-client
tags: tags:
- ns-ecolyo-bo-r01-syn - ns-ecolyo-bo-r01-syn
only: only:
......
@import '../../styles/config/colors'; @import '../../styles/config/colors';
@import '../../styles/config/breakpoints'; @import '../../styles/config/breakpoints';
.root { .root {
display: flex; display: flex;
background: $dark-bg; background: $dark-bg;
...@@ -9,6 +10,9 @@ ...@@ -9,6 +10,9 @@
.wrapper { .wrapper {
flex: 1; flex: 1;
box-shadow:
0px 5px 5px rgb(0 0 0 / 20%),
0px 3px 14px rgb(0 0 0 / 12%),
box-shadow: box-shadow:
0px 5px 5px rgb(0 0 0 / 20%), 0px 5px 5px rgb(0 0 0 / 20%),
0px 3px 14px rgb(0 0 0 / 12%), 0px 3px 14px rgb(0 0 0 / 12%),
...@@ -18,5 +22,6 @@ ...@@ -18,5 +22,6 @@
@media screen and (max-width: $width-tablet) { @media screen and (max-width: $width-tablet) {
margin-left: 0; margin-left: 0;
padding-bottom: 5rem; padding-bottom: 5rem;
padding-bottom: 5rem;
} }
} }
...@@ -50,6 +50,7 @@ const Router = () => { ...@@ -50,6 +50,7 @@ const Router = () => {
<Route path="/popups" element={<Popups />} /> <Route path="/popups" element={<Popups />} />
{user.isAdmin && ( {user.isAdmin && (
<Route path={links.consents.path} element={<Consents />} /> <Route path={links.consents.path} element={<Consents />} />
<Route path={links.consents.path} element={<Consents />} />
)} )}
<Route path="/login" element={<Login />} /> <Route path="/login" element={<Login />} />
<Route <Route
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment