Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
901f39f
chore(deps): update dependency @openedx/frontend-build to v14.2.0 (#557)
renovate[bot] Nov 25, 2024
5e405da
fix(deps): update dependency @openedx/frontend-plugin-framework to v1…
renovate[bot] Dec 2, 2024
d7be18e
chore(deps): update dependency @openedx/frontend-build to v14.2.2 (#559)
renovate[bot] Dec 9, 2024
a5024c3
fix: move `overflow: hidden` to address `mixed-decls` warning (#549)
brian-smith-tcril Dec 9, 2024
a58f1ea
chore(deps): update dependency @edx/frontend-platform to v8.1.3 (#561)
renovate[bot] Dec 16, 2024
d01486e
chore(deps): update dependency react-router-dom to v6.28.1 (#562)
renovate[bot] Dec 23, 2024
227a97a
chore(deps): update dependency @edx/browserslist-config to v1.4.0 (#563)
renovate[bot] Dec 30, 2024
edb2231
chore(deps): update dependency @openedx/paragon to v22.13.0 (#564)
renovate[bot] Dec 30, 2024
ef0b101
chore(deps): update dependency @edx/frontend-platform to v8.1.5 (#566)
renovate[bot] Jan 20, 2025
0dedbbd
docs: Document the owner and drop the old metadata file.
feanil Feb 14, 2025
8c77782
chore(deps): update dependency @edx/browserslist-config to v1.5.0 (#569)
renovate[bot] Feb 17, 2025
48c49fe
revert: fix: Remove Studio Maintenance link (#565)
kdmccormick Feb 19, 2025
5512faa
chore(deps): update dependency @edx/frontend-platform to v8.2.1 (#570)
renovate[bot] Feb 24, 2025
07b1c5b
chore(deps): update dependency @openedx/paragon to v22.15.3 (#572)
renovate[bot] Mar 3, 2025
d7c3e5a
chore(deps): update dependency @edx/frontend-platform to v8.3.1 (#576)
renovate[bot] Mar 10, 2025
8341f17
chore(deps): update dependency @openedx/paragon to v22.16.0 (#577)
renovate[bot] Mar 17, 2025
8d46de8
feat!: remove Paragon 21 support (#578)
brian-smith-tcril Mar 17, 2025
7970561
feat: added support Paragon design tokens (#351)
PKulkoRaccoonGang Mar 18, 2025
2f3b9b8
feat: add react 18 support (#580)
brian-smith-tcril Mar 21, 2025
5076d55
chore(deps): update dependency @edx/frontend-platform to v8.3.3 (#581)
renovate[bot] Mar 24, 2025
6a02c51
chore(deps): update dependency @openedx/paragon to v23.4.2 (#582)
renovate[bot] Mar 24, 2025
90f2e25
chore(deps): update dependency @openedx/paragon to v23.4.3 (#583)
renovate[bot] Mar 31, 2025
e084199
feat: added laber for header dropdown btn
vladislavkeblysh Mar 4, 2025
8ef3a27
chore: remove husky 🪓🐶
regisb Apr 2, 2025
5e77a47
chore(deps): update dependency @edx/frontend-platform to v8.3.4 (#587)
renovate[bot] Apr 21, 2025
8df7d92
chore(deps): update dependency @openedx/paragon to v23.4.5 (#588)
renovate[bot] Apr 21, 2025
95efe7f
feat: standardize slot ids (#589)
brian-smith-tcril Apr 23, 2025
a2dc80f
chore(deps): update dependency @edx/frontend-platform to v8.3.5 (#590)
renovate[bot] May 5, 2025
df704ce
chore(deps): update dependency @openedx/frontend-build to v14.6.0 (#591)
renovate[bot] May 5, 2025
e4720ff
chore(deps): update dependency @openedx/paragon to v23.5.1 (#593)
renovate[bot] May 12, 2025
6796715
chore(deps): update dependency @edx/frontend-platform to v8.3.6 (#592)
renovate[bot] May 12, 2025
ff9cb1b
chore(deps): update dependency @openedx/paragon to v23.6.0 (#594)
renovate[bot] May 19, 2025
ca15863
chore(deps): update dependency react-router-dom to v6.30.0 (#595)
renovate[bot] May 19, 2025
98bc20a
chore(deps): update dependency @edx/frontend-platform to v8.3.7 (#596)
renovate[bot] May 26, 2025
f740d01
chore(deps): update dependency react-router-dom to v6.30.1 (#597)
renovate[bot] May 26, 2025
0c343cf
chore(deps): update dependency @edx/frontend-platform to v8.3.8 (#599)
renovate[bot] Jun 2, 2025
c1db3d4
chore(deps): update dependency @openedx/paragon to v23.10.0 (#600)
renovate[bot] Jun 2, 2025
441e154
chore(deps): update dependency @edx/frontend-platform to v8.3.9 (#601)
renovate[bot] Jun 9, 2025
3be690b
chore(deps): update dependency @openedx/paragon to v23.10.1 (#602)
renovate[bot] Jun 9, 2025
d5ac171
chore(deps): update dependency @edx/frontend-platform to v8.4.0 (#605)
renovate[bot] Jun 16, 2025
ec5381e
chore(deps): update dependency @openedx/paragon to v23.12.2 (#606)
renovate[bot] Jun 16, 2025
2874c96
chore(deps): update dependency @openedx/paragon to v23.13.0 (#614)
renovate[bot] Jun 30, 2025
657e9c0
chore(deps): update dependency @openedx/frontend-build to v14.6.1 (#609)
renovate[bot] Jun 30, 2025
04b3578
fix(deps): update font awesome to v6.7.2 (#610)
renovate[bot] Jun 30, 2025
c63da30
chore(deps): update dependency @openedx/paragon to v23.14.0 (#616)
renovate[bot] Jul 7, 2025
18fefdd
Merge remote-tracking branch 'origin/master' into ahmed/ulmo-upgrade
ahmed-arb Jul 16, 2025
9bcdfbc
fix: update package-lock.json
ahmed-arb Jul 16, 2025
eaca287
feat!: update release branch to ulmo
ahmed-arb Jul 16, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Default CI
on:
push:
branches:
- teak/indigo
- ulmo/indigo
pull_request:
branches:
- "**"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release CI
on:
push:
branches:
- teak/indigo
- ulmo/indigo
jobs:
release:
name: Release
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ module.config.js
.idea/

.vscode
src/i18n/messages
src/i18n/messages
14 changes: 14 additions & 0 deletions catalog-info.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# This file records information about this repo. Its use is described in OEP-55:
# https://open-edx-proposals.readthedocs.io/en/latest/processes/oep-0055-proc-project-maintainers.html

apiVersion: backstage.io/v1alpha1
kind: Component
metadata:
name: "frontend-component-header"
description: "A generic header for the Open edX micro-frontend applications."
annotations:
openedx.org/arch-interest-groups: ""
spec:
owner: group:committers-frontend
type: "library"
lifecycle: "production"
6 changes: 2 additions & 4 deletions example/index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import "@edx/brand/paragon/fonts";
@import "@edx/brand/paragon/variables";
@import "@openedx/paragon/scss/core/core";
@import "@edx/brand/paragon/overrides";
@use "@openedx/paragon/dist/core.min.css" as paragonCore;
@use "@openedx/paragon/dist/light.min.css" as paragonLight;

@import "@edx/frontend-component-header/index";
8 changes: 0 additions & 8 deletions openedx.yaml

This file was deleted.

4,745 changes: 3,531 additions & 1,214 deletions package-lock.json

Large diffs are not rendered by default.

39 changes: 17 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,14 @@
"build": "make build",
"i18n_extract": "fedx-scripts formatjs extract",
"lint": "fedx-scripts eslint --ext .js --ext .jsx .",
"lint:fix": "fedx-scripts eslint --fix --ext .js --ext .jsx .",
"snapshot": "fedx-scripts jest --updateSnapshot",
"start": "fedx-scripts webpack-dev-server --progress",
"test": "fedx-scripts jest --coverage"
},
"files": [
"/dist"
],
"husky": {
"hooks": {
"pre-commit": "npm run lint"
}
},
"repository": {
"type": "git",
"url": "git+https://github.com/edly-io/frontend-component-header.git"
Expand All @@ -35,30 +31,29 @@
"devDependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/browserslist-config": "^1.1.1",
"@edx/frontend-platform": "8.3.4",
"@edx/frontend-platform": "^8.3.1",
"@edx/reactifex": "^2.1.1",
"@openedx/frontend-build": "14.5.0",
"@openedx/paragon": "23.4.5",
"@testing-library/dom": "10.4.0",
"@openedx/frontend-build": "^14.3.2",
"@openedx/paragon": "^23.0.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "5.17.0",
"@testing-library/react": "10.4.9",
"husky": "8.0.3",
"@testing-library/react": "^16.2.0",
"jest": "29.7.0",
"jest-chain": "1.1.6",
"prop-types": "15.8.1",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-redux": "7.2.9",
"react-router-dom": "6.28.0",
"react-test-renderer": "18.3.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-redux": "^8.1.1",
"react-router-dom": "6.30.1",
"react-test-renderer": "^18.3.1",
"redux": "4.2.1",
"redux-saga": "1.3.0"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "6.6.0",
"@fortawesome/free-brands-svg-icons": "6.6.0",
"@fortawesome/free-regular-svg-icons": "6.6.0",
"@fortawesome/free-solid-svg-icons": "6.6.0",
"@fortawesome/fontawesome-svg-core": "6.7.2",
"@fortawesome/free-brands-svg-icons": "6.7.2",
"@fortawesome/free-regular-svg-icons": "6.7.2",
"@fortawesome/free-solid-svg-icons": "6.7.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@openedx/frontend-plugin-framework": "^1.7.0",
"axios-mock-adapter": "1.22.0",
Expand All @@ -71,7 +66,7 @@
},
"peerDependencies": {
"@edx/frontend-platform": "^7.0.0 || ^8.0.0",
"@openedx/paragon": ">= 21.5.7 < 24.0.0",
"@openedx/paragon": ">= 22.0.0 < 24.0.0",
"prop-types": "^15.5.10",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0",
Expand All @@ -80,7 +75,7 @@
"release": {
"tagFormat": "indigo-${version}",
"branches": [
"teak/indigo"
"ulmo/indigo"
]
}
}
5 changes: 5 additions & 0 deletions src/Header.messages.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ const messages = defineMessages({
defaultMessage: 'Studio Home',
description: 'Link to the Studio Home',
},
'header.user.menu.studio.maintenance': {
id: 'header.user.menu.studio.maintenance',
defaultMessage: 'Maintenance',
description: 'Link to the Studio Maintenance',
},
'header.label.account.nav': {
id: 'header.label.account.nav',
defaultMessage: 'Account',
Expand Down
12 changes: 6 additions & 6 deletions src/Menu/menu.scss
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
.menu {
position: relative;
}

.menu-content {
position: absolute;
top: 100%;
z-index: 10;
background: #fff;
background: var(--pgn-color-white, #fff);
min-width: 10rem;

&.pin-left {
left: 0;
}

&.pin-right {
right: 0;
}
}


.menu-dropdown-enter {
opacity: 0;
transform-origin: 75% 0;
transform: scale3d(0.8, 0.8, 1);
}

.menu-dropdown-enter-active {
transform-origin: 75% 0;
transition: all 250ms cubic-bezier(0.4, 0, 0.2, 1);
transform: scale3d(1, 1, 1);
opacity: 1;
}
.menu-dropdown-enter-done {
}

.menu-dropdown-exit {
transform-origin: 75% 0;
transform: scale3d(1, 1, 1);
opacity: 1;
}

.menu-dropdown-exit-active {
transform-origin: 75% 0;
transform: scale3d(0.8, 0.8, 1);
transition: all 250ms cubic-bezier(0.8, 0, 0.6, 1);
opacity: 0;
}
.menu-dropdown-exit-done {
}
51 changes: 29 additions & 22 deletions src/index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
$spacer: 1rem;
$blue: #007db8;
$white: #fff;
$component-active-bg: #0A3055FF !default;
$component-active-color: $white !default;
$rounded-pill: 50rem !default;

@import './Menu/menu.scss';
@import './studio-header/StudioHeader.scss';
Expand All @@ -21,8 +24,9 @@ $white: #fff;
padding: .75rem;
justify-content: center;
align-items:center;

&:hover, &:focus {
background: rgba(0,0,0,.1);
background: rgba(0, 0, 0, .1);
}
}

Expand All @@ -36,17 +40,12 @@ $white: #fff;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
padding-bottom: 0.1rem;
padding-bottom: calc(var(--pgn-spacing-spacer-base, $spacer)* 0.1);
}
}

.user-dropdown {
.btn {
height: 3rem;
// @media (max-width: -1 + map-get($grid-breakpoints, "sm")) {
// padding: 0 0.5rem;
// }
}
.user-dropdown .btn {
height: 3rem;
}
}

Expand All @@ -63,26 +62,30 @@ $white: #fff;
text-decoration: none;
cursor: pointer;
}

img {
height: 1.5rem;
}
}


.site-header-desktop {
box-shadow: 0 1px 0 0 rgba(0,0,0,.1);
background: $white;
box-shadow: 0 1px 0 0 rgba(0, 0, 0, .1);
background: var(--pgn-color-white, $white);

.nav-link {
text-decoration: none;
}

.logo {
display: block;
box-sizing: content-box;
position: relative;
top: -.05em;
height: 1.75rem;
padding: 1rem 0;
margin-right: 1rem;
padding: var(--pgn-spacing-spacer-base, $spacer) 0;
margin-right: var(--pgn-spacing-spacer-base, $spacer);

img {
display: block;
height: 100%;
Expand All @@ -93,38 +96,42 @@ $white: #fff;
.nav-link:focus,
.nav-link.active,
.expanded .nav-link {
background: $component-active-bg;
color: $component-active-color;
background: var(--pgn-color-bg-active, $component-active-bg);
color: var(--pgn-color-active, $component-active-color);
}
}
.main-nav {
.nav-link {
padding: 1.125rem 1rem;
padding: 1.125rem var(--pgn-spacing-spacer-base, $spacer);
text-decoration: none;
font-weight: 500;
letter-spacing: .01em;
}

.nav-link:hover,
.nav-link:focus,
.nav-link.active,
.expanded .nav-link {
background: $component-active-bg;
color: $component-active-color;
background: var(--pgn-color-bg-active, $component-active-bg);
color: var(--pgn-color-active, $component-active-color);
}

.menu {
position: static;

.menu-content {
border-top: solid 2px $component-active-bg;
border-top: solid 2px var(--pgn-color-bg-active);
left: 0;
right: 0;
box-shadow: 0 1px 2px rgba(0,0,0,.25);
box-shadow: var(--pgn-elevation-box-shadow-down-1, 0 1px 2px rgba(0,0,0,.25));
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px;
padding: 1rem;
padding: var(--pgn-spacing-spacer-base, $spacer);
}
}
}

.search-input {
border-radius: $rounded-pill;
border-radius: var(--pgn-size-rounded-pill, $rounded-pill);
}
}
5 changes: 5 additions & 0 deletions src/learning-header/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ const messages = defineMessages({
defaultMessage: 'Sign Out',
description: 'The label for the user menu Sign Out action.',
},
userOptionsDropdownLabel: {
id: 'header.menu.aria-label',
defaultMessage: 'User Options',
description: 'The aria-label for the user options dropdown.',
},
});

export default messages;
11 changes: 7 additions & 4 deletions src/plugin-slots/CourseInfoSlot/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Course Info Slot

### Slot ID: `course_info_slot`
### Slot ID: `org.openedx.frontend.layout.header_learning_course_info.v1`

### Slot ID Aliases
* `course_info_slot`

## Description

Expand All @@ -24,7 +27,7 @@ const replaceCourseTitle = ( widget ) => {

const config = {
pluginSlots: {
course_info_slot: {
'org.openedx.frontend.layout.header_learning_course_info.v1': {
keepDefault: true,
plugins: [
{
Expand All @@ -51,7 +54,7 @@ import { DIRECT_PLUGIN, PLUGIN_OPERATIONS } from '@openedx/frontend-plugin-frame

const config = {
pluginSlots: {
course_info_slot: {
'org.openedx.frontend.layout.header_learning_course_info.v1': {
keepDefault: false,
plugins: [
{
Expand Down Expand Up @@ -83,7 +86,7 @@ import { DIRECT_PLUGIN, PLUGIN_OPERATIONS } from '@openedx/frontend-plugin-frame

const config = {
pluginSlots: {
course_info_slot: {
'org.openedx.frontend.layout.header_learning_course_info.v1': {
keepDefault: true,
plugins: [
{
Expand Down
3 changes: 2 additions & 1 deletion src/plugin-slots/CourseInfoSlot/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ const CourseInfoSlot = ({
...attributes
}) => (
<PluginSlot
id="course_info_slot"
id="org.openedx.frontend.layout.header_learning_course_info.v1"
idAliases={['course_info_slot']}
slotOptions={{
mergeProps: true,
}}
Expand Down
Loading