From 770c9e4afc15add94d24e3cb9af271ae9f7ad6a3 Mon Sep 17 00:00:00 2001
From: Kamran Ahmed <kamranahmed.se@gmail.com>
Date: Fri, 16 Aug 2024 23:31:42 +0100
Subject: [PATCH] Add user avatars

---
 .../Projects/ListProjectSolutions.tsx         | 137 +++++++++++-------
 .../Projects/SubmitProjectModal.tsx           |   4 +-
 src/components/Projects/VoteButton.tsx        |  30 ++++
 src/lib/date.ts                               |   6 +-
 4 files changed, 122 insertions(+), 55 deletions(-)
 create mode 100644 src/components/Projects/VoteButton.tsx

diff --git a/src/components/Projects/ListProjectSolutions.tsx b/src/components/Projects/ListProjectSolutions.tsx
index c691084be..18e02f1fa 100644
--- a/src/components/Projects/ListProjectSolutions.tsx
+++ b/src/components/Projects/ListProjectSolutions.tsx
@@ -3,7 +3,13 @@ import { useToast } from '../../hooks/use-toast';
 import { httpGet, httpPost } from '../../lib/http';
 import { LoadingSolutions } from './LoadingSolutions';
 import { EmptySolutions } from './EmptySolutions';
-import { ArrowDown, ArrowUp, CalendarCheck } from 'lucide-react';
+import {
+  ArrowDown,
+  ArrowUp,
+  CalendarCheck,
+  ThumbsDown,
+  ThumbsUp,
+} from 'lucide-react';
 import { getRelativeTimeString } from '../../lib/date';
 import { Pagination } from '../Pagination/Pagination';
 import { deleteUrlParam, getUrlParams, setUrlParams } from '../../lib/browser';
@@ -12,6 +18,9 @@ import { cn } from '../../lib/classname';
 import { LeavingRoadmapWarningModal } from './LeavingRoadmapWarningModal';
 import { isLoggedIn } from '../../lib/jwt';
 import { showLoginPopup } from '../../lib/popup';
