Skip to content
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

Implemented new design for registration and account setting oage #598

Open
wants to merge 6 commits into
base: deployment
Choose a base branch
from
Open

Implemented new design for registration and account setting oage #598

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
ff68db3
implemented new registration view
hamskid-id Feb 4, 2023
9c67d1b
Merge branch 'deployment' of https://github.com/workshopapps/applyfor…
hamskid-id Feb 4, 2023
83ad5d0
added account-seetting page
hamskid-id Feb 4, 2023
e77c55c
Merge pull request #596 from workshopapps/FE/PaystackIntegration
hamskid-id Feb 6, 2023
6d61d29
Merge pull request #597 from workshopapps/FE/latest-development
hamskid-id Feb 6, 2023
17a6477
new commit
anointedosara Jul 30, 2023
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
3 changes: 0 additions & 3 deletions Apply-For-Me-UI/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.

Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
Expand All @@ -42,10 +41,8 @@
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.

To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
Expand Down
2 changes: 1 addition & 1 deletion Apply-For-Me-UI/src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url('https://fonts.googleapis.com/css2?family=Outfit:wght@100;200;300;400;500;600;700;800;900&display=swap');
/* @import url('https://fonts.googleapis.com/css2?family=Outfit:wght@100;200;300;400;500;600;700;800;900&display=swap'); */
@import url('./styles/dashboard.css');
@import url('./styles/SideNav.css');
@import url('./styles/header.css');
Expand Down
2 changes: 1 addition & 1 deletion Apply-For-Me-UI/src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
padding: 0;
font-size: calc(16px + 0.0396vw);
list-style-type: none;
}
}
9 changes: 3 additions & 6 deletions Apply-For-Me-UI/src/pages/account_settings/AccountSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import AccountSet from "./AccountSet";
// import AccountSet from "./AccountSet";
import AccountSettingsNew from "./AccountSettingsNew";
import { useState, useEffect } from "react";
import Spinner from "components/spinner/Spinner";

Expand All @@ -20,11 +21,7 @@ const AccountSettings = () => {
return <Spinner />;
}

return (
<div>
<AccountSet details={memberdetails} />
</div>
);
return <AccountSettingsNew details={memberdetails} />;
};

export default AccountSettings;
313 changes: 313 additions & 0 deletions Apply-For-Me-UI/src/pages/account_settings/AccountSettingsNew.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,313 @@
import React, { useState } from "react";
import classes from "./AccountSettingsNew.module.css";
import { Link } from "react-router-dom";
// import SettingsTopNav from "./SettingsTopNav";
import LetteredAvatar from "react-lettered-avatar";
// import { useEffect } from "react";
import axios from "axios";
// import TopBar from "pages/dashboard_profile/components/TopBar/TopBar";
import { useSelector } from "react-redux";
import { toast, ToastContainer } from "react-toastify";

