Merge pull request #28 from ConducereIT/dev

.

client/src/App.tsx

@@ -11,6 +11,7 @@ import Login from "./views/Login.view";
 import Register from "./views/Register.view";
 import Otp from "./views/Otp.view";
 import ResetPassword from "./views/ResetPassword.view";
+import ResetPasswordConfirm from "./views/ResetPasswordConfirm.view";
 
 //Console
 import Admin from "./views/Console/Admin.view";
@@ -35,10 +36,10 @@ const App = () => {
         <Router basename="/">
           <Routes>
             <Route path="/" element={<Home />} />
-
             <Route path="/concurenti" element={<Concurenti />} />
             <Route path="/sponsori" element={<Sponsori />} />
             <Route path="/login" element={<Login />} />
+            <Route path="/resetpasswordconfirm" element={<ResetPasswordConfirm />} />
             <Route path="/resetpassword" element={<ResetPassword />} />
             <Route path="/register" element={<Register />} />
             <Route path="/otp" element={<Otp />} />

client/src/views/ResetPasswordConfirm.view.tsx

@@ -0,0 +1,15 @@
+import React from "react";
+
+import ResetPasswordConfirmComp from "./components/General/ResetPasswordConfirm.component";
+import Header from "./components/General/Header";
+
+const ResetPasswordConfirm = () => {
+  return (
+    <>
+      <Header />
+      <ResetPasswordConfirmComp />
+    </>
+  );
+};
+
+export default ResetPasswordConfirm;

client/src/views/components/Concurenti/ConcurentiCarousel.component.tsx

@@ -95,7 +95,6 @@ export default function ConcurentiCarousel() {
         throw new Error("Login first");
       }
 
-      console.log(userV)
       if (userV.status == "ok") {
         const email = window.localStorage.getItem("email" || " ");
 

client/src/views/components/General/Login.component.tsx

@@ -18,14 +18,7 @@ export default function LoginComp() {
 
   const handleForgot = async (event: any) => {
     event.preventDefault();
-
-    const status = await serverFunction.resetPassword(user.email);
-
-    if (status.status != "ok") {
-      setError(`${status.errorMessage}`);
-    }
-
-    window.location.replace("/resetpassword");
+    window.location.replace("/resetpasswordconfirm");
   };
 
   const handleSummit = async (event: any) => {

client/src/views/components/General/ResetPasswordConfirm.component.tsx

@@ -0,0 +1,70 @@
+import React, { useState } from "react";
+import bg_image from "../../../assets/img/Background/back-landing-page.webp";
+import { AiOutlineMail, AiFillLock } from "react-icons/ai";
+
+import { UserServicePostgresql as serverFunction } from "../../../sdk/userServicePostgresql.sdk";
+
+export default function ResetPasswordConfirmComp() {
+  const [user, setUser] = useState({
+    token: "",
+    password: "",
+  });
+
+  const [error, setError] = useState("");
+
+  const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setUser({ ...user, [event.target.name]: event.target.value });
+  };
+
+  const handleSummit = async (event: any) => {
+    event.preventDefault();
+
+    const status = await serverFunction.resetPassword(user.token);
+
+    if (status.status == "ok") {
+      window.localStorage.setItem("email", user.token);
+      window.location.replace("/resetpassword");
+    } else {
+      setError(`${status.errorMessage}`);
+    }
+  };
+
+  return (
+    <>
+      <div
+        className="h-screen flex flex-col justify-center items-center"
+        style={{ backgroundImage: `url(${bg_image})` }}
+      >
+        <div>
+          <h1 className="text-white text-center">{error ? error : ""}</h1>
+          <form className="bg-black/90 p-6 px-4 md:p-10 md:px-24">
+            <label className="mb-4">
+              <div className="my-5 md:my-5 flex">
+                <AiOutlineMail color="white" className="text-3xl md:text-4xl" />
+                <input
+                  name="token"
+                  value={user.token}
+                  type="text"
+                  placeholder="Email"
+                  className="bg-transparent border-b-2 text-lg md:text-2xl text-white ml-4"
+                  onChange={handleChange}
+                />
+              </div>
+            </label>
+
+            <div className="flex items-center justify-between mb-6"></div>
+            <div className="flex justify-center mt-10 bg-gray-500/60 py-4">
+              <button
+                onClick={handleSummit}
+                className="text-white w-full"
+                type="submit"
+              >
+                Confirm
+              </button>
+            </div>
+          </form>
+        </div>
+      </div>
+    </>
+  );
+}

server/helper.ts

@@ -19,7 +19,6 @@ export async function validatePassword(
         throw err;
       }
 
-      console.log("res", res);
       if (res) {
         resolve(true);
       } else {