diff --git a/tdm-fe/public/.keep b/tdm-fe/public/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/tdm-fe/public/logo/abes.svg b/tdm-fe/public/logo/abes.svg new file mode 100644 index 0000000..7bd75b0 --- /dev/null +++ b/tdm-fe/public/logo/abes.svg @@ -0,0 +1,387 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tdm-fe/public/logo/cnrs.svg b/tdm-fe/public/logo/cnrs.svg new file mode 100644 index 0000000..b1f8542 --- /dev/null +++ b/tdm-fe/public/logo/cnrs.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + diff --git a/tdm-fe/public/logo/couperin.svg b/tdm-fe/public/logo/couperin.svg new file mode 100644 index 0000000..b8a18a4 --- /dev/null +++ b/tdm-fe/public/logo/couperin.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tdm-fe/public/logo/france_universites.svg b/tdm-fe/public/logo/france_universites.svg new file mode 100644 index 0000000..3b9d412 --- /dev/null +++ b/tdm-fe/public/logo/france_universites.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tdm-fe/public/logo/investissement.png b/tdm-fe/public/logo/investissement.png new file mode 100644 index 0000000..5e9d0c0 Binary files /dev/null and b/tdm-fe/public/logo/investissement.png differ diff --git a/tdm-fe/public/istex.png b/tdm-fe/public/logo/istex.png similarity index 100% rename from tdm-fe/public/istex.png rename to tdm-fe/public/logo/istex.png diff --git a/tdm-fe/public/logo/mesr.svg b/tdm-fe/public/logo/mesr.svg new file mode 100644 index 0000000..03a48f5 --- /dev/null +++ b/tdm-fe/public/logo/mesr.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tdm-fe/public/logo/ul.svg b/tdm-fe/public/logo/ul.svg new file mode 100644 index 0000000..3c50967 --- /dev/null +++ b/tdm-fe/public/logo/ul.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tdm-fe/public/ws-footer-background.jpg b/tdm-fe/public/ws-footer-background.jpg new file mode 100644 index 0000000..f4c3838 Binary files /dev/null and b/tdm-fe/public/ws-footer-background.jpg differ diff --git a/tdm-fe/src/app/App.scss b/tdm-fe/src/app/App.scss index f3b8f03..dabc1ed 100644 --- a/tdm-fe/src/app/App.scss +++ b/tdm-fe/src/app/App.scss @@ -1,5 +1,9 @@ @import "src/app/scss/colors"; +/* + Note: The app can't render properly under 500px +*/ + body { min-height: 100vh; margin: 0; @@ -16,6 +20,10 @@ body { font-family: "Open Sans", sans-serif; } +#app-container { + flex: 1; +} + .text { color: $light-black; } @@ -33,7 +41,3 @@ h6 { font-family: Montserrat, sans-serif; color: $light-black; } - -#app-container { - margin: 12px 24px; -} diff --git a/tdm-fe/src/app/App.tsx b/tdm-fe/src/app/App.tsx index 288031c..b097c0b 100644 --- a/tdm-fe/src/app/App.tsx +++ b/tdm-fe/src/app/App.tsx @@ -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 ( <>
-
+ + { /> } /> -
+ + +