Skip to content

Commit f3518f5

Browse files
committed
refactor: improve code
1 parent 61384a0 commit f3518f5

File tree

2 files changed

+31
-20
lines changed

2 files changed

+31
-20
lines changed

.env.development

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
2121
LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
2222
LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
2323
FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
24-
ACCESSIBILITY_URL=
25-
ABOUT_US_URL=
26-
HONOR_CODE_URL=
27-
CONTACT_URL=
28-
SUPPORT_CENTER_URL=
29-
SUPPORT_CENTER_TEXT=
30-
TRADEMARK_TEXT=
31-
LOGO_ALT_TEXT=
32-
SHOW_LOGO=
24+
ACCESSIBILITY_URL=null
25+
ABOUT_US_URL=null
26+
HONOR_CODE_URL=null
27+
CONTACT_URL=null
28+
SUPPORT_CENTER_URL=null
29+
SUPPORT_CENTER_TEXT=null
30+
TRADEMARK_TEXT=null
31+
LOGO_ALT_TEXT=null
32+
SHOW_LOGO=null

src/components/Footer.jsx

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ import LanguageSelector from './LanguageSelector';
1111
ensureConfig([
1212
'LMS_BASE_URL',
1313
'LOGO_TRADEMARK_URL',
14+
'SHOW_LOGO',
15+
'LOGO_ALT_TEXT',
16+
'TRADEMARK_TEXT',
17+
'ABOUT_US_URL',
18+
'TERMS_OF_SERVICE_URL',
19+
'PRIVACY_POLICY_URL',
20+
'HONOR_CODE_URL',
21+
'CONTACT_URL',
22+
'ACCESSIBILITY_URL',
23+
'SUPPORT_CENTER_URL',
24+
'SUPPORT_CENTER_TEXT',
1425
], 'Footer component');
1526

1627
const EVENT_NAMES = {
@@ -52,7 +63,7 @@ class SiteFooter extends React.Component {
5263
className="footer d-flex border-top py-3 px-4"
5364
>
5465
<div className="container-fluid d-flex">
55-
{ process.env.SHOW_LOGO
66+
{ config.SHOW_LOGO
5667
&& (
5768
<a
5869
className="d-block"
@@ -62,26 +73,26 @@ class SiteFooter extends React.Component {
6273
<img
6374
style={{ maxHeight: 45 }}
6475
src={logo || config.LOGO_TRADEMARK_URL}
65-
alt={process.env.LOGO_ALT_TEXT || intl.formatMessage(messages['footer.logo.altText'])}
76+
alt={config.LOGO_ALT_TEXT || intl.formatMessage(messages['footer.logo.altText'])}
6677
/>
6778
</a>
6879
)}
6980
<div className="copyright-col">
70-
{process.env.TRADEMARK_TEXT
81+
{config.TRADEMARK_TEXT
7182
&& (
7283
<div className="text-gray-500 small">
73-
{process.env.TRADEMARK_TEXT}
84+
{config.TRADEMARK_TEXT}
7485
</div>
7586
)}
7687
<div>
7788
<ul className="footer-sub-nav">
78-
{this.renderLinkIfExists(process.env.ABOUT_US_URL, 'About Us')}
79-
{this.renderLinkIfExists(process.env.TERMS_OF_SERVICE_URL, 'Terms of Service')}
80-
{this.renderLinkIfExists(process.env.PRIVACY_POLICY_URL, 'Privacy Policy')}
81-
{this.renderLinkIfExists(process.env.HONOR_CODE_URL, 'Honor Code')}
82-
{this.renderLinkIfExists(process.env.CONTACT_URL, 'Contact Us')}
83-
{this.renderLinkIfExists(process.env.ACCESSIBILITY_URL, 'Accessibility')}
84-
{this.renderLinkIfExists(process.env.SUPPORT_CENTER_URL, process.env.SUPPORT_CENTER_TEXT || 'FAQ & Help')}
89+
{this.renderLinkIfExists(config.ABOUT_US_URL, 'About Us')}
90+
{this.renderLinkIfExists(config.TERMS_OF_SERVICE_URL, 'Terms of Service')}
91+
{this.renderLinkIfExists(config.PRIVACY_POLICY_URL, 'Privacy Policy')}
92+
{this.renderLinkIfExists(config.HONOR_CODE_URL, 'Honor Code')}
93+
{this.renderLinkIfExists(config.CONTACT_URL, 'Contact Us')}
94+
{this.renderLinkIfExists(config.ACCESSIBILITY_URL, 'Accessibility')}
95+
{this.renderLinkIfExists(config.SUPPORT_CENTER_URL, config.SUPPORT_CENTER_TEXT || 'FAQ & Help')}
8596
</ul>
8697
</div>
8798
</div>

0 commit comments

Comments
 (0)