edit profile page ui changes
This commit is contained in:
Nuwan
parent
e973a5f55c
commit
136a3c399d
|
|
@ -3363,11 +3363,18 @@
|
|||
}
|
||||
},
|
||||
"@fortawesome/free-solid-svg-icons": {
|
||||
"version": "5.15.3",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz",
|
||||
"integrity": "sha512-XPeeu1IlGYqz4VWGRAT5ukNMd4VHUEEJ7ysZ7pSSgaEtNvSo+FLurybGJVmiqkQdK50OkSja2bfZXOeyMGRD8Q==",
|
||||
"version": "5.15.4",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz",
|
||||
"integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==",
|
||||
"requires": {
|
||||
"@fortawesome/fontawesome-common-types": "^0.2.35"
|
||||
"@fortawesome/fontawesome-common-types": "^0.2.36"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-common-types": {
|
||||
"version": "0.2.36",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz",
|
||||
"integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="
|
||||
}
|
||||
}
|
||||
},
|
||||
"@fortawesome/react-fontawesome": {
|
||||
|
|
|
|||
|
|
@ -271,7 +271,8 @@ function JKDashboardMain() {
|
|||
<Route path="/privacy" component={JKPrivacy} />
|
||||
<Route path="/help" component={JKHelp} />
|
||||
<Route path="/unsubscribe" exact component={JKUnsubscribe} />
|
||||
<PrivateRoute path="/" exact component={HomePage} />
|
||||
{/* <PrivateRoute path="/" exact component={HomePage} /> */}
|
||||
<PrivateRoute path="/" exact component={JKEditProfile} />
|
||||
<PrivateRoute path="/friends/my" component={JKMyFriends} />
|
||||
<PrivateRoute path="/friends" component={JKPeopleFilter} />
|
||||
<PrivateRoute path="/sessions/new" component={JKNewMusicSession} />
|
||||
|
|
|
|||
|
|
@ -75,7 +75,8 @@ const JKNotificationDropdown = () => {
|
|||
'notification-indicator notification-indicator-primary': !isAllRead
|
||||
})}
|
||||
>
|
||||
<FontAwesomeIcon icon="bell" transform="shrink-6" className="fs-4" />
|
||||
{/* <i class="fas fa-bell fa-2x fs-4" data-count="2"></i> */}
|
||||
<FontAwesomeIcon icon={["fas", "bell"]} transform="shrink-5" className="fs-4" />
|
||||
</DropdownToggle>
|
||||
<DropdownMenu right className="dropdown-menu-card" data-testid="notificationDropdown">
|
||||
<Card className="card-notification shadow-none" style={{ maxWidth: '20rem' }}>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ const ProfileDropdown = () => {
|
|||
// }}
|
||||
>
|
||||
<DropdownToggle nav className="pr-0">
|
||||
<JKProfileAvatar url={currentUser.photo_url} className="d-block d-lg-none d-xl-none" />
|
||||
<JKProfileAvatar src={currentUser.photo_url} className="d-block d-lg-none d-xl-none" />
|
||||
{/* <span className="d-none d-lg-block">{currentUser && currentUser.name}</span> */}
|
||||
</DropdownToggle>
|
||||
<DropdownMenu right className="dropdown-menu-card">
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ const TopNavRightSideNavItem = () => {
|
|||
</NavItem> */}
|
||||
|
||||
<NavbarText className="d-none d-md-inline">{t('keep_jamkazam_improving', { ns: 'common' })}:</NavbarText>
|
||||
<NavItem className="d-none d-md-inline ml-1 mr-0">
|
||||
<NavItem className="d-none d-md-inline ml-1 mr-2">
|
||||
<a className="nav-link" href={`${process.env.REACT_APP_CLIENT_BASE_URL}/client#/account/subscription`} target="_blank">
|
||||
{t('subscribe', { ns: 'common' })}
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -470,24 +470,24 @@ function JKEditProfile() {
|
|||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col md={4}>
|
||||
<div className="d-flex align-items-center">
|
||||
<div>
|
||||
<JKProfileAvatar src={currentUser.photo_url} size="4xl" />
|
||||
<Col md={4} className='d-flex flex-column'>
|
||||
<a
|
||||
href="#"
|
||||
onClick={e => {
|
||||
e.preventDefault();
|
||||
toggleAvatarUpload();
|
||||
}}
|
||||
style={{ marginTop: "auto", marginBottom: "auto" }}
|
||||
>
|
||||
<div className="d-flex align-items-center">
|
||||
<div>
|
||||
<JKProfileAvatar src={currentUser.photo_url} size="3xl" />
|
||||
</div>
|
||||
<div>
|
||||
<FontAwesomeIcon icon={['fas', 'edit']} className="ml-2 mr-1" />
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<a
|
||||
href="#"
|
||||
onClick={e => {
|
||||
e.preventDefault();
|
||||
toggleAvatarUpload();
|
||||
}}
|
||||
>
|
||||
<FontAwesomeIcon icon="edit" className="ml-2 mr-1" />
|
||||
{t('change_photo')}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</Col>
|
||||
</Row>
|
||||
<Row>
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import {
|
|||
faSmileBeam as farSmileBeam,
|
||||
faStar as farStar,
|
||||
faMinus as farMinus,
|
||||
faBell as farBell,
|
||||
far,
|
||||
} from '@fortawesome/free-regular-svg-icons';
|
||||
|
||||
|
|
@ -321,6 +322,8 @@ library.add(
|
|||
faInfoCircle,
|
||||
faPhone,
|
||||
faTrello,
|
||||
faMinus,
|
||||
faDownload,
|
||||
|
||||
// Regular
|
||||
farHeart,
|
||||
|
|
@ -344,7 +347,7 @@ library.add(
|
|||
farCircle,
|
||||
farCopy,
|
||||
farComment,
|
||||
faMinus,
|
||||
faDownload,
|
||||
farBell,
|
||||
|
||||
//faAcousticGuitar,
|
||||
);
|
||||
|
|
|
|||
Loading…
Reference in New Issue