diff --git a/src/Layout/SidebarAdmin.tsx b/src/Layout/SidebarAdmin.tsx
index 8e94876..3397d57 100644
--- a/src/Layout/SidebarAdmin.tsx
+++ b/src/Layout/SidebarAdmin.tsx
@@ -166,6 +166,31 @@ const SidebarAdmin = () => {
+ Feedback
navigate("/mentor-admin")}
+ >
+
+
+
Mentor
+ {
+ const navigate = useNavigate();
+ const { createMentor, loading, error } = useCreateMentor();
+
+ const [form, setForm] = useState>({
+ nama_depan: "",
+ nama_belakang: "",
+ full_name: "",
+ email: "",
+ password: "",
+ signature: "",
+ professional_bio: "",
+ });
+
+ const [profilePicture, setProfilePicture] = useState(null);
+ const [preview, setPreview] = useState(null);
+
+ const handleChange = (
+ e: React.ChangeEvent
+ ) => {
+ const { name, value } = e.target;
+ setForm((prev) => ({ ...prev, [name]: value }));
+ };
+
+ const handleFileChange = (e: React.ChangeEvent) => {
+ const file = e.target.files?.[0] ?? null;
+ setProfilePicture(file);
+ if (file) {
+ setPreview(URL.createObjectURL(file));
+ } else {
+ setPreview(null);
+ }
+ };
+
+ const handleSubmit = async (e: React.FormEvent) => {
+ e.preventDefault();
+ const payload: CreateMentorPayload = {
+ ...form,
+ full_name: `${form.nama_depan} ${form.nama_belakang}`.trim(),
+ ...(profilePicture ? { profile_picture: profilePicture } : {}),
+ };
+
+ const result = await createMentor(payload);
+ if (result) {
+ alert("Mentor berhasil dibuat!");
+ navigate("/mentor-admin");
+ }
+ };
+
+ return (
+ (null);
+ const [preview, setPreview] = useState(null);
+
+ // Populate form once mentor data is loaded
+ useEffect(() => {
+ if (mentor) {
+ setForm({
+ nama_depan: mentor.nama_depan ?? "",
+ nama_belakang: mentor.nama_belakang ?? "",
+ email: mentor.email ?? "",
+ password: "",
+ signature: mentor.signature ?? "",
+ professional_bio: mentor.professional_bio ?? "",
+ });
+ if (mentor.profile_picture) {
+ setPreview(mentor.profile_picture);
+ }
+ }
+ }, [mentor]);
+
+ const handleChange = (
+ e: React.ChangeEvent
+ ) => {
+ const { name, value } = e.target;
+ setForm((prev) => ({ ...prev, [name]: value }));
+ };
+
+ const handleFileChange = (e: React.ChangeEvent) => {
+ const file = e.target.files?.[0] ?? null;
+ setProfilePicture(file);
+ if (file) {
+ setPreview(URL.createObjectURL(file));
+ }
+ };
+
+ const handleSubmit = async (e: React.FormEvent) => {
+ e.preventDefault();
+ if (!mentorId) return;
+
+ const payload: UpdateMentorPayload = {
+ nama_depan: form.nama_depan || undefined,
+ nama_belakang: form.nama_belakang || undefined,
+ email: form.email || undefined,
+ signature: form.signature || undefined,
+ professional_bio: form.professional_bio || undefined,
+ ...(form.password ? { password: form.password } : {}),
+ ...(profilePicture ? { profile_picture: profilePicture } : {}),
+ };
+
+ const result = await updateMentor(mentorId, payload);
+ if (result) {
+ alert("Data mentor berhasil diperbarui!");
+ navigate("/mentor-admin");
+ }
+ };
+
+ if (fetching) {
+ return (
+
- {/* OLDER */}
- {olderNotifs.length > 0 && (
-
+
+ );
+};
+
+export default CreateMentorForm;
diff --git a/src/Pages/EditMentorForm.tsx b/src/Pages/EditMentorForm.tsx
new file mode 100644
index 0000000..b45401b
--- /dev/null
+++ b/src/Pages/EditMentorForm.tsx
@@ -0,0 +1,272 @@
+import { useState, useEffect } from "react";
+import { useNavigate, useParams } from "react-router-dom";
+import NavbarAdmin from "../Layout/NavbarAdmin";
+import SidebarAdmin from "../Layout/SidebarAdmin";
+import { useMentorDetail, useUpdateMentor } from "../hooks/useMentors";
+import type { UpdateMentorPayload } from "../services/MentorServices";
+
+const EditMentorForm = () => {
+ const navigate = useNavigate();
+ const { id } = useParams<{ id: string }>();
+ const mentorId = id ? parseInt(id, 10) : null;
+
+ const { mentor, loading: fetching, error: fetchError } = useMentorDetail(mentorId);
+ const { updateMentor, loading: updating, error: updateError } = useUpdateMentor();
+
+ const [form, setForm] = useState({
+ nama_depan: "",
+ nama_belakang: "",
+ email: "",
+ password: "",
+ signature: "",
+ professional_bio: "",
+ });
+
+ const [profilePicture, setProfilePicture] = useState
+
+
+ {/* Header */}
+
+
+
+
+ {error && (
+
+
+
+ Tambah Mentor
+
+ {error}
+
+ )}
+
+
+
+
+ );
+ }
+
+ if (fetchError || !mentor) {
+ return (
+
+
+
+
+ Memuat data mentor...
+
+
+ );
+ }
+
+ return (
+
+
+
+
+ {fetchError ?? "Mentor tidak ditemukan."}
+
+
+ );
+};
+
+export default EditMentorForm;
diff --git a/src/Pages/MentorPage.tsx b/src/Pages/MentorPage.tsx
new file mode 100644
index 0000000..4afd3b2
--- /dev/null
+++ b/src/Pages/MentorPage.tsx
@@ -0,0 +1,137 @@
+import { useNavigate } from "react-router-dom";
+import NavbarAdmin from "../Layout/NavbarAdmin";
+import SidebarAdmin from "../Layout/SidebarAdmin";
+import { useMentors, useDeleteMentor } from "../hooks/useMentors";
+
+const MentorPage = () => {
+ const navigate = useNavigate();
+ const { mentors, loading, error, refetch } = useMentors();
+ const { deleteMentor, loading: deleting } = useDeleteMentor();
+
+ const handleDelete = async (id: number, name: string) => {
+ const confirmed = confirm(`Apakah Anda yakin ingin menghapus mentor "${name}"?`);
+ if (!confirmed) return;
+
+ const success = await deleteMentor(id);
+ if (success) {
+ alert("Mentor berhasil dihapus!");
+ refetch();
+ } else {
+ alert("Gagal menghapus mentor. Silakan coba lagi.");
+ }
+ };
+
+ return (
+
+
+
+ {/* Header */}
+
+
+
+
+ {updateError && (
+
+
+
+ Edit Mentor
++ Mengedit data: {mentor.full_name} +
+
+ {updateError}
+
+ )}
+
+
+
+
+ );
+};
+
+export default MentorPage;
\ No newline at end of file
diff --git a/src/Pages/internify/LoginInternify.tsx b/src/Pages/internify/LoginInternify.tsx
index facd508..7011bfc 100644
--- a/src/Pages/internify/LoginInternify.tsx
+++ b/src/Pages/internify/LoginInternify.tsx
@@ -17,7 +17,7 @@ const decodeJWT = (token: string) => {
export default function InternifyLogin() {
const navigate = useNavigate();
const [email, setEmail] = useState("");
- const [password, setPassword] = useState("");
+ const [password, setPassword] = useState("")
const [showPassword, setShowPassword] = useState(false);
const { login, loading, error, setError } = useLogin();
diff --git a/src/Pages/internify/NotificationList.tsx b/src/Pages/internify/NotificationList.tsx
index 0cb9720..1b97d5c 100644
--- a/src/Pages/internify/NotificationList.tsx
+++ b/src/Pages/internify/NotificationList.tsx
@@ -1,6 +1,6 @@
import { useState, useEffect } from "react";
import { Check, Download, Info } from "lucide-react";
-import { LuFileSpreadsheet } from "react-icons/lu"; // Alternatif icon task dari react-icons
+import { LuFileSpreadsheet } from "react-icons/lu";
import { io } from "socket.io-client";
import * as NotificationService from "../../services/NotificationService";
import type { UINotification, BackendNotification } from "../../types/notification.types";
@@ -72,10 +72,6 @@ export default function NotificationList() {
}
};
- if (false) {
- (handleMarkAllRead as any)();
- }
-
return (
+
+
+ {/* Header */}
+
+
+
+
+ {/* Loading / Error */}
+ {loading && (
+ Daftar Mentor
+ +Memuat data mentor...
+ )} + {error && ( +{error}
+ )} + + {/* Table */} + {!loading && !error && ( +
+
+
+
+
+ {mentors.length === 0 && (
+
+ )}
+ | No | +Nama Lengkap | +Role | +Aksi | +|
|---|---|---|---|---|
| {index + 1} | +{mentor.full_name} | +{mentor.email} | +{mentor.role} | ++ {/* Tombol Edit */} + + + {/* Tombol Hapus */} + + | +
Belum ada data mentor.
+ )} +
{/* Header */}
@@ -87,7 +83,7 @@ export default function NotificationList() {
-
- )}
);
diff --git a/src/Pages/internify/intern/InternClaimCert.tsx b/src/Pages/internify/intern/InternClaimCert.tsx
index a588137..e62f9e6 100644
--- a/src/Pages/internify/intern/InternClaimCert.tsx
+++ b/src/Pages/internify/intern/InternClaimCert.tsx
@@ -65,6 +65,7 @@ const SertificatePage = () => {
progress={progress}
remainingTasks={remainingTasks}
allTasksDone={allTasksDone}
+ project_id={project?.id}
/>
)}
diff --git a/src/Pages/internify/intern/components/CertificateNotAvailable.tsx b/src/Pages/internify/intern/components/CertificateNotAvailable.tsx
index 2704cb4..7d3a117 100644
--- a/src/Pages/internify/intern/components/CertificateNotAvailable.tsx
+++ b/src/Pages/internify/intern/components/CertificateNotAvailable.tsx
@@ -1,16 +1,27 @@
import { Clock, Lock, Award } from "lucide-react";
+import { useClaimCertificate } from "../../../../hooks/useSertificates";
interface CertificateNotAvailableProps {
progress: number;
remainingTasks: number;
allTasksDone?: boolean;
+ project_id?: number;
}
export default function CertificateNotAvailable({
progress,
remainingTasks,
allTasksDone = false,
+ project_id
}: CertificateNotAvailableProps) {
+
+ const { claim, loading, error } = useClaimCertificate();
+
+ const handleClaim = async () => {
+ if (!project_id) return;
+ await claim(project_id);
+ };
+
return (
Older
- {olderNotifs.map(n => renderNotifCard(n, true))} -
{/* Icon */}
@@ -59,9 +70,9 @@ export default function CertificateNotAvailable({
{/* Progress Bar */}
diff --git a/src/Pages/internify/intern/components/HomeHeader.tsx b/src/Pages/internify/intern/components/HomeHeader.tsx
index d709627..e92091b 100644
--- a/src/Pages/internify/intern/components/HomeHeader.tsx
+++ b/src/Pages/internify/intern/components/HomeHeader.tsx
@@ -17,7 +17,7 @@ const HomeHeader = () => {
return (
-
+
+
+
+ {error && - Selesaikan {remainingTasks} tugas lagi untuk membuka akses. -
++ Selesaikan {remainingTasks} tugas lagi untuk membuka akses. +
Progres Proyek
{progress}%
@@ -72,8 +83,17 @@ export default function CertificateNotAvailable({
style={{ width: `${progress}%` }}
/>
-
{error}
} )}
-
Hi, {name || "..."}!
+Hi, {name || "User"}!
Timeline
-
- {tasks.map((task) => {
+ {tasks.map((task, index) => {
const d = new Date(task.deadline_at);
d.setHours(0, 0, 0, 0);
const isToday = d.getTime() === today.getTime();
const isPast = d < today;
const active = isToday || isPast;
-
return (
-
+ {/* Vertical line ke bawah, kecuali item terakhir */}
+ {index < tasks.length - 1 && (
+
+ )}
{/* Dot */}
- {isToday ? 'Hari ini' : formatDate(task.deadline_at)} {/* ← format ISO string */} + {isToday ? 'Hari ini' : formatDate(task.deadline_at)}{task.title} diff --git a/src/Pages/internify/mentor/CertificateListPage.tsx b/src/Pages/internify/mentor/CertificateListPage.tsx index 4bd03ea..69cb675 100644 --- a/src/Pages/internify/mentor/CertificateListPage.tsx +++ b/src/Pages/internify/mentor/CertificateListPage.tsx @@ -2,6 +2,7 @@ import { useNavigate } from "react-router-dom"; import CertificateProjectCard from "./components/CertificateProjectCard"; import { useProjects } from "../../../hooks/useProjects"; + // ─── Main Page ──────────────────────────────────────────────────────────────── export default function CertificateList() { const navigate = useNavigate(); @@ -11,6 +12,13 @@ export default function CertificateList() { navigate(`/mentor/certificates/${slug}`); }; + if (loading){ +
on loading
+ } + + if (error){ +error: {error}
+ } return ({/* Page Header */} diff --git a/src/Pages/internify/mentor/MentorProjectDetailPage.tsx b/src/Pages/internify/mentor/MentorProjectDetailPage.tsx index 3762fde..34bd433 100644 --- a/src/Pages/internify/mentor/MentorProjectDetailPage.tsx +++ b/src/Pages/internify/mentor/MentorProjectDetailPage.tsx @@ -3,14 +3,27 @@ import { useState } from "react"; import { Calendar, Edit } from "lucide-react"; import EditSubmissionModal from "./components/EditSubmissionTask"; import { useTaskSubmissions } from "../../../hooks/useTasks"; +import type { ProjectTask } from "../../../types/task.types"; const toSlug = (name: string) => name.toLowerCase().replace(/\s+/g, '-'); export default function MentorProjectsDetailPage() { const navigate = useNavigate(); const { slug, taskSlug } = useParams<{ slug: string; taskSlug: string }>(); - const { task, loading, error } = useTaskSubmissions(taskSlug!, slug); + const { task, loading, error, refetch } = useTaskSubmissions(taskSlug!, slug); const [openModal, setOpenModal] = useState(false); + + // Di MentorProjectsDetailPage + const handleEditSuccess = (updatedTask: ProjectTask) => { + if (updatedTask.slug !== taskSlug) { + // Slug berubah, navigate ke URL baru + navigate(`/mentor/projects/${slug}/${updatedTask.slug}`, { replace: true }); + } else { + // Slug sama, cukup refetch + refetch(); + } + }; + if (loading) return ({[...Array(3)].map((_, i) => ( @@ -152,6 +165,8 @@ export default function MentorProjectsDetailPage() {diff --git a/src/Pages/internify/mentor/MentorSettingsPage.tsx b/src/Pages/internify/mentor/MentorSettingsPage.tsx index 7fea5ce..a973b91 100644 --- a/src/Pages/internify/mentor/MentorSettingsPage.tsx +++ b/src/Pages/internify/mentor/MentorSettingsPage.tsx @@ -14,19 +14,26 @@ export default function MentorSettingsPage() { // File state untuk profile_picture const [photoFile, setPhotoFile] = useStatesetOpenModal(false)} + task={task} + onSuccess={handleEditSuccess} /> )} (null); const [photoPreview, setPhotoPreview] = useState (null); + const [imageError, setImageError] = useState(false); const fileInputRef = useRef (null); // Sync form data ketika user sudah di-fetch useEffect(() => { if (user) { setFormData({ - fullName: user.full_name || "", + fullName: + user.full_name || + `${user.nama_depan ?? ""} ${user.nama_belakang ?? ""}`.trim() || + "", email: user.email || "", bio: user.professional_bio || "", }); if (user.profile_picture) { setPhotoPreview(user.profile_picture); + } else { + setPhotoPreview(null); } + setImageError(false); } }, [user]); @@ -48,6 +55,7 @@ export default function MentorSettingsPage() { const handleRemovePhoto = () => { setPhotoFile(null); setPhotoPreview(null); + setImageError(false); if (fileInputRef.current) fileInputRef.current.value = ""; }; @@ -62,6 +70,7 @@ export default function MentorSettingsPage() { // Reset file state setelah berhasil save if (!errorMsg) { setPhotoFile(null); + setImageError(false); } }; @@ -104,8 +113,13 @@ export default function MentorSettingsPage() { {/* Avatar dengan badge edit */} - {photoPreview ? ( -+ {photoPreview && !imageError ? ( +
(null); + const { update, loading, error } = useUpdateTask(); - // Form States - const [taskTitle, setTaskTitle] = useState(""); - const [description, setDescription] = useState(""); - const [deadlineDate, setDeadlineDate] = useState(""); - const [specificTime, setSpecificTime] = useState(""); - const [submissionType, setSubmissionType] = useState<"file" | "url">("file"); + // Form States — diinisialisasi dari props task + const [taskTitle, setTaskTitle] = useState(task.title); + const [description, setDescription] = useState(task.description); + const [deadlineDate, setDeadlineDate] = useState( + task.deadline_at ? task.deadline_at.split("T")[0] : "" + ); + const [specificTime, setSpecificTime] = useState( + task.deadline_at ? task.deadline_at.split("T")[1]?.slice(0, 5) ?? "" : "" + ); + const [submissionType, setSubmissionType] = useState (task.submission_type); + + // Sync form ketika task berubah (misal modal dibuka untuk task berbeda) + useEffect(() => { + setTaskTitle(task.title); + setDescription(task.description); + setDeadlineDate(task.deadline_at ? task.deadline_at.split("T")[0] : ""); + setSpecificTime(task.deadline_at ? task.deadline_at.split("T")[1]?.slice(0, 5) ?? "" : ""); + setSubmissionType(task.submission_type); + }, [task]); useEffect(() => { const dialog = dialogRef.current; @@ -41,12 +64,26 @@ export default function EditSubmissionModal({ isOpen, onClose }: EditTaskModalPr }; }, [isOpen, onClose]); - const handleSubmit = (e: React.FormEvent) => { + const handleSubmit = async (e: React.FormEvent) => { e.preventDefault(); - const payload = { taskTitle, description, deadlineDate, specificTime, submissionType }; - console.log("Saving Task:", payload); - alert("Task Saved Successfully!"); - onClose(); + + const payload: UpdateTaskPayload = {}; + + if (taskTitle.trim() !== task.title) payload.title = taskTitle.trim(); + if (description !== task.description) payload.description = description; + if (deadlineDate !== task.deadline_at.split("T")[0]) payload.deadline_date = deadlineDate; + if (specificTime !== (task.deadline_at.split("T")[1]?.slice(0, 5) ?? "")) payload.specific_time = specificTime; + if (submissionType !== task.submission_type) payload.submission_type = submissionType; + + if (Object.keys(payload).length === 0) { + onClose(); + return; + } + const result = await update(task.id, payload, String(task.id_project)); + if (result) { + onSuccess(result); + onClose(); + } }; return ( @@ -54,7 +91,7 @@ export default function EditSubmissionModal({ isOpen, onClose }: EditTaskModalPr {/* Header */} -Task
+Edit Task