Skip to content
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.

Sign up for GitHub

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

Jump to bottom

MaskinportenPage iteration3 includes cleaner CSS for wide screen and mobile view #56

Merged
merged 1 commit into from
Oct 12, 2023
Merged

MaskinportenPage iteration3 includes cleaner CSS for wide screen and mobile view #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 30 additions & 11 deletions frontend/src/features/maskinportenIntAdm/MaskinportenIntAdmPageContent.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.creationPageContainer {
.maskinportenPageContainer {
margin-left: 40px;
margin-right: 40px;
margin-top: 3rem;
Expand Down Expand Up @@ -31,8 +31,26 @@
max-width: 270px;
}

.uploadButtonContainer {
display: flex;
margin-top: 10px;
align-items: center;
}

.uploadButtonWrapper {
margin-right: 10px;
}

.fileChosenTextWrapper {
font-size: 16px;
}



.warningUpdateText {
font-size: 12px;
font-size: 14px;
font-weight: 500;
margin-top: 2rem;
}


Expand All @@ -41,7 +59,6 @@
display: flex;
justify-content: flex-end;
margin-top: 10px;

}

.cancelButton {
Expand All @@ -56,16 +73,22 @@

@media only screen and (min-width: 769px) {

.contentText {
.jwkContentText {
font-size: 18px;
margin-top: 3rem;
}

}

@media only screen and (max-width: 768px) {

.contentText {
.header {
font-size: 20px;
}

.jwkContentText {
font-size: 16px;
margin-top: 2rem;
}

}
Expand All @@ -76,15 +99,11 @@
flex-direction: column;
}

.creationPageContainer {
.maskinportenPageContainer {
margin-top: 1rem;
}

.header {
font-size: 20px;
}

.contentText {
.jwkContentText {
font-size: 14px;
}

Expand Down
55 changes: 17 additions & 38 deletions frontend/src/features/maskinportenIntAdm/MaskinportenIntAdmPageContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ export const MaskinportenIntAdmPageContent = () => {
const [navn, setNavn] = useState('');
const [beskrivelse, setBeskrivelse] = useState('');

// State variabel for nedtrekksmeny:
const [selected, setSelected] = useState('');

const { t } = useTranslation('common');
const navigate = useNavigate();
Expand All @@ -25,52 +23,31 @@ export const MaskinportenIntAdmPageContent = () => {


// brukes i h2, ikke vist i Small/mobile view
const isSm = useMediaQuery('(max-width: 768px)'); // trengs denne?
// const isSm = useMediaQuery('(max-width: 768px)'); // trengs denne?
let overviewText: string;
// overviewText = t('authentication_dummy.auth_overview_text_creation');
overviewText = 'Opprett og administrer maskinporten integrasjon'; // flytt til språkstøtte

// skal nå bare gå tilbake til OverviewPage
// selv om vi må vurdere en sletting av ting?
const handleReject = () => {
setNavn('');
setBeskrivelse('');
setSelected('');
navigate('/' + AuthenticationPath.Auth + '/' + AuthenticationPath.Overview);
}

// Mulig at her skal man trigge en dispatch
// og så navigere til OverviewPage
// har opprettet en creationPageSlice som nå er synlig i
// Chrome DevTools --> må ut og løpe...
const handleConfirm = () => {
setNavn('ReduxLagret');
setBeskrivelse('ReduxLagret');
setSelected('');
}




// Håndterer skifte av valgmuligheter (options) i Nedtrekksmeny
const handleChangeInput = (val: string) => {
setSelected(val);
};
// const minInputId:string = "inputIdString"; // valg id trengs ikke?

// Dette er mest for knapper og videre navigering,
// mens her er <Link> kanskje bedre: fra Studio Dashboard
// men bør også sjekke Designsystemet om de har noe på gang der
const handleSkiftTilCustomCreationPage = () => {
navigate('/' + AuthenticationPath.Auth + '/' + AuthenticationPath.CustomCreation);
};

return (
<div className={classes.creationPageContainer}>
<div className={classes.maskinportenPageContainer}>
<h2 className={classes.header}>{overviewText}</h2>
<div className={classes.flexContainer}>

<div className={classes.leftContainer}>

<div className={classes.nameWrapper}>
<TextField
label = 'Navn'
Expand All @@ -89,31 +66,33 @@ export const MaskinportenIntAdmPageContent = () => {
/>
</div>

<p className={classes.contentText}>

<br></br>
Last opp i jwk i format <br></br>

<div className={classes.uploadButton}>
<p className={classes.jwkContentText}>
Last opp i jwk i format
</p>

<div className={classes.uploadButtonContainer}>

<div className={classes.uploadButtonWrapper}>
<Button
color='primary'
variant='outline'
size='small'
onClick={handleReject}
>
Choose File
</Button>
</Button>
</div>

<div className={classes.fileChosenTextWrapper}>
<span>No file chosen</span>
</div>
<br></br>

</p>
</div>


<p className={classes.warningUpdateText}>
<b>
Maskinporten krever at du oppdaterer JWK hver 12. måned.
Hvis JWK ikke oppdateres vil integrasjon slutte å virke.
</b>
Hvis JWK ikke oppdateres vil integrasjonen slutte å virke.
</p>

<div className={classes.buttonContainer}>
Expand Down