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

MIJN-9614-FEATURE Fe: Varen Thema basis toevoegen aan Frontend #1642

Merged
merged 14 commits into from
Dec 9, 2024
Merged

MIJN-9614-FEATURE Fe: Varen Thema basis toevoegen aan Frontend #1642

merged 14 commits into from
Dec 9, 2024

Conversation

YacineHallo
Copy link
Contributor

No description provided.

@YacineHallo YacineHallo changed the title Mijn 9614 feature fe varen thema basis toevoegen aan frontend Fe: Varen Thema basis toevoegen aan Frontend Dec 2, 2024
@YacineHallo YacineHallo changed the title Fe: Varen Thema basis toevoegen aan Frontend MIJN-9614 Fe: Varen Thema basis toevoegen aan Frontend Dec 2, 2024
@YacineHallo YacineHallo changed the title MIJN-9614 Fe: Varen Thema basis toevoegen aan Frontend MIJN-9614 -FETAURE Fe: Varen Thema basis toevoegen aan Frontend Dec 2, 2024
@YacineHallo YacineHallo changed the title MIJN-9614 -FETAURE Fe: Varen Thema basis toevoegen aan Frontend MIJN-9614 -FEATURE Fe: Varen Thema basis toevoegen aan Frontend Dec 2, 2024
@YacineHallo YacineHallo changed the title MIJN-9614 -FEATURE Fe: Varen Thema basis toevoegen aan Frontend MIJN-9614-FEATURE Fe: Varen Thema basis toevoegen aan Frontend Dec 2, 2024
timvanoostrom
timvanoostrom requested changes Dec 3, 2024
View reviewed changes
src/client/App.tsx Outdated Show resolved Hide resolved
src/client/assets/icons/index.tsx Outdated
@@ -53,6 +53,7 @@ export { default as IconStadspas } from './stadspas.svg?react';
export { default as IconSubsidie } from './subsidie.svg?react';
export { default as IconTips } from './Tip.svg?react';
export { default as IconToeristischeVerhuur } from './toeristische-verhuur.svg?react';
export { default as IconVaren } from './Varen.svg?react';
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
export { default as IconVaren } from './Varen.svg?react';
export { default as IconVaren } from './varen.svg?react';

