Merge branch 'develop' into feature/gantt-chart-improvements

Author: JoshuaGoldberg

src/backend/src/controllers/organizations.controllers.ts

@@ -22,28 +22,6 @@ export default class OrganizationsController {
     }
   }
 
-  static async setImages(req: Request, res: Response, next: NextFunction) {
-    try {
-      const { applyInterestImage = [], exploreAsGuestImage = [] } = req.files as {
-        applyInterestImage?: Express.Multer.File[];
-        exploreAsGuestImage?: Express.Multer.File[];
-      };
-
-      const applyInterestFile = applyInterestImage[0] || null;
-      const exploreAsGuestFile = exploreAsGuestImage[0] || null;
-
-      const newImages = await OrganizationsService.setImages(
-        applyInterestFile,
-        exploreAsGuestFile,
-        req.currentUser,
-        req.organization
-      );
-
-      res.status(200).json(newImages);
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
   static async getAllUsefulLinks(req: Request, res: Response, next: NextFunction) {
     try {
       const links = await OrganizationsService.getAllUsefulLinks(req.organization.organizationId);
@@ -97,15 +75,6 @@ export default class OrganizationsController {
     }
   }
 
-  static async getOrganizationImages(req: Request, res: Response, next: NextFunction) {
-    try {
-      const images = await OrganizationsService.getOrganizationImages(req.organization.organizationId);
-      res.status(200).json(images);
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
-
   static async setOrganizationFeaturedProjects(req: Request, res: Response, next: NextFunction) {
     try {
       const { projectIds } = req.body;
@@ -142,6 +111,20 @@ export default class OrganizationsController {
     }
   }
 
+  static async setPlatformLogoImage(req: Request, res: Response, next: NextFunction) {
+    try {
+      if (!req.file) {
+        throw new HttpException(400, 'Invalid or undefined image data');
+      }
+
+      const updatedOrg = await OrganizationsService.setPlatformLogoImage(req.file, req.currentUser, req.organization);
+
+      res.status(200).json(updatedOrg);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async setNewMemberImage(req: Request, res: Response, next: NextFunction) {
     try {
       if (!req.file) {
@@ -181,6 +164,20 @@ export default class OrganizationsController {
     }
   }
 
+  static async setPlatformDescription(req: Request, res: Response, next: NextFunction) {
+    try {
+      const updatedOrg = await OrganizationsService.setPlatformDescription(
+        req.body.platformDescription,
+        req.currentUser,
+        req.organization
+      );
+
+      res.status(200).json(updatedOrg);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async getOrganizationFeaturedProjects(req: Request, res: Response, next: NextFunction) {
     try {
       const featuredProjects = await OrganizationsService.getOrganizationFeaturedProjects(req.organization.organizationId);

src/backend/src/controllers/projects.controllers.ts

@@ -166,9 +166,16 @@ export default class ProjectsController {
 
   static async createLinkType(req: Request, res: Response, next: NextFunction) {
     try {
-      const { name, iconName, required } = req.body;
+      const { name, iconName, required, isOnGuestHomePage } = req.body;
 
-      const newLinkType = await ProjectsService.createLinkType(req.currentUser, name, iconName, required, req.organization);
+      const newLinkType = await ProjectsService.createLinkType(
+        req.currentUser,
+        name,
+        iconName,
+        required,
+        req.organization,
+        isOnGuestHomePage
+      );
       res.status(200).json(newLinkType);
     } catch (error: unknown) {
       next(error);
@@ -449,13 +456,14 @@ export default class ProjectsController {
   static async editLinkType(req: Request, res: Response, next: NextFunction) {
     try {
       const { linkTypeName } = req.params as Record<string, string>;
-      const { name: newName, iconName, required } = req.body;
+      const { name: newName, iconName, required, isOnGuestHomePage } = req.body;
       const linkTypeUpdated = await ProjectsService.editLinkType(
         linkTypeName,
         iconName,
         required,
         req.currentUser,
         req.organization,
+        isOnGuestHomePage,
         newName
       );
       res.status(200).json(linkTypeUpdated);

src/backend/src/prisma/migrations/20260305012944_guest_home_page/migration.sql

@@ -0,0 +1,24 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `applyInterestImageId` on the `Organization` table. All the data in the column will be lost.
+  - You are about to drop the column `exploreAsGuestImageId` on the `Organization` table. All the data in the column will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE "Sponsor" DROP CONSTRAINT "Sponsor_sponsorTierId_fkey";
+
+-- AlterTable
+ALTER TABLE "Link_Type" ADD COLUMN     "isOnGuestHomePage" BOOLEAN NOT NULL DEFAULT false;
+
+-- AlterTable
+ALTER TABLE "Organization" DROP COLUMN "applyInterestImageId",
+DROP COLUMN "exploreAsGuestImageId",
+ADD COLUMN     "platformDescription" TEXT NOT NULL DEFAULT '',
+ADD COLUMN     "platformLogoImageId" TEXT;
+
+-- AlterTable
+ALTER TABLE "Sponsor" ALTER COLUMN "valueTypes" DROP DEFAULT;
+
+-- AddForeignKey
+ALTER TABLE "Sponsor" ADD CONSTRAINT "Sponsor_sponsorTierId_fkey" FOREIGN KEY ("sponsorTierId") REFERENCES "Sponsor_Tier"("sponsorTierId") ON DELETE SET NULL ON UPDATE CASCADE;

src/backend/src/prisma/schema.prisma

@@ -599,16 +599,17 @@ model Work_Package {
 }
 
 model Link_Type {
-  id             String       @id @default(uuid())
-  name           String
-  dateCreated    DateTime     @default(now())
-  iconName       String
-  required       Boolean
-  creatorId      String
-  creator        User         @relation(name: "linkTypeCreator", fields: [creatorId], references: [userId])
-  links          Link[]       @relation(name: "linkTypes")
-  organizationId String
-  organization   Organization @relation(fields: [organizationId], references: [organizationId])
+  id                String       @id @default(uuid())
+  name              String
+  dateCreated       DateTime     @default(now())
+  iconName          String
+  required          Boolean
+  creatorId         String
+  creator           User         @relation(name: "linkTypeCreator", fields: [creatorId], references: [userId])
+  links             Link[]       @relation(name: "linkTypes")
+  organizationId    String
+  organization      Organization @relation(fields: [organizationId], references: [organizationId])
+  isOnGuestHomePage Boolean      @default(false)
 
   @@unique([name, organizationId], name: "uniqueLinkType")
   @@index([organizationId])
@@ -1392,8 +1393,6 @@ model Organization {
   advisor                                User?     @relation(name: "advisor", fields: [advisorId], references: [userId])
   advisorId                              String?
   description                            String    @default("")
-  applyInterestImageId                   String?
-  exploreAsGuestImageId                  String?
   newMemberImageId                       String?
   logoImageId                            String?
   slackWorkspaceId                       String?
@@ -1402,6 +1401,8 @@ model Organization {
   partReviewSampleImageId                String?
   partReviewGuideLink                    String?
   sponsorshipNotificationsSlackChannelId String?
+  platformDescription                    String    @default("")
+  platformLogoImageId                    String?
 
   // Relation references
   wbsElements              WBS_Element[]

src/backend/src/prisma/seed-data/users.seed.ts

@@ -62,6 +62,20 @@ const joeBlow: Prisma.UserCreateInput = {
   }
 };
 
+const guestUser: Prisma.UserCreateInput = {
+  firstName: 'Guest',
+  lastName: 'User',
+  googleAuthId: 'guest-google-id',
+  email: 'guest@husky.neu.edu',
+  emailId: 'guest',
+  userSettings: {
+    create: {
+      defaultTheme: Theme.DARK,
+      slackId: SLACK_ID ? SLACK_ID : 'guest'
+    }
+  }
+};
+
 const wonderwoman: Prisma.UserCreateInput = {
   firstName: 'Diana',
   lastName: 'Prince',
@@ -1121,6 +1135,7 @@ export const dbSeedAllUsers = {
   thomasEmrax,
   joeShmoe,
   joeBlow,
+  guestUser,
   wonderwoman,
   flash,
   aquaman,

src/backend/src/prisma/seed.ts

@@ -125,10 +125,11 @@ const performSeed: () => Promise<void> = async () => {
       userCreatedId: thomasEmrax.userId,
       description:
         'Northeastern Electric Racing is a student-run organization at Northeastern University building all-electric formula-style race cars from scratch to compete in Forumla Hybrid + Electric Formula SAE (FSAE).',
-      applyInterestImageId: '1_iak6ord4JP9TcR1sOYopyEs6EjTKQpw',
-      exploreAsGuestImageId: '1wRes7V_bMm9W7_3JCIDXYkMUiy6B3wRI',
       applicationLink:
-        'https://docs.google.com/forms/d/e/1FAIpQLSeCvG7GqmZm_gmSZiahbVTW9ZFpEWG0YfGQbkSB_whhHzxXpA/closedform'
+        'https://docs.google.com/forms/d/e/1FAIpQLSeCvG7GqmZm_gmSZiahbVTW9ZFpEWG0YfGQbkSB_whhHzxXpA/closedform',
+      platformDescription:
+        'Finishline is a Project Management Dashboard developed by the Software Team at Northeastern Electric Racing.',
+      platformLogoImageId: '1auQO3GYydZOo1-vCn0D2iyCfaxaVFssx'
     }
   });
 
@@ -277,6 +278,7 @@ const performSeed: () => Promise<void> = async () => {
   const pearl = await createUser(dbSeedAllUsers.pearl, RoleEnum.LEADERSHIP, organizationId);
   const larry = await createUser(dbSeedAllUsers.larry, RoleEnum.LEADERSHIP, organizationId);
   const mrsPuff = await createUser(dbSeedAllUsers.mrsPuff, RoleEnum.LEADERSHIP, organizationId);
+  await createUser(dbSeedAllUsers.guestUser, RoleEnum.GUEST, organizationId);
 
   await UsersService.updateUserRole(cyborg.userId, thomasEmrax, 'APP_ADMIN', ner);
 
@@ -380,21 +382,15 @@ const performSeed: () => Promise<void> = async () => {
   const mechanical = await TeamsService.createTeamType(
     batman,
     'Mechanical',
-    'YouTubeIcon',
+    'Construction',
     'This is the mechanical team',
     ner
   );
-  const software = await TeamsService.createTeamType(
-    thomasEmrax,
-    'Software',
-    'InstagramIcon',
-    'This is the software team',
-    ner
-  );
+  const software = await TeamsService.createTeamType(thomasEmrax, 'Software', 'Code', 'This is the software team', ner);
   const electrical = await TeamsService.createTeamType(
     cyborg,
     'Electrical',
-    'SettingsIcon',
+    'ElectricBolt',
     'This is the electrical team',
     ner
   );
@@ -579,15 +575,22 @@ const performSeed: () => Promise<void> = async () => {
   );
 
   /** Link Types */
-  const confluenceLinkType = await ProjectsService.createLinkType(batman, 'Confluence', 'description', true, ner);
+  const confluenceLinkType = await ProjectsService.createLinkType(batman, 'Confluence', 'description', true, ner, false);
 
-  const bomLinkType = await ProjectsService.createLinkType(batman, 'Bill of Materials', 'bar_chart', true, ner);
+  const bomLinkType = await ProjectsService.createLinkType(batman, 'Bill of Materials', 'bar_chart', true, ner, false);
 
-  const mainWebsiteLinkType = await ProjectsService.createLinkType(batman, 'NER Website', 'bar_chart', true, ner);
+  const mainWebsiteLinkType = await ProjectsService.createLinkType(batman, 'NER Website', 'bar_chart', true, ner, false);
 
-  const instagramWebsiteLinkType = await ProjectsService.createLinkType(batman, 'NER Instagram', 'bar_chart', true, ner);
+  const instagramWebsiteLinkType = await ProjectsService.createLinkType(
+    batman,
+    'NER Instagram',
+    'bar_chart',
+    true,
+    ner,
+    false
+  );
 
-  await ProjectsService.createLinkType(batman, 'Google Drive', 'folder', true, ner);
+  await ProjectsService.createLinkType(batman, 'Google Drive', 'folder', true, ner, false);
 
   /**
    * Projects

src/backend/src/routes/organizations.routes.ts

@@ -11,14 +11,6 @@ const upload = multer({ limits: { fileSize: MAX_FILE_SIZE }, storage: memoryStor
 organizationRouter.get('/current', OrganizationsController.getCurrentOrganization);
 organizationRouter.post('/useful-links/set', ...linkValidators, validateInputs, OrganizationsController.setUsefulLinks);
 organizationRouter.get('/useful-links', OrganizationsController.getAllUsefulLinks);
-organizationRouter.post(
-  '/images/update',
-  upload.fields([
-    { name: 'applyInterestImage', maxCount: 1 },
-    { name: 'exploreAsGuestImage', maxCount: 1 }
-  ]),
-  OrganizationsController.setImages
-);
 
 organizationRouter.post(
   '/application-link/update',
@@ -51,6 +43,13 @@ organizationRouter.post(
 );
 organizationRouter.post('/logo/update', upload.single('logo'), OrganizationsController.setLogoImage);
 organizationRouter.get('/logo', OrganizationsController.getOrganizationLogoImage);
+
+organizationRouter.post(
+  '/platform-logo/update',
+  upload.single('platformLogo'),
+  OrganizationsController.setPlatformLogoImage
+);
+
 organizationRouter.post(
   '/new-member-image/update',
   upload.single('newMemberImage'),
@@ -63,6 +62,12 @@ organizationRouter.post(
   validateInputs,
   OrganizationsController.setOrganizationDescription
 );
+organizationRouter.post(
+  '/platform-description/set',
+  nonEmptyString(body('platformDescription')),
+  validateInputs,
+  OrganizationsController.setPlatformDescription
+);
 organizationRouter.get('/featured-projects', OrganizationsController.getOrganizationFeaturedProjects);
 organizationRouter.post(
   '/workspaceId/set',