ok

src/pages/Dashboard.js

@@ -848,14 +848,15 @@ const sortedMaterials = allMaterials.sort((a, b) => new Date(a.date) - new Date(
               <div className={styles.swipeContainer}>
                 <div className={styles.swipeCreditsContent}>
                   {['AI - MUHAMMAD AINUL FIKRI', 
-                    'BACKEND - ZADIT TAQWA W',
-                    'FRONTEND - NAUFAL UNGU W',
-                    'FRONTEND - PASHA UNGU W' ,
-                    'FRONTEND - ZADIT TAQWA W', 
-                    'UI/UX - LUNA CHELISA A', 
-                    'UI/UX - MAULINA AYU E', 
-                    'UI/UX - NUR ARINDA P', 
-                    'UI/UX - NAURA IZZATI B',].map((item, index) => (
+                    'BACKEND - ZADIT TAQWA W.',
+                    'FRONTEND - M. PASHA A. P.' ,
+                    'FRONTEND - NAUFAL DANIYAL P.',
+                    'FRONTEND - ZADIT TAQWA W.', 
+                    'UI/UX - KEVIN DWI WIJAYA', 
+                    'UI/UX - LUNA CHELISA A.', 
+                    'UI/UX - MAULINA AYU E.', 
+                    'UI/UX - NUR ARINDA P.', 
+                    'UI/UX - NAURA IZZATI B.',].map((item, index) => (
                     <div key={index} className={styles.swipeItem}>{item}</div>
                   ))}
                 </div>

src/pages/LinktreePage.module.css

@@ -103,42 +103,46 @@
 
   10%,
   15% {
-    transform: translateY(-11.1%);
+    transform: translateY(-10%);
   }
 
   20%,
   25% {
-    transform: translateY(-22.2%);
+    transform: translateY(-20%);
   }
 
   30%,
   35% {
-    transform: translateY(-33.3%);
+    transform: translateY(-30%);
   }
 
   40%,
   45% {
-    transform: translateY(-44.4%);
+    transform: translateY(-40%);
   }
   
   50%,
   55% {
-    transform: translateY(-55.5%);
+    transform: translateY(-50%);
   }
 
   60%,
   65% {
-    transform: translateY(-66.6%);
+    transform: translateY(-60%);
   }
 
   70%,
   75% {
-    transform: translateY(-77.7%);
+    transform: translateY(-70%);
   }
 
   80%,
   85% {
-    transform: translateY(-88.8%);
+    transform: translateY(-80%);
+  }
+  90%,
+  95% {
+    transform: translateY(-90%);
   }
 }
 /* Sub Heading */

src/pages/Reports.js

@@ -217,12 +217,13 @@ const App = ({ cafeId,
           selectedSwitch={["yesterday", "weekly", "monthly", "yearly"].indexOf(
             filter
           )}
-          borderColor={'#b3b1b1'}
+          bgColor={'#f4efe6'}
+          borderColor={'transparent'}
           borderWidth={0.1}
           onToggleCallback={onToggle}
-          fontColor={"black"}
+          fontColor={"#af9463"}
           selectedFontColor={"black"}
-          selectedSwitchColor={"rgb(197, 197, 197)"}
+          selectedSwitchColor={"white"}
           eachSwitchWidth={70}
           height={"25px"}
           fontSize={"12px"}
@@ -280,8 +281,8 @@ const App = ({ cafeId,
           >
             <div style={{ marginRight: "5px", fontSize: "1.2em" }}>ⓘ</div>
             <h6 style={{ margin: 0, textAlign: "left" }}>
-              Persentase pertumbuhan dihitung dengan membandingkan periode{" "}
-              {comparisonText} terakhir dengan {comparisonText} hari sebelumnya.
+              Persentase pertumbuhan dihitung dengan membandingkan {" "}
+              {comparisonText} hari terakhir dengan {comparisonText} hari sebelumnya.
             </h6>
           </div>
         </div>
@@ -320,7 +321,7 @@ const App = ({ cafeId,
             ))}
           </div>
         </div>
-        <BarChart transactionGraph={analytics?.transactionGraph} colors={colors}/>
+        <BarChart transactionGraph={analytics?.transactionGraph} type={analytics?.type} aggregatedReports={analytics?.aggregatedReports} colors={colors}/>
       </div>
       <div class="ItemLister_PaymentOption__YZlDL"><div style={{ marginTop: '20px' }} onClick={handleClose} class="ItemLister_Pay2Button__+MIxX">Kembali</div></div>
     </div>

src/pages/Transactions.module.css

@@ -26,11 +26,11 @@
   font-family: "Plus Jakarta Sans", sans-serif;
   font-weight: 500;
   font-style: normal;
-  font-size: 32px;
+  font-size: 6vw;
   color: black;
   text-align: left;
   margin-left: 20px;
-  margin-top: 40px;
+  margin-top: 57px;
 }
 
 .Transactions-detail {