Merge branch 'develop' into #4037-JasperPinkus-credits

chpy04 · web-flow · commit 6d79bd3290e9 · 2026-03-22T16:20:42.000-04:00
diff --git a/.ebextensions/03_ssh_keys.config b/.ebextensions/03_ssh_keys.config
@@ -0,0 +1,33 @@
+files:
+  "/tmp/add_authorized_keys.sh":
+    mode: "000755"
+    owner: root
+    group: root
+    content: |
+      #!/bin/bash
+      AUTHORIZED_KEYS="/home/ec2-user/.ssh/authorized_keys"
+      mkdir -p /home/ec2-user/.ssh
+      touch "$AUTHORIZED_KEYS"
+      chown ec2-user:ec2-user /home/ec2-user/.ssh
+      chmod 700 /home/ec2-user/.ssh
+
+      add_key() {
+        local key="$1"
+        if ! grep -qF "$key" "$AUTHORIZED_KEYS"; then
+          echo "$key" >> "$AUTHORIZED_KEYS"
+        fi
+      }
+
+      # Chris Pyle
+      add_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqV5gwot3utGLPGpAPWr8znU1cjMn1RE7jN8htvaOMt aws-eb"
+
+      # Sean Walker
+      add_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICf1UhVM+65hiKahvdvEj20ohDu+bZVS+btVFJTtg0oP seanwalker@Seans-MacBook-Pro-2.local"
+
+      chown ec2-user:ec2-user "$AUTHORIZED_KEYS"
+      chmod 600 "$AUTHORIZED_KEYS"
+
+commands:
+  add_authorized_keys:
+    command: "/tmp/add_authorized_keys.sh"
+    ignoreErrors: false
diff --git a/infrastructure/modules/elasticbeanstalk/variables.tf b/infrastructure/modules/elasticbeanstalk/variables.tf
@@ -14,7 +14,7 @@ variable "solution_stack_name" {
   description = "Elastic Beanstalk solution stack name"
   type        = string
   # Find the latest: aws elasticbeanstalk list-available-solution-stacks
-  default     = "64bit Amazon Linux 2023 v4.7.4 running Docker"
+  default     = "64bit Amazon Linux 2023 v4.11.0 running Docker"
 }
 
 variable "vpc_id" {
diff --git a/infrastructure/modules/monitoring/main.tf b/infrastructure/modules/monitoring/main.tf
@@ -357,6 +357,10 @@ resource "aws_cloudwatch_metric_alarm" "eb_memory_high" {
     Environment = var.environment
     Project     = var.project_name
   }
+
+  lifecycle {
+    ignore_changes = [metric_query]
+  }
 }
 
 #############
diff --git a/infrastructure/modules/network/main.tf b/infrastructure/modules/network/main.tf
@@ -164,6 +164,14 @@ resource "aws_security_group" "eb_instance" {
     security_groups = [aws_security_group.alb.id]
   }
 
