Merge branch 'dev' into stage

Author: musayann

CONTRIBUTING.md

@@ -76,23 +76,23 @@ yarn install
 Before running the application locally, the following environment variables are required to be set:
 
 ```js
-NEXT_PUBLIC_FIREBASE_API_KEY = "AIzaSyDjGCuQB-aOc0qFZPNJTfF9Is-UywXakUg";
-NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN = "dacade-mvp-1.firebaseapp.com";
-NEXT_PUBLIC_FIREBASE_PROJECT_ID = "dacade-mvp-1";
+NEXT_PUBLIC_FIREBASE_API_KEY = "AIzaSyAmodim2lJZBradsjx6Zl98hECO7vpo2To";
+NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN = "dacade-d02d2.firebaseapp.com";
+NEXT_PUBLIC_FIREBASE_PROJECT_ID = "dacade-d02d2";
 NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID = "${config.measurementId}";
-NEXT_PUBLIC_FIREBASE_APP_ID = "1:1087159887585:web:67f23902be38515b23f9a0";
+NEXT_PUBLIC_FIREBASE_APP_ID = "1:194074425069:web:e519dce8d78a458d8b3ee4";
 
-NEXT_PUBLIC_API_BASE_URL = "https://europe-west1-dacade-mvp-1.cloudfunctions.net/api";
+NEXT_PUBLIC_API_BASE_URL = "https://europe-west1-dacade-d02d2.cloudfunctions.net/api";
 
-NEXT_PUBLIC_BUGSNAG_API_KEY = "77a1ecc00ef7ab8ac27ac7ebfb353afd";
+NEXT_PUBLIC_BUGSNAG_API_KEY = "";
 NEXT_PUBLIC_SHOW_LANGUAGE_SELECTOR = true;
 
-NEXT_PUBLIC_DISCORD_CALLBACK_URL = "http://localhost:3000/profile";
-NEXT_PUBLIC_DISCORD_CLIENT_ID = "910900810815246346";
-NEXT_PUBLIC_DISCORD_OAUTH_BASE_URL = "https://discord.com/oauth2/authorize";
+NEXT_PUBLIC_DISCORD_CLIENT_ID = "";
+NEXT_PUBLIC_DISCORD_CALLBACK_URL = "https://europe-west1-dacade-d02d2.cloudfunctions.net/api/discord-bot/oauth/callback";
+NEXT_PUBLIC_DISCORD_OAUTH_BASE_URL = "https://discord.com/api/oauth2/authorize";
 NEXT_PUBLIC_DISCORD_SCOPE = "identify email";
 
-NEXT_PUBLIC_GOOGLE_TRANSLATE_API_KEY = "AIzaSyC6XYHCctzfWaxQK6Lbl9eZ0JUzbATcjpM";
+NEXT_PUBLIC_GOOGLE_TRANSLATE_API_KEY = "";
 
 NEXT_PUBLIC_BLOCK_EXPLORER_URL = "https://alfajores.celoscan.io";
 

README.md

@@ -89,6 +89,8 @@
   "page.protocols.contact.name.2": "Paul Walton",
   "page.protocols.contact.title.2": "Business Development",
   "page.protocols.contact.email.2": "[email protected]",
+  "communities.overview.challenges.title": "Предизвикателства",
+  "communities.overview.challenges.description": "В курсовете на тази общност ще имате възможност да научите за нови технологии, да решавате предизвикателства, да получавате обратна връзка и да печелите награди.",
   "communities.overview.challenge": "Creative Challenge",
   "communities.overview.chapter": "Chapter Overview",
   "communities.overview.learning-modules": "Learning Modules",
@@ -166,8 +168,8 @@
   "communities.navigation.language.es": "Spanish",
   "communities.overview.courses.title": "Courses",
   "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.overview.scoreboard.title": "Табло за резултати",
+  "communities.overview.scoreboard.description": "На таблото можете да видите кои потребители са натрупали най-много репутация, като предоставят ценни обратни връзки на своите колеги.",
   "communities.scoreboard.empty-state.title": "Няма оценки за тази категория.",
   "communities.card.estimated": "Estimated Time",
   "communities.card.earn": "Earn rewards",

public/locales/bg/common.json

@@ -110,6 +110,8 @@
   "communities.submissions": "Submissions",
   "communities.submission": "Submission",
   "communities.challenge.title": "Challenge",
+  "communities.overview.challenges.title": "Challenges",
+  "communities.overview.challenges.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.challenge.title": "Already ready to complete the challenge?",
   "communities.overview.challenge.rewards": " Rewards",
   "communities.overview.challenge.certificate": "Certificate",

public/locales/en/common.json

@@ -110,6 +110,8 @@
   "communities.submissions": "Propuestas",
   "communities.submission": "Envío",
   "communities.challenge.title": "Reto",
+  "communities.overview.challenges.title": "Desafíos",
+  "communities.overview.challenges.description": "En los cursos de esta comunidad, podrás aprender sobre nuevas tecnologías, resolver desafíos, recibir retroalimentación y ganar recompensas.",
   "communities.overview.challenge.rewards": "Recompensas",
   "communities.overview.challenge.certificate": "Certificate",
   "communities.overview.challenge.subtitle": "Al completar con éxito",

public/locales/es/common.json

@@ -89,6 +89,8 @@
   "page.protocols.contact.name.2": "Paul Walton",
   "page.protocols.contact.title.2": "Business Development",
   "page.protocols.contact.email.2": "[email protected]",
+  "communities.overview.challenges.title": "Izazovi",
+  "communities.overview.challenges.description": "Kroz tečajeve ove zajednice, moći ćete učiti o novim tehnologijama, rješavati izazove, dobivati povratne informacije i zarađivati nagrade.",
   "communities.overview.challenge": "Kreativni izazov",
   "communities.overview.chapter": "Chapter Overview",
   "communities.overview.learning-modules": "Moduli učenja",
@@ -153,8 +155,8 @@
   "communities.navigation.language.es": "Spanish",
   "communities.overview.courses.title": "Courses",
   "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.overview.scoreboard.title": "Rezultatska ploča",
+  "communities.overview.scoreboard.description": "Na ploči rezultata možete vidjeti koji su korisnici stekli najviše reputacije pružanjem vrijednih povratnih informacija svojim kolegama.",
   "communities.scoreboard.empty-state.title": "Nema bodova za ovu kategoriju.",
   "communities.card.estimated": "Estimated Time",
   "communities.card.earn": "Earn rewards",

public/locales/hr/common.json

@@ -1,6 +1,7 @@
 import { useSelector } from "@/hooks/useTypedSelector";
 import Link from "next/link";
-import { useRouter } from 'next/router';
+import { useRouter } from "next/router";
+import { useTranslation } from "next-i18next";
 
 /**
  * @interface SidebarProps
@@ -16,6 +17,7 @@ export default function Sidebar(): JSX.Element {
   const currentCommunity = useSelector((state) => state.communities.current);
   const hasCurrentCommunity = !!currentCommunity; // Check if currentCommunity exists
   const router = useRouter();
+  const { t } = useTranslation();
 
   /**
    * Checks if the given link is the active (current) route.
@@ -26,30 +28,22 @@ export default function Sidebar(): JSX.Element {
     return router.asPath === link;
   };
 
-  const scoreboardLink = hasCurrentCommunity
-    ? `/communities/${currentCommunity.slug}/scoreboard`
-    : "";
+  const scoreboardLink = hasCurrentCommunity ? `/communities/${currentCommunity.slug}/scoreboard` : "";
   const mainLink = hasCurrentCommunity ? `/communities/${currentCommunity.slug}` : "";
 
   return (
     <div className="flex flex-col divide-y divide-solid divide-gray-100 w-full text-gray-700 space-y-6">
       <Link href={mainLink}>
         <div className={isActive(mainLink) ? "" : "opacity-80"}>
-          <div className="font-medium text-.5xl leading-snug">Challenges</div>
-          <div className="text-sm font-light lg:w-full lg:pr-7 pt-2 mb-6 md:mb-0">
-            In the courses of this community, you will be able to learn about new
-            technologies, solve challenges, get feedback, and earn bounties.
-          </div>
+          <div className="font-medium text-.5xl leading-snug">{t("communities.overview.challenges.title")}</div>
+          <div className="text-sm font-light lg:w-full lg:pr-7 pt-2 mb-6 md:mb-0">{t("communities.overview.challenges.description")} </div>
         </div>
       </Link>
       {hasCurrentCommunity && (
         <Link href={scoreboardLink}>
           <div className={isActive(scoreboardLink) ? "pt-5" : "opacity-80 md:block hidden scroll-smooth pt-5"}>
-            <div className="font-medium text-.5xl leading-snug">Scoreboard</div>
-            <div className="text-sm font-light lg:w-full lg:pr-7 pt-2">
-              On the scoreboard, you can see which users have accumulated the most
-              reputation by giving valuable feedback to their peers.
-            </div>
+            <div className="font-medium text-.5xl leading-snug">{t("communities.overview.scoreboard.title")}</div>
+            <div className="text-sm font-light lg:w-full lg:pr-7 pt-2 mb-6 md:mb-0">{t("communities.overview.scoreboard.description")}</div>
           </div>
         </Link>
       )}

src/components/sections/communities/overview/Sidebar.tsx

@@ -10,24 +10,26 @@ import { wrapper } from "@/store";
 import { fetchCurrentCommunity } from "@/store/services/community.service";
 import { fetchAllChallenges } from "@/store/services/communities/challenges";
 import { NotFoundError } from "@/utilities/errors/NotFoundError";
+import { fetchAllScoreboards } from "@/store/services/communities/scoreboard.service";
+import { useTranslation } from "next-i18next";
+
 export default function Slug(props: {
   pageProps: {
     community: Community;
     challenges: Challenge[];
   };
 }): ReactElement {
   const { community, challenges } = props.pageProps;
+  const { t } = useTranslation();
   return (
     <CommunityWrapper>
       {challenges.map((challenge) => (
         <ChallengeCard key={challenge.id} data={challenge} community={community} />
       ))}
       <div className="md:hidden">
         <div className="active md:hidden mb-7 scroll-smooth pt-5">
-          <div className="font-medium text-.5xl leading-snug">Scoreboard</div>
-          <div className="text-sm font-light lg:w-full lg:pr-7 pt-2">
-            On the scoreboard, you can see which users have accumulated the most reputation by giving valuable feedback to their peers.
-          </div>
+          <div className="font-medium text-.5xl leading-snug">{t("communities.overview.scoreboard.title")}</div>
+          <div className="text-sm font-light lg:w-full lg:pr-7 pt-2">{t("communities.overview.scoreboard.description")} </div>
         </div>
         <Scoreboard />
       </div>
@@ -43,16 +45,18 @@ export const getServerSideProps = wrapper.getServerSideProps((store) => async ({
   try {
     const slug = params?.slug as string;
 
-    const [{ data: community }, { data: challenges }, translations] = await Promise.all([
+    const [{ data: community }, { data: challenges }, { data: scoreboard }, translations] = await Promise.all([
       store.dispatch(fetchCurrentCommunity({ slug, locale })),
       store.dispatch(fetchAllChallenges({ slug })),
+      store.dispatch(fetchAllScoreboards({ slug, locale: locale || "en" })),
       serverSideTranslations(locale as string),
     ]);
     if (!community || !challenges) throw new NotFoundError();
     return {
       props: {
         community,
         challenges,
+        scoreboard,
         ...translations,
       },
     };

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

@@ -37,7 +37,7 @@ const scoreboardService = createApi({
         } catch (err) {
           console.error(err);
         } finally {
-          setLoading(false);
+          dispatch(setLoading(false));
         }
       },
     }),