Skip to content

Updating main from finishing touches #74

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 31, 2024
Merged

Updating main from finishing touches #74

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
943e6ff
added bills in admin dashboard
codermehraj Mar 31, 2024
f1a681f
fixed all error messages more than 80 error handelings)
codermehraj Mar 31, 2024
45c685d
Added landfill release option with backend connection
codermehraj Mar 31, 2024
4385197
vehicle live tracking fixed
codermehraj Mar 31, 2024
8327097
incoming waste integrated in the sts
codermehraj Mar 31, 2024
0d75989
Made Component for Schedule from STS ID
codermehraj Mar 31, 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
5 changes: 3 additions & 2 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 @@ -13,6 +13,7 @@ import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import useChangePass from "@/hooks/auth/useChangePass";
import { setCookie } from "@/lib/cookieFunctions";
import { message } from "antd";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useEffect, useState } from "react";
Expand All @@ -34,7 +35,7 @@ export default function ChangePassword() {
setTime((time) => {
if (time === 0) {
clearInterval(timer);
alert("Time Expired!");
message.error("Time Expired!");
router.push("/dashboard");
return 0;
} else return time - 0.5;
Expand All @@ -45,7 +46,7 @@ export default function ChangePassword() {
async function submitForm() {

isVerified && (await changePass()) && router.push("/dashboard");
!isVerified && alert("Invalid Captcha!");
!isVerified && message.error("Invalid Captcha!");
}

return (
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -9,6 +9,7 @@ import { useRouter } from "next/navigation";
import useForgetPassInitiate from "@/hooks/auth/useForgetPassInitiate";
import { useContext, useState } from "react";
import ReCAPTCHA from "react-google-recaptcha";
import { message } from "antd";

function ForgetPassInitiateForm() {
const { userEmail, setUserEmail, initiate } = useForgetPassInitiate();
Expand All @@ -18,7 +19,7 @@ function ForgetPassInitiateForm() {
async function handleFormSubmit(e: React.FormEvent<HTMLFormElement>) {
e.preventDefault();
if (!isCaptchaVerified) {
alert("Please verify that you are not a robot.");
message.warning("Please verify that you are not a robot.");
return;
}
const success = await initiate();
Expand Down
2 changes: 1 addition & 1 deletion client/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const metadata: Metadata = {
title: "EcoSync",
description: "EcoSync is a platform for managing waste in DNCC.",
icons: {
icon: "/logo.png",
icon: "/logoBlack.png",
},
};

Expand Down
Loading