Merge branch 'dev' into ft/show-submission-form-for-multiple-submissions

Author: serapieTuyishime

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,26 @@
+# Describe the bug\*\*
+
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment:**
+
+- Operating System: [e.g. iOS]
+- Browser and version: (To be filled based on the specific browser used)
+- Application or software version: (The specific version of the application where the issue is discovered)
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,8 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+
+
+---
+
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,11 @@
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/pull_request_template.md

@@ -0,0 +1,35 @@
+# Submit a pull request
+
+- [ ] This is not a duplicate of an existing pull request.
+- [ ] No existing features have been broken without good reason.
+- [ ] Your commit messages are detailed
+- [ ] The code style guideline have been followed.
+- [ ] Documentation has been updated to reflect your changes.
+- [ ] Tests have been added or updated to reflect your changes.
+- [ ] All tests pass.
+
+---
+
+Replace any ":question:" below with information about your pull request.
+
+## Pull Request Details
+
+Provide details about your pull request and what it adds, fixes, or changes.
+
+:question:
+
+## Breaking Changes
+
+Describe what features are broken by this pull request and why, if any.
+
+:question:
+
+## Issues Fixed
+
+Enter the issue numbers resolved by this pull request below, if any.
+
+1. :question:
+
+## Other Relevant Information
+
+Provide any other important details below.

README.md

@@ -82,13 +82,13 @@ NEXT_PUBLIC_FIREBASE_PROJECT_ID = "dacade-d02d2";
 NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID = "${config.measurementId}";
 NEXT_PUBLIC_FIREBASE_APP_ID = "1:194074425069:web:e519dce8d78a458d8b3ee4";
 
-NEXT_PUBLIC_API_BASE_URL = "https://europe-west1-dacade-d02d2.cloudfunctions.net/api";
+NEXT_PUBLIC_API_BASE_URL = "https://us-central1-dacade-d02d2.cloudfunctions.net/api";
 
 NEXT_PUBLIC_BUGSNAG_API_KEY = "";
 NEXT_PUBLIC_SHOW_LANGUAGE_SELECTOR = true;
 
 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_CALLBACK_URL = "https://us-central1-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";
 

src/components/cards/Bounty.tsx

