Skip to content

Commit

Permalink
A snyk security upgrade moved forward the version of glob we are usin…
Browse files Browse the repository at this point in the history
…g, which required a minor syntax change. Also fixed spacing errors caught by ESLINT. Added comment to PoliticianImageDesktop fix.
  • Loading branch information
DaleMcGrew committed Dec 1, 2023
1 parent 9de694b commit 9204ecb
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/js/common/components/Style/PoliticianDetailsStyles.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const PoliticianImageMobile = styled('img')`
export const PoliticianImageDesktop = styled('img')`
border-radius: 5px;
height: 100%;
max-height: 200px;
max-height: 200px; // Needs to be revisited when rectangular campaign images are used
`;

export const PoliticianImageSharedStyles = css`
Expand Down
2 changes: 1 addition & 1 deletion src/js/common/node/webPackPostBuild.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const fs = require('fs');
const glob = require('glob');
const { glob } = require('glob');

// builds a tiny html file, that contains the name of the main.hash.js chunk which is
// consumed by the WeVote API Server. When the Server is queried by Fastly to generate an index.html
Expand Down
4 changes: 2 additions & 2 deletions src/js/pages/Ballot/Ballot.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -596,15 +596,15 @@ 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();
} else {
// 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());
Expand Down
4 changes: 2 additions & 2 deletions src/js/pages/Campaigns/CampaignsHome.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
}
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 9204ecb

Please sign in to comment.