From 6906609bf558117bd6a6a35fe49388b98e533650 Mon Sep 17 00:00:00 2001
From: Markus Johansen <markus.aleksander.rakil.johansen@nav.no>
Date: Wed, 19 Jul 2023 16:41:38 +0200
Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20Ny=20hovedside=20etter=20oppdat?=
 =?UTF-8?q?ert=20skisser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mangler scrollbar og noen små detaljer, men layout er fikset.
---
 frontend/src/components/Filtermeny.tsx | 46 ++++++++++++++++++++++++++
 frontend/src/index.tsx                 | 43 +++++-------------------
 frontend/tailwind.config.js            |  5 ++-
 3 files changed, 58 insertions(+), 36 deletions(-)
 create mode 100644 frontend/src/components/Filtermeny.tsx

diff --git a/frontend/src/components/Filtermeny.tsx b/frontend/src/components/Filtermeny.tsx
new file mode 100644
index 0000000..ed58378
--- /dev/null
+++ b/frontend/src/components/Filtermeny.tsx
@@ -0,0 +1,46 @@
+import { Accordion } from "@navikt/ds-react"
+
+
+const Filtermeny = () => {
+    return (
+        <div className="bg-bg-default w-500">
+            <Accordion>
+                <Accordion.Item>
+                    <Accordion.Header>
+                        Kategori
+                    </Accordion.Header>
+                    <Accordion.Content>
+                        Hvis du er mellom 62 og 67 år når du søker, må du som hovedregel ha
+                        hatt en pensjonsgivende inntekt som tilsvarer x G, året før du fikk
+                        nedsatt arbeidsevnen. NAV kan gjøre <a href="#Unntak">unntak</a>.
+                    </Accordion.Content>
+                </Accordion.Item>
+                <Accordion.Item defaultOpen>
+                    <Accordion.Header>
+                        Status
+                    </Accordion.Header>
+                    <Accordion.Content>
+                        Da er det lite som trengs å gjøres.
+                    </Accordion.Content>
+                </Accordion.Item>
+                <Accordion.Item>
+                    <Accordion.Header>
+                        Prioritet
+                    </Accordion.Header>
+                    <Accordion.Content>
+                        Da er det lite som trengs å gjøres.
+                    </Accordion.Content>
+                </Accordion.Item>
+                <Accordion.Item>
+                    <Accordion.Header>
+                        Mine innmeldinger
+                    </Accordion.Header>
+                    <Accordion.Content>
+                        Da er det lite som trengs å gjøres.
+                    </Accordion.Content>
+                </Accordion.Item>
+            </Accordion>
+        </div>
+    )
+}
+export default Filtermeny
\ No newline at end of file
diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx
index 3ee15e2..fb55855 100644
--- a/frontend/src/index.tsx
+++ b/frontend/src/index.tsx
@@ -2,51 +2,24 @@ import CardsContainer from "./components/CardsContainer";
 import "@navikt/ds-css";
 import { Button, Heading, Search } from "@navikt/ds-react";
 import Header from "./components/Header";
