-
- Projects
-
-
- Architects design houses
-
-
- {projectsData.map(
- ({ img, title, description, tag, route, members }) => (
-
- setOpenAddModal(true);
+ const handleCloseAddModal = () => setOpenAddModal(false);
+
+ const handleOpenEditModal = (user) => {
+ setCurrentUser(user);
+ setOpenEditModal(true);
+ };
+
+ const handleCloseEditModal = () => {
+ setCurrentUser(null);
+ setOpenEditModal(false);
+ };
+
+ const fetchUsers = async () => {
+ try {
+ setLoading(true);
+ const response = await apiClient.get("/Users");
+ setUsers(response.data);
+ setError(null);
+ } catch (err) {
+ setError("Kullanıcı verileri yüklenirken bir hata oluştu.");
+ console.error(err);
+ // Hata mesajını sessizce konsola yazabilir veya toast ile gösterebiliriz
+ // toast.error("Veriler yüklenirken hata oluştu.");
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ useEffect(() => {
+ fetchUsers();
+ }, []);
+
+ // --- MERKEZİ VERİ VE MESAJ YÖNETİMİ ---
+ const handleDataChange = (message) => {
+ // 1. Listeyi yenile
+ fetchUsers();
+
+ // 2. Mesaj varsa Toast göster
+ if(message) {
+ toast.success(message, {
+ position: "top-right",
+ autoClose: 3000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ theme: "light",
+ });
+ }
+ };
+
+
+
+ // Ekleme işlemi bitince bu çalışacak
+ const onUserAddedCallback = () => {
+ handleDataChange("Kullanıcı başarıyla eklendi.");
+ };
+
+ // Güncelleme işlemi bitince bu çalışacak
+ const onUserUpdatedCallback = () => {
+ handleDataChange("Kullanıcı bilgileri başarıyla güncellendi.");
+ };
+
+
+ // --- SİLME İŞLEMLERİ ---
+ const handleDeleteToast = (userId, userName) => {
+ toast.warn(
+
+
+ **{userName}** adlı kullanıcıyı silmek istediğinizden emin misiniz?
+
+
+
+
+
+
Kullanıcılar Yükleniyor...
;
+ if (error) return {error}
;
+
+ return (
+ <>
+
+
+
+
+
+
+
+ Kullanıcılar
+
-
-
- {tag}
-
-
- {title}
-
-
- {description}
-
+
+
+
+
+ {["Tam Ad", "Plaka", "Telefon", "İşlem"].map((el) => (
+ |
+ {el}
+ |
+ ))}
+
+
+
+ {users.map((user) => (
+
+ |
+ {user.fullName}
+ |
+
+ {user.licensePlate || "-"}
+ |
+
+ {user.phoneNumber || "-"}
+ |
+
+
+ {
+ e.preventDefault();
+ handleOpenEditModal(user);
+ }}
+ >
+ Düzenle
+
+
+ {
+ e.preventDefault();
+ handleDeleteToast(user.id, user.fullName);
+ }}
+ >
+ Sil
+
+
+ |
+
+ ))}
+
+
-
-
-
-
-
- {members.map(({ img, name }, key) => (
-
-
-
- ))}
-
- )
- )}
+
-
-
-
- );
+
+ );
}
-export default Profile;
+export default Profile;
\ No newline at end of file
diff --git a/src/pages/dashboard/queuemanagementpage.jsx b/src/pages/dashboard/queuemanagementpage.jsx
new file mode 100644
index 00000000..031a0f02
--- /dev/null
+++ b/src/pages/dashboard/queuemanagementpage.jsx
@@ -0,0 +1,233 @@
+import React, { useState, useEffect, useMemo } from "react";
+import {
+ Typography,
+ Card,
+ CardHeader,
+ CardBody,
+ Button,
+ Select,
+ Option,
+ List,
+ ListItem,
+} from "@material-tailwind/react";
+import apiClient from "@/api/axiosConfig";
+import { HubConnectionBuilder, LogLevel } from "@microsoft/signalr";
+
+export function QueueManagementPage() {
+ const [routes, setRoutes] = useState([]);
+ const [allVehicles, setAllVehicles] = useState([]);
+ const [selectedRoute, setSelectedRoute] = useState(null);
+ const [queuedVehicles, setQueuedVehicles] = useState([]);
+ const [vehicleToAdd, setVehicleToAdd] = useState("");
+ const [loadingQueue, setLoadingQueue] = useState(false);
+
+ // IP Adresine dikkat (https/http ve port)
+ const HUB_URL = "https://localhost:7093/hubs/queue";
+
+ const fetchBaseData = async () => {
+ try {
+ const [routesRes, vehiclesRes] = await Promise.all([
+ apiClient.get("/admin/routes"),
+ apiClient.get("/admin/vehicles"),
+ ]);
+ setRoutes(routesRes.data);
+ setAllVehicles(vehiclesRes.data);
+ } catch (error) {
+ console.error("Veri hatası:", error);
+ }
+ };
+
+ const fetchQueueData = async () => {
+ if (!selectedRoute) return;
+ setLoadingQueue(true);
+ try {
+ const response = await apiClient.get(`/routes/${selectedRoute.id}/queue`);
+ setQueuedVehicles(response.data);
+ } catch (error) {
+ setQueuedVehicles([]);
+ } finally {
+ setLoadingQueue(false);
+ }
+ };
+
+ useEffect(() => {
+ fetchBaseData();
+ const connection = new HubConnectionBuilder()
+ .withUrl(HUB_URL)
+ .withAutomaticReconnect()
+ .configureLogging(LogLevel.Information)
+ .build();
+
+ connection.start()
+ .then(() => {
+ console.log("🟢 Admin Paneli: SignalR Bağlandı!");
+ connection.on("ReceiveQueueUpdate", () => {
+ console.log("🔔 Veri güncelleme sinyali alındı.");
+ fetchBaseData();
+ });
+ })
+ .catch(err => console.error("🔴 Bağlantı Hatası:", err));
+
+ return () => connection.stop();
+ }, []);
+
+ useEffect(() => {
+ fetchQueueData();
+ setVehicleToAdd("");
+ }, [selectedRoute]);
+
+ useEffect(() => {
+ const connection = new HubConnectionBuilder()
+ .withUrl(HUB_URL)
+ .withAutomaticReconnect()
+ .build();
+
+ connection.start().then(() => {
+ connection.on("ReceiveQueueUpdate", () => {
+ if (selectedRoute) {
+ apiClient.get(`/routes/${selectedRoute.id}/queue`)
+ .then(res => setQueuedVehicles(res.data))
+ .catch(() => {});
+ }
+ fetchBaseData();
+ });
+ });
+
+ return () => connection.stop();
+ }, [selectedRoute]);
+
+ const handleAddVehicleToQueue = async () => {
+ if (!vehicleToAdd || !selectedRoute) return;
+ try {
+ await apiClient.post(`/routes/${selectedRoute.id}/queue`, { vehicleId: vehicleToAdd });
+ setVehicleToAdd("");
+ } catch (error) {
+ alert(error.response?.data || "Hata.");
+ }
+ };
+
+ const handleRemoveVehicleFromQueue = async (vehicleId) => {
+ if (window.confirm("Emin misiniz?")) {
+ try {
+ await apiClient.delete(`/routes/${selectedRoute.id}/queue/${vehicleId}`);
+ } catch (error) {
+ alert("Hata.");
+ }
+ }
+ };
+
+ // --- DÜZELTME YAPILAN KISIM ---
+ const availableVehicles = useMemo(() => {
+ const queuedIds = new Set(queuedVehicles.map((v) => v.id));
+
+ // Sadece (Kuyrukta Olmayan) VE (Aktif Olan) araçları getir
+ return allVehicles.filter((v) => !queuedIds.has(v.id) && v.isActive);
+
+ }, [allVehicles, queuedVehicles]);
+ // -----------------------------
+
+ const selectKey = selectedRoute
+ ? `select-${selectedRoute.id}-${availableVehicles.length}`
+ : "empty";
+
+ return (
+
+
+
+ Güzergah Sıra Yönetimi
+
+
+ {/* SOL PANEL */}
+
+ Güzergah Seçin
+
+
+ {routes.map((route) => (
+ setSelectedRoute(route)}
+ selected={selectedRoute?.id === route.id}
+ >
+ {route.routeName}
+
+ ))}
+
+
+
+
+ {/* SAĞ PANEL */}
+
+ {!selectedRoute ? (
+
+ Lütfen güzergah seçin
+
+ ) : (
+
+
+ Sıradaki Araçlar: {selectedRoute.routeName}
+
+
+
+
+
+
+ {["Sıra", "Plaka", "Şoför", "İşlem"].map((h) => (
+ |
+ {h}
+ |
+ ))}
+
+
+
+ {loadingQueue ? (
+ | Yükleniyor... |
+ ) : (
+ queuedVehicles.map((vehicle, index) => (
+
+ | #{index + 1} |
+ {vehicle.licensePlate} |
+ {vehicle.userFullName} |
+
+
+ |
+
+ ))
+ )}
+
+
+
+
+
+
+
+
+
+
+ {availableVehicles.length === 0 && (
+
* Eklenecek uygun (aktif) araç bulunamadı.
+ )}
+
+ )}
+
+
+ );
+}
+
+export default QueueManagementPage;
\ No newline at end of file
diff --git a/src/pages/dashboard/tables.jsx b/src/pages/dashboard/tables.jsx
index 3d453ed7..3f1fcc3c 100644
--- a/src/pages/dashboard/tables.jsx
+++ b/src/pages/dashboard/tables.jsx
@@ -1,221 +1,297 @@
+import React, { useState, useEffect } from "react";
import {
Card,
CardHeader,
CardBody,
Typography,
- Avatar,
+ Button,
Chip,
- Tooltip,
- Progress,
+ Tooltip
} from "@material-tailwind/react";
-import { EllipsisVerticalIcon } from "@heroicons/react/24/outline";
-import { authorsTableData, projectsTableData } from "@/data";
+import {
+ ExclamationTriangleIcon,
+ ArchiveBoxXMarkIcon,
+ EyeSlashIcon
+} from "@heroicons/react/24/solid";
+import { ToastContainer, toast } from 'react-toastify';
+import 'react-toastify/dist/ReactToastify.css';
+
+import apiClient from "../../api/axiosConfig.js";
+import { AddVehicleModal } from "@/widgets/layout/AddVehicleModal";
+import { EditVehicleModal } from "@/widgets/layout/EditVehicleModal";
+
+// --- YARDIMCI FONKSİYON ---
+const toTitleCase = (str) => {
+ if (!str) return "";
+ return str
+ .toLowerCase()
+ .split(' ')
+ .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+ .join(' ');
+};
export function Tables() {
+ const [vehicles, setVehicles] = useState([]);
+ const [idleVehicles, setIdleVehicles] = useState([]);
+
+ // Modal State'leri
+ const [addModalOpen, setAddModalOpen] = useState(false);
+ const handleOpenAddModal = () => setAddModalOpen(!addModalOpen);
+
+ const [editModalOpen, setEditModalOpen] = useState(false);
+ const [currentVehicle, setCurrentVehicle] = useState(null);
+
+ const handleOpenEditModal = (vehicle) => {
+ setCurrentVehicle(vehicle);
+ setEditModalOpen(true);
+ };
+
+ const handleCloseEditModal = () => {
+ setEditModalOpen(false);
+ setCurrentVehicle(null);
+ }
+
+ // --- VERİ ÇEKME ---
+ const fetchVehicles = async () => {
+ try {
+ const response = await apiClient.get("/admin/vehicles");
+ setVehicles(response.data);
+ } catch (error) {
+ console.error("Hata:", error);
+ toast.error("Araç listesi yüklenemedi.");
+ }
+ };
+
+ const fetchIdleVehicles = async () => {
+ try {
+ // Backend endpoint'i (Varsayılan 7 gün)
+ const response = await apiClient.get("/admin/vehicles/idle-warnings?days=0");
+ setIdleVehicles(response.data);
+ } catch (error) {
+ console.error("Uyarı verisi çekilemedi:", error);
+ }
+ };
+
+ useEffect(() => {
+ fetchVehicles();
+ fetchIdleVehicles();
+ }, []);
+
+ const handleDataChange = (message) => {
+ fetchVehicles();
+ fetchIdleVehicles();
+ if(message) toast.success(message, { position: "top-right", autoClose: 3000 });
+ };
+
+ // --- AKSİYONLAR (UYARI TABLOSU) ---
+ const handleSetPassive = async (vehicle) => {
+ try {
+ await apiClient.patch(`/admin/vehicles/${vehicle.id}/set-active`, { isActive: false });
+ toast.info(`${vehicle.licensePlate} pasife alındı.`);
+ setIdleVehicles(prev => prev.filter(v => v.id !== vehicle.id));
+ fetchVehicles();
+ } catch (error) {
+ toast.error("İşlem başarısız.");
+ }
+ };
+
+ const handleIgnoreWarning = (vehicleId) => {
+ setIdleVehicles(prev => prev.filter(v => v.id !== vehicleId));
+ toast.success("Uyarı listeden kaldırıldı.", { autoClose: 1000 });
+ };
+
+ // --- SİLME (ANA TABLO) ---
+ const handleDeleteToast = (id, plaka) => {
+ toast.warn(
+
+
**{plaka}** silinsin mi?
+
+
+
+
+
,
+ { position: "top-center", autoClose: false, closeOnClick: false }
+ );
+ };
+
+ const confirmDelete = async (id, plaka) => {
+ toast.dismiss();
+ try {
+ await apiClient.delete(`/admin/vehicles/${id}`);
+ handleDataChange(`${plaka} silindi.`);
+ } catch (error) {
+ toast.error("Silme işlemi başarısız.");
+ }
+ };
+
return (
-
-
-
-
- Authors Table
-
-
-
-
-
-
- {["author", "function", "status", "employed", ""].map((el) => (
- |
-
- {el}
-
- |
- ))}
-
-
-
- {authorsTableData.map(
- ({ img, name, email, job, online, date }, key) => {
- const className = `py-3 px-5 ${
- key === authorsTableData.length - 1
- ? ""
- : "border-b border-blue-gray-50"
- }`;
+ <>
+
+
+ handleDataChange()}
+ />
+ handleDataChange()}
+ vehicleToEdit={currentVehicle}
+ />
+
+
+ {/* ==========================
+ 1. ANA ARAÇ TABLOSU
+ ========================== */}
+
+
+ Araç Listesi
+
+
+
+
+
+
+ {["Plaka", "Şoför Adı", "Telefon", "Durum", "İşlem"].map((el) => (
+ |
+ {el}
+ |
+ ))}
+
+
+
+ {vehicles.map((vehicle, key) => {
+ const className = `py-3 px-5 ${key === vehicles.length - 1 ? "" : "border-b border-blue-gray-50"}`;
return (
-
-
-
-
-
-
- {name}
-
-
- {email}
-
+
+ |
+ {vehicle.licensePlate}
+ |
+
+ {toTitleCase(vehicle.driverName)}
+ |
+
+ {vehicle.phoneNumber || "-"}
+ |
+
+
+ |
+
+
+
+
-
- |
-
-
- {job[0]}
-
-
- {job[1]}
-
- |
-
-
- |
-
-
- {date}
-
- |
-
-
- Edit
-
- |
-
+ |
+
);
- }
- )}
-
-
-
-
-
-
-
- Projects Table
-
-
-
-
-
-
- {["companies", "members", "budget", "completion", ""].map(
- (el) => (
- |
-
- {el}
-
- |
- )
- )}
-
-
-
- {projectsTableData.map(
- ({ img, name, members, budget, completion }, key) => {
- const className = `py-3 px-5 ${
- key === projectsTableData.length - 1
- ? ""
- : "border-b border-blue-gray-50"
- }`;
+ })}
+ {vehicles.length === 0 && | Kayıtlı araç yok. |
}
+
+
+
+
- return (
-
- |
-
- |
-
- {members.map(({ img, name }, key) => (
-
-
-
- ))}
- |
-
-
- {budget}
-
- |
-
-
- |
-
-
-
-
- |
+ {/* ==========================
+ 2. UYARI TABLOSU (ARTIK ANA TABLO İLE AYNI STİLDE)
+ - Header: Gray (Aynı)
+ - Gövde: Beyaz/Gri (Aynı)
+ ========================== */}
+ {idleVehicles.length > 0 && (
+
+ {/* Header Rengi 'orange' yerine 'gray' yapıldı */}
+
+ {/* İkon hala var ama uyumlu duruyor */}
+
+
+ Hareketsiz Araçlar
+
+ Son 7 gündür işlem görmeyen (sırası değişmeyen) araçlar.
+
+
+
+
+
+
+
+
+ {["Plaka", "Şoför Adı", "Telefon", "Aksiyon"].map((el) => (
+ // Border rengi ana tabloyla eşitlendi: border-blue-gray-50
+ |
+ {el}
+ |
+ ))}
- );
- }
- )}
-
-
-
-
-
+
+
+ {idleVehicles.map((vehicle, key) => {
+ // Border rengi ana tabloyla eşitlendi
+ const className = `py-3 px-5 ${key === idleVehicles.length - 1 ? "" : "border-b border-blue-gray-50"}`;
+ return (
+ // Hover efekti ana tabloyla eşitlendi
+
+ |
+
+ {vehicle.licensePlate}
+
+ |
+
+ {toTitleCase(vehicle.driverName)}
+ |
+
+ {vehicle.phoneNumber || "-"}
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+ );
+ })}
+
+
+
+
+ )}
+
+
+
);
}
-export default Tables;
+export default Tables;
\ No newline at end of file
diff --git a/src/routes.jsx b/src/routes.jsx
index 3a5a8da0..dcb12dbe 100644
--- a/src/routes.jsx
+++ b/src/routes.jsx
@@ -1,13 +1,25 @@
import {
HomeIcon,
UserCircleIcon,
- TableCellsIcon,
- InformationCircleIcon,
+ TruckIcon,
+ MapIcon,
+ Squares2X2Icon,
+ QueueListIcon,
+ PaperAirplaneIcon,
ServerStackIcon,
- RectangleStackIcon,
} from "@heroicons/react/24/solid";
-import { Home, Profile, Tables, Notifications } from "@/pages/dashboard";
-import { SignIn, SignUp } from "@/pages/auth";
+
+import {
+ Home,
+ Profile,
+ Tables,
+ Notifications,
+ QueueManagementPage,
+ DispatchPage,
+} from "@/pages/dashboard";
+
+import { SignIn } from "@/pages/auth";
+import TVQueuePage from "./pages/dashboard/TVQueuePage";
const icon = {
className: "w-5 h-5 text-inherit",
@@ -15,52 +27,73 @@ const icon = {
export const routes = [
{
- layout: "dashboard",
+ layout: "anasayfa",
pages: [
{
- icon:
,
- name: "dashboard",
- path: "/home",
+ icon:
,
+ name: "Araç Sıraları",
+ path: "/arac-siralari", // URL artık böyle görünecek
element:
,
},
+ {
+ icon:
,
+ name: "Sıra Yönetimi",
+ path: "/sira-yonetimi",
+ element:
,
+ roles: ['admin'],
+ },
+ {
+ icon:
,
+ name: "Özel Görev",
+ path: "/ozel-gorev",
+ element:
,
+ roles: ['admin'],
+ },
{
icon:
,
- name: "profile",
- path: "/profile",
+ name: "Kullanıcılar",
+ path: "/kullanicilar",
element:
,
+ roles: ['admin'],
},
{
- icon:
,
- name: "tables",
- path: "/tables",
+ icon:
,
+ name: "Araçlar",
+ path: "/araclar",
element:
,
+ roles: ['admin'],
},
{
- icon:
,
- name: "notifications",
- path: "/notifications",
+ icon:
,
+ name: "Güzergahlar",
+ path: "/guzergahlar",
element:
,
+ roles: ['admin'],
},
],
},
{
- title: "auth pages",
+ title: "Giriş İşlemleri",
layout: "auth",
pages: [
{
icon:
,
- name: "sign in",
- path: "/sign-in",
+ name: "Giriş Yap",
+ path: "/giris",
element:
,
},
+ ],
+ },
+ {
+ layout: "tv", // Layout ismi farklı olduğu için menüde gözükmez
+ pages: [
{
- icon:
,
- name: "sign up",
- path: "/sign-up",
- element:
,
+ name: "TV Monitor",
+ path: "/monitor",
+ element:
,
},
],
},
];
-export default routes;
+export default routes;
\ No newline at end of file
diff --git a/src/widgets/layout/AddRouteModal.jsx b/src/widgets/layout/AddRouteModal.jsx
new file mode 100644
index 00000000..6558ec01
--- /dev/null
+++ b/src/widgets/layout/AddRouteModal.jsx
@@ -0,0 +1,77 @@
+import React, { useState } from "react";
+import {
+ Button,
+ Dialog,
+ DialogHeader,
+ DialogBody,
+ DialogFooter,
+ Input,
+ Typography,
+} from "@material-tailwind/react";
+// TOAST ENTEGRASYONU
+import { toast } from 'react-toastify';
+import apiClient from "../../api/axiosConfig.js";
+
+export function AddRouteModal({ open, handleOpen, onRouteAdded }) {
+ const [routeName, setRouteName] = useState("");
+ const [localError, setLocalError] = useState(""); // Hata mesajını local'de tutuyoruz
+
+ const clearForm = () => {
+ setRouteName("");
+ setLocalError("");
+ };
+
+ const handleClose = () => {
+ clearForm();
+ handleOpen();
+ };
+
+ const handleSubmit = async () => {
+ if (!routeName.trim()) {
+ setLocalError("Güzergah adı boş olamaz.");
+ toast.error("Güzergah adı boş olamaz."); // Toast ile de bildir
+ return;
+ }
+
+ try {
+ const response = await apiClient.post("/admin/routes", { routeName });
+
+ // Standart alert yerine BAŞARI TOAST'ı göster
+ toast.success(`${routeName} başarıyla eklendi!`, { position: "top-right" });
+
+ onRouteAdded(response.data); // Ana listeyi yenile
+ handleClose();
+ } catch (err) {
+ console.error("Güzergah eklenirken hata:", err);
+
+ // Backend'den gelen spesifik hata mesajını çek ve TOAST ile göster
+ const apiError = err.response?.data?.message || err.response?.data?.error || "Bir hata oluştu.";
+ setLocalError(apiError);
+ toast.error(apiError);
+ }
+ };
+
+ return (
+
+ );
+}
\ No newline at end of file
diff --git a/src/widgets/layout/AddUserModal.jsx b/src/widgets/layout/AddUserModal.jsx
new file mode 100644
index 00000000..6e246371
--- /dev/null
+++ b/src/widgets/layout/AddUserModal.jsx
@@ -0,0 +1,137 @@
+import React, { useState } from "react";
+import {
+ Button,
+ Dialog,
+ DialogHeader,
+ DialogBody,
+ DialogFooter,
+ Input,
+ Typography,
+} from "@material-tailwind/react";
+import { toast } from 'react-toastify'; // Sadece hatalar için kullanacağız
+import apiClient from "../../api/axiosConfig.js";
+
+export function AddUserModal({ open, handleOpen, onUserAdded }) {
+ const [formData, setFormData] = useState({
+ fullName: "",
+ userName: "",
+ password: "",
+ confirmPassword: "",
+ });
+ const [error, setError] = useState("");
+
+ const clearForm = () => {
+ setFormData({ fullName: "", userName: "", password: "", confirmPassword: "" });
+ setError("");
+ };
+
+ const handleClose = () => {
+ clearForm();
+ handleOpen();
+ };
+
+ const handleSubmit = async () => {
+ // 1. İstemci Tarafı Validasyonları
+ if (!formData.fullName || !formData.userName || !formData.password || !formData.confirmPassword) {
+ const msg = "Tüm zorunlu alanları doldurunuz.";
+ setError(msg);
+ toast.error(msg); // Hata mesajları kalabilir
+ return;
+ }
+ if (formData.password !== formData.confirmPassword) {
+ const msg = "Şifreler birbiriyle eşleşmiyor.";
+ setError(msg);
+ toast.error(msg);
+ return;
+ }
+
+ try {
+ const payload = {
+ fullName: formData.fullName,
+ userName: formData.userName,
+ password: formData.password,
+ confirmPassword: formData.confirmPassword
+ };
+
+ await apiClient.post("/Users", payload);
+
+ // --- DÜZELTME BURADA ---
+ // Buradaki toast.success satırını SİLDİK.
+ // Çünkü onUserAdded() fonksiyonu, Profile.jsx içindeki mesajı zaten tetikliyor.
+
+ onUserAdded(); // Bu satır Profile.jsx'e "İşlem tamam, mesajı göster ve listeyi yenile" der.
+ handleClose();
+
+ } catch (err) {
+ console.error("Kullanıcı eklenirken hata:", err.response || err);
+ let errorMessage = "Kullanıcı eklenirken hata oluştu.";
+
+ if (err.response) {
+ if (err.response.status === 409) {
+ errorMessage = err.response.data?.message || `'${formData.userName}' zaten kayıtlı.`;
+ } else {
+ errorMessage = err.response.data?.message || errorMessage;
+ }
+ } else {
+ errorMessage = "Sunucu ile bağlantı kurulamadı.";
+ }
+
+ setError(errorMessage);
+ toast.error(errorMessage);
+ }
+ };
+
+ const handleChange = (e) => {
+ const { name, value } = e.target;
+ setFormData(prev => ({ ...prev, [name]: value }));
+ setError("");
+ };
+
+ return (
+
+ );
+}
\ No newline at end of file
diff --git a/src/widgets/layout/AddVehicleModal.jsx b/src/widgets/layout/AddVehicleModal.jsx
new file mode 100644
index 00000000..fa4f2cc5
--- /dev/null
+++ b/src/widgets/layout/AddVehicleModal.jsx
@@ -0,0 +1,175 @@
+import React, { useState, useEffect } from "react";
+import {
+ Button,
+ Dialog,
+ DialogHeader,
+ DialogBody,
+ DialogFooter,
+ Input,
+ Select,
+ Option,
+ Typography,
+} from "@material-tailwind/react";
+// TOAST ENTEGRASYONU
+import { toast } from 'react-toastify';
+import apiClient from "../../api/axiosConfig.js";
+
+// TÜRKİYE PLAKA FORMATI REGEX KURALI
+const TURKISH_PLATE_REGEX = /^(\d{2})\s*([A-Z]{1,3})\s*(\d{1,4})$/;
+
+export function AddVehicleModal({ open, handleOpen, onVehicleAdded }) {
+ const [users, setUsers] = useState([]);
+
+ // --- DEĞİŞİKLİK 1 ---
+ // 'appUserId' state'ini 'formData'dan ayırıyoruz.
+ // 'driverName' state'den tamamen kaldırıldı.
+ const [selectedUserId, setSelectedUserId] = useState(""); // Seçilen kullanıcı ID'si için ayrı state
+ const [formData, setFormData] = useState({
+ licensePlate: "",
+ phoneNumber: "",
+ });
+
+ const [error, setError] = useState("");
+
+ useEffect(() => {
+ if (open) {
+ // Modal açıldığında kullanıcıları çek
+ apiClient.get("/Users/without-vehicle")
+ .then(response => {
+ setUsers(response.data);
+ setError("");
+ })
+ .catch(err => {
+ console.error("Kullanıcılar çekilirken hata oluştu:", err);
+ const msg = "Atanabilir kullanıcı listesi yüklenemedi.";
+ setError(msg);
+ toast.error(msg);
+ });
+ } else {
+ // Modal kapandığında formu temizle
+ clearForm();
+ }
+ }, [open]);
+
+ // Input (Plaka, Telefon) değişiklikleri için
+ const handleChange = (e) => {
+ const { name, value } = e.target;
+ const newValue = name === 'licensePlate' ? value.toUpperCase() : value;
+ setFormData(prev => ({ ...prev, [name]: newValue }));
+ };
+
+ // --- DEĞİŞİKLİK 2 ---
+ // Select (Kullanıcı) değişikliği için
+ // Bu fonksiyon artık doğrudan 'selectedUserId' state'ini güncelliyor.
+ const handleSelectChange = (value) => {
+ setSelectedUserId(value);
+ };
+
+ const clearForm = () => {
+ // --- DEĞİŞİKLİK 3 ---
+ // Formu temizlerken her iki state'i de sıfırlıyoruz.
+ setFormData({ licensePlate: "", phoneNumber: "" });
+ setSelectedUserId("");
+ setError("");
+ };
+
+ const handleClose = () => {
+ // clearForm(); // useEffect [open] içinde zaten çağrılıyor
+ handleOpen();
+ }
+
+ const handleSubmit = async () => {
+ // --- DEĞİŞİKLİK 4 ---
+ // Zorunlu alan kontrolü 'selectedUserId' üzerinden yapılıyor
+ if (!formData.licensePlate || !selectedUserId) {
+ const msg = "Plaka ve Kullanıcı alanları zorunludur.";
+ setError(msg);
+ toast.error(msg);
+ return;
+ }
+
+ if (!TURKISH_PLATE_REGEX.test(formData.licensePlate.trim())) {
+ const msg = "Plaka formatı uygun değil.";
+ setError(msg);
+ toast.error(msg);
+ return;
+ }
+
+ try {
+ // --- DEĞİŞİKLİK 5 ---
+ // Payload'u gönderirken 'formData' ve 'selectedUserId' state'lerini birleştiriyoruz.
+ const payload = {
+ licensePlate: formData.licensePlate.trim().replace(/\s+/g, ''),
+ phoneNumber: formData.phoneNumber,
+ appUserId: selectedUserId // Ayrı state'den gelen ID
+ };
+
+ await apiClient.post("/admin/vehicles", payload);
+ toast.success(`'${formData.licensePlate}' plakalı araç başarıyla eklendi!`, { position: "top-right" });
+
+ onVehicleAdded();
+ handleClose();
+ } catch (err) {
+ console.error("Araç eklenirken hata:", err.response || err);
+ const apiError = err.response?.data?.message || err.response?.data?.error || "Araç eklenirken beklenmedik bir hata oluştu.";
+ setError(apiError);
+ toast.error(apiError);
+ }
+ };
+
+ return (
+
+ );
+}
\ No newline at end of file
diff --git a/src/widgets/layout/EditRouteModal.jsx b/src/widgets/layout/EditRouteModal.jsx
new file mode 100644
index 00000000..67629bb0
--- /dev/null
+++ b/src/widgets/layout/EditRouteModal.jsx
@@ -0,0 +1,96 @@
+import React, { useState, useEffect } from "react";
+import {
+ Button,
+ Dialog,
+ DialogHeader,
+ DialogBody,
+ DialogFooter,
+ Input,
+ Typography,
+ Checkbox,
+} from "@material-tailwind/react";
+import apiClient from "../../api/axiosConfig.js";
+
+export function EditRouteModal({ open, handleOpen, routeToEdit, onRouteUpdated }) {
+ const [formData, setFormData] = useState({
+ routeName: "",
+ isActive: true,
+ });
+ const [error, setError] = useState("");
+
+ // Modal'a düzenlenecek güzergah bilgisi geldiğinde formu doldur
+ useEffect(() => {
+ if (routeToEdit) {
+ setFormData({
+ routeName: routeToEdit.routeName,
+ isActive: routeToEdit.isActive,
+ });
+ setError("");
+ }
+ }, [routeToEdit]);
+
+ const handleChange = (e) => {
+ const { name, value, type, checked } = e.target;
+ setFormData(prev => ({
+ ...prev,
+ [name]: type === "checkbox" ? checked : value,
+ }));
+ };
+
+ const clearForm = () => {
+ setFormData({ routeName: "", isActive: true });
+ setError("");
+ };
+
+ const handleClose = () => {
+ clearForm();
+ handleOpen();
+ };
+
+ const handleSubmit = async () => {
+ if (!formData.routeName.trim()) {
+ setError("Güzergah adı boş olamaz.");
+ return;
+ }
+
+ try {
+ // PUT isteği ile güzergahı güncelle
+ await apiClient.put(`/admin/routes/${routeToEdit.id}`, formData);
+ alert("Güzergah başarıyla güncellendi!");
+ onRouteUpdated(); // Ana listeyi yenilemesi için sinyal gönder
+ handleClose();
+ } catch (err) {
+ console.error("Güzergah güncellenirken hata:", err);
+ setError(err.response?.data || "Bir hata oluştu.");
+ }
+ };
+
+ return (
+
+ );
+}
\ No newline at end of file
diff --git a/src/widgets/layout/EditUserModal.jsx b/src/widgets/layout/EditUserModal.jsx
new file mode 100644
index 00000000..85c1f4b6
--- /dev/null
+++ b/src/widgets/layout/EditUserModal.jsx
@@ -0,0 +1,115 @@
+import React, { useState, useEffect } from "react";
+import { Button, Dialog, DialogHeader, DialogBody, DialogFooter, Input, Typography } from "@material-tailwind/react";
+import apiClient from "../../api/axiosConfig.js";
+import { toast } from 'react-toastify';
+
+export function EditUserModal({ open, handleOpen, userToEdit, onUserUpdated }) {
+ const [formData, setFormData] = useState({ fullName: "", userName: "", password: "", confirmPassword: "" });
+
+ // ✨ Estetik Hata Bildirimi
+ const notifyError = (msg) => {
+ toast.error(msg, {
+ className: "border-l-4 border-red-500 bg-white shadow-xl rounded-lg",
+ bodyClassName: "text-blue-gray-800 font-medium text-sm",
+ icon: "❌"
+ });
+ };
+
+ useEffect(() => {
+ if (userToEdit) {
+ setFormData({
+ fullName: userToEdit.fullName || "",
+ userName: userToEdit.userName || "",
+ password: "",
+ confirmPassword: ""
+ });
+ }
+ }, [userToEdit]);
+
+ const handleSubmit = async () => {
+ // Form Kontrolü
+ if (formData.password && formData.password !== formData.confirmPassword) {
+ notifyError("Şifreler uyuşmuyor, lütfen kontrol edin!");
+ return;
+ }
+
+ const payload = { fullName: formData.fullName };
+ if (formData.password) payload.password = formData.password;
+
+ try {
+ await apiClient.put(`/Users/${userToEdit.id}`, payload);
+
+ // Başarı mesajı Profile.jsx içindeki onUserUpdated propu üzerinden tetiklenir ✨
+ onUserUpdated();
+ handleOpen();
+ } catch (err) {
+ const backendMsg = err.response?.data?.message || "Güncelleme sırasında bir sorun oluştu.";
+ notifyError(backendMsg);
+ }
+ };
+
+ return (
+
+ );
+}
\ No newline at end of file
diff --git a/src/widgets/layout/EditVehicleModal.jsx b/src/widgets/layout/EditVehicleModal.jsx
new file mode 100644
index 00000000..51a8eed0
--- /dev/null
+++ b/src/widgets/layout/EditVehicleModal.jsx
@@ -0,0 +1,87 @@
+import React, { useState, useEffect } from "react";
+import {
+ Button, Dialog, DialogHeader, DialogBody, DialogFooter, Input, Checkbox, Typography
+} from "@material-tailwind/react";
+import apiClient from "../../api/axiosConfig.js";
+
+export function EditVehicleModal({ open, handleOpen, onVehicleUpdated, vehicleToEdit }) {
+ const [formData, setFormData] = useState({
+ licensePlate: "",
+ driverName: "", // --- DEĞİŞİKLİK --- Bu state kalıyor, sadece disabled input'u doldurmak için.
+ phoneNumber: "",
+ isActive: true,
+ });
+ const [error, setError] = useState("");
+
+ // Bu useEffect, modal'a düzenlenecek araç bilgisi geldiğinde formu doldurur.
+ useEffect(() => {
+ if (vehicleToEdit) {
+ setFormData({
+ licensePlate: vehicleToEdit.licensePlate || "",
+ driverName: vehicleToEdit.driverName || "", // 'driverName'i state'e atıyoruz (API'den geliyor)
+ phoneNumber: vehicleToEdit.phoneNumber || "",
+ isActive: vehicleToEdit.isActive,
+ });
+ } else {
+ setFormData({ licensePlate: "", driverName: "", phoneNumber: "", isActive: true });
+ setError("");
+ }
+ }, [vehicleToEdit]);
+
+ const handleChange = (e) => {
+ const { name, value, type, checked } = e.target;
+ setFormData(prev => ({
+ ...prev,
+ [name]: type === 'checkbox' ? checked : value
+ }));
+ };
+
+ const handleSubmit = async () => {
+ if (!formData.licensePlate) {
+ setError("Plaka alanı zorunludur.");
+ return;
+ }
+ if (!vehicleToEdit) return;
+
+ try {
+ // --- DEĞİŞİKLİK ---
+ // API'ye gönderilecek payload'u manuel oluşturuyoruz.
+ // 'driverName' bu payload'a dahil edilmiyor.
+ const payload = {
+ licensePlate: formData.licensePlate,
+ phoneNumber: formData.phoneNumber,
+ isActive: formData.isActive
+ };
+
+ await apiClient.put(`/admin/vehicles/${vehicleToEdit.id}`, payload);
+
+ alert("Araç başarıyla güncellendi!"); // Bunu da toast'a çevirebilirsiniz
+ onVehicleUpdated();
+ handleOpen();
+ } catch (err) {
+ console.error("Araç güncellenirken hata:", err);
+ setError(err.response?.data || "Güncelleme sırasında bir hata oluştu.");
+ }
+ };
+
+ return (
+
+ );
+}
\ No newline at end of file
diff --git a/src/widgets/layout/VehicleQueueCard.jsx b/src/widgets/layout/VehicleQueueCard.jsx
new file mode 100644
index 00000000..056476f2
--- /dev/null
+++ b/src/widgets/layout/VehicleQueueCard.jsx
@@ -0,0 +1,28 @@
+import React from "react";
+import { Typography } from "@material-tailwind/react";
+
+export function VehicleQueueCard({ vehicle, index }) {
+ const isFirstThree = index < 3;
+ const cardBgColor = isFirstThree ? "bg-green-100" : "bg-blue-gray-50/70";
+ const textColor = isFirstThree ? "text-green-900" : "text-blue-gray-700";
+ const borderColor = isFirstThree ? "border-green-300" : "border-transparent";
+
+ return (
+ // DEĞİŞİKLİK: Dikey boşluğu azaltmak için padding (p-1.5) küçültüldü.
+
+ {/* DEĞİŞİKLİK: Elemanlar arası boşluk (gap-2) azaltıldı. */}
+
+ {/* DEĞİŞİKLİK: Sıra numarasının fontu (text-md) küçültüldü. */}
+
+ #{index + 1}
+
+
+ {vehicle.licensePlate}
+
+
+
+
+ );
+}
+
+export default VehicleQueueCard;
\ No newline at end of file
diff --git a/src/widgets/layout/configurator.jsx b/src/widgets/layout/_configurator.jsx
similarity index 100%
rename from src/widgets/layout/configurator.jsx
rename to src/widgets/layout/_configurator.jsx
diff --git a/src/widgets/layout/dashboard-navbar.jsx b/src/widgets/layout/dashboard-navbar.jsx
index d91e23f7..427c44ab 100644
--- a/src/widgets/layout/dashboard-navbar.jsx
+++ b/src/widgets/layout/dashboard-navbar.jsx
@@ -1,196 +1,100 @@
-import { useLocation, Link } from "react-router-dom";
-import {
- Navbar,
- Typography,
- Button,
- IconButton,
- Breadcrumbs,
- Input,
- Menu,
- MenuHandler,
- MenuList,
- MenuItem,
- Avatar,
-} from "@material-tailwind/react";
-import {
- UserCircleIcon,
- Cog6ToothIcon,
- BellIcon,
- ClockIcon,
- CreditCardIcon,
- Bars3Icon,
-} from "@heroicons/react/24/solid";
-import {
- useMaterialTailwindController,
- setOpenConfigurator,
- setOpenSidenav,
-} from "@/context";
+import React from "react";
+import { useLocation, Link, useNavigate } from "react-router-dom";
+import { IconButton, Navbar, Typography, Breadcrumbs } from "@material-tailwind/react";
+import { ArrowRightOnRectangleIcon, Bars3Icon } from "@heroicons/react/24/solid";
+import { useMaterialTailwindController, setOpenSidenav } from "@/context";
+
+// ✨ URL'den gelen teknik ismi şık bir başlığa çeviren harita
+const pageNamesMap = {
+ "arac-siralari": "Araç Sıraları",
+ "sira-yonetimi": "Sıra Yönetimi",
+ "ozel-gorev": "Özel Görev",
+ "kullanici-ayarlari": "Kullanıcılar",
+ "arac-listesi": "Araçlar",
+ "guzergahlar": "Güzergahlar",
+};
export function DashboardNavbar() {
- const [controller, dispatch] = useMaterialTailwindController();
- const { fixedNavbar, openSidenav } = controller;
- const { pathname } = useLocation();
- const [layout, page] = pathname.split("/").filter((el) => el !== "");
+ const [controller, dispatch] = useMaterialTailwindController();
+ const { fixedNavbar, openSidenav } = controller;
+ const { pathname } = useLocation();
+ const navigate = useNavigate();
+
+ // URL'yi parçalayıp layout (dashboard) ve sayfa (path) kısımlarını alıyoruz
+ const pathParts = pathname.split("/").filter((el) => el !== "");
+ const layout = pathParts[0];
+ const urlPath = pathParts[1];
+
+ // Eşleştirme listesinden Türkçe ismi çek, yoksa ham halini göster
+ const currentPageName = pageNamesMap[urlPath] || urlPath;
- return (
-
-
-
- {
+ localStorage.removeItem("authToken");
+ localStorage.removeItem("userRole");
+ navigate("/auth/giris"); // Yeni login path'imize yönlendiriyoruz
+ };
+
+ return (
+
-
-
- {layout}
-
-
-
- {page}
-
-
-
- {page}
-
-
-
-
-
-
-
setOpenSidenav(dispatch, !openSidenav)}
- >
-
-
-
-
-
-
-
-
-
+
+ );
}
DashboardNavbar.displayName = "/src/widgets/layout/dashboard-navbar.jsx";
-export default DashboardNavbar;
+export default DashboardNavbar;
\ No newline at end of file
diff --git a/src/widgets/layout/footer.jsx b/src/widgets/layout/footer.jsx
index 1ea98e53..f2c59643 100644
--- a/src/widgets/layout/footer.jsx
+++ b/src/widgets/layout/footer.jsx
@@ -8,33 +8,7 @@ export function Footer({ brandName, brandLink, routes }) {
return (
);
diff --git a/src/widgets/layout/index.js b/src/widgets/layout/index.js
index e4fd0383..e1bd44ba 100644
--- a/src/widgets/layout/index.js
+++ b/src/widgets/layout/index.js
@@ -1,5 +1,4 @@
export * from "@/widgets/layout/sidenav";
export * from "@/widgets/layout/dashboard-navbar";
-export * from "@/widgets/layout/configurator";
export * from "@/widgets/layout/footer";
export * from "@/widgets/layout/navbar";
diff --git a/src/widgets/layout/sidenav.jsx b/src/widgets/layout/sidenav.jsx
index cc7e6ffe..b6e88aa6 100644
--- a/src/widgets/layout/sidenav.jsx
+++ b/src/widgets/layout/sidenav.jsx
@@ -1,17 +1,14 @@
+import React from "react";
import PropTypes from "prop-types";
-import { Link, NavLink } from "react-router-dom";
+import { NavLink } from "react-router-dom";
import { XMarkIcon } from "@heroicons/react/24/outline";
-import {
- Avatar,
- Button,
- IconButton,
- Typography,
-} from "@material-tailwind/react";
+import { Button, IconButton, Typography } from "@material-tailwind/react";
import { useMaterialTailwindController, setOpenSidenav } from "@/context";
-export function Sidenav({ brandImg, brandName, routes }) {
+export function Sidenav({ brandName, routes }) {
const [controller, dispatch] = useMaterialTailwindController();
- const { sidenavColor, sidenavType, openSidenav } = controller;
+ const { sidenavColor, sidenavType, openSidenav, userRole } = controller;
+
const sidenavTypes = {
dark: "bg-gradient-to-br from-gray-800 to-gray-900",
white: "bg-white shadow-sm",
@@ -19,93 +16,80 @@ export function Sidenav({ brandImg, brandName, routes }) {
};
return (
-
+