Dan Hansen
5df556896f
Merge branch 'feature/add-volcano-view' into 'main'
...
Feature/add volcano view
See merge request vkuchenik/website-framework!56
2025-08-07 00:12:27 +00:00
Daniel S. Hansen
c91216d214
Add Volcano view DataList, historical summary, and map
2025-08-06 17:10:33 -07:00
vkuchenik
a2df2c181c
Merge branch 'canvas/doing-stuff' into 'main'
...
alert level has a complete form
See merge request vkuchenik/website-framework!55
2025-08-06 23:28:23 +00:00
vkuchenik
aad3a95507
alert level has a complete form
...
+ alert level now has entry for country and volcano name
+ widget now has a submit button
+ now has a refresh button that only appears when something is submitted
+ adjusted number of columns in grid layout
+ other small sizing adjustments in canvas
2025-08-06 16:27:08 -07:00
Daniel S. Hansen
6c4fae9b82
Add boilerplate Volcano view page
2025-08-06 16:25:54 -07:00
Dan Hansen
7e75ea6648
Merge branch 'debug/maps-not-loading' into 'main'
...
Fix map loading
See merge request vkuchenik/website-framework!54
2025-08-06 20:38:06 +00:00
Daniel S. Hansen
193c60fc56
Fix map loading by adding 'height' parameter to wrapping chakra.div inside Canvas.jsx
2025-08-06 13:30:31 -07:00
Daniel S. Hansen
0021156b90
Test push small comment
2025-08-06 12:38:04 -07:00
vkuchenik
0f5b6dd066
Merge branch 'canvas/doing-stuff' into 'main'
...
quick fix
See merge request vkuchenik/website-framework!53
2025-08-06 19:28:27 +00:00
vkuchenik
023ee333fb
quick fix
2025-08-06 12:27:27 -07:00
vkuchenik
922ec84fac
Merge branch 'canvas/doing-stuff' into 'main'
...
a few more changes
See merge request vkuchenik/website-framework!52
2025-08-06 19:04:58 +00:00
vkuchenik
a7f1bbbc61
a few more changes
...
+ boxshadow is constant
+ new resize handle
+ minW and minH set on widgets
2025-08-06 12:03:48 -07:00
vkuchenik
d563cb9d19
Merge branch 'canvas/doing-stuff' into 'main'
...
some small changes
See merge request vkuchenik/website-framework!51
2025-08-06 00:15:37 +00:00
vkuchenik
4fb2f7eabe
some small changes
...
+ removed sliding animation from widgets
+ added form fields to Alert Level widget
2025-08-05 17:12:59 -07:00
vkuchenik
39ca605fbd
add removal of widgets in widgetArray
2025-08-05 15:19:46 -07:00
vkuchenik
1543682add
Merge branch 'canvas/doing-stuff' into 'main'
...
updating names cont.
See merge request vkuchenik/website-framework!50
2025-08-05 22:08:49 +00:00
vkuchenik
46b27d90dd
updating names cont.
2025-08-05 15:08:18 -07:00
vkuchenik
c4d9725583
removed old svg's
2025-08-05 14:15:28 -07:00
vkuchenik
1407a98863
Merge branch 'Refactor/file-names-and-organization' into 'main'
...
Rename and Restructure
See merge request vkuchenik/website-framework!49
2025-08-05 19:58:34 +00:00
vkuchenik
ff95f2cbc0
Rename and Restructure
...
+ took out extra 'layout' directory.
+ 'Canvas' postfix removed from all files in the views directory.
+ "WidgetCanvas" renamed to "MyDashboard"
2025-08-05 12:57:18 -07:00
vkuchenik
03a335710f
removed extra wrapper components
2025-08-05 12:43:57 -07:00
Dan Hansen
24f90cd542
Merge branch 'feature/user-account-page' into 'main'
...
Feature/user account page
See merge request vkuchenik/website-framework!48
2025-08-04 23:03:43 +00:00
Daniel S. Hansen
a43113d1d1
Add react-hook-forms to AccountCanvas
2025-08-04 16:02:06 -07:00
vkuchenik
e3a2c84e27
Merge branch 'bug/widget-canvas/widget-persistance' into 'main'
...
fixed widget state saving bug
See merge request vkuchenik/website-framework!47
2025-08-04 22:38:50 +00:00
vkuchenik
9b8f7ea4d4
fixed widget state saving bug
...
+ decluttered props by using prop forwarding
+ renamed DashboardCanvas to HomeCanvas
2025-08-04 15:38:19 -07:00
vkuchenik
f250f11d8d
Merge branch 'dashboard-canvas/add-widgets-menu/fix-bugs' into 'main'
...
add missing prop
See merge request vkuchenik/website-framework!46
2025-08-04 20:52:16 +00:00
vkuchenik
4bd9f78bc5
add missing prop
2025-08-04 13:51:30 -07:00
vkuchenik
952162e150
Merge branch 'dashboard-canvas/add-widgets-menu/fix-bugs' into 'main'
...
removing redundancies
See merge request vkuchenik/website-framework!45
2025-08-04 20:45:00 +00:00
vkuchenik
88b287afa7
removing redundancies
2025-08-04 13:44:35 -07:00
vkuchenik
543d481aa9
Merge branch 'dashboardCanvas/Widget/add-widgets-menu' into 'main'
...
added submenu to settings
See merge request vkuchenik/website-framework!43
2025-08-04 19:21:04 +00:00
Daniel S. Hansen
f19ddc1994
Add boilerplate user account view
2025-08-04 12:20:26 -07:00
vkuchenik
6f41df3f88
Merge branch 'main' into 'dashboardCanvas/Widget/add-widgets-menu'
...
# Conflicts:
# client/src/components/layout/Canvas/views/DashboardCanvas.jsx
2025-08-04 19:20:13 +00:00
vkuchenik
1f83dcf9bb
added submenu to settings
...
widget information is now stored in two arrays. One array (widgetArray) holds the id and name/type of the widget. The second array (layout) holds the id, position, width, height, and static info
2025-08-04 12:04:33 -07:00
Dan Hansen
eca6bc2405
Merge branch 'feature/regional-map' into 'main'
...
Feature/regional map
See merge request vkuchenik/website-framework!42
2025-07-31 21:52:54 +00:00
Daniel S. Hansen
d2716f6f84
Fix canvas not taking up full space in Regional and Global map views
2025-07-31 14:51:25 -07:00
Daniel S. Hansen
e6b7d82310
Add regional map functionality, and edit global map zoom settings
2025-07-31 14:39:35 -07:00
Dan Hansen
31d38e5113
Merge branch 'refactor/add-widget-behavior' into 'main'
...
Add new add-widget behavior.
See merge request vkuchenik/website-framework!41
2025-07-31 21:02:47 +00:00
Daniel S. Hansen
bedd616d92
Add new add widget behavior. Edit mode is enabled upon 'Add Widget' and user must either Save/Cancel their changes before navigating away from My Dashboard
2025-07-31 14:01:08 -07:00
Dan Hansen
ff64e6bb58
Merge branch 'refactor/cleanup-stray-props' into 'main'
...
Remove old comments and deprecated code snippets
See merge request vkuchenik/website-framework!40
2025-07-31 20:25:02 +00:00
Daniel S. Hansen
ee03a1d2f4
Remove old comments and deprecated code snippets
2025-07-31 13:23:11 -07:00
Dan Hansen
fb096b403f
Merge branch 'fix/edit-mode-scope2' into 'main'
...
Fix/edit mode scope2
See merge request vkuchenik/website-framework!39
2025-07-31 19:45:28 +00:00
Daniel S. Hansen
80a0515bb1
Add navigation prevention while in Edit mode to Avatar menu options in Header
2025-07-31 12:40:46 -07:00
Daniel S. Hansen
364ce0b752
Save point, Sidebar prevents navigation without first saving or cancelling current changes
2025-07-31 12:23:45 -07:00
vkuchenik
90704879e1
Merge branch 'dashboardCanvas/widgets/delete-all-btn' into 'main'
...
added delete all widgets button
See merge request vkuchenik/website-framework!38
2025-07-31 16:52:05 +00:00
vkuchenik
f5b694508e
added delete all widgets button
2025-07-31 09:50:40 -07:00
vkuchenik
0aeabbc218
more dark mode colors
2025-07-31 09:23:40 -07:00
vkuchenik
c1a91bddd7
map has dark mode
2025-07-31 08:56:32 -07:00
vkuchenik
3324530dc5
Merge branch 'dashboard/GlobalMap/add-map' into 'main'
...
a map!
See merge request vkuchenik/website-framework!37
2025-07-30 18:16:48 +00:00
vkuchenik
f932a4f467
a map!
2025-07-30 11:16:21 -07:00
vkuchenik
6ce374405c
added behavior to tooltip
...
tooltip disappears on click now
2025-07-30 08:57:32 -07:00