Skip to content
Closed

Dev #11

Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 35 additions & 0 deletions src/api/companies.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import axios from "@/lib/axios";

export interface CreateCompanyPayload {
name: string;
address: string;
email: string;
codeConfirm: string;
phoneNumber: string;
industryType: string;
picName: string;
picPhone: string;
startDate: string;
endDate: string;
isActive: boolean;
}

export const getCompaniesApi = async () => {
const res = await axios.get("/companies");
return res.data.data;
}

export const createCompanyApi = async (companyData: CreateCompanyPayload) => {
const res = await axios.post("/companies", companyData);
return res.data.data;
}

export const updateCompanyApi = async (id: number, companyData: Partial<CreateCompanyPayload>) => {
const res = await axios.put(`/companies/${id}`, companyData);
return res.data.data;
}

export const deleteCompanyApi = async (id: number) => {
const res = await axios.delete(`/companies/${id}`);
return res.data.data;
}
1 change: 1 addition & 0 deletions src/api/device.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// nanti tunggu ui/ux ada
6 changes: 6 additions & 0 deletions src/api/vehicle-models.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import axios from "@/lib/axios";

export const getVehicleModels = async () => {
const res = await axios.get(`vehicle-models`);
return res.data.data;
};
90 changes: 86 additions & 4 deletions src/api/vehicle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ export const getMachineActiveVehicle = async (companyId: number) => {
return res.data.data;
};

export const getVehicleDetail = async (vehicleId: number) => {
const res = await axios.get(`vehicles/vehicle-detail/${vehicleId}`);
return res.data.data;
};

export const getVehicleActivityReport = async ( vehicleId: number, date: string ) => {
const res = await axios.get(`vehicles/activity/trip-report/${vehicleId}/date`, { params: { date } });
Expand Down Expand Up @@ -77,3 +73,89 @@ export const toggleVehicleStarter = async (
);
return res.data;
};

// API GET

// api to get detailed list of vehicles by company - super admin
export const getDetailedListVehiclesByCompany = async (companyId: number) => {
const res = await axios.get(`vehicles/list/sa/${companyId}/detailed`);
return res.data.data;
};

export const getVehicleByMarkingNumber = async (markingNumber: string, companyId: number) => {
const res = await axios.get(`vehicles/marking-number/${markingNumber}`, {
params: { companyId }
});
return res.data.data;
}

// count company - super admin

export const getVehiclesCountAllCompanies = async () => {
const res = await axios.get(`vehicles/count/sa`);
return res.data.data.vehicle_count ?? 0;
};

export const getVehiclesCountByCompany = async (companyId: number) => {
const res = await axios.get(`vehicles/count/sa/${companyId}`);
return res.data.data.vehicle_count ?? 0;
}

export const deleteVehicleById = async (vehicleId: number) => {
const res = await axios.delete(`vehicles/${vehicleId}`);
return res.data;
}

// Edit Vehicle Super Admin
export const editVehicleSuperAdmin = async (vehicleId: number, companyId: number, vehicleData: object) => {
const payload = {
...vehicleData,
companyId: companyId
};

const res = await axios.put(`vehicles/superadmin/${vehicleId}`, payload);
return res.data;
};

export const getVehicleDetail = async (vehicleId: number, companyId: number) => {
const res = await axios.get(`vehicles/vehicle-details/${vehicleId}`, {
params: { companyId }
});
return res.data.data;
};

// MODEL VEHICLE API

export const addVehicleModel = async (modelData: number) => {
const res = await axios.post(`vehicles/models`, modelData);
return res.data;
}

export const editVehicleModelById = async (modelId: number, modelData: number) => {
const res = await axios.put(`vehicles/models/${modelId}`, modelData);
return res.data;
}

export const deleteVehicleModelById = async (modelId: number) => {
const res = await axios.delete(`vehicles/models/${modelId}`);
return res.data;
}

// POST VEHICLE API