+  ingress {
+    description = "SSH access"
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
   egress {
     description = "Allow all outbound traffic"
     from_port   = 0
diff --git a/infrastructure/scripts/ssh-to-eb.sh b/infrastructure/scripts/ssh-to-eb.sh
@@ -58,6 +58,7 @@ echo "🔌 Connecting to EB instance..."
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo ""
 echo "Instance: $INSTANCE_IP ($INSTANCE_ID)"
+echo "Direct SSH: ssh -i $KEY_PATH_EXPANDED ec2-user@$INSTANCE_IP"
 echo "User: ec2-user"
 echo ""
 echo "Useful commands once connected:"
diff --git a/src/backend/src/prisma-query-args/projects.query-args.ts b/src/backend/src/prisma-query-args/projects.query-args.ts
@@ -100,6 +100,12 @@ export const getProjectPreviewQueryArgs = (organizationId: string) =>
       abbreviation: true,
       teams: {
         select: {
+          teamType: {
+            select: {
+              teamTypeId: true,
+              name: true
+            }
+          },
           teamId: true,
           teamName: true
         }
@@ -132,6 +138,12 @@ export const getProjectOverviewQueryArgs = (organizationId: string) =>
       abbreviation: true,
       teams: {
         select: {
+          teamType: {
+            select: {
+              teamTypeId: true,
+              name: true
+            }
+          },
           teamId: true,
           teamName: true
         }
diff --git a/src/backend/src/services/organizations.services.ts b/src/backend/src/services/organizations.services.ts
@@ -410,7 +410,7 @@ export default class OrganizationsService {
       throw new NotFoundException('Organization', organizationId);
     }
 
-    return organization.featuredProjects.map(projectPreviewTransformer);
+    return organization.featuredProjects.filter((p) => !p.wbsElement.dateDeleted).map(projectPreviewTransformer);
   }
 
   /**
diff --git a/src/backend/src/transformers/projects.transformer.ts b/src/backend/src/transformers/projects.transformer.ts
@@ -117,6 +117,19 @@ export const projectPreviewTransformer = (project: Prisma.ProjectGetPayload<Proj
     duration: calculateDuration(project.workPackages),
     startDate: calculateProjectStartDate(project.workPackages),
     abbreviation: project.abbreviation ?? undefined,
+    teamTypes: Array.from(
+      project.teams
+        .reduce((acc, team) => {
+          if (team.teamType) {
+            acc.set(team.teamType.teamTypeId, {
+              name: team.teamType.name,
+              teamTypeId: team.teamType.teamTypeId
+            });
+          }
+          return acc;
+        }, new Map<string, { name: string; teamTypeId: string }>())
+        .values()
+    ),
     teams: project.teams,
     workPackages: project.workPackages.map((wp) => ({
       ...wp,
diff --git a/src/frontend/src/pages/CalendarPage/CalendarWeekView.tsx b/src/frontend/src/pages/CalendarPage/CalendarWeekView.tsx
@@ -405,7 +405,11 @@ const CalendarWeekView: React.FC<CalendarWeekViewProps> = ({
         enterDelay={0}
         leaveDelay={200}
         title={
-          <Box onMouseEnter={() => setTooltipHovered(true)} onMouseLeave={() => setTooltipHovered(false)}>
+          <Box
+            onMouseEnter={() => setTooltipHovered(true)}
+            onMouseLeave={() => setTooltipHovered(false)}
+            onMouseDown={(e) => e.stopPropagation()}
+          >
             <EventClickContent
               event={event}
               eventTypes={allEventTypes}
@@ -513,7 +517,11 @@ const CalendarWeekView: React.FC<CalendarWeekViewProps> = ({
         enterDelay={0}
         leaveDelay={200}
         title={
-          <Box onMouseEnter={() => setTooltipHovered(true)} onMouseLeave={() => setTooltipHovered(false)}>
+          <Box
+            onMouseEnter={() => setTooltipHovered(true)}
+            onMouseLeave={() => setTooltipHovered(false)}
+            onMouseDown={(e) => e.stopPropagation()}
+          >
             <EventClickContent
               event={event}
               eventTypes={allEventTypes}
@@ -590,7 +598,11 @@ const CalendarWeekView: React.FC<CalendarWeekViewProps> = ({
         enterDelay={0}
         leaveDelay={200}
         title={
-          <Box onMouseEnter={() => setTooltipHovered(true)} onMouseLeave={() => setTooltipHovered(false)}>
+          <Box
+            onMouseEnter={() => setTooltipHovered(true)}
+            onMouseLeave={() => setTooltipHovered(false)}
+            onMouseDown={(e) => e.stopPropagation()}
+          >
             <TaskClickContent task={task} onClose={() => setLockedTooltipEventId(null)} />
           </Box>
         }
diff --git a/src/frontend/src/pages/CreditsPage/CreditsPage.tsx b/src/frontend/src/pages/CreditsPage/CreditsPage.tsx
@@ -76,6 +76,7 @@ const CreditsPage: React.FC = () => {
     { name: 'Martin Hema', color: '#9125cc' },
     { name: 'Shree Singhal', color: '#ff7ca4' },
     { name: 'Isaac Levine', color: '#6a3941' },
+    { name: 'Pooja Ramakrishnan', color: '#9125cc' },
     { name: 'Andrew Tsai', color: '#3281a8' },
     { name: 'Ahnaf Inkiad', color: '#ab38b5' },
     { name: 'Aaryan Jain', color: '#e53774' },
@@ -122,6 +123,7 @@ const CreditsPage: React.FC = () => {
     { name: 'Raghav Mathur', color: '#009933' },
     { name: 'Anika Sharma', color: '#ff0000' },
     { name: 'William (Jack) Turner', color: '#ff5733' },
+    { name: 'Natasha Joshi', color: '#00f7ffff' },
     {
       name: 'Samson Ajayi',
       color: '6a0dad',
@@ -371,7 +373,8 @@ const CreditsPage: React.FC = () => {
     },
     { name: 'Josh Len', color: '#000000ff' },
     { name: 'Grace Theobald', color: '#537c2c' },
-    { name: 'Jasper Pinkus', color: '#276221' }
+    { name: 'Jasper Pinkus', color: '#276221' },
+    { name: 'Sara Johnson', color: '#ffff99' }
   ];
 
   const snark = ['Add your name!', "Shouldn't you do it yourself?", 'Seriously', 'go', 'do', 'it'];
diff --git a/src/frontend/src/pages/GuestProjectsPage/GuestProjectsCard.tsx b/src/frontend/src/pages/GuestProjectsPage/GuestProjectsCard.tsx
@@ -0,0 +1,115 @@
+import { alpha, Box, Card, CardContent, Chip, Stack, Typography, useTheme, Link } from '@mui/material';
+import { wbsNamePipe, ProjectPreview, wbsPipe, WbsElementStatus } from 'shared';
+import { datePipe } from '../../utils/pipes';
+import { NERButton } from '../../components/NERButton';
+import { useSingleProject } from '../../hooks/projects.hooks';
+import LoadingIndicator from '../../components/LoadingIndicator';
+import ErrorPage from '../ErrorPage';
+import { Link as RouterLink } from 'react-router-dom';
+
+interface ProjectCardProps {
+  project: ProjectPreview;
+}
+
+const GuestProjectsCard: React.FC<ProjectCardProps> = ({ project }) => {
+  const theme = useTheme();
+  const { data: singleProject, isLoading, isError, error } = useSingleProject(project.wbsNum);
+  if (isError) return <ErrorPage message={error.message} />;
+  if (isLoading || !singleProject) return <LoadingIndicator />;
+
+  const activeWorkPackages = project.workPackages.filter((wp) => wp.status === WbsElementStatus.Active);
+
+  return (
+    <Card
+      variant="outlined"
+      sx={{
+        width: '100%',
+        height: '100%',
+        display: 'flex',
+        flexDirection: 'column',
+        background: theme.palette.background.paper,
+        borderRadius: 2
+      }}
+    >
+      <CardContent sx={{ padding: 2, display: 'flex', flexDirection: 'column', flexGrow: 1 }}>
+        <Stack direction="row" justifyContent="space-between">
+          <Box width={'100%'}>
+            <Box display="flex" justifyContent="space-between" alignItems="center">
+              <Typography
+                fontWeight={'regular'}
+                variant="h5"
+                sx={{ marginBottom: '0.3rem', fontSize: { xs: '1.15rem', sm: '1.5rem' }, flexGrow: 1 }}
+              >
+                {wbsNamePipe(singleProject)}
+              </Typography>
+              {activeWorkPackages[0]?.stage ? (
+                <Chip
+                  size="medium"
+                  variant="filled"
+                  sx={{
+                    marginLeft: 'auto',
+                    fontSize: 12,
+                    bgcolor: alpha(theme.palette.primary.main, 0.45),
+                    color: theme.palette.primary.light
+                  }}
+                  label={activeWorkPackages[0].stage}
+                />
+              ) : null}
+            </Box>
+            <Typography fontSize={12} color="text.secondary">
+              Project Lead:{' '}
+              {singleProject.lead?.firstName && singleProject.lead?.lastName
+                ? `${singleProject.lead.firstName} ${singleProject.lead.lastName}`
+                : 'N/A'}
+              {' • '}
+              Project Manager:{' '}
+              {singleProject.manager?.firstName && singleProject.manager?.lastName
+                ? `${singleProject.manager.firstName} ${singleProject.manager.lastName}`
+                : 'N/A'}
+            </Typography>
+            <Typography fontWeight={'regular'} fontSize={{ xs: 14, sm: 16 }}>
+              {datePipe(singleProject.startDate) +
+                ' ⟝ ' +
+                singleProject.duration +
+                ' wks ⟞ ' +
+                datePipe(singleProject.endDate)}
+            </Typography>
+          </Box>
+        </Stack>
+        <Typography
+          sx={{
+            flexGrow: 1,
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            display: '-webkit-box',
+            WebkitLineClamp: 3,
+            WebkitBoxOrient: 'vertical'
+          }}
+        >
+          {singleProject.summary}
+        </Typography>
+        <Link
+          component={RouterLink}
+          to={`/projects/${wbsPipe(project.wbsNum)}`}
+          sx={{ width: '100%', textDecoration: 'none' }}
+        >
+          <NERButton
+            fullWidth
+            sx={{
+              marginTop: 2,
+              backgroundColor: theme.palette.error.main,
+              color: theme.palette.error.contrastText,
+              '&:hover': {
+                backgroundColor: theme.palette.error.dark
+              }
+            }}
+          >
+            Learn more
+          </NERButton>
+        </Link>
+      </CardContent>
+    </Card>
+  );
+};
+
+export default GuestProjectsCard;
diff --git a/src/frontend/src/pages/GuestProjectsPage/GuestProjectsPage.tsx b/src/frontend/src/pages/GuestProjectsPage/GuestProjectsPage.tsx
@@ -0,0 +1,77 @@
+import { useAllProjects } from '../../hooks/projects.hooks';
+import LoadingIndicator from '../../components/LoadingIndicator';
+import ErrorPage from '../ErrorPage';
+import { Box, useMediaQuery } from '@mui/system';
+import { wbsPipe } from 'shared';
+import PageLayout from '../../components/PageLayout';
+import GuestProjectsCard from './GuestProjectsCard';
+import { useAllTeamTypes } from '../../hooks/team-types.hooks';
+import { Chip } from '@mui/material';
+import { useState } from 'react';
+
+const GuestProjectsPage: React.FC = () => {
+  const { data: allProjects, isLoading, isError, error } = useAllProjects();
+  const [selectedTeamTypes, setSelectedTeamTypes] = useState<string[]>([]);
+  const isMobilePortrait = useMediaQuery('(max-width:480px)');
+  const {
+    isLoading: teamTypesIsLoading,
+    isError: teamTypesIsError,
+    data: teamTypes,
+    error: teamTypesError
+  } = useAllTeamTypes();
+
+  if (isLoading || !allProjects || teamTypesIsLoading || !teamTypes) return <LoadingIndicator />;
+  if (isError) return <ErrorPage message={error.message} />;
+  if (teamTypesIsError) return <ErrorPage message={teamTypesError.message} />;
+
+  const filteredProjects = allProjects.filter(
+    (project) =>
+      selectedTeamTypes.length === 0 || project.teamTypes.some((t) => t !== null && selectedTeamTypes.includes(t.name))
+  );
+
+  return (
+    <PageLayout title="Projects">
+      <Box
+        width={'100%'}
+        display={'flex'}
+        justifyContent={'center'}
+        gap={2}
+        mb={3}
+        sx={{
+          overflowX: 'auto',
+          pb: 1
+        }}
+      >
+        {teamTypes.map((team) => (
+          <Chip
+            key={team.name}
+            label={team.name}
+            onClick={() =>
+              setSelectedTeamTypes((prev) =>
+                prev?.includes(team.name) ? prev.filter((t: string) => t !== team.name) : [...(prev || []), team.name]
+              )
+            }
+            clickable
+            color={selectedTeamTypes?.includes(team.name) ? 'primary' : 'default'}
+            sx={{ flexShrink: 0 }}
+          />
+        ))}
+      </Box>
+      <Box
+        sx={{
+          display: 'grid',
+          gridTemplateColumns: isMobilePortrait ? '1fr' : 'repeat(3, 1fr)',
+          gap: isMobilePortrait ? 2 : 3,
+          width: '100%',
+          px: isMobilePortrait ? 1 : 0
+        }}
+      >
+        {filteredProjects.map((p) => (
+          <GuestProjectsCard key={wbsPipe(p.wbsNum)} project={p} />
+        ))}
+      </Box>
+    </PageLayout>
+  );
+};
+
+export default GuestProjectsPage;
diff --git a/src/frontend/src/pages/HomePage/components/FeaturedProjects.tsx b/src/frontend/src/pages/HomePage/components/FeaturedProjects.tsx
diff --git a/src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/TaskList/TaskFormModal.tsx b/src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/TaskList/TaskFormModal.tsx
diff --git a/src/frontend/src/pages/ProjectPage/ProjectSpendingHistory.tsx b/src/frontend/src/pages/ProjectPage/ProjectSpendingHistory.tsx
diff --git a/src/frontend/src/pages/ProjectsPage/ProjectsPage.tsx b/src/frontend/src/pages/ProjectsPage/ProjectsPage.tsx
diff --git a/src/shared/src/types/project-types.ts b/src/shared/src/types/project-types.ts

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ variable "solution_stack_name" {`
`14`	`14`	`description = "Elastic Beanstalk solution stack name"`
`15`	`15`	`type = string`
`16`	`16`	`# Find the latest: aws elasticbeanstalk list-available-solution-stacks`
`17`		`- default = "64bit Amazon Linux 2023 v4.7.4 running Docker"`
	`17`	`+ default = "64bit Amazon Linux 2023 v4.11.0 running Docker"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`variable "vpc_id" {`
Original file line number	Diff line number	Diff line change
`@@ -357,6 +357,10 @@ resource "aws_cloudwatch_metric_alarm" "eb_memory_high" {`
`357`	`357`	`Environment = var.environment`
`358`	`358`	`Project = var.project_name`
`359`	`359`	`}`
	`360`	`+`
	`361`	`+ lifecycle {`
	`362`	`+ ignore_changes = [metric_query]`
	`363`	`+ }`
`360`	`364`	`}`
`361`	`365`
`362`	`366`	`#############`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ export default class OrganizationsService {`
`410`	`410`	`throw new NotFoundException('Organization', organizationId);`
`411`	`411`	`}`
`412`	`412`
`413`		`- return organization.featuredProjects.map(projectPreviewTransformer);`
	`413`	`+ return organization.featuredProjects.filter((p) => !p.wbsElement.dateDeleted).map(projectPreviewTransformer);`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`/**`