Commit Graph
246 Commits
Author SHA1 Message Date
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
Daniel S. Hansen 416873fc08 Save point, page is rendering with view tracking 2025-07-29 09:59:17 -07:00
vkuchenik 11198e23ea Merge branch 'feature/dashboard/dark-mode' into 'main'
new icons

See merge request vkuchenik/website-framework!32
2025-07-28 22:11:36 +00:00
vkuchenik 4495cb9f78 new icons
got rid of custom imported icons, too much work to make them dark mode useable.
2025-07-28 15:10:57 -07:00
vkuchenik 55890d0b3d changed btn from "dashboard" to "home" 2025-07-28 13:42:12 -07:00
vkuchenik eae9bc4048 sets canvas zindex behind sidebar/header 2025-07-28 13:32:03 -07:00
vkuchenik f312730e35 Merge branch 'add/widgets/conditional-deleting' into 'main'
now can delete widgets

See merge request vkuchenik/website-framework!31
2025-07-28 19:46:03 +00:00
vkuchenik 1956a0685b Merge branch 'main' into 'add/widgets/conditional-deleting'
# Conflicts:
#   client/src/components/layout/Canvas/views/DashboardCanvas.jsx
2025-07-28 19:45:54 +00:00
vkuchenik 8f18879e96 now can delete widgets 2025-07-28 12:44: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