Merge branch 'dev' into stage

Author: musayann

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.2.1](https://github.com/dacadeorg/dacade-frontend-app/compare/v1.2.0...v1.2.1) (2023-12-08)
+
+
+### Bug Fixes
+
+* remove learning modules list in the challenge header ([bbefe48](https://github.com/dacadeorg/dacade-frontend-app/commit/bbefe48f19b5c71dace8aa2a337aa63432b70cd1))
+
 ## [1.2.0](https://github.com/dacadeorg/dacade-frontend-app/compare/v1.1.0...v1.2.0) (2023-12-08)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dacade",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "scripts": {
     "dev": "next dev",

src/components/sections/challenges/Header.tsx

@@ -1,6 +1,5 @@
 import Section from "@/components/sections/communities/_partials/Section";
 import Header from "@/components/sections/communities/_partials/Header";
-import ObjectiveList from "@/components/list/Objectives";
 import { useSelector } from "@/hooks/useTypedSelector";
 import { useTranslation } from "next-i18next";
 import { ReactElement } from "react";
@@ -19,9 +18,7 @@ export default function ChallengeHeader(): ReactElement {
   return (
     <div>
       <Header isTeamChallenge={challenge?.isTeamChallenge} title={challenge?.name} subtitle={t("communities.challenge.title")} isHackathon={challenge?.isHackathon} />
-      <Section subtitle={challenge?.description}>
-        {challenge?.learningModules?.length ? <ObjectiveList objectives={challenge?.learningModules?.map((module) => module.title) || []} /> : <></>}
-      </Section>
+      <Section subtitle={challenge?.description} />
     </div>
   );
 }

src/components/sections/communities/_partials/Section.tsx

@@ -15,7 +15,7 @@ interface SectionProps {
   id?: string;
   className?: string;
   hideSubtitleOnMobile?: boolean;
-  children: ReactNode;
+  children?: ReactNode;
 }
 
 /**

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

@@ -32,6 +32,8 @@ import { getTeamByChallenge, getUserInvitesByChallenge } from "@/store/services/
 import { fetchChallenge, fetchChallengeAuthenticated } from "@/store/services/communities/challenges";
 import Loader from "@/components/ui/Loader";
 import { NotFoundError } from "@/utilities/errors/NotFoundError";
+import Hint from "@/components/ui/Hint";
+import Link from "next/link";
 
 /**
  * interface for ChallengePage multiSelector
@@ -75,7 +77,6 @@ export default function ChallengePage(props: {
     isAuthenticated: (state: IRootState) => authCheck(state),
     isSubmissionLoading: (state: IRootState) => state.challenges.loading,
   });
-
   const title = useMemo(() => getMetadataTitle(t("communities.challenge.title"), challenge?.name || ""), [challenge?.name, t]);
 
   const navigation = useNavigation();
@@ -109,7 +110,7 @@ export default function ChallengePage(props: {
           <RatingRubric ratingCriteria={challenge?.ratingCriteria} selected={[]} />
           <BestSubmissions />
 
-          {isAuthenticated && (
+          {isAuthenticated ? (
             <div>
               {isSubmissionLoading ? (
                 <div className="h-24 sm:h-48 grid place-items-center">
@@ -131,6 +132,15 @@ export default function ChallengePage(props: {
                 </>
               )}
             </div>
+          ) : (
+            <div>
+              <Hint className="mt-6 flex flex-col md:flex-row">
+                <p>To be able to submit</p>&nbsp;
+                <Link className="underline" href="/login">
+                  Login.
+                </Link>
+              </Hint>
+            </div>
           )}
         </div>
       </Wrapper>