Merge branch 'stage'

Author: musayann

src/components/cards/profile/Referral.tsx

@@ -7,7 +7,7 @@ import { Referral as ReferralType } from "@/types/community";
 import Link from "next/link";
 import TimeIcon from "@/icons/time.svg";
 import RewardBadge from "@/components/badges/RewardBadge";
-import { Evaluation, Submission } from "@/types/bounty";
+import { Evaluation } from "@/types/bounty";
 
 interface ReferralProps {
   referral: ReferralType;
@@ -29,7 +29,6 @@ export default function Referral({ referral }: ReferralProps): ReactElement {
   const { locale } = useRouter();
   const joinedAt = useMemo(() => DateManager.fromNow(referral.created_at, locale), [locale, referral.created_at]);
   const rewardAt = useMemo(() => (referral.rewarded ? DateManager.fromNow(referral.updated_at, locale) : null), [locale, referral.rewarded, referral.updated_at]);
-  const challengeLink = (submission: Submission) => `/communities/${submission.community.slug}/challenges/${submission.challenge.id}/submissions/${submission.id}`
   const status = (evaluation: Evaluation) => {
     if (!evaluation) return t("referrals.challenge.evaluation.status.pending")
     return t(evaluation?.reward ? "referrals.challenge.evaluation.status.passed" : "referrals.challenge.evaluation.status.failed")
@@ -51,11 +50,11 @@ export default function Referral({ referral }: ReferralProps): ReactElement {
         <div className="flex-grow md:ml-19">
           <div className="pt-1">
             <ul className="pb-1 font-light leading-loose text-gray-700 grid divide-y-2 space-y-4 divide-gray-200">
-              {referral?.submissions?.length ? referral.submissions.map((submission) => (
+              {referral.user.submissions.length ? referral.user.submissions.map((submission) => (
                 <li key={submission.id} className="grid md:flex justify-between pt-4 gap-2 md:gap-0">
                   <span className="grid gap-2">
                     <span>
-                      {status(submission.metadata.evaluation)} <Link href={challengeLink(submission)} className="font-bold underline text-base- underline-offset-2">{submission.challenge.name} {t("referrals.submission.challenge")}</Link>
+                      {status(submission.metadata.evaluation)} <Link href={submission.link} className="font-bold underline text-base- underline-offset-2">{submission.challengeData.name} {t("referrals.submission.challenge")}</Link>
                     </span>
                     {!submission?.metadata?.evaluation && <span className="mr-0 flex items-center gap-2.5 leading-none "> <TimeIcon />{t("referrals.challenge.evaluation.pending")}</span>}
                   </span>

src/components/sections/challenges/Submission.tsx

@@ -9,7 +9,6 @@ import { useMultiSelector } from "@/hooks/useTypedSelector";
 import { useDispatch } from "@/hooks/useTypedDispatch";
 import { createSubmission, createSubmissionTeam } from "@/store/feature/communities/challenges/submissions";
 import { useForm } from "react-hook-form";
-import classNames from "classnames";
 import { useTranslation } from "next-i18next";
 import { ReactElement } from "react";
 import { Submission as TSubmission, User } from "@/types/bounty";
@@ -163,11 +162,7 @@ export default function Submission(): ReactElement {
                     />
                   </div>
                   {challenge.format.githubLink && (
-                    <div
-                      className={classNames("w-full border border-solid border-gray-200 m-0 rounded-b text-lg py-0 leading-none items-center space-x-2", {
-                        "border-t-0": challenge.format.text,
-                      })}
-                    >
+                    <div className="w-full m-0 text-lg py-0 leading-none items-center space-x-2">
                       <div>
                         <GithubLinkInput
                           id="input-github"

src/components/sections/homepage/_partials/testimonials/CommunityStats.tsx

@@ -37,10 +37,10 @@ export default function CommunityStats() {
   return (
     <div className="p-7 bg-primary rounded-3.5xl mx-auto text-white relative md:absolute md:top-28 lg:top-32 xl:w-1/3 md:w-4/6 z-10 sm:max-w-sm">
       <h3 className="m-0 text-4.5xl w-3/4">{t("testimonials.community.title")}</h3>
-      <div className="relative mt-11 mb-5 divide-y divide-white divide-dotted">
+      <div className="relative divide-y divide-white divide-dotted">
         {stats.map((stat) => (
-          <div key={stat.title} className="py-5">
-            <span className="block text-2xl mb-2">{stat.count}</span>
+          <div key={stat.title} className="py-6">
+            <span className="block text-.5xl mb-2">{stat.count}</span>
             <p className="text-base w-3/4 m-0">
               <span className="font-graphik font-medium">{t(stat.title)}</span> {t(stat.description)}
             </p>

src/components/ui/GithubLinkInput.tsx

@@ -83,7 +83,7 @@ export default forwardRef<HTMLInputElement, GithubLinkInputProps>(function Githu
   );
 
   return (
-    <div className="flex items-center w-full border border-t-0 border-gray-200">
+    <div className="flex items-center w-full border border-t-0 rounded-b border-gray-200">
       <div className="flex-none pl-3.75">
         <GithubIcon className="relative flex-none text-gray-400 m-0 p-0 block -mt-0.5" />
       </div>

src/components/ui/Hint.tsx

@@ -6,7 +6,7 @@ type HintProps = {
 };
 
 function Hint({ children, className }: HintProps): ReactElement {
-  return <div className={`bg-yellow-50 text-yellow-900 py-5 px-8 border border-solid border-yellow-100 text-base hint-container ${className}`}>{children}</div>;
+  return <div className={`bg-blue-50 text-primary p-3 border border-blue-200 rounded text-base hint-container ${className}`}>{children}</div>;
 }
 
 export default Hint;

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

@@ -144,7 +144,6 @@ export default function ChallengePage() {
                   <div className="grid mt-8 space-y-8">
                     <Hint>
                       <p
-                        className="text-lg py-4"
                         dangerouslySetInnerHTML={{
                           __html: t(
                             challenge?.multipleSubmissions ? "communities.challenge.submission.multiple-submissions" : "communities.challenge.submission.no-multiple-submissions"
@@ -170,11 +169,13 @@ export default function ChallengePage() {
               </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 className="mt-6">
+                  <p>
+                    To be able to submit
+                    <Link className="underline pl-1" href="/login">
+                      Login.
+                    </Link>
+                  </p>
                 </Hint>
               </div>
             )}

src/styles/globals.css

@@ -98,24 +98,12 @@ body {
 }
 
 .message-bubble {
-  @apply w-72 p-8 rounded-3.5xl relative text-base;
+  @apply w-72 p-6 rounded-3.5xl rounded-bl-none relative text-base border border-black border-opacity-5;
 
   background: #fefce8;
   color: #713f12;
 }
 
-.message-bubble::before {
-  width: 0;
-  height: 0;
-  left: -28px;
-  content: "";
-  position: absolute;
-  border-left: 28px solid transparent;
-  bottom: 0;
-  border-right: 28px solid transparent;
-  border-bottom: 28px solid #fefce8;
-}
-
 @media only screen and (min-width: 992px) {
   .quadratic-card {
     @apply p-8 mb-5;
@@ -349,7 +337,7 @@ div {
 }
 
 .hint-container a {
-  font-weight: 400;
+  font-weight: 500;
   text-decoration: underline;
 }
 

src/types/community.d.ts

@@ -42,8 +42,14 @@ export interface Colors {
     background: string;
   };
 }
+interface ReferralSubmission extends Submission {
+  challengeData: Challenge,
+  link: string
+}
+interface UserReferral extends User {
+  submissions: ReferralSubmission[]
+}
 export interface Referral {
-  user: User;
   id: string;
   name: string;
   ref: string;
@@ -53,13 +59,11 @@ export interface Referral {
   community: Community;
   timestamp: number;
   reward: Reward;
-  user: User;
   challenge: Challenge;
-  community: Community;
   submissions: Submission[];
   rewarded: boolean;
   metadata?: {
     reward: Reward;
   };
-  user: User;
+  user: UserReferral;
 }