Added pages: About TMEIT, Documents, along with mobile fixes to the u…

…ser menu (#196) * Have started to work on a new documents-page. I will have to figure out how to import the module to the app * tmp * Added the About TMEIT-page * About page and documents page done - for now * updated version number Co-authored-by: Sebbe <[email protected]>
TMEIT · Jan 8, 2023 · 510c4ce · 510c4ce
1 parent 57d1150
commit 510c4ce
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 6 deletions.
diff --git a/back/pyproject.toml b/back/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tmeit_backend"
-version = "1.0.2"
+version = "1.0.3"
 description = "Python backend for the TMEIT website"
 authors = ["TraditionsMEsterIT"]
 license = "AGPL-3.0"

diff --git a/deploy/kubernetes/tmeit-se/postgres/set_image_tag.json b/deploy/kubernetes/tmeit-se/postgres/set_image_tag.json
@@ -2,6 +2,6 @@
   {
     "op": "replace",
     "path": "/spec/jobTemplate/spec/template/spec/containers/0/image",
-    "value": "ghcr.io/tmeit/db-backup-agent:1.0.2"
+    "value": "ghcr.io/tmeit/db-backup-agent:1.0.3"
   }
 ]
diff --git a/deploy/kubernetes/tmeit-se/run-migrations/set_image_tag.json b/deploy/kubernetes/tmeit-se/run-migrations/set_image_tag.json
@@ -2,6 +2,6 @@
   {
     "op": "replace",
     "path": "/spec/template/spec/containers/0/image",
-    "value": "ghcr.io/tmeit/tmeit-run-migrations:1.0.2"
+    "value": "ghcr.io/tmeit/tmeit-run-migrations:1.0.3"
   }
 ]
diff --git a/deploy/kubernetes/tmeit-se/tmeit-app/set_image_tag.json b/deploy/kubernetes/tmeit-se/tmeit-app/set_image_tag.json
@@ -2,6 +2,6 @@
   {
     "op": "replace",
     "path": "/spec/template/spec/containers/0/image",
-    "value": "ghcr.io/tmeit/tmeit-app:1.0.2"
+    "value": "ghcr.io/tmeit/tmeit-app:1.0.3"
   }
 ]
diff --git a/deploy/kubernetes/tmeit-se/tmeit-worker/set_image_tag.json b/deploy/kubernetes/tmeit-se/tmeit-worker/set_image_tag.json
@@ -2,6 +2,6 @@
   {
     "op": "replace",
     "path": "/spec/template/spec/containers/0/image",
-    "value": "ghcr.io/tmeit/tmeit-worker:1.0.2"
+    "value": "ghcr.io/tmeit/tmeit-worker:1.0.3"
   }
 ]
diff --git a/docs/Sitemap and page design ideas.md b/docs/Sitemap and page design ideas.md
@@ -78,3 +78,7 @@
 * Must sign up with a kth email, masters/marskalk can bypass this
 * Proper GDPR consent
 * Make sure to rate limit signups
