 Daniel S. Hansen
|
5d3a8ec344
|
Spell check
|
2025-08-13 15:57:46 -07:00 |
|
|
Daniel S. Hansen
|
079663b8fa
|
Small default tab fix for Admin
|
2025-08-13 15:46:37 -07:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Daniel S. Hansen
|
f19ddc1994
|
Add boilerplate user account view
|
2025-08-04 12:20:26 -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 |
|
|
Dan Hansen
|
5dea9199cd
|
Merge branch 'feature/add-user-account-view' into 'main'
Add user account and settings boilerplate canvas pages.
See merge request vkuchenik/website-framework!36
|
2025-07-29 21:52:51 +00:00 |
|
|
Daniel S. Hansen
|
be925c1f35
|
Add user account and settings boilerplate. UserAvatarMenu now navigates to placeholder pages for both Account and Settings
|
2025-07-29 14:47:03 -07:00 |
|
|
Dan Hansen
|
96cbf90dfb
|
Merge branch 'bug/sidebar-children-keys' into 'main'
Fix button.map warning inside Sidebar.jsx 'each child in a list should hae a...
See merge request vkuchenik/website-framework!35
|
2025-07-29 19:54:46 +00:00 |
|
|
Daniel S. Hansen
|
6a990ef56e
|
Fix button.map warning inside Sidebar.jsx 'each child in a list should hae a unique key prop'. Pass 'key' parameter in top level Tooltip inside map function
|
2025-07-29 12:53:20 -07:00 |
|
|
Dan Hansen
|
482ea9b04c
|
Merge branch 'fix/edit-mode-scope' into 'main'
Fix/edit mode scope
See merge request vkuchenik/website-framework!34
|
2025-07-29 19:23:52 +00:00 |
|
|
Dan Hansen
|
a76c869be5
|
Merge branch 'main' into 'fix/edit-mode-scope'
# Conflicts:
# client/src/components/layout/Canvas/views/DashboardCanvas.jsx
# client/src/components/layout/Sidebar/Sidebar.jsx
|
2025-07-29 19:22:14 +00:00 |
|
|
Daniel S. Hansen
|
80854e4bf3
|
Remove garbage comments
|
2025-07-29 12:08:36 -07:00 |
|
|
Daniel S. Hansen
|
a06a79218c
|
Add tab navigation prevention while in Editable mode
|
2025-07-29 11:51:33 -07:00 |
|
|
Daniel S. Hansen
|
89c32e4f6e
|
Add keyViews.js file inside src/constants to track current view in Sidebar and Canvas
|
2025-07-29 11:04:29 -07:00 |
|
|
Daniel S. Hansen
|
416873fc08
|
Save point, page is rendering with view tracking
|
2025-07-29 09:59:17 -07:00 |
|
|
Dan Hansen
|
1d7679b3f5
|
Merge branch 'bug/avatar-dropdown-menu' into 'main'
Fix competing zIndex values between the Canvas Header and the Avatar dropdown menu
See merge request vkuchenik/website-framework!30
|
2025-07-28 19:05:00 +00:00 |
|
|
Daniel S. Hansen
|
9d6a4b356f
|
Fix competiting zIndex values between the Canvas Header and the Avatar dropdown menu
|
2025-07-28 11:44:25 -07:00 |
|
|
Dan Hansen
|
968f468030
|
Merge branch 'feature/sidebar-hover-message2' into 'main'
Add tooltip messaging on sidebar when closed
See merge request vkuchenik/website-framework!29
|
2025-07-28 18:21:40 +00:00 |
|
|
Daniel S. Hansen
|
69becb34e5
|
Add tooltip messaging on sidebar when closed
|
2025-07-28 11:12:03 -07:00 |
|
|
Dan Hansen
|
e7a16551ec
|
Merge branch 'add/persistant-widget-state' into 'main'
Clean garbage comments from refactor
See merge request vkuchenik/website-framework!28
|
2025-07-25 20:26:27 +00:00 |
|
|
Daniel S. Hansen
|
20998e43af
|
Clean garbage comments from refactor
|
2025-07-25 13:25:49 -07:00 |
|
|
Dan Hansen
|
994ec9249f
|
Merge branch 'add/persistant-widget-state' into 'main'
Add persistant widget state across sidebar 'dashboard' button and canvas...
See merge request vkuchenik/website-framework!27
|
2025-07-25 20:20:54 +00:00 |
|
|
Daniel S. Hansen
|
5f17293ac6
|
Add persistant widget state across sidebar 'dashboard' button and canvas header nav 'my dashboard' button
|
2025-07-25 13:19:09 -07:00 |
|
|
Dan Hansen
|
2544d1bbdb
|
Merge branch 'add/widgets/conditional-editing' into 'main'
Add conditional editing of widgets along with save and cancel buttons.
See merge request vkuchenik/website-framework!26
|
2025-07-25 18:42:38 +00:00 |
|
|
Daniel S. Hansen
|
58f734684b
|
Add Editable state to canvas along with Save and Cancel buttons while in Editable mode. Save - saves the new state after editing. Cancel - reverts to the widget state before Edit mode
|
2025-07-25 11:40:57 -07:00 |
|
|
Dan Hansen
|
95be8eac21
|
Merge branch 'feature/add-widgets' into 'main'
Add dynamic widget adding functionality, along with boilerplate for edit and delete functionality
See merge request vkuchenik/website-framework!23
|
2025-07-23 23:48:25 +00:00 |
|
|
Daniel S. Hansen
|
d61fd3dd02
|
Add dynamic widget adding functionality, along with boilerplate for edit and delete functionality
|
2025-07-23 16:40:52 -07:00 |
|
|
Dan Hansen
|
64540f2de1
|
Merge branch 'refactor/add-dashboard-layout' into 'main'
Add Dashboard parent component to lift state between Header, Sidebar, and Canvas
See merge request vkuchenik/website-framework!21
|
2025-07-23 19:07:23 +00:00 |
|
|
Daniel S. Hansen
|
43fd246b1f
|
Add functional links between Sidebar nav buttons and Canvas views
|
2025-07-23 12:03:06 -07:00 |
|
|
Daniel S. Hansen
|
0ec105d9ec
|
Add view and setView props in order to successfully pass state from Sidebar to the Canvas inside Dashboard
|
2025-07-23 11:35:28 -07:00 |
|
|
Daniel S. Hansen
|
b432c8a8ec
|
Add Dashboard parent component to Header, Siderbar, Canvas in order to faciliate lifting state
|
2025-07-23 11:01:25 -07:00 |
|
|
Dan Hansen
|
118792ec7c
|
Merge branch 'refactor/canvas-component' into 'main'
Refactor src/components directory with a layout section for better separation of concerns.
See merge request vkuchenik/website-framework!16
|
2025-07-21 21:43:47 +00:00 |
|
|
Daniel S. Hansen
|
73d85a3247
|
Remove garbage comments
|
2025-07-21 14:30:41 -07:00 |
|
|
Daniel S. Hansen
|
35aa0347a9
|
Save point, page renders and is functional
|
2025-07-21 14:27:53 -07:00 |
|
|
Daniel S. Hansen
|
8a34f11a46
|
Add new 'views' directory that handles what the Canvas displays. Refactor Canvas.jsx to act as a router between canvas views. Add /views/WidgetCanvas to handle default view
|
2025-07-21 14:12:32 -07:00 |
|
|
Daniel S. Hansen
|
a1f2fcc9be
|
Refactor: moved Widget and CanvasHeader code into Canvas.jsx to handle both as a parent element
|
2025-07-21 13:01:16 -07:00 |
|
|
Daniel S. Hansen
|
06edb481e9
|
Restructure file system to seperate Sidebar, Header, and Canvas components
|
2025-07-21 11:33:44 -07:00 |
|
|
Dan Hansen
|
a7bef5ddb3
|
Merge branch 'refactor/avatar-component' into 'main'
Refactor header: extract Avatar into standalone UserAvatarMenu component, and add _hover styling
See merge request vkuchenik/website-framework!15
|
2025-07-17 22:38:35 +00:00 |
|
|
Daniel S. Hansen
|
2298347e84
|
Refactor header: extract Avatar into standalone UserAvatarMenu component, and add _hover styling
|
2025-07-17 15:35:01 -07:00 |
|
|
Dan Hansen
|
0b7547cdc2
|
Merge branch 'refactor/sidebar-transition2' into 'main'
Refactor Header.jsx to place users name, email, and avatar in a group to the right side of the header
See merge request vkuchenik/website-framework!14
|
2025-07-17 18:36:02 +00:00 |
|
|
Daniel S. Hansen
|
02b4b8ee45
|
Refactor color theme temporarily, style the search bar to have a more rounded shape
|
2025-07-17 11:33:16 -07:00 |
|
|
Daniel S. Hansen
|
7da843b573
|
Refactor Header.jsx to place users name, email, and avatar in a group on the right side of the header
|
2025-07-17 11:03:55 -07:00 |
|
|
Daniel S. Hansen
|
5c68b1c5c3
|
Refactor sidebar to transition smoothly by changing open sidebar width from 100% to 210px
|
2025-07-17 10:32:35 -07:00 |
|
|
Dan Hansen
|
e1187892d3
|
Merge branch 'refactor/file-names' into 'main'
Rename component files Sidebar.jsx and Header.jsx with correct casing
See merge request vkuchenik/website-framework!11
|
2025-07-16 22:04:19 +00:00 |
|
|
Daniel S. Hansen
|
6a6bbf1866
|
Rename component files Sidebar.jsx and Header.jsx with correct casing
|
2025-07-16 15:02:57 -07:00 |
|
|
Daniel S. Hansen
|
56b2644fe5
|
Add Chakra darkmode theme to canvas header
|
2025-07-16 13:28:13 -07:00 |
|
|
Dan Hansen
|
b4dd663a1d
|
Merge branch 'refactor/sidebar-transition' into 'main'
Refactor/sidebar transition
See merge request vkuchenik/website-framework!9
|
2025-07-16 18:21:32 +00:00 |
|
|
Daniel S. Hansen
|
f6997c82ee
|
Save point
|
2025-07-16 11:19:55 -07:00 |
|
|
Daniel S. Hansen
|
1d1bf314e7
|
Refactor sidebar transition to keep icons stationary
|
2025-07-16 11:06:36 -07:00 |
|
|
Dan Hansen
|
23d126bdb5
|
Merge branch 'feature/sidebar-transition' into 'main'
Feature/sidebar transition
See merge request vkuchenik/website-framework!8
|
2025-07-15 22:59:24 +00:00 |
|
|
Daniel S. Hansen
|
dc1f4fcdaf
|
Save point, working on sidebar icon positioning during transition
|
2025-07-15 15:55:20 -07:00 |
|
|
Daniel S. Hansen
|
9f61ab2216
|
Add side bar transition animation between open and closed
|
2025-07-15 13:51:56 -07:00 |
|
|
Daniel S. Hansen
|
b6a3b3d9d8
|
Fix Gas nav link to use hash instead of path. Page no longer reloads upon clicking Gas link
|
2025-07-14 15:08:20 -07:00 |
|
|
Dan Hansen
|
2064f1b043
|
Merge branch 'feature/settings-menu' into 'main'
Feature/settings menu
See merge request vkuchenik/website-framework!7
|
2025-07-14 22:03:30 +00:00 |
|
|
Daniel S. Hansen
|
6cbfb4e29a
|
Edit sidebar close symbol from 'X' to 'RxHamburgerMenu' and aligned to the right
|
2025-07-14 13:31:11 -07:00 |
|
|
Daniel S. Hansen
|
94aa70a307
|
Adjust spacing on CanvasHeaderNav items
|
2025-07-14 13:13:47 -07:00 |
|
|
Daniel S. Hansen
|
bc83710acc
|
Add drop-down menu to Avatar
|
2025-07-14 12:23:26 -07:00 |
|
|
Daniel S. Hansen
|
1223ecc0b6
|
Add drop down menu to settings button
|
2025-07-14 12:10:10 -07:00 |
|
|
Dan Hansen
|
ebad1e792e
|
Merge branch 'feature/canvas-header' into 'main'
Add CanvasHeader along with sub components CanvasHeaderNav, SearchBar, SettingsButton
See merge request vkuchenik/website-framework!6
|
2025-07-11 23:04:34 +00:00 |
|
|
Daniel S. Hansen
|
eab46d424e
|
Add CanvasHeader along with sub components CanvasHeaderNav, SearchBar, SettingsButton
|
2025-07-11 15:58:38 -07:00 |
|
|
Dan Hansen
|
97f769d63e
|
Merge branch 'feature/widget' into 'main'
Add initial widget functionality using react-grid-layout and react-resizable
See merge request vkuchenik/website-framework!4
|
2025-07-09 22:26:45 +00:00 |
|
|
Daniel S. Hansen
|
e0fc1a98ac
|
Add initial widget functionality using react-grid-layout and react-resizable
|
2025-07-09 15:20:29 -07:00 |
|