feat(axiom): implement form builder

Author: MFarabi619

apps/axiom/src/components/Nav/navIconMap.ts

@@ -9,6 +9,7 @@ import {
   Users,
 PersonStanding,
 MousePointer2,
+  Inbox,
   Trophy,
   CalendarDays,
   Cpu
@@ -28,7 +29,8 @@ export const navIconMap: Partial<
   challengePrize: Trophy,
   "base-event": CalendarDays,
   "general-event": CalendarDays,
-  "application-form": MousePointer2,
+  forms: MousePointer2,
+  "form-submissions": Inbox,
   hardware: Cpu
 }
 

libs/cms/auth/config.ts

@@ -21,7 +21,6 @@ export const baseConfig = {
 
 export const githubStrategyConfig = {
   strategyName: "github",
-  subFieldName: 'githubSub',
   clientId: process.env.GITHUB_CLIENT_ID || "",
   clientSecret: process.env.GITHUB_CLIENT_SECRET || "",
   authorizePath: "/oauth/github",
@@ -36,7 +35,6 @@ export const githubStrategyConfig = {
 
 export const linkedinStrategyConfig = {
   strategyName: "linkedin",
-  subFieldName: 'linkedinSub',
   clientId: process.env.LINKEDIN_CLIENT_ID || "",
   clientSecret: process.env.LINKEDIN_CLIENT_SECRET || "",
   authorizePath: "/oauth/linkedin",
@@ -51,7 +49,6 @@ export const linkedinStrategyConfig = {
 
 export const discordStrategyConfig = {
   strategyName: "discord",
-  subFieldName: 'discordSub',
   clientId: process.env.DISCORD_CLIENT_ID || "",
   clientSecret: process.env.DISCORD_CLIENT_SECRET || "",
   authorizePath: "/oauth/discord",
@@ -66,7 +63,6 @@ export const discordStrategyConfig = {
 
 export const googleStrategyConfig = {
   strategyName: "google",
-  subFieldName: 'googleSub',
   clientId: process.env.GOOGLE_CLIENT_ID || "",
   clientSecret: process.env.GOOGLE_CLIENT_SECRET || "",
   authorizePath: "/oauth/google",

libs/cms/auth/strategies/google.ts

@@ -1,7 +1,6 @@
 import { PayloadRequest } from "payload";
 import { OAuth2Plugin, defaultGetToken } from "payload-oauth2";
 import { googleStrategyConfig } from "@/cms/auth/config"
-import {generateEmail} from '@/cms/utils'
 
 export const googleOAuth = OAuth2Plugin({
   useEmailAsIdentity: true,
@@ -20,40 +19,40 @@ getUserInfo: async (accessToken: string, req: PayloadRequest) => {
 
   const user = await response.json();
 
-// const existingUser = await req.payload.find({
-//         collection: 'users',
-//         where: {
-//           email: {
-//             equals: req.user?.email,
-//           },
-//         },
-//         limit: 1,
-//       })
+const existingUser = await req.payload.find({
+        collection: 'users',
+        where: {
+          email: {
+            equals: req.user?.email,
+          },
+        },
+        limit: 1,
+      })
 
-//       if (!existingUser.docs || existingUser.docs.length === 0) {
-//         console.log('Creating new user for:', req.user)
+      if (!existingUser.docs || existingUser.docs.length === 0) {
+      }
 
-//         const newUser = await req.payload.create({
-//           collection: 'users',
-//           data: {
-//             email: req.user?.email,
-//             displayName: req.user?.displayName,
-//             mediaUrl: req.user?.photoUrl
-//             // roles: ['hacker'],
-//           },
-//         })
-//         return {
-//           ...newUser,
-//           // roles: ['customer'],
-//         }
-//       }
+        // console.log('Creating new user for:', req.user)
+
+        // const newUser = await req.payload.create({
+        //   collection: 'users',
+        //   data: {
+        //     email: req.user?.email,
+        //     displayName: req.user?.displayName,
+        //     mediaUrl: req.user?.photoUrl
+        //     // roles: ['hacker'],
+        //   },
+        // })
+        // return {
+        //   ...newUser,
+        //   // roles: ['customer'],
+        // }
 
 //   console.log('Found existing user:', existingUser.docs[0])
 //       const userFromDB = existingUser.docs[0]
 
   return {
     email: user.email,
-      googleSub: user.sub,
     googleEmail: user.email,
       googleEmailVerified: user.email_verified,
   };

libs/cms/auth/strategies/linkedin.ts

@@ -2,6 +2,7 @@ import { Payload, PayloadRequest } from "payload";
 import type { File } from "payload";
 import { OAuth2Plugin } from "payload-oauth2";
 import { linkedinStrategyConfig } from "@/cms/auth/config";
+import {generateEmail} from '@/cms/utils'
 
 async function uploadFileByURL(
   payload: Payload,

libs/cms/configs/server.ts

@@ -1,6 +1,6 @@
 // github.com/jhb-software/payload-plugins/tree/main/geocoding
 /* eslint-disable node/prefer-global/process */
-import {Brands, Roles} from "@/db/collections"
+import {adminGroups, Brands, Roles} from "@/db/collections"
 import {Sponsor,
         Organization,
         ChallengePrize,
@@ -9,7 +9,6 @@ import {Sponsor,
         UserToEvent,
         GeneralEvent,
         BaseEvent,
-        ApplicationForm,
         Media,
         Emails,
         Hardware,
@@ -18,6 +17,7 @@ import {Sponsor,
 import {Constants} from "@/db/globals";
 import { linkedinOAuth, githubOAuth, discordOAuth, googleOAuth } from '@/cms/auth'
 
+import { formBuilderPlugin } from '@payloadcms/plugin-form-builder'
 import { resendAdapter } from '@payloadcms/email-resend'
 import { postgresAdapter } from "@payloadcms/db-postgres";
 import { s3Storage } from '@payloadcms/storage-s3'
@@ -38,7 +38,6 @@ export const baseConfig = {
     Roles,
     BaseEvent,
     Hardware,
-    ApplicationForm,
     GeneralEvent,
     UserToEvent,
     SponsorToEvent,
@@ -55,6 +54,41 @@ export const baseConfig = {
     githubOAuth,
     discordOAuth,
     googleOAuth,
+formBuilderPlugin({
+  defaultToEmail: 'info@cuhacking,ca',
+// redirectRelationships: ['pages'],
+  fields: {
+    text: true,
+    textarea: true,
+    select: true,
+    email: true,
+    state: true,
+    country: true,
+    checkbox: true,
+    number: true,
+    message: true,
+    payment: false,
+  },
+formOverrides: {
+  admin: {
+    group: adminGroups.communication,
+    livePreview: {
+     // url: `${process.env.CUHACKING_2025_PORTAL_LOCAL_URL}/registration`,
+     url: `${process.env.CUHACKING_2025_PORTAL_PUBLIC_URL}/registration`,
+    }
+  },
+  versions: {
+    drafts: true
+  },
+    // access: {
+    // },
+  },
+  formSubmissionOverrides:{
+  admin: {
+    group: adminGroups.communication
+  },
+  }
+}),
     process.env.NODE_ENV==='production' && s3Storage({
     collections: {
       media: {

libs/db/collections/models/Users.ts

@@ -1,7 +1,9 @@
 // https://github.com/shefing/payload-tools/tree/main/packages/authorization
 /* eslint-disable node/prefer-global/process */
 import type { CollectionConfig } from 'payload'
-import { admins, adminsAndUser, anyone,
+import { admins,
+         adminsAndUser,
+         anyone,
   // checkRole
 } from '@/db/access'
 // import { authenticated, isAdminFieldLevel } from '@/db/access'
@@ -58,6 +60,10 @@ export const Users: CollectionConfig = {
       limits: [10, 20, 50],
     },
   },
+  versions: {
+    drafts: true,
+    maxPerDoc: 1,
+  },
   fields: [
     {
       name: 'roles',
@@ -211,15 +217,6 @@ export const Users: CollectionConfig = {
               label: 'Handle',
               admin: { readOnly: true },
             },
-            // {
-            //   name: 'linkedinSub',
-            //   type: 'text',
-            //   admin: {
-            //     readOnly: true,
-            //     //   condition: (data, siblingData, { user }) => {
-            //     //     return false
-            //   },
-            // },
             {
               name: 'linkedinId',
               type: 'text',
@@ -274,10 +271,6 @@ export const Users: CollectionConfig = {
                 },
               },
             },
-            // {
-            //   name: 'githubSub',
-            //   type: 'text',
-            // },
             {
               name: 'githubAvatarUrl',
               type: 'text',
@@ -374,8 +367,9 @@ export const Users: CollectionConfig = {
               type: 'text',
               admin: {
                 readOnly: true,
-                //   condition: (data, siblingData, { user }) => {
-                //     return false
+                  condition: () => {
+                    return false
+                  }
               },
             },
           ],
@@ -385,15 +379,6 @@ export const Users: CollectionConfig = {
           label: 'Google',
           fields: [
             { name: 'googleEmail', type: 'email' },
-            // {
-            //   name: 'googleSub',
-            //   type: 'text',
-            //   admin: {
-            //     readOnly: true,
-            //     //   condition: (data, siblingData, { user }) => {
-            //     //     return false
-            //   },
-            // },
             {
               name: 'googleEmailVerified',
               type: 'checkbox',

libs/db/collections/models/index.ts

@@ -1,14 +1,14 @@
-export * from './Application'
+// export * from './Application'
 export * from './Challenge'
 export * from './Criteria'
 export * from './Emails'
 export * from './Event'
 export * from './Hackathons'
+export * from './Hardware'
 export * from './Host-To-Event'
 export * from './Media'
 export * from './Organization'
 export * from './Sponsor-To-Event'
 export * from './Teams'
 export * from './User-To-Event'
 export * from './Users'
-export * from './Hardware'