Skip to content

Commit

Permalink
Reception patch#2 (#217)
Browse files Browse the repository at this point in the history
* Have started to work on a new documents-page. I will have to figure out how to import the module to the app

* tmp

* Ignore

* Replaced image on Join-view, fixed so that Documents is not part of the Nav-header

---------

Co-authored-by: Sebbe <[email protected]>
  • Loading branch information
Sebbedi and Sebbe authored Jul 19, 2023
1 parent 79c0c71 commit d5997bd
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion back/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "tmeit_backend"
version = "1.1.1"
version = "1.1.2"
description = "Python backend for the TMEIT website"
authors = ["TraditionsMEsterIT"]
license = "AGPL-3.0"
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/tmeit-se/postgres/set_image_tag.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
"op": "replace",
"path": "/spec/jobTemplate/spec/template/spec/containers/0/image",
"value": "ghcr.io/tmeit/db-backup-agent:1.1.1"
"value": "ghcr.io/tmeit/db-backup-agent:1.1.2"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
"op": "replace",
"path": "/spec/template/spec/containers/0/image",
"value": "ghcr.io/tmeit/tmeit-run-migrations:1.1.1"
"value": "ghcr.io/tmeit/tmeit-run-migrations:1.1.2"
}
]
2 changes: 1 addition & 1 deletion deploy/kubernetes/tmeit-se/tmeit-app/set_image_tag.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
"op": "replace",
"path": "/spec/template/spec/containers/0/image",
"value": "ghcr.io/tmeit/tmeit-app:1.1.1"
"value": "ghcr.io/tmeit/tmeit-app:1.1.2"
}
]
2 changes: 1 addition & 1 deletion deploy/kubernetes/tmeit-se/tmeit-worker/set_image_tag.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
"op": "replace",
"path": "/spec/template/spec/containers/0/image",
"value": "ghcr.io/tmeit/tmeit-worker:1.1.1"
"value": "ghcr.io/tmeit/tmeit-worker:1.1.2"
}
]
2 changes: 1 addition & 1 deletion front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"sideEffects": [
"*.css"
],
"version": "1.1.1",
"version": "1.1.2",
"description": "Front-end for the TMEIT website.",
"main": "index.js",
"scripts": {
Expand Down
1 change: 0 additions & 1 deletion front/src/app/components/HeaderFooter/navs/HeaderNav.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ const getHeaderNavItems = (wrapInMenuItem) => {
"/team": "Team",
"/about": "About TMEIT",
"/join_tmeit": "Join",
"/documents": "Documents",
}
if(wrapInMenuItem) {
return Object.entries(links).map(([path, label]) => (
Expand Down
Binary file added front/src/app/layout_photos/AG_group_photo.webp
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions front/src/app/layouts/Join.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {useState, useEffect} from "react";
import styled from "@emotion/styled";

import sjo_group from "../layout_photos/sjoslaget_group_2022_patch.webp";
import ag_group from "../layout_photos/AG_group_photo.webp";

import { kisel_blue, secondary_purp, secondary_purp_dark, me_green, data_pink, me_and_in_teal, primary_light, primary_lighter, accent_yellow, accent_maroon, accent_salmon } from "../palette.js";
import JoinForm from "../components/JoinForm";
Expand Down Expand Up @@ -122,7 +122,7 @@ function Join({className}) {
</div>
</div>
<h1> See you at the pub! </h1>
<img className="group-photo" src={sjo_group} alt="A group photo of TMEIT after Sjöslaget 2022" />
<img className="group-photo" src={ag_group} alt="A group photo of TMEIT during AG 2023" />
</div>
)
}
Expand Down

0 comments on commit d5997bd

Please sign in to comment.