From 73215513a350b721b3e75a08dd94e63690b7ac26 Mon Sep 17 00:00:00 2001
From: Sindre Kjelsrud <sindre.kjelsrud@nav.no>
Date: Wed, 19 Jul 2023 17:10:21 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20Routing=20in=20the=20box?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Amalie Erdal Mansåker <amalie.erdal.mansaker@nav.no>
Co-authored-by: Øydis Kind Refsum <oydis.kind.refsum@nav.no>
---
 .../no/nav/helse/sprik/plugins/Routing.kt       |  2 +-
 frontend/src/index.tsx                          |  7 +++++--
 frontend/src/main.tsx                           | 17 +++++++++++++++--
 frontend/src/pages/feil.tsx                     |  5 ++++-
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt b/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt
index aa5a6a5..de18b2f 100644
--- a/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt
+++ b/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt
@@ -48,7 +48,7 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin
                 val test = call.receive<Test>()
                 call.respond(status = HttpStatusCode.Created, message = test)
             }
-            post("/nyFeil") {
+            post("/nyfeil") {
                 val feilmelding = call.receive<Feilmelding>()
                 feilmeldingRepository.lagre(feilmelding)
                 call.respond(status = HttpStatusCode.Created, message = "Feilmelding motatt og sendt til database")
diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx
index 3ee15e2..a3a2aa9 100644
--- a/frontend/src/index.tsx
+++ b/frontend/src/index.tsx
@@ -2,13 +2,15 @@ import CardsContainer from "./components/CardsContainer";
 import "@navikt/ds-css";
 import { Button, Heading, Search } from "@navikt/ds-react";
 import Header from "./components/Header";
-
+import { useNavigate } from "react-router-dom";
 
 export default function Home() {
   // const handleFeil = () => {
   //   router.push('/feil')
   // }
 
+  const navigate = useNavigate()
+
   return (
     <main className="flex flex-col h-screen">
       <Header/>
@@ -16,8 +18,9 @@ export default function Home() {
         <div className="bg-bg-subtle w-1/6 p-8 flex flex-col justify-end">
           <div className="flex flex-col gap-4 text-center bottom-0">
             <Button 
-              variant="primary" 
+              variant="primary"
               // onClick={handleFeil}
+              onClick={() => navigate("nyfeil")}
             >
               Meld inn feil
             </Button>
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index b51eb0c..cb81e91 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -1,10 +1,23 @@
 import React from 'react'
 import ReactDOM from 'react-dom/client'
+import { RouterProvider, createBrowserRouter } from 'react-router-dom'
 import './index.css'
-import Home from './index.tsx'
+import Home from './index'
+import Feil from './pages/feil'
+
+const router = createBrowserRouter([
+  {
+    path: "/",
+    element: <Home />,
+  },
+  {
+    path: "nyfeil",
+    element: <Feil />
+  }
+])
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
-    <Home />
+    <RouterProvider router={router} />
   </React.StrictMode>,
 )
diff --git a/frontend/src/pages/feil.tsx b/frontend/src/pages/feil.tsx
index 36d546b..70c1a33 100644
--- a/frontend/src/pages/feil.tsx
+++ b/frontend/src/pages/feil.tsx
@@ -6,13 +6,14 @@ import axios from "axios";
 import { useState } from "react";
 import BildeOpplastning from "../components/BildeOpplastning";
 import Header from "../components/Header";
+import { useNavigate } from "react-router-dom";
 
 export default function Feil() {
     const [tittel, setTittel] = useState("");
     const [beskrivelse, setBeskrivelse] = useState("");
 
     const handleSubmit = () => {
-        axios.post("https://helse-sprik.intern.dev.nav.no/nyFeil",
+        axios.post("https://helse-sprik.intern.dev.nav.no/nyfeil",
             {
                 "data": {
                     tittel: tittel,
@@ -32,6 +33,7 @@ export default function Feil() {
 
         // TODO: clear data fra felter
 
+    const navigate = useNavigate()
 
     return (
         <main className="flex flex-col h-screen">
@@ -76,6 +78,7 @@ export default function Feil() {
                             // onClick={() => {
                             //     router.push('/')
                             // }}
+                            onClick={() => navigate("/")}
                         >
                             Gå tilbake til hovedmenyen
                         </Button>