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.

Sign up for GitHub

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

Jump to bottom

Feature - Project Details Mapper UI #861

Merged
merged 74 commits into from
Oct 4, 2023
Merged

Feature - Project Details Mapper UI #861

merged 74 commits into from
Oct 4, 2023

Conversation

varun2948
Copy link
Contributor

@varun2948 varun2948 commented Sep 28, 2023 •
edited
Loading

This PR Contains create new project UI and Project Details Mobile View, but as create new project new UI is not yet completed we will have another PR this week or maybe next week ready for new UI on the create project

  1. One of The Key Changes on This PR is the web view for POPUP as it is now an overlay on top of the whole page and can be scrollable on the map side without much problem.
    Screenshot:
    image

  2. Same thing but for the mobile view
    Screenshot:
    image

You can tell me any flaws you find or see @spwoodcock and will change it accordingly.

NSUWAL123 and others added 30 commits September 26, 2023 09:51
@NSUWAL123
fix (create new project): create new project url updated
d9f0c8f
@NSUWAL123
fix (create new project): upload area - select a file issue solved
baca147
@NSUWAL123
fix (create new project): data extract - select a file issue solved
9dd336a
@NSUWAL123
fix (radiobutton): option selection on label click, UI fix
887689b
@NSUWAL123
fix (create new project): initial values for project details form added
287cf7d
@NSUWAL123
feat (select): custom select component added
e5f6caa
@NSUWAL123
fix (create new project): data extract - shadcn select replaced with …
4fd5dae 
…customselect
@NSUWAL123
fix (custom select): updated props
b14952c
@NSUWAL123
fix (create new project): project detials - shadcn select replaced wi…
73d4dc0 
…th customselect
@NSUWAL123
fix (select): shadcn components export removed
90c2a8a
@NSUWAL123
fix (create new project): select form - shadcn select replaced with c…
e85db74 
…ustomselect
@varun2948
fix: style fixes on input field
b791c65
@varun2948
Merge branch 'feat-create-new-project' of https://github.com/NSUWAL12…
4485f68 
…3/fmtm into feat-createproject-projectdetails-new
@NSUWAL123
fix radiobutton): - value prop added
b9c0960
@varun2948
Merge branch 'feat-create-new-project' of https://github.com/NSUWAL12…
7595499 
…3/fmtm into feat-createproject-projectdetails-new
@NSUWAL123
fix (create new project): upload area - value prop added to radiobutt…
df036ce 
…on, map added
@NSUWAL123
fix (create new project): event cleanup added
60a7b1a
@varun2948
Merge branch 'feat-create-new-project' of https://github.com/NSUWAL12…
ce64621 
…3/fmtm into feat-createproject-projectdetails-new
@NSUWAL123
fix (create new project): geojson file cleanup added
5d270dd
@NSUWAL123
fix (create new project): upload area - drawgeojson added, geojson fi…
5265bba 
…le clear when option changed
@NSUWAL123
Feat create new project (#844)
196ab84 
* fix (create new project): create new project url updated

* fix (create new project): upload area - select a file issue solved

* fix (create new project): data extract - select a file issue solved

* fix (radiobutton): option selection on label click, UI fix

* fix (create new project): initial values for project details form added

* feat (select): custom select component added

* fix (create new project): data extract - shadcn select replaced with customselect

* fix (custom select): updated props

* fix (create new project): project detials - shadcn select replaced with customselect

* fix (select): shadcn components export removed

* fix (create new project): select form - shadcn select replaced with customselect

* fix radiobutton):  - value prop added

* fix (create new project): upload area - value prop added to radiobutton, map added

* fix (create new project): event cleanup added
@NSUWAL123
fix (create project): uploadArea/dataExtract - reset and select same …
03bbd9a 
…file issue solved
@varun2948
feat(select): added responsive
6342607
@varun2948
feat(validation) : added validation file on new create project
cb2b701
@varun2948
feat(data-extract): data extract useform integration
3349b33
@varun2948
Merge branch 'feat-create-new-project' of https://github.com/NSUWAL12…
9a14fc4 
…3/fmtm into feat-createproject-projectdetails-new
@varun2948
fix(dataextract): removed formcategory actions
45d0aba
@NSUWAL123
feat (create project): upload area - total area calculation on upload…
5058091 
… area drawn
@varun2948
feat: changed step from data extract to select form
73c7a0e
@varun2948
Merge branch 'feat-create-new-project' of https://github.com/NSUWAL12…
87a0e8b 
…3/fmtm into feat-createproject-projectdetails-new
@spwoodcock spwoodcock force-pushed the feat-project-details-mapper-ui branch from a376826 to 87422cb Compare October 2, 2023 23:28
@spwoodcock spwoodcock force-pushed the feat-project-details-mapper-ui branch from 87422cb to 5d81e8d Compare October 2, 2023 23:31
@spwoodcock spwoodcock temporarily deployed to test October 2, 2023 23:31 — with GitHub Actions Inactive
@spwoodcock
Copy link
Member

  • I had to create a project to review this & in the process I tweaked both Alembic & the project creation workflow.
  • Tomorrow I will be reviewing the new mapper flow, then this can be merged 👍

@varun2948
Copy link
Contributor Author

Sounds great i hope the alembic and other stuff doesnt break create project api's

@NSUWAL123 NSUWAL123 mentioned this pull request Oct 3, 2023
Merged
spwoodcock and others added 3 commits October 3, 2023 18:06
@spwoodcock
fix: incorrect defaults for DbProject.author & author_id
aa8bc65
@spwoodcock
refactor: set webpack env vars with defaults (instead of dev/prod)
9a2d886
@spwoodcock @pre-commit-ci
Various: task splitting error handling, compose cleanup, default svcf…
14c3cd9 
…mtm user (#872)

* refactor: rename frontend container ui-main --> ui (fmtm)

* fix: remove route protection during dev, populate odk vars

* docs: lengthen default odk pass example

* fix: improve task splitting logs and error handling

* fix: handle empty task split on frontend

* fix: add default svc user for fmtm

* build: remove refs to redundant APP_NAME for frontend

* build: add bind mount to migration container

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@spwoodcock spwoodcock temporarily deployed to test October 3, 2023 17:30 — with GitHub Actions Inactive
@spwoodcock
Copy link
Member

I like this a lot better - more intuitive - it looks great!

Only three things to note:

  • The descriptions don't appear from the drop down menu:
    image

  • The legend is present in two places:
    image

  • The map button icons are not all centred (this will be addressed in the map component overhaul though).
    image

These are minor issues, so I will merge & we can continue refining in other PRs 🎉

@spwoodcock spwoodcock merged commit 3a2c7db into development Oct 4, 2023
@spwoodcock spwoodcock deleted the feat-project-details-mapper-ui branch October 4, 2023 19:32
@varun2948
Copy link
Contributor Author

varun2948 commented Oct 5, 2023 •
edited
Loading

@spwoodcock yes Sam, we had a look onto that and have already address all the issue u have mentioned and will create a PR or should come on another PR that we have issued

@varun2948 varun2948 changed the title Feat-project-details-mapper-ui Feature - Project Details Mapper UI Oct 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spwoodcock spwoodcock Awaiting requested review from spwoodcock

Assignees

@varun2948 varun2948

Labels
enhancement New feature or request frontend Related to frontend code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@varun2948 @spwoodcock @NSUWAL123