-
+import { PlusIcon } from "@navikt/aksel-icons";
+import Filtermeny from "./components/Filtermeny";
 
 export default function Home() {
-  // const handleFeil = () => {
-  //   router.push('/feil')
-  // }
-
   return (
     <main className="flex flex-col h-screen">
       <Header/>
-      <div className="flex justify-center grow">
-        <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" 
-              // onClick={handleFeil}
-            >
+      <div className="flex grow">
+        <Filtermeny/>
+        <div className="grow bg-bg-subtle px-32 py-10 flex flex-col gap-10">
+          <div className="flex gap-12 items-end">
+            <Search label="Søkefelt" hideLabel={false}/>
+            <Button className="w-64 h-min" icon={<PlusIcon/>}>
               Meld inn feil
             </Button>
-            <Button 
-              variant="secondary"
-            >
-              Meld inn funksjonalitetsønsker
-            </Button>
           </div>
-        </div>
-
-        <div className="p-8 grow flex gap-8 flex-col">
-          <Search
-            label="Søk gjennom innmeldte feil (nøkkelord, tags, status)"
-            variant="primary"
-            hideLabel={false}
-          />
-          <Heading 
-            level="1" 
-            size="medium"
-          >
-            Innmeldte feil (saker, feilmeldinger poster, feil)
-          </Heading>
           <CardsContainer/>
         </div>
-
-        <div className="bg-bg-subtle w-1/6 p-8">
-          <h1>Filter to be</h1>
-        </div>
       </div>
     </main>
   )
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
index 42f6d32..26e8961 100644
--- a/frontend/tailwind.config.js
+++ b/frontend/tailwind.config.js
@@ -293,7 +293,10 @@ module.exports = {
         "large": "8px",
         "xlarge": "12px",
         "full": "9999px"
-      }
+      },
+      "width": {
+        "500": "500px",
+      },
     }
   },
   plugins: [],

From f40c345bd34df2d8abeb4a4e509be91b6f3fc801 Mon Sep 17 00:00:00 2001
From: Markus Johansen <markus.aleksander.rakil.johansen@nav.no>
Date: Wed, 19 Jul 2023 17:10:50 +0200
Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=A8=20Feilkort=20med=20dynamisk=20has?=
 =?UTF-8?q?ter=20tag,=20og=20felles=20interface.ts=20fil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/CardsContainer.tsx | 29 +++++++++++++---------
 frontend/src/components/FeilCard.tsx       | 17 ++++++-------
 frontend/src/interface.ts                  | 10 ++++++++
 3 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 frontend/src/interface.ts

diff --git a/frontend/src/components/CardsContainer.tsx b/frontend/src/components/CardsContainer.tsx
index bfb0658..cacf5bd 100644
--- a/frontend/src/components/CardsContainer.tsx
+++ b/frontend/src/components/CardsContainer.tsx
@@ -1,35 +1,35 @@
 import FeilCard from "./FeilCard"