src/client/assets/icons/varen.svg Outdated
@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M21.5975 21.4756C19.9287 21.4756 18.265 20.8829 16.7974 19.8086C13.8721 21.9731 10.1275 21.9731 7.19723 19.8086C5.73459 20.8829 4.06588 21.4756 2.39716 21.4756H0.00466529V24H2.40219C4.06085 24 5.68936 23.5607 7.20226 22.751C10.2281 24.381 13.7766 24.381 16.8024 22.751C18.3153 23.5713 19.9438 24 21.6025 24H24V21.4756H21.5975ZM8.40353 0H4.80474C3.48283 0 2.40219 1.13782 2.40219 2.52437V8.36163L0.854102 8.89085C0.542474 8.9914 0.281109 9.21896 0.135348 9.52591C-0.0104135 9.82756 -0.0455973 10.1821 0.0649803 10.5103L2.3469 18.946H2.40721C4.32724 18.946 6.03114 17.8346 7.20729 16.4216C8.38343 17.8346 10.0873 18.946 12.0074 18.946C13.9274 18.946 15.6313 17.8346 16.8074 16.4216C17.9836 17.8346 19.6875 18.946 21.6075 18.946H21.6678L23.9246 10.5103C24.0201 10.1821 23.995 9.82756 23.8542 9.52591C23.7085 9.21896 23.4471 8.99669 23.1355 8.89085L21.6025 8.36163V2.52437C21.5975 1.13782 20.5218 0 19.1999 0H15.6011H8.40353ZM4.80474 2.52437H19.1999V7.54135L12.0023 5.05402L4.80474 7.54135V2.52437Z" fill="#004699"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
<path d="M21.5975 21.4756C19.9287 21.4756 18.265 20.8829 16.7974 19.8086C13.8721 21.9731 10.1275 21.9731 7.19723 19.8086C5.73459 20.8829 4.06588 21.4756 2.39716 21.4756H0.00466529V24H2.40219C4.06085 24 5.68936 23.5607 7.20226 22.751C10.2281 24.381 13.7766 24.381 16.8024 22.751C18.3153 23.5713 19.9438 24 21.6025 24H24V21.4756H21.5975ZM8.40353 0H4.80474C3.48283 0 2.40219 1.13782 2.40219 2.52437V8.36163L0.854102 8.89085C0.542474 8.9914 0.281109 9.21896 0.135348 9.52591C-0.0104135 9.82756 -0.0455973 10.1821 0.0649803 10.5103L2.3469 18.946H2.40721C4.32724 18.946 6.03114 17.8346 7.20729 16.4216C8.38343 17.8346 10.0873 18.946 12.0074 18.946C13.9274 18.946 15.6313 17.8346 16.8074 16.4216C17.9836 17.8346 19.6875 18.946 21.6075 18.946H21.6678L23.9246 10.5103C24.0201 10.1821 23.995 9.82756 23.8542 9.52591C23.7085 9.21896 23.4471 8.99669 23.1355 8.89085L21.6025 8.36163V2.52437C21.5975 1.13782 20.5218 0 19.1999 0H15.6011H8.40353ZM4.80474 2.52437H19.1999V7.54135L12.0023 5.05402L4.80474 7.54135V2.52437Z" fill="#004699"/>
<path d="M21.5975 21.4756C19.9287 21.4756 18.265 20.8829 16.7974 19.8086C13.8721 21.9731 10.1275 21.9731 7.19723 19.8086C5.73459 20.8829 4.06588 21.4756 2.39716 21.4756H0.00466529V24H2.40219C4.06085 24 5.68936 23.5607 7.20226 22.751C10.2281 24.381 13.7766 24.381 16.8024 22.751C18.3153 23.5713 19.9438 24 21.6025 24H24V21.4756H21.5975ZM8.40353 0H4.80474C3.48283 0 2.40219 1.13782 2.40219 2.52437V8.36163L0.854102 8.89085C0.542474 8.9914 0.281109 9.21896 0.135348 9.52591C-0.0104135 9.82756 -0.0455973 10.1821 0.0649803 10.5103L2.3469 18.946H2.40721C4.32724 18.946 6.03114 17.8346 7.20729 16.4216C8.38343 17.8346 10.0873 18.946 12.0074 18.946C13.9274 18.946 15.6313 17.8346 16.8074 16.4216C17.9836 17.8346 19.6875 18.946 21.6075 18.946H21.6678L23.9246 10.5103C24.0201 10.1821 23.995 9.82756 23.8542 9.52591C23.7085 9.21896 23.4471 8.99669 23.1355 8.89085L21.6025 8.36163V2.52437C21.5975 1.13782 20.5218 0 19.1999 0H15.6011H8.40353ZM4.80474 2.52437H19.1999V7.54135L12.0023 5.05402L4.80474 7.54135V2.52437Z" />

src/client/config/menuItems.ts Outdated Show resolved Hide resolved
src/client/config/thema.ts Outdated Show resolved Hide resolved
src/client/pages/Varen/Varen.tsx Outdated Show resolved Hide resolved
src/client/pages/Varen/Varen.tsx Outdated
// (vaar) => vaar.caseType === CaseType.GPK
// );

