From 71af99ddaf32502dce628803a08a5434bf3de291 Mon Sep 17 00:00:00 2001
From: Tyler Yu <tyleryy@uci.edu>
Date: Fri, 23 Feb 2024 05:30:48 -0800
Subject: [PATCH 1/2] feat: implmented subscribe toggle

---
 src/assets/logos/subscribe.svg | 14 +++++++++
 src/components/Home/Home.jsx   | 52 +++++++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 src/assets/logos/subscribe.svg

diff --git a/src/assets/logos/subscribe.svg b/src/assets/logos/subscribe.svg
new file mode 100644
index 0000000..f5981e2
--- /dev/null
+++ b/src/assets/logos/subscribe.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" height="800px" width="800px" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 75.294 75.294" xml:space="preserve">
+<g>
+	<path d="M66.097,12.089h-56.9C4.126,12.089,0,16.215,0,21.286v32.722c0,5.071,4.126,9.197,9.197,9.197h56.9
+		c5.071,0,9.197-4.126,9.197-9.197V21.287C75.295,16.215,71.169,12.089,66.097,12.089z M61.603,18.089L37.647,33.523L13.691,18.089
+		H61.603z M66.097,57.206h-56.9C7.434,57.206,6,55.771,6,54.009V21.457l29.796,19.16c0.04,0.025,0.083,0.042,0.124,0.065
+		c0.043,0.024,0.087,0.047,0.131,0.069c0.231,0.119,0.469,0.215,0.712,0.278c0.025,0.007,0.05,0.01,0.075,0.016
+		c0.267,0.063,0.537,0.102,0.807,0.102c0.001,0,0.002,0,0.002,0c0.002,0,0.003,0,0.004,0c0.27,0,0.54-0.038,0.807-0.102
+		c0.025-0.006,0.05-0.009,0.075-0.016c0.243-0.063,0.48-0.159,0.712-0.278c0.044-0.022,0.088-0.045,0.131-0.069
+		c0.041-0.023,0.084-0.04,0.124-0.065l29.796-19.16v32.551C69.295,55.771,67.86,57.206,66.097,57.206z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/src/components/Home/Home.jsx b/src/components/Home/Home.jsx
index fb57a40..7ab2fd6 100644
--- a/src/components/Home/Home.jsx
+++ b/src/components/Home/Home.jsx
@@ -35,6 +35,7 @@ import { SettingsIcon, StarIcon } from "@chakra-ui/icons";
 import upload from "../../assets/images/download.png";
 
 import logout from "../../assets/logos/logout.svg";
+import subscribe from "../../assets/logos/subscribe.svg";
 import unsubscribe from "../../assets/logos/unsubscribe.svg";
 import userlogo from "../../assets/logos/userlogo.svg";
 import yourposts from "../../assets/logos/yourposts.svg";
@@ -56,6 +57,9 @@ export default function Home() {
   const [leaderboard, setLeaderboard] = useState([]);
   const { user, logOut } = UserAuth();
   const [token, setToken] = useState("");
+
+  const [subscription, setSubscription] = useState(false);
+
   const btnRef = useRef();
 
   const toast = useToast();
@@ -120,14 +124,14 @@ export default function Home() {
     onClose: onLoginModalClose,
   } = useDisclosure();
 
-  const unsubscribeEmail = async (e) => {
+  const subscribeToggle = async (e) => {
     e.preventDefault();
     try {
       const result = await axios.patch(
         `${process.env.REACT_APP_AWS_BACKEND_URL}/leaderboard/changeSubscription`,
         {
           email: user.email,
-          subscription: false,
+          subscription: !subscription,
         },
         {
           headers: {
@@ -135,9 +139,11 @@ export default function Home() {
           },
         }
       );
-      console.log(result);
+      setSubscription(!subscription);
       toast({
-        title: "Succesfully Unsubscribed!",
+        title: subscribe
+          ? "Succesfully Subscribed!"
+          : "Succesfully Unsubscribed!", // just switched subscription
         description: "You have been unsubscribed from the ZotNFound Newsletter",
         status: "success",
         duration: 5000,
@@ -201,7 +207,7 @@ export default function Home() {
     const getLeaderboard = async () => {
       try {
         const { data: leaderboardData } = await axios.get(
-          `${process.env.REACT_APP_AWS_BACKEND_URL}/leaderboard/`
+          `${process.env.REACT_APP_AWS_BACKEND_URL}/leaderboard`
         );
         setLeaderboard(
           leaderboardData.map((item) => ({ ...item, id: item.id }))
@@ -210,6 +216,10 @@ export default function Home() {
         const userEmailExists = leaderboardData.some(
           (entry) => entry.email === user?.email
         );
+        const userSubscription = leaderboardData.some(
+          (entry) => entry.subscription === true
+        );
+        setSubscription(userSubscription);
         // If it does not exist, add the user to the leaderboard
         if (!userEmailExists && user) {
           // added user to prevent race condition (user is undefined before auth resolves)
@@ -227,7 +237,7 @@ export default function Home() {
           );
           // Fetch the leaderboard again after insertion
           const { data: updatedLeaderboardData } = await axios.get(
-            `${process.env.REACT_APP_AWS_BACKEND_URL}/leaderboard/`
+            `${process.env.REACT_APP_AWS_BACKEND_URL}/leaderboard`
           );
           setLeaderboard(
             updatedLeaderboardData.map((item) => ({ ...item, id: item.id }))
@@ -369,14 +379,28 @@ export default function Home() {
                     Your Posts
                   </MenuItem>
 
-                  <MenuItem onClick={unsubscribeEmail}>
-                    <Image
-                      boxSize="1.2rem"
-                      src={unsubscribe}
-                      alt="unsubscribe from newsletter button"
-                      mr="12px"
-                    />
-                    Unsubscribe
+                  <MenuItem onClick={subscribeToggle}>
+                    {subscription ? (
+                      <>
+                        <Image
+                          boxSize="1.2rem"
+                          src={subscribe}
+                          alt="unsubscribe from newsletter button"
+                          mr="12px"
+                        />
+                        Subscribe
+                      </>
+                    ) : (
+                      <>
+                        <Image
+                          boxSize="1.2rem"
+                          src={unsubscribe}
+                          alt="unsubscribe from newsletter button"
+                          mr="12px"
+                        />
+                        Unsubscribe
+                      </>
+                    )}
                   </MenuItem>
 
                   <MenuItem onClick={handleLogout}>

From e87502c4c27b5a1c973780eeef7640deeeb86249 Mon Sep 17 00:00:00 2001
From: Steven Zhou <stevenzhouni@gmail.com>
Date: Tue, 27 Feb 2024 01:30:12 -0800
Subject: [PATCH 2/2] fixed subscription state and patch

---
 src/components/Home/Home.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Home/Home.jsx b/src/components/Home/Home.jsx
index 7ab2fd6..575a572 100644
--- a/src/components/Home/Home.jsx
+++ b/src/components/Home/Home.jsx
@@ -131,7 +131,7 @@ export default function Home() {
         `${process.env.REACT_APP_AWS_BACKEND_URL}/leaderboard/changeSubscription`,
         {
           email: user.email,
-          subscription: !subscription,
+          subscription: subscription,
         },
         {
           headers: {
@@ -141,7 +141,7 @@ export default function Home() {
       );
       setSubscription(!subscription);
       toast({
-        title: subscribe
+        title: subscription
           ? "Succesfully Subscribed!"
           : "Succesfully Unsubscribed!", // just switched subscription
         description: "You have been unsubscribed from the ZotNFound Newsletter",