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
2 changes: 1 addition & 1 deletion Apply-For-Me-UI/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]);

Expand Down
17 changes: 12 additions & 5 deletions Apply-For-Me-UI/src/pages/authentication-pages/Welcome2.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

24 changes: 18 additions & 6 deletions Apply-For-Me-UI/src/pages/authentication-pages/Welcome2.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -89,7 +90,7 @@ const Welcome2 = () => {
: err.response.data.message;
setError(message);
setLoading(false);
toast.error(message);
toast.error("Authentication Failed");
});
};

Expand Down Expand Up @@ -117,11 +118,22 @@ const Welcome2 = () => {
placeholder="Password"
required
/>
<img
src="https://res.cloudinary.com/hamskid/image/upload/v1670631906/Vector_1_qntpu2.svg"
alt="object not found"
onClick={handletoggle}
/>
{
password === "password"?
<FaEye
onClick={handletoggle}
size="1.2rem"
color="grey"
className="passowrd-toggler"
/>:
<FaEyeSlash
onClick={handletoggle}
size="1.2rem"
color="grey"
className="passowrd-toggler"
/>
}

</label>

{error && <p style={{ color: "red" }}>{error}</p>}
Expand Down
3 changes: 3 additions & 0 deletions Apply-For-Me-UI/src/pages/paystack/paystack.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ export const PaystackPage = () => {
name="name"
className="pay_input"
defaultValue={decoded?.fullName}
readOnly={true}
/>
</div>
<div className="inputDiv_wrapper">
Expand All @@ -139,6 +140,7 @@ export const PaystackPage = () => {
name="email"
className="pay_input"
defaultValue={decoded?.emailAddress}
readOnly={true}
/>
</div>
<div className="inputDiv_wrapper">
Expand All @@ -150,6 +152,7 @@ export const PaystackPage = () => {
name="amount"
className="pay_input"
defaultValue={`$ ${price}`}
readOnly={true}
/>
</div>
<button className="submit_btn">Make payment</button>
Expand Down