Skip to content

Commit

Permalink
feat(contact): make email optional in form (#1708)
Browse files Browse the repository at this point in the history
* feat(contact): make email optional and add checkbox to prevent user from submit without email

* style(contact): align checkbox with text on first line
  • Loading branch information
emilielr authored Oct 31, 2024
1 parent 31a57c4 commit ab1ef1a
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 26 deletions.
68 changes: 43 additions & 25 deletions tavla/app/components/ContactForm.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'
import { TextArea, TextField } from '@entur/form'
import { Label, Paragraph } from '@entur/typography'
import { Checkbox, TextArea, TextField } from '@entur/form'
import { Label, Paragraph, SubParagraph } from '@entur/typography'
import { SubmitButton } from 'components/Form/SubmitButton'
import { postForm } from './actions'
import {
Expand All @@ -10,11 +10,12 @@ import {
} from 'app/(admin)/utils'
import { useState } from 'react'
import { FormError } from 'app/(admin)/components/FormError'
import { useToast } from '@entur/alert'
import { SmallAlertBox, useToast } from '@entur/alert'
import { Expandable } from './Expandable'
import { usePostHog } from 'posthog-js/react'
import { isEmptyOrSpaces } from 'app/(admin)/edit/utils'
import { validEmail } from 'utils/email'

function ContactForm() {
const posthog = usePostHog()

Expand All @@ -23,12 +24,13 @@ function ContactForm() {
const [formState, setFormError] = useState<TFormFeedback | undefined>(
undefined,
)
const [disabledEmail, setDisabledEmail] = useState(false)

const submit = async (data: FormData) => {
const email = data.get('email') as string
const message = data.get('message') as string

if (!validEmail(email))
if (!disabledEmail && !validEmail(email))
return setFormError(getFormFeedbackForError('auth/missing-email'))

if (isEmptyOrSpaces(message))
Expand All @@ -40,6 +42,7 @@ function ContactForm() {
if (error) return setFormError(error)
else {
setIsOpen(false)
setDisabledEmail(false)
setFormError(undefined)
addToast('Takk for tilbakemelding!')
}
Expand All @@ -66,25 +69,9 @@ function ContactForm() {
<Paragraph as="h1" margin="none" className="font-bold">
Vi setter stor pris på tilbakemeldinger og innspill, og
bistår gjerne hvis du vil ha hjelp til å komme i gang
med Tavla
med Tavla.
</Paragraph>
<div>
<Label
htmlFor="email"
className="font-bold"
aria-required
>
E-post *
</Label>

<TextField
label="E-postadresse"
name="email"
id="email"
aria-label="E-postadresse"
{...getFormFeedbackForField('email', formState)}
/>
</div>
<div>
<Label
htmlFor="message"
Expand All @@ -100,12 +87,43 @@ function ContactForm() {
aria-label="Skriv her"
aria-required
{...getFormFeedbackForField('user', formState)}
className="mb-2"
/>
<SubParagraph>
Hvis du ønsker å legge ved bilder, kan du sende en
e-post til [email protected].
</SubParagraph>
</div>
<Paragraph margin="none">
Hvis du ønsker å legge ved bilder, kan du sende en
e-post til [email protected].
</Paragraph>
<div>
<Label htmlFor="email" className="font-bold">
E-post
</Label>
<TextField
label="E-postadresse"
name="email"
id="email"
aria-label="E-postadresse"
disabled={disabledEmail}
{...getFormFeedbackForField('email', formState)}
/>
</div>
<div>
<Checkbox
className="!items-start"
name="disabledEmail"
onClick={() => setDisabledEmail(!disabledEmail)}
>
Jeg ønsker ikke å oppgi e-postadresse og vil ikke få
svar på henvendelsen.
</Checkbox>
{disabledEmail && (
<SmallAlertBox variant="info">
Vi kan bare svare på meldingen hvis vi har
e-postadressen din.
</SmallAlertBox>
)}
</div>

<FormError
{...getFormFeedbackForField('general', formState)}
/>
Expand Down
6 changes: 5 additions & 1 deletion tavla/app/components/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
import { isEmptyOrSpaces } from 'app/(admin)/edit/utils'
import { TFormFeedback, getFormFeedbackForError } from 'app/(admin)/utils'
import { validEmail } from 'utils/email'

async function postForm(prevState: TFormFeedback | undefined, data: FormData) {
const email = data.get('email') as string
const message = data.get('message') as string
const disabledEmail = data.get('disabledEmail') as string

if (!validEmail(email)) return getFormFeedbackForError('auth/missing-email')
if (disabledEmail !== 'on' && !validEmail(email)) {
return getFormFeedbackForError('auth/missing-email')
}

if (isEmptyOrSpaces(message))
return getFormFeedbackForError('contact/message-missing')
Expand Down

0 comments on commit ab1ef1a

Please sign in to comment.