const AccountSettingsNew = ({ details }) => {
//User Info
const { user } = useSelector(state => state.user);

const fullName = user?.fullName;
// console.log(details);

// const userEmail = user.sub;
// const [countryDetails, setCountryDetails] = useState([]);

const [formField, setFormField] = useState({
avatar: details?.avatar !== null ? details.avatar : "",
first_name: details?.firstName,
last_name: details?.lastName,
email: details?.emailAddress,
phone_number: details?.phoneNumber,
address: details?.address,
city: details?.city !== null ? details.city : "",
state: details?.state !== null ? details.state : "",
country_of_residence:
details?.countryOfResidence !== null
? details.countryOfResidence
: 15,
nationality: details?.nationality !== null ? details.nationality : 15,
date_of_birth: details?.dateOfBirth,
current_job_title:
details?.currentJobTitle !== null ? details?.currentJobTitle : "",
username: details?.username !== null ? details.username : "",
new_password: ""
});

const post = {
"avatar": formField.avatar,
"first_name": formField.first_name,
"last_name": formField.last_name,
"nationality": formField.nationality,
"country_of_residence": formField.country_of_residence,
"date_of_birth": formField.date_of_birth,
"current_job_title": formField.current_job_title,
"email_address": formField.email,
"username": formField.username,
"phone_number": formField.phone_number,
"city": formField.city,
"state": formField.state,
"address": formField.address
};

console.log(post);

const updateInfo = async () => {
const token = localStorage.getItem("tokenHngKey");
try {
// eslint-disable-next-line no-unused-vars
const res = await axios.put(
`https://api.applyforme.hng.tech/api/v1/member/update`,
post,
{
headers: {
"Authorization": `Bearer ${token}`
},
params: { "id": details.id }
}
);
toast.success("Profile successfully updated");
} catch (err) {
console.log("error for update", err);
toast.error(err?.response.data.message);
}
};

return (
<div className={classes.account_settings_container}>
<ToastContainer />
<div className={classes.body_container}>
<div className={classes.body_content}>
<div className={classes.general_details}>
<h2>General Details</h2>
<p>Update your photo and personal details here</p>
</div>

<div className={classes.details_settings}>
<div className={classes.details_setting}>
<h3 className={classes.settings_heading}>
Personal Details
</h3>
<form
onSubmit={e => e.preventDefault()}
className={classes.settings_form}
>
<div className={classes.form_row}>
<div className={classes.form_control}>
<label htmlFor="first_name">
First Name
</label>
<input
onChange={event =>
setFormField({
...formField,
first_name:
event.target.value
})
}
value={formField?.first_name}
type="text"
name="first_name"
id="first_name"
placeholder={details.firstName}
/>
</div>
<div className={classes.form_control}>
<label htmlFor="last_name">
Last Name
</label>
<input
onChange={event =>
setFormField({
...formField,
last_name:
event.target.value
})
}
value={formField.last_name}
type="text"
name="last_name"
id="last_name"
placeholder={details.lastName}
/>
</div>
</div>

<div className={classes.form_row}>
<div className={classes.form_control}>
<label htmlFor="email">Email</label>
<input
onChange={event =>
setFormField({
...formField,
email: event.target.value
})
}
value={formField.email}
type="email"
readOnly
name="email"
id="email"
placeholder={details.email}
/>
</div>

<div className={classes.form_control}>
<label htmlFor="number">
Phone Number
</label>
<input
onChange={event =>
setFormField({
...formField,
phone_number:
event.target.value
})
}
value={formField.phone_number}
type="text"
name="number"
id="number"
placeholder={details.phoneNumber}
/>
</div>
</div>

<div className={classes.form_row}>
<div className={classes.form_control}>
<label htmlFor="password">
Password
</label>

<input
onChange={event =>
setFormField({
...formField,
new_password:
event.target.value
})
}
value={formField.new_password}
type="password"
/>
</div>
<button
onClick={updateInfo}
className={
classes.update_personal_details
}
>
Update
</button>
</div>
</form>
</div>

<div className={classes.photo_and_plan_settings}>
<h3 className={classes.settings_heading}>
Your Photo
</h3>

<div className={classes.edit_photo}>
<div className={classes.previous_photo}>
<LetteredAvatar
name={fullName}
backgroundColor={"#52515B"}
/>
</div>
<div className={classes.edit_photo_buttons}>
<h3
className={`${classes.settings_heading} ${classes.settings_heading_without_border}`}
>
Edit your photo
</h3>
<div className={classes.edit_buttons}>
<button
className={classes.edit_button_red}
>
Delete
</button>
<button
className={classes.edit_button_blue}
>
Update
</button>
</div>
</div>
</div>

<div className={classes.edit_plan_container}>
<h4 className={classes.plan_details}>
Plan details
</h4>
<div className={classes.edit_plan}>
<div className={classes.current_plan}>
Basic Plan
</div>
<Link
to="/pricing"
className={`${classes.change_plan} ${classes.edit_button_blue}`}
>
change plan
</Link>
</div>
</div>
</div>
</div>

<div className={classes.membership_plan_container}>
<h3 className={classes.settings_heading}>
Membership and Billing
</h3>
<div className={classes.plan_details_container}>
<div className={classes.plan_details}>
<div className={classes.card_details_container}>
<div className={classes.card_details}>
<img
src="https://res.cloudinary.com/doiq3txf7/image/upload/v1674223425/Praise%20Files/mastercard-svg_itpbkk.svg"
alt=""
/>
<p className={classes.card_number}>
********<span>67789</span>
</p>
</div>
<p>
To remove this card add another card
first
</p>
</div>
<div className={classes.next_billing_date}>
<p>Next billing Date</p>
<h3
className={`${classes.settings_heading} ${classes.settings_heading_without_border} ${classes.settings_heading_without_padding}`}
>
Your next billing date is January 31,
2023
</h3>
</div>
</div>

<button className={classes.preferred_card}>
Preferred Card
</button>
<Link
to="/pricing"
className={`${classes.edit_button_blue}`}
>
edit billing details
</Link>
</div>
</div>
</div>
</div>
</div>
);
};

export default AccountSettingsNew;
Loading