+
+## Documents
+* Links to Reglemente, Meeting protocols (limit availability of Meeting protocols to members only?)
+* Random trivia like on the old website?
diff --git a/front/package.json b/front/package.json
@@ -3,7 +3,7 @@
   "sideEffects": [
     "*.css"
   ],
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Front-end for the TMEIT website.",
   "main": "index.js",
   "scripts": {

diff --git a/front/src/app/components/HeaderFooter/MobileHeaderMenu.js b/front/src/app/components/HeaderFooter/MobileHeaderMenu.js
@@ -24,6 +24,10 @@ function MobileHeaderMenu({className}) {
     const menuItems = [
         [meData, (meData? <Link to={`/profile/${meData.short_uuid}/${meData.first_name}_${meData.last_name}`}><MenuItem>My Profile</MenuItem></Link>: null)],
         [isAdmin, (<Link to={"/master"}><MenuItem>Master Menu</MenuItem></Link>)],
+        [true, (<Link to={"/"}><MenuItem>Home</MenuItem></Link>)],
+        [true, (<Link to={"/events"}><MenuItem>Events</MenuItem></Link>)],
+        [true, (<Link to={"/team"}><MenuItem>Team</MenuItem></Link>)],
+        [true, (<Link to={"/about"}><MenuItem>About TMEIT</MenuItem></Link>)],
         [true, (<MenuItem onClick={() => logOut(navigate)}>Log Out</MenuItem>)],
         ]
 

diff --git a/front/src/app/components/HeaderFooter/navs/HeaderNav.js b/front/src/app/components/HeaderFooter/navs/HeaderNav.js
@@ -10,6 +10,7 @@ const getHeaderNavItems = (wrapInMenuItem) => {
     const links = {
         "/events": "Events",
         "/team": "Team",
+        "/about": "About TMEIT",
         "/join_tmeit": "Join",
     }
     if(wrapInMenuItem) {

diff --git a/front/src/app/index.js b/front/src/app/index.js
@@ -65,6 +65,8 @@ const router = createBrowserRouter([{
     children: [
         { path: "/", element: <routes.Home.component />, loader: routes.Home.loader },
         { path: "/events", element: <routes.Events.component />, loader: routes.Events.loader },
+        { path: "/about", element: <routes.About.component />, loader: routes.About.loader },
+        { path: "/documents", element: <routes.Documents.component />, loader: routes.Documents.loader},
         { path: "/team", element: <routes.Team.component />,
             loader: async ({ params }) => {
             await routes.Team.loader();

diff --git a/front/src/app/layouts/About.js b/front/src/app/layouts/About.js
@@ -0,0 +1,25 @@
+import styled from "@emotion/styled";
+import {Link} from "react-router-dom"; 
+
+import Centered from "../components/Centered.js";
+import TextSummary from "../components/TextSummary.js";
+
+const StyledAbout = styled(About)({
+    [TextSummary]:  {
+        maxWidth: "80em",
+        margin: "2em"
+    }
+});
+
+function About({className}){
+    return(
+        <Centered className={className}>
+            <TextSummary>
+                <h1>About TMEIT</h1>
+                <p>* <Link to="/documents">Documents</Link></p>
+                <p>* TMEIT's history</p>
+            </TextSummary>
+        </Centered>
+    );
+}
+export default StyledAbout
diff --git a/front/src/app/layouts/Documents.js b/front/src/app/layouts/Documents.js
@@ -0,0 +1,24 @@
+import styled from "@emotion/styled";  
+
+import Centered from "../components/Centered.js";
+import TextSummary from "../components/TextSummary.js";
+
+const StyledDocuments = styled(Documents)({
+    [TextSummary]:  {
+        maxWidth: "80em",
+        margin: "2em"
+    }
+});
+
+function Documents({className}){
+    return(
+        <Centered className={className}>
+            <TextSummary>
+                <h1>Documents</h1>
+                <p>* Reglemente - for now you can find the reglemente in google drive, click "Meeting Protocols"</p>
+                <p>* <a target="_blank" href="https://drive.google.com/drive/folders/16nr4Zem5E2HfjWQ135W_fiy7F58fCFDk?usp=share_link">Meeting protocols</a></p>
+            </TextSummary>
+        </Centered>
+    );
+}
+export default StyledDocuments
diff --git a/front/src/app/routes.js b/front/src/app/routes.js
@@ -20,6 +20,14 @@ const routes = {
         "component": lazy(() => import("./layouts/Team")),
         "loader": async () => await import("./layouts/Team"),
     },
+    "About": {
+        "component": lazy(() => import("./layouts/About")),
+        "loader": async () => await import("./layouts/About"),
+    },
+    "Documents": {
+        "component": lazy(() => import("./layouts/Documents")),
+        "loader": async () => await import("./layouts/Documents"),
+    },
     "Profile": {
         "component": lazy(() => import("./layouts/Profile")),
         "loader": async () => await import("./layouts/Profile"),