diff --git a/src/App.tsx b/src/App.tsx index 8c3323a..da9ab18 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -4,9 +4,9 @@ import { ThemeProvider } from "@/contexts/ThemeContext"; import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; import { AnimatePresence } from "framer-motion"; import { BrowserRouter, Route, Routes, useLocation } from "react-router-dom"; + import ScrollToTop from "./components/home/ScrollToTop"; -import OverviewPage from "./pages/admins/components/dashboards/OverviewPage"; -import ManageProject from "./pages/admins/components/projects/ManageProject"; +import ManageProject from "./components/admin/projects/ManageProject"; import DashboardLayout from "./pages/admins/layout/DashboardLayout"; import MainLayout from "./pages/admins/layout/MainLayout"; import Index from "./pages/Index"; @@ -14,8 +14,9 @@ import NotFound from "./pages/NotFound"; import { PrivacyPolicy } from "./pages/PrivacyPolicy"; import ProjectDetails from "./pages/ProjectDetails"; import Projects from "./pages/Projects"; -import { QueryProvider } from "./provider/QueryProvider"; import Technologies from "./pages/Technologies"; +import { QueryProvider } from "./provider/QueryProvider"; +import OverviewPage from "./components/admin/dashboards/OverviewPage"; function AnimatedRoutes() { const location = useLocation(); @@ -28,7 +29,7 @@ function AnimatedRoutes() { } /> } /> } /> - }/> + } /> {/* } /> } /> */} {/* ADD ALL CUSTOM ROUTES ABOVE THE CATCH-ALL "*" ROUTE */} diff --git a/src/pages/admins/components/dashboards/OverviewPage.tsx b/src/components/admin/dashboards/OverviewPage.tsx similarity index 100% rename from src/pages/admins/components/dashboards/OverviewPage.tsx rename to src/components/admin/dashboards/OverviewPage.tsx diff --git a/src/pages/admins/components/dashboards/Sidebar.tsx b/src/components/admin/dashboards/Sidebar.tsx similarity index 100% rename from src/pages/admins/components/dashboards/Sidebar.tsx rename to src/components/admin/dashboards/Sidebar.tsx diff --git a/src/pages/admins/components/dashboards/Topbar.tsx b/src/components/admin/dashboards/Topbar.tsx similarity index 100% rename from src/pages/admins/components/dashboards/Topbar.tsx rename to src/components/admin/dashboards/Topbar.tsx diff --git a/src/pages/admins/components/projects/EditProjectModal.tsx b/src/components/admin/projects/EditProjectModal.tsx similarity index 99% rename from src/pages/admins/components/projects/EditProjectModal.tsx rename to src/components/admin/projects/EditProjectModal.tsx index 58ff9df..8299764 100644 --- a/src/pages/admins/components/projects/EditProjectModal.tsx +++ b/src/components/admin/projects/EditProjectModal.tsx @@ -12,7 +12,7 @@ export const EditProjectModal = ({ onSave: (data: Partial) => void; }) => { const [formData, setFormData] = useState({ - name: project.name, + name: project.title, shortDescription: project.description, previewUrl: project.liveLink, }); diff --git a/src/pages/admins/components/projects/ManageProject.tsx b/src/components/admin/projects/ManageProject.tsx similarity index 96% rename from src/pages/admins/components/projects/ManageProject.tsx rename to src/components/admin/projects/ManageProject.tsx index c6ee1d5..a8bb4df 100644 --- a/src/pages/admins/components/projects/ManageProject.tsx +++ b/src/components/admin/projects/ManageProject.tsx @@ -23,7 +23,7 @@ console.log("project data", projectsData?.data.data.result) const handleUpdate = (data: Partial) => { if (selectedProject) { updateMutation.mutate( - { id: selectedProject.id, data }, + { id: selectedProject._id, data }, { onSuccess: () => setSelectedProject(null), }, @@ -54,7 +54,7 @@ console.log("project data", projectsData?.data.data.result)
{projects.map((item) => (

- {project.name} + {project.title} {project.isFeatured && ( Featured @@ -41,7 +41,7 @@ export const ProjectCard = ({ project, onEdit, onDelete }: ProjectCardProps) =>

); -} \ No newline at end of file +} diff --git a/src/types/projects.type.ts b/src/types/projects.type.ts index 821afbf..98a722a 100644 --- a/src/types/projects.type.ts +++ b/src/types/projects.type.ts @@ -2,22 +2,22 @@ import { ProjectCategory } from "@/enums/projectCategory"; import { ProjectStatus } from "@/enums/projectStatus"; export type T_projects = { - id:string; - name: string; - description: string; - thumbnail?: string; - images?: string[]; - category: ProjectCategory; - githubLink: string; - liveLink?: string; - technologies: string[]; - companyName: string; - completionYear?: number; - isFeatured: boolean; - status: ProjectStatus; - createdAt: Date; - updatedAt: Date; -} + _id: string; + title: string; + description: string; + thumbnail?: string; + images?: string[]; + category: ProjectCategory; + githubLink: string; + liveLink?: string; + technologies: string[]; + companyName: string; + completionYear?: number; + isFeatured: boolean; + status: ProjectStatus; + createdAt: Date; + updatedAt: Date; +}; /** * _id:string; title: string; @@ -68,4 +68,4 @@ export type T_projects = { "Responsive UI" ] } - */ \ No newline at end of file + */