chight
0715fa61ab
Bug fix, removed old routes i should have removed in last commit
2026-06-05 11:08:21 -07:00
chight
6fd777d804
Update pulled app foundation out into a route of its own
2026-06-05 11:04:17 -07:00
vkuchenik
8532a2558e
now all routes added but some are broken bc of bad refrences
2026-06-04 15:35:11 -07:00
vkuchenik
fd3cdc69ad
some routes added
2026-06-04 15:30:01 -07:00
Dan Hansen
dd70ec077c
Merge branch 'revert-2a4139ab' into 'main'
...
Revert "Merge branch 'feature/gas-filter' into 'main'"
See merge request vkuchenik/website-framework!86
2026-01-30 19:11:11 +00:00
Dan Hansen
946dbb499e
Revert "Merge branch 'feature/gas-filter' into 'main'"
2026-01-30 19:11:11 +00:00
Dan Hansen
2a4139ab31
Merge branch 'feature/gas-filter' into 'main'
...
Fix add widget behavior, widget types and view settings button menu item...
See merge request vkuchenik/website-framework!85
2026-01-30 19:02:31 +00:00
Dan Hansen
6c49239675
Fix add widget behavior, widget types and view settings button menu item...
2026-01-30 19:02:31 +00:00
Daniel S. Hansen
b1e9b442ff
Revert "Merge branch 'feature/add-deformation-tab' into 'main'"
...
This reverts commit a94c6de39aec72385de0
2025-09-26 12:05:47 -07:00
Dan Hansen
a94c6de39a
Merge branch 'feature/add-deformation-tab' into 'main'
...
Feature/add deformation tab
See merge request vkuchenik/website-framework!75
2025-09-26 19:02:47 +00:00
Daniel S. Hansen
ed68dd6d9c
Add new deformation tab to domestic/main branch
2025-09-26 12:01:48 -07:00
Dan Hansen
ec72385de0
Merge branch 'refactor/header-tabs' into 'main'
...
Refactor the way TABS and VIEWS are handeled, now derived inside viewKeys.js
See merge request vkuchenik/website-framework!73
2025-09-05 20:15:00 +00:00
Dan Hansen
68a4e0417e
Refactor the way TABS and VIEWS are handeled, now derived inside viewKeys.js
2025-09-05 20:15:00 +00:00
Dan Hansen
81896d8f5b
Merge branch 'feature/volcano-tabs' into 'main'
...
Add Volcano tabs along with functioning boilerplate component views
See merge request vkuchenik/website-framework!72
2025-09-04 00:26:24 +00:00
Daniel S. Hansen
3a4565e120
Add Volcano tabs along with functioning boilerplate component views
2025-09-03 17:22:24 -07:00
Dan Hansen
ff783f59a2
Merge branch 'feature/admin-view3' into 'main'
...
Add style and interactivity features to M&E Data Entry view
See merge request vkuchenik/website-framework!71
2025-08-25 22:15:12 +00:00
Daniel S. Hansen
bdd92f2f2c
Add ScrollArea to main M&E Data Entry table along with sticky header
2025-08-25 15:12:20 -07:00
Daniel S. Hansen
caad4e117e
Add form type validation for date and number values along with interactive row highlighting in the main M&E Data Entry table
2025-08-25 14:15:04 -07:00
Dan Hansen
39ce297af4
Merge branch 'feature/admin-view2' into 'main'
...
Feature/admin view2
See merge request vkuchenik/website-framework!70
2025-08-23 01:14:45 +00:00
Daniel S. Hansen
0de3b2c5e7
Add labels, placeholders, and buttons to the form section
2025-08-22 18:08:38 -07:00
Daniel S. Hansen
ea11372e51
Save point, layout of form section looks decent
2025-08-22 17:31:42 -07:00
Daniel S. Hansen
dc56ec79f1
Add initial fill in form boilerplate
2025-08-22 16:55:24 -07:00
Daniel S. Hansen
69525d0132
Add initial table and checkbox functionality to M&E Data Entry view
2025-08-22 16:28:50 -07:00
Daniel S. Hansen
66d1220fbe
Add styling, margin, and padding changes
2025-08-22 12:46:08 -07:00
Daniel S. Hansen
3ef85bbcbf
Save point, layout taking shape
2025-08-22 09:28:03 -07:00
Daniel S. Hansen
8630340a07
Add dropdown menus to M&E Data Entry view
2025-08-20 17:44:21 -07:00
vkuchenik
7e23c6a98d
Merge branch 'maps/layer-selector-component' into 'main'
...
added layer selector in global maps
See merge request vkuchenik/website-framework!69
2025-08-19 23:48:22 +00:00
vkuchenik
3d52160dfc
+ Lots of work was done but specifically within the GlobalMap.jsx
...
+ Two new component files were also added
+ Some slight adjustments to Theme.jsx
2025-08-19 16:45:03 -07:00
Daniel S. Hansen
5d3a8ec344
Spell check
2025-08-13 15:57:46 -07:00
Daniel S. Hansen
079663b8fa
Small default tab fix for Admin
2025-08-13 15:46:37 -07:00
Dan Hansen
35e781a0bb
Merge branch 'feature/admin-view' into 'main'
...
Feature/admin view
See merge request vkuchenik/website-framework!68
2025-08-13 22:43:32 +00:00
Dan Hansen
566b7310f8
Merge branch 'main' into 'feature/admin-view'
...
# Conflicts:
# client/src/components/Sidebar/Sidebar.jsx
# client/src/constants/viewKeys.js
2025-08-13 22:42:56 +00:00
Daniel S. Hansen
d4645eb3c1
Add default admin tab now set to M&E Data Entry
2025-08-13 15:35:17 -07:00
Daniel S. Hansen
c496396092
Add new tabs and views under Admin sidebar tab
2025-08-13 15:18:03 -07:00
Dan Hansen
ff67ea8f0f
Merge branch 'bug/tooltip-behavior' into 'main'
...
Add useMemo to sidebar button function to prevent unecessary remounting of components
See merge request vkuchenik/website-framework!67
2025-08-13 19:56:40 +00:00
Daniel S. Hansen
846afa3eac
Add useMemo to sidebar button function to prevent unecessary remounting of components
2025-08-13 12:55:33 -07:00
Dan Hansen
cd9f7c77ac
Merge branch 'bug/tooltip-behavior' into 'main'
...
Prevent Tooltip from displaying when Sidebar toggles between The Home sidebar...
See merge request vkuchenik/website-framework!66
2025-08-13 19:32:04 +00:00
Daniel S. Hansen
5e2364334f
Prevent Tooltip from displaying when Sidebar toggles between The Home sidebar and the Personal sidebar while closed
2025-08-13 12:27:47 -07:00
Daniel S. Hansen
4afccac3f3
Fix tooltip zIndex to appear on top of maps and other canvas items
2025-08-13 10:49:37 -07:00
vkuchenik
54530f324f
Merge branch 'refactor/remove-delete-btn' into 'main'
...
removed delete button
See merge request vkuchenik/website-framework!65
2025-08-12 22:28:04 +00:00
vkuchenik
805f1dc82f
removed delete button
...
+ renamed delete button to edit button (to keep functionality)
+ removed edit button (redundant)
+ on add widgets, it no longer asks you to save before continuing
2025-08-12 15:27:33 -07:00
vkuchenik
f8bd3845c4
Merge branch 'sidebar/account-sidebar' into 'main'
...
new favicon and title
See merge request vkuchenik/website-framework!64
2025-08-12 21:56:05 +00:00
vkuchenik
2aea676551
new favicon and title
...
*forgot to switch branches oops
2025-08-12 14:55:15 -07:00
vkuchenik
d78100dfcd
Merge branch 'sidebar/account-sidebar' into 'main'
...
removed account button
See merge request vkuchenik/website-framework!63
2025-08-12 21:31:38 +00:00
vkuchenik
69529f77be
removed account button
2025-08-12 14:31:10 -07:00
vkuchenik
17f1b7ad63
Merge branch 'sidebar/account-sidebar' into 'main'
...
new sidebar for account/settings
See merge request vkuchenik/website-framework!62
2025-08-12 21:22:40 +00:00
vkuchenik
b4dd5b205d
new sidebar for account/settings
2025-08-12 14:21:31 -07:00
Dan Hansen
4967f649ad
Merge branch 'bug/cancel-removes-widgets' into 'main'
...
Fix state not being saved before entering edit or delete modes
See merge request vkuchenik/website-framework!61
2025-08-12 21:03:54 +00:00
Daniel S. Hansen
92bcbf57a9
Fix state not being saved before entering edit or delete modes
2025-08-12 13:57:58 -07:00
vkuchenik
bf315aa647
Merge branch 'widgets/alert-level' into 'main'
...
widget menu refactoring
See merge request vkuchenik/website-framework!59
2025-08-12 17:06:31 +00:00
chight
vkuchenik
Dan Hansen