Skip to content

Commit 12e90fa

Browse files
asadiqbal08asadali145
authored andcommitted
feat: configureable header links
* Added user full name option * nit
1 parent 3b2a2bf commit 12e90fa

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

src/Header.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ ensureConfig([
2727
subscribe(APP_CONFIG_INITIALIZED, () => {
2828
mergeConfig({
2929
AUTHN_MINIMAL_HEADER: !!process.env.AUTHN_MINIMAL_HEADER,
30+
SHOW_FULLNAME: process.env.SHOW_FULLNAME,
3031
}, 'Header additional config');
3132
});
3233

src/learning-header/AuthenticatedUserDropdown.jsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ import PropTypes from 'prop-types';
33

44
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
55
import { faUserCircle } from '@fortawesome/free-solid-svg-icons';
6+
67
import { getConfig } from '@edx/frontend-platform';
78
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
89
import { Dropdown } from '@openedx/paragon';
910

1011
import messages from './messages';
1112

12-
const AuthenticatedUserDropdown = ({ intl, username }) => {
13+
const AuthenticatedUserDropdown = ({ intl, name }) => {
1314
const dashboardMenuItem = (
14-
<Dropdown.Item href={`${getConfig().LMS_BASE_URL}/dashboard`}>
15+
<Dropdown.Item href={`${process.env.MARKETING_SITE_BASE_URL}/dashboard`}>
1516
{intl.formatMessage(messages.dashboard)}
1617
</Dropdown.Item>
1718
);
@@ -23,16 +24,16 @@ const AuthenticatedUserDropdown = ({ intl, username }) => {
2324
<Dropdown.Toggle variant="outline-primary">
2425
<FontAwesomeIcon icon={faUserCircle} className="d-md-none" size="lg" />
2526
<span data-hj-suppress className="d-none d-md-inline">
26-
{username}
27+
{name}
2728
</span>
2829
</Dropdown.Toggle>
2930
<Dropdown.Menu className="dropdown-menu-right">
3031
{dashboardMenuItem}
31-
<Dropdown.Item href={`${getConfig().ACCOUNT_PROFILE_URL}/u/${username}`}>
32+
<Dropdown.Item href={`${getConfig().MARKETING_SITE_BASE_URL}/profile/`}>
3233
{intl.formatMessage(messages.profile)}
3334
</Dropdown.Item>
3435
<Dropdown.Item href={getConfig().ACCOUNT_SETTINGS_URL}>
35-
{intl.formatMessage(messages.account)}
36+
{intl.formatMessage(messages.settings)}
3637
</Dropdown.Item>
3738
{ getConfig().ORDER_HISTORY_URL && (
3839
<Dropdown.Item href={getConfig().ORDER_HISTORY_URL}>
@@ -50,7 +51,7 @@ const AuthenticatedUserDropdown = ({ intl, username }) => {
5051

5152
AuthenticatedUserDropdown.propTypes = {
5253
intl: intlShape.isRequired,
53-
username: PropTypes.string.isRequired,
54+
name: PropTypes.string.isRequired,
5455
};
5556

5657
export default injectIntl(AuthenticatedUserDropdown);

src/learning-header/LearningHeader.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const LearningHeader = ({
3333
const headerLogo = (
3434
<LinkedLogo
3535
className="logo"
36-
href={`${getConfig().LMS_BASE_URL}/dashboard`}
36+
href={`${getConfig().MARKETING_SITE_BASE_URL}`}
3737
src={getConfig().LOGO_URL}
3838
alt={getConfig().SITE_NAME}
3939
/>
@@ -49,9 +49,9 @@ const LearningHeader = ({
4949
<span className="d-block m-0 font-weight-bold course-title">{courseTitle}</span>
5050
</div>
5151
{showUserDropdown && authenticatedUser && (
52-
<AuthenticatedUserDropdown
53-
username={authenticatedUser.username}
54-
/>
52+
<AuthenticatedUserDropdown
53+
name={getConfig().SHOW_FULLNAME ? authenticatedUser.name : authenticatedUser.username}
54+
/>
5555
)}
5656
{showUserDropdown && !authenticatedUser && (
5757
<AnonymousUserMenu />

src/learning-header/messages.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ const messages = defineMessages({
2121
defaultMessage: 'Account',
2222
description: 'The text for the user menu Account navigation link.',
2323
},
24+
settings: {
25+
id: 'header.menu.settings.label',
26+
defaultMessage: 'Settings',
27+
description: 'The text for the user menu Settings navigation link.',
28+
},
2429
orderHistory: {
2530
id: 'header.menu.orderHistory.label',
2631
defaultMessage: 'Order History',

0 commit comments

Comments
 (0)