Skip to content
Merged
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
39 changes: 39 additions & 0 deletions frontend/src/components/AddCarButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import React from "react";
import AddCar from "../pages/AddCar";
import { DriverWithVandC } from "../types/datatypes";

const AddCarButton = ({
activeSection,
driver,
vehicleModalActive,
setVehicleModalActive,
}: {
activeSection: string;
driver: DriverWithVandC;
vehicleModalActive: boolean;
setVehicleModalActive: React.Dispatch<React.SetStateAction<boolean>>;
}) => {
const handleAddVehicle = () => {
setVehicleModalActive(true);
};
return (
<>
{activeSection === "vehicle" && (
<button
onClick={handleAddVehicle}
className="flex bg-buttongreen text-white py-3 px-5 hover:bg-[#33471a] font-syke-regular transition-colors rounded-md justify-center items-center font-bold text-md mt-3 w-auto self-end">
Add Vehicle
</button>
)}
{vehicleModalActive && (
<AddCar
driver_id={driver.id!}
license_number={driver.license_number!}
setVehicleModalActive={setVehicleModalActive}
/>
)}
</>
);
};

export default AddCarButton;
2 changes: 1 addition & 1 deletion frontend/src/pages/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const HomePage = () => {

{/* Typewriter animation */}
<div className="relative text-white text-lg overflow-hidden h-12">
<p className="inline-block whitespace-nowrap border-r-2 border-textgreen pr-2 animate-typewriter">
<p className="inline-block whitespace-nowrap border-r-2 border-textgreen pr-2 animate-typewriter break-word">
Thank you for registering as a driver. Our team is reviewing
your details to validate your registration.
</p>
Expand Down
29 changes: 6 additions & 23 deletions frontend/src/pages/ViewProfile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import useGetDriver from "../hooks/driver-hooks/useGetDriver";
import { AuthContextType } from "../types/user.types";
import useAuth from "../hooks/context-hooks/useAuth";
import Loading from "../components/Loading";
import AddCar from "./AddCar";
import AddCarButton from "../components/AddCarButton";

const ViewProfile = () => {
const { driverId } = useParams<{ driverId: string }>();
Expand All @@ -18,10 +18,6 @@ const ViewProfile = () => {
const { auth }: AuthContextType = useAuth();
const [vehicleModalActive, setVehicleModalActive] = useState<boolean>(false);

const handleAddVehicle = () => {
setVehicleModalActive(true);
};

if (loading) {
return <Loading loading={loading} />;
}
Expand Down Expand Up @@ -76,26 +72,13 @@ const ViewProfile = () => {
<ViolationList violations={driver.violations!} />
)}
</div>
{activeSection === "vehicle" && (
<button
onClick={handleAddVehicle}
className="flex bg-buttongreen text-white py-3 px-5 hover:bg-[#33471a] font-syke-regular transition-colors rounded-md justify-center items-center font-bold text-md mt-3 w-auto self-end">
Add Vehicle
</button>
)}
{activeSection === "violation" && (
<button className="flex bg-buttongreen text-white py-3 px-5 hover:bg-[#33471a] font-syke-regular transition-colors rounded-md justify-center items-center font-bold text-md mt-3 w-auto self-end">
Add Violation
</button>
)}
</div>
{vehicleModalActive && (
<AddCar
driver_id={driverId!}
license_number={driver.license_number!}
<AddCarButton
activeSection={activeSection}
driver={driver}
vehicleModalActive={vehicleModalActive}
setVehicleModalActive={setVehicleModalActive}
/>
)}
</div>
</div>
);
};
Expand Down
Loading