From bb93464e68115231138bea5dbe1e61203ae88231 Mon Sep 17 00:00:00 2001
From: zuies <zurabichkhikvadze66@gmail.com>
Date: Fri, 8 Sep 2023 16:48:22 +0300
Subject: [PATCH] change some icons and styles

---
 package-lock.json                                  | 14 +++++++-------
 package.json                                       |  2 +-
 src/components/layouts/xs/SidebarXs.tsx            |  4 ++--
 .../activeMembers/ActiveMemberBreakdown.tsx        |  8 ++++----
 .../DisengagedMembersCompositionBreakdown.tsx      |  8 ++++----
 .../OnboardingMembersBreakdown.tsx                 |  8 ++++----
 src/layouts/defaultLayout.tsx                      |  1 -
 7 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f20f5255..9709f409 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -49,7 +49,7 @@
         "react-force-graph-2d": "^1.25.0",
         "react-helmet-async": "^1.3.0",
         "react-hotjar": "^5.5.0",
-        "react-icons": "^4.6.0",
+        "react-icons": "^4.11.0",
         "react-modern-calendar-datepicker": "^3.1.6",
         "react-router-dom": "^6.4.3",
         "react-timezone-select": "^1.3.2",
@@ -10598,9 +10598,9 @@
       "integrity": "sha512-cXp1DKUruibmbSvCCRl4hXLagT7fVUiFJbpXtVDovVjNxooClf7ZXdkkzbATpPSU4+IuvYP773T4vXXnjrV3dg=="
     },
     "node_modules/react-icons": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.7.1.tgz",
-      "integrity": "sha512-yHd3oKGMgm7zxo3EA7H2n7vxSoiGmHk5t6Ou4bXsfcgWyhfDKMpyKfhHR6Bjnn63c+YXBLBPUql9H4wPJM6sXw==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.11.0.tgz",
+      "integrity": "sha512-V+4khzYcE5EBk/BvcuYRq6V/osf11ODUM2J8hg2FDSswRrGvqiYUYPRy4OdrWaQOBj4NcpJfmHZLNaD+VH0TyA==",
       "peerDependencies": {
         "react": "*"
       }
@@ -19812,9 +19812,9 @@
       "integrity": "sha512-cXp1DKUruibmbSvCCRl4hXLagT7fVUiFJbpXtVDovVjNxooClf7ZXdkkzbATpPSU4+IuvYP773T4vXXnjrV3dg=="
     },
     "react-icons": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.7.1.tgz",
