Merge branch 'main' into Pages-order-info

rubberdok · Oct 17, 2024 · 3edf0e5 · 3edf0e5
2 parents 570914b + 1993cc0
commit 3edf0e5
Show file tree

Hide file tree

Showing 8 changed files with 649 additions and 186 deletions.
diff --git a/backend/requirements/base.txt b/backend/requirements/base.txt
@@ -2,7 +2,7 @@ coverage==7.2.7
 cryptography==42.0.8
 django-alive==1.2.1
 django-anymail[postmark]==10.3
-django-cors-headers==4.3.0
+django-cors-headers==4.4.0
 django-environ==0.11.2
 django-guardian==2.4.0
 django-multiselectfield==0.1.12
@@ -13,9 +13,9 @@ factory-boy==3.3.0
 google-api-python-client==2.125.0
 graphene-django==2.15.0
 graphene==2.1.8
-gunicorn==21.2.0
+gunicorn==23.0.0
 oauth2client==4.1.3
-pandas==2.2.1
+pandas==2.2.3
 phonenumbers==8.13.39
 pillow>=8.1.1
 promise==2.3

diff --git a/backend/requirements/local.txt b/backend/requirements/local.txt
@@ -1,4 +1,4 @@
 -r base.txt
 
 black>=23.1.0
-flake8==6.1.0
+flake8==7.1.1
diff --git a/frontend/package.json b/frontend/package.json
@@ -56,7 +56,7 @@
     "@graphql-codegen/client-preset": "^4.1.0",
     "@graphql-codegen/typed-document-node": "^5.0.6",
     "@graphql-codegen/typescript": "4.0.6",
-    "@graphql-codegen/typescript-operations": "4.2.0",
+    "@graphql-codegen/typescript-operations": "4.2.3",
     "@graphql-typed-document-node/core": "^3.2.0",
     "@next/bundle-analyzer": "^13.4.19",
     "@parcel/watcher": "^2.4.1",
@@ -80,11 +80,11 @@
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react": "^7.37.1",
     "eslint-plugin-react-hooks": "^4.0.8",
     "graphql-tag": "^2.12.6",
     "prettier": "^3.3.2",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
     "typescript": "^5.1.6",
     "wait-on": "^7.2.0"
   }

diff --git a/frontend/src/app/components/Layout/AppBar/navigation/constants.tsx b/frontend/src/app/components/Layout/AppBar/navigation/constants.tsx
@@ -7,7 +7,6 @@ export const routes: Route[] = [
   },
   { title: "Verv", path: "/listings" },
   { title: "Hyttebooking", path: "/cabins" },
-  { title: "Bang", path: "https://bangg.pages.dev" },
   { title: "Dokumenter", path: "/archive", permission: "archive.view_archivedocument" },
   { title: "Om oss", path: "/about" },
 ];
diff --git a/frontend/src/components/pages/listings/detail/TitleCard.tsx b/frontend/src/components/pages/listings/detail/TitleCard.tsx
@@ -54,7 +54,13 @@ export const TitleCard: React.FC<Props> = ({ listing }) => {
               {`Frist ${dayjs(listing?.deadline).format("LLL")}`}
             </Typography>
             {link && (
-              <Tooltip title="Dette fristen for dette vervet har gått ut. Hvis du tror dette er en feil sjekk årstallet på fristen. Hvis du fortsatt tror det er en feil ta kontakt med vervet.">
+              <Tooltip
+                title={
+                  dayjs(listing?.deadline).isBefore(dayjs())
+                    ? "Fristen for dette vervet har gått ut. Hvis du tror dette er en feil sjekk årstallet på fristen. Hvis du fortsatt tror det er en feil ta kontakt med vervet."
+                    : ""
+                }
+              >
                 <Grid container item justifyContent="center">
                   <Button
                     component={Link}

diff --git a/frontend/src/layouts/footer/HallOfFame/constants.ts b/frontend/src/layouts/footer/HallOfFame/constants.ts
@@ -13,6 +13,12 @@ export const rubberdokMembers: Record<string, Member[]> = {
     { name: "Frederik Egelund Edvardsen", class: 3 },
     { name: "Andreas Tauge", class: 2 },
     { name: "Kristian Tveråmo Aastveit", class: 3 },
+    { name: "Inger Elinor Skomedal", class: 1},
+    { name: "Erik Aas", class: 1},
+    { name: "Oscar Gangstad Westbye", class: 1 },
+    { name: "Jan Zabielski", class: 1 },
+    { name: "Tien Tran", class: 1 },
+    { name: "Oda Fu Zhe Runde", class: 1},
   ],
   "2023/2024": [
     { name: "Magnus Hafstad", class: 3, position: "Prosjektleder" },

diff --git a/frontend/src/layouts/navigation/constants.tsx b/frontend/src/layouts/navigation/constants.tsx
@@ -7,7 +7,6 @@ export const routes: Route[] = [
   },
   { title: "Verv", path: "/listings" },
   { title: "Hyttebooking", path: "/cabins" },
-  { title: "Bang", path: "bangg.pages.dev" },
   { title: "Dokumenter", path: "/archive", permission: "archive.view_archivedocument" },
   { title: "Om oss", path: "/about" },
 ];