Merge branch 'dev' into feature/voyage-overview

.gitignore

@@ -30,6 +30,7 @@ yarn-error.log*
 # local env files
 .env*.local
 .env
+.env.production
 
 # vercel
 .vercel

src/app/(main)/my-voyage/[teamId]/sprints/components/EmptySprintWrapper.tsx

@@ -17,6 +17,7 @@ import {
   getSprintCheckinIsStatus,
   getVoyageProjectStatus,
 } from "@/utils/getFormStatus";
+import { getCurrentVoyageTeam } from "@/utils/getCurrentVoyageTeam";
 import { ErrorType } from "@/utils/error";
 import ErrorComponent from "@/components/Error";
 
@@ -45,6 +46,16 @@ export default async function EmptySprintWrapper({
 
   const [user, error] = await getUser();
 
+  const { currentTeam, projectSubmitted } = getCurrentVoyageTeam({
+    teamId,
+    user,
+    error: null,
+  });
+
+  if (currentTeam && projectSubmitted) {
+    redirect(`/my-voyage/${teamId}/sprints/`);
+  }
+
   const { errorResponse, data } = await getCurrentVoyageData({
     user,
     error,

src/app/(main)/my-voyage/[teamId]/sprints/components/RedirectToCurrentSprintWrapper.tsx

@@ -1,11 +1,16 @@
 import { redirect } from "next/navigation";
 
+import VoyageSubmittedMessage from "./VoyageSubmittedMessage";
+
 import {
   type FetchSprintsProps,
   type FetchSprintsResponse,
   type SprintsResponse,
 } from "@/myVoyage/sprints/sprintsService";
 
+import VoyagePageBannerContainer from "@/components/banner/VoyagePageBannerContainer";
+import Banner from "@/components/banner/Banner";
+
 import { getAccessToken } from "@/utils/getCookie";
 import { getUser } from "@/utils/getUser";
 import { getCurrentSprint } from "@/utils/getCurrentSprint";
@@ -15,6 +20,7 @@ import { type AsyncActionResponse, handleAsync } from "@/utils/handleAsync";
 import { type Sprint } from "@/store/features/sprint/sprintSlice";
 import { getCurrentVoyageData } from "@/utils/getCurrentVoyageData";
 import routePaths from "@/utils/routePaths";
+import { getCurrentVoyageTeam } from "@/utils/getCurrentVoyageTeam";
 import { ErrorType } from "@/utils/error";
 import ErrorComponent from "@/components/Error";
 
@@ -49,6 +55,32 @@ export default async function RedirectToCurrentSprintWrapper({
 
   const [user, error] = await getUser();
 
+  const { currentTeam, projectSubmitted } = getCurrentVoyageTeam({
+    teamId,
+    user,
+    error: null,
+  });
+
+  if (currentTeam && projectSubmitted) {
+    return (
+      <div className="flex w-full flex-col gap-y-10">
+        <VoyagePageBannerContainer
+          title="Sprints"
+          description="A sprint agenda helps the team stay on track, communicate well, and improve. Basically, it's like speed dating for developers. Except we're not looking for a soulmate, we're just trying to get some quality work done."
+        >
+          <Banner
+            imageLight="/img/sprints_banner_light.png"
+            imageDark="/img/sprints_banner_dark.png"
+            alt="sprints_banner"
+            height="h-[200px]"
+            width="w-[276px]"
+          />
+        </VoyagePageBannerContainer>
+        <VoyageSubmittedMessage />
+      </div>
+    );
+  }
+
   const { errorResponse, data } = await getCurrentVoyageData({
     user,
     error,

src/app/(main)/my-voyage/[teamId]/sprints/components/SprintActions.tsx

@@ -75,19 +75,6 @@ export default function SprintActions({
 
   function renderSubmitVoyageButton() {
     if (submitVoyageIsAllowed) {
-      return (
-        <Button
-          variant="secondary"
-          size="lg"
-          className="group"
-          disabled={false}
-        >
-          <RocketLaunchIcon className="h-[18px] w-[18px]" />
-          Submit Voyage
-          <ArrowRightIcon className="h-[18px] w-0 transition-all group-hover:w-[18px]" />
-        </Button>
-      );
-    } else {
       if (voyageProjectIsSubmitted) {
         return (
           <Button
@@ -96,7 +83,7 @@ export default function SprintActions({
             className="group"
             disabled={true}
           >
-            <RocketLaunchIcon className="h-[18px] w-[18px]" />
+            <SolidRocketLaunchIcon className="h-[18px] w-[18px]" />
             Voyage Submitted
           </Button>
         );
@@ -106,13 +93,21 @@ export default function SprintActions({
             variant="secondary"
             size="lg"
             className="group"
-            disabled={true}
+            disabled={false}
           >
-            <SolidRocketLaunchIcon className="h-[18px] w-[18px]" />
+            <RocketLaunchIcon className="h-[18px] w-[18px]" />
             Submit Voyage
+            <ArrowRightIcon className="h-[18px] w-0 transition-all group-hover:w-[18px]" />
           </Button>
         );
       }
+    } else {
+      return (
+        <Button variant="secondary" size="lg" className="group" disabled={true}>
+          <SolidRocketLaunchIcon className="h-[18px] w-[18px]" />
+          {voyageProjectIsSubmitted ? "Voyage Submitted" : "Submit Voyage"}
+        </Button>
+      );
     }
   }
 

src/app/(main)/my-voyage/[teamId]/sprints/components/SprintWrapper.tsx

@@ -37,6 +37,7 @@ import {
   getSprintCheckinIsStatus,
   getVoyageProjectStatus,
 } from "@/utils/getFormStatus";
+import { getCurrentVoyageTeam } from "@/utils/getCurrentVoyageTeam";
 import { ErrorType } from "@/utils/error";
 import ErrorComponent from "@/components/Error";
 
@@ -77,6 +78,18 @@ export default async function SprintWrapper({ params }: SprintWrapperProps) {
 
   const [user, error] = await getUser();
 
+  // Check if it's a current team and if a project's been submitted,
+  // redirect to /sprints page where a corresponding messsage is rendered
+  const { currentTeam, projectSubmitted } = getCurrentVoyageTeam({
+    teamId,
+    user,
+    error: null,
+  });
+
+  if (currentTeam && projectSubmitted) {
+    redirect(`/my-voyage/${teamId}/sprints/`);
+  }
+
   const { errorResponse, data } = await getCurrentVoyageData({
     user,
     error,

src/app/(main)/my-voyage/[teamId]/sprints/components/sections/Sections.tsx

@@ -36,7 +36,7 @@ export default function Sections({
       id: Forms.notes,
       title: "notes",
       icon: <DocumentTextIcon aria-hidden="true" />,
-      isAdded: notes !== undefined,
+      isAdded: notes !== null,
       children: <Notes data={notes} />,
     },
     {

src/app/(main)/my-voyage/[teamId]/sprints/sprintsService.ts

@@ -472,7 +472,7 @@ export async function submitVoyageProjectForm({
 
   const editSectionAsync = () =>
     POST<SubmitVoyageFormBody, SubmitVoyageFormResponse>(
-      "api/v1/voyages/sprints/submit-project",
+      "api/v1/voyages/submit-project",
       token,
       "default",
       { voyageTeamId, responses },

src/components/inputs/CheckBoxGroup/CheckboxGroupItem.tsx

@@ -32,7 +32,7 @@ export const CheckboxGroupItem = React.forwardRef<
         className="peer hidden"
       />
       <span className="flex h-6 w-6 items-center justify-center rounded border border-neutral/40 bg-base-200 transition-all group-hover:bg-base-100 peer-checked:border-base-300 group-hover:peer-checked:border-neutral-content [&>*]:hidden [&>*]:text-base-300 peer-checked:[&>*]:block group-hover:peer-checked:[&>*]:text-neutral-content">
-        <CheckIcon className="hidden transition-all" />
+        <CheckIcon className="hidden h-full w-full transition-all" />
       </span>
       <span className="transition-all peer-checked:text-base-300">{label}</span>
     </Label>

src/utils/getCurrentSprint.ts

@@ -10,5 +10,6 @@ export function getCurrentSprint(sprints: Sprint[]) {
       end: sprint.endDate,
     }),
   );
+
   return currentSprint;
 }

src/utils/getCurrentVoyageTeam.ts

@@ -19,6 +19,7 @@ export function getCurrentVoyageTeam({
   let err = "";
   let currentTeam = false;
   let voyageTeamMemberId: number = 0;
+  let projectSubmitted: boolean = false;
 
   if (user) {
     currentVoyageTeam = user.voyageTeamMembers.find(
@@ -32,6 +33,7 @@ export function getCurrentVoyageTeam({
 
   if (currentVoyageTeam) {
     voyageTeamMemberId = currentVoyageTeam.id;
+    projectSubmitted = currentVoyageTeam.voyageTeam.projectSubmitted;
   }
 
   if (teamId === currentVoyageTeam?.voyageTeamId) {
@@ -48,5 +50,6 @@ export function getCurrentVoyageTeam({
     currentTeam,
     isStarted,
     voyageTeamMemberId,
+    projectSubmitted,
   };
 }