Skip to content

Commit

Permalink
Merge pull request #180 from TogetherCrew/fix/csv-style-button
Browse files Browse the repository at this point in the history
change some icons and styles
  • Loading branch information
mehdi-torabiv authored Sep 8, 2023
2 parents 3862282 + bb93464 commit 8aea424
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 23 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/components/layouts/xs/SidebarXs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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}
>
Expand Down
1 change: 0 additions & 1 deletion src/layouts/defaultLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit 8aea424

Please sign in to comment.