Merge pull request #84 from edx/dsheraz/rebrand-logo-update

rebrand logo
openedx · Jan 22, 2021 · e445c3f · e445c3f
2 parents 511cc52 + 72b9fd1
commit e445c3f
Show file tree

Hide file tree

Showing 14 changed files with 5,375 additions and 8,661 deletions.
diff --git a/.env.development b/.env.development
@@ -10,6 +10,10 @@ LMS_BASE_URL='http://localhost:18000'
 DISCOVERY_API_BASE_URL='http://localhost:18381'
 LOGIN_URL='http://localhost:18000/login'
 LOGOUT_URL='http://localhost:18000/logout'
+LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
+LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
+LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg/
+FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 MARKETING_SITE_BASE_URL='http://localhost:18000'
 ORDER_HISTORY_URL='localhost:1996/orders'
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "url": "https://github.com/edx/frontend-app-support/issues"
   },
   "dependencies": {
-    "@edx/frontend-platform": "1.6.1",
+    "@edx/frontend-platform": "^1.8.1",
     "@edx/paragon": "7.2.1",
     "@fortawesome/fontawesome-svg-core": "1.2.32",
     "@fortawesome/free-brands-svg-icons": "5.15.1",
@@ -51,7 +51,7 @@
     "redux": "4.0.5"
   },
   "devDependencies": {
-    "@edx/frontend-build": "3.1.20",
+    "@edx/frontend-build": "^5.5.1",
     "check-prop-types": "1.1.2",
     "codecov": "3.8.1",
     "enzyme": "3.11.0",
@@ -60,6 +60,7 @@
     "glob": "7.1.6",
     "jest": "26.6.3",
     "react-test-renderer": "17.0.1",
-    "reactifex": "1.1.1"
+    "reactifex": "1.1.1",
+    "request": "^2.88.2"
   }
 }
diff --git a/public/index.html b/public/index.html
@@ -4,7 +4,7 @@
       <title>Support Tools | edX</title>
       <meta charset="utf-8">
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+      <link rel="shortcut icon" href="<%=htmlWebpackPlugin.options.FAVICON_URL%>" type="image/x-icon" />
   </head>
   <body>
     <div id="root"></div>

diff --git a/src/Table.jsx b/src/Table.jsx
@@ -152,7 +152,6 @@ export default class Table extends React.Component {
     return element;
   }
 
-
   render() {
     return (
       <table className={classNames(

diff --git a/src/assets/favicon.ico b/src/assets/favicon.ico
diff --git a/src/index.jsx b/src/index.jsx
@@ -16,7 +16,6 @@ import UserPage from './users/UserPage';
 import UserMessagesProvider from './user-messages/UserMessagesProvider';
 
 import './index.scss';
-import './assets/favicon.ico';
 
 subscribe(APP_READY, () => {
   const { administrator } = getAuthenticatedUser();

diff --git a/src/support-header/Header.jsx b/src/support-header/Header.jsx
@@ -14,8 +14,6 @@ import {
 import DesktopHeader from './DesktopHeader';
 import MobileHeader from './MobileHeader';
 
-import LogoSVG from './logo.svg';
-
 ensureConfig([
   'LMS_BASE_URL',
   'LOGOUT_URL',
@@ -139,7 +137,7 @@ export default function Header() {
   ];
 
   const props = {
-    logo: LogoSVG,
+    logo: config.LOGO_URL,
     logoAltText: 'edX',
     siteName: 'edX',
     logoDestination: getConfig().MINIMAL_HEADER ? null : `${config.LMS_BASE_URL}/dashboard`,

diff --git a/src/support-header/Logo.jsx b/src/support-header/Logo.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-
 function Logo({ src, alt, ...attributes }) {
   return (
     <img src={src} alt={alt} {...attributes} />

diff --git a/src/support-header/Menu/Menu.jsx b/src/support-header/Menu/Menu.jsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { CSSTransition } from 'react-transition-group';
 import PropTypes from 'prop-types';
 
-
 function MenuTrigger({ tag, className, ...attributes }) {
   return React.createElement(tag, {
     className: `menu-trigger ${className}`,
@@ -19,7 +18,6 @@ MenuTrigger.defaultProps = {
 };
 const MenuTriggerType = <MenuTrigger />.type;
 
-
 function MenuContent({ tag, className, ...attributes }) {
   return React.createElement(tag, {
     className: ['menu-content', className].join(' '),
@@ -35,7 +33,6 @@ MenuContent.defaultProps = {
   className: null,
 };
 
-
 class Menu extends React.Component {
   constructor(props) {
     super(props);
@@ -140,7 +137,6 @@ class Menu extends React.Component {
     this.close();
   }
 
-
   // Internal functions
 
   getFocusableElements() {
@@ -241,7 +237,6 @@ class Menu extends React.Component {
   }
 }
 
-
 Menu.propTypes = {
   tag: PropTypes.string,
   onClose: PropTypes.func,
@@ -264,5 +259,4 @@ Menu.defaultProps = {
   transitionClassName: 'menu-content',
 };
 
-
 export { Menu, MenuTrigger, MenuContent };
diff --git a/src/support-header/logo.svg b/src/support-header/logo.svg
diff --git a/src/user-messages/Alert.jsx b/src/user-messages/Alert.jsx
@@ -51,7 +51,6 @@ function Alert({
   );
 }
 
-
 Alert.propTypes = {
   type: PropTypes.oneOf(['error', 'danger', 'info', 'success']).isRequired,
   dismissible: PropTypes.bool,
@@ -65,5 +64,4 @@ Alert.defaultProps = {
   onDismiss: null,
 };
 
-
 export default Alert;
diff --git a/src/users/EntitlementForm.jsx b/src/users/EntitlementForm.jsx
@@ -12,7 +12,6 @@ import { postEntitlement, patchEntitlement } from './data/api';
 export const REISSUE = 'reissue';
 export const CREATE = 'create';
 
-
 export default function EntitlementForm({
   formType,
   entitlement,

diff --git a/src/users/UserSearch.jsx b/src/users/UserSearch.jsx
@@ -5,7 +5,6 @@ import PropTypes from 'prop-types';
 
 import { Input, Button } from '@edx/paragon';
 
-
 export default function UserSearch({ userIdentifier, searchHandler }) {
   const searchRef = useRef();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,7 +5,6 @@ import PropTypes from 'prop-types';

		import { Input, Button } from '@edx/paragon';


		export default function UserSearch({ userIdentifier, searchHandler }) {
		const searchRef = useRef();

Expand Down