diff --git a/tavla/app/(admin)/boards/components/Column/Delete.tsx b/tavla/app/(admin)/boards/components/Column/Delete.tsx index 58cf392ca..7282ec8e7 100644 --- a/tavla/app/(admin)/boards/components/Column/Delete.tsx +++ b/tavla/app/(admin)/boards/components/Column/Delete.tsx @@ -1,6 +1,6 @@ 'use client' -import { Button, IconButton, SecondarySquareButton } from '@entur/button' -import { CloseIcon, DeleteIcon } from '@entur/icons' +import { Button, ButtonGroup, IconButton } from '@entur/button' +import { DeleteIcon } from '@entur/icons' import { TBoard } from 'types/settings' import { Tooltip } from '@entur/tooltip' import { useModalWithValue } from '../../hooks/useModalWithValue' @@ -46,13 +46,6 @@ function Delete({ closeLabel="Avbryt sletting" className="flex flex-col justify-start items-center text-center" > - - - Slett tavle @@ -66,13 +59,27 @@ function Delete({
- - Ja, slett! - + + + Ja, slett! + + + + diff --git a/tavla/app/(admin)/components/Delete/index.tsx b/tavla/app/(admin)/components/Delete/index.tsx index fd1a8dd4f..06b53729a 100644 --- a/tavla/app/(admin)/components/Delete/index.tsx +++ b/tavla/app/(admin)/components/Delete/index.tsx @@ -1,6 +1,6 @@ 'use client' -import { Button, IconButton, SecondarySquareButton } from '@entur/button' -import { CloseIcon, DeleteIcon } from '@entur/icons' +import { Button, ButtonGroup, IconButton } from '@entur/button' +import { DeleteIcon } from '@entur/icons' import { Modal } from '@entur/modal' import { Heading3, Paragraph, SubParagraph } from '@entur/typography' import { TOrganization } from 'types/settings' @@ -77,16 +77,6 @@ function Delete({ closeLabel="Avbryt sletting" className="flex flex-col text-center" > - { - close() - setNameError(undefined) - }} - > - - Slett organisasjon @@ -99,27 +89,39 @@ function Delete({
-
- - -
- - Ja, slett organisasjon - + + + + + + Ja, slett! + + + diff --git a/tavla/app/(admin)/components/Login/Create.tsx b/tavla/app/(admin)/components/Login/Create.tsx index cd498d0e3..ae91ec212 100644 --- a/tavla/app/(admin)/components/Login/Create.tsx +++ b/tavla/app/(admin)/components/Login/Create.tsx @@ -20,6 +20,9 @@ import { FirebaseError } from 'firebase/app' import { useFormState } from 'react-dom' import { FormError } from '../FormError' import { SubmitButton } from 'components/Form/SubmitButton' +import { usePathname } from 'next/navigation' +import { Button, ButtonGroup } from '@entur/button' +import Link from 'next/link' function Create() { const submit = async (p: TFormFeedback | undefined, data: FormData) => { @@ -47,6 +50,8 @@ function Create() { } } const [state, action] = useFormState(submit, undefined) + const pathname = usePathname() + return (
- Opprett ny bruker + +
+ + Opprett bruker + +
+ +
+ +
+
) diff --git a/tavla/app/(admin)/components/Login/Email.tsx b/tavla/app/(admin)/components/Login/Email.tsx index 3abce0433..a958d19f1 100644 --- a/tavla/app/(admin)/components/Login/Email.tsx +++ b/tavla/app/(admin)/components/Login/Email.tsx @@ -7,8 +7,9 @@ import { } from 'firebase/auth' import { getClientApp } from 'utils/firebase' import { login } from './actions' -import { Heading3, Link } from '@entur/typography' +import { Heading3, Link as EnturLink } from '@entur/typography' import { TextField } from '@entur/form' +import { Button, ButtonGroup } from '@entur/button' import Image from 'next/image' import musk from 'assets/illustrations/Musk.png' import { @@ -22,6 +23,8 @@ import { FirebaseError } from 'firebase/app' import { FormError } from '../FormError' import { TLoginPage } from './types' import { SubmitButton } from 'components/Form/SubmitButton' +import { usePathname } from 'next/navigation' +import Link from 'next/link' function Email() { const submit = async ( @@ -55,6 +58,7 @@ function Email() { const [state, action] = useFormState(submit, undefined) const getPathWithParams = useSearchParamsSetter('login') + const pathname = usePathname() return (
@@ -85,11 +89,34 @@ function Email() {

- + Glemt passord? - +

- Logg inn + +
+ + Logg inn + +
+ +
+ +
+
) diff --git a/tavla/app/(admin)/components/Login/index.tsx b/tavla/app/(admin)/components/Login/index.tsx index 0c9c332c1..3e9b65b23 100644 --- a/tavla/app/(admin)/components/Login/index.tsx +++ b/tavla/app/(admin)/components/Login/index.tsx @@ -3,7 +3,7 @@ import Link from 'next/link' import { Modal } from '@entur/modal' import { usePathname, useRouter } from 'next/navigation' import { IconButton, SecondarySquareButton } from '@entur/button' -import { BackArrowIcon, CloseIcon, LogOutIcon, UserIcon } from '@entur/icons' +import { BackArrowIcon, LogOutIcon, UserIcon } from '@entur/icons' import { logout } from './actions' import { Email } from './Email' import { Start } from './Start' @@ -54,25 +54,14 @@ function Login({ loggedIn }: { loggedIn: boolean }) { className="w-11/12 lg:w-full" onDismiss={() => router.push(pathname ?? '/')} > -
- {hasPage && ( - router.back()} - aria-label="Tilbake til logg inn" - > - - - )} - + {hasPage && ( router.back()} + aria-label="Tilbake til logg inn" > - + -
+ )} diff --git a/tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx b/tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx index 8ef5b7a3a..1c5e2649d 100644 --- a/tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx +++ b/tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx @@ -2,6 +2,7 @@ import { useToast } from '@entur/alert' import { Button, + ButtonGroup, IconButton, NegativeButton, SecondarySquareButton, @@ -463,30 +464,36 @@ function TileCard({ closeLabel="Avbryt endring" >
- + Lagre endringer - Du har endringer som ikke er lagret + Du har endringer som ikke er lagret. -
- + + Lagre -
+ +
diff --git a/tavla/app/(admin)/organizations/components/CreateOrganization/index.tsx b/tavla/app/(admin)/organizations/components/CreateOrganization/index.tsx index ff700fe5a..f56deb6fc 100644 --- a/tavla/app/(admin)/organizations/components/CreateOrganization/index.tsx +++ b/tavla/app/(admin)/organizations/components/CreateOrganization/index.tsx @@ -1,6 +1,6 @@ 'use client' -import { PrimaryButton, SecondarySquareButton } from '@entur/button' -import { AddIcon, CloseIcon } from '@entur/icons' +import { Button, ButtonGroup, PrimaryButton } from '@entur/button' +import { AddIcon } from '@entur/icons' import { Modal } from '@entur/modal' import { Heading3, Paragraph, SubParagraph } from '@entur/typography' import { TextField } from '@entur/form' @@ -29,13 +29,6 @@ function CreateOrganization() { size="small" closeLabel="Avbryt oppretting" > - - - Opprett organisasjon @@ -63,14 +56,29 @@ function CreateOrganization() { {...getFormFeedbackForField('name', state)} /> - - Opprett - + +
+ + Opprett + +
+ +
+ +
+
diff --git a/tavla/app/(admin)/organizations/components/MemberAdministration/RemoveUserButton.tsx b/tavla/app/(admin)/organizations/components/MemberAdministration/RemoveUserButton.tsx index 5bf93defd..477103fe2 100644 --- a/tavla/app/(admin)/organizations/components/MemberAdministration/RemoveUserButton.tsx +++ b/tavla/app/(admin)/organizations/components/MemberAdministration/RemoveUserButton.tsx @@ -1,6 +1,6 @@ 'use client' -import { IconButton, SecondarySquareButton } from '@entur/button' -import { CloseIcon, DeleteIcon } from '@entur/icons' +import { Button, ButtonGroup, IconButton } from '@entur/button' +import { DeleteIcon } from '@entur/icons' import { Modal } from '@entur/modal' import { Tooltip } from '@entur/tooltip' import { Heading3, Paragraph } from '@entur/typography' @@ -32,7 +32,7 @@ function RemoveUserButton({ @@ -43,38 +43,44 @@ function RemoveUserButton({ size="small" onDismiss={close} closeLabel="Avbryt sletting" - className="flex flex-col justify-start items-center text-center" + className="flex flex-col items-center text-center" > - - - Slett medlem - + Er du sikker på at du vil slette medlem med e-postadresse{' '} {user?.email} fra organisasjonen?
- - Ja, slett - + + + Ja, slett! + + + +