Merge branch 'dev' into fix/console-errors

serapieTuyishime · web-flow · commit 683a4c12e4e8 · 2024-01-19T15:30:01.000+02:00
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
- npx lint-staged
+ npx lint-staged && npm run check-branch-name
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ More on the [Conventional commits](https://www.conventionalcommits.org/en/v1.0.0
 
 <br>
 
-# Components conventions
+## Components conventions
 
 1. Use `functional components` instead of arrow components
 2. For typescript, use `interface` for props, and types if needed.
diff --git a/README.md b/README.md
@@ -62,6 +62,7 @@ yarn start
 
 ```bash
 git clone https://github.com/dacadeorg/dacade-frontend-app.git
+cd dacade-frontend-app
 ```
 
 ### 2. Install Dependencies
diff --git a/check_branch_name.sh b/check_branch_name.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+local_branch_name="$(git rev-parse --abbrev-ref HEAD)"
+
+# This regular expression is:
+# 1. checking for branch Names: "dev" or "main" 
+#    - ^(dev|main)$)
+# 2. checking for branch Name starting with fix,ft,ht,chore or doc follwed by a "/" then the "branch name"
+#    - ^((fix|ft|ht|chore|doc)\/[a-zA-Z0-9\-]+)$
+valid_branch_regex='^(dev|main)$|^((fix|ft|ht|chore|doc)\/[a-zA-Z0-9\-]+)$'
+
+green='\033[0;32m'
+red='\033[0;31m'
+clear='\033[0m'
+
+message="❌❌❌❌ Error: The branch name $local_branch_name does not adhere to the project guidelines.\nPlease refer to the CONTRIBUTING guide for the correct format.\nYour commit will be rejected. Rename your branch to a valid name and try again."
+
+if [[ ! $local_branch_name =~ $valid_branch_regex ]]; then
+    echo -e "${red}$message${clear}"
+    exit 1
+fi
+
+echo -e "${green}Branch name check passed ✅${clear}"
+exit 0
diff --git a/package.json b/package.json
@@ -8,7 +8,8 @@
     "start": "next start",
     "lint": "eslint --ignore-path .eslintignore \"./**/*.{ts,tsx,js}\"",
     "prettier-format": "prettier --config .prettierrc 'src/**/*.{ts,tsx,js,jsx}' --write",
-    "postinstall": "chmod +x .husky/*"
+    "check-branch-name": "./check_branch_name.sh",
+    "prepare": "npx husky install && chmod +x .husky/* && chmod +x ./check_branch_name.sh"
   },
   "dependencies": {
     "@coingecko/cryptoformat": "^0.5.4",
diff --git a/public/locales/bg/common.json b/public/locales/bg/common.json
@@ -149,6 +149,7 @@
   "communities.challenge.evaluation.total": "Total",
   "communities.challenge.evaluation.points": "Points",
   "communities.challenge.evaluation.message": "Congratulations you gained at least 70% of the available learning points.",
+  "communities.challenge.evaluation.message.nominated": "Поздравления, печеленето на 90% ви номинира за наградния фонд от:",
   "communities.submission.title": "Submissions",
   "communities.feedbacks": "Feedbacks",
   "communities.navigation.overview": "Преглед",
@@ -167,6 +168,7 @@
   "communities.overview.courses.description": "In the courses of this community, you will be able to learn about new technologies, solve challenges, get feedback and earn bounties.",
   "communities.overview.scoreboard.title": "Scoreboard",
   "communities.overview.scoreboard.description": "On the scoreboard, you can see which users have accumulated the most reputation by giving valuable feedback to their peers.",
+  "communities.scoreboard.empty-state.title": "Няма оценки за тази категория.",
   "communities.card.estimated": "Estimated Time",
   "communities.card.earn": "Earn rewards",
   "communities.card.submissions": "{{count}} Изявления",
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -150,6 +150,7 @@
   "communities.challenge.evaluation.total": "Total",
   "communities.challenge.evaluation.points": "Points",
   "communities.challenge.evaluation.message": "Congratulations you gained at least 70% of the available learning points.",
+  "communities.challenge.evaluation.message.nominated": "Congratulations, earning 90% nominates you for the prize pool of:",
   "communities.submission.title": "Submissions",
   "communities.feedbacks": "Feedbacks",
   "communities.navigation.overview": "Overview",
@@ -170,6 +171,7 @@
   "communities.overview.courses.description": "In the courses of this community, you will be able to learn about new technologies, solve challenges, get feedback and earn bounties.",
   "communities.overview.scoreboard.title": "Scoreboard",
   "communities.overview.scoreboard.description": "On the scoreboard, you can see which users have accumulated the most reputation by giving valuable feedback to their peers.",
+  "communities.scoreboard.empty-state.title": "No scores for this category",
   "communities.card.estimated": "Estimated Time",
   "communities.card.earn": "Earn rewards",
   "communities.card.submissions": "{{count}} Submissions",
diff --git a/public/locales/es/common.json b/public/locales/es/common.json
@@ -153,6 +153,7 @@
   "communities.challenge.evaluation.total": "Total",
   "communities.challenge.evaluation.points": "Puntos",
   "communities.challenge.evaluation.message": "¡Felicidades, ha ganado al menos el 70% de los puntos disponibles!",
+  "communities.challenge.evaluation.message.nominated": "Felicitaciones, ganar el 90% te nominó para el fondo de premios de:",
   "communities.submission.title": "Propuestas",
   "communities.feedbacks": "Feedbacks",
   "communities.navigation.overview": "Vista general",
@@ -170,6 +171,7 @@
   "communities.overview.courses.description": "En los cursos de esta comunidad, podrá aprender sobre nuevas tecnologías, resolver retos, recibir feedbacks y ganar premios.",
   "communities.overview.scoreboard.title": "Tabla de Resultados",
   "communities.overview.scoreboard.description": "En la tabla de resultados, puede ver qué usuarios han acumulado la mejor reputación dando su valioso feedback a sus compañeras.",
+  "communities.scoreboard.empty-state.title": "No hay puntuaciones para esta categoría.",
   "communities.card.estimated": "Tiempo estimado",
   "communities.card.earn": "Gane recompensas",
   "communities.card.submissions": "{{count}} Envíos",
diff --git a/public/locales/hr/common.json b/public/locales/hr/common.json
@@ -136,6 +136,7 @@
   "communities.challenge.evaluation.total": "Total",
   "communities.challenge.evaluation.points": "Points",
   "communities.challenge.evaluation.message": "Congratulations you gained at least 70% of the available learning points.",
+  "communities.challenge.evaluation.message.nominated": "Čestitamo, osvajanje 90% nominira vas za nagradni fond od:",
   "communities.submission.title": "Submissions",
   "communities.feedbacks": "Feedbacks",
   "communities.navigation.overview": "Pregled",
@@ -154,6 +155,7 @@
   "communities.overview.courses.description": "In the courses of this community, you will be able to learn about new technologies, solve challenges, get feedback and earn bounties.",
   "communities.overview.scoreboard.title": "Scoreboard",
   "communities.overview.scoreboard.description": "On the scoreboard, you can see which users have accumulated the most reputation by giving valuable feedback to their peers.",
+  "communities.scoreboard.empty-state.title": "Nema bodova za ovu kategoriju.",
   "communities.card.estimated": "Estimated Time",
   "communities.card.earn": "Earn rewards",
   "communities.overview.challenge.rewards": "Nagrade",
diff --git a/src/components/cards/Scoreboard.tsx b/src/components/cards/Scoreboard.tsx
@@ -14,6 +14,7 @@ interface ScoreboardCardProps {
     feedbacks: number;
     score: number;
     submissions: number;
+    submissionPoints: number;
   };
   index: number;
 }
