Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VOTE-2903 incorporate latest data structure changes from nvrf #1010

Merged
merged 2 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion scripts/upkeep
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ echo ""
echo "**************************************************"
echo "Adding missing data files for NVRF..."
echo "**************************************************"
cp -rfp ${app_path}/web/data ${html_path}
cp -rfp ${app_path}/web/es/nvrf/data ${html_path}
cp -rfp ${app_path}/web/nvrf/data ${html_path}
echo "Missing data files for NVRF...completed!"
echo ""

Expand Down
File renamed without changes.
11 changes: 5 additions & 6 deletions web/data/es/strings.json → web/es/nvrf/data/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
"month": "Mes",
"day": "Día",
"year": "Año",
"backIcon": "back arrow icon",
"forwardIcon": "forward arrow icon",
"selectState": "Select your state or territory",
"selectStateAriaLabel": "State selection dropdown menu",
"backIcon": "icono de flecha hacia atrás",
"forwardIcon": "icono de flecha hacia adelante",
"selectState": "Seleccione su estado o territorio",
"selectStateAriaLabel": "Lista de sugerencias de estados y territorios",
"lastUpdated": "@state_name información actualizada por última vez",
"emailLabel": "Voter Contact",
"select": "-Elija-",
"download": "Descargue el formulario",
"mailDeadlineLabel": "Plazo de registro por correo:",
"idSelectionAriaLabel": "Choose identification type"
"idSelectionAriaLabel": "Seleccione el tipo de identificación"
}
1 change: 1 addition & 0 deletions web/modules/custom/vote_nvrf/dist/assets/index.css

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions web/modules/custom/vote_nvrf/dist/assets/index.js

Large diffs are not rendered by default.

95 changes: 0 additions & 95 deletions web/modules/custom/vote_nvrf/dist/assets/nvrf.css

This file was deleted.

8 changes: 4 additions & 4 deletions web/modules/custom/vote_nvrf/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions web/modules/custom/vote_nvrf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
"version": "1.0.0",
"scripts": {
"postinstall": "npm run build",
"build": "npm run reset-dist && npm run copy-dist:js && npm run copy-dist:css && npm run copy-data",
"reset-dist": "rm -rf ./dist && mkdir ./dist && mkdir ./dist/assets",
"build": "npm run reset-dist && npm run copy-dist:js && npm run copy-dist:css && npm run copy-data && npm run copy-data-es",
"reset-dist": "mkdir -p ./dist/assets",
"copy-dist:js": "cp -r ./node_modules/vote-gov-nvrf-app/dist/assets/index.js ./dist/assets/index.js",
"copy-dist:css": "cp -r ./node_modules/vote-gov-nvrf-app/dist/theme/assets/styles/nvrf.css ./dist/assets/nvrf.css",
"copy-data": "rm -rf ../../../data && cp -r ./node_modules/vote-gov-nvrf-app/data ../../../data"
"copy-dist:css": "cp -r ./node_modules/vote-gov-nvrf-app/dist/assets/index.css ./dist/assets/index.css",
"copy-data": "mkdir -p ../../../nvrf && rm -rf ../../../nvrf/data && cp -r ./node_modules/vote-gov-nvrf-app/dist/nvrf/data ../../../nvrf/data",
"copy-data-es": "mkdir -p ../../../es/nvrf && rm -rf ../../../es/nvrf/data && cp -r ./node_modules/vote-gov-nvrf-app/dist/es/nvrf/data ../../../es/nvrf/data"
},
"dependencies": {
"vote-gov-nvrf-app": "github:usagov/vote-gov-nvrf-app#v0.17.2"
"vote-gov-nvrf-app": "github:usagov/vote-gov-nvrf-app#v0.18.0"
}
}
2 changes: 1 addition & 1 deletion web/modules/custom/vote_nvrf/vote_nvrf.libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ nvrf_assets:
dist/assets/index.js: {}
css:
theme:
dist/assets/nvrf.css: {}
dist/assets/index.css: {}
File renamed without changes.
1 change: 0 additions & 1 deletion web/data/strings.json → web/nvrf/data/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"selectState": "Select your state or territory",
"selectStateAriaLabel": "State selection dropdown menu",
"lastUpdated": "@state_name information last updated ",
"emailLabel": "Voter Contact",
"select": "- Select -",
"download": "Download your mail-in form",
"mailDeadlineLabel": "Mail-in registration deadline:",
Expand Down