-
-type FeilMelding = {
-    tittel: String
-    beskrivelse: String
-}
 /**
  * 
  * @returns Komponent for returnering av konteiner med alle feilinnmeldingene. 
  */
 const CardsContainer = () => {
     
-    const feilMeldinger: FeilMelding[] = [
+    const feilMeldinger: Feilmelding[] = [
         {
             tittel: "Mangel på hensyn til tariffoppgjør",
-            beskrivelse: "Det har vært ett tariffoppgjør og speil sier sykepengene må tilbakekreves, noe som er feil. (sier vi.. har ikke domenekunnskap)"
+            beskrivelse: "Det har vært ett tariffoppgjør og speil sier sykepengene må tilbakekreves, noe som er feil. (sier vi.. har ikke domenekunnskap)",
+            haster: false
         },
         {
             tittel: "Speil sier NAV må tilbakekreve sykepenger på feil grunnlag",
-            beskrivelse: "baluba"
+            beskrivelse: "baluba",
+            haster: true
         },
         {
             tittel: "Feil A",
-            beskrivelse: "Lorem Ipsum"
+            beskrivelse: "Lorem Ipsum",
+            haster: false
         },
         {
             tittel: "Feil B",
-            beskrivelse: "dolor"
+            beskrivelse: "dolor",
+            haster: false
         },
         {
             tittel: "Håndkle på hue",
-            beskrivelse: "Bombastic side eye"
+            beskrivelse: "Bombastic side eye",
+            haster: true
         }
     ]
 
@@ -37,7 +37,12 @@ const CardsContainer = () => {
         <div>
             <div className="grid grid-cols-2 gap-4">
                 {feilMeldinger.map((feilMelding) => (
-                    <FeilCard key={feilMelding.toString()} tittel={feilMelding.tittel} beskrivelse={feilMelding.beskrivelse}/> 
+                    <FeilCard 
+                        key={feilMeldinger.indexOf(feilMelding)} 
+                        tittel={feilMelding.tittel} 
+                        beskrivelse={feilMelding.beskrivelse} 
+                        haster={feilMelding.haster}
+                    /> 
                 ))}
             </div>     
         </div>
diff --git a/frontend/src/components/FeilCard.tsx b/frontend/src/components/FeilCard.tsx
index f54a91c..6744276 100644
--- a/frontend/src/components/FeilCard.tsx
+++ b/frontend/src/components/FeilCard.tsx
@@ -1,24 +1,21 @@
 import "@navikt/ds-css";
 import { ExpansionCard, Tag } from "@navikt/ds-react";
 
-interface feilmeldingInterface {
-    tittel: String,
-    beskrivelse: String
+interface TagBarInterface {
+    haster: boolean
 }
 
-const TagBar = () => {
+//typen på status er veldig wack heheheh, må fjerne any etterhvert men String fungerer ikke 
+const TagBar = (props: TagBarInterface) => {
     return (
         <div className="flex gap-8 mt-4">
             <Tag variant="info">Jobbes med</Tag>
-            <div className="flex gap-2">
-                <Tag variant="neutral">Spleiselaget</Tag>
-                <Tag variant="warning">Haster</Tag>
-            </div>
+            {props.haster === true ? <Tag variant="warning">Haster</Tag> : <></>}
         </div>
     )
 }
 
-const FeilCard = (props: feilmeldingInterface) => {
+const FeilCard = (props: Feilmelding) => {
     return (
         <ExpansionCard aria-label="tekst">
             <ExpansionCard.Header>
@@ -26,7 +23,7 @@ const FeilCard = (props: feilmeldingInterface) => {
                 <ExpansionCard.Description>
                     {props.beskrivelse}
                 </ExpansionCard.Description>
-                <TagBar />
+                <TagBar haster={props.haster}/>
             </ExpansionCard.Header>
             <ExpansionCard.Content>
                 Hællæ
diff --git a/frontend/src/interface.ts b/frontend/src/interface.ts
new file mode 100644
index 0000000..352db82
--- /dev/null
+++ b/frontend/src/interface.ts
@@ -0,0 +1,10 @@
+/*
+ * I denne filen kan vi legge interfaces som skal brukes over flere steder!
+ */
+
+
+interface Feilmelding {
+    tittel: String,
+    beskrivelse: String
+    haster: boolean
+}
\ No newline at end of file

From 03709bac6a462ccbf6b03c3a74249d56a412c39d Mon Sep 17 00:00:00 2001
From: Markus Johansen <markus.aleksander.rakil.johansen@nav.no>
Date: Wed, 19 Jul 2023 17:21:17 +0200
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=9A=B8=20Fikset=20routing=20for=20?=
 =?UTF-8?q?=C3=A5=20unng=C3=A5=20merge-konflikt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sindre Kjelsrud <sindre.kjelsrud@nav.no>
---
 frontend/src/index.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx
index fb55855..8b71297 100644
--- a/frontend/src/index.tsx
+++ b/frontend/src/index.tsx
@@ -4,8 +4,12 @@ import { Button, Heading, Search } from "@navikt/ds-react";
 import Header from "./components/Header";
 import { PlusIcon } from "@navikt/aksel-icons";
 import Filtermeny from "./components/Filtermeny";
+import { useNavigate } from "react-router-dom";
 
 export default function Home() {
+
+  const navigate = useNavigate()
+
   return (
     <main className="flex flex-col h-screen">
       <Header/>
@@ -14,7 +18,11 @@ export default function Home() {
         <div className="grow bg-bg-subtle px-32 py-10 flex flex-col gap-10">
           <div className="flex gap-12 items-end">
             <Search label="Søkefelt" hideLabel={false}/>
-            <Button className="w-64 h-min" icon={<PlusIcon/>}>
+            <Button 
+              className="w-64 h-min" 
+              icon={<PlusIcon/>}
+              onClick={() => navigate("nyfeil")}  
+            >
               Meld inn feil
             </Button>
           </div>