chight/Web-Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
210 Commits 2 Branches 0 Tags
35e781a0bb80140376492d5bee37797453ddb142
Commit Graph
210 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Hansen 35e781a0bb Merge branch 'feature/admin-view' into 'main' 
Feature/admin view

See merge request vkuchenik/website-framework!68
 2025-08-13 22:43:32 +00:00
Dan Hansen 566b7310f8 Merge branch 'main' into 'feature/admin-view' 
# Conflicts:
#   client/src/components/Sidebar/Sidebar.jsx
#   client/src/constants/viewKeys.js
 2025-08-13 22:42:56 +00:00
Daniel S. Hansen d4645eb3c1 Add default admin tab now set to M&E Data Entry 2025-08-13 15:35:17 -07:00
Daniel S. Hansen c496396092 Add new tabs and views under Admin sidebar tab 2025-08-13 15:18:03 -07:00
Dan Hansen ff67ea8f0f Merge branch 'bug/tooltip-behavior' into 'main' 
Add useMemo to sidebar button function to prevent unecessary remounting of components

See merge request vkuchenik/website-framework!67
 2025-08-13 19:56:40 +00:00
Daniel S. Hansen 846afa3eac Add useMemo to sidebar button function to prevent unecessary remounting of components 2025-08-13 12:55:33 -07:00
Dan Hansen cd9f7c77ac Merge branch 'bug/tooltip-behavior' into 'main' 
Prevent Tooltip from displaying when Sidebar toggles between The Home sidebar...

See merge request vkuchenik/website-framework!66
 2025-08-13 19:32:04 +00:00
Daniel S. Hansen 5e2364334f Prevent Tooltip from displaying when Sidebar toggles between The Home sidebar and the Personal sidebar while closed 2025-08-13 12:27:47 -07:00
Daniel S. Hansen 4afccac3f3 Fix tooltip zIndex to appear on top of maps and other canvas items 2025-08-13 10:49:37 -07:00
vkuchenik 54530f324f Merge branch 'refactor/remove-delete-btn' into 'main' 
removed delete button

See merge request vkuchenik/website-framework!65
 2025-08-12 22:28:04 +00:00
vkuchenik 805f1dc82f removed delete button 
+ renamed delete button to edit button (to keep functionality)
+ removed edit button (redundant)
+ on add widgets, it no longer asks you to save before continuing
 2025-08-12 15:27:33 -07:00
vkuchenik f8bd3845c4 Merge branch 'sidebar/account-sidebar' into 'main' 
new favicon and title

See merge request vkuchenik/website-framework!64
 2025-08-12 21:56:05 +00:00
vkuchenik 2aea676551 new favicon and title 
*forgot to switch branches oops
 2025-08-12 14:55:15 -07:00
vkuchenik d78100dfcd Merge branch 'sidebar/account-sidebar' into 'main' 
removed account button

See merge request vkuchenik/website-framework!63
 2025-08-12 21:31:38 +00:00
vkuchenik 69529f77be removed account button 2025-08-12 14:31:10 -07:00
vkuchenik 17f1b7ad63 Merge branch 'sidebar/account-sidebar' into 'main' 
new sidebar for account/settings

See merge request vkuchenik/website-framework!62
 2025-08-12 21:22:40 +00:00
vkuchenik b4dd5b205d new sidebar for account/settings 2025-08-12 14:21:31 -07:00
Dan Hansen 4967f649ad Merge branch 'bug/cancel-removes-widgets' into 'main' 
Fix state not being saved before entering edit or delete modes

See merge request vkuchenik/website-framework!61
 2025-08-12 21:03:54 +00:00
Daniel S. Hansen 92bcbf57a9 Fix state not being saved before entering edit or delete modes 2025-08-12 13:57:58 -07:00
vkuchenik bf315aa647 Merge branch 'widgets/alert-level' into 'main' 
widget menu refactoring

See merge request vkuchenik/website-framework!59
 2025-08-12 17:06:31 +00:00
vkuchenik 2d739ef5c7 Merge branch 'main' into 'widgets/alert-level' 
# Conflicts:
#   client/src/components/Canvas/views/Home.jsx
 2025-08-12 17:02:23 +00:00
vkuchenik f85c64e7f0 Dialog popup works 2025-08-12 09:55:57 -07:00
vkuchenik f8c9a0cc0b Adding dialogs instead of window messages 2025-08-11 15:10:58 -07:00
Dan Hansen 7b43d4831a Merge branch 'Fix/cancel-first-widget' into 'main' 
Refactor onSave and onCancel to track both layout and widgetArray useState()...

See merge request vkuchenik/website-framework!60
 2025-08-11 21:55:53 +00:00
Daniel S. Hansen cab0fe3a0b Fix layout of newly added Widgets 2025-08-11 14:53:17 -07:00
Daniel S. Hansen 77bba49dc8 Refactor onSave and onCancel to track both layout and widgetArray useState() in order to restore state on cancel 2025-08-11 14:40:05 -07:00
Daniel S. Hansen c1787d7871 Fix first widget is now removed upon clicking Cancel 2025-08-11 14:17:21 -07:00
vkuchenik 9ad6e3b799 widget menu refactoring 2025-08-11 14:02:58 -07:00
vkuchenik 03942a422e Merge branch 'widgets/alert-level' into 'main' 
Added input validation

See merge request vkuchenik/website-framework!58
 2025-08-11 20:02:00 +00:00
vkuchenik 8116745921 Added input validation 
the alert level widget now has visual and logical input validation
 2025-08-11 12:59:38 -07:00
Dan Hansen e1dc54208f Merge branch 'feature/first-widget-button' into 'main' 
Feature/first widget button

See merge request vkuchenik/website-framework!57
 2025-08-11 19:20:32 +00:00
Daniel S. Hansen 672fcff01d Connect Alert Level widget creation to First Widget Button 2025-08-11 12:18:04 -07:00
Daniel S. Hansen 28a59ab366 Add first widget button with popup menu 2025-08-11 11:31:15 -07:00
Daniel S. Hansen f2fe8b5fb2 Add button when no widgets populate the canvas 2025-08-08 13:00:33 -07:00
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