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.

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

Mijn omgeving overzicht pagina #436

Open
wants to merge 97 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
1b33ee4
:tada: Beginning project with title and header
Marwaxhello Mar 8, 2024
ab3bfd8
:art: Imported all the necessary components, styles, and SVGs
Marwaxhello Mar 18, 2024
715962a
:art: Recreating content structure with headings, buttons and forms
Marwaxhello Mar 18, 2024
d841bec
:art: Added ButtonGroup and Button to login
Marwaxhello Mar 18, 2024
26232e2
:art: Added DigiDLogo, FormField and lables with RadioButtons Ja and Nee
Marwaxhello Mar 18, 2024
74b0f0a
:art: Imported necessary components and set document title based on s…
Marwaxhello Mar 18, 2024
769af39
:art: Added Article, form abd Button to page
Marwaxhello Mar 18, 2024
9a57806
:tada: Begin mijn-omgeving logged in page. Imported necessities
Marwaxhello Mar 20, 2024
158a026
:art: Imported ExampleHeader and Footer, styling, design tokens and b…
Marwaxhello Apr 2, 2024
fa94c32
:art: Added Page component
Marwaxhello Apr 2, 2024
e9760c9
:art: Added Mijn-Omgeving detail content
Marwaxhello Apr 4, 2024
bf33526
:fire: Removed file mijn omgeving from wmebv
Marwaxhello Apr 4, 2024
dbf39fa
:art: Replaced custom wmebv header and footer Funnel with standard he…
Marwaxhello Apr 4, 2024
cfb9eea
:art: Changed stepLable
Marwaxhello Apr 4, 2024
5c05635
:art: Replaced Heading1 Vraag aan de gemeente met Inloggen
Marwaxhello Apr 4, 2024
1d518a5
:fire: Removed comments and space icon
Marwaxhello Apr 4, 2024
6afd35e
:fire: Removed Backlink import
Marwaxhello Apr 4, 2024
d62c7ff
:arrow_up: Upgraded pnpm-lock with gemeente-denhaag dependencies
Marwaxhello Apr 5, 2024
e9d2395
:package: Upgraded package with gemeente-denhaag dependencies
Marwaxhello Apr 5, 2024
24a386e
:art: Added gemeente-denhaag SideNav to Mijn-omgeving Overzicht-page
Marwaxhello Apr 5, 2024
d91cee3
:fire: Removed H2 mijn-zaken
Marwaxhello Apr 8, 2024
2962b52
:art: Sidenav outline
Marwaxhello Apr 8, 2024
41cd6f8
♻️ Top BreadcrumNavLink outline
Marwaxhello Apr 8, 2024
f1bcc4f
:recycle: Import position clean-up
Marwaxhello Apr 8, 2024
91d2fcf
:art: Mijn zaken blok
Marwaxhello Apr 11, 2024
c022f79
:fire: Removed Footer import and space icon from BreadcrumNav
Marwaxhello Apr 18, 2024
bb8b0ea
:recycle: Fix typos
Marwaxhello Apr 18, 2024
bd98572
:fire: Removed Backlink-Icon
Marwaxhello Apr 18, 2024
0cd1bdf
:sparkles: Begin mijn-zaken page
Marwaxhello Apr 18, 2024
4df005c
:arrow_up: added denhaag dependencies
Marwaxhello Apr 18, 2024
e81274a
:art: added link
Marwaxhello Apr 18, 2024
cd450b4
:art: improved code structure
Marwaxhello Apr 22, 2024
64c9b5e
:fire: Removed extra Header and Footer imports
Marwaxhello Apr 23, 2024
8a4bff5
:fire: Removed UtrechtLogo en UtrechtIcon imports
Marwaxhello Apr 23, 2024
0d364da
:fire: Removed Heading3 import
Marwaxhello Apr 23, 2024
41f26c0
:art: Added IngelogdeHeader import
Marwaxhello Apr 23, 2024
32371ea
:art: Bold Paragraph
Marwaxhello Apr 23, 2024
abeab70
:pencil2: Bekijk zaken typos fix
Marwaxhello Apr 23, 2024
2948fad
:truck: Renamed Header component
Marwaxhello Apr 23, 2024
52a0729
:sparkles: Start new Header component for mijn-omgeving file
Marwaxhello Apr 23, 2024
134e9f0
:bulb: Added SearchBar comment
Marwaxhello Apr 23, 2024
62b6326
:lipstick: Added HeadingIngelogd CSS file
Marwaxhello Apr 23, 2024
22236e6
:art: Added Classnames
Marwaxhello Apr 25, 2024
c7c7a97
:arrow_up: Update DenHaag Sidenav components dependencies
Marwaxhello Apr 25, 2024
049134b
:lipstick: Added mijn-omgeving css file with content-layout styling
Marwaxhello Apr 25, 2024
fc878d8
:fire: Removed import Main
Marwaxhello Apr 25, 2024
c1bcc76
:fire: Removed import
Marwaxhello Apr 25, 2024
e03a086
:lipstick: Styling toptask layout
Marwaxhello Apr 29, 2024
ab3e730
:fire: Removed heading 3 styling mijn-omgeving
Marwaxhello Apr 29, 2024
97405a5
:lipstick: Added spacing design token
Marwaxhello Apr 29, 2024
d4f397c
:fire: Removed sidenav layout styling
Marwaxhello Apr 29, 2024
67c982a
:art: Header content zonder zoek functie
Marwaxhello Apr 29, 2024
a312474
:lipstick: Styling HeaderIngelogd
Marwaxhello Apr 29, 2024
23aa6da
:fire: Removed lege headings
Marwaxhello Apr 30, 2024
bce9eea
:fire: Removed slash
Marwaxhello Apr 30, 2024
c459f92
:fire: Removed navigation import
Marwaxhello Apr 30, 2024
c01a4eb
:lipstick: Added design tokens
Marwaxhello Apr 30, 2024
0481912
:art: Added SideNav Icons
Marwaxhello Apr 30, 2024
8440daa
:art: Card component content
Marwaxhello Apr 30, 2024
c211c94
:lipstick: Card border styling
Marwaxhello Apr 30, 2024
1068d50
:recycle: Card refactor code
Marwaxhello Apr 30, 2024
eb7fad8
:art: Added Card import
Marwaxhello Apr 30, 2024
612f9e2
:lipstick: Added voorbeeld design tokens
Marwaxhello Apr 30, 2024
d51054c
:fire: Removed unused imports
Marwaxhello Apr 30, 2024
339b4ea
:truck: Fix typo
Marwaxhello Apr 30, 2024
3c49b40
:fire: Removed unused imports
Marwaxhello Apr 30, 2024
e16c0a5
:art: Added ClassName to card title
Marwaxhello Apr 30, 2024
51b7a0b
:lipstick: Styling example-card-title
Marwaxhello Apr 30, 2024
b463a7f
:art: Added ButtonGroup
Marwaxhello Apr 30, 2024
a15b4fa
:art: Added ClassName Sidenav gap
Marwaxhello Apr 30, 2024
6d09aa1
:lipstick: Styling sidenav spacing
Marwaxhello Apr 30, 2024
c83562f
:art: Center Inlog pages
Marwaxhello Apr 30, 2024
f91e864
:fire: Removed buttongroup
Marwaxhello Apr 30, 2024
e4917b7
:lipstick: Added margin to viirbeeld card
Marwaxhello May 1, 2024
a1ebb23
:art: Added Icons
Marwaxhello May 1, 2024
f16fe43
:fire: Removed Imports
Marwaxhello May 1, 2024
201aac8
:art: Imported HeaderIngelogd css
Marwaxhello May 1, 2024
81d0bf3
:art: Header swap and added class to link
Marwaxhello May 1, 2024
c21bfa3
:fire: Removed ButtonGroup import
Marwaxhello May 1, 2024
63a4e7e
:fire: Removed Navigation
Marwaxhello May 1, 2024
e35eb47
:art: Added Navigation
Marwaxhello May 1, 2024
38be33f
:art: Added Teaxtbox and zoek button
Marwaxhello May 1, 2024
539ad89
:lipstick: Added example header styling
Marwaxhello May 1, 2024
df00dec
:fire: Removed FormFieldTextbox import
Marwaxhello May 3, 2024
15189e5
:truck: import name typo fix
Marwaxhello May 3, 2024
af649b9
:truck: import name typo fix
Marwaxhello May 3, 2024
b828b4a
:fire: Removed comment
Marwaxhello May 3, 2024
4f4c629
:fire: Removed ExampleNav and Header
Marwaxhello May 3, 2024
a1b353e
:fire: Removed unnecessary styling
Marwaxhello May 3, 2024
f348043
:lipstick: Added header home page styling
Marwaxhello May 3, 2024
d00f9f3
:art: Zoek Button appearance and icon added
Marwaxhello May 3, 2024
d9ee67f
:fire: Removed comment
Marwaxhello May 3, 2024
501d21c
:lipstick: Added design token to margin inline
Marwaxhello May 3, 2024
5f3bbf1
:lipstick: Font-weight bold token
Marwaxhello May 6, 2024
6c28955
:recycle: Self closing tag
Marwaxhello May 6, 2024
2cc681b
:truck: Rename class
Marwaxhello May 6, 2024
f88312f
:lipstick: Rename class
Marwaxhello May 6, 2024
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
2 changes: 2 additions & 0 deletions packages/next-templates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"devDependencies": {
"@fontsource/fira-sans": "5.0.18",
"@fontsource/source-serif-pro": "5.0.8",
"@gemeente-denhaag/button": "0.2.3-alpha.384",
"@gemeente-denhaag/sidenav": "0.1.0-alpha.205",
"@next/eslint-plugin-next": "13.5.6",
"@nl-design-system-unstable/voorbeeld-design-tokens": "1.0.0-alpha.122",
"@svgr/webpack": "8.1.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
'use client';

import { Article, Page, PageContent, Heading1, ButtonGroup, Button } from '@utrecht/component-library-react';

import '@/app/styling/css/wmebv.css';
import { useEffect, useId } from 'react';

export default function home() {
const formHeadingId = useId();

const stepLabel = 'Doe alsof u inlogt met DigiD';
const websiteLabel = 'gemeente Voorbeeld';

useEffect(() => {
if (typeof document?.title === 'string') {
document.title = `${stepLabel} - ${websiteLabel}`;
}
}, []);

return (
<Page>
<PageContent className="voorbeeld-page-content-flex">
<Article id="main" className="voorbeeld-article-space">
<Heading1 id={formHeadingId}>{stepLabel}</Heading1>
<form action="./ingelogd/stap1" method="get" aria-labelledby={formHeadingId}>
<ButtonGroup>
<Button type="submit" appearance="primary-action-button">
Inloggen
</Button>
</ButtonGroup>
</form>
</Article>
</PageContent>
</Page>
);
}
105 changes: 105 additions & 0 deletions packages/next-templates/src/app/mijn-omgeving/inloggen/page.tsx
Marwaxhello marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
'use client';

import {
Article,
Button,
ButtonGroup,
Heading1,
Heading2,
Icon,
Link,
Page,
PageContent,
Paragraph,
} from '@utrecht/component-library-react';
import { UtrechtDigidLogo } from '@utrecht/web-component-library-react';
import { Fieldset, FieldsetLegend, FormField, FormLabel, RadioButton } from '@utrecht/component-library-react';
Marwaxhello marked this conversation as resolved.
Show resolved Hide resolved

import { IconArrowLeft } from '@tabler/icons-react';
import '@/app/styling/css/wmebv.css';
import '@/app/styling/css/detail-page.css';
import '@utrecht/design-tokens/dist/index.css';
import { useEffect } from 'react';

import { ExampleHeader } from '@/components/ExampleHeader/ExampleHeader';
import { ExampleFooter } from '@/components/ExampleFooter/ExampleFooter';

export default function home() {
const stepLabel = 'Inloggen mijn omgeving';
const websiteLabel = 'gemeente Voorbeeld';

useEffect(() => {
if (typeof document?.title === 'string') {
document.title = `${stepLabel} - ${websiteLabel}`;
}
}, []);

return (
<Page>
<ExampleHeader />
Marwaxhello marked this conversation as resolved.
Show resolved Hide resolved
<PageContent className="voorbeeld-page-content-flex">
<Article id="main" className="voorbeeld-article-space ">
<form method="POST" action="/api/wmebv/choose-form">
<ButtonGroup>
<Link href="./">
<Icon>
<IconArrowLeft />
</Icon>
Terug
</Link>
</ButtonGroup>
<Heading1>Inloggen</Heading1>
<Paragraph className="paragraph_digid">
Dankzij uw DigiD kunt u overal makkelijk en veilig inloggen. Uw persoonlijke gegevens blijven goed
beschermd. Wanneer u inlogt worden uw persoonlijke gegevens automatisch ingevuld.
</Paragraph>
<UtrechtDigidLogo className="voorbeeld-digid-logo" aria-label="DigiD logo" role="img" />
<Fieldset id="df861ef1-844a-42df-8365-b54f59474fb8" role="radiogroup">
<FieldsetLegend className="fieldlabel_inloggen">Wilt u inloggen?</FieldsetLegend>
<FormField type="radio">
<Paragraph className="utrecht-form-field__label utrecht-form-field__label--radio">
<FormLabel
className="voorbeeld-radio-button-form-label"
htmlFor="800b7f3f-5048-4dcc-8f23-d04fa6ca4199"
type="radio"
>
<RadioButton
className="utrecht-form-field__input"
id="800b7f3f-5048-4dcc-8f23-d04fa6ca4199"
name="loggedIn"
value="true"
/>
Ja
</FormLabel>
</Paragraph>
</FormField>
<FormField type="radio">
<Paragraph className="utrecht-form-field__label utrecht-form-field__label--radio">
<FormLabel
className="voorbeeld-radio-button-form-label"
htmlFor="fbc03e63-42c2-46e3-9acc-183fa64c6dcd"
type="radio"
>
<RadioButton
className="utrecht-form-field__input"
id="fbc03e63-42c2-46e3-9acc-183fa64c6dcd"
name="loggedIn"
value="false"
/>
Nee
</FormLabel>
</Paragraph>
</FormField>
</Fieldset>
<ButtonGroup>
Marwaxhello marked this conversation as resolved.
Show resolved Hide resolved
<Button type="submit" appearance="primary-action-button">
Doorgaan
</Button>
</ButtonGroup>
</form>
</Article>
</PageContent>
<ExampleFooter />
</Page>
);
}
25 changes: 25 additions & 0 deletions packages/next-templates/src/app/mijn-omgeving/mijn-zaken/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
'use client';

import { Article, Document, Page } from '@utrecht/component-library-react';

import { useForm } from 'react-hook-form';
import { useRouter } from 'next/navigation';

import '@/app/styling/css/detail-page.css';
import '@utrecht/design-tokens/dist/index.css';

export default function Home() {
const router = useRouter();
const {
register,
handleSubmit,
watch,
formState: { errors },
} = useForm<{ [key: string]: string }>();

return (
<Document>
<Page></Page>
</Document>
);
}
157 changes: 157 additions & 0 deletions packages/next-templates/src/app/mijn-omgeving/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
'use client';

import {
Article,
BreadcrumbNavLink,
BreadcrumbNav,
BreadcrumbNavSeparator,
Document,
Heading1,
Heading2,
Link,
Paragraph,
Page,
PageContent,
} from '@utrecht/component-library-react';
import { Sidenav, SidenavItem, SidenavLink, SidenavList } from '@gemeente-denhaag/sidenav';

import { HeaderIngelogd } from '@/components/ExampleHeader/HeaderIngelogd/HeaderIngelogd';
import { ExampleFooter } from '@/components/ExampleFooter/ExampleFooter';
import { Card } from '@/components/Card/Card';

import {
IconCurrencyEuro,
IconLayoutGrid,
IconInbox,
IconArchive,
IconHome,
IconParking,
IconBuildingCommunity,
IconUser,
} from '@tabler/icons-react';

import { useForm } from 'react-hook-form';
import { useRouter } from 'next/navigation';

import IconChevronRight from '../../app/styling/assets/chevronRight.svg';

import '@/app/styling/css/detail-page.css';
import '@utrecht/design-tokens/dist/index.css';
import '@/app/styling/css/mijn-omgeving.css';

export default function Home() {
const router = useRouter();
const {
register,
handleSubmit,
watch,
formState: { errors },
} = useForm<{ [key: string]: string }>();

return (
<Document>
<Page>
<HeaderIngelogd />
<PageContent>
<BreadcrumbNav label="Kruimelpad">
<BreadcrumbNavLink href="" index={0} rel="home">
Home
</BreadcrumbNavLink>
<BreadcrumbNavSeparator>
<IconChevronRight className="voorbeeld-chevron-right-space" />
</BreadcrumbNavSeparator>
<BreadcrumbNavLink href="" index={1} rel="mijn-omgeving">
Mijn Omgeving
</BreadcrumbNavLink>
</BreadcrumbNav>

<Article id="main" className="voorbeeld-main-layout voorbeeld-toptask-layout">
<div className="voorbeeld-sidenav-layout">
<Sidenav>
<SidenavList>
<SidenavItem className="voorbeeld-sidenav-spacing">
<SidenavLink current href="#">
<IconLayoutGrid />
Overzicht
</SidenavLink>
</SidenavItem>

<SidenavItem>
<SidenavLink href="#">
<IconInbox />
Berichten
</SidenavLink>
</SidenavItem>
<SidenavItem className="voorbeeld-sidenav-spacing">
<SidenavLink href="#">
<IconArchive />
Mijn zaken
</SidenavLink>
</SidenavItem>
</SidenavList>
</Sidenav>

<Sidenav>
<SidenavList>
<SidenavItem>
<SidenavLink href="#">
<IconCurrencyEuro />
Belastingzaken
</SidenavLink>
</SidenavItem>
<SidenavItem>
<SidenavLink href="#">
<IconHome /> WOZ
</SidenavLink>
</SidenavItem>
<SidenavItem>
<SidenavLink href="#">
<IconParking />
Parkeren
</SidenavLink>
</SidenavItem>
<SidenavItem className="voorbeeld-sidenav-spacing">
<SidenavLink href="#">
<IconBuildingCommunity />
Erfpacht
</SidenavLink>
</SidenavItem>
</SidenavList>
</Sidenav>

<Sidenav>
<SidenavList>
<SidenavItem>
<SidenavLink href="#">
<IconUser />
Account
</SidenavLink>
</SidenavItem>
</SidenavList>
</Sidenav>
</div>

<div className="voorbeeld-content">
<Heading1>Hallo Jeroen van Drouwen</Heading1>
<Paragraph>
In ‘Mijn omgeving’ kunt u zelf uw persoonlijke zaken regelen wanneer het u uitkomt. U kunt bijvoorbeeld
uw rekeningen betalen en zien wanneer uw aanvraag klaar is.
</Paragraph>

<Heading2>Wat moet ik regelen?</Heading2>
<Paragraph>U hoeft op dit moment niets te regelen.</Paragraph>
<Heading2>Mijn zaken</Heading2>
<Card />

<Link className="example--back-link" href="./mijn-omgeving/mijn-zaken">
Bekijk alle zaken
</Link>
</div>
</Article>
</PageContent>

<ExampleFooter />
</Page>
</Document>
);
}
16 changes: 16 additions & 0 deletions packages/next-templates/src/app/styling/css/mijn-omgeving.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.voorbeeld-main-layout {
margin-inline: auto;
padding-inline: var(--voorbeeld-space-block-cat);
max-inline-size: calc(var(--utrecht-article-max-inline-size) * 1.2);
inline-size: 100%;
}

.voorbeeld-toptask-layout {
display: flex;
justify-content: space-between;
gap: var(--voorbeeld-space-column-elephant);
}

.voorbeeld-sidenav-spacing {
margin-bottom: var(--voorbeeld-space-row-rat);
}
17 changes: 17 additions & 0 deletions packages/next-templates/src/components/Card/Card.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
'use client';

import { Paragraph, LinkList } from '@utrecht/component-library-react';
import './card.css';

export const Card = () => (
<section className="example-section">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Waarom beginnen alle classNames met example?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Styling names van denhaag, moet nog naam veranderen

Copy link
Collaborator Author

@Marwaxhello Marwaxhello Apr 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hier is mijn component nieuwe en bestaat uit niet zo veel example titles, dus dit zal ik wel aanpassen! :)

<div className="example-card-group">
<div className="example-card">
<Paragraph className="example-card-title">Vraag aan de gemeente</Paragraph>
<LinkList links={[{ href: './mijn-omgeving/mijn-zaken', children: 'Bekijk zaak' }]} />
</div>
</div>
</section>
);

Card.displayName = 'Card';
26 changes: 26 additions & 0 deletions packages/next-templates/src/components/Card/card.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
.example-section {
margin-block-start: var(--voorbeeld-space-block-rabbit);
}

.example-card-group {
--example-card-border-width: var(--voorbeeld-border-width-sm,);
--example-card-border-color: var(--voorbeeld-color-dark-alpha-100);
--example-card-title-font-size: var(--voorbeeld-typography-font-size-xl);
--example-card-title-line-height: var(--voorbeeld-typography-line-height-lg);
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Card CSS example to voorbeeld


.example-card {
border: var(--example-card-border-width) solid var(--example-card-border-color);
flex: 1 1 calc(50% - 64px);
padding-block-end: calc(2rem - var(--voorbeeld-space-block-ant));
padding-block-start: calc(1.5rem - var(--voorbeeld-space-block-ant));
padding-inline-start: calc(1.5rem - var(--voorbeeld-space-inline-ant));

border-radius: var(--voorbeeld-border-radius-md);
margin-bottom: var(--voorbeeld-space-block-rabbit);
}

.example-card-title {
font-size: var(--voorbeeld-typography-font-size-lg);
font-weight: var(--voorbeeld-typography-font-weight-bold);
}
Loading
Loading