diff --git a/.env.development b/.env.development
index 1d3121bf2..c80fc19e6 100644
--- a/.env.development
+++ b/.env.development
@@ -29,4 +29,3 @@ SITE_URL=
LOGO_ALT_TEXT=
SHOW_LOGO=
SUPPORT_EMAIL=
-
diff --git a/package-lock.json b/package-lock.json
index 296ed2f58..07670a4e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "@edx/frontend-component-footer",
+ "name": "frontend-component-footer-mitol",
"version": "1.0.0-semantically-released",
"lockfileVersion": 1,
"requires": true,
diff --git a/package.json b/package.json
index 030c2f097..e1c0fabdd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
- "name": "@edx/frontend-component-footer",
+ "name": "frontend-component-footer-mitol",
"version": "1.0.0-semantically-released",
- "description": "Footer component for use when building Open edX frontend applications",
+ "description": "Footer component for use when building Open edX frontend applications for MITX",
"main": "dist/index.js",
"publishConfig": {
"access": "public"
@@ -25,14 +25,14 @@
},
"repository": {
"type": "git",
- "url": "git+https://github.com/edx/frontend-component-footer.git"
+ "url": "git+https://github.com/mitodl/frontend-component-footer-mitol"
},
"author": "edX",
"license": "AGPL-3.0",
"bugs": {
- "url": "https://github.com/edx/frontend-component-footer/issues"
+ "url": "https://github.com/mitodl/frontend-component-footer-mitol/issues"
},
- "homepage": "https://github.com/edx/frontend-component-footer#readme",
+ "homepage": "https://github.com/mitodl/frontend-component-footer-mitol#readme",
"devDependencies": {
"@commitlint/cli": "13.2.0",
"@commitlint/config-angular": "13.2.0",
diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx
index af242cfa4..7c70e8e15 100644
--- a/src/components/Footer.jsx
+++ b/src/components/Footer.jsx
@@ -40,8 +40,8 @@ class SiteFooter extends React.Component {
sendTrackEvent(eventName, properties);
}
- renderLinkIfExists(value,text){
- return value &&
{text}
+ renderLinkIfExists(value, text) {
+ return value && {text};
}
render() {
@@ -59,7 +59,8 @@ class SiteFooter extends React.Component {
className="footer d-flex border-top py-3 px-4"
>
- { process.env.SHOW_LOGO &&
+ { process.env.SHOW_LOGO
+ && (
- }
-
- {process.env.TRADEMARK_TEXT &&
- {process.env.TRADEMARK_TEXT}
-
}
+ )}
+
+ {process.env.TRADEMARK_TEXT
+ && (
+
+ {process.env.TRADEMARK_TEXT}
+
+ )}
-
+
{showLanguageSelector && (
diff --git a/src/components/__snapshots__/Footer.test.jsx.snap b/src/components/__snapshots__/Footer.test.jsx.snap
index 7f423261c..80070b0bf 100644
--- a/src/components/__snapshots__/Footer.test.jsx.snap
+++ b/src/components/__snapshots__/Footer.test.jsx.snap
@@ -11,10 +11,10 @@ exports[`
renders correctly renders with a language selector 1`] = `
renders correctly renders with a language selector 1`] = `
}
/>
+
+
+ Trade Mark text
+
+
+
@@ -83,10 +133,10 @@ exports[`
renders correctly renders without a language selector 1`] =
renders correctly renders without a language selector 1`] =
}
/>
+
+
+ Trade Mark text
+
+
+
@@ -113,10 +213,10 @@ exports[`
renders correctly renders without a language selector in es
renders correctly renders without a language selector in es
}
/>
+
+
+ Trade Mark text
+
+
+
diff --git a/src/setupTest.js b/src/setupTest.js
index d53a1982b..4dccac115 100644
--- a/src/setupTest.js
+++ b/src/setupTest.js
@@ -24,3 +24,15 @@ process.env.LOGO_URL = 'https://edx-cdn.org/v3/default/logo.svg';
process.env.LOGO_TRADEMARK_URL = 'https://edx-cdn.org/v3/default/logo-trademark.svg';
process.env.LOGO_WHITE_URL = 'https://edx-cdn.org/v3/default/logo-white.svg';
process.env.FAVICON_URL = 'https://edx-cdn.org/v3/default/favicon.ico';
+process.env.ABOUT_US_URL = 'http://localhost:18000/about';
+process.env.PRIVACY_POLICY_URL = 'http://localhost:18000/privacy';
+process.env.HONOR_CODE_URL = 'http://localhost:18000/tos_and_honor';
+process.env.TERMS_OF_SERVICE_URL = 'http://localhost:18000/tos_and_honor';
+process.env.CONTACT_URL = 'http://localhost:18000/about';
+process.env.SUPPORT_CENTER_URL = 'http://localhost:18000/about';
+process.env.SUPPORT_CENTER_TEXT = 'SUPPORT CENTER';
+process.env.TRADEMARK_TEXT = 'Trade Mark text';
+process.env.SITE_URL = 'http://localhost:18000/';
+process.env.LOGO_ALT_TEXT = 'alt text';
+process.env.SHOW_LOGO = true;
+process.env.SUPPORT_EMAIL = 'webmaster@email.com';