-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/609 ny startside med info fra browseit mm #616
Merged
karo
merged 4 commits into
master
from
feature/609_ny_startside_med_info_fra_browseit_mm
Oct 22, 2024
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,17 @@ | ||
- **[Timeføring]** | ||
- **[Utlegg]** | ||
- **[Kalender]** | ||
- **[1password]** | ||
- **[Kantine]** | ||
- **[Helpit]** | ||
- **[Print]** | ||
- **[Brandbook for Knowit]** | ||
|
||
[1password]: https://knowit.1password.eu | ||
[brandbook for knowit]: https://knowit.se/brandbook/ | ||
[helpit]: https://helpit.knowit.se/ | ||
[kalender]: http://kalender.knowit.no/ | ||
[kantine]: https://tullin.munu.shop/ | ||
[print]: https://knowit.sharepoint.com/sites/groupcommon/itsupport/SitePages/Knowit--Printix.aspx?web=1&CT=1728381612322&OR=OWA-NT-Mail&CID=cb86ef7f-3f5c-8826-7c08-88a0c6d6b79f | ||
[timeføring]: https://timer.knowit.no/ | ||
[utlegg]: https://knowit.unit4cloud.no/ |
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,7 @@ | ||
- **[Epost]** | ||
- **[Objectnet Slack]** | ||
- **[Knowit Slack]** | ||
|
||
[epost]: http://epost.knowit.no/ | ||
[knowit slack]: https://knowit.slack.com/signup | ||
[objectnet slack]: https://knowitobjectnet.slack.com/ |
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,23 @@ | ||
- **[Profilbilder]** | ||
- **[CVPartner]** | ||
- **[Hvordan skrive CV]** | ||
- **[Seatit]** | ||
- **[Kompetansekartlegging]** | ||
- **[Personalhåndbok]** | ||
- **[Simployer]** | ||
- **[Forsikring]** | ||
- **[Eyr]** | ||
- **[Firmahytter]** | ||
- **[Telefon-abonnement for familie]** | ||
|
||
[cvpartner]: https://cv.knowit.no/ | ||
[eyr]: https://eyr.md/no/ | ||
[firmahytter]: https://booking.minfirmahytte.no/vacation-rentals | ||
[forsikring]: https://www.gjensidige.no/ | ||
[hvordan skrive cv]: https://knowit.sharepoint.com/sites/Org-320-internal/SitePages/How-to-articles.aspx | ||
[kompetansekartlegging]: https://kompetanse.knowit.no/ | ||
[personalhåndbok]: https://handbooks.simployer.com/nb-no/handbook/104949 | ||
[profilbilder]: https://knowit.sharepoint.com/teams/profilbilder/Pictures/Forms/Ansatt.aspx?id=%2Fteams%2Fprofilbilder%2FPictures%2FAnsatt%2FKnowit%20Objectnet&viewid=32518de6%2Dc021%2D43e9%2D9418%2D9807285ba4f0 | ||
[seatit]: https://seatit.knowit.no/ | ||
[simployer]: https://my.simployer.com/ | ||
[telefon-abonnement for familie]: https://knowit.sharepoint.com/sites/Org-320-internal/SitePages/Telenor-mobilabonnement-for-familie.aspx |
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,15 @@ | ||
- **[Bedriftskonti]** | ||
- **[Objectnet på Sharepoint]** | ||
- **[Objectnet fag på Sharepoint]** | ||
- **[Bedriftidrettslag]** | ||
- **[Hva Skjer]** | ||
- **[Objectnet github]** | ||
- **[Knowit github]** | ||
|
||
[bedriftidrettslag]: https://knowit.sharepoint.com/:u:/r/sites/Local-320-aktiviteter/SitePages/Bedriftsidrettslag.aspx?csf=1&=&web=1&e=18ZzpQ | ||
[bedriftskonti]: https://knowit.sharepoint.com/sites/Org-320-internal/SitePages/Bedriftskontoer-(bedriftskonti)-og-mat.aspx | ||
[hva skjer]: https://hvaskjer.knowit.no/ | ||
[objectnet på sharepoint]: https://knowit.sharepoint.com/sites/Org-320-internal | ||
[objectnet fag på sharepoint]: https://knowit.sharepoint.com/sites/Local-320-fagrommet | ||
[objectnet github]: https://github.com/Knowit-Objectnet | ||
[knowit github]: https://github.com/knowit |
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 |
---|---|---|
@@ -1,9 +1,10 @@ | ||
export { default as CompetencePage } from './competence/CompetencePage' | ||
export { default as CustomerPage } from './customer/CustomerPage' | ||
export { default as CustomerSitePage } from './customer/CustomerSitePage' | ||
export { default as DebugPage } from './other/DebugPage' | ||
export { default as EmployeePage } from './employee/EmployeePage' | ||
export { default as EmployeeProfilePage } from './employee/EmployeeProfilePage' | ||
export { default as NotFoundPage } from './other/NotFoundPage' | ||
export { default as OrganizationStructurePage } from './organizationStructure/OrganizationStructurePage' | ||
export { default as StartPage } from './start/StartPage' | ||
export { default as UnderConstructionPage } from './other/UnderConstructionPage' | ||
export { default as DebugPage } from './other/DebugPage' |
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,26 @@ | ||
import { marked } from 'marked' | ||
import DOMPurify from 'dompurify' | ||
import { GridItem } from '../../components/gridItem/GridItem' | ||
import { GridItemHeader } from '../../components/gridItem/GridItemHeader' | ||
import { GridItemContent } from '../../components/gridItem/GridItemContent' | ||
interface MarkdownContentProps { | ||
title: string | ||
markdown: string | ||
} | ||
|
||
const MarkdownContent = ({ ...props }: MarkdownContentProps) => { | ||
return ( | ||
<GridItem> | ||
<GridItemHeader title={props.title} /> | ||
<GridItemContent> | ||
<div | ||
dangerouslySetInnerHTML={{ | ||
__html: DOMPurify.sanitize(marked.parse(props.markdown)), | ||
}} | ||
></div> | ||
</GridItemContent> | ||
</GridItem> | ||
) | ||
} | ||
|
||
export default MarkdownContent |
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,54 @@ | ||
import { useEffect, useState } from 'react' | ||
import { Grid } from '@mui/material' | ||
import { useMatomo } from '@jonkoops/matomo-tracker-react' | ||
import { pageTitle } from '../../utils/pagetitle' | ||
import MarkdownContent from './MarkdownContent' | ||
|
||
export default function StartPage() { | ||
const { trackPageView } = useMatomo() | ||
|
||
const [administrationMD, setAdministrationMD] = useState('') | ||
const [communicationMD, setCommunicationMD] = useState('') | ||
const [employmentMD, setEmploymentMD] = useState('') | ||
const [otherMD, setOtherMD] = useState('') | ||
|
||
useEffect(() => { | ||
fetch('/markdown/Administration.md') | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Vi bør etterhvert få henta .md filene fra et annet sted, sånn at de kan oppdateres uten å ha github kompetanse |
||
.then((response) => response.text()) | ||
.then((text) => setAdministrationMD(text)) | ||
}, []) | ||
|
||
useEffect(() => { | ||
fetch('/markdown/Communication.md') | ||
.then((response) => response.text()) | ||
.then((text) => setCommunicationMD(text)) | ||
}, []) | ||
|
||
useEffect(() => { | ||
fetch('/markdown/MyEmployment.md') | ||
.then((response) => response.text()) | ||
.then((text) => setEmploymentMD(text)) | ||
}, []) | ||
|
||
useEffect(() => { | ||
fetch('/markdown/Other.md') | ||
.then((response) => response.text()) | ||
.then((text) => setOtherMD(text)) | ||
}, []) | ||
|
||
useEffect(() => { | ||
trackPageView({ | ||
documentTitle: 'Start', | ||
}) | ||
pageTitle('Start') | ||
}, [trackPageView]) | ||
|
||
return ( | ||
<Grid container spacing={2} alignItems={'stretch'}> | ||
<MarkdownContent title="Administrasjon" markdown={administrationMD} /> | ||
<MarkdownContent title="Kommunikasjon" markdown={communicationMD} /> | ||
<MarkdownContent title="Min ansettelse" markdown={employmentMD} /> | ||
<MarkdownContent title="Annet" markdown={otherMD} /> | ||
</Grid> | ||
) | ||
} |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Flyttet så de ligger alfabetisk
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Liker det