diff --git a/docker-compose.yml b/docker-compose.yml index 2b6ef00d8..8be4407e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: postgres: - image: postgres + image: postgres:17 environment: - POSTGRES_DB=postgres - POSTGRES_USER=postgres diff --git a/frontend/public/img/Amund Norland.jpg b/frontend/public/img/Amund Norland.jpg deleted file mode 100644 index 59e0db342..000000000 Binary files a/frontend/public/img/Amund Norland.jpg and /dev/null differ diff --git a/frontend/public/img/Hilvi Fjose.jpg b/frontend/public/img/Hilvi Fjose.jpg deleted file mode 100644 index 1b66d0229..000000000 Binary files a/frontend/public/img/Hilvi Fjose.jpg and /dev/null differ diff --git a/frontend/public/img/Martin Bore.jpg b/frontend/public/img/Martin Bore.jpg new file mode 100644 index 000000000..1887a1d46 Binary files /dev/null and b/frontend/public/img/Martin Bore.jpg differ diff --git a/frontend/src/pages/baksida/index.tsx b/frontend/src/pages/baksida/index.tsx index 8c23df25d..cbde200f6 100644 --- a/frontend/src/pages/baksida/index.tsx +++ b/frontend/src/pages/baksida/index.tsx @@ -12,25 +12,26 @@ import { ListItemText, Typography, } from "@mui/material"; -import { amber, green, red } from "@mui/material/colors"; +import { amber, red } from "@mui/material/colors"; import Head from "next/head"; -import { useRef } from "react"; +import { useRef, useState } from "react"; import { ContactInfo } from "@/components/pages/baksida/ContactInfo"; import { Layout, RootStyle } from "@/layouts/Layout"; import { NextPageWithLayout } from "@/lib/next"; -import Amund from "~/public/img/Amund Norland.jpg"; -import Hilvi from "~/public/img/Hilvi Fjose.jpg"; +import Martin from "~/public/img/Martin Bore.jpg"; import Solveig from "~/public/img/Solveig Lund Christiansen.jpg"; const ReportsPage: NextPageWithLayout = () => { const formRef = useRef(null); const scrollToForm = () => formRef.current?.scrollIntoView({ behavior: "smooth" }); + const [iframeLoaded, setIframeLoaded] = useState(false); + const responsibles = [ { id: 1, - name: "Solveig Lund Christiansen", + name: "Solveig L. Christiansen", initials: "SLC", color: red[800], image: Solveig, @@ -38,19 +39,11 @@ const ReportsPage: NextPageWithLayout = () => { }, { id: 2, - name: "Hilvi Fjose ", - initials: "HF", + name: "Martin Bore", + initials: "MB", color: amber[500], - image: Hilvi, - email: "hilvif@stud.ntnu.no", - }, - { - id: 3, - name: "Amund Norland", - initials: "AN", - color: green[500], - image: Amund, - email: "amundno@stud.ntnu.no", + image: Martin, + email: "martbore@stud.ntnu.no", }, ]; @@ -314,16 +307,32 @@ const ReportsPage: NextPageWithLayout = () => { - + + {!iframeLoaded && ( + + + + )} + + onLoad={() => setIframeLoaded(true)} + style={{ display: "block" }} + />