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

updated social links section #123

Merged
merged 2 commits into from
Feb 18, 2022
Merged

updated social links section #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeb6635
updated social links section
M-Rb3 Feb 17, 2022
d83cc88
updated select elements
M-Rb3 Feb 17, 2022
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
11 changes: 11 additions & 0 deletions components/settings/DropdownIndicator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from 'react';

const DropdownIndicator = () => (
<img
style={{ maxWidth: '40px', marginRight: '10px' }}
src="/assets/images/settings/arrow-down.svg"
alt="link"
/>
);

export default DropdownIndicator;
68 changes: 46 additions & 22 deletions components/settings/ProfileFirstStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { useState, useContext } from 'react';
import DatePicker from 'react-datepicker';
import PhoneInput from 'react-phone-input-2';
import Select from 'react-select';
import DropdownIndicator from './DropdownIndicator';
import {
ethnicities,
nationalities,
Expand All @@ -12,13 +13,15 @@ import { GlobalContext } from '../../contexts/provider';
import updateProfileJSON from '../../contexts/actions/profile/updateProfileJSON';

const ProfileFirstStep = ({
data, setStep, step, dates,
data, setStep, step, dates, customStyles,
}) => {
const [firstName, setFirstName] = useState(data.firstName);
const [lastName, setLastName] = useState(data.lastName);
const [gender, setGender] = useState(data.Gender);
const [gender, setGender] = useState({ label: data.Gender, value: data.Gender });
const [phoneNumber, setPhoneNumber] = useState(`+${data.phoneNumber}`);
const [nationality, setNationality] = useState(data.Nationality);
const [nationality, setNationality] = useState(
{ label: data.Nationality, value: data.Nationality },
);
const [ethnicity, setEthnicity] = useState(data.Ethnicity);
const [startDate, setStartDate] = useState(dates.birthdayDate);
// update userData
Expand All @@ -34,9 +37,9 @@ const ProfileFirstStep = ({
setStartDate(dates.birthdayDate);
setFirstName(data.firstName);
setLastName(data.lastName);
setGender(data.Gender);
setGender({ label: data.Gender, value: data.Gender });
setPhoneNumber(`+${data.phoneNumber}`);
setNationality(data.Nationality);
setNationality({ label: data.Nationality, value: data.Nationality });
setEthnicity(data.Ethnicity);
};
const submitHandler = (e) => {
Expand All @@ -47,8 +50,8 @@ const ProfileFirstStep = ({
phoneNumber,
birthday: startDate,
Ethnicity: ethnicity,
Nationality: nationality,
Gender: gender,
Nationality: nationality.label,
Gender: gender.label,
};
// submit data
updateProfileJSON(
Expand Down Expand Up @@ -78,12 +81,23 @@ const ProfileFirstStep = ({
{startDate && <DatePicker placeholderText="Select" selected={startDate} onChange={(date) => setStartDate(date)} />}
</div>
<div className="col-lg-6">
<label>Gender </label>
<select placeholder="Select" value={gender} onChange={(e) => setGender(e.target.value)}>
{genders.map((g) => (
<option value={g.label} key={g.label}>{g.label}</option>
))}
</select>
<div className={`row ${styles.selectRow}`}>
<div className="col-12">
<label>Gender</label>
</div>
<div style={{ display: 'unset', padding: '0' }} className={`col ${styles.socialCol}`}>
<Select
styles={customStyles}
components={{ DropdownIndicator }}
isClearable={false}
isSearchable
onChange={(newValue) => setGender(newValue)}
options={genders}
placeholder="Select Nationality"
value={gender}
/>
</div>
</div>
</div>
</div>
<div className={`row ${styles.nameRow}`}>
Expand All @@ -99,22 +113,32 @@ const ProfileFirstStep = ({
</div>
</div>
<div className={`row ${styles.nameRow}`}>
<div className="settings-phone-field col">
<div className="col-12">
<label>Nationality </label>
<select placeholder="Select Nationality" value={nationality} onChange={(e) => setNationality(e.target.value)}>
{nationalities.map((country) => (
<option value={country.label} key={country.label}>{country.label}</option>
))}
</select>

</div>
<div style={{ display: 'unset', padding: '0' }} className={`col ${styles.socialCol}`}>
<Select
styles={customStyles}
components={{ DropdownIndicator }}
isClearable={false}
isSearchable
onChange={(newValue) => setNationality(newValue)}
options={nationalities}
placeholder="Select Nationality"
value={nationality}
/>
</div>
</div>
<div className={`row ${styles.nameRow}`}>
<div className="settings-phone-field col">
<label>Ethnicity</label>
<div className="col-12">
<label>Ethnicity </label>
</div>
<div style={{ display: 'unset', padding: '0' }} className={`col ${styles.socialCol}`}>
<Select
isMulti
isClearable
styles={customStyles}
components={{ DropdownIndicator }}
onChange={handleChange}
options={ethnicities}
placeholder="Select Ethnicity"
Expand Down
Loading