From 12020a4a92ce2d483c15c7a6b0b96e27d30b5056 Mon Sep 17 00:00:00 2001 From: hinakhadim Date: Fri, 8 Dec 2023 12:25:46 +0500 Subject: [PATCH] feat: update styling for indigo header --- .github/workflows/release.yml | 2 +- package.json | 15 ++-- .../AuthenticatedUserDropdown.jsx | 68 ++++++++++--------- src/learning-header/LearningHeader.jsx | 16 ++++- 4 files changed, 62 insertions(+), 39 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f39d95c65f..fd16aa6a99 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release CI on: push: branches: - - master + - indigo jobs: release: name: Release diff --git a/package.json b/package.json index 10ab99f3ed..c0fd2c6b8c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "@edx/frontend-component-header", - "version": "1.0.0-semantically-released", + "name": "@edly-io/indigo-frontend-component-header", + "version": "1.0.0", "description": "The standard header for Open edX", "main": "dist/index.js", "publishConfig": { @@ -24,14 +24,14 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/openedx/frontend-component-header.git" + "url": "git+https://github.com/edly-io/frontend-component-header.git" }, "author": "edX", "license": "AGPL-3.0", "bugs": { - "url": "https://github.com/openedx/frontend-component-header/issues" + "url": "https://github.com/edly-io/frontend-component-header/issues" }, - "homepage": "https://github.com/openedx/frontend-component-header#readme", + "homepage": "https://github.com/edly-io/frontend-component-header#readme", "devDependencies": { "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", "@edx/browserslist-config": "^1.1.1", @@ -72,5 +72,10 @@ "prop-types": "^15.5.10", "react": "^16.9.0 || ^17.0.0", "react-dom": "^16.9.0 || ^17.0.0" + }, + "release": { + "branches": [ + "indigo" + ] } } diff --git a/src/learning-header/AuthenticatedUserDropdown.jsx b/src/learning-header/AuthenticatedUserDropdown.jsx index 4090bea46e..cbf6b1b07a 100644 --- a/src/learning-header/AuthenticatedUserDropdown.jsx +++ b/src/learning-header/AuthenticatedUserDropdown.jsx @@ -1,11 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { faUserCircle } from '@fortawesome/free-solid-svg-icons'; import { getConfig } from '@edx/frontend-platform'; import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; -import { Dropdown } from '@edx/paragon'; +import { Dropdown, Image } from '@edx/paragon'; import messages from './messages'; @@ -17,34 +15,42 @@ const AuthenticatedUserDropdown = ({ intl, username }) => { ); return ( - <> - {intl.formatMessage(messages.help)} - - - - - {username} - - - - {dashboardMenuItem} - - {intl.formatMessage(messages.profile)} - - - {intl.formatMessage(messages.account)} - - { getConfig().ORDER_HISTORY_URL && ( - - {intl.formatMessage(messages.orderHistory)} - - )} - - {intl.formatMessage(messages.signOut)} - - - - + + +
+ + + + +
+ Image description + + {username} + +
+ + My Courses + Discover + {dashboardMenuItem} + + {intl.formatMessage(messages.profile)} + + + {intl.formatMessage(messages.account)} + + { getConfig().ORDER_HISTORY_URL && ( + + {intl.formatMessage(messages.orderHistory)} + + )} + + {intl.formatMessage(messages.signOut)} + + +
); }; diff --git a/src/learning-header/LearningHeader.jsx b/src/learning-header/LearningHeader.jsx index 373001d190..cc6fcbf3df 100644 --- a/src/learning-header/LearningHeader.jsx +++ b/src/learning-header/LearningHeader.jsx @@ -45,8 +45,20 @@ const LearningHeader = ({
{headerLogo}
- {courseOrg} {courseNumber} - {courseTitle} +
+ {courseTitle} + {courseOrg} {courseNumber} +
+
+ + My Courses + +
+
+ + Discover + +
{showUserDropdown && authenticatedUser && (