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

Update staging #935

Merged
merged 94 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
de7e90b
Updated codeinventory to have the correct status.
cschwinderg Oct 18, 2023
16df14a
fix(#646): fixed incorrectly decoded symbol in mapping file
maxdiebold-erg Dec 7, 2023
e24ac11
Merge pull request #917 from Eastern-Research-Group/bugfix/646_massac…
cschwinderg Dec 7, 2023
b765dd9
fix(HMW-640): added blur handler to source select menus
maxdiebold-erg Dec 18, 2023
17becec
fix(HMW-640): reset cursor on blur
maxdiebold-erg Dec 18, 2023
9a9ed37
Merge pull request #918 from Eastern-Research-Group/bugfix/640_source…
cschwinderg Dec 21, 2023
0f9ebad
HMW-647 Fixed issues with the print map widget.
cschwinderg Dec 21, 2023
2ef1494
HMW-647 Fixed styling issues of the resulting map pdf.
cschwinderg Dec 21, 2023
be61119
feat(HMW-137): started updating the EPA template
maxdiebold-erg Dec 27, 2023
5e3177b
feat(HMW-137): fixed some broken styles
maxdiebold-erg Dec 28, 2023
b5d53d1
feat(HMW-137): propagated template changes to other pages
maxdiebold-erg Dec 28, 2023
e8f959d
feat(HMW-137): added 'once' definition to fix console error
maxdiebold-erg Dec 29, 2023
f680fac
feat(HMW-137): added icons for external template links
maxdiebold-erg Dec 29, 2023
f468547
Merge pull request #919 from Eastern-Research-Group/bugfix/647_print-…
maxdiebold-erg Dec 29, 2023
0aff45e
feat(HMW-137): minor style fixes
maxdiebold-erg Dec 29, 2023
d1e6f37
feat(HMW-137): fixed more broken styles
maxdiebold-erg Jan 2, 2024
5f0df0d
feat(HMW-137): updated base font
maxdiebold-erg Jan 2, 2024
8f74e83
Merge pull request #920 from Eastern-Research-Group/feature/137_updat…
cschwinderg Jan 3, 2024
f8f4bc8
feat(HMW-650): migrated analytics code to 'gtag.js' API
maxdiebold-erg Jan 3, 2024
12b5927
feat(HMW-137): moved close icon to correct directory
maxdiebold-erg Jan 3, 2024
cc38edb
fix(HMW-137): updated EPA template script, fixed mobile errors
maxdiebold-erg Jan 4, 2024
5ca8099
feat(HMW-650): updated analytics exception reporting
maxdiebold-erg Jan 4, 2024
d14b08e
feat(HMW-650): updated comment
maxdiebold-erg Jan 5, 2024
25f7ff0
test(HMW-650): added button to trigger exception for testing
maxdiebold-erg Jan 5, 2024
c1ede59
feat(HMW-650): fixed a code smell
maxdiebold-erg Jan 5, 2024
3fff30b
HMW-650 Added a comment about production ga4.
cschwinderg Jan 8, 2024
3c64c54
Merge pull request #922 from Eastern-Research-Group/feature/650_add-g…
cschwinderg Jan 8, 2024
65bc93d
HMW-650 Debugging gtag setup in cloud.gov
cschwinderg Jan 8, 2024
fa6f9a4
HMW-650 Removed testing code.
cschwinderg Jan 8, 2024
2499c32
Fixed issue of HMW banner over top of EPA template slide out menu.
cschwinderg Jan 8, 2024
953fe50
HMW-655 Updated to node 20 and updated app version numbers.
cschwinderg Jan 8, 2024
e331748
HMW-655 Updated most dependencies.
cschwinderg Jan 8, 2024
28a29a3
HMW-655 Updated arcgis js api.
cschwinderg Jan 8, 2024
b6bd79d
Merge pull request #921 from Eastern-Research-Group/feature/137_updat…
cschwinderg Jan 8, 2024
4fb4284
HMW-655 Moved from Styled Components to Emotion
maxdiebold-erg Jan 8, 2024
3816e52
Merge remote-tracking branch 'origin/feature/655_update-dependencies'…
maxdiebold-erg Jan 9, 2024
8b784cf
HMW-655 Started work on upgrading to react 18.
cschwinderg Jan 9, 2024
b6e4c0b
HMW-655 Fixed a couple of styling issues.
cschwinderg Jan 9, 2024
e4f32e0
Merge pull request #923 from Eastern-Research-Group/feature/655_updat…
cschwinderg Jan 9, 2024
860aeb9
HMW-655 Merge in css branch.
cschwinderg Jan 9, 2024
2948957
HMW-655 Fixed issues with glossary panel and terms
maxdiebold-erg Jan 9, 2024
11c7bae
HMW-655 Fixed some cypress tests.
cschwinderg Jan 9, 2024
7914a4b
HMW-655 Hide back-to-top button when fullscreen active
maxdiebold-erg Jan 9, 2024
9f56e8d
HMW-655 Fixed issue with rendering legend
maxdiebold-erg Jan 9, 2024
3a74592
Merge remote-tracking branch 'origin/feature/655_update-dependencies'…
maxdiebold-erg Jan 9, 2024
058aa03
HMW-655 Fixed issue of back to top button being visible in full scree…
cschwinderg Jan 10, 2024
072ae86
HMW-655 Fixed more cypress tests.
cschwinderg Jan 10, 2024
2814b0d
HMW-655 Ran prettier on commands.ts
cschwinderg Jan 10, 2024
30c3725
HMW-655 Addressed some CSS-related console warnings
maxdiebold-erg Jan 10, 2024
1ec8252
HMW-657 Fixed flickering layer issue
maxdiebold-erg Jan 10, 2024
dca8a0b
HMW-657 Addressed a code smell
maxdiebold-erg Jan 10, 2024
b47b360
HMW-657 Removed console log, unnecessary effect
maxdiebold-erg Jan 10, 2024
4576c46
Merge pull request #924 from Eastern-Research-Group/feature/655_updat…
cschwinderg Jan 10, 2024
ac447b1
HMW-659 Updated NARS data for the National page
maxdiebold-erg Jan 10, 2024
0b34539
HMW-655 Fixed more cypress tests and updated visual test snapshots.
cschwinderg Jan 10, 2024
261200a
HMW-655 Addressed codesmell.
cschwinderg Jan 10, 2024
8e37c76
HMW-655 Adjusted back-to-top z-index to be above map
maxdiebold-erg Jan 10, 2024
96abf94
HMW-655 Fixed issue of state and tribal maps being shifted to the rig…
cschwinderg Jan 11, 2024
e31eaf0
Merge pull request #925 from Eastern-Research-Group/feature/655_updat…
cschwinderg Jan 11, 2024
3f14253
Merge pull request #926 from Eastern-Research-Group/feature/659_updat…
cschwinderg Jan 11, 2024
e18c1bf
HMW-655 Troubleshooting Expand/Collapse all.
cschwinderg Jan 11, 2024
e35fa20
HMW-655 Fixed state/tribe padding issue when not in fullscreen mode.
cschwinderg Jan 11, 2024
caf2b20
HMW-660 Wrapped the map in a toggleable fullscreen container
maxdiebold-erg Jan 11, 2024
16c728d
HMW-660 Disabled the Escape key in the fullscreen container due to sc…
maxdiebold-erg Jan 11, 2024
badd1da
HMW-660 Added footer back to fullscreen map
maxdiebold-erg Jan 12, 2024
67dd02f
HMW-660 Fixed border issue
maxdiebold-erg Jan 12, 2024
ebc7fb5
HMW-660 Adjusted fullscreen z-index
maxdiebold-erg Jan 12, 2024
8e67b96
Merge pull request #927 from Eastern-Research-Group/bugfix/660_fullsc…
cschwinderg Jan 12, 2024
52e7346
HMW-660 Removed extra fullscreen code
maxdiebold-erg Jan 12, 2024
89c57e6
HMW-662 Fixed glossary terms in fullscreen view, other zoom behavior
maxdiebold-erg Jan 12, 2024
ce1f32a
HMW-662 Fixed a code smell
maxdiebold-erg Jan 12, 2024
dc4c717
HMW-662 Removed unnecessary data-content attributes.
cschwinderg Jan 16, 2024
d8e41db
Merge pull request #928 from Eastern-Research-Group/bugfix/662_fullsc…
cschwinderg Jan 16, 2024
3fdd457
HMW-662 Call reset data function when leaving pages
maxdiebold-erg Jan 16, 2024
8d7c3ca
HMW-662 Added reset data call to State/Tribal page
maxdiebold-erg Jan 16, 2024
d03576d
HMW-662 Moved initial extent out of state
maxdiebold-erg Jan 16, 2024
a95c36f
HMW-661 Fixed issue of sticky box not working after leaving full scre…
cschwinderg Jan 16, 2024
cce2895
Merge pull request #929 from Eastern-Research-Group/bugfix/662_fullsc…
cschwinderg Jan 16, 2024
c45f5e9
Merge pull request #930 from Eastern-Research-Group/bugfix/661_sticky…
maxdiebold-erg Jan 16, 2024
30dfccc
HMW-663 Fixed issue of unsupported message displaying on supported br…
cschwinderg Jan 17, 2024
22ef96e
HMW-663 Updated the supported browser version numbers based on ArcGIS…
cschwinderg Jan 17, 2024
6ded43e
HMW-663 Fixed issue of close button, for unsupported browser message,…
cschwinderg Jan 17, 2024
5f91ad8
Merge pull request #931 from Eastern-Research-Group/bugfix/663_fixed-…
maxdiebold-erg Jan 17, 2024
92d2082
HMW-664 Switched from react-window to react-virtuoso
maxdiebold-erg Jan 17, 2024
b9269e1
HMW-664 Addressed sluggish select box when there are many options
maxdiebold-erg Jan 18, 2024
7f25bd4
HMW-665 Updated wild and scenic rivers service urls.
cschwinderg Jan 19, 2024
0da51a6
HMW-665 Updated wild and scenic river attributes to match new service.
cschwinderg Jan 19, 2024
41b5f4a
HMW-664 Implemented pagination in react-virtuoso
maxdiebold-erg Jan 19, 2024
b9f8262
HMW-664 Added input handling to paginated select
maxdiebold-erg Jan 22, 2024
6cfe824
HMW-664 Fixed issue with search input in paginated select
maxdiebold-erg Jan 22, 2024
2237fb8
HMW-664 Removed magic number, removed unused prop
maxdiebold-erg Jan 22, 2024
ebdba08
Merge pull request #932 from Eastern-Research-Group/bugfix/664_fix-vi…
cschwinderg Jan 22, 2024
ff83e98
Merge pull request #933 from Eastern-Research-Group/feature/665_updat…
maxdiebold-erg Jan 22, 2024
d8a4804
Fixed cypress tests.
cschwinderg Jan 23, 2024
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
1,728 changes: 825 additions & 903 deletions app/client/package-lock.json

Large diffs are not rendered by default.

65 changes: 32 additions & 33 deletions app/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mywaterway-client",
"version": "2.5.0",
"version": "2.9.0",
"description": "A tool to learn about your water resources.",
"keywords": [
"MyWaterway",
Expand All @@ -25,7 +25,7 @@
"Max Diebold <[email protected]>"
],
"engines": {
"node": "18.x"
"node": "20.x"
},
"main": "src/index.js",
"scripts": {
Expand All @@ -38,60 +38,59 @@
"devDependencies": {
"@cypress/instrument-cra": "1.4.0",
"@esri/arcgis-rest-types": "3.7.0",
"@testing-library/jest-dom": "6.1.3",
"@testing-library/react": "14.0.0",
"@testing-library/user-event": "14.5.1",
"@types/file-saver": "2.0.5",
"@types/jest": "29.5.5",
"@types/node": "18.16.0",
"@types/papaparse": "5.3.9",
"@types/react": "17.0.45",
"@types/react-dom": "17.0.17",
"@types/react-ranger": "2.0.2",
"@types/react-window": "1.8.6",
"@types/smoothscroll-polyfill": "0.3.1",
"@types/styled-components": "5.1.28",
"@types/uuid": "9.0.4",
"@testing-library/jest-dom": "6.2.0",
"@testing-library/react": "14.1.2",
"@testing-library/user-event": "14.5.2",
"@types/file-saver": "2.0.7",
"@types/jest": "29.5.11",
"@types/node": "20.10.7",
"@types/papaparse": "5.3.14",
"@types/react": "18.2.47",
"@types/react-dom": "18.2.18",
"@types/react-ranger": "2.0.4",
"@types/smoothscroll-polyfill": "0.3.3",
"@types/uuid": "9.0.7",
"husky": "8.0.3",
"lint-staged": "14.0.1",
"prettier": "3.0.3",
"typescript": "5.2.2",
"web-vitals": "3.5.0"
"lint-staged": "15.2.0",
"prettier": "3.1.1",
"typescript": "5.3.3",
"web-vitals": "3.5.1"
},
"dependencies": {
"@arcgis/core": "4.27.6",
"@arcgis/core": "4.28.10",
"@emotion/react": "11.11.3",
"@radix-ui/react-dialog": "1.0.5",
"@reach/tabs": "0.18.0",
"@reach/tooltip": "0.18.0",
"@reach/window-size": "0.18.0",
"@visx/curve": "3.3.0",
"@visx/glyph": "3.3.0",
"@visx/legend": "3.3.0",
"@visx/scale": "3.3.0",
"@visx/xychart": "3.3.0",
"@visx/legend": "3.5.0",
"@visx/scale": "3.5.0",
"@visx/xychart": "3.5.1",
"eslint-config-react-app": "7.0.1",
"file-saver": "2.0.5",
"glossary-panel": "github:Eastern-Research-Group/glossary",
"highcharts": "11.1.0",
"highcharts": "11.2.0",
"highcharts-react-official": "3.2.1",
"html-to-image": "1.11.11",
"papaparse": "5.4.1",
"pdf-lib": "1.17.1",
"react": "17.0.2",
"react": "18.2.0",
"react-app-polyfill": "3.0.0",
"react-dom": "17.0.2",
"react-dom": "18.2.0",
"react-dropzone": "14.2.3",
"react-ranger": "2.1.0",
"react-rnd": "10.4.1",
"react-router-dom": "6.16.0",
"react-router-dom": "6.21.1",
"react-scripts": "5.0.1",
"react-select": "5.7.7",
"react-select": "5.8.0",
"react-spring": "9.7.3",
"react-sticky-box": "2.0.2",
"react-sticky-box": "2.0.5",
"react-switch": "7.0.0",
"react-table": "7.8.0",
"react-window": "1.8.9",
"react-virtuoso": "4.6.2",
"smoothscroll-polyfill": "0.4.4",
"styled-components": "5.3.11",
"uuid": "9.0.1"
},
"lint-staged": {
Expand Down Expand Up @@ -120,4 +119,4 @@
"last 1 safari version"
]
}
}
}
Binary file removed app/client/public/apple-touch-icon.png
Binary file not shown.
2 changes: 1 addition & 1 deletion app/client/public/browserconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<square150x150logo src="/images/mstile-150x150.png"/>
<TileColor>#2b5797</TileColor>
</tile>
</msapplication>
Expand Down
68 changes: 68 additions & 0 deletions app/client/public/epa-template-files/css/epa.css

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
12 changes: 12 additions & 0 deletions app/client/public/epa-template-files/ieconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<browserconfig>
<msapplication>
<tile>
<square70x70logo src="/images/favicon-70.png"/>
<square150x150logo src="/images/favicon-150.png"/>
<wide310x150logo src="/images/favicon-310x150.png"/>
<square310x310logo src="/images/favicon-310.png"/>
<TileColor>#FFFFFF</TileColor>
</tile>
</msapplication>
</browserconfig>
1 change: 1 addition & 0 deletions app/client/public/epa-template-files/images/epa-seal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/client/public/epa-template-files/images/icon-https.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/client/public/epa-template-files/images/minus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/client/public/epa-template-files/images/plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading