- To Favorite, Submit or Join any activity you will first need to complete your user
- profile.
+ To purchase a ticket, or apply to speak, you first need to complete your user profile.
@@ -24,7 +23,7 @@
(wasDismissed = !wasDismissed)}>
diff --git a/src/lib/formSchemas/emergencyContact.js b/src/lib/formSchemas/emergencyContact.js
index 7ef89e4..6ea6f31 100644
--- a/src/lib/formSchemas/emergencyContact.js
+++ b/src/lib/formSchemas/emergencyContact.js
@@ -1,5 +1,7 @@
import { z } from 'zod';
+const phoneNumberRegEx = /^\+(?:[0-9] ?){6,14}[0-9]$/;
+
export default z.object({
fullName: z
.string({ required_error: 'Please enter the name of your contact.' })
@@ -16,7 +18,7 @@ export default z.object({
}),
phoneNumber: z
.string()
- .regex(/^\+(?:[0-9] ?){6,14}[0-9]$/, {
+ .regex(phoneNumberRegEx, {
message: 'Phone number must be in the following format: +13476748428, +493083050, etc.'
})
.min(1, { message: 'Please enter a phone number we can reach them at.' })
diff --git a/src/lib/formSchemas/primaryProfile.js b/src/lib/formSchemas/primaryProfile.js
index 0d98156..d0162d6 100644
--- a/src/lib/formSchemas/primaryProfile.js
+++ b/src/lib/formSchemas/primaryProfile.js
@@ -1,31 +1,4 @@
import { z } from 'zod';
-// import memberApi from '$dataSources/api.that.tech/members/queries';
-
-function validateSlug(slug) {
- // const { isSlugTaken } = memberApi();
-
- console.log('in validate slug', slug);
-
- // message: 'Slug is already taken. Try again.',
- if (!/^[a-zA-Z0-9-_]+$/g.test(slug)) {
- console.log('here');
- return (
- false,
- {
- message: `Invalid format: use only letters, numbers, dash, and underscore`
- }
- );
- }
-
- return true;
-
- // return new Promise((res) =>
- // isSlugTaken(slug).then((r) => {
- // if (isNewProfile) res(!r);
- // res(true);
- // })
- // );
-}
export default z.object({
firstName: z.string().trim().min(1, { message: 'Please enter your first or given name.' }),
@@ -33,9 +6,11 @@ export default z.object({
email: z.string().email({ message: 'Please enter your email address.' }).trim(),
profileSlug: z
.string({ required_error: 'You must enter a value to represent your member page.' })
+ .regex(/^[a-zA-Z0-9-_]+$/, {
+ message: 'Invalid slug format: use only letters, numbers, dash, and underscore'
+ })
.trim()
- .toLowerCase()
- .refine(validateSlug),
+ .toLowerCase(),
acceptedCodeOfConduct: z
.literal(true, {
errorMap: () => ({ message: 'You must accept our Code of Conduct policy.' })
@@ -61,5 +36,6 @@ export default z.object({
errorMap: () => ({ message: 'You Must be 13 years or older.' })
})
.default(false),
- isDeactivated: z.literal(false).default(false)
+ isDeactivated: z.literal(false).default(false),
+ canFeature: z.boolean().default(false)
});
diff --git a/src/routes/(admin my)/my/profiles/primary/+page.server.js b/src/routes/(admin my)/my/profiles/primary/+page.server.js
index d7bd66a..8c48b4c 100644
--- a/src/routes/(admin my)/my/profiles/primary/+page.server.js
+++ b/src/routes/(admin my)/my/profiles/primary/+page.server.js
@@ -1,12 +1,13 @@
import lodash from 'lodash';
import { fail } from '@sveltejs/kit';
-import { superValidate } from 'sveltekit-superforms/server';
+import { superValidate, setError } from 'sveltekit-superforms/server';
import { redirect } from 'sveltekit-flash-message/server';
import primaryProfileSchema from '$lib/formSchemas/primaryProfile';
import meApi from '$dataSources/api.that.tech/me';
import memberApi from '$dataSources/api.that.tech/members/mutations';
+import memberApiQueries from '$dataSources/api.that.tech/members/queries';
const { isNil, isEmpty } = lodash;
@@ -29,15 +30,10 @@ async function getProfile({ parent, fetch }) {
export const load = async (request) => {
let currentProfile = {};
- const { isNewProfile, me, authUser } = await getProfile(request);
+ const { isNewProfile, me } = await getProfile(request);
if (isNewProfile) {
- currentProfile = {
- firstName: authUser.baseUser?.given_name ? authUser.baseUser.given_name : '',
- lastName: authUser.baseUser?.family_name ? authUser.baseUser.family_name : '',
- profileSlug: authUser.baseUser?.nickname ? authUser.baseUser.nickname : '',
- email: authUser.baseUser?.email ? authUser.baseUser.email : ''
- };
+ currentProfile = undefined;
} else {
currentProfile = me;
}
@@ -54,6 +50,7 @@ export const actions = {
default: async (event) => {
const { queryMe } = meApi(event.fetch);
const { createProfile, updateProfile } = memberApi(event.fetch);
+ const { isSlugTaken } = memberApiQueries(event.fetch);
const form = await superValidate(event, primaryProfileSchema);
@@ -66,11 +63,20 @@ export const actions = {
let isNewProfile = false;
const me = await queryMe(fetch);
- if (me) {
- if (!isNil(me) && !isEmpty(me)) {
- isNewProfile = false;
- } else {
- isNewProfile = true;
+ if (!isNil(me) && !isEmpty(me)) {
+ isNewProfile = false;
+ } else {
+ // this is a new profile
+ isNewProfile = true;
+
+ // we need to validate the slug hasn't already been taken.
+ const isTaken = await isSlugTaken(form.data.profileSlug);
+
+ if (isTaken) {
+ setError(form, 'profileSlug', 'This member slug is already taken.');
+ return fail(400, {
+ form
+ });
}
}
diff --git a/src/routes/(admin my)/my/profiles/primary/+page.svelte b/src/routes/(admin my)/my/profiles/primary/+page.svelte
index bbd635b..b1ae3fc 100644
--- a/src/routes/(admin my)/my/profiles/primary/+page.svelte
+++ b/src/routes/(admin my)/my/profiles/primary/+page.svelte
@@ -5,7 +5,7 @@
import Seo from '$components/Seo.svelte';
import ProfileForm from './profileForm.svelte';
- let { form } = data;
+ let { form, isNewProfile } = data;
const metaTags = ((title = 'System Profile - THAT Conference') => ({
title,
@@ -23,4 +23,4 @@
+