Merge branch 'develop' into #4020-improved-task-dragging

Author: chpy04

Dockerfile

@@ -1,5 +1,5 @@
 # Build stage - compile TypeScript
-FROM node:20 AS builder
+FROM node:25 AS builder
 WORKDIR /app
 
 COPY package.json tsconfig.build.json ./
@@ -11,11 +11,11 @@ RUN cd src/backend && npx prisma generate
 RUN yarn build:shared
 RUN yarn build:backend
 
-FROM node:20-slim
+FROM platformatic/node-caged:25-slim
 WORKDIR /app
 
 # Install OpenSSL for Prisma (slim image needs this)
-RUN apt-get update -y && apt-get install -y openssl && rm -rf /var/lib/apt/lists/*
+RUN apt-get update -y && apt-get install -y openssl && rm -rf /var/lib/apt/lists/* && npm install -g yarn
 
 COPY package.json ./
 

devContainerization/Dockerfile.backend.dev

@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:25
 
 COPY package.json tsconfig.build.json ./
 COPY ./src/backend/package.json ./src/backend/tsconfig.json src/backend/

devContainerization/Dockerfile.frontend.dev

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:25-alpine
 
 COPY package.json tsconfig.build.json ./
 COPY ./src/frontend/package.json ./src/frontend/tsconfig.json src/frontend/
@@ -11,4 +11,4 @@ COPY ./src/frontend src/frontend
 COPY ./src/shared src/shared
 
 EXPOSE 3000
-CMD [ "yarn", "workspace", "frontend", "vite", "--force", "--host" ]
+CMD [ "yarn", "workspace", "frontend", "vite", "--force", "--host" ]

package.json

@@ -86,7 +86,7 @@
     "@babel/preset-typescript": "^7.18.6",
     "@types/canvas-confetti": "^1.9.0",
     "@types/jest": "^29.5.14",
-    "@types/node": "20.0.0",
+    "@types/node": "^25.0.0",
     "@typescript-eslint/eslint-plugin": "8.20.0",
     "@typescript-eslint/parser": "8.20.0",
     "concurrently": "^9.1.0",

src/backend/Dockerfile

@@ -1,5 +1,6 @@
 # TO BE RUN FROM DOCKER COMPOSE. DO NOT RUN MANUALLY AS CONTEXT IS NOT SET CORRECTLY
-FROM node:20
+FROM platformatic/node-caged:25-slim
+RUN npm install -g yarn
 
 WORKDIR /base
 

src/backend/package.json

@@ -39,7 +39,7 @@
   "devDependencies": {
     "@types/express-jwt": "^6.0.4",
     "@types/jsonwebtoken": "^8.5.9",
-    "@types/node": "^20.0.0",
+    "@types/node": "^25.0.0",
     "@types/supertest": "^2.0.12",
     "nodemon": "^2.0.16",
     "supertest": "^6.2.4",

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[]