Merge Develop onto Main

.github/workflows/build-and-test-prs.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/codeql-analysis.yml

@@ -22,7 +22,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
       contents: read

.github/workflows/community-issue-comment.yml

@@ -24,7 +24,7 @@ jobs:
   # Returns: Posts comment tagging assignee and helpful message
   assigned-comment:
     if: github.event.action == 'assigned'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Post assignee issue comment
         id: assigned-comment
@@ -37,7 +37,7 @@ jobs:
             repo: context.repo.repo,
             issue_number: context.payload.issue.number,
             body: `Thank you @${context.payload.issue.assignee.login} you have been assigned this issue!
-            **Please follow the directions in our [Contributing Guide](https://github.com/chaynHQ/.github/blob/main/docs/CONTRIBUTING.md). We look forward to reviewing your pull request. ✨**
+            **Please follow the directions in our [Contributing Guide](https://github.com/chaynHQ/bloom-frontend/blob/develop/CONTRIBUTING.md). We look forward to reviewing your pull request. ✨**
 
             ---
 
@@ -52,7 +52,7 @@ jobs:
   # Returns: Posts warning comment tagging assignee
   stale-label-comment:
     if: ${{ github.event.action == 'labeled' && github.event.label.name == 'stale' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Post stale issue comment
         id: stale-label-comment

.github/workflows/community-slackpost-repo-activity.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   gather-gh-activity:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4 # https://github.com/actions/checkout

.github/workflows/community-stale-management.yml

@@ -18,7 +18,7 @@ jobs:
   # PRs: automated closing after 1 more week of inactivity
   # Issues: requires manual closing by maintainers
   stale:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       issues: write
       pull-requests: write

.github/workflows/create-release-pr.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   create-pr-to-main:
     name: Create release PR to main
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Create Pull Request
         uses: actions/github-script@v7

.github/workflows/cypress-release-test.yml

@@ -9,7 +9,7 @@ jobs:
   # wait for new deployment to complete before running tests
   wait-for-vercel-deployment:
     name: Wait for vercel deployment
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       preview_url: ${{ steps.waitForVercelDeployment.outputs.url }}
     steps:
@@ -24,7 +24,7 @@ jobs:
   cypress-run:
     name: Cypress e2e tests
     needs: wait-for-vercel-deployment
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       # when one test fails, DO NOT cancel the other
       # containers, because this will kill Cypress processes

.github/workflows/cypress-test.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Get yarn cache directory path
@@ -47,7 +47,7 @@ jobs:
   cypress-run:
     name: Cypress e2e tests
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       # when one test fails, DO NOT cancel the other
       # containers, because this will kill Cypress processes

.github/workflows/dependabot-pr-review.yml

@@ -11,7 +11,7 @@ permissions:
 
 jobs:
   dependency-review:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: 'Checkout Repository'
         uses: actions/checkout@v4

.github/workflows/lighthouse-performance.yml

@@ -11,7 +11,7 @@ jobs:
   # assume the develop branch has also completed deploying
   wait-for-vercel-deployment:
     name: Wait for vercel deployment
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Wait for Vercel preview deployment to be ready
         uses: patrickedqvist/[email protected]
@@ -22,7 +22,7 @@ jobs:
           check_interval: 5
 
   lighthouse-desktop:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: wait-for-vercel-deployment
     steps:
       - uses: actions/checkout@v4
@@ -50,7 +50,7 @@ jobs:
           path: ${{ steps.lighthouseDesktop.outputs.resultsPath }}
 
   lighthouse-mobile:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: wait-for-vercel-deployment
     steps:
       - uses: actions/checkout@v4

.github/workflows/newrelic-release-tracking.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   newrelic:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: New Relic Release Tracking
     steps:
       # This step builds a var with the release tag value to use later

components/cards/CourseCard.tsx

@@ -1,5 +1,4 @@
 import KeyboardArrowDown from '@mui/icons-material/KeyboardArrowDown';
-import PendingOutlined from '@mui/icons-material/PendingOutlined';
 import {
   Box,
   Card,
@@ -78,8 +77,6 @@ const CourseCard = (props: CourseCardProps) => {
   const [expanded, setExpanded] = useState<boolean>(false);
   const t = useTranslations('Courses');
 
-  const courseComingSoon: boolean = course.content.coming_soon;
-
   const handleExpandClick = () => {
     setExpanded(!expanded);
   };
@@ -136,13 +133,6 @@ const CourseCard = (props: CourseCardProps) => {
         </CardContent>
       )}
       <CardActions sx={cardActionsStyle}>
-        {courseComingSoon && (
-          <Box sx={statusRowStyle}>
-            <PendingOutlined color="error" />
-            <Typography>{t('comingSoon')}</Typography>
-          </Box>
-        )}
-
         {!!courseProgress && courseProgress !== PROGRESS_STATUS.NOT_STARTED && (
           <ProgressStatus status={courseProgress} />
         )}

components/course/CourseIntroduction.tsx

@@ -2,17 +2,14 @@ import { Box, Link as MuiLink, Typography } from '@mui/material';
 import { ISbRichtext } from '@storyblok/react';
 import { useTranslations } from 'next-intl';
 import { useEffect, useState } from 'react';
-import { render } from 'storyblok-rich-text-react-renderer';
 import {
   COURSE_INTRO_VIDEO_TRANSCRIPT_CLOSED,
   COURSE_INTRO_VIDEO_TRANSCRIPT_OPENED,
 } from '../../constants/events';
 import { rowStyle } from '../../styles/common';
 import { EventUserData, logEvent } from '../../utils/logEvent';
-import { RichTextOptions } from '../../utils/richText';
 import Video from '../video/Video';
 import VideoTranscriptModal from '../video/VideoTranscriptModal';
-import CourseStatusHeader from './CourseStatusHeader';
 
 const containerStyle = {
   ...rowStyle,
@@ -28,26 +25,11 @@ interface CourseIntroductionProps {
   video: { url: string };
   name: string;
   video_transcript: ISbRichtext;
-  live_soon_content: ISbRichtext;
-  live_now_content: ISbRichtext;
-  courseLiveSoon?: boolean;
-  courseLiveNow?: boolean;
-  liveCourseAccess?: boolean;
   eventData: EventUserData;
 }
 
 const CourseIntroduction = (props: CourseIntroductionProps) => {
-  const {
-    video,
-    name,
-    video_transcript,
-    live_soon_content,
-    live_now_content,
-    courseLiveSoon = false,
-    courseLiveNow = false,
-    liveCourseAccess = false,
-    eventData,
-  } = props;
+  const { video, name, video_transcript, eventData } = props;
   const [openTranscriptModal, setOpenTranscriptModal] = useState<boolean | null>(null);
 
   const t = useTranslations('Courses');
@@ -102,22 +84,8 @@ const CourseIntroduction = (props: CourseIntroductionProps) => {
           setOpenTranscriptModal={setOpenTranscriptModal}
           openTranscriptModal={openTranscriptModal}
         />
-        {/* Video position switches column depending on if live content shown */}
-        {liveCourseAccess && (courseLiveSoon || courseLiveNow) && <IntroductionVideo />}
       </Box>
-      {liveCourseAccess && courseLiveSoon ? (
-        <Box flex={1}>
-          <CourseStatusHeader status="liveSoon" />
-          {render(live_soon_content, RichTextOptions)}
-        </Box>
-      ) : liveCourseAccess && courseLiveNow ? (
-        <Box flex={1}>
-          <CourseStatusHeader status="liveNow" />
-          {render(live_now_content, RichTextOptions)}
-        </Box>
-      ) : (
-        <IntroductionVideo />
-      )}
+      <IntroductionVideo />
     </Box>
   );
 };