Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: codeforgso/GoVote
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dev
Choose a base ref
...
head repository: codeforgso/GoVote
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master_old
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 2 commits
  • 77 files changed
  • 11 contributors

Commits on Dec 21, 2019

  1. Merge Dev to master (#152)

    * Blake - enable hot-reloading.
    
    * spinner for voter info search
    
    * this fixes issue #73
    
    * Implement react-router. Implement basic page design
    
    * Add VoterInfoForm to VoterRegLookup
    
    * Delete modals
    
    * Remove npm commands from contributing guide
    
    * Fix comma dangle
    
    * Implement react router / Project cleanup (#77)
    
    * Implement react-router. Implement basic page design
    
    * Add VoterInfoForm to VoterRegLookup
    
    * Delete modals
    
    * Remove npm commands from contributing guide
    
    * move address to top of page when selected (#88)
    
    * Add basic pages and implement landing page menu
    
    * Add basic pages and implement landing page menu
    
    * Implement Landing Page Menu (#90)
    
    * Implement react-router. Implement basic page design
    
    * Add VoterInfoForm to VoterRegLookup
    
    * Delete modals
    
    * Remove npm commands from contributing guide
    
    * Fix comma dangle
    
    * Add basic pages and implement landing page menu
    
    * Add basic pages and implement landing page menu
    
    * Fix eslint/console warnings
    
    * Fix merge conflict issues (#93)
    
    * Implement react-router. Implement basic page design
    
    * Add VoterInfoForm to VoterRegLookup
    
    * Delete modals
    
    * Remove npm commands from contributing guide
    
    * Fix comma dangle
    
    * Add basic pages and implement landing page menu
    
    * Add basic pages and implement landing page menu
    
    * Fix eslint/console warnings
    
    * Refactor VoterInfoForm into reusable component
    
    * Refactor VoterInfoForm into reusable component
    
    * Fix eslint no-alert error
    
    * Refactor VoterInfoForm into a reusable component (#97)
    
    * Implement react-router. Implement basic page design
    
    * Add VoterInfoForm to VoterRegLookup
    
    * Delete modals
    
    * Remove npm commands from contributing guide
    
    * Fix comma dangle
    
    * Add basic pages and implement landing page menu
    
    * Add basic pages and implement landing page menu
    
    * Fix eslint/console warnings
    
    * Refactor VoterInfoForm into reusable component
    
    * Refactor VoterInfoForm into reusable component
    
    * Fix eslint no-alert error
    
    * Fix Issue 99 (#101) - Add content to Can I Vote page
    
    * Remove lipsum text from DayOfInfo. Remove extra link from Home page
    
    * #87 added selected address to the component that displays voter info the selected address (#96)
    
    * move address to top of page when selected
    
    * #87 moved address above voter info when address selected
    
    * #87 moved address above voter info when address selected
    
    * #87 moved address above voter info when address selected
    
    * #89 selected address and reg info at top of page, auto scroll to top after selection (#102)
    
    * move address to top of page when selected
    
    * #87 moved address above voter info when address selected
    
    * #87 moved address above voter info when address selected
    
    * #87 moved address above voter info when address selected
    
    * #89 selected address and reg info at top of page, auto scroll to top after selection
    
    * #95 link to Can I vote from I don't see my address
    
    * remove commented line
    
    * syntax fix VoterRegLookup
    
    * Switch to HashRouter to fix issue when direct linking
    
    * Implement HashRouter to fix issue when direct linking to pages (#103)
    
    * Implement react-router. Implement basic page design
    
    * Add VoterInfoForm to VoterRegLookup
    
    * Delete modals
    
    * Remove npm commands from contributing guide
    
    * Fix comma dangle
    
    * Add basic pages and implement landing page menu
    
    * Add basic pages and implement landing page menu
    
    * Fix eslint/console warnings
    
    * Refactor VoterInfoForm into reusable component
    
    * Refactor VoterInfoForm into reusable component
    
    * Fix eslint no-alert error
    
    * Remove lipsum text from DayOfInfo. Remove extra link from Home page
    
    * Switch to HashRouter to fix issue when direct linking
    
    * Update "I Don't See My Address" to use react-router link
    
    * Additional fix for Issue #95 (#104)
    
    * Implement react-router. Implement basic page design
    
    * Add VoterInfoForm to VoterRegLookup
    
    * Delete modals
    
    * Remove npm commands from contributing guide
    
    * Fix comma dangle
    
    * Add basic pages and implement landing page menu
    
    * Add basic pages and implement landing page menu
    
    * Fix eslint/console warnings
    
    * Refactor VoterInfoForm into reusable component
    
    * Refactor VoterInfoForm into reusable component
    
    * Fix eslint no-alert error
    
    * Remove lipsum text from DayOfInfo. Remove extra link from Home page
    
    * Switch to HashRouter to fix issue when direct linking
    
    * Update "I Don't See My Address" to use react-router link
    
    * WIP. Breaking correctl
    
    * removed global CSS rule that was preventing menu from expanding properly
    
    * Fix coloring
    
    * Styles work correctly, animation doesn't
    
    * Remove mayoral candiates from VoterInfoForm.jsx
    
    * Revert "Remove mayoral candiates info from VoterInfoForm"
    
    * Remove mayoral candidates from VoterInfoForm
    
    * Move VoterRequirements text from CanIVote to its own page. Link to /voter-requirements
    
    * Update map statement to use implict return
    
    * Update Header.jsx
    
    * Update Header.jsx. Remove unecessary
    
    * Set up CanIVote to use components and sub routes
    
    * [WIP] Styling for CanIVote and VoterRequirements
    
    * [WIP] Styling voter requirements page
    
    * Add key to NavItems in Header
    
    * Finish styling VoterRequirements page
    
    * Fix button layout on small displays on CanIVote
    
    * Update columns for CanIVote buttons
    
    * Remove "City Council Members'" text from VoterInfoForm
    
    * Implement polling place lookup on WhereAndWhen
    
    * Cleanup UX on WhereAndWhen
    
    * Add SASS CSS preprocessor with hot reloading
    
    * Refactor VoterInfoForm and VoterRegLookup
    
    * Update WhereAndWhen and CanIVoteCheckStatus to use the new VoterRegLookup
    
    * index on dev: e0f6311 Merge pull request #111 from SchaeStewart/VoterInfoFormRemoveAddressList
    
    * Implement sessionStorage for the selectedVoter in VoterRegLookup
    
    * Update CanIVoteRegistered to only show header when needed via props
    
    * Add link to NCVoter.org to VoterRequirements page
    
    * Add Where information to WhereAndWhen
    
    * Minor npm updates
    
    * Revert "Add CSS preprocessor SASS with hot reloading"
    
    * Add link to sample NCSBE ballot form on Candidates page
    
    * Change Home page links into cards
    
    * Revert "Add link to sample NCSBE ballot form on Candidates page"
    
    This reverts commit bccda6e.
    
    * npm audit
    
    * actions/index.js export handleError
    
    * WhereAndWhen.jsx new url for voter registration info
    
    * first changes to add map
    
    * additional changes to add map
    
    * conditonal render of voter precinct map
    
    * no map if API missing, update Contributing.md
    
    * init
    
    * add link to polling places
    
    * change h2 to p tag
    
    * Fix typo
    
    * Delete yarn.lock
    
    * add config.js
    
    * Improve markdown formatting
    
    * Update CONTRIBUTING.md
    
    * NPX create client folder. Copy src to client. Move react deps to client
    
    * rm src directory
    
    * rm config
    
    * rm scripts public
    
    * Resolve package.json conflict issues
    
    * Remove eslint from client deps
    
    * added .env file
    
    * Rename client npm module name
    
    * Remove .env stuff from client
    
    * drop table before create, use var for table name, use env
    
    * Fix console warnings
    
    * Update server Dockerfile
    
    * Create Dockerfile for client
    
    * Move server related items to the server dir. Link the top-level package.json to server and client packages
    
    * remove old .gitkeep
    
    * Remove old candidates data
    
    * Update docker-compose to use new Dockerfiles. Update client proxy behavior to work inside container
    
    * Update server/package.json to use nodemon
    
    * Add docker:create-tables and docker:etl to npm scripts
    
    * Create start:dev npm script for server
    
    * Configure docker-compose to use .env file. Create sample .env. Fix bug in create-tables.js
    
    * Update Contributing.md with details about .env file
    
    * Delete CRA README from client
    
    * Remove comments
    
    * Document client proxying behavaior
    
    * comment
    
    * documentation
    
    * fix docker create table and etl
    
    * env changes
    
    * process.lock change from pull
    
    * env variables
    
    * fix .env problems on client
    
    * fix nested a tags
    
    * comments and add loadDataMac to package.json
    
    * fix scripts to load data
    
    * issue #127 add URL to .env and pull filename from URL
    
    * issue #127 remove temp files that were added during testing
    
    * add polling place table to create_tables.js
    
    * [wip] polling_place etl
    
    * etl for polling places
    
    * fix voters/poll join, fix googleapis script load
    
    * remove comment
    
    * Add StreamCleaner transform stream to remove null byte and unprintable characters
    
    * Remove county_id from createPollingTable
    
    * Format etl. Uncomment voterETL
    
    * Clean up etl
    
    * Remove polling_place.txt
    
    * Cleanup code (#148)
    
    * Seperate pages and components. Remove unused components
    
    * [wip] Move VoterInfoForm into VoterRegLookup. Implement context api in VoterRegLookup
    
    * Use voter registration context in WhereAndWhen cleanup VoterPrecinctMap
    
    * Finish implmenting Voter Registration Context. Move session storage to context
    
    * Remove unused component did mount
    
    * Hookify VoterRegistrationContext
    
    * Hookify and cleanup
    
    * Switch to useContext and fix form hydration bug
    
    * Switch to useContext
    
    * Add cross-env (#149)
    
    * Seperate pages and components. Remove unused components
    
    * [wip] Move VoterInfoForm into VoterRegLookup. Implement context api in VoterRegLookup
    
    * Use voter registration context in WhereAndWhen cleanup VoterPrecinctMap
    
    * Finish implmenting Voter Registration Context. Move session storage to context
    
    * Remove unused component did mount
    
    * Hookify VoterRegistrationContext
    
    * Hookify and cleanup
    
    * Switch to useContext and fix form hydration bug
    
    * Switch to useContext
    
    * run npm audit
    
    * Add cross-env
    
    * Update package.json
    
    * Bump lodash from 4.17.11 to 4.17.15 in /server (#151)
    
    Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15.
    - [Release notes](https://github.com/lodash/lodash/releases)
    - [Commits](lodash/lodash@4.17.11...4.17.15)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    * Bump mixin-deep from 1.3.1 to 1.3.2 in /server (#150)
    
    Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
    - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
    - [Commits](jonschlinkert/mixin-deep@1.3.1...1.3.2)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: Blake Guilloud <blake.guilloud@gmail.com>
    Co-authored-by: Rob Martin <Rob.martin.5758@gmail.com>
    Co-authored-by: rtrunkhill <rtrunkhill@gmail.com>
    Co-authored-by: Michael Ellis <michael.ellis.010@gmail.com>
    Co-authored-by: Steven Buccini <stevenbuccini@users.noreply.github.com>
    Co-authored-by: Philip Curley <curleypg@gmail.com>
    Co-authored-by: dresean <20849315+dresean@users.noreply.github.com>
    Co-authored-by: Colin94L <45083512+Colin94L@users.noreply.github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    10 people authored Dec 21, 2019
    Configuration menu
    Copy the full SHA
    4d8773c View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. Set theme jekyll-theme-minimal

    Tr3yb0 committed May 20, 2020
    Configuration menu
    Copy the full SHA
    cba9511 View commit details
    Browse the repository at this point in the history
Loading