- Lukt het niet om een melding te doen? Bel het telefoonnummer 14 020
-
- Wij zijn bereikbaar van maandag tot en met vrijdag van 08.00 tot 18.00
- uur.
-
+
+ Lukt het niet om een melding te doen? Bel het telefoonnummer
+ 14 020.
+
+
+ Wij zijn bereikbaar van maandag tot en met vrijdag van 08:00 tot
+ 18:00 uur.
+
+
+
+
From d357eb29d7469e4a969c76efa85b61bd5a09ec8a Mon Sep 17 00:00:00 2001
From: Tessa Viergever <112861180+TessaViergever@users.noreply.github.com>
Date: Mon, 21 Oct 2024 16:52:56 +0200
Subject: [PATCH 05/11] feat: add utrecht comp lib + use Heading1 comp for h1
---
src/app/[locale]/incident/add/page.tsx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/app/[locale]/incident/add/page.tsx b/src/app/[locale]/incident/add/page.tsx
index 8443ffe..dc9c17f 100644
--- a/src/app/[locale]/incident/add/page.tsx
+++ b/src/app/[locale]/incident/add/page.tsx
@@ -1,5 +1,7 @@
import { NextIntlClientProvider, useMessages, useTranslations } from 'next-intl'
import { IncidentQuestionsLocationForm } from '@/app/[locale]/incident/add/components/IncidentQuestionsLocationForm'
+import { Heading1 } from '@utrecht/component-library-react/dist/css-module'
+import '@utrecht/design-tokens/dist/index.css'
export default function AddAditionalInformationPage() {
const t = useTranslations('describe-add')
@@ -7,7 +9,7 @@ export default function AddAditionalInformationPage() {
return (
-
- Lukt het niet om een melding te doen? Bel het telefoonnummer
- 14 020.
-
-
- Wij zijn bereikbaar van maandag tot en met vrijdag van 08:00 tot
- 18:00 uur.
-
-
+
+ Lukt het niet om een melding te doen? Bel het telefoonnummer
+ 14 020.
+
+
+ Wij zijn bereikbaar van maandag tot en met vrijdag van 08:00 tot
+ 18:00 uur.
+
diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
index 18ba3ab..6d4f93e 100644
--- a/src/app/[locale]/layout.tsx
+++ b/src/app/[locale]/layout.tsx
@@ -6,7 +6,6 @@ import { Header } from '@/app/[locale]/components/Header'
import localFont from 'next/font/local'
import AppProvider from '@/components/providers/AppProvider'
import { Document } from '@utrecht/component-library-react/dist/css-module'
-import '@utrecht/design-tokens/dist/index.css'
const font = localFont({
src: '../../../public/fonts/open-sans.woff2',
From 985811abcde80d517b4654f8265c8d46627e9792 Mon Sep 17 00:00:00 2001
From: Tessa Viergever <112861180+TessaViergever@users.noreply.github.com>
Date: Wed, 23 Oct 2024 16:09:29 +0200
Subject: [PATCH 10/11] feat: swap: link,button,p comp to NLDS comp
---
src/app/[locale]/incident/components/Stepper.tsx | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/app/[locale]/incident/components/Stepper.tsx b/src/app/[locale]/incident/components/Stepper.tsx
index 2d991b5..2d76912 100644
--- a/src/app/[locale]/incident/components/Stepper.tsx
+++ b/src/app/[locale]/incident/components/Stepper.tsx
@@ -1,11 +1,15 @@
'use client'
import { useTranslations } from 'next-intl'
-import { Link, Paths, usePathname } from '@/routing/navigation'
+import { Paths, usePathname } from '@/routing/navigation'
import { useStepperStore } from '@/store/stepper_store'
import { useEffect, useRef } from 'react'
-import { Button } from '@/components/ui/Button'
import { useFormStore } from '@/store/form_store'
+import {
+ Button,
+ Link,
+ Paragraph,
+} from '@utrecht/component-library-react/dist/css-module'
type StepperProps = {}
@@ -107,13 +111,13 @@ export const Stepper = ({}: StepperProps) => {
>
{index + 1}
-
{item.name}
-
+
)
})}
From 6ef8a8b4f7e9ad83b1cc5e4139fa65492b21eedf Mon Sep 17 00:00:00 2001
From: Tessa Viergever <112861180+TessaViergever@users.noreply.github.com>
Date: Wed, 23 Oct 2024 16:12:50 +0200
Subject: [PATCH 11/11] feat: swap input, formlabel and textarea to nlds comp
---
.../components/IncidentDescriptionForm.tsx | 36 ++++++++++---------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/app/[locale]/incident/components/IncidentDescriptionForm.tsx b/src/app/[locale]/incident/components/IncidentDescriptionForm.tsx
index 7b38888..494765f 100644
--- a/src/app/[locale]/incident/components/IncidentDescriptionForm.tsx
+++ b/src/app/[locale]/incident/components/IncidentDescriptionForm.tsx
@@ -7,14 +7,11 @@ import {
FormField,
FormItem,
FormMessage,
- FormLabel,
FormDescription,
} from '@/components/ui/Form'
import { useForm } from 'react-hook-form'
import { zodResolver } from '@hookform/resolvers/zod'
import { useTranslations } from 'next-intl'
-import { Textarea } from '@/components/ui/TextArea'
-import { Input } from '@/components/ui/Input'
import { IncidentFormFooter } from '@/app/[locale]/incident/components/IncidentFormFooter'
import { useStepperStore } from '@/store/stepper_store'
import { useRouter } from '@/routing/navigation'
@@ -23,6 +20,9 @@ import { getCategoryForDescription } from '@/services/classification'
import { debounce } from 'lodash'
import { useFormStore } from '@/store/form_store'
+import { FormFieldTextarea } from '@utrecht/component-library-react/dist/css-module'
+import { FileInput, Label } from '@amsterdam/design-system-react'
+
export const IncidentDescriptionForm = () => {
const t = useTranslations('describe-report.form')
const { updateForm, formState } = useFormStore()
@@ -89,27 +89,24 @@ export const IncidentDescriptionForm = () => {
name={'description'}
control={form.control}
render={({ field, formState: { errors } }) => (
-
-
{/* TODO: put onChange handler on file upload, or provide defaultValue (bind to react-hook-form). To prevent error */}
- 'test'} />
+ 'test'}
+ multiple
+ />
)}