Compare commits

..

3 Commits

Author SHA1 Message Date
mashal-m
bba751ba88 build: update lock file 2023-11-29 18:13:10 +05:00
mashal-m
0e65c7b32c Merge branch 'master' of https://github.com/openedx/frontend-component-header into mashal-m/url-test 2023-11-29 17:15:29 +05:00
mashal-m
4c21d5874d refactor: add profile url in config 2023-11-29 17:08:23 +05:00
17 changed files with 4082 additions and 8528 deletions

View File

@@ -1,3 +1,3 @@
const { createConfig } = require('@openedx/frontend-build');
const { createConfig } = require('@edx/frontend-build');
module.exports = createConfig('babel-preserve-modules');

View File

@@ -1,6 +1,6 @@
@import "@edx/brand/paragon/fonts";
@import "@edx/brand/paragon/variables";
@import "@openedx/paragon/scss/core/core";
@import "@edx/paragon/scss/core/core";
@import "@edx/brand/paragon/overrides";
@import "@edx/frontend-component-header/index";

View File

@@ -1,4 +1,4 @@
const { createConfig } = require('@openedx/frontend-build');
const { createConfig } = require('@edx/frontend-build');
module.exports = createConfig('jest', {
setupFilesAfterEnv: [

12486
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -35,13 +35,14 @@
"devDependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/browserslist-config": "^1.1.1",
"@edx/frontend-platform": "6.2.0",
"@edx/frontend-build": "13.0.8",
"@edx/frontend-platform": "6.1.0",
"@edx/reactifex": "^2.1.1",
"@openedx/frontend-build": "13.0.27",
"@openedx/paragon": "21.13.1",
"@testing-library/dom": "9.3.4",
"@testing-library/dom": "9.3.3",
"@testing-library/jest-dom": "5.17.0",
"@testing-library/react": "10.4.9",
"@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
"enzyme": "3.11.0",
"husky": "8.0.3",
"jest": "29.7.0",
"jest-chain": "1.1.6",
@@ -49,16 +50,17 @@
"react": "17.0.2",
"react-dom": "17.0.2",
"react-redux": "7.2.9",
"react-router-dom": "6.21.1",
"react-router-dom": "6.20.0",
"react-test-renderer": "17.0.2",
"redux": "4.2.1",
"redux-saga": "1.3.0"
"redux-saga": "1.2.3"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "6.5.1",
"@fortawesome/free-brands-svg-icons": "6.5.1",
"@fortawesome/free-regular-svg-icons": "6.5.1",
"@fortawesome/free-solid-svg-icons": "6.5.1",
"@edx/paragon": "21.5.6",
"@fortawesome/fontawesome-svg-core": "6.4.2",
"@fortawesome/free-brands-svg-icons": "6.4.2",
"@fortawesome/free-regular-svg-icons": "6.4.2",
"@fortawesome/free-solid-svg-icons": "6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"axios-mock-adapter": "1.22.0",
"babel-polyfill": "6.26.0",
@@ -69,7 +71,6 @@
"@edx/frontend-platform": "^4.0.0 || ^5.0.0 || ^6.0.0",
"prop-types": "^15.5.10",
"react": "^16.9.0 || ^17.0.0",
"react-dom": "^16.9.0 || ^17.0.0",
"@openedx/paragon": ">= 21.5.7 < 22.0.0"
"react-dom": "^16.9.0 || ^17.0.0"
}
}

View File

@@ -22,6 +22,7 @@ ensureConfig([
'SITE_NAME',
'LOGO_URL',
'ORDER_HISTORY_URL',
'ACCOUNT_PROFILE_URL',
], 'Header component');
subscribe(APP_CONFIG_INITIALIZED, () => {

View File

@@ -1,36 +1,36 @@
{
"header.links.courses": "पाठ्यक्रम",
"header.links.programs": "कार्यक्रमों",
"header.links.content.search": "नया खोजें",
"header.links.schools": "स्कूलों और भागीदारों",
"header.user.menu.dashboard": "डैशबोर्ड",
"header.user.menu.profile": "प्रोफ़ाइल",
"header.user.menu.account.settings": "खाता",
"header.user.menu.order.history": "ऑर्डर इतिहास",
"header.user.menu.logout": "लॉग आउट",
"header.user.menu.login": "लॉगिन",
"header.user.menu.register": "साइन अप",
"header.user.menu.studio.home": "स्टूडियो होम",
"header.user.menu.studio.maintenance": "अनुरक्षण करना",
"header.label.account.nav": "खाता",
"header.label.account.menu": "खाता मेनू",
"header.label.account.menu.for": "{username} के लिए खाता मेनू",
"header.label.main.nav": "मुख्य",
"header.label.main.menu": "मुख्य मेनू",
"header.label.main.header": "मुख्य",
"header.label.secondary.nav": "माध्यमिक",
"header.label.skip.nav": "मुख्य विषयवस्तु में जाएं",
"header.label.app.nav": "ऐप",
"general.register.sentenceCase": "रजिस्टर करें",
"general.signIn.sentenceCase": "साइन इन करें",
"header.menu.dashboard.label": "डैशबोर्ड",
"header.help.label": "मदद",
"header.menu.profile.label": "प्रोफ़ाइल",
"header.menu.account.label": "खाता",
"header.menu.orderHistory.label": "ऑर्डर इतिहास",
"header.navigation.skipNavLink": "मुख्य सामग्री पर जाएँ।",
"header.menu.signOut.label": "साइन आउट करें",
"header.user.menu.studio": "स्टूडियो होम",
"header.user.menu.maintenance": "अनुरक्षण करना",
"header.label.courseOutline": "स्टूडियो में पाठ्यक्रम की रूपरेखा पर वापस जाएँ"
"header.links.courses": "Courses",
"header.links.programs": "Programs",
"header.links.content.search": "Discover New",
"header.links.schools": "Schools & Partners",
"header.user.menu.dashboard": "Dashboard",
"header.user.menu.profile": "Profile",
"header.user.menu.account.settings": "Account",
"header.user.menu.order.history": "Order History",
"header.user.menu.logout": "Logout",
"header.user.menu.login": "Login",
"header.user.menu.register": "Sign Up",
"header.user.menu.studio.home": "Studio Home",
"header.user.menu.studio.maintenance": "Maintenance",
"header.label.account.nav": "Account",
"header.label.account.menu": "Account Menu",
"header.label.account.menu.for": "Account menu for {username}",
"header.label.main.nav": "Main",
"header.label.main.menu": "Main Menu",
"header.label.main.header": "Main",
"header.label.secondary.nav": "Secondary",
"header.label.skip.nav": "Skip to main content",
"header.label.app.nav": "App",
"general.register.sentenceCase": "Register",
"general.signIn.sentenceCase": "Sign in",
"header.menu.dashboard.label": "Dashboard",
"header.help.label": "Help",
"header.menu.profile.label": "Profile",
"header.menu.account.label": "Account",
"header.menu.orderHistory.label": "Order History",
"header.navigation.skipNavLink": "Skip to main content.",
"header.menu.signOut.label": "Sign Out",
"header.user.menu.studio": "Studio Home",
"header.user.menu.maintenance": "Maintenance",
"header.label.courseOutline": "Back to course outline in Studio"
}

View File

@@ -3,7 +3,7 @@ import React from 'react';
import { getConfig } from '@edx/frontend-platform';
import { getLoginRedirectUrl } from '@edx/frontend-platform/auth';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import { Button } from '@openedx/paragon';
import { Button } from '@edx/paragon';
import genericMessages from '../generic/messages';

View File

@@ -5,7 +5,7 @@ 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 '@openedx/paragon';
import { Dropdown } from '@edx/paragon';
import messages from './messages';

View File

@@ -1,7 +1,9 @@
/* eslint-disable import/no-extraneous-dependencies */
import Enzyme from 'enzyme';
import React from 'react';
import PropTypes from 'prop-types';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import '@testing-library/jest-dom';
import '@testing-library/jest-dom/extend-expect';
import 'babel-polyfill';
@@ -15,6 +17,8 @@ import { IntlProvider } from 'react-intl';
import AppProvider from '@edx/frontend-platform/react/AppProvider';
import appMessages from './i18n';
Enzyme.configure({ adapter: new Adapter() });
// These configuration values are usually set in webpack's EnvironmentPlugin however
// Jest does not use webpack so we need to set these so for testing
process.env.ACCESS_TOKEN_COOKIE_NAME = 'edx-jwt-cookie-header-payload';

View File

@@ -4,7 +4,7 @@ import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import {
OverlayTrigger,
Tooltip,
} from '@openedx/paragon';
} from '@edx/paragon';
import messages from './messages';
const CourseLockUp = ({

View File

@@ -6,8 +6,8 @@ import {
Container,
Nav,
Row,
} from '@openedx/paragon';
import { Close, MenuIcon } from '@openedx/paragon/icons';
} from '@edx/paragon';
import { Close, MenuIcon } from '@edx/paragon/icons';
import CourseLockUp from './CourseLockUp';
import UserMenu from './UserMenu';

View File

@@ -1,6 +1,6 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { useToggle, ModalPopup } from '@openedx/paragon';
import { useToggle, ModalPopup } from '@edx/paragon';
import HeaderBody from './HeaderBody';
import MobileMenu from './MobileMenu';

View File

@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Collapsible } from '@openedx/paragon';
import { Collapsible } from '@edx/paragon';
const MobileMenu = ({
mainMenuDropdowns,

View File

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import {
Dropdown,
DropdownButton,
} from '@openedx/paragon';
} from '@edx/paragon';
const NavDropdownMenu = ({
id,

View File

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import {
Avatar,
} from '@openedx/paragon';
} from '@edx/paragon';
import NavDropdownMenu from './NavDropdownMenu';
import getUserMenuItems from './utils';

View File

@@ -1,5 +1,5 @@
const path = require('path');
const { createConfig } = require('@openedx/frontend-build');
const { createConfig } = require('@edx/frontend-build');
module.exports = createConfig('webpack-dev', {
entry: path.resolve(__dirname, 'example'),