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

Feature/sidebar component #125

Open
wants to merge 62 commits into
base: nih-2024
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
cf7507b
Current state of simulation page
LazarKrmpot Nov 14, 2024
d698fbd
Custom Modal, Range Sliders, Switch component, Stepper, File drop com…
LazarKrmpot Dec 9, 2024
4d8d55c
Added forms for add target area and add dataset
LazarKrmpot Dec 9, 2024
70276b5
Added campaign magement to the right panel
LazarKrmpot Dec 12, 2024
027d4a2
Loading child polygons on parent click
LazarKrmpot Dec 18, 2024
a2db917
loading polygons optimized
Dec 20, 2024
9f45304
Working on map loading
LazarKrmpot Dec 23, 2024
7af3df7
loading child polygons on reverse hierarchy click fixed
Dec 23, 2024
ff7adf8
Added single and multiselect states and separated logic into helper.
LazarKrmpot Dec 23, 2024
9a193d7
Autocomplete, contex demo, hierarchy revised
LazarKrmpot Dec 30, 2024
256d7dc
Hierarcy refined and context setup
LazarKrmpot Jan 3, 2025
870e43f
Data sets, multi and single select
LazarKrmpot Jan 16, 2025
d36ec6f
Wokring on datasets implementation
LazarKrmpot Jan 20, 2025
1d9ede2
implement fetching simulation ID and working without hardcoded data
Jan 21, 2025
3976df0
fix layers order on the map
Jan 21, 2025
62613e9
implement dataset filtering
Jan 23, 2025
13f2803
fix labels not showing
Jan 23, 2025
e93d3aa
add real data to campaign totals
Jan 24, 2025
64a5bc9
Added map legend and custom popup restyle
LazarKrmpot Jan 24, 2025
125f8c7
fix issue with last deleted dataset layer still showing
Jan 24, 2025
6ae17ff
Merge branch 'feature/sidebar-component' of https://github.com/akrosi…
Jan 24, 2025
5543a76
Added map legend and assignment of operational areas, restructure pop…
LazarKrmpot Jan 27, 2025
e4ac6ca
implement filtering datasets against the chosen admin level
Jan 29, 2025
2bf7b86
Added dataset opacity change, line width and target assignment logic.
LazarKrmpot Jan 31, 2025
19d6fe5
Merge branch 'feature/sidebar-component' of https://github.com/akrosi…
LazarKrmpot Jan 31, 2025
2681ccd
Change style of the datasets by parent level button
LazarKrmpot Jan 31, 2025
4d66f04
Added border color modification
LazarKrmpot Feb 3, 2025
59723a5
implement location assignment and unassignment
Feb 4, 2025
62165c3
Merge branch 'feature/sidebar-component' of https://github.com/akrosi…
Feb 4, 2025
e23632a
implement location removal from campaign totals list
Feb 4, 2025
cb6330f
feature: campaign management page and sub components
danneba Feb 4, 2025
3b89396
Merge remote-tracking branch 'origin/feature/sidebar-component' into …
LazarKrmpot Feb 5, 2025
f21b192
Another merge commit
LazarKrmpot Feb 5, 2025
0c0d245
Fixing map updates, added target list, added chars.
LazarKrmpot Feb 6, 2025
8959947
Icons for chart types
LazarKrmpot Feb 6, 2025
3d56f5a
Merged Manage Teams Component
LazarKrmpot Feb 6, 2025
25c5083
Removed Add operational area button for now
LazarKrmpot Feb 6, 2025
0b68e48
Added coloring on structures and minor mixes
LazarKrmpot Feb 7, 2025
60257ec
modal feature for managing teams
danneba Feb 7, 2025
01168ce
Merge branch 'feature/sidebar-component' into feature/manage-teams
danneba Feb 7, 2025
bee9a3b
done the fixes
danneba Feb 7, 2025
ae1323a
Wired up diagrams with endpoint
LazarKrmpot Feb 7, 2025
f61853a
Done on the team management component
danneba Feb 10, 2025
1650bed
Merge pull request #126 from akrosinc/feature/manage-teams
LazarKrmpot Feb 10, 2025
62affd2
Fix on the Manage Users componets, and minor bugs on the graphs.
LazarKrmpot Feb 10, 2025
3048766
fix: structure select breaking when no population data
Feb 10, 2025
8f833c4
Merge branch 'feature/sidebar-component' of https://github.com/akrosi…
Feb 10, 2025
3241a1e
Implemented the teams list on left drawer and dialog for picking team…
LazarKrmpot Feb 10, 2025
540c806
fixing the tastify notifications
danneba Feb 10, 2025
bbc95f6
adding fetch data props
danneba Feb 10, 2025
aac5b3c
Merge branch 'feature/sidebar-component' into feature/manage-teams
danneba Feb 10, 2025
b83d504
fixing the dropdown to reset to empty teams after selecting a team
danneba Feb 11, 2025
f264275
Merge pull request #127 from akrosinc/feature/manage-teams
LazarKrmpot Feb 11, 2025
7f8dd24
Merged fixes for the team management component
LazarKrmpot Feb 11, 2025
47fd49c
Restyle the teams drawer component
LazarKrmpot Feb 11, 2025
cc57467
Fixed padding on username and updating state after user and teams cha…
LazarKrmpot Feb 11, 2025
06c48e2
Synced team information, team assignment to a polygon
LazarKrmpot Feb 11, 2025
7fdbaa9
manage to fix the menu title and rendering fixed and also creating us…
danneba Feb 11, 2025
f67fb10
Merge branch 'feature/sidebar-component' into feature/manage-teams
danneba Feb 11, 2025
b76f9a2
Fixed team allocation and map displaing allocated polygons
LazarKrmpot Feb 11, 2025
91734d4
Merge pull request #128 from akrosinc/feature/manage-teams
LazarKrmpot Feb 11, 2025
5c6e4e6
Merge branch 'feature/sidebar-component' of https://github.com/akrosi…
LazarKrmpot Feb 11, 2025
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
6 changes: 4 additions & 2 deletions src/app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ function App() {
toast.success('Welcome back ' + res.username);
});
api.interceptors.request.use(function (config) {
dispatch(showLoader(true));
if (!config.url?.includes('task-details')) {
dispatch(showLoader(true));
}
// Inject Bearer token in every request
config.headers = {
Authorization: `Bearer ${keycloak.token}`
Expand All @@ -101,7 +103,7 @@ function App() {
});
}
} else {
dispatch(showLoader(true));
// dispatch(showLoader(true));
}
}, [initialized, dispatch, keycloak]);

Expand Down
7 changes: 7 additions & 0 deletions src/assets/svgs/barChart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/svgs/check-circle.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 src/assets/svgs/eye-regular.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 src/assets/svgs/eye-slash-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/svgs/gaugeIcon.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 src/assets/svgs/house.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 src/assets/svgs/layers-icon.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 src/assets/svgs/pen-solid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions src/assets/svgs/placeMarker.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/assets/svgs/remove.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/svgs/search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/svgs/sphere.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/svgs/tag-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/assets/svgs/tag-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/svgs/tagIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/assets/svgs/task.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading