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.

Sign up for GitHub

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

Jump to bottom

- Tasks Table #52

Merged
merged 3 commits into from
Sep 23, 2024
Merged

- Tasks Table #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8be8a2
- Tasks Table
malik-na Sep 18, 2024
7f2934f
Merge branch 'main' of https://github.com/malik-na/Daylight into test…
malik-na Sep 23, 2024
92480cc
- Dashboard layout complete
malik-na Sep 23, 2024
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
1,147 changes: 1,143 additions & 4 deletions frontend/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"dev": "vite",
"build": "tsc -b && vite build",
"lint": "eslint .",
"preview": "vite preview"
"preview": "vite preview",
"start": "react-scripts start --host 0.0.0.0"
},
"dependencies": {
"@emotion/react": "^11.13.3",
Expand All @@ -19,6 +20,8 @@
"@mui/styled-engine-sc": "^6.1.0",
"@mui/system": "^6.1.0",
"@mui/x-charts": "^7.17.0",
"@mui/x-data-grid": "^7.17.0",
"@mui/x-data-grid-generator": "^7.17.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.26.2",
Expand Down
8 changes: 5 additions & 3 deletions frontend/src/components/DashboardProjectsTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

type Order = "asc" | "desc";

function getComparator<Key extends keyof any>(

Check failure on line 85 in frontend/src/components/DashboardProjectsTable/index.tsx

View workflow job for this annotation

GitHub Actions / Analyze 

Unexpected any. Specify a different type
order: Order,
orderBy: Key
): (
Expand Down Expand Up @@ -331,7 +331,7 @@
const handleChangePage = (newPage: number) => {
setPage(newPage);
};
const handleChangeRowsPerPage = (event: any, newValue: number | null) => {

Check failure on line 334 in frontend/src/components/DashboardProjectsTable/index.tsx

View workflow job for this annotation

GitHub Actions / Analyze 

Unexpected any. Specify a different type
setRowsPerPage(parseInt(newValue!.toString(), 10));
setPage(0);
};
Expand All @@ -349,12 +349,14 @@
return (
<Sheet
variant="outlined"
sx={{ width: "75%", boxShadow: "sm", borderRadius: "sm" }}
sx={{
width: { xs: "100%", md: "75%" },
boxShadow: "sm",
borderRadius: "sm",
}}
>
<EnhancedTableToolbar numSelected={selected.length} />
<Table
stickyHeader
stickyFooter
aria-labelledby="tableTitle"
hoverRow
sx={{
Expand Down
8 changes: 6 additions & 2 deletions frontend/src/components/ProjectProgress/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Sheet } from "@mui/joy";
import { Sheet, Typography } from "@mui/joy";
import { Gauge, gaugeClasses } from "@mui/x-charts/Gauge";

const settings = {
Expand All @@ -12,7 +12,8 @@ export default function ProjectProgress() {
<Sheet
variant="outlined"
sx={{
width: 250,
width: "15.6rem",
height: { xs: "6.25rem", md: "21rem" },
borderRadius: "sm",
display: "flex",
flexDirection: "column",
Expand All @@ -21,6 +22,9 @@ export default function ProjectProgress() {
boxShadow: "sm",
}}
>
<Typography level="title-lg" py={2}>
Progress
</Typography>
<Gauge
{...settings}
cornerRadius="50%"
Expand Down
14 changes: 7 additions & 7 deletions frontend/src/components/Sidebar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import Stack from "@mui/joy/Stack";
import SearchRoundedIcon from "@mui/icons-material/SearchRounded";
import HomeRoundedIcon from "@mui/icons-material/HomeRounded";
import DashboardRoundedIcon from "@mui/icons-material/DashboardRounded";
import ShoppingCartRoundedIcon from "@mui/icons-material/ShoppingCartRounded";
import FolderIcon from "@mui/icons-material/Folder";
import AssignmentRoundedIcon from "@mui/icons-material/AssignmentRounded";
import QuestionAnswerRoundedIcon from "@mui/icons-material/QuestionAnswerRounded";
import GroupRoundedIcon from "@mui/icons-material/GroupRounded";
Expand Down Expand Up @@ -125,7 +125,7 @@ export default function Sidebar() {
<IconButton variant="soft" color="primary" size="sm">
<BrightnessAutoRoundedIcon />
</IconButton>
<Typography level="title-lg">Acme Co.</Typography>
<Typography level="title-lg">Daylight</Typography>
<ColorSchemeToggle sx={{ ml: "auto" }} />
</Box>
<Input
Expand Down Expand Up @@ -164,7 +164,7 @@ export default function Sidebar() {

<Link to="dashboard">
<ListItem>
<ListItemButton>
<ListItemButton selected>
<DashboardRoundedIcon />
<ListItemContent>
<Typography level="title-sm">Dashboard</Typography>
Expand All @@ -174,10 +174,10 @@ export default function Sidebar() {
</Link>

<ListItem>
<ListItemButton selected>
<ShoppingCartRoundedIcon />
<ListItemButton>
<FolderIcon />
<ListItemContent>
<Typography level="title-sm">Orders</Typography>
<Typography level="title-sm">Projects</Typography>
</ListItemContent>
</ListItemButton>
</ListItem>
Expand Down Expand Up @@ -241,7 +241,7 @@ export default function Sidebar() {
<ListItemButton onClick={() => setOpen(!open)}>
<GroupRoundedIcon />
<ListItemContent>
<Typography level="title-sm">Users</Typography>
<Typography level="title-sm">Teams</Typography>
</ListItemContent>
<KeyboardArrowDownIcon
sx={[
Expand Down
Loading