chight/Web-Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164 Commits 2 Branches 0 Tags
d563cb9d19da850c1fc5454e920fc46b0bf2d00d
Commit Graph
94 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
vkuchenik d563cb9d19 Merge branch 'canvas/doing-stuff' into 'main' 
some small changes

See merge request vkuchenik/website-framework!51
 2025-08-06 00:15:37 +00:00
vkuchenik 4fb2f7eabe some small changes 
+ removed sliding animation from widgets
+ added form fields to Alert Level widget
 2025-08-05 17:12:59 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
vkuchenik 022f37b086 dark mode technically works 
but it is terrible
 2025-07-15 12:55:27 -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
vkuchenik f293e14ed1 Reorganized file structure 
Moved app.css and index.css into the css folder.
 2025-07-10 08:11:24 -07:00
vkuchenik 24e36c1294 Merge branch 'feature/sidebar/highlight-active-btns' into 'main' 
active buttons highlighted

See merge request vkuchenik/website-framework!3
 2025-07-10 15:06:11 +00:00
vkuchenik 0190bf7c72 dark mode 
forgot to switch branches. Started working on dark mode by creating a theme for the app
 2025-07-10 14:59:13 +00:00
vkuchenik 6bb10060e5 active buttons highlighted 
the current active button is now highlighting a bolder color.
 2025-07-10 14:59:13 +00:00
vkuchenik ed05ea8caf consolidated import statements 2025-07-09 11:13:56 -07:00
vkuchenik de6d5fd681 tiny update to button sizes 2025-07-09 10:28:30 -07:00
vkuchenik bfacfd302c sidebar collapsible feature 
The sidebar can now be collapsed to just its icons
 2025-07-09 10:25:54 -07:00
vkuchenik b8852b20bf Merge branch 'refactor/sidebar' into 'main' 
added close button to sidebar

See merge request vkuchenik/website-framework!2
 2025-07-09 16:07:08 +00:00
vkuchenik bf9a9d8461 updated colors 
adjusted text colors of sidebar tabs and header logo and username from black to dark green.
 2025-07-09 09:03:34 -07:00
vkuchenik 186e8baefc added close button to sidebar 
I added the close button to the sidebar (no functionality yet). I also fixed the canvas grid width and height
 2025-07-09 08:43:52 -07:00
vkuchenik e3d4054e0c added grid to canvas area. 2025-07-08 13:02:20 -07:00
vkuchenik 8e8206c041 Merge branch 'initial-local-code' into 'main' 
initial commit

See merge request vkuchenik/website-framework!1
 2025-07-08 18:40:43 +00:00
vkuchenik a0f2f63e6e initial commit 2025-07-08 11:16:51 -07:00
vkuchenik 194e39770a Edit README.md 2025-07-08 17:20:04 +00:00
vkuchenik aa933b6a93 Initial commit 2025-07-08 17:16:34 +00:00