@@ -57,7 +57,7 @@ export default function BountyCard({ bounty }: BountyProps): ReactElement {
   const Component = link.startsWith("http") ? "a" : Link;
 
   return (
-    <div className="cursor-pointer flex md:flex-row-reverse md:space-x-5 px-5 min-h-32 md:h-auto md:w-full justify-between hover:bg-secondary relative">
+    <div className="p-5 flex md:flex-row-reverse md:space-x-5 px-5 min-h-32 md:h-auto md:w-full justify-between hover:bg-secondary relative">
       <div className="bg-theme-accent flex-col w-full h-full justify-between md:-space-y-1 pl-3 pr-5 mt-7 mb-5">
         <Component className="relative w-full block" href={link}>
           <div className="font-medium text-md md:pt-1.5">{bounty.course ? bounty.course.name : bounty.name}</div>
@@ -71,15 +71,16 @@ export default function BountyCard({ bounty }: BountyProps): ReactElement {
         {bounty.submissions?.length ? (
           <div className="mt-4 space-y-0 divide-y divide-gray-200 border-t border-t-solid border-gray-200">
             {bounty.submissions.map((submission) => (
-              <Link
-                href={navigation.community.submissionPath(submission.id, bounty.challenge, bounty?.slug)}
-                className="flex space-x-1 relative text-sm font-medium py-3"
-                key={submission.id}
-              >
+              <div className="flex space-x-1 relative text-sm font-medium py-3" key={submission.id}>
                 <div className="flex justify-between w-full pr-0 gap-1 sm:gap-0">
                   <div className="flex space-x-1">
                     <Avatar user={submission.user} size="mini" />
-                    <div className="text-ellipsis overflow-hidden w-17 sm:w-auto whitespace-nowrap">{submission.user.displayName}</div>
+                    <Link
+                      className="text-ellipsis overflow-hidden w-17 sm:w-auto whitespace-nowrap"
+                      href={navigation.community.submissionPath(submission.id, bounty.challenge, bounty?.slug)}
+                    >
+                      {submission.user.displayName}
+                    </Link>
                     <div className="flex align-middle text-gray-500 text-middle bg-gray-200 px-2 text-xxs rounded-xl m-0 h-5">
                       {submission.metadata && submission.metadata.feedbacks ? submission.metadata.feedbacks : 0}
                     </div>
@@ -94,7 +95,7 @@ export default function BountyCard({ bounty }: BountyProps): ReactElement {
                     )}
                   </div>
                 </div>
-              </Link>
+              </div>
             ))}
           </div>
         ) : (

src/components/cards/Reputation.tsx

@@ -1,9 +1,9 @@
-import Link from "next/link";
 import Avatar from "@/components/ui/Avatar";
 import Currency from "@/components/ui/Currency";
 import { Community } from "@/types/community";
 import { ReactElement } from "react";
 import { User } from "@/types/bounty";
+import Link from "next/link";
 
 /**
  * Interface for the reputation card props
@@ -32,16 +32,16 @@ interface ReputationCardProps {
  */
 export default function ReputationCard({ details = {} }: ReputationCardProps): ReactElement {
   return (
-    <Link href={details?.community ? `/communities/${details.community.slug}` : ""} className="flex space-x-3 text-left hover:bg-gray-50 pb-3 -mx-5 px-5">
+    <div className="flex space-x-3 text-left hover:bg-gray-50 pb-3 -mx-5 px-5">
       <Avatar icon={details.community?.icon} color={details.community?.colors?.cover?.background || details.community?.colors.primary} size="medium" shape="rounded" />
       {details?.score && (
-        <div className="pt-1">
+        <Link href={details?.community ? `/communities/${details.community.slug}` : ""} className="pt-1">
           <span className="block text-base font-medium leading-normal">
             <Currency value={details.score} token="REP" />
           </span>
           <span className="block font-normal text-sm">{details.community?.name}</span>
-        </div>
+        </Link>
       )}
-    </Link>
+    </div>
   );
 }

src/components/cards/challenge/Challenge.tsx

@@ -7,7 +7,7 @@ import Link from "next/link";
 import RelatedContent from "./RelatedContent";
 import Badges from "./Badges";
 import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
+import { useTranslation } from "next-i18next";
 
 /**
  * `ChallengeCard` is a function component that renders a card
@@ -25,10 +25,12 @@ interface ChallengeCardProps {
 }
 export default function ChallengeCard({ data, community, isCourseEnd }: ChallengeCardProps) {
   const { t } = useTranslation();
+
   const link = `/communities/${community.slug}/challenges/${data.id}`;
   const expiresAt = useMemo(() => (data.expiresAt ? new Date(data.expiresAt).toLocaleDateString() : null), [data.expiresAt]);
   const reward = isCourseEnd ? data?.rewards?.find((reward) => reward.type === "SUBMISSION") : data?.reward;
   const totalReward = data?.rewards?.reduce((acc, reward) => (acc += Number(reward.amount)), 0);
+
   return (
     <div className="border-solid border border-gray-200 bg-gray-50 rounded-3xl mb-5 group text-gray-700">
       <div className="border-solid border-b border-gray-300 bg-white rounded-3xl sm:p-8 sm:pb-6 w-full p-6">
@@ -46,7 +48,7 @@ export default function ChallengeCard({ data, community, isCourseEnd }: Challeng
                 <div className="md:pl-2 max-w-max">
                   <div className="flex text-sm text-gray-700">
                     <span className="block font-medium pr-1">
-                      {community.slug === "celo" && "NFT"} {t("communities.overview.challenge.certificate")}
+                      {community?.slug === "celo" && "NFT"} {t("communities.overview.challenge.certificate")}
                     </span>
                   </div>
                   <div className="text-gray-400 text-xs font-normal">Upon successful completion</div>

src/components/cards/challenge/Overview.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import Coin from "@/components/ui/Coin";
 import { Challenge, Reward } from "@/types/course";
 import { useTranslation } from "next-i18next";
@@ -43,7 +42,7 @@ export default function Overview({ challenge, community }: Props) {
           <div className="md:pl-2 max-w-max">
             <div className="flex text-sm text-gray-700">
               <span className="block font-medium pr-1">
-                {community.slug === "celo" && "NFT"} {t("communities.overview.challenge.certificate")}
+                {community?.slug === "celo" && "NFT"} {t("communities.overview.challenge.certificate")}
               </span>
             </div>
             <div className="text-gray-400 text-xs font-medium">{t("communities.overview.challenge.subtitle")}</div>

src/components/layout/NotificationBar.tsx

@@ -33,7 +33,7 @@ export default function Notification(): ReactElement {
     <div className="w-full flex justify-center">
       {error && (
         <div className="bg-red-50 border border-red-100 text-red-900 px-4 py-3 rounded-md relative w-full max-w-md justify-center flex" role="alert">
-          <span className="block sm:inline">{t(error?.error?.data.message || error?.code)}</span>
+          <span className="block sm:inline">{t(error?.error?.data?.message || error?.code)}</span>
         </div>
       )}
     </div>