Merge branch 'main' into nyttHome
This commit is contained in:
commit
822c2af790
4 changed files with 22 additions and 4 deletions
|
@ -48,7 +48,7 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin
|
||||||
val test = call.receive<Test>()
|
val test = call.receive<Test>()
|
||||||
call.respond(status = HttpStatusCode.Created, message = test)
|
call.respond(status = HttpStatusCode.Created, message = test)
|
||||||
}
|
}
|
||||||
post("/nyFeil") {
|
post("/nyfeil") {
|
||||||
val feilmelding = call.receive<Feilmelding>()
|
val feilmelding = call.receive<Feilmelding>()
|
||||||
feilmeldingRepository.lagre(feilmelding)
|
feilmeldingRepository.lagre(feilmelding)
|
||||||
call.respond(status = HttpStatusCode.Created, message = "Feilmelding motatt og sendt til database")
|
call.respond(status = HttpStatusCode.Created, message = "Feilmelding motatt og sendt til database")
|
||||||
|
|
|
@ -10,6 +10,8 @@ export default function Home() {
|
||||||
|
|
||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="flex flex-col h-screen">
|
<main className="flex flex-col h-screen">
|
||||||
<Header/>
|
<Header/>
|
||||||
|
|
|
@ -1,10 +1,23 @@
|
||||||
import React from 'react'
|
import React from 'react'
|
||||||
import ReactDOM from 'react-dom/client'
|
import ReactDOM from 'react-dom/client'
|
||||||
|
import { RouterProvider, createBrowserRouter } from 'react-router-dom'
|
||||||
import './index.css'
|
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(
|
ReactDOM.createRoot(document.getElementById('root')!).render(
|
||||||
<React.StrictMode>
|
<React.StrictMode>
|
||||||
<Home />
|
<RouterProvider router={router} />
|
||||||
</React.StrictMode>,
|
</React.StrictMode>,
|
||||||
)
|
)
|
||||||
|
|
|
@ -6,13 +6,14 @@ import axios from "axios";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import BildeOpplastning from "../components/BildeOpplastning";
|
import BildeOpplastning from "../components/BildeOpplastning";
|
||||||
import Header from "../components/Header";
|
import Header from "../components/Header";
|
||||||
|
import { useNavigate } from "react-router-dom";
|
||||||
|
|
||||||
export default function Feil() {
|
export default function Feil() {
|
||||||
const [tittel, setTittel] = useState("");
|
const [tittel, setTittel] = useState("");
|
||||||
const [beskrivelse, setBeskrivelse] = useState("");
|
const [beskrivelse, setBeskrivelse] = useState("");
|
||||||
|
|
||||||
const handleSubmit = () => {
|
const handleSubmit = () => {
|
||||||
axios.post("https://helse-sprik.intern.dev.nav.no/nyFeil",
|
axios.post("https://helse-sprik.intern.dev.nav.no/nyfeil",
|
||||||
{
|
{
|
||||||
"data": {
|
"data": {
|
||||||
tittel: tittel,
|
tittel: tittel,
|
||||||
|
@ -32,6 +33,7 @@ export default function Feil() {
|
||||||
|
|
||||||
// TODO: clear data fra felter
|
// TODO: clear data fra felter
|
||||||
|
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="flex flex-col h-screen">
|
<main className="flex flex-col h-screen">
|
||||||
|
@ -76,6 +78,7 @@ export default function Feil() {
|
||||||
// onClick={() => {
|
// onClick={() => {
|
||||||
// router.push('/')
|
// router.push('/')
|
||||||
// }}
|
// }}
|
||||||
|
onClick={() => navigate("/")}
|
||||||
>
|
>
|
||||||
Gå tilbake til hovedmenyen
|
Gå tilbake til hovedmenyen
|
||||||
</Button>
|
</Button>
|
||||||
|
|
Reference in a new issue