Update FireFusion dashboard UI and layout by Gaveesha08 · Pull Request #151 · InnovAIte-Deakin/InnovAIte_FireFusion_Project

Gaveesha08 · 2026-05-15T07:23:06Z

This PR updates the FireFusion dashboard interface and layout.

Changes include:

Improved dashboard visual structure
Updated sidebar and dashboard styling
Refined emergency overview sections
Added clearer dashboard cards and information panels
Prepared the dashboard for frontend integration testing

This branch has been tested locally using npm run dev.

…nt-end framework decision is finalised

…FireFusion_Project into feature/map-layout

…rid of unneccessary files

…ge with sample data

…nnovAIte_FireFusion_Project into feature/misinfo-review-page-screen-2

…page-screen-2 [FE] feat(misinfo-screen-2): build all components with sample data - no conflicts, tested code, works and page looks great.

[FE] feat(auth-pages): add login and signup pages

…rontend dev branch

…sinfo-screen-2, increase misinfo-screen-2 font size

…ty, display, data sync and about tabs

…page-screen-2 Feature/misinfo review page screen 2: Integrate with APIs

…earch functionality to the search bar

…on_Project into frontend-dashboard-ui

…ure/map-layout

…ter visibility

…en1-2

Map layout UI components and fixed layout and file structure Tested functionality after changes and resolving conflicts.

…jsx reference errors

…-ui-test Test/frontend dashboard UI test

…ashboard-ui-test" This reverts commit 08027ed, reversing changes made to 2b1d3e6.

…onitor Build misinformation monitor landing screen

…ecent minformation monitor merge

[FE] feat(settings): add Settings page with profile, notifications, security, display, data sync and about tabs

fix(dependencies): misused dependencies between outer vs inner

…nnovAIte_FireFusion_Project into feature/misinfo-connect-screen1-2

…-screen1-2 Connect misinformation screen 1 and screen 2 via shared API

Gaveesha08 and others added 30 commits April 5, 2026 19:46

Set up React frontend app for FireFusion

38c52a8

Created map-layout branch to work on the map page skeleton whilst fro…

f8ea0aa

…nt-end framework decision is finalised

Fixing folder structure and prepping pages for React

141207f

Fixed bugs environment set up and rendered map using leaflet

70faffb

Merge remote-tracking branch 'origin/main' into feature/map-layout

d57f5be

set up web socket and api connection

1632ea0

working on render logic for the polygons

6712b06

added some meaningful comments for later

03ca509

fixed websocket connection console bug

6cdbdd9

Merge branch 'main' of https://github.com/InnovAIte-Deakin/InnovAIte_…

2cd8eb5

…FireFusion_Project into feature/map-layout

updated api and websocket connection to port 8080

1ab166e

prepping files to be compatible with dashboard

b62dfeb

made the map full page

8eba75a

Fixed dashboard bug and solved merge conflicts with updated code

a83662e

fixed sidebar and app so that fire map page is clickable

520cd13

applying the layout components to the Fire Risk Map page and getting …

53212bd

…rid of unneccessary files

remove file from old branch structure

5adfb31

feat(misinfo-screen-2): build all components in review and debunk sta…

a203df0

…ge with sample data

Added frontend login, signup and alerts pages

55c5567

Merge branch 'frontend-dashboard-ui' of github.com:InnovAIte-Deakin/I…

bb14948

…nnovAIte_FireFusion_Project into feature/misinfo-review-page-screen-2

Remove alerts page as per updated frontend structure

118de80

Clean auth page validation logic

8551b54

Merge pull request #107 from InnovAIte-Deakin/feature/misinfo-review-…

abaa915

…page-screen-2 [FE] feat(misinfo-screen-2): build all components with sample data - no conflicts, tested code, works and page looks great.

added a folder for map UI components and css

7b886ab

Convert login and signup pages to React components

ef964dc

fixed merge conflict in App.jsx and CSS override issue

96c9c7e

Merge branch 'frontend-dashboard-ui' into feature/ritika-frontend-ui

faa1584

Merge pull request #114 from RitikaSharma2815/feature/ritika-frontend-ui

