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

UI improvements #129

Closed
wants to merge 11 commits into from
Closed

UI improvements #129

wants to merge 11 commits into from

Conversation

smcalilly
Copy link
Contributor

Overview

This PR has a ton of UI changes for issue #125. There are a lot of CSS changes and UI element tweaks.

It also includes some React code changes for #120 and #96. The changes let a user select a row in the table which will open a popup for that row's geometry and allow the user to save that geometry. Similarly, a user can select a single geometry and save the geometry.

Demo

Screen Shot 2022-02-16 at 3 56 30 PM
Screen Shot 2022-02-16 at 3 56 41 PM
Screen Shot 2022-02-16 at 3 57 06 PM
Screen Shot 2022-02-16 at 3 57 36 PM
Screen Shot 2022-02-16 at 3 57 53 PM

Testing Instructions

If you are opening a PR for functionality that requires access to the remote GIS
database from your review app, don't forget to attach the QuotaGuard Static add-on
to your review app after it initializes:

# From your local command line
heroku addons:attach -a ${REVIEW_APP} quotaguardstatic

tk

smcalilly and others added 11 commits February 25, 2022 15:39
* add new phase model to the UI form

* appease flake8

* adding phase form

* save searchable map with pagination proof of concept

* save messy proof of concept / wip

* save selected asset on the backend

* appease flake8

* fix fixtures and clean up dead code

* remove remnant from phase-form branch work

* remove remnant from phase-form branch work

* move function so it reads better

* cleanup code

* appease flake8

* remove problematic auth fixture

* fixtures without auth

* add user

* update password

* Spike asset API with DRF

* Allow internal UID to be null

* draft for searching assets with django rest and a react table

* cleanup code

* cleanup code

* cleanup code

* cleanup code

* appease flake8

* fix failing compressor

* fix planner bugs and set correct state value

* better styling for the search elements

* extract table column config

* adding loading message

* Add DRF endpoint and serializers for LocalAssets model (#106)

* saving work

* django rest framework endpoint and serializer for local assets

* appease flake8

* remove test geojson file

* Associate the asset tool with a phase (#110)

* in the ui, associate the asset tool with a phase

* appease flake8

* don't need to override create method

* Add leaflet drawing for selecting assets (#113)

* in the ui, associate the asset tool with a phase

* appease flake8

* don't need to override create method

* saving work

* finish react drawer

* add citation for the EditControl source

* tweak styles

* cleanup code

* cleanup code

* uncomment code...

* remove console logs

* use object.entries

* add context to code comment

* Improve default behavior for selecting assets (#119)

* improve the logic to select an asset

* clarify code comment and change order of function calls for organization

* Improvements to the asset map UI (#117)

* in the ui, associate the asset tool with a phase

* appease flake8

* don't need to override create method

* cleanup code

* uncomment code...

* delete assets in table proof of concept

* bring in delete button style

* bring in sessionstorage code

* reorganize useSessionStorage import

* change line weight to fix geo overlap bug

* rename state objects to present tense

* add map zoom when there are search results

* cleanup code

* add code comment

* remove dead code

* add source to search assets response. use it to determine when to zoom

* refactor search source into a serializer for reusability

* Add authenticated endpoints (#123)

* add authentication with tests

* fix failing test

* Add asset map to phase edit page (#124)

* render asset map in the phase update page; rename some variables and filenames for clarity

* cleanup code

* Add success and error messages to the ajax responses (#122)

* in the ui, associate the asset tool with a phase

* appease flake8

* don't need to override create method

* add messages to the ajax responses

* commit missing js import

* only use message in html template when error'd. show success message in button

* show success message in table

* better message handling in existing assets table

* change variable name and clean up code

* manage message state with session storage

* commit missing dependency

* Add search and save for the remaining tables (#128)

* add points of interest to asset map search; implement a simple popup

* add search for parking lots

* add migration to LocalAsset so we can use PicnicGrove.fpd_uid CharField

* make popup relevant to local assets and search assets

* cleanup code

* add signage search + tidy up point markers

* cleanup code

* cleanup code

* cleanup code

* catch and render 400 error from client

* allow null for LocalAsset.asset_id

* bring back docstring

* change CharField to a TextField and create a new migration instead of having the two migrations that do nothing

* remove signage table for now

* remove dead code

* fix merge conflicts

* appease flake8

Co-authored-by: hancush <[email protected]>
…ap + facelift to navbar and other style improvments
@smcalilly
Copy link
Contributor Author

closing this. my code got all messed up when i tried to rebase from the main branch, so i added the changes to a fresh branch with a new pr (#132)

@smcalilly smcalilly closed this Feb 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant