feat: allow parents & students to sign up at the same time (#24)

Author: Dropheart

app/pages/index.vue

@@ -17,8 +17,9 @@ const data = computed(() => {
       };
     case 'freshers_open':
       return {
-        notificationTitle: 'Freshers signup is now open!',
-        notificationDescription: 'Sign up to be adopted by a DoCSoc family'
+        notificationTitle: 'Parents & freshers signups are now open!',
+        notificationDescription:
+          'Parents, sign up to help freshers settle into university life! Freshers, sign up to be adopted by a DoCSoc family!'
       };
     case 'closed':
       return {

app/pages/portal.vue

@@ -61,20 +61,22 @@ definePageMeta({
         </CardDetails>
       </div>
       <div v-else-if="currentState == 'freshers_open'">
-        <CardDetails v-if="currentUser!.role == 'fresher'">
-          <strong>Fresher's survey. [OPEN]</strong>
-          <CardText>
-            If you have not completed our survey yet, please complete the
-            <NuxtLink to="/survey">survey</NuxtLink>
-            so we can assign a family to you.
+        <CardDetails>
+          <strong>Mums and Dads Survey. [OPEN]</strong>
+          <CardText v-if="!currentUser!.completedSurvey">
+            Please complete the
+            <NuxtLink to="/survey">Mums and Dads survey</NuxtLink>
+            so we can assign you to a happy family!
           </CardText>
-        </CardDetails>
-        <CardDetails v-else>
-          <strong>Parent's survey & proposals. [CLOSED]</strong>
-          <CardText>
-            Visit your
-            <NuxtLink to="/family">family page</NuxtLink>
-            to see your family details.
+          <CardText v-else-if="currentUser!.role == 'fresher'">
+            Thank you for completing the survey! Be on the look out for an email
+            with more details once families have been assigned.
+          </CardText>
+          <CardText v-else-if="currentUser!.role == 'parent'">
+            Thank you for completing the survey! If you haven't yet, please
+            send/accept a
+            <NuxtLink to="/proposals">proposal</NuxtLink>
+            to mark the start of your happy family.
           </CardText>
         </CardDetails>
       </div>

hono/family/family.ts

@@ -13,7 +13,7 @@ import {
   surveySchema
 } from './schema';
 import { requireState } from '../admin/admin';
-import { meta } from '../admin/schema';
+// import { meta } from '../admin/schema';
 
 const proposalSchema = z.object({
   shortcode: z.string()
@@ -44,15 +44,16 @@ export const family = factory
         return ctx.text('You have already completed the survey.', 400);
       }
 
+      // Todo: consider changing states to simply survey open / closed
       // Ensure that parents can only complete the route during parents_open,
       // and students can only complete the route during students_open.
-      const metaInDb = await db.select().from(meta);
-      if (!metaInDb[0]!.state.includes(studentInDb[0]!.role)) {
-        return ctx.text(
-          `It is not yet your time o ${studentInDb[0]!.role}.`,
-          400
-        );
-      }
+      // const metaInDb = await db.select().from(meta);
+      // if (!metaInDb[0]!.state.includes(studentInDb[0]!.role)) {
+      //   return ctx.text(
+      //     `It is not yet your time o ${studentInDb[0]!.role}.`,
+      //     400
+      //   );
+      // }
 
       const { name, interests, aboutMe, socials, gender, jmc } =
         ctx.req.valid('json');
@@ -75,7 +76,7 @@ export const family = factory
   )
   .post(
     '/propose',
-    requireState('parents_open'),
+    requireState('parents_open', 'freshers_open'),
     grantAccessTo('parent'),
     zValidator('json', proposalSchema, async (zRes, ctx) => {
       if (!zRes.success) {
@@ -159,7 +160,7 @@ export const family = factory
   )
   .delete(
     '/proposal',
-    requireState('parents_open'),
+    requireState('parents_open', 'freshers_open'),
     grantAccessTo('parent'),
     zValidator('json', proposalSchema, async (zRes, ctx) => {
       if (!zRes.success) {
@@ -193,7 +194,7 @@ export const family = factory
   )
   .post(
     '/acceptProposal',
-    requireState('parents_open'),
+    requireState('parents_open', 'freshers_open'),
     grantAccessTo('parent'),
     zValidator('json', proposalSchema, async (zRes, ctx) => {
       if (!zRes.success) {
@@ -204,6 +205,17 @@ export const family = factory
       const proposee = ctx.get('shortcode')!;
       const { shortcode: proposer } = ctx.req.valid('json');
 
+      const studentInDb = await db
+        .select()
+        .from(students)
+        .where(eq(students.shortcode, proposee));
+      if (!studentInDb[0]!.completedSurvey) {
+        return ctx.text(
+          'My good fellow, how do you want to get married without having told us *anything* about yourself?',
+          400
+        );
+      }
+
       const proposalsInDb = await db
         .select()
         .from(proposals)
@@ -249,7 +261,7 @@ export const family = factory
   )
   .get(
     '/proposals',
-    requireState('parents_open'),
+    requireState('parents_open', 'freshers_open'),
     grantAccessTo('parent'),
     async ctx => {
       const shortcode = ctx.get('shortcode')!;

hono/seed.ts

@@ -110,15 +110,17 @@ if (push) {
 
   console.log('--- Adding state to the db...');
   // Add the required meta values for state
-  await db.insert(meta).values({
-    id: 1,
-    state: 'parents_open'
-  });
+  await db
+    .insert(meta)
+    .values({
+      id: 1,
+      state: 'parents_open'
+    })
+    .onConflictDoNothing();
   console.log('--- State added! ---');
-} else {
-  console.log('--- Writing JSON to file... ---');
+}
+console.log('--- Writing JSON to file... ---');
 
-  await Bun.write('students.json', JSON.stringify(allStudents, null, 2));
+await Bun.write('students.json', JSON.stringify(allStudents, null, 2));
 
-  console.log('--- Wrote JSON to file! ---');
-}
+console.log('--- Wrote JSON to file! ---');