WV-504 fixed Team link in footer to stay with quality.wevote.us websi…

…te [TEAM REVIEW]
wevote · Sep 10, 2024 · 910920d · 910920d
1 parent dc2344f
commit 910920d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/src/js/common/components/FAQBody.jsx b/src/js/common/components/FAQBody.jsx
@@ -4,6 +4,7 @@ import styled from 'styled-components';
 import { isCordova, isWebApp } from '../utils/isCordovaOrWebApp';
 import { renderLog } from '../utils/logging';
 import ToolBar from './Widgets/ToolBar';
+import webAppConfig from "../../config";
 
 
 const OpenExternalWebSite = React.lazy(() => import(/* webpackChunkName: 'OpenExternalWebSite' */ './Widgets/OpenExternalWebSite'));
@@ -128,7 +129,7 @@ export default class FAQBody extends Component {
         <Suspense fallback={<></>}>
           <OpenExternalWebSite
             linkIdAttribute="weVoteAboutUsPage"
-            url="https://quality.WeVote.US/more/about"
+            url={`${webAppConfig.WE_VOTE_URL_PROTOCOL + webAppConfig.WE_VOTE_HOSTNAME}/more/about`}
             target="_blank"
             body="volunteer board members"
           />

diff --git a/src/js/components/Navigation/FooterMainWeVote.jsx b/src/js/components/Navigation/FooterMainWeVote.jsx
@@ -7,6 +7,7 @@ import OpenExternalWebSite from '../../common/components/Widgets/OpenExternalWeb
 import AppObservableStore from '../../common/stores/AppObservableStore';
 import { isWebApp } from '../../common/utils/isCordovaOrWebApp';
 import VoterStore from '../../stores/VoterStore';
+import webAppConfig from "../../config";
 
 const BallotElectionListWithFilters = React.lazy(() => import(/* webpackChunkName: 'BallotElectionListWithFilters' */ '../Ballot/BallotElectionListWithFilters'));
 const DeleteAllContactsButton = React.lazy(() => import(/* webpackChunkName: 'DeleteAllContactsButton' */ '../SetUpAccount/DeleteAllContactsButton'));
@@ -108,7 +109,7 @@ class FooterMainWeVote extends Component {
                   <RowSpacer />
                   <OpenExternalWebSite
                     linkIdAttribute="footerLinkTeam"
-                    url="https://quality.wevote.us/more/about"
+                    url={`${webAppConfig.WE_VOTE_URL_PROTOCOL + webAppConfig.WE_VOTE_HOSTNAME}/more/about`}
                     target="_blank"
                     body={(
                       <span>Team</span>
@@ -118,7 +119,7 @@ class FooterMainWeVote extends Component {
                   <RowSpacer />
                   <OpenExternalWebSite
                     linkIdAttribute="footerLinkCredits"
-                    url="https://quality.wevote.us/more/credits"
+                    url={`${webAppConfig.WE_VOTE_URL_PROTOCOL + webAppConfig.WE_VOTE_HOSTNAME}/more/credits`}
                     target="_blank"
                     body={(
                       <span>Credits &amp; Thanks</span>

diff --git a/src/js/components/Navigation/SettingsSectionFooter.jsx b/src/js/components/Navigation/SettingsSectionFooter.jsx
@@ -10,6 +10,7 @@ import { isTablet } from '../../common/utils/isMobileScreenSize';
 import { renderLog } from '../../common/utils/logging';
 import { DeviceInformationSpan, TermsAndPrivacyText } from '../Style/pageLayoutStyles';
 import DeviceDialog from '../Widgets/DeviceDialog';
+import webAppConfig from "../../config";
 
 
 class SettingsSectionFooter extends Component {
@@ -95,7 +96,7 @@ class SettingsSectionFooter extends Component {
             <>
               <OpenExternalWebSite
                 linkIdAttribute="footerLinkTeam"
-                url="https://quality.wevote.us/more/about"
+                url={`${webAppConfig.WE_VOTE_URL_PROTOCOL + webAppConfig.WE_VOTE_HOSTNAME}/more/about`}
                 target="_blank"
                 body={(
                   <TermsAndPrivacyText>Team</TermsAndPrivacyText>
@@ -104,7 +105,7 @@ class SettingsSectionFooter extends Component {
               <span style={{ paddingLeft: 15 }} />
               <OpenExternalWebSite
                 linkIdAttribute="footerLinkCredit"
-                url="https://quality.wevote.us/more/credits"
+                url={`${webAppConfig.WE_VOTE_URL_PROTOCOL + webAppConfig.WE_VOTE_HOSTNAME}/more/credits`}
                 target="_blank"
                 body={(
                   <TermsAndPrivacyText className="u-no-break">Credits &amp; Thanks</TermsAndPrivacyText>

diff --git a/src/js/pages/More/Credits.jsx b/src/js/pages/More/Credits.jsx
@@ -6,6 +6,7 @@ import CreditsBody from '../../common/components/CreditsBody';
 import { renderLog } from '../../common/utils/logging';
 import { Section } from '../../components/Welcome/sectionStyles';
 import cordovaScrollablePaneTopPadding from '../../utils/cordovaScrollablePaneTopPadding';
+import webAppConfig from "../../config";
 
 const WelcomeAppbar = React.lazy(() => import(/* webpackChunkName: 'WelcomeAppbar' */ '../../components/Navigation/WelcomeAppbar'));
 const WelcomeFooter = React.lazy(() => import(/* webpackChunkName: 'WelcomeFooter' */ '../../components/Welcome/WelcomeFooter'));
@@ -26,7 +27,7 @@ class Credits extends Component {
       <Wrapper>
         <Helmet>
           <title>Credits - WeVote</title>
-          <link rel="canonical" href="https://quality.wevote.us/more/credits" />
+          <link rel="canonical" href={`${webAppConfig.WE_VOTE_URL_PROTOCOL + webAppConfig.WE_VOTE_HOSTNAME}/more/credits`} />
         </Helmet>
         <Suspense fallback={<></>}>
           <WelcomeAppbar pathname="/more/pricing" />

diff --git a/tests/browserstack_automation/specs/FAQPage.js b/tests/browserstack_automation/specs/FAQPage.js
@@ -1,6 +1,7 @@
 import { driver, expect } from '@wdio/globals';
 import ReadyPage from '../page_objects/ready.page';
 import FAQPage from '../page_objects/faq.page';
+import webAppConfig from "../../../src/js/config";
 
 const assert = require('assert');
 const { describe, it } = require('mocha');
@@ -113,7 +114,7 @@ describe('FAQPage', () => {
     await ReadyPage.waitAboutLinkAndClick();
     await driver.pause(waitTime);
     await FAQPage.getAboutPageTitleElement.click();
-    driver.switchWindow('https://quality.wevote.us/more/about');
+    driver.switchWindow(`${webAppConfig.WE_VOTE_URL_PROTOCOL + webAppConfig.WE_VOTE_HOSTNAME}/more/about`);
     await driver.pause(waitTime);
     await expect(driver).toHaveTitle('About WeVote');
   });

diff --git a/tests/browserstack_automation/specs/ReadyPage.js b/tests/browserstack_automation/specs/ReadyPage.js
@@ -3,6 +3,7 @@ import ReadyPage from '../page_objects/ready.page';
 import PrivacyPage from '../page_objects/privacy.page';
 import DonatePage from '../page_objects/donate.page';
 import TermsPage from '../page_objects/terms.page';
+import webAppConfig from "../../../src/js/config";
 
 const waitTime = 8000;
 
@@ -192,7 +193,7 @@ describe('ReadyPage', () => {
     await driver.pause(waitTime);
     await ReadyPage.getTeamLinkElement.click();
     await driver.pause(waitTime);
-    await driver.switchWindow('https://quality.wevote.us/more/about');
+    await driver.switchWindow(`${webAppConfig.WE_VOTE_URL_PROTOCOL + webAppConfig.WE_VOTE_HOSTNAME}/more/about`);
     await driver.pause(waitTime);
     await expect(ReadyPage.getTeamPageTitleElement).toHaveText('About WeVote');
   });
@@ -203,7 +204,7 @@ describe('ReadyPage', () => {
     await driver.pause(waitTime);
     await ReadyPage.getCreditsAndThanksElement.click();
     await driver.pause(waitTime);
-    await driver.switchWindow('https://quality.wevote.us/more/credits');
+    await driver.switchWindow(`${webAppConfig.WE_VOTE_URL_PROTOCOL + webAppConfig.WE_VOTE_HOSTNAME}/more/credits`);
     await driver.pause(waitTime);
     await expect(ReadyPage.getCreditsAndThanksPageTitleElement).toHaveText('Credits & Thanks');
   });