Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎨 Improve styles #673

Merged
merged 4 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/components/Common/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import SidebarItems from './SidebarItems'
const Sidebar: React.FC = () => {
const queryClient = useQueryClient()
const bgColor = useColorModeValue('ui.white', 'ui.dark')
const textColor = useColorModeValue('ui.light', 'ui.white')
const textColor = useColorModeValue('ui.dark', 'ui.white')
const secBgColor = useColorModeValue('ui.secondary', 'ui.darkSlate')
const currentUser = queryClient.getQueryData<UserOut>('currentUser')
const { isOpen, onOpen, onClose } = useDisclosure()
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Common/SidebarItems.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface SidebarItemsProps {

const SidebarItems: React.FC<SidebarItemsProps> = ({ onClose }) => {
const queryClient = useQueryClient()
const textColor = useColorModeValue('ui.main', 'ui.light')
const textColor = useColorModeValue('ui.main', 'ui.white')
const bgActive = useColorModeValue('#E2E8F0', '#4A5568')
const currentUser = queryClient.getQueryData<UserOut>('currentUser')

Expand Down
68 changes: 0 additions & 68 deletions frontend/src/index.css

This file was deleted.

6 changes: 4 additions & 2 deletions frontend/src/routes/_layout/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Container, Text } from '@chakra-ui/react'
import { Box, Container, Text } from '@chakra-ui/react'
import { useQueryClient } from 'react-query'
import { createFileRoute } from '@tanstack/react-router'

Expand All @@ -15,11 +15,13 @@ function Dashboard() {

return (
<>
<Container maxW="full" pt={12}>
<Container maxW="full">
<Box pt={12} m={4}>
<Text fontSize="2xl">
Hi, {currentUser?.full_name || currentUser?.email} 👋🏼
</Text>
<Text>Welcome back, nice to see you again!</Text>
</Box>
</Container>
</>
)
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/theme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ const theme = extendTheme({
secondary: '#EDF2F7',
success: '#48BB78',
danger: '#E53E3E',
light: '#E2E8F0',
dark: '#1A202C',
white: '#FFFFFF',
dark: '#1A202C',
darkSlate: '#252D3D',
},
},
Expand Down
Loading