Migrate to a monorepo setup - step 1 * Move web to subfolder /apps/scandic-web * Yarn + transitive deps - Move to yarn - design-system package removed for now since yarn doesn't support the parameter for token (ie project currently broken) - Add missing transitive dependencies as Yarn otherwise prevents these imports - VS Code doesn't pick up TS path aliases unless you open /apps/scandic-web instead of root (will be fixed with monorepo) * Pin framer-motion to temporarily fix typing issue https://github.com/adobe/react-spectrum/issues/7494 * Pin zod to avoid typ error There seems to have been a breaking change in the types returned by zod where error is now returned as undefined instead of missing in the type. We should just handle this but to avoid merge conflicts just pin the dependency for now. * Pin react-intl version Pin version of react-intl to avoid tiny type issue where formatMessage does not accept a generic any more. This will be fixed in a future commit, but to avoid merge conflicts just pin for now. * Pin typescript version Temporarily pin version as newer versions as stricter and results in a type error. Will be fixed in future commit after merge. * Setup workspaces * Add design-system as a monorepo package * Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN * Fix husky for monorepo setup * Update netlify.toml * Add lint script to root package.json * Add stub readme * Fix react-intl formatMessage types * Test netlify.toml in root * Remove root toml * Update netlify.toml publish path * Remove package-lock.json * Update build for branch/preview builds Approved-by: Linus Flood
121 lines
3.4 KiB
TypeScript
121 lines
3.4 KiB
TypeScript
import { z } from "zod"
|
|
|
|
import { dt } from "@/lib/dt"
|
|
|
|
import { phoneValidator } from "@/utils/zod/phoneValidator"
|
|
|
|
// stringMatcher regex is copied from current web as specified by requirements.
|
|
const stringMatcher =
|
|
/^[A-Za-z¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ0-9-\s]*$/
|
|
|
|
const isValidString = (key: string) => stringMatcher.test(key)
|
|
|
|
export enum FloorPreference {
|
|
LOW = "Low floor",
|
|
HIGH = "High floor",
|
|
}
|
|
|
|
export enum ElevatorPreference {
|
|
AWAY_FROM_ELEVATOR = "Away from elevator",
|
|
NEAR_ELEVATOR = "Near elevator",
|
|
}
|
|
|
|
const specialRequestsSchema = z
|
|
.object({
|
|
floorPreference: z
|
|
.nativeEnum(FloorPreference)
|
|
.or(z.literal("").transform((_) => undefined))
|
|
.optional(),
|
|
elevatorPreference: z
|
|
.nativeEnum(ElevatorPreference)
|
|
.or(z.literal("").transform((_) => undefined))
|
|
.optional(),
|
|
comments: z.string().default(""),
|
|
})
|
|
.optional()
|
|
|
|
export const baseDetailsSchema = z.object({
|
|
countryCode: z.string().min(1, { message: "Country is required" }),
|
|
email: z.string().email({ message: "Email address is required" }),
|
|
firstName: z
|
|
.string()
|
|
.min(1, { message: "First name is required" })
|
|
.refine(isValidString, {
|
|
message: "First name can't contain any special characters",
|
|
}),
|
|
lastName: z
|
|
.string()
|
|
.min(1, { message: "Last name is required" })
|
|
.refine(isValidString, {
|
|
message: "Last name can't contain any special characters",
|
|
}),
|
|
phoneNumber: phoneValidator(),
|
|
specialRequests: specialRequestsSchema,
|
|
})
|
|
|
|
export const notJoinDetailsSchema = baseDetailsSchema.merge(
|
|
z.object({
|
|
join: z.literal<boolean>(false),
|
|
zipCode: z.string().optional(),
|
|
dateOfBirth: z.string().optional(),
|
|
membershipNo: z
|
|
.string()
|
|
.optional()
|
|
.refine((val) => {
|
|
if (val) {
|
|
return !val.match(/[^0-9]/g)
|
|
}
|
|
return true
|
|
}, "Only digits are allowed")
|
|
.refine((num) => {
|
|
if (num) {
|
|
return num.match(/^30812(?!(0|1|2))[0-9]{9}$/)
|
|
}
|
|
return true
|
|
}, "Invalid membership number format"),
|
|
})
|
|
)
|
|
|
|
export const joinDetailsSchema = baseDetailsSchema.merge(
|
|
z.object({
|
|
join: z.literal<boolean>(true),
|
|
zipCode: z.string().min(1, { message: "Zip code is required" }),
|
|
dateOfBirth: z
|
|
.string()
|
|
.min(1, { message: "Date of birth is required" })
|
|
.refine(
|
|
(date) => {
|
|
const today = dt()
|
|
const dob = dt(date)
|
|
const age = today.diff(dob, "year")
|
|
return age >= 18
|
|
},
|
|
{ message: "Must be at least 18 years of age to continue" }
|
|
),
|
|
membershipNo: z.string().default(""),
|
|
})
|
|
)
|
|
|
|
export const guestDetailsSchema = z.discriminatedUnion("join", [
|
|
notJoinDetailsSchema,
|
|
joinDetailsSchema,
|
|
])
|
|
|
|
// For signed in users we accept partial or invalid data. Users cannot
|
|
// change their info in this flow, so we don't want to validate it.
|
|
export const signedInDetailsSchema = z.object({
|
|
countryCode: z.string().default(""),
|
|
email: z.string().default(""),
|
|
firstName: z.string().default(""),
|
|
lastName: z.string().default(""),
|
|
membershipNo: z.string().default(""),
|
|
phoneNumber: z.string().default(""),
|
|
join: z
|
|
.boolean()
|
|
.optional()
|
|
.transform((_) => false),
|
|
dateOfBirth: z.string().default(""),
|
|
zipCode: z.string().default(""),
|
|
specialRequests: specialRequestsSchema,
|
|
})
|