Correct info site routes

Adds the info site routes as constants in the constants file, instead of using their string value directly. This allows us to update the links in one place in order to keep them consistent and avoid outdated links around the site. Updates the info links throughout the site to use the constant values. Updates the info site routes to use the most current version of the URLs.
opensupplyhub · Nov 10, 2021 · 9df0164 · 9df0164
1 parent 4dfc5bf
commit 9df0164
Show file tree

Hide file tree

Showing 12 changed files with 131 additions and 88 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 
+- Correct info site routes [#1520](https://github.com/open-apparel-registry/open-apparel-registry/pull/1520)
+
 ### Security
 
 ## [51] 2021-11-04

diff --git a/src/app/src/components/Contribute.jsx b/src/app/src/components/Contribute.jsx
@@ -10,7 +10,12 @@ import AppGrid from './AppGrid';
 import AppOverflow from './AppOverflow';
 import ContributeForm from './ContributeForm';
 
-import { listsRoute, authLoginFormRoute, InfoLink } from '../util/constants';
+import {
+    listsRoute,
+    authLoginFormRoute,
+    InfoLink,
+    InfoPaths,
+} from '../util/constants';
 
 function ContributeList({ userHasSignedIn, fetchingSessionSignIn }) {
     if (fetchingSessionSignIn) {
@@ -51,7 +56,7 @@ function ContributeList({ userHasSignedIn, fetchingSessionSignIn }) {
 
                         <p>
                             <a
-                                href={`${InfoLink}/resources/how-to-contribute-data-to-the-oar`}
+                                href={`${InfoLink}/${InfoPaths.contribute}`}
                                 target="_blank"
                                 rel="noreferrer"
                             >
@@ -84,7 +89,7 @@ function ContributeList({ userHasSignedIn, fetchingSessionSignIn }) {
                                     uploaded, you will receive an email letting
                                     you know{' '}
                                     <a
-                                        href={`${InfoLink}/how-the-oar-improves-data-quality`}
+                                        href={`${InfoLink}/${InfoPaths.dataQuality}`}
                                         target="_blank"
                                         rel="noreferrer"
                                     >

diff --git a/src/app/src/components/CookiePreferencesText.jsx b/src/app/src/components/CookiePreferencesText.jsx
@@ -1,17 +1,25 @@
 import React from 'react';
-import { InfoLink } from '../util/constants';
+import { InfoLink, InfoPaths } from '../util/constants';
 
 const CookiePreferencesText = () => (
     <div>
         The Open Apparel Registry uses cookies to collect and analyze site
         performance and usage. By clicking the Accept button, you agree to allow
         us to place cookies and share information with Google Analytics. For
         more information, please visit our{' '}
-        <a href={`${InfoLink}/terms-of-use`} target="_blank" rel="noreferrer">
+        <a
+            href={`${InfoLink}/${InfoPaths.termsOfUse}`}
+            target="_blank"
+            rel="noreferrer"
+        >
             Terms of Use
         </a>{' '}
         and{' '}
-        <a href={`${InfoLink}/privacy-policy`} target="_blank" rel="noreferrer">
+        <a
+            href={`${InfoLink}/${InfoPaths.privacyPolicy}`}
+            target="_blank"
+            rel="noreferrer"
+        >
             Privacy Policy
         </a>
         .

diff --git a/src/app/src/components/EmbeddedFooter.jsx b/src/app/src/components/EmbeddedFooter.jsx
@@ -1,13 +1,10 @@
 import React from 'react';
 import logo from '../styles/images/OAR_PoweredBy_white.svg';
+import { InfoLink } from '../util/constants';
 
 const EmbeddedFooter = () => (
     <footer className="footerContainerEmbedded results-height-subtract" xs={12}>
-        <a
-            href="https://info.openapparel.org/"
-            target="_blank"
-            rel="noopener noreferrer"
-        >
+        <a href={`${InfoLink}`} target="_blank" rel="noopener noreferrer">
             <img
                 className="footer-image"
                 src={logo}

diff --git a/src/app/src/components/EmbeddedMapConfig.jsx b/src/app/src/components/EmbeddedMapConfig.jsx
@@ -138,7 +138,12 @@ function EmbeddedMapConfig({
             </Typography>
             <Typography paragraph style={{ width: '100%' }}>
                 <strong>Have questions?</strong> Check out the FAQs on our{' '}
-                <a href={EmbeddedMapInfoLink} className="inline-link">
+                <a
+                    href={EmbeddedMapInfoLink}
+                    className="inline-link"
+                    target="_blank"
+                    rel="noreferrer"
+                >
                     Embedded Map info page
                 </a>{' '}
                 or email{' '}

diff --git a/src/app/src/components/EmbeddedMapUnauthorized.jsx b/src/app/src/components/EmbeddedMapUnauthorized.jsx
@@ -29,8 +29,10 @@ function EmbeddedMapUnauthorized({ isSettings, error = [] }) {
             </Typography>
             <Typography paragraph>
                 To activate this paid-for feature, check out the{' '}
-                <a href={EmbeddedMapInfoLink}>OAR Embedded Map</a> page on our
-                website for packages and pricing options.
+                <a href={EmbeddedMapInfoLink} target="_blank" rel="noreferrer">
+                    OAR Embedded Map
+                </a>{' '}
+                page on our website for packages and pricing options.
             </Typography>
             {isSettings && (
                 <Typography paragraph>

diff --git a/src/app/src/components/FacilityListItems.jsx b/src/app/src/components/FacilityListItems.jsx
@@ -26,6 +26,7 @@ import {
     authLoginFormRoute,
     dashboardListsRoute,
     InfoLink,
+    InfoPaths,
 } from '../util/constants';
 
 import { facilityListPropType } from '../util/propTypes';
@@ -209,7 +210,7 @@ class FacilityListItems extends Component {
                         <div style={facilityListItemsStyles.subheadStyles}>
                             Read about how your facility data is{' '}
                             <a
-                                href={`${InfoLink}/how-the-oar-improves-data-quality`}
+                                href={`${InfoLink}/${InfoPaths.dataQuality}`}
                                 target="_blank"
                                 rel="noreferrer"
                             >

diff --git a/src/app/src/components/FilterSidebarGuideTab.jsx b/src/app/src/components/FilterSidebarGuideTab.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 
 import { filterSidebarStyles } from '../util/styles';
-import { authRegisterFormRoute } from '../util/constants';
+import { authRegisterFormRoute, InfoLink, InfoPaths } from '../util/constants';
 
 export default function FilterSidebarGuideTab({ vectorTile }) {
     if (!vectorTile) {
@@ -36,7 +36,7 @@ export default function FilterSidebarGuideTab({ vectorTile }) {
                     are able to search the site without creating an account.
                 </p>
                 <a
-                    href="http://info.openapparel.org/about"
+                    href={`${InfoLink}/${InfoPaths.aboutUs}`}
                     target="_blank"
                     rel="noopener noreferrer"
                     className="link-underline"
@@ -120,7 +120,7 @@ export default function FilterSidebarGuideTab({ vectorTile }) {
                 the OAR map.
             </p>
             <a
-                href="http://info.openapparel.org/about"
+                href={`${InfoLink}/${InfoPaths.aboutUs}`}
                 target="_blank"
                 rel="noopener noreferrer"
                 className="link-underline"

diff --git a/src/app/src/components/Footer.jsx b/src/app/src/components/Footer.jsx
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import logo from '../styles/images/Creative-Commons-Attribution-ShareAlike-40-International-Public.png';
 
 import { setGDPROpen } from '../actions/ui';
-import { InfoLink } from '../util/constants';
+import { FooterLinks } from '../util/constants';
 
 const linkButtonStyle = {
     minHeight: 'auto',
@@ -17,54 +17,10 @@ const linkButtonStyle = {
     fontWeight: 700,
 };
 
-const links = [
-    {
-        href: 'https://www.azavea.com/',
-        prefix: 'Built by ',
-        text: 'Azavea',
-        external: true,
-        newTab: true,
-    },
-    {
-        text: 'Cookie Preferences',
-        button: true,
-    },
-    {
-        href: `${InfoLink}/contact`,
-        text: 'Contact us',
-        external: true,
-        newTab: true,
-    },
-    {
-        href: `${InfoLink}/work-with-us`,
-        text: 'Work with us',
-        external: true,
-        newTab: true,
-    },
-    {
-        href: `${InfoLink}/faqs`,
-        text: 'FAQs',
-        external: true,
-        newTab: true,
-    },
-    {
-        href: `${InfoLink}/privacy-policy`,
-        text: 'Privacy policy',
-        external: true,
-        newTab: true,
-    },
-    {
-        href: `${InfoLink}/terms-of-use`,
-        text: 'Terms of use',
-        external: true,
-        newTab: true,
-    },
-];
-
 const Footer = ({ openGDPR }) => (
     <footer className="results-height-subtract" xs={12}>
         <div className="simple-footer">
-            {links.map(l => {
+            {FooterLinks.map(l => {
                 if (l.external && 'prefix' in l) {
                     return (
                         <span

diff --git a/src/app/src/components/Navbar.jsx b/src/app/src/components/Navbar.jsx
@@ -10,7 +10,7 @@ import MainMobileNav from './Navbar/MainMobileNav';
 
 import '../styles/css/header.css';
 
-import { InfoLink } from '../util/constants';
+import { InfoLink, InfoPaths } from '../util/constants';
 
 function Navbar() {
     const [activeSubmenu, setActiveSubmenu] = useState(null);
@@ -37,7 +37,7 @@ function Navbar() {
                 />
                 <a
                     className="nav__link nav__link--level-1"
-                    href={`${InfoLink}/resources`}
+                    href={`${InfoLink}/${InfoPaths.storiesResources}`}
                     target="_blank"
                     rel="noreferrer"
                 >

diff --git a/src/app/src/components/Navbar/MainMobileNav.jsx b/src/app/src/components/Navbar/MainMobileNav.jsx
@@ -4,7 +4,11 @@ import MobileNavParent from './MobileNavParent';
 import BurgerButton from './BurgerButton';
 import MobileContributeButton from './MobileContributeButton';
 
-import { MOBILE_HEADER_HEIGHT, InfoLink } from '../../util/constants';
+import {
+    MOBILE_HEADER_HEIGHT,
+    InfoLink,
+    InfoPaths,
+} from '../../util/constants';
 
 const styles = {
     mobileNavActive: {
@@ -53,7 +57,7 @@ function MainMobileNav({
                 <div className="mobile-nav__item">
                     <a
                         className="mobile-nav__link"
-                        href={`${InfoLink}/resources`}
+                        href={`${InfoLink}/${InfoPaths.storiesResources}`}
                         target="_blank"
                         rel="noreferrer"
                         onClick={handleClose}