diff --git a/client/src/assets/images/logos/ALL_White.png b/client/src/assets/images/logos/ALL_White.png deleted file mode 100644 index 8e0e411d4..000000000 Binary files a/client/src/assets/images/logos/ALL_White.png and /dev/null differ diff --git a/client/src/assets/images/logos/ALL_White_Logo.svg b/client/src/assets/images/logos/ALL_White_Logo.svg deleted file mode 100644 index 70fd51dd4..000000000 --- a/client/src/assets/images/logos/ALL_White_Logo.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - >ALL - - - - - Accessible Learning Labs - - - - - - - diff --git a/client/src/assets/images/logos/ALL_logo_blue.png b/client/src/assets/images/logos/ALL_logo_blue.png deleted file mode 100644 index 3e895fd3c..000000000 Binary files a/client/src/assets/images/logos/ALL_logo_blue.png and /dev/null differ diff --git a/client/src/assets/stylesheets/components/App.scss b/client/src/assets/stylesheets/components/App.scss index 7e34f2b7f..5e05bbe50 100644 --- a/client/src/assets/stylesheets/components/App.scss +++ b/client/src/assets/stylesheets/components/App.scss @@ -1924,9 +1924,6 @@ hr.horiz { float: right; clear: both; } -.line-height-0 { - line-height: 0; -} .btn-text { background-color: white; } diff --git a/client/src/components/all-components/BrandedALLModal.js b/client/src/components/all-components/BrandedALLModal.js deleted file mode 100644 index 2234438b2..000000000 --- a/client/src/components/all-components/BrandedALLModal.js +++ /dev/null @@ -1,113 +0,0 @@ -import React from "react"; -import { Modal } from "reactstrap"; -import PropTypes from "prop-types"; -import logo from "../../assets/images/logos/ALL_White.png"; - -const BrandedALLModal = (props) => { - const { isOpen, toggle, direction, body } = props; - - return direction === "row" && window.innerWidth >= 640 ? ( - -
-
-
-
- -
-
-
-
- - {body} -
-
- - ) : ( - -
-
- -
-
- -
-
-
-
-
{body}
-
-
- - ); -}; - -BrandedALLModal.propTypes = { - isOpen: PropTypes.bool.isRequired, - toggle: PropTypes.bool.isRequired, - body: PropTypes.any, - direction: PropTypes.oneOf(["row", "column"]).isRequired, -}; -export default BrandedALLModal; diff --git a/client/src/components/body/landingpage/index.js b/client/src/components/body/landingpage/index.js index 12150c36f..058148bbb 100644 --- a/client/src/components/body/landingpage/index.js +++ b/client/src/components/body/landingpage/index.js @@ -18,7 +18,6 @@ const mapDispatchToProps = (dispatch) => { const Home = (props) => { const { actions } = props; - return (
{/* Header */} diff --git a/client/src/components/body/login/LoginBody.js b/client/src/components/body/login/LoginBody.js deleted file mode 100644 index 89404cb33..000000000 --- a/client/src/components/body/login/LoginBody.js +++ /dev/null @@ -1,65 +0,0 @@ -import React from "react"; -import LoginButton from "../../header/helpers/LoginButton"; -import getExerciseState from "../../../helpers/GetReducer"; -import { EXERCISE_IDLE } from "../../../constants/lab1"; -import useMainStateContext from "../../../reducers/MainContext"; -import PropTypes from "prop-types"; - -const LoginBody = (props) => { - const { state } = useMainStateContext(); - const loginEnabled = - state.main.lab === 0 || - getExerciseState(state, props.state) === EXERCISE_IDLE || - state.main.body !== 2; - - return ( -
-
- Welcome -
-
-

- {" "} - Continue with Google to complete labs, assign labs as an educator, and - keep track of scores.{" "} -

-
- -
-

- {" "} - Sign Up or Log In{" "} -

-
-
- -
-
- ); -}; - -LoginBody.propTypes = { - state: PropTypes.shape({}), -}; - -export default LoginBody; diff --git a/client/src/components/header/helpers/LoginButton.js b/client/src/components/header/helpers/LoginButton.js index c82beb9a7..f256ae2cb 100644 --- a/client/src/components/header/helpers/LoginButton.js +++ b/client/src/components/header/helpers/LoginButton.js @@ -1,6 +1,8 @@ +/* eslint-disable no-undef */ +/* eslint-disable react/prop-types */ +/* eslint-disable require-jsdoc */ import React from "react"; import API from "../../../services/API"; -import PropTypes from "prop-types"; const LoginButton = (props) => { const { enabled } = props; @@ -26,8 +28,4 @@ const LoginButton = (props) => { return
; }; -LoginButton.propTypes = { - enabled: PropTypes.bool, -}; - export default LoginButton; diff --git a/client/tailwind.config.js b/client/tailwind.config.js index 7e966f043..cb177dd0e 100644 --- a/client/tailwind.config.js +++ b/client/tailwind.config.js @@ -1,5 +1,3 @@ -const plugin = require("tailwindcss/plugin"); - /* eslint-disable no-undef */ /* eslint-disable max-len */ module.exports = { @@ -55,21 +53,6 @@ module.exports = { brightRed: "#dc2626", }, extend: { - fontFamily: { - poppins: ["Poppins", "sans-serif"], - calibri: ["Calibri", "sans-serif"], - }, - colors: { - primary: { - yellow: "#FACE35", - blue: "#0144D5", - }, - secondary: { - black: "#000000", - gray: "#CECECE", - white: "#FFFFFF", - }, - }, spacing: { 128: "32rem", 144: "36rem", @@ -113,25 +96,5 @@ module.exports = { bg: ["group", "responsive", "hover", "focus"], }, }, - plugins: [ - plugin(({ addComponents, theme }) => { - addComponents({ - ".title-styling-name": { - fontFamily: theme("fontFamily.poppins"), - fontSize: "2rem", - fontWeight: theme("fontWeight.bold"), - }, - ".sub-title-styling-name": { - fontFamily: theme("fontFamily.calibri"), - fontSize: "1.5rem", - fontWeight: theme("fontWeight.normal"), - }, - ".body-styling-name": { - font: theme("fontFamily.calibri"), - fontSize: "1.125rem", - fontWeight: theme("fontWeight.light"), - }, - }); - }), - ], + plugins: [], }; diff --git a/package-lock.json b/package-lock.json index 5d5d5ef0e..4bb38a008 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,10 +5,8 @@ "packages": { "": { "dependencies": { - "@fontsource/poppins": "^5.1.0", "@redux-devtools/extension": "^3.2.5", "crypto": "^1.0.1", - "font-face": "^2.3.4", "mathjs": "^12.3.2", "nanoid": "^5.0.7", "node-sass": "^9.0.0", @@ -181,11 +179,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/@fontsource/poppins": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@fontsource/poppins/-/poppins-5.1.0.tgz", - "integrity": "sha512-tpLXlnNi2fwQjiipvuj4uNFHCdoLA8izRsKdoexZuEzjx0r/g1aKLf4ta6lFgF7L+/+AFdmaXFlUwwvmDzYH+g==" - }, "node_modules/@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", @@ -2361,11 +2354,6 @@ } } }, - "node_modules/font-face": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/font-face/-/font-face-2.3.4.tgz", - "integrity": "sha512-7Ko9gU36xbTmyeh7mfyJrYB4Gwz6cI+Q/DRMJeAdq3qN8lzlLN5uMTLheCMUpHGStRKLM/mKCv+Pp7zjfMtBxQ==" - }, "node_modules/foreground-child": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", diff --git a/package.json b/package.json index 5498f511b..b347ee7c4 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,8 @@ "scriptname": "cmd" }, "dependencies": { - "@fontsource/poppins": "^5.1.0", "@redux-devtools/extension": "^3.2.5", "crypto": "^1.0.1", - "font-face": "^2.3.4", "mathjs": "^12.3.2", "nanoid": "^5.0.7", "node-sass": "^9.0.0",