diff --git a/package-lock.json b/package-lock.json index cb2d16d..bae5b66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2636,6 +2636,7 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz", "integrity": "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==", + "dev": true, "license": "MIT", "optional": true, "dependencies": { @@ -2647,6 +2648,7 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz", "integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==", + "dev": true, "license": "MIT", "optional": true, "dependencies": { @@ -2657,6 +2659,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz", "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==", + "dev": true, "license": "MIT", "optional": true, "dependencies": { @@ -3262,6 +3265,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "Apache-2.0", "optional": true, "os": [ @@ -3284,6 +3288,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "Apache-2.0", "optional": true, "os": [ @@ -3306,6 +3311,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3322,6 +3328,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3338,6 +3345,7 @@ "cpu": [ "arm" ], + "dev": true, "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3354,6 +3362,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3370,6 +3379,7 @@ "cpu": [ "ppc64" ], + "dev": true, "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3386,6 +3396,7 @@ "cpu": [ "s390x" ], + "dev": true, "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3402,6 +3413,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3418,6 +3430,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3434,6 +3447,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3450,6 +3464,7 @@ "cpu": [ "arm" ], + "dev": true, "license": "Apache-2.0", "optional": true, "os": [ @@ -3472,6 +3487,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "Apache-2.0", "optional": true, "os": [ @@ -3494,6 +3510,7 @@ "cpu": [ "ppc64" ], + "dev": true, "license": "Apache-2.0", "optional": true, "os": [ @@ -3516,6 +3533,7 @@ "cpu": [ "s390x" ], + "dev": true, "license": "Apache-2.0", "optional": true, "os": [ @@ -3538,6 +3556,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "Apache-2.0", "optional": true, "os": [ @@ -3560,6 +3579,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "Apache-2.0", "optional": true, "os": [ @@ -3582,6 +3602,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "Apache-2.0", "optional": true, "os": [ @@ -3604,6 +3625,7 @@ "cpu": [ "wasm32" ], + "dev": true, "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", "optional": true, "dependencies": { @@ -3623,6 +3645,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "Apache-2.0 AND LGPL-3.0-or-later", "optional": true, "os": [ @@ -3642,6 +3665,7 @@ "cpu": [ "ia32" ], + "dev": true, "license": "Apache-2.0 AND LGPL-3.0-or-later", "optional": true, "os": [ @@ -3661,6 +3685,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "Apache-2.0 AND LGPL-3.0-or-later", "optional": true, "os": [ @@ -4731,6 +4756,7 @@ "version": "0.2.12", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz", "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==", + "dev": true, "license": "MIT", "optional": true, "dependencies": { @@ -4759,6 +4785,7 @@ "version": "2.1.8-no-fsevents.3", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz", "integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==", + "dev": true, "license": "MIT", "optional": true }, @@ -6070,6 +6097,7 @@ "version": "0.10.1", "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz", "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==", + "dev": true, "license": "MIT", "optional": true, "dependencies": { @@ -6899,6 +6927,7 @@ "cpu": [ "arm" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -6912,6 +6941,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -6925,6 +6955,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -6938,6 +6969,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -6951,6 +6983,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -6964,6 +6997,7 @@ "cpu": [ "arm" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -6977,6 +7011,7 @@ "cpu": [ "arm" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -6990,6 +7025,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -7003,6 +7039,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -7016,6 +7053,7 @@ "cpu": [ "ppc64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -7029,6 +7067,7 @@ "cpu": [ "riscv64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -7042,6 +7081,7 @@ "cpu": [ "riscv64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -7055,6 +7095,7 @@ "cpu": [ "s390x" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -7068,6 +7109,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -7081,6 +7123,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -7094,6 +7137,7 @@ "cpu": [ "wasm32" ], + "dev": true, "license": "MIT", "optional": true, "dependencies": { @@ -7110,6 +7154,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -7123,6 +7168,7 @@ "cpu": [ "ia32" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -7136,6 +7182,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -10742,6 +10789,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, "license": "BSD-3-Clause", "optional": true, "engines": { @@ -12465,6 +12513,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, @@ -19260,9 +19309,9 @@ } }, "node_modules/react-share": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/react-share/-/react-share-5.2.2.tgz", - "integrity": "sha512-z0nbOX6X6vHHWAvXduNkYeJUKTKNpKM5Xpmc5a2BxjJhUWl+sE7AsSEMmYEUj2DuDjZr5m7KFIGF0sQPKcUN6w==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/react-share/-/react-share-5.3.0.tgz", + "integrity": "sha512-NU4TqizVi2TuyLpN93/ng2ux+uIGHK5b2dT15cHvZDwfi5b5NuzGych4htCGObN8lubygeamhRxUot4lZ0Pv6Q==", "license": "MIT", "dependencies": { "classnames": "^2.3.2", diff --git a/src/App.jsx b/src/App.jsx index c8d914f..66abadd 100755 --- a/src/App.jsx +++ b/src/App.jsx @@ -6,7 +6,6 @@ import { logError } from '@edx/frontend-platform/logging'; import { initializeHotjar } from '@edx/frontend-enterprise-hotjar'; import { ErrorPage } from '@edx/frontend-platform/react'; -import { FooterSlot } from '@edx/frontend-component-footer'; import { Alert } from '@openedx/paragon'; import Dashboard from 'containers/Dashboard'; @@ -61,7 +60,6 @@ export const App = () => { )} - ); diff --git a/src/App.scss b/src/App.scss index bd72d63..630a6c2 100755 --- a/src/App.scss +++ b/src/App.scss @@ -4,6 +4,85 @@ $fa-font-path: "~font-awesome/fonts"; @import "~font-awesome/scss/font-awesome"; +// Andal Learning Brand Colors - Override Paragon variables +:root { + --pgn-color-primary: #ff4f00; + --pgn-color-primary-100: #ffe6cc; + --pgn-color-primary-200: #ffcc99; + --pgn-color-primary-300: #ffb366; + --pgn-color-primary-400: #ff9933; + --pgn-color-primary-500: #ff4f00; + --pgn-color-primary-600: #cc3f00; + --pgn-color-primary-700: #992f00; + --pgn-color-primary-800: #661f00; + --pgn-color-primary-900: #330f00; + --pgn-color-action-primary: #ff4f00; + --pgn-color-action-primary-hover: #cc3f00; + --pgn-color-action-primary-focus: #992f00; + --pgn-color-action-primary-active: #992f00; +} + +// Override all button variants to use Andal orange +.btn-primary { + background-color: #ff4f00 !important; + border-color: #ff4f00 !important; + + &:hover { + background-color: #cc3f00 !important; + border-color: #cc3f00 !important; + } + + &:focus { + background-color: #992f00 !important; + border-color: #992f00 !important; + box-shadow: 0 0 0 2px #ffcc99 !important; + } +} + +.btn-outline-primary { + color: #ff4f00 !important; + border-color: #ff4f00 !important; + + &:hover { + background-color: #ff4f00 !important; + color: #fff !important; + } + + &:focus { + box-shadow: 0 0 0 2px #ffcc99 !important; + } +} + +.btn-brand { + background-color: #ff4f00 !important; + border-color: #ff4f00 !important; + color: #fff !important; + + &:hover { + background-color: #cc3f00 !important; + border-color: #cc3f00 !important; + } + + &:focus { + box-shadow: 0 0 0 2px #ffcc99 !important; + } +} + +// Override link colors +a { + color: #ff4f00; + + &:hover { + color: #cc3f00; + } +} + +// Override active states +.active { + background-color: #ff4f00 !important; + color: #fff !important; +} + $input-focus-box-shadow: var(--pgn-elevation-form-input-base); // hack to get upgrade to paragon 4.0.0 to work @import "~@edx/frontend-component-header/dist/index"; diff --git a/src/assets/complete-logo.svg b/src/assets/complete-logo.svg new file mode 100644 index 0000000..50e7361 --- /dev/null +++ b/src/assets/complete-logo.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/containers/Dashboard/DashboardLayout.jsx b/src/containers/Dashboard/DashboardLayout.jsx index 4c68236..c0e6b2b 100644 --- a/src/containers/Dashboard/DashboardLayout.jsx +++ b/src/containers/Dashboard/DashboardLayout.jsx @@ -47,6 +47,7 @@ export const DashboardLayout = ({ children }) => { ); }; + DashboardLayout.propTypes = { children: PropTypes.node.isRequired, }; diff --git a/src/containers/LearnerDashboardHeader/messages.js b/src/containers/LearnerDashboardHeader/messages.js index 08c71cd..1ff2da8 100644 --- a/src/containers/LearnerDashboardHeader/messages.js +++ b/src/containers/LearnerDashboardHeader/messages.js @@ -63,8 +63,8 @@ const messages = defineMessages({ }, logoAltText: { id: 'learnerVariantDashboard.logoAltText', - defaultMessage: 'edX, Inc. Dashboard', - description: 'Alt text for the edX logo.', + defaultMessage: 'Andal Learning Dashboard', + description: 'Alt text for the Andal Learning logo.', }, collapseMenuOpenAltText: { id: 'learnerVariantDashboard.collapseMenuOpenAltText', diff --git a/webpack.dev-tutor.config.js b/webpack.dev-tutor.config.js new file mode 100644 index 0000000..e69de29