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
vkuchenik
9575cd8d21
Merge branch 'add/widgets/conditional-editing' into 'main'
...
widgets only edited on btn click
See merge request vkuchenik/website-framework!25
2025-07-24 23:06:37 +00:00
vkuchenik
552b1bd16a
widgets only edited on btn click
...
The widgets now cannot be resized until the user clicks on "Edit Widgets" in the settings gear icon.
2025-07-24 16:05:42 -07:00
vkuchenik
4cdc335cad
canvas is now scrollable
2025-07-24 13:48:41 -07:00
vkuchenik
cc6d141d19
Merge branch 'add/dashboard/tabs' into 'main'
...
Add/dashboard/tabs
See merge request vkuchenik/website-framework!24
2025-07-24 20:00:51 +00:00
vkuchenik
741668f241
Merge remote-tracking branch 'origin/main' into add/dashboard/tabs
2025-07-24 12:59:23 -07:00
vkuchenik
85160caae0
lots of file surgery, it works
2025-07-24 12:08:10 -07:00
vkuchenik
2db5514f2c
fixing refrences after file rename
2025-07-24 09:01:35 -07:00
vkuchenik
2cdc5e1e82
file name change
2025-07-24 08:57:24 -07:00
vkuchenik
1d5b00448b
added tabs and file restructure
2025-07-24 08:52:20 -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
vkuchenik
0ca419a093
oneliner
2025-07-23 14:58:22 -07:00
vkuchenik
d8f7f4b9dc
quick fix
2025-07-23 14:41:52 -07:00
vkuchenik
2e259c1b34
Merge branch 'add/widgets/theme' into 'main'
...
beautified the widget
See merge request vkuchenik/website-framework!22
2025-07-23 21:31:54 +00:00
vkuchenik
cde87274c6
Copied and pasted most recent App.jsx into Dashboard.jsx
2025-07-23 21:31:18 +00:00
vkuchenik
20ca59ad82
Merge branch 'main' into 'add/widgets/theme'
...
# Conflicts:
# client/src/App.jsx
2025-07-23 21:25:21 +00:00
vkuchenik
1f1eced159
beautified the widget
...
the widgets now don't shrink past the size of the header. The canvas in the widget is scrollable and the scroller is pretty. The resizing arrow button at the bottom of the widget stays at the bottom (this is because only the canvas can scroll now).
2025-07-23 13:44:24 -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
vkuchenik
caeed48d19
Merge branch 'add/widgets/theme' into 'main'
...
widget overflow now scrolls
See merge request vkuchenik/website-framework!20
2025-07-22 21:55:59 +00:00
vkuchenik
7c29b2a14c
widget overflow now scrolls
...
if content is too big for widget it now scrolls.
2025-07-22 14:55:28 -07:00
vkuchenik
745faa9020
Merge branch 'add/widgets/theme' into 'main'
...
add text highlighting controls in widgets
See merge request vkuchenik/website-framework!19
2025-07-22 20:43:12 +00:00
vkuchenik
b066c7f023
add text highlighting controls
...
only disable highlighting text when dragging widgets
2025-07-22 13:41:32 -07:00
vkuchenik
ff74f0a7a4
Merge branch 'add/widgets/theme' into 'main'
...
udpated bg of widget shadow
See merge request vkuchenik/website-framework!18
2025-07-22 19:58:11 +00:00
vkuchenik
ab03d43aff
udpated bg of widget shadow
...
the drop shadow behind widgets when moved around is now light blue and the corners are round.
2025-07-22 12:56:44 -07:00
vkuchenik
973bae8b24
Merge branch 'add/widgets/theme' into 'main'
...
widgets are bound to container
See merge request vkuchenik/website-framework!17
2025-07-22 18:59:45 +00:00
vkuchenik
37ebd3d478
widgets are bound to container
...
figured out how to set bounds so widgets don't go off screen!
2025-07-22 11:58:10 -07:00
vkuchenik
999206b013
style changes
...
some small style changes like cursor types on hover and some color changes.
2025-07-22 09:26:40 -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
vkuchenik
f49486d234
Removed comments
2025-07-17 09:50:21 -07:00
vkuchenik
850bb2bea3
Delete header.jsx (this file is redundant. header.jsx is Header.jsx)
2025-07-17 16:48:22 +00:00
vkuchenik
d0f7090be8
Delete sidebar.jsx (this is extra from when we were renaming files. sidebar.jsx is now Sidebar.jsx)
2025-07-17 16:47:04 +00:00
vkuchenik
24c33b51f3
looping through btns now
2025-07-17 09:45:36 -07:00
Dan Hansen
vkuchenik