Skip to content

Commit

Permalink
Merge pull request #3782 from DaleMcGrew/Dale_WebApp_Nov10-2023
Browse files Browse the repository at this point in the history 
A temporary fix for WV-168 has been put in place, but the real problem relates to “isOnPartnerUrl“ not being set correctly in the AppObservableStore. This will need to be corrected because we ideally do not want to offer the Friends and Discuss features on partner websites.
  • Loading branch information
@DaleMcGrew
DaleMcGrew authored Nov 27, 2023
2 parents aa425c6 + 975131a commit b6e0780
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 42 deletions.
48 changes: 31 additions & 17 deletions src/js/common/components/FAQBody.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ export default class FAQBody extends Component {

<strong>Who&apos;s behind We Vote?</strong>
<br />
We Vote is a collaboration between two nonprofits (
We Vote is a collaboration between two nonprofits
{' '}
<Suspense fallback={<></>}>
<OpenExternalWebSite
linkIdAttribute="weVoteEducationWebsite"
Expand All @@ -79,7 +80,7 @@ export default class FAQBody extends Component {
{/* August 2022, TODO: Re-enable this once the SSL cert is renewed */}
{isCordova() ? (
<>
WeVoteUSA.org - 501(c)(4) FEIN 81-1052585),&nbsp;
WeVoteUSA.org - 501(c)(4) FEIN 81-1052585,&nbsp;
</>
) : (
<>
Expand All @@ -91,7 +92,7 @@ export default class FAQBody extends Component {
body="WeVoteUSA.org"
/>
</Suspense>
- 501(c)(4) FEIN 81-1052585),&nbsp;
- 501(c)(4) FEIN 81-1052585,&nbsp;
</>
)}
both based in Oakland, CA. We do not support or oppose any political candidate or party.
Expand All @@ -101,46 +102,54 @@ export default class FAQBody extends Component {

<strong>No really, who are you?</strong>
<br />
We Vote is a volunteer-driven movement.
We are volunteers from across the country, in over 22 states. See our
{' '}
<Suspense fallback={<></>}>
<OpenExternalWebSite
linkIdAttribute="wevoteVolunteerNow"
url="https://wevote.applytojob.com/apply"
target="_blank"
body="(See volunteer openings here.)"
body="volunteer openings here"
/>
</Suspense>
We
rely on volunteers across the country who use
their engineering, design, and other skills to build
We Vote. We are over 100 people who have donated 12,000+ volunteer hours, including
, and join us! We use our engineering, design, marketing, and other skills to build
We Vote. We are over 400 people (60+ active) who have donated 20,000+ volunteer hours, including
{' '}
<Suspense fallback={<></>}>
<OpenExternalWebSite
linkIdAttribute="wevoteGithubContributors"
url="https://github.com/WeVote"
target="_blank"
body="90+ contributors on GitHub."
body="100+ contributors on GitHub."
/>
</Suspense>
We also have a
We also have
{' '}
<Suspense fallback={<></>}>
<OpenExternalWebSite
linkIdAttribute="weVoteAboutUsPage"
url="https://WeVote.US/more/about"
target="_blank"
body="small team of core staff"
body="volunteer board members"
/>
</Suspense>
and volunteer board members.
.
<br />
<br />

<strong>How can I contact We Vote?</strong>
<br />
Please feel free to reach out to us with questions via our
<Suspense fallback={<></>}>
<OpenExternalWebSite
linkIdAttribute="weVoteContactUsPage"
url="https://help.wevote.us/hc/en-us/requests/new"
target="_blank"
body="Contact Us form."
body="Contact Us form"
/>
</Suspense>
.
{' '}
Our mailing address is:
<br />
We Vote
Expand Down Expand Up @@ -230,9 +239,9 @@ export default class FAQBody extends Component {
<>
If you like We Vote,
{' '}
<Link to="/donate" className="u-cursor--pointer u-link-color">please donate</Link>
<Link to="/donate" className="u-cursor--pointer u-link-color">please donate monthly</Link>
{' '}
so we can do more to help voters.
so we can help more voters.
</>
)}
<br />
Expand Down Expand Up @@ -286,9 +295,14 @@ export default class FAQBody extends Component {
url="https://wevote.applytojob.com/apply"
target="_blank"
className="open-web-site open-web-site__no-right-padding"
body="sign up to volunteer with We Vote."
body="sign up to volunteer"
/>
</Suspense>
{' '}
and
{' '}
<Link to="/donate" className="u-cursor--pointer u-link-color">donate $5 monthly</Link>
.
<br />
<br />
<Link to="/" className="u-cursor--pointer u-link-color">Let&apos;s get started!</Link>
Expand Down
49 changes: 24 additions & 25 deletions src/js/components/Navigation/SettingsPersonalSideBar.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export default class SettingsPersonalSideBar extends Component {
const { isOnPartnerUrl, isSignedIn, isOrganization, showPremiumFeatures, voterIsAdminForThisUrl } = this.state;
const showSettingsInDevelopment = false; // If developing any of the new settings, change this to true
const isOnPartnerUrlAndNotAdmin = isOnPartnerUrl && !voterIsAdminForThisUrl;
const alwaysTrue = true; // A temp fix for https://wevoteusa.atlassian.net/browse/WV-168

return (
<div className="card">
Expand Down Expand Up @@ -145,31 +146,29 @@ export default class SettingsPersonalSideBar extends Component {
</div>
)}

{!isOnPartnerUrl && (
<div className={String(editMode) === 'notifications' ?
'SettingsItem__summary__item-container SettingsItem__summary__item-container--selected' :
'SettingsItem__summary__item-container'}
>
<div>
<Link to="/settings/notifications" className="SettingsItem__summary__item" id="notifications">
<span className={String(editMode) === 'notifications' ?
'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
'SettingsItem__summary__item__display-name'}
>
Notifications
</span>
</Link>
</div>
<div className={String(editMode) === 'notifications' ?
'SettingsItem__summary__item-container SettingsItem__summary__item-container--selected' :
'SettingsItem__summary__item-container'}
>
<div>
<Link to="/settings/notifications" className="SettingsItem__summary__item" id="settingsNotifications">
<span className={String(editMode) === 'notifications' ?
'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
'SettingsItem__summary__item__display-name'}
>
Notifications
</span>
</Link>
</div>
)}
</div>

{!isOnPartnerUrl && (
{alwaysTrue && (/* {!isOnPartnerUrl && ( */
<div className={String(editMode) === 'friends' ?
'SettingsItem__summary__item-container SettingsItem__summary__item-container--selected' :
'SettingsItem__summary__item-container'}
>
<div>
<Link to="/friends" className="SettingsItem__summary__item" id="notifications">
<Link to="/friends" className="SettingsItem__summary__item" id="settingsFriends">
<span className={String(editMode) === 'friends' ?
'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
'SettingsItem__summary__item__display-name'}
Expand All @@ -181,13 +180,13 @@ export default class SettingsPersonalSideBar extends Component {
</div>
)}

{(isSignedIn && !isOnPartnerUrl) && (
{(isSignedIn && alwaysTrue/* && !isOnPartnerUrl */) && (
<div className={String(editMode) === 'discuss' ?
'SettingsItem__summary__item-container SettingsItem__summary__item-container--selected' :
'SettingsItem__summary__item-container'}
>
<div>
<Link to="/news" className="SettingsItem__summary__item" id="notifications">
<Link to="/news" className="SettingsItem__summary__item" id="settingsDiscuss">
<span className={String(editMode) === 'discuss' ?
'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
'SettingsItem__summary__item__display-name'}
Expand All @@ -205,7 +204,7 @@ export default class SettingsPersonalSideBar extends Component {
'SettingsItem__summary__item-container '}
>
<div>
<Link to="/settings/domain" className="SettingsItem__summary__item" id="domain">
<Link to="/settings/domain" className="SettingsItem__summary__item" id="settingsDomain">
<span className={String(editMode) === 'domain' ?
'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
'SettingsItem__summary__item__display-name'}
Expand All @@ -226,7 +225,7 @@ export default class SettingsPersonalSideBar extends Component {
'SettingsItem__summary__item-container '}
>
<div>
<Link to="/settings/text" className="SettingsItem__summary__item" id="site text">
<Link to="/settings/text" className="SettingsItem__summary__item" id="settingsSiteText">
<span className={String(editMode) === 'text' ?
'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
'SettingsItem__summary__item__display-name'}
Expand All @@ -244,7 +243,7 @@ export default class SettingsPersonalSideBar extends Component {
'SettingsItem__summary__item-container '}
>
<div>
<Link to="/settings/sharing" className="SettingsItem__summary__item" id="sharing">
<Link to="/settings/sharing" className="SettingsItem__summary__item" id="settingsSharing">
<span className={String(editMode) === 'sharing' ?
'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
'SettingsItem__summary__item__display-name'}
Expand All @@ -265,7 +264,7 @@ export default class SettingsPersonalSideBar extends Component {
'SettingsItem__summary__item-container '}
>
<div>
<Link to="/settings/subscription" className="SettingsItem__summary__item" id="subscriptionPlan">
<Link to="/settings/subscription" className="SettingsItem__summary__item" id="settingsSubscriptionPlan">
<span className={String(editMode) === 'subscription' ?
'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
'SettingsItem__summary__item__display-name'}
Expand All @@ -286,7 +285,7 @@ export default class SettingsPersonalSideBar extends Component {
'SettingsItem__summary__item-container '}
>
<div>
<Link to="/settings/analytics" className="SettingsItem__summary__item" id="analytics">
<Link to="/settings/analytics" className="SettingsItem__summary__item" id="settingsAnalytics">
<span className={String(editMode) === 'analytics' ?
'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
'SettingsItem__summary__item__display-name'}
Expand Down

0 comments on commit b6e0780

Please sign in to comment.