@@ -42,8 +43,8 @@ export default function ScoreboardCard({ value, index }: ScoreboardCardProps): J
             <span>{value.submissions === 1 ? "Submission" : "Submissions"}</span>
           </p>
           <p className="whitespace-nowrap sm:px-4 px-3 text-xs space-x-1">
-            <span>{value.score}</span>
-            <span>{value.score === 1 ? "Total Point" : "Total Points"}</span>
+            <span>{value.submissionPoints}</span>
+            <span>{value.submissionPoints === 1 ? "Submission Point" : "Submission Points"}</span>
           </p>
           <p className="whitespace-nowrap text-xs sm:px-4 px-3 space-x-1">
             <span>{value.feedbacks}</span>
diff --git a/src/components/cards/profile/Request.tsx b/src/components/cards/profile/Request.tsx
@@ -25,7 +25,7 @@ export default function Request(): ReactElement {
     <div className="md:flex items-center justify-between text-sm ">
       <div className={`relative md:flex text-gray-500 items-center md:divide-x divide-solid ${referrals && referrals.length ? "" : "hidden"}`}>
         <div className="flex pr-3 items-center">
-          <div className="cursor-pointer" onClick={onClick}>
+          <div className="cursor-pointer flex" onClick={onClick}>
             {previewList?.map((referral, index) => (
               <Avatar key={referral.id} className={`border-2 border-solid border-white ${index > 0 && "-ml-3"}`} hideVerificationBadge useLink={false} user={referral.user} />
             ))}
diff --git a/src/components/layout/Navbar.tsx b/src/components/layout/Navbar.tsx
@@ -15,6 +15,7 @@ import { Colors } from "@/types/community";
 import classNames from "classnames";
 import Loader from "../ui/Loader";
 import { IRootState } from "@/store";
+import { User } from "@/types/bounty";
 
 interface NavbarProps {
   settings?: {
@@ -38,13 +39,14 @@ interface NavbarProps {
 export default function Navbar({ settings, sidebarBurgerColor = false }: NavbarProps): ReactElement {
   const { t } = useTranslation();
   const router = useRouter();
-  const { isAuthenticated, isAuthenticatedAndVerified, isAuthLoading } = useMultiSelector<
+  const { isAuthenticated, isAuthenticatedAndVerified, isAuthLoading, authData } = useMultiSelector<
     unknown,
-    { isAuthenticated: boolean; isAuthenticatedAndVerified: boolean; isAuthLoading: boolean }
+    { isAuthenticated: boolean; isAuthenticatedAndVerified: boolean; isAuthLoading: boolean; authData: User }
   >({
     isAuthenticatedAndVerified: (state: IRootState) => authVerify(state),
     isAuthenticated: (state: IRootState) => authCheck(state),
     isAuthLoading: (state: IRootState) => state.auth.isAuthLoading,
+    authData: (state: IRootState) => state.auth.data,
   });
 
   const colors = useMemo(() => {
@@ -94,7 +96,7 @@ export default function Navbar({ settings, sidebarBurgerColor = false }: NavbarP
           </ul>
         )}
 
-        {isAuthLoading ? (
+        {isAuthLoading && !authData ? (
           <ul className="ml-auto relative">
             <Loader isSmallSpinner />
           </ul>
diff --git a/src/components/list/Objectives.tsx b/src/components/list/Objectives.tsx
@@ -23,7 +23,7 @@ interface ObjectiveProps {
  */
 export default function ObjectiveList({ iconcolor = "", crossmark = false, objectives = [] }: ObjectiveProps): ReactElement {
   return (
-    <div className="flex flex-col gap-y-3 md:grid md:w-99 md:gap-x-3 md:items-stretch pt-6 md:pb-2 md:mb-2">
+    <div className="flex flex-col gap-y-3 md:grid md:w-fit md:gap-x-3 md:items-stretch pt-6 md:pb-2 md:mb-2">
       {objectives.map((objective, index) => (
         <Objective key={`objective-list-${index}`} crossmark={crossmark} objective={objective} iconcolor={iconcolor} />
       ))}
diff --git a/src/components/sections/communities/overview/scoreboard/Filter.tsx b/src/components/sections/communities/overview/scoreboard/Filter.tsx
@@ -1,9 +1,8 @@
 import { ChangeEvent, ReactElement, useCallback, useEffect, useState } from "react";
 import FilterOption from "./_partials/FilterOption";
-import { selectList, setLoading, setFilterBy as setScoreboardFilterBy, setScoreboardList, sortScoreboards } from "@/store/feature/communities/scoreboard.slice";
+import { setLoading } from "@/store/feature/communities/scoreboard.slice";
 import { useDispatch } from "@/hooks/useTypedDispatch";
 import { useRouter } from "next/router";
-import { useSelector } from "@/hooks/useTypedSelector";
 import { filterScoreboards } from "@/store/services/communities/scoreboard.service";
 
 /**
@@ -76,12 +75,11 @@ export default function Filters(): ReactElement {
   const [sortBy, setSortBy] = useState("score");
 
   const dispatch = useDispatch();
-  const list = useSelector((state) => selectList(state));
-  const filteredScoreboards = useSelector((state) => selectList(state));
   const router = useRouter();
   const { slug } = router.query;
 
   const onFilterScoreboards = useCallback(async () => {
+    dispatch(setLoading(true));
     await dispatch(
       filterScoreboards({
         slug: slug as string,
@@ -90,28 +88,13 @@ export default function Filters(): ReactElement {
         locale: router.locale as string,
       })
     );
-    const data = filteredScoreboards;
-    if (data) {
-      const filteredData = [...data];
-      dispatch(setScoreboardFilterBy(filterBy));
-      if (sortBy) {
-        filteredData?.sort((firstItem, secondItem) => secondItem[sortBy] - firstItem[sortBy]);
-      }
-      dispatch(setScoreboardList(filteredData));
-    }
-    setLoading(true);
+    dispatch(setLoading(false));
   }, [dispatch, filterBy, router.locale, slug, sortBy]);
 
   useEffect(() => {
     onFilterScoreboards();
   }, [onFilterScoreboards]);
 
-  useEffect(() => {
-    dispatch(setScoreboardList(sortScoreboards({ sortBy, list })));
-    // Eslint disable because the list is running the effect infinitely
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [dispatch, sortBy]);
-
   const handleFilterByChange = (event: ChangeEvent<HTMLInputElement>) => {
     const newValue = event.target.value;
     if (newValue === filterBy) return;
diff --git a/src/components/sections/communities/overview/scoreboard/index.tsx b/src/components/sections/communities/overview/scoreboard/index.tsx
@@ -3,6 +3,8 @@ import ScoreboardCard from "@/components/cards/Scoreboard";
 import ArrowButton from "@/components/ui/button/Arrow";
 import { useTranslation } from "next-i18next";
 import { ReactElement, useState } from "react";
+import Loader from "@/components/ui/Loader";
+import EmptyState from "@/components/ui/EmptyState";
 
 /**
  * Scoreboard Overview index component
@@ -14,7 +16,7 @@ import { ReactElement, useState } from "react";
 
 export default function ScoreboardOverview(): ReactElement {
   const { t } = useTranslation();
-  const { list, filterBy } = useSelector((state) => state.scoreboard);
+  const { list, loading } = useSelector((state) => state.scoreboard);
 
   const [items, setItems] = useState(3);
 
@@ -24,7 +26,11 @@ export default function ScoreboardOverview(): ReactElement {
 
   return (
     <>
-      {(list && list.length !== 0) || filterBy !== "all" ? (
+      {loading ? (
+        <div className="h-full w-full grid">
+          <Loader className="place-self-center" />
+        </div>
+      ) : list && list.length !== 0 ? (
         <div className="flex flex-col w-full overflow-hidden border border-gray-200 border-solid divide-y divide-gray-200 divide-solid rounded-3xl">
           {list.slice(0, items).map((item, i) => (
             <ScoreboardCard key={`list-element-${i}`} index={i + 1} value={item} />
@@ -38,7 +44,9 @@ export default function ScoreboardOverview(): ReactElement {
           )}
         </div>
       ) : (
-        <></>
+        <div className=" w-full overflow-hidden border-t border-gray-200 ">
+          <EmptyState title={t("communities.scoreboard.empty-state.title")} />
+        </div>
       )}
     </>
   );
diff --git a/src/components/sections/submissions/Evaluation.tsx b/src/components/sections/submissions/Evaluation.tsx
@@ -55,15 +55,25 @@ export default function Evaluations(): ReactElement {
           </div>
           {evaluation.reward && (
             <div className="relative text-sm">
-              <span className="block font-medium">{t("communities.challenge.evaluation.total")}</span>
-              <div className="absolute -left-5 top-7">
-                <Coin token={evaluation.reward.token} size="small" />
-              </div>
-              <div className="inline-block font-medium" style={{ color: colors?.textAccent }}>
-                <span className="text-xl">{evaluation.reward.amount}</span>
-                <span>{evaluation.reward.token}</span>
-              </div>
-              <div>{t("communities.challenge.evaluation.message")}</div>
+              {challenge?.isHackathon ? (
+                <>
+                  <div>{t("communities.challenge.evaluation.message.nominated")}</div>
+                  <div className="inline-block font-medium" style={{ color: colors?.textAccent }}>
+                    <span className="text-xl">{evaluation.reward.amount}</span> USD
+                  </div>
+                </>
+              ) : (
+                <>
+                  <span className="block font-medium">{t("communities.challenge.evaluation.total")}</span>
+                  <div className="absolute -left-5 top-7">
+                    <Coin token={evaluation.reward.token} size="small" />
+                  </div>
+                  <div className="inline-block font-medium" style={{ color: colors?.textAccent }}>
+                    <span className="text-xl">{evaluation.reward.amount}</span> <span>{evaluation.reward.token}</span>
+                  </div>
+                  <div>{t("communities.challenge.evaluation.message")}</div>
+                </>
+              )}
             </div>
           )}
         </div>
diff --git a/src/components/ui/Avatar.tsx b/src/components/ui/Avatar.tsx
@@ -118,15 +118,20 @@ export default function Avatar({
         className={`bg-primary h-full w-full flex overflow-hidden text-white items-center justify-center uppercase leading-none align-middle relative z-0 ${shapeClassName}`}
       >
         {user && user.avatar && userAvatarLoaded ? (
-          <Image
-            src={user.avatar}
-            alt="user-avatar"
-            fill={true}
-            className="object-cover w-full h-full"
-            onError={() => {
-              setUserAvatarLoaded(false);
-            }}
-          />
+          <div>
+            <Image
+              src={user.avatar}
+              alt="user-avatar"
+              fill={true}
+              className="object-cover w-full h-full relative z-10"
+              onError={() => {
+                setUserAvatarLoaded(false);
+              }}
+            />
+            <div className="absolute inset-0 z-0 h-full flex items-center justify-center">
+              <span >{initials}</span>
+            </div>
+          </div>
         ) : (
           <span>{initials}</span>
         )}
diff --git a/src/pages/communities/[slug]/challenges/[challenge_id]/submissions/[submission_id].tsx b/src/pages/communities/[slug]/challenges/[challenge_id]/submissions/[submission_id].tsx
@@ -17,13 +17,14 @@ import { useRouter } from "next/router";
 import Loader from "@/components/ui/Loader";
 import Section from "@/components/ui/Section";
 import { useSelector } from "@/hooks/useTypedSelector";
+import { fetchChallenge } from "@/store/services/communities/challenges";
 
 export default function SubmissionPage() {
   const dispatch = useDispatch();
   const { t } = useTranslation();
   const navigation = useNavigation();
   const router = useRouter();
-  const { slug, locale, submission_id } = router.query;
+  const { slug, locale, submission_id, challenge_id } = router.query;
   const [loading, setLoading] = useState(true);
   const { current } = useSelector((state) => state.submissions);
 
@@ -33,7 +34,11 @@ export default function SubmissionPage() {
       locale: locale as string,
     };
     setLoading(true);
-    await Promise.all([dispatch(fetchCurrentCommunity(fetchCurrentCommunityPayload)), dispatch(findSubmssionById({ id: submission_id as string }))]);
+    await Promise.all([
+      dispatch(fetchChallenge({ id: challenge_id as string, relations: ["rubric"] })),
+      dispatch(fetchCurrentCommunity(fetchCurrentCommunityPayload)),
+      dispatch(findSubmssionById({ id: submission_id as string })),
+    ]);
     dispatch(initChallengeNavigationMenu(navigation.community));
     setLoading(false);
   }, [slug, submission_id]);
diff --git a/src/pages/profile/[username]/communities/[slug].tsx b/src/pages/profile/[username]/communities/[slug].tsx
diff --git a/src/store/index.ts b/src/store/index.ts
diff --git a/src/store/services/communities/scoreboard.service.ts b/src/store/services/communities/scoreboard.service.ts