// superadmin then integrate with maximus vehicles (DB Live)
export const addVehicleSuperAdmin = async (vehicleData: {
vehicleModelId: number;
companyId: number;
licensePlate: string;
image: string;
color: string;
year: number;
frameNumber: string;
engineNumber: string;
marking_number: string;
description?: string;
}) => {
const res = await axios.post(`vehicles/superadmin`, vehicleData);
return res.data;
};
2 changes: 1 addition & 1 deletion src/components/leftbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const data = {
},
{
title: "Manajemen Device",
url: "/device-management",
url: "/manajemen-device",
icon: Car,
},
{
Expand Down
37 changes: 31 additions & 6 deletions src/components/vehicle-map .tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,20 @@ import L from "leaflet";
import "leaflet/dist/leaflet.css";
import { Vehicle } from "@/types/types";
import { FitBoundsToVehicles } from "./focus-vehicle";
import React, { useState } from "react";
import React, { useState, useEffect } from "react";
import { getCompaniesApi } from "@/api/companies";

interface Company {
id: number;
name: string;
address: string;
email: string;
phoneNumber: string;
industryType: string;
picName: string;
picPhone: string;
isActive: boolean;
}

interface VehicleMapProps {
vehicleLocations: Vehicle[];
Expand Down Expand Up @@ -143,13 +156,25 @@ const formatVehicleType = (type: string | undefined) => {


const VehicleMap: React.FC<VehicleMapProps> = ({ vehicleLocations }) => {
// Ambil daftar unik perusahaan dari data kendaraan
const companyList = Array.from(
new Set(vehicleLocations.map((v) => v.company_name).filter(Boolean))
);

const [companyList, setCompanyList] = useState<string[]>([]);
const [selectedCompany, setSelectedCompany] = useState<string | "">("");

// Fetch companies dari API
useEffect(() => {
const fetchCompanies = async () => {
try {
const companies: Company[] = await getCompaniesApi();
const companyNames = companies.map((company) => company.name);
setCompanyList(companyNames);
} catch (error) {
console.error("Error fetching companies:", error);
setCompanyList([]);
}
};

fetchCompanies();
}, []);

// Filter kendaraan berdasarkan perusahaan yang dipilih
const filteredVehicles =
selectedCompany && selectedCompany !== ""
Expand Down
12 changes: 10 additions & 2 deletions src/components/vehicle-profile-dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { getVehicleActivityReport, getVehicleDetail } from "@/api/vehicle";
import { format } from "date-fns";
import { useReverseGeocode } from "@/hooks/useReverseGeocode";
import { useVehicleStore } from "@/store/useVehicleStore";
import { useAuthStore } from "@/store/useAuthStore";

// Helper to format vehicle type for display
function formatVehicleType(type: string | undefined) {
Expand Down Expand Up @@ -76,6 +77,11 @@ interface VehicleProfilePageProps {
vehicleId?: number | null;
}

interface VehicleProfilePageProps {
vehicleDetail?: VehicleDetail;
vehicleId?: number | null;
}

const AktivitasBaruContent = ({
activities,
isLoading,
Expand Down Expand Up @@ -327,13 +333,15 @@ export default function VehicleProfilePage({

// Fetch vehicle detail
useEffect(() => {
const companyId = useAuthStore((s) => s.user?.companyId);

const fetchVehicleDetail = async () => {
if (!vehicleId || !isOpen) return;
if (!vehicleId || !isOpen || !companyId) return;

setIsLoadingDetail(true);
try {
console.log("Fetching vehicle detail for:", vehicleId);
const data = await getVehicleDetail(vehicleId);
const data = await getVehicleDetail(vehicleId, companyId);
console.log("Vehicle detail received:", data);
setDetail({
id: data.id,
Expand Down
10 changes: 7 additions & 3 deletions src/pages/auth/login/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,20 @@ export default function LoginPage() {

try {
const token = await loginApi(email, password);
setToken(token);
const userProfile = await getProfileApi(token);

// ✅ VALIDASI ROLE SUPER_ADMIN
// Debug: lihat data yang dikembalikan API
console.log('User Profile:', userProfile);
console.log('Role:', userProfile.role);

// ✅ VALIDASI ROLE SUPER_ADMIN - hanya super_admin yang bisa login
if (userProfile.role !== 'super_admin') {
setErrorMessage("Akses ditolak. Anda bukan Super Admin.");
setToken("");
return;
}

// Set token dan user hanya setelah validasi role berhasil
setToken(token);
useAuthStore.getState().setUser(userProfile);
navigate("/dashboard");
} catch (err: unknown) {
Expand Down
Empty file.
Loading
Loading