diff --git a/Apply-For-Me-UI/package.json b/Apply-For-Me-UI/package.json index fde56f57..59f18dc4 100644 --- a/Apply-For-Me-UI/package.json +++ b/Apply-For-Me-UI/package.json @@ -36,7 +36,7 @@ "yup": "^0.32.11" }, "scripts": { - "start": "PORT=7000 react-scripts start", + "start": "set PORT=7000 && react-scripts start", "dev": "react-scripts start", "build": "react-scripts build", "test": "react-scripts test", diff --git a/Apply-For-Me-UI/src/pages/applications/components/Table.jsx b/Apply-For-Me-UI/src/pages/applications/components/Table.jsx index 26f0a5c6..fb5ac969 100644 --- a/Apply-For-Me-UI/src/pages/applications/components/Table.jsx +++ b/Apply-For-Me-UI/src/pages/applications/components/Table.jsx @@ -36,7 +36,7 @@ const Table = () => { setPageCout(response.data?.totalPages); } catch (error) { toast.error(`${error}`); - console.log("thisis", JSON.stringify(error.response)) + console.log("thisis",error) } }, [token, pagination.pageNo, pagination.pageSize]); diff --git a/Apply-For-Me-UI/src/pages/authentication-pages/Welcome2.css b/Apply-For-Me-UI/src/pages/authentication-pages/Welcome2.css index 27667701..9859d193 100644 --- a/Apply-For-Me-UI/src/pages/authentication-pages/Welcome2.css +++ b/Apply-For-Me-UI/src/pages/authentication-pages/Welcome2.css @@ -34,14 +34,21 @@ padding: 2%; box-sizing: border-box; } +.passowrd-toggler { + position: absolute; + top: 16px; + right: 20px; +} @media screen and (max-width: 860px) { .passowrd-label-input { padding: 4.5%; } } -.passowrd-label img { - position: absolute; - position: absolute; - top: 18px; - right: 20px; +@media only screen and (min-width: 616px) and (max-width: 856px){ + .passowrd-toggler { + position: absolute; + top: 24px; + right: 20px; + } } + diff --git a/Apply-For-Me-UI/src/pages/authentication-pages/Welcome2.js b/Apply-For-Me-UI/src/pages/authentication-pages/Welcome2.js index cfa6651d..2f11d0b0 100644 --- a/Apply-For-Me-UI/src/pages/authentication-pages/Welcome2.js +++ b/Apply-For-Me-UI/src/pages/authentication-pages/Welcome2.js @@ -17,6 +17,7 @@ import { userInfo } from "store/slice/UserSlice"; import { ToastContainer, toast } from "react-toastify"; import "react-toastify/dist/ReactToastify.css"; import Spinner from "components/spinner/Spinner"; +import { FaEye, FaEyeSlash } from "react-icons/fa"; const BaseUrl = "https://api.applyforme.hng.tech/api/v1/auth/sign-in"; @@ -89,7 +90,7 @@ const Welcome2 = () => { : err.response.data.message; setError(message); setLoading(false); - toast.error(message); + toast.error("Authentication Failed"); }); }; @@ -117,11 +118,22 @@ const Welcome2 = () => { placeholder="Password" required /> - object not found + { + password === "password"? + : + + } + {error &&

{error}

} diff --git a/Apply-For-Me-UI/src/pages/paystack/paystack.jsx b/Apply-For-Me-UI/src/pages/paystack/paystack.jsx index 0b25e15a..e7471caa 100644 --- a/Apply-For-Me-UI/src/pages/paystack/paystack.jsx +++ b/Apply-For-Me-UI/src/pages/paystack/paystack.jsx @@ -128,6 +128,7 @@ export const PaystackPage = () => { name="name" className="pay_input" defaultValue={decoded?.fullName} + readOnly={true} />
@@ -139,6 +140,7 @@ export const PaystackPage = () => { name="email" className="pay_input" defaultValue={decoded?.emailAddress} + readOnly={true} />
@@ -150,6 +152,7 @@ export const PaystackPage = () => { name="amount" className="pay_input" defaultValue={`$ ${price}`} + readOnly={true} />