c1455d1

[FE] feat(auth-pages): add login and signup pages

Merge branch 'frontend-dashboard-ui' into feature/map-layout

3e0a91d

fixed routing bug in FireRiskMap.tsx and pulled latest updates from f…

7e9ddfb

…rontend dev branch

labp1 and others added 30 commits May 12, 2026 00:27

fix(sidebar): make side bar collapsible, hide header and footer in mi…

8a0d9c7

…sinfo-screen-2, increase misinfo-screen-2 font size

Merge remote-tracking branch 'origin/main' into feature/map-layout

b42f5c0

feat(settings): add Settings page with profile, notifications, securi…

f7b3733

…ty, display, data sync and about tabs

Merge pull request #133 from InnovAIte-Deakin/feature/misinfo-review-…

254537a

…page-screen-2 Feature/misinfo review page screen 2: Integrate with APIs

Build misinformation monitor landing screen

08113a8

added map page component styling, made legend collapsible and added s…

cf67ac1

…earch functionality to the search bar

fixed css to match Jasmeen's design work

a389bc8

Merge branch 'main' of github.com:InnovAIte-Deakin/InnovAIte_FireFusi…

0f77fb8

…on_Project into frontend-dashboard-ui

fix(dependencies): misused dependencies between outer vs inner

87c464a

Merge remote-tracking branch 'origin/frontend-dashboard-ui' into feat…

1fa1084

…ure/map-layout

fix(settings): remove duplicate sections from Profile tab and fix foo…

0189b48

…ter visibility

fix(settings): resolve Sidebar merge conflict, keep Settings navigation

69e7f20

fix: install missing dependencies axios and react-query

f269af2

fix: resolve App.css conflict and add missing dependencies

4d8cff1

fix(misinfo-screen-1): resolve conflict

d7ee930

Merge branch 'fix/misinfo-screen-1' into feature/misinfo-connect-scre…

9b533a6

…en1-2

fix(misinfo-page): connect misinfo screen 1 and screen 2 via shared API

9b40f89

Merge pull request #140 from InnovAIte-Deakin/feature/map-layout

2b1d3e6

Map layout UI components and fixed layout and file structure Tested functionality after changes and resolving conflicts.

created testing branch for resolving package merge conflicts and app.…

b6e25c9

…jsx reference errors

created testing branch to fix merge conflicts and reference errors

b0183b5

Merge pull request #146 from InnovAIte-Deakin/test/frontend-dashboard…

08027ed

…-ui-test Test/frontend dashboard UI test

Revert "Merge pull request #146 from InnovAIte-Deakin/test/frontend-d…

80723b7

…ashboard-ui-test" This reverts commit 08027ed, reversing changes made to 2b1d3e6.

resolve merge conflicts for pr136 caused by most recent merge

a5bf373

Merge pull request #136 from Chaitanya932000/feat/chaitanya-misinfo-m…

e7c798f

…onitor Build misinformation monitor landing screen

Resolved minor package-lock and app.jsx merge conflicts due to most r…

d6585e8

…ecent minformation monitor merge

Merge pull request #135 from taruntejsaka/feature/settings-page-main

54a04a1

[FE] feat(settings): add Settings page with profile, notifications, security, display, data sync and about tabs

fix: remove outer dependencies

0efd310

Merge pull request #141 from InnovAIte-Deakin/fix/dependencies_error

960831b

fix(dependencies): misused dependencies between outer vs inner

Merge branch 'frontend-dashboard-ui' of github.com:InnovAIte-Deakin/I…

db57582

…nnovAIte_FireFusion_Project into feature/misinfo-connect-screen1-2

Merge pull request #149 from InnovAIte-Deakin/feature/misinfo-connect…

6b54081

…-screen1-2 Connect misinformation screen 1 and screen 2 via shared API

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update FireFusion dashboard UI and layout#151

Update FireFusion dashboard UI and layout#151
Gaveesha08 wants to merge 63 commits into
mainfrom
frontend-dashboard-ui

Gaveesha08 commented May 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

Gaveesha08 commented May 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants