Skip to content
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
4 changes: 4 additions & 0 deletions backend/src/main/java/com/taskflow/task/Task.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import com.taskflow.user.User;
import jakarta.persistence.*;
import org.hibernate.annotations.CreationTimestamp;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.annotations.UpdateTimestamp;
import org.hibernate.type.SqlTypes;

import java.time.LocalDate;
import java.time.OffsetDateTime;
Expand All @@ -24,10 +26,12 @@ public class Task {
@Column(columnDefinition = "TEXT")
private String description;

@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Enumerated(EnumType.STRING)
@Column(nullable = false, columnDefinition = "task_status")
private TaskStatus status;

@JdbcTypeCode(SqlTypes.NAMED_ENUM)
@Enumerated(EnumType.STRING)
@Column(nullable = false, columnDefinition = "task_priority")
private TaskPriority priority;
Expand Down
Empty file removed curl
Empty file.
89 changes: 53 additions & 36 deletions frontend/src/components/layout/Navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import React, { useState } from 'react';
import {
AppBar, Toolbar, Typography, Button, IconButton, Avatar,
Box, Tooltip, Switch, FormControlLabel,
Box, Tooltip, Dialog, DialogTitle, DialogContent, DialogActions,
} from '@mui/material';
import {
Assignment as AssignmentIcon,
Expand All @@ -17,48 +17,65 @@ const Navbar = () => {
const { user, logout } = useAuth();
const { mode, toggleMode } = useThemeMode();
const navigate = useNavigate();
const [logoutDialogOpen, setLogoutDialogOpen] = useState(false);

const handleLogout = () => {
const handleLogoutConfirm = () => {
setLogoutDialogOpen(false);
logout();
navigate('/login');
};

return (
<AppBar position="static" elevation={1}>
<Toolbar>
<AssignmentIcon sx={{ mr: 1 }} />
<Typography
variant="h6"
component="div"
sx={{ flexGrow: 1, cursor: 'pointer', fontWeight: 700 }}
onClick={() => navigate('/projects')}
>
TaskFlow
</Typography>
<>
<AppBar position="static" elevation={1}>
<Toolbar>
<AssignmentIcon sx={{ mr: 1 }} />
<Typography
variant="h6"
component="div"
sx={{ flexGrow: 1, cursor: 'pointer', fontWeight: 700 }}
onClick={() => navigate('/projects')}
>
TaskFlow
</Typography>

<Tooltip title={mode === 'dark' ? 'Switch to light mode' : 'Switch to dark mode'}>
<IconButton color="inherit" onClick={toggleMode} size="small" sx={{ mr: 1 }}>
{mode === 'dark' ? <Brightness7Icon /> : <Brightness4Icon />}
</IconButton>
</Tooltip>
<Tooltip title={mode === 'dark' ? 'Switch to light mode' : 'Switch to dark mode'}>
<IconButton color="inherit" onClick={toggleMode} size="small" sx={{ mr: 1 }}>
{mode === 'dark' ? <Brightness7Icon /> : <Brightness4Icon />}
</IconButton>
</Tooltip>

{user && (
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
<Avatar sx={{ width: 32, height: 32, bgcolor: 'secondary.main', fontSize: '0.875rem' }}>
{user.name.charAt(0).toUpperCase()}
</Avatar>
<Typography variant="body2" sx={{ display: { xs: 'none', sm: 'block' } }}>
{user.name}
</Typography>
<Tooltip title="Logout">
<IconButton color="inherit" onClick={handleLogout} size="small">
<LogoutIcon fontSize="small" />
</IconButton>
</Tooltip>
</Box>
)}
</Toolbar>
</AppBar>
{user && (
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
<Avatar sx={{ width: 32, height: 32, bgcolor: 'secondary.main', fontSize: '0.875rem' }}>
{user.name.charAt(0).toUpperCase()}
</Avatar>
<Typography variant="body2" sx={{ display: { xs: 'none', sm: 'block' } }}>
{user.name}
</Typography>
<Tooltip title="Logout">
<IconButton color="inherit" onClick={() => setLogoutDialogOpen(true)} size="small">
<LogoutIcon fontSize="small" />
</IconButton>
</Tooltip>
</Box>
)}
</Toolbar>
</AppBar>

<Dialog open={logoutDialogOpen} onClose={() => setLogoutDialogOpen(false)}>
<DialogTitle>Log out?</DialogTitle>
<DialogContent>
<Typography>Are you sure you want to log out?</Typography>
</DialogContent>
<DialogActions>
<Button onClick={() => setLogoutDialogOpen(false)}>Cancel</Button>
<Button color="error" variant="contained" onClick={handleLogoutConfirm}>
Log out
</Button>
</DialogActions>
</Dialog>
</>
);
};

Expand Down
Loading