-      "integrity": "sha512-yHd3oKGMgm7zxo3EA7H2n7vxSoiGmHk5t6Ou4bXsfcgWyhfDKMpyKfhHR6Bjnn63c+YXBLBPUql9H4wPJM6sXw==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.11.0.tgz",
+      "integrity": "sha512-V+4khzYcE5EBk/BvcuYRq6V/osf11ODUM2J8hg2FDSswRrGvqiYUYPRy4OdrWaQOBj4NcpJfmHZLNaD+VH0TyA==",
       "requires": {}
     },
     "react-is": {
diff --git a/package.json b/package.json
index 0f09a62c..f3b65d94 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "react-force-graph-2d": "^1.25.0",
     "react-helmet-async": "^1.3.0",
     "react-hotjar": "^5.5.0",
-    "react-icons": "^4.6.0",
+    "react-icons": "^4.11.0",
     "react-modern-calendar-datepicker": "^3.1.6",
     "react-router-dom": "^6.4.3",
     "react-timezone-select": "^1.3.2",
diff --git a/src/components/layouts/xs/SidebarXs.tsx b/src/components/layouts/xs/SidebarXs.tsx
index bed2f8be..7cf21649 100644
--- a/src/components/layouts/xs/SidebarXs.tsx
+++ b/src/components/layouts/xs/SidebarXs.tsx
@@ -20,7 +20,7 @@ import { useRouter } from 'next/router';
 import Link from 'next/link';
 import { Drawer } from '@mui/material';
 
-import { GoThreeBars } from 'react-icons/go';
+import { FaBars } from 'react-icons/fa';
 import { MdKeyboardBackspace } from 'react-icons/md';
 import useAppStore from '../../../store/useStore';
 import { StorageService } from '../../../services/StorageService';
@@ -127,7 +127,7 @@ const Sidebar = () => {
             <p className="text-md font-bold">{guildInfoByDiscord.name}</p>
           </div>
         </div>
-        <GoThreeBars size={30} onClick={handleDrawerOpen} />
+        <FaBars size={30} onClick={handleDrawerOpen} />
       </div>
       <Drawer
         variant="persistent"
diff --git a/src/components/pages/statistics/memberBreakdowns/activeMembers/ActiveMemberBreakdown.tsx b/src/components/pages/statistics/memberBreakdowns/activeMembers/ActiveMemberBreakdown.tsx
index 2e0568fe..e681917e 100644
--- a/src/components/pages/statistics/memberBreakdowns/activeMembers/ActiveMemberBreakdown.tsx
+++ b/src/components/pages/statistics/memberBreakdowns/activeMembers/ActiveMemberBreakdown.tsx
@@ -10,7 +10,7 @@ import {
 import CustomPagination from '../CustomPagination';
 import CustomButton from '../../../../global/CustomButton';
 import clsx from 'clsx';
-import { FaFileCsv } from 'react-icons/fa';
+import { BsFiletypeCsv } from 'react-icons/bs';
 import { Button } from '@mui/material';
 import {
   convertToCSV,
@@ -157,10 +157,10 @@ export default function ActiveMemberBreakdown() {
             Members breakdown
           </h3>
           <Button
-            startIcon={<FaFileCsv />}
+            startIcon={<BsFiletypeCsv />}
             size="small"
-            variant="contained"
-            className="bg-secondary text-white"
+            variant="outlined"
+            className="border-black text-black"
             disableElevation
             onClick={handleDownloadCSV}
           >
diff --git a/src/components/pages/statistics/memberBreakdowns/disengagedMembersComposition/DisengagedMembersCompositionBreakdown.tsx b/src/components/pages/statistics/memberBreakdowns/disengagedMembersComposition/DisengagedMembersCompositionBreakdown.tsx
index 0539a6a8..ed8b8cbb 100644
--- a/src/components/pages/statistics/memberBreakdowns/disengagedMembersComposition/DisengagedMembersCompositionBreakdown.tsx
+++ b/src/components/pages/statistics/memberBreakdowns/disengagedMembersComposition/DisengagedMembersCompositionBreakdown.tsx
@@ -11,7 +11,7 @@ import CustomPagination from '../CustomPagination';
 import CustomButton from '../../../../global/CustomButton';
 import clsx from 'clsx';
 import { Button } from '@mui/material';
-import { FaFileCsv } from 'react-icons/fa';
+import { BsFiletypeCsv } from 'react-icons/bs';
 import {
   convertToCSV,
   downloadCSVFile,
@@ -170,10 +170,10 @@ export default function DisengagedMembersCompositionBreakdown() {
             Members breakdown
           </h3>
           <Button
-            startIcon={<FaFileCsv />}
+            startIcon={<BsFiletypeCsv />}
             size="small"
-            variant="contained"
-            className="bg-secondary text-white"
+            variant="outlined"
+            className="border-black text-black"
             disableElevation
             onClick={handleDownloadCSV}
           >
diff --git a/src/components/pages/statistics/memberBreakdowns/onboardingMembers/OnboardingMembersBreakdown.tsx b/src/components/pages/statistics/memberBreakdowns/onboardingMembers/OnboardingMembersBreakdown.tsx
index c16ae939..dd0237b5 100644
--- a/src/components/pages/statistics/memberBreakdowns/onboardingMembers/OnboardingMembersBreakdown.tsx
+++ b/src/components/pages/statistics/memberBreakdowns/onboardingMembers/OnboardingMembersBreakdown.tsx
@@ -11,7 +11,7 @@ import CustomPagination from '../CustomPagination';
 import CustomButton from '../../../../global/CustomButton';
 import clsx from 'clsx';
 import { Button } from '@mui/material';
-import { FaFileCsv } from 'react-icons/fa';
+import { BsFiletypeCsv } from 'react-icons/bs';
 import {
   convertToCSV,
   downloadCSVFile,
@@ -158,10 +158,10 @@ export default function OnboardingMembersBreakdown() {
             Members breakdown
           </h3>
           <Button
-            startIcon={<FaFileCsv />}
+            startIcon={<BsFiletypeCsv />}
             size="small"
-            variant="contained"
-            className="bg-secondary text-white"
+            variant="outlined"
+            className="border-black text-black"
             disableElevation
             onClick={handleDownloadCSV}
           >
diff --git a/src/layouts/defaultLayout.tsx b/src/layouts/defaultLayout.tsx
index 86807f97..2aba59ca 100644
--- a/src/layouts/defaultLayout.tsx
+++ b/src/layouts/defaultLayout.tsx
@@ -3,7 +3,6 @@ import Sidebar from '../components/layouts/Sidebar';
 import SidebarXs from '../components/layouts/xs/SidebarXs';
 import useAppStore from '../store/useStore';
 import { StorageService } from '../services/StorageService';
-import { useRouter } from 'next/router';
 import { IUser } from '../utils/types';
 
 type Props = {