Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update theming to correctly match ISTEX design #24

Merged
merged 9 commits into from
Mar 29, 2024
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
Empty file removed tdm-fe/public/.keep
Empty file.
387 changes: 387 additions & 0 deletions tdm-fe/public/logo/abes.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 49 additions & 0 deletions tdm-fe/public/logo/cnrs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions tdm-fe/public/logo/couperin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
74 changes: 74 additions & 0 deletions tdm-fe/public/logo/france_universites.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tdm-fe/public/logo/investissement.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
1 change: 1 addition & 0 deletions tdm-fe/public/logo/mesr.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions tdm-fe/public/logo/ul.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tdm-fe/public/ws-footer-background.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 8 additions & 4 deletions tdm-fe/src/app/App.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
@import "src/app/scss/colors";

/*
Note: The app can't render properly under 500px
*/

body {
min-height: 100vh;
margin: 0;
Expand All @@ -16,6 +20,10 @@ body {
font-family: "Open Sans", sans-serif;
}

#app-container {
flex: 1;
}

.text {
color: $light-black;
}
Expand All @@ -33,7 +41,3 @@ h6 {
font-family: Montserrat, sans-serif;
color: $light-black;
}

#app-container {
margin: 12px 24px;
}
11 changes: 9 additions & 2 deletions tdm-fe/src/app/App.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
import '~/app/App.scss';
import Footer from '~/app/components/layout/Footer';
import Header from '~/app/components/layout/Header';
import WebServicesFooter from '~/app/components/layout/WebServicesFooter';
import WebServicesHeader from '~/app/components/layout/WebServicesHeader';
import ProcessingCreationForm from '~/app/pages/ProcessingCreationForm';
import ProcessingStatus from '~/app/pages/ProcessingStatus';
import ProcessingFormContextProvider from '~/app/provider/ProcessingFormContextProvider';
import { RouteProcessingStatus, RouteRoot } from '~/app/shared/routes';

import Container from '@mui/material/Container';
import { Route, Routes } from 'react-router-dom';

const App = () => {
return (
<>
<Header />
<div id="app-container">
<WebServicesHeader />
<Container id="app-container">
<Routes>
<Route
path={RouteRoot}
Expand All @@ -23,7 +28,9 @@ const App = () => {
/>
<Route path={`${RouteProcessingStatus}/:id`} element={<ProcessingStatus />} />
</Routes>
</div>
</Container>
<WebServicesFooter />
<Footer />
</>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const ProcessingFormConfirmation = () => {
<>
<p>Le traitement a commencé. Vous allez recevoir un mail contenant un résumé.</p>
<p>
Vous pouvez voir l&apos;avancement du traitement via la page de statut des traitements :{' '}
Vous pouvez voir l&lsquo;avancement du traitement via la page de statut des traitements :{' '}
<Link href={href}>{processingId}</Link>
</p>
</>
Expand Down
Loading
Loading