return (
Copy link
Contributor

Choose a reason for hiding this comment

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

Graag het nieuwe ThemaPagina component gebruiken, zie ook HLI.tsx

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Deze Varen.tsx is totaal nog niet aan gewerkt ik heb deze alleen even aangemaakt omdat ik dacht dat ik daarmee het Thema getoond kreeg > volgens mij moet dit in de volgende story Frontend Varen aanmaken worden opgepikt. Ik heb deze file opnieuw gepushed met een comment erin dat dit "fake' data is..

Copy link
Contributor

Choose a reason for hiding this comment

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

Je kunt dan ook iets doen als:

export default function Varen() {
 return 'FAKE';
}

src/universal/config/routes.ts Outdated Show resolved Hide resolved
src/client/config/thema.ts Outdated Show resolved Hide resolved
src/client/config/themaIcons.tsx Outdated Show resolved Hide resolved
YacineHallo and others added 9 commits December 3, 2024 10:46
@YacineHallo
KLeur icoon gewijzigd en comment dat varen fakedata is
1ea30b0
@YacineHallo @timvanoostrom
Update src/client/App.tsx
1151218 
Co-authored-by: Tim van Oostrom <[email protected]>
@YacineHallo @timvanoostrom
Update src/client/config/menuItems.ts
ea4ed06 
Co-authored-by: Tim van Oostrom <[email protected]>
@YacineHallo @timvanoostrom
Update src/client/config/thema.ts
b06d318 
Co-authored-by: Tim van Oostrom <[email protected]>
@YacineHallo @timvanoostrom
Update src/client/pages/Varen/Varen.tsx
2d22993 
Co-authored-by: Tim van Oostrom <[email protected]>
@YacineHallo @timvanoostrom
Update src/client/config/themaIcons.tsx
4747f74 
Co-authored-by: Tim van Oostrom <[email protected]>
@YacineHallo @timvanoostrom
Update src/universal/config/routes.ts
ba7a03f 
Co-authored-by: Tim van Oostrom <[email protected]>
@YacineHallo @timvanoostrom
Update src/client/config/thema.ts
f7d42ea 
Co-authored-by: Tim van Oostrom <[email protected]>
@YacineHallo
id toegevoegd en Varen.tsx geleegd van data
291c545
timvanoostrom
timvanoostrom requested changes Dec 4, 2024
View reviewed changes
Copy link
Contributor

@timvanoostrom timvanoostrom left a comment

Choose a reason for hiding this comment

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

Bijna!

src/client/config/thema.ts Outdated
Comment on lines 157 to 158
'/passagiers-en-beroepsvaart/vergunningen/:kind/:page?': '',
'/passagiers-en-beroepsvaart/vergunning/:caseType/:id': '',
Copy link
Contributor

Choose a reason for hiding this comment

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

Deze moge weg...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Die waren er met een quick fix weer geplaats . Wanneer ik deze weer weghaal krijg ik heb een foutmelding bij DocumentTitles > Type '{ [x: string]: string | ((config: TrackingConfig) => "Home | Meldingen overzicht" | "Home | Dashboard" | "Inloggen | Mijn Amsterdam"); "/": (config: TrackingConfig) => "Home | Meldingen overzicht" | ... 1 more ... | "Inloggen | Mijn Amsterdam"; ... 56 more ...; "/facturen-en-betalen/betaalvoorkeuren": string; }' is missing the following properties from type 'DocumentTitlesConfig': "/passagiers-en-beroepsvaart/vergunningen/:kind/:page?", "/passagiers-en-beroepsvaart/vergunning/:caseType/:id"ts(2739)

Copy link
Contributor

Choose a reason for hiding this comment

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

Check, ik heb hier een fix voor gemaakt. e39f6dd

timvanoostrom
timvanoostrom approved these changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@timvanoostrom timvanoostrom left a comment

Choose a reason for hiding this comment

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

LGTM

@timvanoostrom timvanoostrom merged commit c5ba29c into main Dec 9, 2024
5 checks passed
@timvanoostrom timvanoostrom deleted the MIJN-9614-FEATURE-fe-varen-thema-basis-toevoegen-aan-frontend branch December 9, 2024 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timvanoostrom timvanoostrom timvanoostrom approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@YacineHallo @timvanoostrom