Merge branch 'dev' of github.com:dacadeorg/frontend-app into dev

musayann · musayann · commit f788ad65eddf · 2024-01-24T21:39:01.000+02:00
diff --git a/src/components/cards/community/index.tsx b/src/components/cards/community/index.tsx
@@ -74,7 +74,7 @@ export default function CommunityCard({ showRewards = true, community }: Communi
             </div>
             <div className="flex flex-col items-start justify-start max-w-xs -mt-4 md:flex-row lg:flex-col md:-mt-7 md:max-w-lg">
               {showRewards && reward && (
-                <div className="text-sm">
+                <div className="text-sm flex">
                   <RewardBadge reward={{ token: reward.token }} styles={rewardBadgeStyle} />
                 </div>
               )}
diff --git a/src/components/sections/challenges/Learning.tsx b/src/components/sections/challenges/Learning.tsx
@@ -24,7 +24,7 @@ export default function Learning({ courses, learningModules, community }: { cour
         isExpanded
         content={
           <>
-            <div className="text-base font-normal text-slate-700 pt-8 pb-7 md:w-99">{t("communities.overview.challenge.learning.title")}</div>
+            <div className="text-base font-normal text-slate-700 pt-8 pb-7 md:w-182.5">{t("communities.overview.challenge.learning.title")}</div>
             <div className="md:grid grid-cols-2 gap-3">
               {courses?.map((course) => (
                 <LearningCard
diff --git a/src/components/sections/challenges/Rubric.tsx b/src/components/sections/challenges/Rubric.tsx
@@ -56,25 +56,25 @@ export default function RubricHeader({ ratingCriteria, selected, hideTitle = fal
     const hackatonPassingScore = t("communities.challenge.hackathon.passing.score");
 
     return (
-        <div className="text-base font-normal text-slate-700 pt-8 md:w-99 inline-flex flex-wrap items-center gap-1">
-          {challenge?.isHackathon ? (
-            <div dangerouslySetInnerHTML={{ __html: hackatonPassingScore }} />
-          ) : (
-            passingScoreParts.map((part, index) => {
-              if (index === passingScoreParts.length - 1) {
-                return part.split(" ").map((word, index) => <span key={index} dangerouslySetInnerHTML={{ __html: word }} />);
-              }
-              return (
-                <Fragment key={index}>
-                  {part.split(" ").map((word, index) => (
-                    <span key={index} dangerouslySetInnerHTML={{ __html: word }} />
-                  ))}
-                  {<Coin token={reward?.token} size="small" className="!-mr-1 md:!-mr-1 -ml-1" />}
-                </Fragment>
-              );
-            })
-          )}
-        </div>
+      <div className="text-base font-normal text-slate-700 pt-8 md:w-182.5 inline-flex flex-wrap items-center gap-1">
+        {challenge?.isHackathon ? (
+          <div dangerouslySetInnerHTML={{ __html: hackatonPassingScore }} />
+        ) : (
+          passingScoreParts.map((part, index) => {
+            if (index === passingScoreParts.length - 1) {
+              return part.split(" ").map((word, index) => <span key={index} dangerouslySetInnerHTML={{ __html: word }} />);
+            }
+            return (
+              <Fragment key={index}>
+                {part.split(" ").map((word, index) => (
+                  <span key={index} dangerouslySetInnerHTML={{ __html: word }} />
+                ))}
+                {<Coin token={reward?.token} size="small" className="!-mr-1 md:!-mr-1 -ml-1" />}
+              </Fragment>
+            );
+          })
+        )}
+      </div>
     );
   };
 
diff --git a/src/components/sections/challenges/SetupTeamChallenge.tsx b/src/components/sections/challenges/SetupTeamChallenge.tsx
@@ -24,7 +24,7 @@ export default function SetupTeamChallenge(): JSX.Element {
 
   return (
     <Section title="Submission">
-      <div className="text-base font-normal text-slate-700 pt-8 pb-7 md:w-99">{t("communities.overview.challenge.team.setup.info")}</div>
+      <div className="text-base font-normal text-slate-700 pt-8 pb-7 md:w-182.5">{t("communities.overview.challenge.team.setup.info")}</div>
       <div className="md:flex flex-row gap-5">
         <FormTeamCard index={1} title="Form your team" description="Open discord channel #icp-ai-web3-hachathon and find your teammates to complete the challenge with you." />
         {invite && !invite.team?.locked ? (
diff --git a/src/components/sections/challenges/Submission.tsx b/src/components/sections/challenges/Submission.tsx
@@ -136,7 +136,7 @@ export default function Submission(): ReactElement {
         <Hint className="mb-8">{t("communities.overview.challenge.submissions-closed")}</Hint>
       ) : (
         <>
-          {challenge?.isTeamChallenge && <p className="text-base font-normal text-slate-700 pt-2 pb-7 md:w-99"> {t("communities.overview.challenge.submission.description")}</p>}
+          {challenge?.isTeamChallenge && <p className="text-base font-normal text-slate-700 pt-2 pb-7 md:w-182.5"> {t("communities.overview.challenge.submission.description")}</p>}
           {!canSubmit ? (
             <Hint className="mb-8">{t("communities.challenge.submission.hint")}</Hint>
           ) : (
diff --git a/src/components/sections/challenges/TeamChallenge.tsx b/src/components/sections/challenges/TeamChallenge.tsx
@@ -37,7 +37,7 @@ export default function TeamChallenge(): JSX.Element {
 
   return (
     <Section title="Team Challenge">
-      <div className="text-base font-normal text-slate-700 pt-8 pb-7 md:w-99">To complete the team challenge, you need to follow these steps:</div>
+      <div className="text-base font-normal text-slate-700 pt-8 pb-7 md:w-182.5">To complete the team challenge, you need to follow these steps:</div>
       <div className="md:flex flex-row gap-20 md:divide-y-0 divide-y divide-gray-900 divide-dotted space-y-5 md:space-y-0 space-x-0">
         {TeamChallengeData.map((card) => (
           <TeamChallengeCard key={`TeamChallenge-card-data-${card.index}`} index={card.index} title={card.title} text={card.text} />
diff --git a/src/components/sections/communities/_partials/Header.tsx b/src/components/sections/communities/_partials/Header.tsx
@@ -40,7 +40,7 @@ export default function Header({
           </h2>
         )}
       </div>
-      {description && <p className="lg:w-99 my-2 md:my-5 text-base md:text-.5xl w-full md:w-10/12 leading-loose md:leading-snug text-gray-700">{description}</p>}
+      {description && <p className="lg:w-182.5 my-2 md:my-5 text-base md:text-.5xl w-full md:w-10/12 leading-loose md:leading-snug text-gray-700">{description}</p>}
     </div>
   );
 }
diff --git a/src/components/sections/communities/overview/MainHeader.tsx b/src/components/sections/communities/overview/MainHeader.tsx
@@ -27,8 +27,8 @@ export default function CommunitySection(): ReactElement {
             <p className="mt-2 text-xl tracking-tight md:text-.5xl leading-tight max-w-text-sm lg:hidden">{community?.summary}</p>
             <p className="hidden mt-4 tracking-tight text-lg xl:text-.5xl max-w-text-md font-extralight lg:block">{community?.summary}</p>
           </div>
-          <div className="self-end w-36 md:w-1/2 max-w-lg">
-            {community?.icon && <Image src={`${community?.icon}`} alt={community?.name || ""} className="relative w-full" width={300} height={300} />}
+          <div className="self-end w-36 h-128 md:w-1/2 max-w-lg">
+            {community?.icon && <Image src={`${community?.icon}`} alt={community?.name || ""} className="relative w-full h-full" width={300} height={300} />}
           </div>
         </div>
         <div className="flex flex-col max-w-xs mt-0 sm:-mt-15 lg:-mt-8 md:max-w-xl lg:flex-row lg:items-center">
diff --git a/src/components/sections/learning-modules/MaterialSection.tsx b/src/components/sections/learning-modules/MaterialSection.tsx
@@ -32,7 +32,7 @@ export default function MaterialSection({ material }: MaterialProps) {
   return (
     <Section id={materialId} title={isAdditional ? "Additional Material" : material?.title}>
       {!isAdditional && <Duration text={material?.subtitle || ""} value={material?.duration as number} />}
-      {!isAdditional && <span className="block text-lg mb-6 mt-2 md:w-99">{material?.description}</span>}
+      {!isAdditional && <span className="block text-lg mb-6 mt-2 md:w-182.5">{material?.description}</span>}
       {material?.type === "EMBEDDED-VIDEO" && <Video url={material.link} />}
       {material?.type === "MARKDOWN" && <Markdown url={material?.link} />}
       {isAdditional && (
diff --git a/src/components/ui/Certificate.tsx b/src/components/ui/Certificate.tsx
@@ -8,6 +8,7 @@ import IcpIcon from "@/icons/certificates/Icp.svg";
 import AiIcon from "@/icons/certificates/Ai.svg";
 import Solidity from "@/icons/certificates/Solidity.svg";
 import SuiIcon from "@/icons/certificates/Sui.svg";
+
 /**
  * Interface for the coin props
  * @date 3/23/2023 - 11:32:31 AM
diff --git a/src/icons/tokens/SUI.svg b/src/icons/tokens/SUI.svg
@@ -7,4 +7,4 @@
     <rect width="60" height="60" fill="white"/>
     </clipPath>
     </defs>
-</svg>
+</svg>
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -48,7 +48,8 @@ module.exports = {
         62: "15.5rem",
         96.5: "25.5rem",
         98: "28rem",
-        99: "45.625rem",
+        128: "32rem",
+        182.5: "45.625rem",
         "10.5/12": "90%",
         "1/100": "1%",
         "1/10": "10%",

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export default function Header({`
`40`	`40`	`</h2>`
`41`	`41`	`)}`
`42`	`42`	`</div>`
`43`		`- {description && <p className="lg:w-99 my-2 md:my-5 text-base md:text-.5xl w-full md:w-10/12 leading-loose md:leading-snug text-gray-700">{description}</p>}`
	`43`	`+ {description && <p className="lg:w-182.5 my-2 md:my-5 text-base md:text-.5xl w-full md:w-10/12 leading-loose md:leading-snug text-gray-700">{description}</p>}`
`44`	`44`	`</div>`
`45`	`45`	`);`
`46`	`46`	`}`