 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 |
|
|
vkuchenik
|
a6dc0325f7
|
Merge branch 'fix/sidebar/sizing' into 'main'
updated to loop through btns
See merge request vkuchenik/website-framework!13
|
2025-07-17 16:31:27 +00:00 |
|
|
vkuchenik
|
8697c547b8
|
updated to loop through btns
Instead of listing each button it now loops through
|
2025-07-17 09:30:42 -07:00 |
|
|
vkuchenik
|
e21b88bc3a
|
Merge branch 'fix/sidebar/sizing' into 'main'
Sidebar text fades in and OUT!!
See merge request vkuchenik/website-framework!12
|
2025-07-17 14:29:48 +00:00 |
|
|
vkuchenik
|
9f6342d240
|
Sidebar text fades in and OUT!!
|
2025-07-17 07:29:03 -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 |
|
|
vkuchenik
|
26bd2028a8
|
updated padding btwn sidebar btns
|
2025-07-16 14:38:10 -07:00 |
|
|
vkuchenik
|
dc1aa0aa39
|
adjusting sidebar btn flex directions
|
2025-07-16 13:31:05 -07:00 |
|
|
Daniel S. Hansen
|
56b2644fe5
|
Add Chakra darkmode theme to canvas header
|
2025-07-16 13:28:13 -07:00 |
|
|
vkuchenik
|
2b1779716c
|
Merge branch 'feature/dashboard/dark-mode' into 'main'
dark mode technically works
See merge request vkuchenik/website-framework!10
|
2025-07-16 19:38:27 +00:00 |
|
|
vkuchenik
|
e7abce2ed1
|
Merge branch 'main' into 'feature/dashboard/dark-mode'
# Conflicts:
# client/src/App.jsx
# client/src/components/header.jsx
# client/src/components/sidebar.jsx
|
2025-07-16 19:35:22 +00:00 |
|
|
vkuchenik
|
466ee6edc4
|
fixed spelling error
|
2025-07-16 11:23:29 -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 |
|
|
vkuchenik
|
59667876b0
|
Updated colors in theme.js
|
2025-07-16 07:21:26 -07:00 |
|
|
vkuchenik
|
23540bc5cd
|
added hover & active w/ dark mode
dark mode works with buttons in hover, active, and inactive state! (and its not totally ugly!)
|
2025-07-15 18:28:37 -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 |
|
|
vkuchenik
|
022f37b086
|
dark mode technically works
but it is terrible
|
2025-07-15 12:55:27 -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 |
|
|
vkuchenik
|
12090cb391
|
Merge branch 'feature/dashboard/dark-mode' into 'main'
quick fix
See merge request vkuchenik/website-framework!5
|
2025-07-10 16:59:20 +00:00 |
|
|
vkuchenik
|
5fd48bc958
|
quick fix
changed theme.js to use chakras new way to create a theme in v3+
|
2025-07-10 09:58:23 -07:00 |
|