- { !hideFacebookSignInButton && !voterIsSignedInFacebook && isOnFacebookSupportedDomainUrl && (
+ { !hideFacebookSignInButton && !voterIsSignedInFacebook && isOnFacebookSupportedDomainUrl && webAppConfig.ENABLE_FACEBOOK && (
})
{
+// const mode = primary ? 'storybook-button--primary' : 'storybook-button--secondary';
+// return (
+//
+// );
+// };
+
+// Button.propTypes = {
+// /**
+// * Is this the principal call to action on the page?
+// */
+// primary: PropTypes.bool,
+// /**
+// * What background color to use
+// */
+// backgroundColor: PropTypes.string,
+// /**
+// * How large should the button be?
+// */
+// size: PropTypes.oneOf(['small', 'medium', 'large']),
+// /**
+// * Button contents
+// */
+// label: PropTypes.string.isRequired,
+// /**
+// * Optional click handler
+// */
+// onClick: PropTypes.func,
+// };
+
+// Button.defaultProps = {
+// backgroundColor: null,
+// primary: false,
+// size: 'medium',
+// onClick: undefined,
+// };
diff --git a/src/js/common/stories/Button.stories.js b/src/js/common/stories/Button.stories.js
new file mode 100644
index 000000000..f0d501f0d
--- /dev/null
+++ b/src/js/common/stories/Button.stories.js
@@ -0,0 +1,88 @@
+import React from 'react';
+import styled from 'styled-components';
+import Button from '../../components/Buttons/BaseButton';
+
+// More on how to set up stories at: https://storybook.js.org/docs/writing-stories#default-export
+export default {
+ title: 'Design System',
+ component: Button,
+ parameters: {
+ // Optional parameter to center the component in the Canvas. More info: https://storybook.js.org/docs/configure/story-layout
+ layout: 'centered',
+ },
+ // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/writing-docs/autodocs
+ tags: ['autodocs'],
+ // More on argTypes: https://storybook.js.org/docs/api/argtypes
+ // argTypes: {
+ // backgroundColor: { control: 'color' },
+ // },
+ args: {
+ primary: true,
+ },
+};
+
+// More on writing stories with args: https://storybook.js.org/docs/writing-stories/args
+export const AllButtons = (args) => (
+
+
+
+
+
+
+
+
+
+);
+
+export const Primary = {
+ args: {
+ primary: true,
+ label: 'Button',
+ },
+};
+
+export const PrimaryDisabled = {
+ args: {
+ primary: false,
+ label: 'Button',
+ },
+};
+
+export const Secondary = {
+ args: {
+ secondary: true,
+ label: 'Button',
+ },
+};
+
+export const Large = {
+ args: {
+ primary: true,
+ size: 'large',
+ label: 'Button',
+ },
+};
+
+export const Medium = {
+ args: {
+ primary: true,
+ size: 'medium',
+ label: 'Button',
+ },
+};
+
+export const Small = {
+ args: {
+ primary: true,
+ size: 'small',
+ label: 'Button',
+ },
+};
+
+const ButtonContainer = styled.div`
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 34px;
+ flex-direction: column;
+`;
diff --git a/src/js/common/stories/Colors.stories.js b/src/js/common/stories/Colors.stories.js
new file mode 100644
index 000000000..f108887c9
--- /dev/null
+++ b/src/js/common/stories/Colors.stories.js
@@ -0,0 +1,172 @@
+import React from 'react';
+import styled from 'styled-components';
+import colors from '../components/Style/Colors';
+
+export default {
+ title: 'Design System/Colors - Product Brand',
+};
+
+const bluePalette = ['#E6F3FF', '#B2D6F8', '#8BBCE9', '#66A2D8', '#4187C6', '#206DB3', '#0858A1', '#074986', '#053C6D', '#042B4E'];
+const steelSecondary = ['#ECF2F7', '#C8D4DF', '#A7BACD', '#87A0B9', '#6888A5', '#4E6E8E', '#3A5B7C', '#2C4A66', '#1F3A53', '#142B41'];
+const redTertiary = ['#FFEDF1', '#FFC3D0', '#FF98AE', '#FA708D', '#E1516F', '#CB2649', '#AA203D', '#8B1A32', '#74162A', '#53101E'];
+const orangeAccent = ['#FCEFE4', '#FBC89C', '#FBA255', '#FB7704', '#D46505', '#AC5204', '#8F4403', '#743703', '#602E02', '#442102'];
+
+const isLight = (color) => {
+ const hex = color.replace('#', '');
+ const r = parseInt(hex.slice(0, 2), 16);
+ const g = parseInt(hex.slice(2, 4), 16);
+ const b = parseInt(hex.slice(4, 6), 16);
+ const result = (r * 299 + g * 587 + b * 114) / 1000;
+ return result > 128;
+};
+
+const ColorRowContainer = styled.div`
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ height: 44px;
+ border-bottom: 0.5px solid var(--colorSplit, ${colors.lightGrey});
+ color: ${colors.darkGrey};
+`;
+const PrimitiveSemanticName = styled.div`
+ width: 20%;
+ font-family: SF Pro Text;
+ font-size: 14px;
+ font-style: normal;
+ font-weight: 400;
+ padding-left: 14px;
+`;
+
+const Circle = styled.div`
+ background-color: ${(props) => props.color};
+ width: 16px;
+ height: 16px;
+ border-radius: 50%;
+ stroke-width: 2px;
+ stroke: #EFEFEF;
+ display: flex;
+ justify-content: center;
+ align-items: flex-end;
+`;
+
+const Hex = styled.div`
+ width: 20%;
+ display: flex;
+`;
+
+const ColorValue = styled.div`
+ width: 30%;
+ background-color: ${(props) => props.color};
+ color: ${(props) => `rgba(${isLight(props.color) ? '0, 0, 0' : '255, 255, 255'}, 0.80)`};
+ height: 100%;
+ font-family: SF Pro Text;
+ font-size: 14px;
+ font-style: normal;
+ font-weight: 400;
+ display: flex;
+ align-items: center;
+ padding-left: 18px;
+ border-bottom: 1px solid var(--colorSplit, ${(props) => props.color});
+`;
+
+const TableHeaderTitle = styled.div`
+ font-weight: 600;
+ color: ${colors.darkGrey};
+`;
+
+const TableColorHeader = () => (
+
+
+ Primitive Name
+
+
+
+ Semantic Name
+
+
+
+
+ Hex
+
+
+
+
+ Value
+
+
+);
+
+const ColorRow = ({ color, SemanticLabel, PrimitiveLabel, value }) => (
+
+ {PrimitiveLabel}
+ {SemanticLabel}
+
+ {color}
+
+ {value}
+
+);
+
+const Colors = ({ palette, title }) => (
+
A positive personalized score
{ballotDisplay[0] && (
diff --git a/src/js/components/Ballot/OfficeItemCompressed.jsx b/src/js/components/Ballot/OfficeItemCompressed.jsx
index 8dcfe4349..335b77e42 100644
--- a/src/js/components/Ballot/OfficeItemCompressed.jsx
+++ b/src/js/components/Ballot/OfficeItemCompressed.jsx
@@ -10,6 +10,7 @@ import { BallotHorizontallyScrollingContainer, BallotScrollingInnerWrapper, Ball
import signInModalGlobalState from '../../common/components/Widgets/signInModalGlobalState';
import AppObservableStore from '../../common/stores/AppObservableStore';
import historyPush from '../../common/utils/historyPush';
+import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
import { renderLog } from '../../common/utils/logging';
import normalizedImagePath from '../../common/utils/normalizedImagePath';
import toTitleCase from '../../common/utils/toTitleCase';
@@ -300,8 +301,7 @@ class OfficeItemCompressed extends Component {
const avatarCompressed = 'card-main__avatar-compressed';
const avatarBackgroundImage = normalizedImagePath('../img/global/svg-icons/avatar-generic.svg');
const uniqueKey = `candidate_preview-${oneCandidate.we_vote_id}-${window.performance.now()}`;
- // console.log('ScrollingInnerWrapper: ', uniqueKey);
- const scoreExplanationTooltip = (
+ const scoreExplanationTooltip = isMobileScreenSize() ? () : (
Your personalized score
{oneCandidate.ballot_item_display_name && (
diff --git a/src/js/components/Buttons/BaseButton.jsx b/src/js/components/Buttons/BaseButton.jsx
new file mode 100644
index 000000000..9f2d025fd
--- /dev/null
+++ b/src/js/components/Buttons/BaseButton.jsx
@@ -0,0 +1,98 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import styled from 'styled-components';
+import colors from '../../common/components/Style/Colors';
+
+const StyledButton = styled.button`
+/* Default styles */
+color: ${colors.white};
+font-weight: 600;
+border-radius: 4px;
+aria-label: "Button";
+border: none;
+cursor: pointer;
+
+&:focus {
+ outline: 2px solid ${colors.primary} !important;
+ outline-offset: 2px;
+}
+
+/* Hover state */
+&:hover {
+ background-color: ${colors.primaryHover};
+}
+
+/* Primary styles */
+${(props) => props.primary && `
+ background-color: ${colors.primary};
+ color: white;
+`}
+
+/* Primary Disabled styles */
+${(props) => !props.primary && `
+ background-color: ${colors.lightGrey};
+ color: ${colors.grey};
+ cursor: not-allowed;
+
+ &:hover {
+ background-color: ${colors.lightGrey};
+ color: ${colors.grey};
+ }
+`}
+
+/* Secondary styles */
+ ${(props) => props.secondary && `
+ background-color: transparent;
+ color: ${colors.grey};
+
+ &:hover {
+ background-color: ${colors.secondaryHover};
+ color: ${colors.primary}};
+ cursor: pointer;
+ }
+ `}
+
+ /* Size styles */
+ ${(props) => props.size === 'small' && `
+ font-size: 12px;
+ padding: 6px;
+ width: 150px;
+ `}
+ ${(props) => props.size === 'medium' && `
+ font-size: 16px;
+ padding: 10px;
+ width: 350px;
+ `}
+ ${(props) => props.size === 'large' && `
+ font-size: 18px;
+ padding: 15px;
+ width: 450px;
+ `}
+`;
+
+const Button = ({ primary, size, label, onClick, ...props }) => (
+
+ {label}
+
+);
+
+export default Button;
+Button.propTypes = {
+ primary: PropTypes.bool,
+ secondary: PropTypes.bool,
+ size: PropTypes.oneOf(['small', 'medium', 'large']),
+ label: PropTypes.string.isRequired,
+ onClick: PropTypes.func,
+};
+
+Button.defaultProps = {
+ primary: false,
+ size: 'medium',
+ onClick: undefined,
+};
diff --git a/src/js/components/Facebook/FacebookSignedInData.js b/src/js/components/Facebook/FacebookSignedInData.js
index d32f9faf7..6ddbd265f 100644
--- a/src/js/components/Facebook/FacebookSignedInData.js
+++ b/src/js/components/Facebook/FacebookSignedInData.js
@@ -1,8 +1,8 @@
// eslint-disable-next-line import/no-cycle
+import signInModalGlobalState from '../../common/components/Widgets/signInModalGlobalState';
import { isWebApp } from '../../common/utils/isCordovaOrWebApp';
import { oAuthLog } from '../../common/utils/logging';
import facebookApi from '../../utils/facebookApi';
-import signInModalGlobalState from '../../common/components/Widgets/signInModalGlobalState';
const fbData = {
connected: false,
@@ -199,7 +199,7 @@ export default {
this.login2022Response(resolve, response);
},
(responseFail) => {
- console.log('Failure to sign in to Facebook', responseFail);
+ console.log('Failure to sign in to Facebook', JSON.stringify(responseFail));
});
}
});
diff --git a/src/js/components/Friends/FriendDetails.jsx b/src/js/components/Friends/FriendDetails.jsx
index daa5aa363..722ae2896 100644
--- a/src/js/components/Friends/FriendDetails.jsx
+++ b/src/js/components/Friends/FriendDetails.jsx
@@ -4,6 +4,7 @@ import React, { Component, Suspense } from 'react';
import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
import Tooltip from 'react-bootstrap/Tooltip';
import styled from 'styled-components';
+import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
import { FriendDetailsLine, FriendDetailsWrapper, FriendName, InviteToWeVoteLine } from '../Style/friendStyles';
import abbreviateNumber from '../../common/utils/abbreviateNumber';
import { renderLog } from '../../common/utils/logging';
@@ -57,7 +58,7 @@ class FriendDetails extends Component {
let mutualFriendImageHtmlArray = <>;
if (mutualFriendPreviewList) {
const mutualFriendPreviewListSorted = mutualFriendPreviewList.sort(this.orderByPhotoExists);
- mutualFriendsTooltip = (
+ mutualFriendsTooltip = isMobileScreenSize() ? () : (
{
+// const mode = primary ? 'storybook-button--primary' : 'storybook-button--secondary';
+// return (
+//
+// );
+// };
+
+// Button.propTypes = {
+// /**
+// * Is this the principal call to action on the page?
+// */
+// primary: PropTypes.bool,
+// /**
+// * What background color to use
+// */
+// backgroundColor: PropTypes.string,
+// /**
+// * How large should the button be?
+// */
+// size: PropTypes.oneOf(['small', 'medium', 'large']),
+// /**
+// * Button contents
+// */
+// label: PropTypes.string.isRequired,
+// /**
+// * Optional click handler
+// */
+// onClick: PropTypes.func,
+// };
+
+// Button.defaultProps = {
+// backgroundColor: null,
+// primary: false,
+// size: 'medium',
+// onClick: undefined,
+// };
diff --git a/src/js/common/stories/Button.stories.js b/src/js/common/stories/Button.stories.js
new file mode 100644
index 000000000..f0d501f0d
--- /dev/null
+++ b/src/js/common/stories/Button.stories.js
@@ -0,0 +1,88 @@
+import React from 'react';
+import styled from 'styled-components';
+import Button from '../../components/Buttons/BaseButton';
+
+// More on how to set up stories at: https://storybook.js.org/docs/writing-stories#default-export
+export default {
+ title: 'Design System',
+ component: Button,
+ parameters: {
+ // Optional parameter to center the component in the Canvas. More info: https://storybook.js.org/docs/configure/story-layout
+ layout: 'centered',
+ },
+ // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/writing-docs/autodocs
+ tags: ['autodocs'],
+ // More on argTypes: https://storybook.js.org/docs/api/argtypes
+ // argTypes: {
+ // backgroundColor: { control: 'color' },
+ // },
+ args: {
+ primary: true,
+ },
+};
+
+// More on writing stories with args: https://storybook.js.org/docs/writing-stories/args
+export const AllButtons = (args) => (
+
+
+);
+
+export const AllColors = () => {
+ return (
+ <>
+ { title }
+ +
+ {
+ palette?.map((color, index) => (
+
+ + Colors - Product Brand +
+ +
+
+
+ # Configure your project
+
+ Because Storybook works separately from your app, you'll need to configure it for your specific stack and setup. Below, explore guides for configuring Storybook with popular frameworks and tools. If you get stuck, learn how you can ask for help from our community.
+
+
+
+
+ 
+
+ Add styling and CSS
+Like with web applications, there are many ways to include CSS within Storybook. Learn more about setting up styling within Storybook.
+ Learn more
+ 
+
+ Provide context and mocking
+Often when a story doesn't render, it's because your component is expecting a specific environment or context (like a theme provider) to be available.
+ Learn more
+ 
+
+
+
+ Load assets and resources
+To link static files (like fonts) to your projects and stories, use the + `staticDirs` configuration option to specify folders to load when + starting Storybook.
+ Learn more
+
+
+ # Do more with Storybook
+
+ Now that you know the basics, let's explore other parts of Storybook that will improve your experience. This list is just to get you started. You can customise Storybook in many ways to fit your needs.
+
+
+
+
+
+
+
+ 
+
+ Autodocs
+Auto-generate living, + interactive reference documentation from your components and stories.
+ Learn more
+ 
+
+ Publish to Chromatic
+Publish your Storybook to review and collaborate with your entire team.
+ Learn more
+ 
+
+ Figma Plugin
+Embed your stories into Figma to cross-reference the design and live + implementation in one place.
+ Learn more
+ 
+
+ Testing
+Use stories to test a component in all its variations, no matter how + complex.
+ Learn more
+ 
+
+
+ Accessibility
+Automatically test your components for a11y issues as you develop.
+ Learn more
+
+
+
+
+ 
+
+
+
+
+
diff --git a/src/js/common/stories/assets/accessibility.png b/src/js/common/stories/assets/accessibility.png
new file mode 100644
index 000000000..6ffe6feab
Binary files /dev/null and b/src/js/common/stories/assets/accessibility.png differ
diff --git a/src/js/common/stories/assets/accessibility.svg b/src/js/common/stories/assets/accessibility.svg
new file mode 100644
index 000000000..a3288830e
--- /dev/null
+++ b/src/js/common/stories/assets/accessibility.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/src/js/common/stories/assets/addon-library.png b/src/js/common/stories/assets/addon-library.png
new file mode 100644
index 000000000..95deb38a8
Binary files /dev/null and b/src/js/common/stories/assets/addon-library.png differ
diff --git a/src/js/common/stories/assets/assets.png b/src/js/common/stories/assets/assets.png
new file mode 100644
index 000000000..cfba6817a
Binary files /dev/null and b/src/js/common/stories/assets/assets.png differ
diff --git a/src/js/common/stories/assets/avif-test-image.avif b/src/js/common/stories/assets/avif-test-image.avif
new file mode 100644
index 000000000..530709bc1
Binary files /dev/null and b/src/js/common/stories/assets/avif-test-image.avif differ
diff --git a/src/js/common/stories/assets/context.png b/src/js/common/stories/assets/context.png
new file mode 100644
index 000000000..e5cd249a2
Binary files /dev/null and b/src/js/common/stories/assets/context.png differ
diff --git a/src/js/common/stories/assets/discord.svg b/src/js/common/stories/assets/discord.svg
new file mode 100644
index 000000000..1204df998
--- /dev/null
+++ b/src/js/common/stories/assets/discord.svg
@@ -0,0 +1,15 @@
+
diff --git a/src/js/common/stories/assets/docs.png b/src/js/common/stories/assets/docs.png
new file mode 100644
index 000000000..a749629df
Binary files /dev/null and b/src/js/common/stories/assets/docs.png differ
diff --git a/src/js/common/stories/assets/figma-plugin.png b/src/js/common/stories/assets/figma-plugin.png
new file mode 100644
index 000000000..8f79b08cd
Binary files /dev/null and b/src/js/common/stories/assets/figma-plugin.png differ
diff --git a/src/js/common/stories/assets/github.svg b/src/js/common/stories/assets/github.svg
new file mode 100644
index 000000000..158e0268a
--- /dev/null
+++ b/src/js/common/stories/assets/github.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/js/common/stories/assets/share.png b/src/js/common/stories/assets/share.png
new file mode 100644
index 000000000..8097a3707
Binary files /dev/null and b/src/js/common/stories/assets/share.png differ
diff --git a/src/js/common/stories/assets/styling.png b/src/js/common/stories/assets/styling.png
new file mode 100644
index 000000000..d341e8263
Binary files /dev/null and b/src/js/common/stories/assets/styling.png differ
diff --git a/src/js/common/stories/assets/testing.png b/src/js/common/stories/assets/testing.png
new file mode 100644
index 000000000..d4ac39a0c
Binary files /dev/null and b/src/js/common/stories/assets/testing.png differ
diff --git a/src/js/common/stories/assets/theming.png b/src/js/common/stories/assets/theming.png
new file mode 100644
index 000000000..1535eb9b8
Binary files /dev/null and b/src/js/common/stories/assets/theming.png differ
diff --git a/src/js/common/stories/assets/tutorials.svg b/src/js/common/stories/assets/tutorials.svg
new file mode 100644
index 000000000..4b2fc7c44
--- /dev/null
+++ b/src/js/common/stories/assets/tutorials.svg
@@ -0,0 +1,12 @@
+
diff --git a/src/js/common/stories/assets/youtube.svg b/src/js/common/stories/assets/youtube.svg
new file mode 100644
index 000000000..33a3a61f6
--- /dev/null
+++ b/src/js/common/stories/assets/youtube.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/js/common/stories/button.css b/src/js/common/stories/button.css
new file mode 100644
index 000000000..dc91dc763
--- /dev/null
+++ b/src/js/common/stories/button.css
@@ -0,0 +1,30 @@
+.storybook-button {
+ font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ font-weight: 700;
+ border: 0;
+ border-radius: 3em;
+ cursor: pointer;
+ display: inline-block;
+ line-height: 1;
+}
+.storybook-button--primary {
+ color: white;
+ background-color: #1ea7fd;
+}
+.storybook-button--secondary {
+ color: #333;
+ background-color: transparent;
+ box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 0px 1px inset;
+}
+.storybook-button--small {
+ font-size: 12px;
+ padding: 10px 16px;
+}
+.storybook-button--medium {
+ font-size: 14px;
+ padding: 11px 20px;
+}
+.storybook-button--large {
+ font-size: 16px;
+ padding: 12px 24px;
+}
diff --git a/src/js/common/utils/addressFunctions.js b/src/js/common/utils/addressFunctions.js
index f4568856b..280af2a50 100644
--- a/src/js/common/utils/addressFunctions.js
+++ b/src/js/common/utils/addressFunctions.js
@@ -88,6 +88,18 @@ export function convertStateCodeFilterToStateCode (stateCodeFilter) {
return '';
}
+export function isValidStateCode (incomingStateCode) {
+ if (incomingStateCode) {
+ // Log incoming State Code
+ console.log('incomingStateCode:', incomingStateCode);
+ const incomingStateCodeUpper = incomingStateCode.toUpperCase();
+ const existingStateCodes = Object.keys(stateCodeMap);
+ return existingStateCodes.indexOf(incomingStateCodeUpper) > -1;
+ } else {
+ return false;
+ }
+}
+
export function getAllStateCodeFilters () {
return Object.keys(stateCodeMap).map((stateCode) => `stateCode${stateCode}`);
}
diff --git a/src/js/common/utils/historyPush.js b/src/js/common/utils/historyPush.js
index 96daf3c47..5a85a2e52 100644
--- a/src/js/common/utils/historyPush.js
+++ b/src/js/common/utils/historyPush.js
@@ -4,8 +4,8 @@ import webAppConfig from '../../config';
// See v5: https://reactrouter.com/native/api/Hooks/usehistory
// IMPORTANT: The HTML5 window.history, is very different from the react-router V5 history, don't use window.history!
// removePriorPathname determines whether the route should be pushed or replace the previous entry in the history stack.
-export default function historyPush (route, removePriorPathname = false) {
- if (route !== global.weVoteGlobalHistory.location.pathname) {
+export default function historyPush (route, removePriorPathname = false, doNotPushToHistory = false) {
+ if (route !== global.weVoteGlobalHistory.location.pathname && !doNotPushToHistory) {
if (removePriorPathname) {
global.weVoteGlobalHistory.replace(route);
} else {
diff --git a/src/js/components/Ballot/MeasureItemCompressed.jsx b/src/js/components/Ballot/MeasureItemCompressed.jsx
index d8dc2312c..f4418e3f5 100644
--- a/src/js/components/Ballot/MeasureItemCompressed.jsx
+++ b/src/js/components/Ballot/MeasureItemCompressed.jsx
@@ -8,6 +8,7 @@ import styled from 'styled-components';
import MeasureActions from '../../actions/MeasureActions';
import extractNumber from '../../common/utils/extractNumber';
import historyPush from '../../common/utils/historyPush';
+import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
import { renderLog } from '../../common/utils/logging';
import shortenText from '../../common/utils/shortenText';
import toTitleCase from '../../common/utils/toTitleCase';
@@ -218,7 +219,7 @@ class MeasureItemCompressed extends Component {
}
const measureSubtitleCapitalized = toTitleCase(measureSubtitle);
ballotItemDisplayName = toTitleCase(ballotItemDisplayName);
- const scoreExplanationTooltip = (
+ const scoreExplanationTooltip = isMobileScreenSize() ? () : (
+ 
+ Join our contributors building the future of UI development.
+
+ Star on GitHub
+
+ 
+
+
+ Get support and chat with frontend developers.
+
+ Join Discord server
+
+ 
+
+
+
+ Watch tutorials, feature previews and interviews.
+
+ Watch on YouTube
+
{mutualFriendPreviewListSorted.map((mutualFriend) => {
diff --git a/src/js/components/Navigation/FooterMainWeVote.jsx b/src/js/components/Navigation/FooterMainWeVote.jsx
index 80f402d73..a02cdb0c6 100644
--- a/src/js/components/Navigation/FooterMainWeVote.jsx
+++ b/src/js/components/Navigation/FooterMainWeVote.jsx
@@ -4,8 +4,8 @@ import React, { Component, Suspense } from 'react';
import { Link } from 'react-router-dom';
import styled from 'styled-components';
import OpenExternalWebSite from '../../common/components/Widgets/OpenExternalWebSite';
-import { isWebApp } from '../../common/utils/isCordovaOrWebApp';
import AppObservableStore from '../../common/stores/AppObservableStore';
+import { isWebApp } from '../../common/utils/isCordovaOrWebApp';
import VoterStore from '../../stores/VoterStore';
const BallotElectionListWithFilters = React.lazy(() => import(/* webpackChunkName: 'BallotElectionListWithFilters' */ '../Ballot/BallotElectionListWithFilters'));
@@ -129,6 +129,8 @@ class FooterMainWeVote extends Component {
) : (
<>
Frequently Asked Questions
+
Frequently Asked Questions
+ Attributions
)}
diff --git a/src/js/components/Ready/ElectionCountdown.jsx b/src/js/components/Ready/ElectionCountdown.jsx
index 8cdbb3496..600385f85 100644
--- a/src/js/components/Ready/ElectionCountdown.jsx
+++ b/src/js/components/Ready/ElectionCountdown.jsx
@@ -309,9 +309,9 @@ ElectionCountdown.propTypes = {
};
const CountdownTitleHeaderWrapper = styled('div')(({ theme }) => (`
- margin-top: 60px;
+ margin-top: 30px;
${theme.breakpoints.down('sm')} {
- margin-top: 42px;
+ margin-top: 30px;
}
`));
@@ -323,7 +323,7 @@ const CardCountdown = styled('div')(({ theme }) => (`
padding-top: 4px;
padding-bottom: 8px;
${theme.breakpoints.down('sm')} {
- min-height: 140px;
+ min-height: 180px;
}
`));
@@ -335,7 +335,7 @@ const CardTitleUpcoming = styled('h1')(({ theme }) => (`
font-size: 64px;
font-weight: 900;
margin-bottom: 8px;
- margin-top: 0;
+ margin-top: 12px;
text-align: center;
${theme.breakpoints.down('xs')} {
font-size: 60px;
diff --git a/src/js/components/Ready/ReadyInformationDisclaimer.jsx b/src/js/components/Ready/ReadyInformationDisclaimer.jsx
index 5626354b4..178faa1a6 100644
--- a/src/js/components/Ready/ReadyInformationDisclaimer.jsx
+++ b/src/js/components/Ready/ReadyInformationDisclaimer.jsx
@@ -5,6 +5,7 @@ import { OverlayTrigger } from 'react-bootstrap'; // TODO APRIL 2021: Replace w
import Popover from 'react-bootstrap/Popover';
import { isAndroid, isIOS } from '../../common/utils/cordovaUtils';
import { isWebApp } from '../../common/utils/isCordovaOrWebApp';
+import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
import { renderLog } from '../../common/utils/logging';
@@ -43,7 +44,7 @@ class ReadyInformationDisclaimer extends React.Component {
trigger="click"
key="top"
placement="top"
- overlay={(
+ overlay={isMobileScreenSize() ? () : (
diff --git a/src/js/components/Ready/ViewUpcomingBallotButton.jsx b/src/js/components/Ready/ViewUpcomingBallotButton.jsx
index 599c194c2..627904e82 100644
--- a/src/js/components/Ready/ViewUpcomingBallotButton.jsx
+++ b/src/js/components/Ready/ViewUpcomingBallotButton.jsx
@@ -1,7 +1,7 @@
-import { Button } from '@mui/material';
import PropTypes from 'prop-types';
import React from 'react';
import styled from 'styled-components';
+import BaseButton from '../Buttons/BaseButton';
import daysUntil from '../../common/utils/daysUntil';
import historyPush from '../../common/utils/historyPush';
import { renderLog } from '../../common/utils/logging';
@@ -99,23 +99,12 @@ class ViewUpcomingBallotButton extends React.Component {
} = this.state;
return (
-
+ primary
+ label={electionDataExistsForUpcomingElection ? 'View Your Ballot' : 'Find Your Friends'}
+ />
);
}
diff --git a/src/js/components/Share/ShareButtonDesktopTablet.jsx b/src/js/components/Share/ShareButtonDesktopTablet.jsx
index 97efa45ee..4307d01bb 100644
--- a/src/js/components/Share/ShareButtonDesktopTablet.jsx
+++ b/src/js/components/Share/ShareButtonDesktopTablet.jsx
@@ -113,7 +113,7 @@ class ShareButtonDesktopTablet extends Component {
if (!stringContains('/modal/share', pathname) && isWebApp()) {
const pathnameWithModalShare = `${pathname}${pathname.endsWith('/') ? '' : '/'}modal/share`;
// console.log('Navigation ShareButtonDesktopTablet openShareModal ', pathnameWithModalShare)
- historyPush(pathnameWithModalShare);
+ historyPush(pathnameWithModalShare, false, true);
}
}
diff --git a/src/js/components/Share/ShareButtonFooter.jsx b/src/js/components/Share/ShareButtonFooter.jsx
index 65b7f3d3a..f8f79d247 100644
--- a/src/js/components/Share/ShareButtonFooter.jsx
+++ b/src/js/components/Share/ShareButtonFooter.jsx
@@ -8,13 +8,15 @@ import AnalyticsActions from '../../actions/AnalyticsActions';
import FriendActions from '../../actions/FriendActions';
import VoterActions from '../../actions/VoterActions';
import ShareActions from '../../common/actions/ShareActions';
+import { openSnackbar } from '../../common/components/Widgets/SnackNotifier';
+import AppObservableStore, { messageService } from '../../common/stores/AppObservableStore';
import ShareStore from '../../common/stores/ShareStore';
import apiCalming from '../../common/utils/apiCalming';
import { hasDynamicIsland, hasIPhoneNotch, isAndroid } from '../../common/utils/cordovaUtils';
import { isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
import { renderLog } from '../../common/utils/logging';
import stringContains from '../../common/utils/stringContains';
-import AppObservableStore, { messageService } from '../../common/stores/AppObservableStore';
+import webAppConfig from '../../config';
import FriendStore from '../../stores/FriendStore';
import VoterStore from '../../stores/VoterStore';
import { getApplicationViewBooleans } from '../../utils/applicationUtils';
@@ -22,7 +24,6 @@ import { shareBottomOffset } from '../../utils/cordovaOffsets';
import createMessageToFriendDefaults from '../../utils/createMessageToFriendDefaults';
import sortFriendListByMutualFriends from '../../utils/friendFunctions';
import isMobile from '../../utils/isMobile';
-import { openSnackbar } from '../../common/components/Widgets/SnackNotifier';
import { CopyLink, getKindOfShareFromURL, getWhatAndHowMuchToShareDefault, saveActionShareAnalytics, ShareFacebook, SharePreviewFriends, shareStyles, ShareTwitter, ShareWeVoteFriends } from './shareButtonCommon'; // cordovaSocialSharingByEmail // cordovaSocialSharingByEmail
import ShareModalOption from './ShareModalOption';
import { generateShareLinks } from './ShareModalText';
@@ -397,7 +398,9 @@ class ShareButtonFooter extends Component {
this.saveActionShareButtonFriends()} />
{(!(isMobile() && navigator.share) || isCordova()) && (
<>
- this.saveActionShareButtonFriends()} />
-
Follow
@@ -207,7 +209,7 @@ class IssueCard extends Component {
let linkedOrganizationsTooltip = <>;
let linkedOrganizationNameCount = 0;
if (linkedOrganizationPreviewList) {
- linkedOrganizationsTooltip = (
+ linkedOrganizationsTooltip = isMobileScreenSize() ? () : (
See endorsements from
@@ -249,7 +251,8 @@ class IssueCard extends Component {
);
}
- const followersTooltip = (
+
+ const followersTooltip = isMobileScreenSize() ? () : (
);
+
const issueNameAndCount = (
{`${issueDisplayName} `}
@@ -274,6 +278,7 @@ class IssueCard extends Component {
);
let isFirst = true;
let organizationImageCount = 0;
+
const issueAdvocates = (
{!!(linkedOrganizationPreviewList) && (
diff --git a/src/js/components/Values/IssueLinkToggle.jsx b/src/js/components/Values/IssueLinkToggle.jsx
index 13b625cd6..983bd6bbd 100644
--- a/src/js/components/Values/IssueLinkToggle.jsx
+++ b/src/js/components/Values/IssueLinkToggle.jsx
@@ -37,6 +37,7 @@ export default class IssueLinkToggle extends Component {
render () {
renderLog('IssueLinkToggle'); // Set LOG_RENDER_EVENTS to log all renders
let supportButtonPopoverTooltip;
+ // Dec 2023: Leave this in for Mobile and Cordova, since it is an error report condition
if (this.props.incompatibleIssues !== undefined) {
// Removed bsPrefix="card-popover"
const incompatibleIssues = {`You cannot link because the issue is incompatible with the following issues: ${this.props.incompatibleIssues.map((issue) => issue.issue_name).join(', ')}`};
diff --git a/src/js/components/Widgets/FollowToggleCheckPlus.jsx b/src/js/components/Widgets/FollowToggleCheckPlus.jsx
index 866a12cc3..bb4cf539d 100644
--- a/src/js/components/Widgets/FollowToggleCheckPlus.jsx
+++ b/src/js/components/Widgets/FollowToggleCheckPlus.jsx
@@ -4,22 +4,23 @@ import { Button } from '@mui/material';
import Menu from '@mui/material/Menu';
import MenuItem from '@mui/material/MenuItem';
import { styled as muiStyled } from '@mui/styles';
-import withTheme from '@mui/styles/withTheme';
import withStyles from '@mui/styles/withStyles';
-import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
-import Tooltip from 'react-bootstrap/Tooltip';
+import withTheme from '@mui/styles/withTheme';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
+import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
+import Tooltip from 'react-bootstrap/Tooltip';
import styled from 'styled-components';
import OrganizationActions from '../../actions/OrganizationActions';
+import { openSnackbar } from '../../common/components/Widgets/SnackNotifier';
import historyPush from '../../common/utils/historyPush';
+import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
import { renderLog } from '../../common/utils/logging';
import FriendStore from '../../stores/FriendStore';
import IssueStore from '../../stores/IssueStore';
import OrganizationStore from '../../stores/OrganizationStore';
import VoterGuideStore from '../../stores/VoterGuideStore';
import VoterStore from '../../stores/VoterStore';
-import { openSnackbar } from '../../common/components/Widgets/SnackNotifier';
import { createSharedIssuesText } from '../../utils/issueUtils';
@@ -32,7 +33,7 @@ function AlreadyFollowingOrIgnoringButton (params) {
alreadyFollowingOrIgnoringPopOverText += ` ${speakerDisplayName},`;
}
alreadyFollowingOrIgnoringPopOverText += ' their opinion is added to your score. Click to stop following.';
- const alreadyFollowingOrIgnoringPopOverTooltip = (
+ const alreadyFollowingOrIgnoringPopOverTooltip = isMobileScreenSize() ? () : (
{alreadyFollowingOrIgnoringPopOverText}
@@ -103,11 +104,12 @@ function FollowButton (params) {
followOrganizationCheckPlusPopOverText += ` ${speakerDisplayName},`;
}
followOrganizationCheckPlusPopOverText += ' and add their opinion to your score.';
- const followOrganizationCheckPlusPopOverTooltip = (
+ const followOrganizationCheckPlusPopOverTooltip = isMobileScreenSize() ? () : (
{followOrganizationCheckPlusPopOverText}
);
+
return (
@@ -414,7 +416,8 @@ class FollowToggleCheckPlus extends Component {
friendOrLinkedToIssuePopOverText += ' cares about the same values as you.';
friendOrLinkedToIssuePopOverText += ' Because of this, their opinion is added to your score.';
}
- const friendOrLinkedToIssuePopOverTooltip = (
+
+ const friendOrLinkedToIssuePopOverTooltip = isMobileScreenSize() ? () : (
{friendOrLinkedToIssuePopOverText}
@@ -525,9 +528,9 @@ const FriendOrLinkedToIssue = styled('div')`
align-items: center;
display: flex;
height: 40px;
- margin: '0 !important';
+ margin: 0 !important;
min-width: 0;
- padding: '0 !important';
+ padding: 0 !important;
width: 32px;
`;
diff --git a/src/js/components/Widgets/FriendsOnlyIndicator.jsx b/src/js/components/Widgets/FriendsOnlyIndicator.jsx
index 2395839c3..2cbdac800 100644
--- a/src/js/components/Widgets/FriendsOnlyIndicator.jsx
+++ b/src/js/components/Widgets/FriendsOnlyIndicator.jsx
@@ -4,6 +4,7 @@ import React, { Component } from 'react';
import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
import Tooltip from 'react-bootstrap/Tooltip';
import { ReactSVG } from 'react-svg';
+import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
import { renderLog } from '../../common/utils/logging';
import normalizedImagePath from '../../common/utils/normalizedImagePath';
@@ -59,7 +60,9 @@ export default class FriendsOnlyIndicator extends Component {
);
}
- const tooltip = {labelText} ;
+ const tooltip = isMobileScreenSize() ? () : (
+ {labelText}
+ );
return (
diff --git a/src/js/components/Widgets/ItemActionBar/ItemActionBar.jsx b/src/js/components/Widgets/ItemActionBar/ItemActionBar.jsx
index 0d2e28e5b..15ff57703 100644
--- a/src/js/components/Widgets/ItemActionBar/ItemActionBar.jsx
+++ b/src/js/components/Widgets/ItemActionBar/ItemActionBar.jsx
@@ -8,6 +8,7 @@ import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
import Tooltip from 'react-bootstrap/Tooltip';
import SupportActions from '../../../actions/SupportActions';
import VoterActions from '../../../actions/VoterActions';
+import isMobileScreenSize from '../../../common/utils/isMobileScreenSize';
import Cookies from '../../../common/utils/js-cookie/Cookies';
import { convertToInteger } from '../../../common/utils/textFormat';
import { renderLog } from '../../../common/utils/logging';
@@ -740,12 +741,13 @@ class ItemActionBar extends PureComponent {
opposeButtonUnselectedPopOverText += '.';
}
- const supportButtonPopoverTooltip = (
+ const supportButtonPopoverTooltip = isMobileScreenSize() ? () : (
{this.isSupportCalculated() ? supportButtonUnselectedPopOverText : supportButtonSelectedPopOverText }
);
- const opposeButtonPopoverTooltip = (
+
+ const opposeButtonPopoverTooltip = isMobileScreenSize() ? () : (
{this.isOpposeCalculated() ? opposeButtonUnselectedPopOverText : opposeButtonSelectedPopOverText}
diff --git a/src/js/components/Widgets/PositionInformationOnlySnippet.jsx b/src/js/components/Widgets/PositionInformationOnlySnippet.jsx
index c6c91c310..e3a7bedde 100644
--- a/src/js/components/Widgets/PositionInformationOnlySnippet.jsx
+++ b/src/js/components/Widgets/PositionInformationOnlySnippet.jsx
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
import React, { Component, Suspense } from 'react';
import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
import Tooltip from 'react-bootstrap/Tooltip';
+import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
import { renderLog } from '../../common/utils/logging';
import normalizedImagePath from '../../common/utils/normalizedImagePath';
import { vimeoRegX, youTubeRegX } from '../../common/utils/textFormat';
@@ -68,7 +69,10 @@ export default class PositionInformationOnlySnippet extends Component {
}
const labelText = 'This position is information-only, as opposed to “support” or “oppose”';
- const tooltip = {labelText} ;
+ const tooltip = isMobileScreenSize() ? () : (
+ {labelText}
+ );
+
return (
{abbreviateNumber(issueFollowersCount)}
@@ -262,6 +265,7 @@ class IssueCard extends Component {
diff --git a/src/js/components/Widgets/ShowMoreItems.jsx b/src/js/components/Widgets/ShowMoreItems.jsx
index 1e2431b88..ef698aab1 100644
--- a/src/js/components/Widgets/ShowMoreItems.jsx
+++ b/src/js/components/Widgets/ShowMoreItems.jsx
@@ -2,6 +2,8 @@ import styled from 'styled-components';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
+const MINIMUM_DENOMINATOR = 6;
+
class ShowMoreItems extends Component {
constructor (props) {
super(props);
@@ -11,7 +13,7 @@ class ShowMoreItems extends Component {
render () {
const { hideShowMoreLink, loadingMoreItemsNow, numberOfItemsDisplayed, numberOfItemsTotal } = this.props;
- if (numberOfItemsDisplayed === 0) {
+ if (numberOfItemsDisplayed < MINIMUM_DENOMINATOR) {
return null;
}
diff --git a/src/js/components/Widgets/TooltipIcon.jsx b/src/js/components/Widgets/TooltipIcon.jsx
index e52a65182..1e7713146 100644
--- a/src/js/components/Widgets/TooltipIcon.jsx
+++ b/src/js/components/Widgets/TooltipIcon.jsx
@@ -3,17 +3,20 @@ import { Tooltip } from '@mui/material';
import styled from 'styled-components';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
+import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
class TooltipIcon extends Component {
render () {
return (
-
-
+ {isMobileScreenSize() ? () : (
+
+
+ )}
);
}
diff --git a/src/js/pages/Ballot/Ballot.jsx b/src/js/pages/Ballot/Ballot.jsx
index 39e1da4be..3c9938998 100644
--- a/src/js/pages/Ballot/Ballot.jsx
+++ b/src/js/pages/Ballot/Ballot.jsx
@@ -596,7 +596,7 @@ class Ballot extends Component {
if (voter && voter.is_signed_in) {
// console.log('onVoterStoreChange, about to historyPush(pathname):', pathname);
// Return to the same page without the 'voter_refresh_timer_on' variable
- historyPush(pathname, true);
+ historyPush(pathname, true);
} else if (numberOfVoterRetrieveAttempts < 3) {
// console.log('About to startTimerToRetrieveVoter');
this.startTimerToRetrieveVoter();
@@ -604,7 +604,7 @@ class Ballot extends Component {
// We have exceeded the number of allowed attempts and want to 'turn off' the request to refresh the voter object
// Return to the same page without the 'voter_refresh_timer_on' variable
// console.log('Exiting voterRefreshTimerOn');
- historyPush(pathname, true);
+ historyPush(pathname, true);
}
} else {
// console.log('Ballot.jsx onVoterStoreChange VoterStore.getVoter: ', VoterStore.getVoter());
diff --git a/src/js/pages/Campaigns/CampaignsHome.jsx b/src/js/pages/Campaigns/CampaignsHome.jsx
index 1b770583d..83bf66bd8 100644
--- a/src/js/pages/Campaigns/CampaignsHome.jsx
+++ b/src/js/pages/Campaigns/CampaignsHome.jsx
@@ -572,7 +572,7 @@ class CampaignsHome extends Component {
const newPathname = this.getStateNamePathnameFromStateCode(e.target.value);
const { location: { pathname } } = window;
if (pathname !== newPathname) {
- historyPush(newPathname);
+ historyPush(newPathname);
} else {
this.setState({ stateCode: e.target.value });
}
@@ -624,7 +624,7 @@ class CampaignsHome extends Component {
render () {
renderLog('CampaignsHome'); // Set LOG_RENDER_EVENTS to log all renders
- const {
+ const {
campaignList, campaignListTimeStampOfChange,
campaignsShowing,
candidateListOther, candidateListTimeStampOfChange,
diff --git a/src/js/pages/Campaigns/CampaignsHomeLoader.jsx b/src/js/pages/Campaigns/CampaignsHomeLoader.jsx
index 29789e3ed..a9be24551 100644
--- a/src/js/pages/Campaigns/CampaignsHomeLoader.jsx
+++ b/src/js/pages/Campaigns/CampaignsHomeLoader.jsx
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
import React, { Component, Suspense } from 'react';
import { Helmet } from 'react-helmet-async';
import styled from 'styled-components';
-import { convertStateCodeToStateText, convertStateTextToStateCode } from '../../common/utils/addressFunctions';
+import { convertStateCodeToStateText, convertStateTextToStateCode, isValidStateCode } from '../../common/utils/addressFunctions';
import historyPush from '../../common/utils/historyPush';
import { isWebApp } from '../../common/utils/isCordovaOrWebApp';
import { renderLog } from '../../common/utils/logging';
@@ -117,10 +117,18 @@ class CampaignsHomeLoader extends Component {
}
getStateNamePathnameFromStateCode = (stateCode) => {
- const stateName = convertStateCodeToStateText(stateCode);
- const stateNamePhrase = `${stateName}-candidates`;
- const stateNamePhraseLowerCase = stateNamePhrase.replaceAll(/\s+/g, '-').toLowerCase();
- return `/${stateNamePhraseLowerCase}/cs/`;
+ if (isValidStateCode(stateCode)) {
+ const stateName = convertStateCodeToStateText(stateCode);
+ if (stateName) {
+ const stateNamePhrase = `${stateName}-candidates`;
+ const stateNamePhraseLowerCase = stateNamePhrase.replaceAll(/\s+/g, '-').toLowerCase();
+ return `/${stateNamePhraseLowerCase}/cs/`;
+ } else {
+ return '/cs';
+ }
+ } else {
+ return '/cs';
+ }
}
getTopPadding = () => {
diff --git a/src/js/pages/Friends/Friends.jsx b/src/js/pages/Friends/Friends.jsx
index d2fd24f6b..12e2571ac 100755
--- a/src/js/pages/Friends/Friends.jsx
+++ b/src/js/pages/Friends/Friends.jsx
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
import React, { Component, Suspense } from 'react';
import { Helmet } from 'react-helmet-async';
import styled from 'styled-components';
+import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
import FriendsCurrent from './FriendsCurrent';
import FriendInvitationsSentByMe from './FriendInvitationsSentByMe';
import InviteByEmail from './InviteByEmail';
@@ -523,7 +524,11 @@ class Friends extends Component {
Invite Friends
-
Invite Friends
-
- this.deviceTableVisibilityOn()} style={{ color: 'black', opacity: '0.7', fontSize: '10px' }}>
+ this.deviceTableVisibilityOn()} style={{ color: 'black', opacity: '0.7', fontSize: '15px' }}>
Device Information