Skip to content

AYS-333 | Solving test errors #68

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

Merged
merged 12 commits into from
Aug 17, 2024
Merged

AYS-333 | Solving test errors #68

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0d80596
fix : clear stepper error step-2
NNakreSS Aug 14, 2024
9b987d0
initial commit
NNakreSS Aug 14, 2024
cc72fa3
common form structure moved to single component
NNakreSS Aug 14, 2024
58369d0
add message for seatingCount is not number
NNakreSS Aug 14, 2024
f2eb69b
error handling for phoneNumberMustNotBeSameOne
NNakreSS Aug 14, 2024
a6214f9
set seatingcount default 1 & trim for user name fields
NNakreSS Aug 14, 2024
55d1d4e
trim for user name fields
NNakreSS Aug 14, 2024
a81da3f
remove unused imports
NNakreSS Aug 14, 2024
3977be6
remove unused imports
NNakreSS Aug 14, 2024
418ba1d
refactor: rename file OtherEvacuationForm.tsx -> ProxyEvacuationForm.tsx
NNakreSS Aug 17, 2024
a15d75c
refactor: add onwhell for number input & value limit
NNakreSS Aug 17, 2024
dded17b
Merge branch 'main' into bugfix/AYS-333/solving-test-errors
NNakreSS Aug 17, 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
233 changes: 120 additions & 113 deletions src/components/EmergencyForm/EvacuationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,144 +15,151 @@ export default function EvacuationForm({ form }: { form: any }) {
return (
<>
{/* name surname block*/}
<div className="grid grid-cols-2 gap-2">
<FormField name="firstName" render={({ field }) => (
<FormItem>
<FormControl>
<Input placeholder="İsim" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)} />
<div className="grid grid-cols-2 gap-2">
<FormField name="firstName" render={({ field }) => (
<FormItem>
<FormControl>
<Input placeholder="İsim" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)} />

<FormField name="lastName" render={({ field }) => (
<FormItem>
<FormControl>
<Input placeholder="Soyisim" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)} />
</div>
<FormField name="lastName" render={({ field }) => (
<FormItem>
<FormControl>
<Input placeholder="Soyisim" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)} />
</div>

{/*Phone Number block*/}
<FormField name="phoneNumber" render={({ field }) => (
<FormItem>
<FormControl>
<PhoneInput
value={field.value.countryCode + field.value.lineNumber}
onChange={(value: string, country: CountryData) => {
const countryCode: string = country.dialCode
const lineNumber: string = value.slice(countryCode.length)
field.onChange({ countryCode, lineNumber })
}}
/>
</FormControl>
<div className="text-red-500 font-thin text-sm flex gap-2">
<span>{countryCodeError?.message}</span>
<span>{lineNumberError?.message}</span>
</div>
</FormItem>
)} />

{/*number of seats block*/}
<FormField name="seatingCount" render={({ field }) => (
<FormItem>
<FormControl>
<div className="flex items-center justify-between gap-5">
<Label htmlFor="seatingCount" className="text-background text-nowrap font-semibold">Koltuk
Sayısı:</Label>
<Input
id="seatingCount"
placeholder="Koltuk Sayısı"
type="number"
min={1}
max={999}
{...field}
onChange={(e) => {
const value = e.target.value ? Number(e.target.value) : ''
field.onChange(value)
}}
/>
</div>
</FormControl>
<FormMessage />
</FormItem>
)} />

<hr />
<span className="font-bold text-white block text-center">Başvurunun Yapıldığı Konum</span>
{/*application location box*/}
<div className="grid grid-cols-2 gap-2">
<FormField name="sourceCity" render={({ field }) => (
<FormField name="phoneNumber" render={({ field }) => (
<FormItem>
<FormControl>
<SelectLocation
type="city"
value={field.value}
onChange={field.onChange}
<PhoneInput
value={field.value.countryCode + field.value.lineNumber}
onChange={(value: string, country: CountryData) => {
const countryCode: string = country.dialCode
const lineNumber: string = value.slice(countryCode.length)
field.onChange({ countryCode, lineNumber })
}}
/>
</FormControl>
<FormMessage />
<div className="text-red-500 font-thin text-sm flex gap-2">
<span>{countryCodeError?.message}</span>
<span>{lineNumberError?.message}</span>
</div>
</FormItem>
)} />

<FormField name="sourceDistrict" render={({ field }) => (
{/*number of seats block*/}
<FormField name="seatingCount" render={({ field }) => (
<FormItem>
<FormControl>
<SelectLocation
type="district"
cityValue={form.watch('sourceCity')}
value={field.value}
onChange={field.onChange}
/>
<div className="flex items-center justify-between gap-5">
<Label htmlFor="seatingCount" className="text-background text-nowrap font-semibold">Koltuk
Sayısı:</Label>
<Input
id="seatingCount"
placeholder="Koltuk Sayısı"
type="number"
onWheel={(e: any) => e.target.blur()}
{...field}
onChange={(e) => {
const value = e.target.value ? Number(e.target.value) : ''
if (typeof value === 'number') {
if (value <= 999 && value > -1) {
field.onChange(value)
}
} else {
field.onChange(value)
}
}} />
</div>
</FormControl>
<FormMessage />
</FormItem>
)} />
</div>
)
}
/>

<FormField name="address" render={({ field }) => (
<FormItem>
<FormControl>
<Textarea {...field} placeholder="Açık adres" />
</FormControl>
<FormMessage />
</FormItem>
)} />
<hr />
<span className="font-bold text-white block text-center">Başvurunun Yapıldığı Konum</span>
{/*application location box*/
}
<div className="grid grid-cols-2 gap-2">
<FormField name="sourceCity" render={({ field }) => (
<FormItem>
<FormControl>
<SelectLocation
type="city"
value={field.value}
onChange={field.onChange}
/>
</FormControl>
<FormMessage />
</FormItem>
)} />

<hr />
<span className="font-bold text-white block text-center">Tahliye Sağlanacak Konum</span>
<FormField name="sourceDistrict" render={({ field }) => (
<FormItem>
<FormControl>
<SelectLocation
type="district"
cityValue={form.watch('sourceCity')}
value={field.value}
onChange={field.onChange}
/>
</FormControl>
<FormMessage />
</FormItem>
)} />
</div>

{/*target location box*/}
<div className="grid grid-cols-2 gap-2">
<FormField name="targetCity" render={({ field }) => (
<FormField name="address" render={({ field }) => (
<FormItem>
<FormControl>
<SelectLocation
type="city"
value={field.value}
onChange={field.onChange}
/>
<Textarea {...field} placeholder="Açık adres" />
</FormControl>
<FormMessage />
</FormItem>
)} />
<hr />
<span className="font-bold text-white block text-center">Tahliye Sağlanacak Konum</span>

<FormField name="targetDistrict" render={({ field }) => (
<FormItem>
<FormControl>
<SelectLocation
type="district"
cityValue={form.watch('targetCity')}
value={field.value}
onChange={field.onChange}
/>
</FormControl>
<FormMessage />
</FormItem>
)} />
</div>
{/*target location box*/
}
<div className="grid grid-cols-2 gap-2">
<FormField name="targetCity" render={({ field }) => (
<FormItem>
<FormControl>
<SelectLocation
type="city"
value={field.value}
onChange={field.onChange}
/>
</FormControl>
<FormMessage />
</FormItem>
)} />

<FormField name="targetDistrict" render={({ field }) => (
<FormItem>
<FormControl>
<SelectLocation
type="district"
cityValue={form.watch('targetCity')}
value={field.value}
onChange={field.onChange}
/>
</FormControl>
<FormMessage />
</FormItem>
)} />
</div>
</>
)
}
Loading