Squashed commit of the following:

commit 9c79f7e Author: Aaron Chan <[email protected]> Date: Tue Nov 12 22:35:23 2024 -0800 fix: add support for multi word names and support accent a in font commit 73a3e56 Merge: f05a574 eea9b48 Author: Aaron Chan <[email protected]> Date: Tue Nov 12 16:59:52 2024 -0800 Merge branch 'develop' of https://github.com/ucsddesignco/stride2024 into develop commit f05a574 Author: Aaron Chan <[email protected]> Date: Tue Nov 12 16:12:44 2024 -0800 feat: account for longer names for badge
ucsddesignco · Nov 13, 2024 · 0b27376 · 0b27376
1 parent d78accd
commit 0b27376
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/public/fonts/Iosevka-Curly-SemiBoldItalic.woff2 b/public/fonts/Iosevka-Curly-SemiBoldItalic.woff2
diff --git a/src/app/badge/[slug]/ViewBadge.scss b/src/app/badge/[slug]/ViewBadge.scss
@@ -8,6 +8,11 @@
   padding-inline: var(--main-padding);
   position: relative;
 
+  h1,
+  p {
+    margin-inline: auto;
+  }
+
   #mascot-badge-container {
     aspect-ratio: 252/378;
     width: 100%;

diff --git a/src/app/badge/[slug]/findBadge.ts b/src/app/badge/[slug]/findBadge.ts
@@ -10,12 +10,11 @@ export async function getUser(url: string) {
     const userInfo = await User.findOne({ url }, { email: 0 }).lean();
 
     if (!userInfo) {
-      return { error: 'User not found' };
+      return { error: 'User Not Found' };
     }
 
     return userInfo;
   } catch (error) {
-    console.error(error);
     throw new Error('Failed to find user');
   }
 }
diff --git a/src/app/badge/[slug]/page.tsx b/src/app/badge/[slug]/page.tsx
@@ -15,6 +15,7 @@ export default async function ViewBadge({
     return (
       <main id="view-badge-page">
         <h1>{data.error}</h1>
+        <p>Please contact [email protected] for assistance.</p>
       </main>
     );
   }

diff --git a/src/components/Register/MascotBadge/MascotBadge.tsx b/src/components/Register/MascotBadge/MascotBadge.tsx
@@ -27,7 +27,10 @@ const DEFAULT_VALUES = {
 const parseFormData = (formData: TFormData): ParsedFormData => {
   const name = formData.name || DEFAULT_VALUES.name;
   const pronouns = formData.pronouns || DEFAULT_VALUES.pronouns;
-  const [firstName, lastName] = name.split(' ');
+  const lastNameIndex = name.indexOf(' ');
+  const firstName = name.substring(0, lastNameIndex);
+  const lastName = name.substring(lastNameIndex + 1);
+
   let [firstPronoun, secondPronoun] = pronouns.split(' ');
   if (pronouns.includes('/')) {
     [firstPronoun, secondPronoun] = pronouns