From adc3d58ac1e6a8376e052309b163770f77444316 Mon Sep 17 00:00:00 2001
From: kumsuzCode <mkumsuz1@gmail.com>
Date: Wed, 20 Sep 2023 16:22:32 +1000
Subject: [PATCH 1/2] fix(fe): Redirect campaign card link to correct page

---
 .../src/components/CampaignCard/index.tsx     | 12 +++---
 .../AdminContent/AdminCampaignContent.tsx     |  2 +-
 .../src/pages/admin/AdminContent/index.tsx    | 37 ++++++++++++-------
 .../pages/dashboard/CampaignGrid/index.tsx    |  2 +-
 4 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/frontend/src/components/CampaignCard/index.tsx b/frontend/src/components/CampaignCard/index.tsx
index 813398d0..f22e38e7 100644
--- a/frontend/src/components/CampaignCard/index.tsx
+++ b/frontend/src/components/CampaignCard/index.tsx
@@ -81,13 +81,15 @@ const CampaignCard = ({
     />
   );
 
+  const linkComponent = isAdmin ? (
+    <Link to={`/admin/review/${campaignId}`}>{content}</Link>
+  ) : (
+    <Link to={`/application/${campaignId}`}>{content}</Link>
+  );
+
   return (
     <>
-      {campaignId === undefined ? (
-        content
-      ) : (
-        <Link to={`/application/${campaignId}`}>{content}</Link>
-      )}
+      {campaignId === undefined ? content : linkComponent}
       {popup}
     </>
   );
diff --git a/frontend/src/pages/admin/AdminContent/AdminCampaignContent.tsx b/frontend/src/pages/admin/AdminContent/AdminCampaignContent.tsx
index 05f28ee7..e5ca4208 100644
--- a/frontend/src/pages/admin/AdminContent/AdminCampaignContent.tsx
+++ b/frontend/src/pages/admin/AdminContent/AdminCampaignContent.tsx
@@ -13,7 +13,7 @@ type Props = {
 };
 
 const AdminCampaignContent = ({ campaigns, setCampaigns, orgLogo }: Props) => (
-  <div tw="flex flex-wrap gap-4">
+  <div tw="flex flex-wrap gap-4 ml-20">
     {campaigns.map((c) => (
       <CampaignCard
         key={c.id}
diff --git a/frontend/src/pages/admin/AdminContent/index.tsx b/frontend/src/pages/admin/AdminContent/index.tsx
index 200626ef..37d36c9f 100644
--- a/frontend/src/pages/admin/AdminContent/index.tsx
+++ b/frontend/src/pages/admin/AdminContent/index.tsx
@@ -1,4 +1,4 @@
-import { PencilIcon } from "@heroicons/react/24/solid";
+import { PencilIcon, PlusIcon } from "@heroicons/react/24/solid";
 import { DeleteForeverRounded } from "@mui/icons-material";
 import { Button, ToggleButton, ToggleButtonGroup } from "@mui/material";
 import { useContext, useEffect, useState } from "react";
@@ -65,7 +65,7 @@ const AdminContent = ({
   useEffect(() => {
     if (orgLogo === undefined) {
       // have to be consistent in returning a function to make eslint happy
-      return () => { };
+      return () => {};
     }
 
     const reader = new FileReader();
@@ -185,6 +185,15 @@ const AdminContent = ({
           >
             <PencilIcon tw="w-8 h-8" />
           </button>
+          <button
+            tw="text-gray-500 hover:text-gray-800 transition-colors"
+            type="button"
+            onClick={() => console.log("addition modal goes here")}
+          >
+            <PlusIcon tw="w-12 h-12" />
+          </button>
+          {/* have to add addition button here to create campaigns,
+          or maybe it should go in a more obvious spot? */}
           <ToggleButtonContainer>
             <ToggleButtonGroup
               color="primary"
@@ -207,23 +216,23 @@ const AdminContent = ({
           </ToggleButtonContainer>
         </div>
       </ContentHeader>
-      <ContentBody>
-        {windowSelected === "campaigns" && (
-          <AdminCampaignContent
-            campaigns={campaigns}
-            setCampaigns={setCampaigns}
-            orgId={id}
-            orgLogo={icon}
-          />
-        )}
-        {windowSelected === "members" && (
+      {windowSelected === "campaigns" && (
+        <AdminCampaignContent
+          campaigns={campaigns}
+          setCampaigns={setCampaigns}
+          orgId={id}
+          orgLogo={icon}
+        />
+      )}
+      {windowSelected === "members" && (
+        <ContentBody>
           <AdminMembersContent
             orgId={id}
             members={members}
             setMembers={setMembers}
           />
-        )}
-      </ContentBody>
+        </ContentBody>
+      )}
 
       <Modal
         open={showEditDialog}
diff --git a/frontend/src/pages/dashboard/CampaignGrid/index.tsx b/frontend/src/pages/dashboard/CampaignGrid/index.tsx
index 8cb322d5..c604bd1d 100644
--- a/frontend/src/pages/dashboard/CampaignGrid/index.tsx
+++ b/frontend/src/pages/dashboard/CampaignGrid/index.tsx
@@ -79,7 +79,7 @@ const CampaignGrid = ({
           />
         </Transition>
       ))}
-    </div >
+    </div>
   );
 };
 

From 9c0153e1da779d04241c016e4ec423e05efd2882 Mon Sep 17 00:00:00 2001
From: m4ch374 <spiner47@gmail.com>
Date: Tue, 26 Sep 2023 13:54:46 +1000
Subject: [PATCH 2/2] hotfix(create_campagin): users could now create campaign

---
 frontend/src/pages/admin/AdminContent/index.tsx | 6 +++++-
 frontend/src/pages/create_campaign/index.tsx    | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/admin/AdminContent/index.tsx b/frontend/src/pages/admin/AdminContent/index.tsx
index 37d36c9f..7ae479b0 100644
--- a/frontend/src/pages/admin/AdminContent/index.tsx
+++ b/frontend/src/pages/admin/AdminContent/index.tsx
@@ -4,6 +4,8 @@ import { Button, ToggleButton, ToggleButtonGroup } from "@mui/material";
 import { useContext, useEffect, useState } from "react";
 import "twin.macro";
 
+import { useNavigate } from "react-router-dom";
+
 import { doDeleteOrg, putOrgLogo } from "api";
 import { FetchError } from "api/api";
 import { Modal } from "components";
@@ -54,6 +56,8 @@ const AdminContent = ({
     orgName = "...";
   }
 
+  const navigate = useNavigate();
+
   const [windowSelected, setWindowSelected] = useState("campaigns");
   const [showDeleteDialog, setShowDeleteDialog] = useState(false);
   const [showEditDialog, setShowEditDialog] = useState(false);
@@ -188,7 +192,7 @@ const AdminContent = ({
           <button
             tw="text-gray-500 hover:text-gray-800 transition-colors"
             type="button"
-            onClick={() => console.log("addition modal goes here")}
+            onClick={() => navigate(`/campaign/create/${id}`)}
           >
             <PlusIcon tw="w-12 h-12" />
           </button>
diff --git a/frontend/src/pages/create_campaign/index.tsx b/frontend/src/pages/create_campaign/index.tsx
index 5adfb637..7f31f666 100644
--- a/frontend/src/pages/create_campaign/index.tsx
+++ b/frontend/src/pages/create_campaign/index.tsx
@@ -234,6 +234,7 @@ const CreateCampaign = () => {
         questionsSend
       );
       await setCampaignCoverImage(campaignId, cover);
+      navigate("/admin");
     } catch (err) {
       if (err instanceof FetchError) {
         try {