-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into reintroduser-fiks
- Loading branch information
Showing
33 changed files
with
467 additions
and
385 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,124 +1,10 @@ | ||
| import AvtaleFetcher from '@/AvtaleSide/AvtaleFetcher'; | ||
| import AlleredeOpprettetAvtaleProvider from '@/komponenter/alleredeOpprettetTiltak/api/AlleredeOpprettetAvtaleProvider'; | ||
| import Oversikt from '@/Oversikt'; | ||
| import * as React from 'react'; | ||
| import { BrowserRouter, Route, Routes } from 'react-router-dom'; | ||
| import AdvarselBannerTestversjon from './AdvarselBannerTestversjon/AdvarselBannerTestversjon'; | ||
| import AvtaleProvider from './AvtaleProvider'; | ||
| import AvtaleSide from './AvtaleSide/AvtaleSide'; | ||
| import BeslutterSide from './BeslutterSide/BeslutterSide'; | ||
| import { FeatureToggleProvider } from './FeatureToggleProvider'; | ||
| import { FeilVarselProvider } from './FeilVarselProvider'; | ||
| import Informasjonsside from './Informasjonsside/Informasjonsside'; | ||
| import InnloggingBoundary from './InnloggingBoundary/InnloggingBoundary'; | ||
| import { VarselOmNedetid } from './InnloggingBoundary/VarselOmNedetid'; | ||
| import ErrorBoundary from './komponenter/ErrorBoundary'; | ||
| import Slettemerk from './komponenter/Slettemerk'; | ||
| import { NotifikasjonWidgetProvider } from './NotifikasjonWidgetProvider'; | ||
| import OpprettAvtaleArbeidsgiver from './OpprettAvtale/OpprettAvtaleArbeidsgiver/OpprettAvtaleArbeidsgiver'; | ||
| import OpprettAvtaleVeileder from './OpprettAvtale/OpprettAvtaleVeileder/OpprettAvtaleVeileder'; | ||
| import { RouterProvider } from 'react-router-dom'; | ||
|
|
||
| import { | ||
| basename, | ||
| pathTilAvtale, | ||
| pathTilInformasjonssideInnlogget, | ||
| pathTilInformasjonssideUinnlogget, | ||
| pathTilOpprettAvtale, | ||
| pathTilOpprettAvtaleArbeidsgiver, | ||
| pathTilStegIAvtale, | ||
| } from './paths'; | ||
| import RedirectEtterLogin from './RedirectEtterLogin'; | ||
| import router from './Router'; | ||
|
|
||
| class App extends React.Component { | ||
| render() { | ||
| return ( | ||
| <ErrorBoundary> | ||
| <BrowserRouter basename={basename}> | ||
| <AdvarselBannerTestversjon /> | ||
| <VarselOmNedetid /> | ||
| <Routes> | ||
| <Route path={pathTilInformasjonssideUinnlogget} element={<Informasjonsside />} /> | ||
| <Route | ||
| path="*" | ||
| element={ | ||
| <FeilVarselProvider> | ||
| <InnloggingBoundary> | ||
| <FeatureToggleProvider> | ||
| <RedirectEtterLogin> | ||
| <AlleredeOpprettetAvtaleProvider> | ||
| <NotifikasjonWidgetProvider> | ||
| <Routes> | ||
| <Route path="/" element={<Oversikt />} /> | ||
| <Route | ||
| path={pathTilInformasjonssideInnlogget} | ||
| element={<Informasjonsside />} | ||
| /> | ||
| <Route | ||
| path={pathTilOpprettAvtale} | ||
| element={<OpprettAvtaleVeileder />} | ||
| /> | ||
| <Route | ||
| path={pathTilOpprettAvtaleArbeidsgiver} | ||
| element={<OpprettAvtaleArbeidsgiver />} | ||
| /> | ||
| </Routes> | ||
| <Routes> | ||
| <Route | ||
| path={pathTilAvtale(':avtaleId/*')} | ||
| element={ | ||
| <AvtaleProvider> | ||
| <AvtaleFetcher> | ||
| <Routes> | ||
| <Route | ||
| path="/" | ||
| element={<AvtaleSide />} | ||
| /> | ||
| <Route | ||
| path="/:stegPath" | ||
| element={<AvtaleSide />} | ||
| /> | ||
|
|
||
| <Route | ||
| path={`/beslutte/`} | ||
| element={<BeslutterSide />} | ||
| /> | ||
|
|
||
| <Route | ||
| path={`/beslutte/:tilskuddsperiodeId`} | ||
| element={<BeslutterSide />} | ||
| /> | ||
|
|
||
| <Route | ||
| path={`/slett`} | ||
| element={<Slettemerk />} | ||
| /> | ||
|
|
||
| <Route | ||
| path={pathTilStegIAvtale( | ||
| ':avtaleId', | ||
| ':stegPath', | ||
| )} | ||
| element={<AvtaleSide />} | ||
| /> | ||
| </Routes> | ||
| </AvtaleFetcher> | ||
| </AvtaleProvider> | ||
| } | ||
| /> | ||
| </Routes> | ||
| </NotifikasjonWidgetProvider> | ||
| </AlleredeOpprettetAvtaleProvider> | ||
| </RedirectEtterLogin> | ||
| </FeatureToggleProvider> | ||
| </InnloggingBoundary> | ||
| </FeilVarselProvider> | ||
| } | ||
| /> | ||
| </Routes> | ||
| </BrowserRouter> | ||
| </ErrorBoundary> | ||
| ); | ||
| } | ||
| function App() { | ||
| return <RouterProvider router={router} />; | ||
| } | ||
|
|
||
| export default App; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| .container { | ||
| display: flex; | ||
| justify-content: center; | ||
| margin-top: 10rem; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.