Skip to content

updating branch #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 28, 2024
Merged

updating branch #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
18d93f0
Merge pull request #43 from definecoder/main
codermehraj Mar 27, 2024
5f4073c
Fixed STS Management Component in the admin section
codermehraj Mar 27, 2024
510b89b
Added Landfill management table & Fixed modal folder structure
codermehraj Mar 27, 2024
3e58cd6
LANDFILL & STS MANAGEMENT FINISHED
codermehraj Mar 27, 2024
0a38331
Captcha added
codermehraj Mar 27, 2024
1f6bcad
Vehicle list rendered from server and deletation of vehicle added
codermehraj Mar 28, 2024
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
30 changes: 16 additions & 14 deletions client/app/auth/change-password/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ import { setCookie } from "@/lib/cookieFunctions";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useEffect, useState } from "react";
import ReCAPTCHA from "react-google-recaptcha";

export default function ChangePassword() {
const router = useRouter();

const { changePass, setPassChangeData } = useChangePass();

const [correctCaptcha, setCorrectCaptcha] = useState("");
const [userCaptcha, setUserCaptcha] = useState("");
const [isVerified, setIsCaptchaVerified] = useState<string | null>();
const [oldPassword, setOldPassword] = useState("");
const [newPassword, setNewPassword] = useState("");

Expand All @@ -33,8 +33,8 @@ export default function ChangePassword() {
let timer = setInterval(() => {
setTime((time) => {
if (time === 0) {
clearInterval(timer);
alert("Time Expired!");
clearInterval(timer);
alert("Time Expired!");
router.push("/dashboard");
return 0;
} else return time - 0.5;
Expand All @@ -44,15 +44,15 @@ export default function ChangePassword() {

async function submitForm() {
setPassChangeData({ oldPassword, newPassword });
correctCaptcha === userCaptcha &&
(await changePass()) &&
router.push("/dashboard");
correctCaptcha !== userCaptcha && alert("Invalid Captcha!");
isVerified && (await changePass()) && router.push("/dashboard");
!isVerified && alert("Invalid Captcha!");
}

return (
<div className="flex flex-col gap-4 justify-center items-center h-screen w-screen">
<Button variant="outline" onClick={() => router.push("/dashboard")}>Back to Dashboard</Button>
<Button variant="outline" onClick={() => router.push("/dashboard")}>
Back to Dashboard
</Button>
<Card className="w-full max-w-sm">
<CardHeader className="text-center">
<CardTitle className="text-2xl">Change Password</CardTitle>
Expand All @@ -62,7 +62,7 @@ export default function ChangePassword() {
{`${time % 60}`.padStart(2, "0")} mins.
</CardDescription>
</CardHeader>
<CardContent className="grid gap-4">
<CardContent className="grid gap-6">
<form onSubmit={submitForm}>
<div className="grid gap-2">
<Label htmlFor="old-password">Old Password</Label>
Expand All @@ -84,10 +84,12 @@ export default function ChangePassword() {
required
/>
</div>
<CaptchaDiv
setCorrectCaptcha={setCorrectCaptcha}
setUserCaptcha={setUserCaptcha}
/>
<div className="mt-3 flex items-center justify-center">
<ReCAPTCHA
sitekey={process.env.NEXT_PUBLIC_RECAPTCHA_SITE_KEY!}
onChange={setIsCaptchaVerified}
/>
</div>
</form>
</CardContent>
<CardFooter>
Expand Down
11 changes: 9 additions & 2 deletions client/app/auth/reset-password/initiate/forgetPasswordInitiate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,20 @@ import { Label } from "@/components/ui/label";

import { useRouter } from "next/navigation";
import useForgetPassInitiate from "@/hooks/auth/useForgetPassInitiate";
import { useContext } from "react";
import { useContext, useState } from "react";
import ReCAPTCHA from "react-google-recaptcha";

function ForgetPassInitiateForm() {
const { userEmail, setUserEmail, initiate } = useForgetPassInitiate();
const [isCaptchaVerified, setIsCaptchaVerified] = useState<string | null>();
const router = useRouter();

async function handleFormSubmit(e: React.FormEvent<HTMLFormElement>) {
e.preventDefault();
if (!isCaptchaVerified) {
alert("Please verify that you are not a robot.");
return;
}
const success = await initiate();
success && router.push("/auth/reset-password/confirm" + "?email=" + userEmail);
}
Expand All @@ -34,7 +40,8 @@ function ForgetPassInitiateForm() {
}
required
/>
</div>
</div>
<ReCAPTCHA sitekey={process.env.NEXT_PUBLIC_RECAPTCHA_SITE_KEY!} className="mx-auto" onChange={setIsCaptchaVerified} />
<Button type="submit" className="w-full">
Send Reset Password Link
</Button>
Expand Down
2 changes: 1 addition & 1 deletion client/components/dashboard-componenets/mainContent/systemAdminContents/Roles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Button } from "@/components/ui/button";
import { Cog, UserRoundCog } from "lucide-react";
import EmptyFillContainer from "../../cards/EmptyFillContainer";
import { RoleCreateModal } from "@/components/modals/RoleModal";
import { RoleCreateModal } from "@/components/modals/userControls/RoleModal";

export default function AdminRolesManagementPanel() {
return (
Expand Down
22 changes: 12 additions & 10 deletions client/components/dashboard-componenets/mainContent/systemAdminContents/System.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { Button } from "@/components/ui/button";
import EmptyFillContainer from "../../cards/EmptyFillContainer";
import { Plus, Truck } from "lucide-react";
import { StsCreateModal } from "../../../modals/StsModal";
import { StsCreateModal } from "../../../modals/stsControl/StsModal";
import { VehicleCreateModal } from "@/components/modals/VehicleModal";
import { LandfillCreateModal } from "@/components/modals/LandfillModal";
import { LandfillCreateModal } from "@/components/modals/landfillControl/LandfillModal";
import UserListTable from "@/components/dataTables/UserList";
import STSListTable from "@/components/dataTables/STSList";
import LandFillListTable from "@/components/dataTables/LandFillList";
import AllVehicleList from "@/components/dataTables/AllVehicleList";

export default function AdminSystemDataPanel() {
return (
Expand Down Expand Up @@ -47,16 +49,16 @@ export default function AdminSystemDataPanel() {
</div>
</div>
<div className="flex flex-1 items-center justify-center rounded-lg border border-dashed shadow-sm">
<div className="grid grid-cols-1 md:grid-cols-2 grid-rows-2 grid-flow-row gap-2 md:gap-4 w-full md:h-full max-h-max">
<div className="col-span-1 row-span-1 min-h-48">
<div className="grid grid-cols-1 md:grid-cols-2 grid-flow-row gap-2 md:gap-4 w-full md:h-full max-h-max">
<div className="col-span-1 min-h-48">
<EmptyFillContainer><STSListTable /></EmptyFillContainer>
</div>
<div className="col-span-1 row-span-2 min-h-48">
<EmptyFillContainer>VEICLE LIST</EmptyFillContainer>
</div>
<div className="col-span-1 row-span-1 min-h-48">
<EmptyFillContainer>LANDFILL LIST</EmptyFillContainer>
</div>
<div className="col-span-1 min-h-48">
<EmptyFillContainer><LandFillListTable /></EmptyFillContainer>
</div>
<div className="md:col-span-2 min-h-48">
<EmptyFillContainer><AllVehicleList /></EmptyFillContainer>
</div>
</div>
</div>
</main>
Expand Down
2 changes: 1 addition & 1 deletion client/components/dashboard-componenets/mainContent/systemAdminContents/Users.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import * as React from "react";

import useAddNewUser from "@/hooks/user_data/useAddNewUser";
import { AddNewUserModal } from "@/components/modals/AddNewUserModal";
import { AddNewUserModal } from "@/components/modals/userControls/AddNewUserModal";
import UserListTable from "@/components/dataTables/UserList";

export default function AdminUserManagementPanel() {
Expand Down
Loading