Skip to content

Commit

Permalink
chore: fix all icons (#163)
Browse files Browse the repository at this point in the history
  • Loading branch information
NicholasG04 authored Mar 21, 2022
1 parent cbadca4 commit 1e02312
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
8 changes: 3 additions & 5 deletions src/components/Home/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import {
Flex, Heading, Button, Box,
Icon,
Spinner,
Flex, Heading, Button, Box, Spinner,
} from '@chakra-ui/react';
import { SiMicrosoftoffice } from 'react-icons/si';
import { BsFillArrowDownCircleFill, BsArrowDownCircle } from 'react-icons/bs';
Expand All @@ -22,11 +20,11 @@ const Header: React.FC = () => {
{isLoading ? <Spinner />
: user ? (
<NextLink href="/panel">
<a><Button leftIcon={<Icon as={FaRegUser} color="white" boxSize={8} />} fontSize="24" p={8}>User Panel</Button></a>
<a><Button leftIcon={<FaRegUser />} fontSize="24" p={8}>User Panel</Button></a>
</NextLink>
)
: (
<Button onClick={signin} leftIcon={<Icon as={SiMicrosoftoffice} color="white" boxSize={8} />} fontSize="24" p={8}>Sign in with Office</Button>
<Button onClick={signin} leftIcon={<SiMicrosoftoffice />} fontSize="24" p={8}>Sign in with Office</Button>
)}
</Flex>
<Flex direction="row" mt="-30px" justify="center" zIndex={105} position="sticky" bottom={2}>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Nav/NavBar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {
Flex, Spacer, Button, Icon, Spinner,
Flex, Spacer, Button, Spinner,
} from '@chakra-ui/react';
import { FiLogIn } from 'react-icons/fi';
import { useUser } from '@supabase/supabase-auth-helpers/react';
Expand All @@ -20,7 +20,7 @@ const NavBar: React.FC = () => {
: user
? <SignedInMenu />
: (
<Button onClick={signin} leftIcon={<Icon as={FiLogIn} boxSize={6} />}>Sign in</Button>
<Button onClick={signin} leftIcon={<FiLogIn size={16} />}>Sign in</Button>
)}
</Flex>
);
Expand Down
3 changes: 2 additions & 1 deletion src/components/Nav/SignedInMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
} from '@chakra-ui/react';
import { useUser } from '@supabase/supabase-auth-helpers/react';
import { ChevronDownIcon } from '@chakra-ui/icons';
import { FaRegUser } from 'react-icons/fa';
import NextLink from 'next/link';
import { signout } from 'util/authHelpers';

Expand All @@ -16,7 +17,7 @@ const SignedInMenu = () => {
if (isLoading || !user) return <Spinner />;
return (
<Menu>
<MenuButton as={Button} rightIcon={<ChevronDownIcon />}>
<MenuButton as={Button} leftIcon={<FaRegUser />} rightIcon={<ChevronDownIcon />}>
{user.user_metadata.proper_name}
</MenuButton>
<MenuList>
Expand Down

1 comment on commit 1e02312

@vercel
Copy link

@vercel vercel bot commented on 1e02312 Mar 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.