fix: merge conflict

Author: Samantha-KY

src/components/cards/challenge/_partials/Learning.tsx

@@ -27,9 +27,9 @@ export default function Learning({ title, description, link }: LearningProps): J
       <div className="flex flex-col justify-between w-full sm:pb-0">
         <div className="flex flex-col">
           <div className="text-lg font-medium leading-normal text-gray-900">{title}</div>
-          <div className="text-sm font-normal text-gray-700 mt-3 max-w-xxs pb-6">{description}</div>
+          <div className="text-sm font-normal text-gray-700 mt-3 max-w-xxs pb-6 mb-5">{description}</div>
         </div>
-        <div className="">
+        <div className="absolute bottom-0 pb-4">
           <Link href={link}>
             <ArrowButton communityStyles={true} variant="outline-primary">
               {t("communities.overview.challenge.learning.start")}

src/pages/communities/[slug]/challenges/[challenge_id]/index.tsx

@@ -31,6 +31,7 @@ import Objectives from "@/components/sections/challenges/Objectives";
 import { getTeamByChallenge } from "@/store/services/teams.service";
 import { fetchChallenge, fetchChallengeAuthenticated } from "@/store/services/communities/challenges";
 import Loader from "@/components/ui/Loader";
+import { NotFoundError } from "@/utilities/errors/NotFoundError";
 
 /**
  * interface for ChallengePage multiSelector
@@ -155,7 +156,7 @@ export const getServerSideProps: GetServerSideProps = wrapper.getServerSideProps
       store.dispatch(fetchChallenge({ ...fetchPayload, id: challenge_id as string, relations: ["rubric", "courses", "learning-modules", "best-submissions"] })),
       serverSideTranslations(locale as string),
     ]);
-
+    if (!community || !challenge) throw new NotFoundError();
     return {
       props: {
         ...translations,

src/pages/communities/[slug]/challenges/[challenge_id]/submissions/[submission_id].tsx

@@ -15,6 +15,7 @@ import { Challenge } from "@/types/course";
 import { initChallengeNavigationMenu } from "@/store/feature/communities/navigation.slice";
 import useNavigation from "@/hooks/useNavigation";
 import { fetchChallenge } from "@/store/services/communities/challenges";
+import { NotFoundError } from "@/utilities/errors/NotFoundError";
 
 export default function SubmissionPage(props: { pageProps: { challenge: Challenge } }) {
   const dispatch = useDispatch();
@@ -57,6 +58,8 @@ export const getServerSideProps: GetServerSideProps = wrapper.getServerSideProps
       serverSideTranslations(locale as string),
     ]);
 
+    if (!community || !challenge || !submission) throw new NotFoundError();
+
     return {
       props: {
         community,

src/pages/communities/[slug]/challenges/[challenge_id]/submissions/index.tsx

@@ -16,6 +16,7 @@ import { fetchCurrentCommunity } from "@/store/services/community.service";
 import { Submission as SubmissionType } from "@/types/bounty";
 import { Community } from "@/types/community";
 import { Challenge } from "@/types/course";
+import { NotFoundError } from "@/utilities/errors/NotFoundError";
 import { localePath } from "@/utilities/Routing";
 import { GetServerSideProps } from "next";
 import { useTranslation } from "next-i18next";
@@ -53,21 +54,24 @@ export default function Submission(props: { pageProps: { currentCommunity: Commu
     dispatch(initChallengeNavigationMenu(navigation.community));
   }, [navigation.community, dispatch]);
 
-  const handleShowSubmission = useCallback((e: any) => {
+  const handleShowSubmission = useCallback(
+    (e: any) => {
       const newUrl = e.detail;
-      const submissionId = newUrl.replace(localePath(router, router.asPath), "").replace(/\//g, '');
+      const submissionId = newUrl.replace(localePath(router, router.asPath), "").replace(/\//g, "");
       const submission = submissions.find((submission) => submission.id === submissionId);
       if(!submission) return;
       dispatch(showSubmission(submissionId));
       dispatch(toggleBodyScrolling(true));
-  }, [dispatch, router, submissions]);
+    },
+    [dispatch, router, submissions]
+  );
 
   useEffect(() => {
-    window.addEventListener('onSoftNavigation', handleShowSubmission);
-    window.addEventListener('popstate', handleCloseSubmission);
+    window.addEventListener("onSoftNavigation", handleShowSubmission);
+    window.addEventListener("popstate", handleCloseSubmission);
     return () => {
-      window.removeEventListener('onSoftNavigation', handleShowSubmission);
-      window.removeEventListener('popstate', handleCloseSubmission);
+      window.removeEventListener("onSoftNavigation", handleShowSubmission);
+      window.removeEventListener("popstate", handleCloseSubmission);
     };
   }, [handleCloseSubmission, handleShowSubmission]);
 
@@ -105,19 +109,26 @@ export const getServerSideProps: GetServerSideProps = wrapper.getServerSideProps
   const { slug, challenge_id } = query;
   const { dispatch } = store;
 
-  const [{ data: currentCommunity }, { data: submissions }, { data: challenge }, translations] = await Promise.all([
-    dispatch(fetchCurrentCommunity({ slug: slug as string, locale: locale as string })),
-    dispatch(fetchAllSubmission({ challengeId: challenge_id as string, locale: locale as string })),
-    dispatch(fetchChallenge({ id: challenge_id as string, relations: ["rubric", "courses", "learning-modules"] })),
-    serverSideTranslations(locale as string),
-  ]);
+  try {
+    const [{ data: currentCommunity }, { data: submissions }, { data: challenge }, translations] = await Promise.all([
+      dispatch(fetchCurrentCommunity({ slug: slug as string, locale: locale as string })),
+      dispatch(fetchAllSubmission({ challengeId: challenge_id as string, locale: locale as string })),
+      dispatch(fetchChallenge({ id: challenge_id as string, relations: ["rubric", "courses", "learning-modules"] })),
+      serverSideTranslations(locale as string),
+    ]);
 
-  return {
-    props: {
-      currentCommunity,
-      submissions,
-      challenge,
-      ...translations,
-    },
-  };
+    if (!currentCommunity || !challenge || !submissions) throw new NotFoundError();
+    return {
+      props: {
+        currentCommunity,
+        submissions,
+        challenge,
+        ...translations,
+      },
+    };
+  } catch (error) {
+    return {
+      notFound: true,
+    };
+  }
 });

src/pages/communities/[slug]/courses/[course_slug]/index.tsx

@@ -15,6 +15,7 @@ import { wrapper } from "@/store";
 import { fetchCourse } from "@/store/services/course.service";
 import { fetchCurrentCommunity } from "@/store/services/community.service";
 import { serverSideTranslations } from "next-i18next/serverSideTranslations";
+import { NotFoundError } from "@/utilities/errors/NotFoundError";
 
 export default function CourseViewPage(props: {
   pageProps: {
@@ -68,7 +69,8 @@ export const getServerSideProps: GetServerSideProps = wrapper.getServerSideProps
       store.dispatch(fetchCourse({ slug: course_slug, locale })),
       serverSideTranslations(locale as string),
     ]);
-
+    if (!community || !course) throw new NotFoundError();
+    
     return {
       props: {
         community,

src/pages/communities/[slug]/courses/[course_slug]/learning-modules/[id].tsx

@@ -19,6 +19,7 @@ import useNavigation from "@/hooks/useNavigation";
 import ChallengeCard from "@/components/cards/challenge/Challenge";
 import { useTranslation } from "react-i18next";
 import PageNavigation from "@/components/sections/courses/PageNavigation";
+import { NotFoundError } from "@/utilities/errors/NotFoundError";
 
 /**
  * Learning module page props interfae
@@ -114,7 +115,7 @@ export const getServerSideProps = wrapper.getServerSideProps((store) => async ({
       store.dispatch(findLearningModule(id)),
       serverSideTranslations(locale as string),
     ]);
-
+    if (!community || !course || !learningModule) throw new NotFoundError();
     return {
       props: {
         community,

src/pages/communities/[slug]/index.tsx

@@ -9,6 +9,7 @@ import { Challenge } from "@/types/course";
 import { wrapper } from "@/store";
 import { fetchCurrentCommunity } from "@/store/services/community.service";
 import { fetchAllChallenges } from "@/store/services/communities/challenges";
+import { NotFoundError } from "@/utilities/errors/NotFoundError";
 export default function Slug(props: {
   pageProps: {
     community: Community;
@@ -47,7 +48,7 @@ export const getServerSideProps = wrapper.getServerSideProps((store) => async ({
       store.dispatch(fetchAllChallenges({ slug })),
       serverSideTranslations(locale as string),
     ]);
-
+    if (!community || !challenges) throw new NotFoundError();;
     return {
       props: {
         community,

src/pages/communities/[slug]/scoreboard.tsx

@@ -13,6 +13,7 @@ import { wrapper } from "@/store";
 import { Scoreboard as ScoreboardType } from "@/types/scoreboard";
 import { Community } from "@/types/community";
 import { CommunityLayout } from "@/layouts/Community";
+import { NotFoundError } from "@/utilities/errors/NotFoundError";
 
 /**
  * Scoreboard list page
@@ -51,10 +52,17 @@ ScoreboardList.getLayout = function (page: ReactElement) {
 export const getServerSideProps: GetServerSideProps = wrapper.getServerSideProps((store) => async ({ locale, params }) => {
   const slug = params?.slug as string;
 
-  const [{ data: community }, { data: scoreboards }] = await Promise.all([
-    store.dispatch(fetchCurrentCommunity({ slug, locale })),
-    store.dispatch(fetchAllScoreboards({ slug, locale: locale || "en" })),
-  ]);
+  try {
+    const [{ data: community }, { data: scoreboards }] = await Promise.all([
+      store.dispatch(fetchCurrentCommunity({ slug, locale })),
+      store.dispatch(fetchAllScoreboards({ slug, locale: locale || "en" })),
+    ]);
+    if (!community || !scoreboards) throw new NotFoundError();
 
-  return { props: { community, scoreboards, ...(await i18Translate(locale as string)) } };
+    return { props: { community, scoreboards, ...(await i18Translate(locale as string)) } };
+  } catch (error) {
+    return {
+      notFound: true,
+    };
+  }
 });

src/pages/profile/[username]/communities/[slug].tsx

@@ -22,20 +22,27 @@ ProfileCommunities.getLayout = function (page: ReactElement) {
 };
 
 export const getServerSideProps: GetServerSideProps = wrapper.getServerSideProps((store) => async ({ locale, query }) => {
-  const { slug, username } = query;
-
-  const [{ data }, translations] = await Promise.all([
-    store.dispatch(fetchProfileCommunity({ username: username as string, slug: slug as string })),
-    serverSideTranslations(locale as string),
-  ]);
-
-  return {
-    props: {
-      community: data.community,
-      feedbacks: data.feedbacks,
-      submissions: data.submissions,
-      reputation: data.reputation,
-      ...translations,
-    },
-  };
+  try {
+    const { slug, username } = query;
+  
+    const [{ data }, translations] = await Promise.all([
+      store.dispatch(fetchProfileCommunity({ username: username as string, slug: slug as string })),
+      serverSideTranslations(locale as string),
+    ]);
+  
+    return {
+      props: {
+        community: data.community,
+        feedbacks: data.feedbacks,
+        submissions: data.submissions,
+        reputation: data.reputation,
+        ...translations,
+      },
+    };
+    
+  } catch (error) {
+    return {
+      notFound: true
+    }
+  }
 });

src/store/services/bounties.service.ts

@@ -2,6 +2,7 @@ import baseQuery from "@/config/baseQuery";
 import { createApi } from "@reduxjs/toolkit/dist/query";
 import { setBountiesList, setLoading } from "../feature/bouties.slice";
 import { HYDRATE } from "next-redux-wrapper";
+import { setBusy, setError } from "../feature/index.slice";
 
 /**
  * Bounties api api service
@@ -23,10 +24,15 @@ const bountiesService = createApi({
       query: () => "bounties",
       onQueryStarted: async (slug, { dispatch, queryFulfilled }) => {
         dispatch(setLoading(true))
-        const { data } = await queryFulfilled;
-        if (data) dispatch(setBountiesList(data));
-        dispatch(setLoading(false))
-        return data
+        try {
+          const { data } = await queryFulfilled;
+          if (data) dispatch(setBountiesList(data));
+          dispatch(setLoading(false))
+          return data
+        } catch (error) {
+          dispatch(setBusy(false));
+          dispatch(setError(error));
+        }
       },
     }),
   }),