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

Implement category trees and integrate with backend for map page. Add victim page with quick add need #493

Merged
merged 11 commits into from
Nov 27, 2023

Conversation

ilgazer
Copy link
Contributor

@ilgazer ilgazer commented Nov 27, 2023

close #374 #416 #486

This PR migrates the mock data formats to the backend data format. Furthermore, category tree support is added for displaying item names, as well as filtering by supercategories in the category selector. Furthermore, the map demo page was converted into a generic map page, and a victim map page with quick add need was implemented.

This PR adds the dependency react-query.

This PR addresses the following requirements:

1.1.2.1.3. Victims shall be able to view assistance locations on a map and as a list. (Help centres, soup kitchens etc.)
1.1.2.1.4. Victims shall be able to filter the assistance locations by type and distance.
1.1.2.1.5. Victims shall be able to view available resources on a map and as a list.
1.1.2.1.6. Victims shall be able to filter resources by name, category and distance.
1.1.2.1.7. Victims shall be notified when a relevant assistance location is nearby.
1.2.7.1. The platform shall have a map interface that displays the appropriate subset of resources, requests, and tasks, along with warnings related to the current situation.
1.2.7.2. The map shall be capable of filtering items by the applicable subset of name, category, amount, distance, urgency and status.

@ilgazer ilgazer requested a review from kubraaksux November 27, 2023 18:27
@ilgazer ilgazer marked this pull request as draft November 27, 2023 18:27
@ilgazer ilgazer marked this pull request as ready for review November 27, 2023 18:30
…rate_map_backend

# Conflicts:
#	resq/frontend/src/App.js
#	resq/frontend/src/pages/MapPage.js
complete rollback of zoom on click card as it was not working
@ilgazer
Copy link
Contributor Author

ilgazer commented Nov 27, 2023

I successfully merged dev. As the zoom feature in #474 was not working, it was rolled back. The PR is now ready for merge.

@ilgazer
Copy link
Contributor Author

ilgazer commented Nov 27, 2023

@kubraaksux was the zoom feature working before? I couldn't get it to work so I assumed it was broken

@ilgazer ilgazer marked this pull request as draft November 27, 2023 19:12
@ilgazer ilgazer marked this pull request as ready for review November 27, 2023 19:18
@kubraaksux kubraaksux merged commit 898aee3 into dev Nov 27, 2023
@kubraaksux
Copy link
Contributor

it was working ofc as i wrote. why to merge not working? check conflicts, we have talked this with you before your commit here so you are already very aware it was working. this is the second time you are doing that, playing blind.

@kubraaksux
Copy link
Contributor

those are implemented at another pr. Are you sure this description is not repetetive?
1.1.2.1.3. Victims shall be able to view assistance locations on a map and as a list. (Help centres, soup kitchens etc.)
1.1.2.1.4. Victims shall be able to filter the assistance locations by type and distance.
1.1.2.1.5. Victims shall be able to view available resources on a map and as a list.
1.1.2.1.6. Victims shall be able to filter resources by name, category and distance.

PR #469

@kubraaksux kubraaksux deleted the feature/frontend_integrate_map_backend branch December 19, 2023 20:37
@ilgazer ilgazer self-assigned this Dec 29, 2023
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.

2 participants