diff --git a/frontend/src/Components/Pages/Css/Background.css b/frontend/src/Components/Pages/Css/Background.css index 67ac5a1..179f74c 100644 --- a/frontend/src/Components/Pages/Css/Background.css +++ b/frontend/src/Components/Pages/Css/Background.css @@ -1,4 +1,13 @@ -/* Background utilities copied from ComponentUtils/Css/Background.css */ +/* Shared base styles used by all pages */ +/* Reset browser default margins so header spans full width */ +html, body, #root { height: 100%; } +body { margin: 0; font-family: Roboto, Arial, sans-serif; background: #fff; } + +/* Page layout wrapper used across pages */ .allContainer { display: flex; flex-direction: column; min-height: 100vh; } .footerContainer { margin-top: auto; } + .moderation-loading, .moderation-error { padding: 40px; text-align: center; } + +/* Reset common element spacing to keep consistent top spacing */ +h1, h2, h3, h4, h5 { margin-top: 0; } diff --git a/frontend/src/Components/Pages/GroupImagesPage.js b/frontend/src/Components/Pages/GroupImagesPage.js index 36ef8a9..b296f9a 100644 --- a/frontend/src/Components/Pages/GroupImagesPage.js +++ b/frontend/src/Components/Pages/GroupImagesPage.js @@ -10,7 +10,6 @@ import Footer from '../ComponentUtils/Footer'; import ImagePreviewGallery from '../ComponentUtils/MultiUpload/ImagePreviewGallery'; import DescriptionInput from '../ComponentUtils/MultiUpload/DescriptionInput'; -import '../Pages/Css/Background.css'; import '../Pages/Css/GroupImagesPage.css'; diff --git a/frontend/src/Components/Pages/GroupsOverviewPage.js b/frontend/src/Components/Pages/GroupsOverviewPage.js index a4b285b..2261955 100644 --- a/frontend/src/Components/Pages/GroupsOverviewPage.js +++ b/frontend/src/Components/Pages/GroupsOverviewPage.js @@ -30,7 +30,6 @@ import { fetchAllGroups, deleteGroup } from '../../Utils/batchUpload'; // Styles import '../../App.css'; -import '../Pages/Css/Background.css'; function GroupsOverviewPage() { // use CSS classes from GroupsOverviewPage.css diff --git a/frontend/src/Components/Pages/ModerationPage.js b/frontend/src/Components/Pages/ModerationPage.js index 80fef9e..94be63d 100644 --- a/frontend/src/Components/Pages/ModerationPage.js +++ b/frontend/src/Components/Pages/ModerationPage.js @@ -1,8 +1,10 @@ import React, { useState, useEffect } from 'react'; import { Helmet } from 'react-helmet'; import { useHistory } from 'react-router-dom'; +import { Container } from '@material-ui/core'; import './Css/ModerationPage.css'; import Navbar from '../ComponentUtils/Headers/Navbar'; +import Footer from '../ComponentUtils/Footer'; const ModerationPage = () => { const [groups, setGroups] = useState([]); @@ -147,7 +149,7 @@ const ModerationPage = () => { const approvedGroups = groups.filter(g => g.approved); return ( -
+
Moderation - Interne Verwaltung @@ -155,7 +157,23 @@ const ModerationPage = () => { -

Moderation

+ +

Moderation

+ +
+
+ {pendingGroups.length} + Wartend +
+
+ {approvedGroups.length} + Freigegeben +
+
+ {groups.length} + Gesamt +
+
@@ -225,6 +243,8 @@ const ModerationPage = () => { onDeleteImage={deleteImage} /> )} + +
); }; diff --git a/frontend/src/Components/Pages/MultiUploadPage.js b/frontend/src/Components/Pages/MultiUploadPage.js index 4043e68..9101588 100644 --- a/frontend/src/Components/Pages/MultiUploadPage.js +++ b/frontend/src/Components/Pages/MultiUploadPage.js @@ -18,7 +18,7 @@ import { uploadImageBatch } from '../../Utils/batchUpload'; // Styles import '../../App.css'; -import '../Pages/Css/Background.css'; +// Background.css is now globally imported in src/index.js const useStyles = makeStyles({ container: { diff --git a/frontend/src/Components/Pages/UploadPage.js b/frontend/src/Components/Pages/UploadPage.js index 8741a27..c07681b 100644 --- a/frontend/src/Components/Pages/UploadPage.js +++ b/frontend/src/Components/Pages/UploadPage.js @@ -14,7 +14,7 @@ import 'sweetalert2/src/sweetalert2.scss' import { sendRequest } from '../../Utils/sendRequest' -import '../Pages/Css/Background.css' +// Background.css is now globally imported in src/index.js const useStyles = makeStyles({ multiUploadButton: { diff --git a/frontend/src/index.js b/frontend/src/index.js index c1f31c5..c996bc6 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -1,6 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import App from './App'; +import './Components/Pages/Css/Background.css'; ReactDOM.render(