+import { CheckIcon } from '../ReactIcons/CheckIcon.tsx';
+import { VoteButton } from './VoteButton.tsx';
+import { GitHubIcon } from '../ReactIcons/GitHubIcon.tsx';
 
 export interface ProjectStatusDocument {
   _id?: string;
@@ -63,6 +72,30 @@ type ListProjectSolutionsProps = {
   projectId: string;
 };
 
+const submittedAlternatives = [
+  'submitted their solution',
+  'got it done',
+  'submitted their take',
+  'finished the project',
+  'submitted their work',
+  'completed the project',
+  'got it done',
+  'delivered their project',
+  'handed in their solution',
+  'provided their deliverables',
+  'submitted their approach',
+  'sent in their project',
+  'presented their take',
+  'shared their completed task',
+  'submitted their approach',
+  'completed it',
+  'finalized their solution',
+  'delivered their approach',
+  'turned in their project',
+  'submitted their final draft',
+  'delivered their solution',
+];
+
 export function ListProjectSolutions(props: ListProjectSolutionsProps) {
   const { projectId } = props;
 
@@ -220,72 +253,72 @@ export function ListProjectSolutions(props: ListProjectSolutionsProps) {
         }}
       />
 
-      <div className="my-4 flex flex-col gap-2">
-        {solutions?.data.map((solution) => {
-          const repoUrlParts = solution?.repositoryUrl
-            ?.replace(/https?:\/\/(www\.)?github\.com/, '')
-            .split('/');
-          const username = repoUrlParts?.[1];
-          const repoName = repoUrlParts?.[2];
-
+      <div className="my-4 flex flex-col divide-y divide-gray-100">
+        {solutions?.data.map((solution, counter) => {
           const isVisited = alreadyVisitedSolutions[solution._id!];
+          const avatar = solution.user.avatar || '';
 
           return (
             <div
               key={solution._id}
-              className="flex items-center justify-between gap-2 rounded-md bg-gray-100 p-2.5"
+              className="group flex items-center justify-between py-1 text-sm text-gray-500"
             >
-              <div>
+              <div className="flex items-center gap-1.5">
+                <img
+                  src={
+                    avatar
+                      ? `${import.meta.env.PUBLIC_AVATAR_BASE_URL}/${avatar}`
+                      : '/images/default-avatar.png'
+                  }
+                  alt={solution.user.name}
+                  className="mr-0.5 h-7 w-7 rounded-full"
+                />
+                <span className="font-medium text-black">
+                  {solution.user.name}
+                </span>
+                {submittedAlternatives[
+                  counter % submittedAlternatives.length
+                ] || 'submitted their solution'}{' '}
+                <span className="font-medium text-black">
+                  {getRelativeTimeString(solution?.submittedAt!)}
+                </span>
+              </div>
+
+              <div className="5 flex items-center gap-1">
+                <span className="flex items-center overflow-hidden rounded-full border">
+                  <VoteButton
+                    icon={ThumbsUp}
+                    isActive={solution?.voteType === 'upvote'}
+                    count={solution.upvotes || 0}
+                    onClick={() => {
+                      handleSubmitVote(solution._id!, 'upvote');
+                    }}
+                  />
+
+                  <VoteButton
+                    icon={ThumbsDown}
+                    isActive={solution?.voteType === 'downvote'}
+                    count={solution.downvotes || 0}
+                    onClick={() => {
+                      handleSubmitVote(solution._id!, 'downvote');
+                    }}
+                  />
+                </span>
+
                 <a
-                  href={solution.repositoryUrl}
-                  target="_blank"
-                  className="font-medium underline underline-offset-2"
+                  className="ml-1 flex items-center gap-1 rounded-full border px-2 py-1 text-xs text-black transition-colors hover:border-black hover:bg-black hover:text-white"
                   onClick={(e) => {
                     if (!isVisited) {
                       e.preventDefault();
                       setShowLeavingRoadmapModal(solution);
                     }
                   }}
+                  target="_blank"
+                  href={solution.repositoryUrl}
                 >
-                  {username}/{repoName}
+                  <GitHubIcon className="h-4 w-4 text-current" />
+                  Visit Solution
                 </a>
-
-                <div className="mt-2 flex items-center">
-                  <button
-                    className={cn(
-                      'flex items-center gap-1 text-sm text-gray-500 hover:text-black',
-                      solution?.voteType === 'upvote' &&
-                        'text-orange-600 hover:text-orange-700',
-                    )}
-                    disabled={solution?.voteType === 'upvote'}
-                    onClick={() => {
-                      handleSubmitVote(solution._id!, 'upvote');
-                    }}
-                  >
-                    <ArrowUp className="size-3.5 stroke-[2.5px]" />
-                    {solution.upvotes}
-                  </button>
-                  <span className="mx-2">&middot;</span>
-                  <button
-                    className={cn(
-                      'flex items-center gap-1 text-sm text-gray-500 hover:text-black',
-                      solution?.voteType === 'downvote' &&
-                        'text-orange-600 hover:text-orange-700',
-                    )}
-                    disabled={solution?.voteType === 'downvote'}
-                    onClick={() => {
-                      handleSubmitVote(solution._id!, 'downvote');
-                    }}
-                  >
-                    <ArrowDown className="size-3.5 stroke-[2.5px]" />
-                    {solution.downvotes}
-                  </button>
-                  <span className="mx-2">&middot;</span>
-                  <span className="flex items-center gap-1 text-sm text-gray-500">
-                    <CalendarCheck className="size-3.5 stroke-[2.5px]" />
-                    {getRelativeTimeString(solution?.submittedAt!)}
-                  </span>
-                </div>
               </div>
             </div>
           );
diff --git a/src/components/Projects/SubmitProjectModal.tsx b/src/components/Projects/SubmitProjectModal.tsx
index 3ccc8f537..ac8b84e4c 100644
--- a/src/components/Projects/SubmitProjectModal.tsx
+++ b/src/components/Projects/SubmitProjectModal.tsx
@@ -206,7 +206,7 @@ export function SubmitProjectModal(props: SubmitProjectModalProps) {
 
   return (
     <Modal onClose={onClose} bodyClassName="h-auto p-4">
-      <h2 className="mb-2 flex items-center gap-2.5 text-2xl font-semibold">
+      <h2 className="mb-2 flex items-center gap-2.5 text-xl font-semibold">
         <GitHubIcon className="h-6 w-6 text-black" /> Submit Solution URL
       </h2>
       <p className="text-sm text-gray-500">
@@ -272,7 +272,7 @@ export function SubmitProjectModal(props: SubmitProjectModalProps) {
 
         <button
           type="submit"
-          className="mt-2 w-full rounded-lg bg-black p-2 font-medium text-white disabled:opacity-50"
+          className="mt-2 w-full rounded-lg bg-black p-2 font-medium text-white disabled:opacity-50 text-sm"
           disabled={isLoading}
         >
           {isLoading ? 'Verifying...' : 'Verify and Submit'}
diff --git a/src/components/Projects/VoteButton.tsx b/src/components/Projects/VoteButton.tsx
new file mode 100644
index 000000000..64209999f
--- /dev/null
+++ b/src/components/Projects/VoteButton.tsx
@@ -0,0 +1,30 @@
+import { cn } from '../../lib/classname.ts';
+import { type LucideIcon, ThumbsUp } from 'lucide-react';
+
+type VoteButtonProps = {
+  icon: LucideIcon;
+  isActive: boolean;
+  count: number;
+  onClick: () => void;
+};
+export function VoteButton(props: VoteButtonProps) {
+  const { icon: VoteIcon, isActive, count, onClick } = props;
+  return (
+    <button
+      className={cn(
+        'flex items-center gap-1 px-2 py-1 text-sm text-gray-500 hover:bg-gray-100 hover:text-black',
+        {
+          'bg-gray-100 text-orange-600 hover:text-orange-700': isActive,
+          'bg-transparent text-gray-500 hover:text-black': !isActive,
+        },
+      )}
+      disabled={isActive}
+      onClick={onClick}
+    >
+      <VoteIcon className={cn('size-3.5 stroke-[2.5px]')} />
+      <span className="relative -top-[0.5px] text-xs font-medium tabular-nums">
+        {count}
+      </span>
+    </button>
+  );
+}
diff --git a/src/lib/date.ts b/src/lib/date.ts
index 0316c2ca4..2adbc3a86 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -33,11 +33,15 @@ export function getRelativeTimeString(
     } else {
       relativeTime = rtf.format(-diffInDays, 'day');
     }
+  } else if (diffInDays < 30) {
+    relativeTime = rtf.format(-Math.round(diffInDays / 7), 'week');
+  } else if (diffInDays < 365) {
+    relativeTime = rtf.format(-Math.round(diffInDays / 30), 'month');
   } else {
     if (isTimed) {
       relativeTime = dayjs(date).format('MMM D, YYYY h:mm A');
     } else {
-      relativeTime = rtf.format(-Math.round(diffInDays / 7), 'week');
+      relativeTime = dayjs(date).format('MMM D, YYYY');
     }
   }