Merge pull request #81 from tobySolutions/feat/dashboard-theme

fix: ended livestreams showing in scheduled tab
tobySolutions · Dec 4, 2024 · 7abe68f · 7abe68f
2 parents 9ab5052 + f67ad91
commit 7abe68f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 26 deletions.
diff --git a/packages/frontend/src/lib/components/LivestreamCard.tsx b/packages/frontend/src/lib/components/LivestreamCard.tsx
@@ -16,7 +16,7 @@ const LivestreamCard = ({ livestream }: any) => {
       // Reset the copied state after 2 seconds
       setTimeout(() => setIsCopied(false), 2000);
     } catch (err) {
-      toast.error("An error occured, try again")
+      toast.error("An error occured, try again");
     }
   };
   const viewDetails = () => {
@@ -29,32 +29,36 @@ const LivestreamCard = ({ livestream }: any) => {
       <div>
         <h3 className="text-lg font-semibold text-primary-white flex items-center gap-2">
           {livestream?.title}
-          <span
-            onClick={handleCopy}
-            title="Click to copy stream url"
-            className="cursor-pointer"
-          >
-            {isCopied ? (
-              <span className="text-green-500 text-[12px]">
-                Copied to clipboard!
-              </span>
-            ) : (
-              <FaRegCopy />
-            )}
-          </span>
+          {livestream?.status.toLowerCase() !== "ended" && (
+            <span
+              onClick={handleCopy}
+              title="Click to copy stream url"
+              className="cursor-pointer"
+            >
+              {isCopied ? (
+                <span className="text-green-500 text-[12px]">
+                  Copied to clipboard!
+                </span>
+              ) : (
+                <FaRegCopy />
+              )}
+            </span>
+          )}
         </h3>
         {/* <p className="text-primary-white text-sm mb-2">Date: {livestream.date}</p> */}
         <p className="text-primary-white text-[13px]">
           Status: {livestream?.status}
         </p>
       </div>
-      <button
-        onClick={viewDetails}
-        className="relative mt-2 group overflow-hidden px-4 py-2 font-semibold text-primary-white hover:text-black bg-transparent border border-primary-border rounded-md"
-      >
-        <span className="relative z-[10]">Start stream</span>
-        <div className="absolute inset-0 w-full h-full bg-primary transition-transform duration-500 transform translate-y-full group-hover:translate-y-0"></div>
-      </button>
+      {livestream?.status.toLowerCase() !== "ended" && (
+        <button
+          onClick={viewDetails}
+          className="relative mt-2 group overflow-hidden px-4 py-2 font-semibold text-primary-white hover:text-black bg-transparent border border-primary-border rounded-md"
+        >
+          <span className="relative z-[10]">Start stream</span>
+          <div className="absolute inset-0 w-full h-full bg-primary transition-transform duration-500 transform translate-y-full group-hover:translate-y-0"></div>
+        </button>
+      )}
     </div>
   );
 };

diff --git a/packages/frontend/src/routes/dashboard/projects/[id]/index.tsx b/packages/frontend/src/routes/dashboard/projects/[id]/index.tsx
@@ -228,7 +228,7 @@ const ProjectPage = () => {
 
       {loading.project ? (
         <div className="grid place-content-center h-[calc(100vh-400px)]">
-         <Loader variant="large"/>
+          <Loader variant="large" />
         </div>
       ) : (
         <div className="container p-0 md:p-4">
@@ -251,9 +251,7 @@ const ProjectPage = () => {
                   }`}
                   onClick={() => setActiveTab(tab)}
                 >
-                  {tab === "upcoming"
-                    ? "Upcoming"
-                    : "Past"}
+                  {tab === "upcoming" ? "Upcoming" : "Past"}
                 </button>
               ))}
             </div>
@@ -316,7 +314,9 @@ const ProjectPage = () => {
 // Helper components
 const renderStreams = (tab: string, livestreamData: any[]) => {
   const filteredStreams = livestreamData?.filter((stream) =>
-    tab === "upcoming" ? stream.status !== "ended" : stream.status === "ended"
+    tab === "upcoming"
+      ? stream.status.toLowerCase() !== "ended"
+      : stream.status.toLowerCase() === "ended"
   );
 
   if (filteredStreams?.length === 0) {