Skip to content

Commit 8a5c95a

Browse files
authored
Merge pull request #69 from PentabyteDevAlign/refactor
Refactor
2 parents 08e6712 + 038a4ab commit 8a5c95a

23 files changed

Lines changed: 57 additions & 35 deletions

Frontend/src/components/ProjectDetails.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ import { useAuthStore } from "@/store/useAuthStore";
1010
import projectService from "../services/project.service";
1111
import { Button } from "@/components/ui/button";
1212
import { CircleCheckBig, Trash } from "lucide-react";
13+
import ConfirmDialog from "./ConfirmDialog";
14+
1315
import { toast } from "@/lib/toast";
1416
import Loading from "@/components/Loading";
15-
import ConfirmDialog from "./ConfirmDialog";
1617

1718
// ─── Utility Helpers ──────────────────────────────────────────────
1819
const getStatusColor = (status) => {

Frontend/src/components/UploadFile.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState, useRef } from "react";
22
import { Card, CardContent } from "@/components/ui/card";
3-
import { Button } from "@/components/ui/button";
3+
44
import {
55
Upload,
66
Image as ImageIcon,

Frontend/src/components/auth/SpecificRoleRoute.jsx

Lines changed: 0 additions & 9 deletions
This file was deleted.

Frontend/src/components/kanban/Column.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,10 @@ import {
5454
import api from "@/api/axios";
5555
import { useAssigneeStore } from "@/store/useAssigneeStore";
5656
import { SkillSelector } from "../SkillSelector";
57+
import { useAuthStore } from "@/store/useAuthStore";
58+
5759
import Loading from "@/components/Loading";
5860
import { toast } from "@/lib/toast";
59-
import { useAuthStore } from "@/store/useAuthStore";
6061

6162
const Column = ({
6263
projectId,

Frontend/src/components/kanban/TaskCard.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ import {
4949
} from "lucide-react";
5050
import { useAssigneeStore } from "@/store/useAssigneeStore";
5151
import api from "@/api/axios";
52+
import { useAuthStore } from "@/store/useAuthStore";
53+
5254
import Loading from "@/components/Loading";
5355
import { toast } from "@/lib/toast";
54-
import { useAuthStore } from "@/store/useAuthStore";
5556

5657
const TaskCard = ({ task, projectId }) => {
5758
const [openCalendar, setOpenCalendar] = useState(false);

Frontend/src/components/layouts/AppLayout.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { SidebarProvider, SidebarInset } from "@/components/ui/sidebar";
22
import AppSidebar from "@/components/layouts/AppSidebar";
33

44
import AppNavbar from "@/components/layouts/AppNavbar";
5-
import App from "@/App";
65

76
export default function Layout({ children }) {
87
return (

Frontend/src/components/layouts/AppSidebar.jsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,12 @@ import {
1919
PopoverTrigger,
2020
PopoverContent,
2121
} from "@/components/ui/popover";
22-
import { Badge } from "@/components/ui/badge";
2322

2423
import * as LucideIcons from "lucide-react";
2524
import { ChevronDown, ChevronRight, Loader2 } from "lucide-react";
2625
import logoIcon from "@/assets/img/LogoDevAlign.png";
27-
import { useAuthStore } from "@/store/useAuthStore";
2826

2927
export default function AppSidebar() {
30-
const { logout, name, role } = useAuthStore();
3128
const { state } = useSidebar();
3229
const [menus, setMenus] = useState([]);
3330
const [loading, setLoading] = useState(true);

Frontend/src/pages/HR/Dashboard.jsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
} from "@/services/dashboard.service";
1818
import projectService from "@/services/project.service";
1919
import EmployeeTable from "@/components/EmployeeTable";
20-
import Loading from "@/components/Loading";
2120
import {
2221
Card,
2322
CardHeader,
@@ -43,6 +42,9 @@ import {
4342
} from "lucide-react";
4443
import { cn } from "@/lib/utils";
4544

45+
import Loading from "@/components/Loading";
46+
import { toast } from "@/lib/toast";
47+
4648
export default function HRDashboard() {
4749
const [loadingState, setLoadingState] = useState(false);
4850
const [loadingText, setLoadingText] = useState("");
@@ -76,6 +78,9 @@ export default function HRDashboard() {
7678
setPositionsList(positions);
7779
} catch (err) {
7880
console.error("Error fetching initial data:", err);
81+
toast(err.response.data.message || "Error fetching initial data", {
82+
type: "error",
83+
});
7984
} finally {
8085
setLoadingState(false);
8186
setLoadingText("");
@@ -117,6 +122,9 @@ export default function HRDashboard() {
117122
setEmployees(sorted.slice(start, start + pageSize));
118123
} catch (err) {
119124
console.error("Failed to fetch employees", err);
125+
toast(err.response.data.message || "Failed to fetch employees", {
126+
type: "error",
127+
});
120128
} finally {
121129
setLoadingState(false);
122130
setLoadingText("");

Frontend/src/pages/HR/Employee/AddEmployee.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import api from "@/api/axios";
3131
import UploadFile from "@/components/UploadFile";
3232
import { SkillSelector } from "@/components/SkillSelector";
3333
import { PositionSelector } from "@/components/PositionSelector";
34-
import Loading from "@/components/Loading";
3534
import {
3635
ArrowLeft,
3736
FileText,
@@ -50,9 +49,11 @@ import {
5049
Medal,
5150
} from "lucide-react";
5251
import { cn } from "@/lib/utils";
53-
import { toast } from "@/lib/toast";
5452
import apiAI from "@/api/ai";
5553

54+
import { toast } from "@/lib/toast";
55+
import Loading from "@/components/Loading";
56+
5657
export default function AddEmployee() {
5758
const [skills, setSkills] = useState([]);
5859
const [calendarOpen, setCalendarOpen] = useState(false);

Frontend/src/pages/HR/Employee/EmployeeDetail.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import {
4747
Users,
4848
Loader2,
4949
} from "lucide-react";
50+
5051
import Loading from "@/components/Loading";
5152
import { toast } from "@/lib/toast";
5253

0 commit comments

Comments
 (0)