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
vkuchenik
54e1d6c8ad
tiny aesthetic changes
2025-07-30 08:34:07 -07:00
vkuchenik
f48e9eaf30
Increased size of tabs
2025-07-30 08:28:16 -07:00
vkuchenik
f11d179bb1
Update dark mode colors
2025-07-30 08:17: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
vkuchenik
b68b1500ef
Merge branch 'feature/dashboard/dark-mode' into 'main'
...
tooltip works!!
See merge request vkuchenik/website-framework!33
2025-07-29 18:20:47 +00:00
vkuchenik
7307736662
tooltip works!!
...
(sorry i'm in the wrong branch)
2025-07-29 11:08:36 -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