Skip to content

Commit a16a117

Browse files
jniebuhrManfredRichthofen
authored and
silverfoxy
committed
Daisy UI Migration (jniebuhr#355)
* Add Daisy Ui (jniebuhr#339) * Initial Daisy Ui transition and 4 themes to start * Update Ui * Fix SonarCloud issues * Remove Computed Single line Chart Register * Use JSX syntax * Apply Bunny Fixes * Use card component * Use Card * Fix active and hover states * Format and Style Nav Bar Better * Move profiles over(need to fix spacing between lables) * Fix Mobile Layout * Fix mobile layout * Listen to the bunny * Update style.css * Convert Scale and Autotune * Delete dashboard.html * I like the titles on the left better * fix: Fix some bugs in the UI * feat: Change overview chart readability * Dasiy Ui (jniebuhr#347) * Migrate Settings to DaisyUi and removed unused error handling * Fix eslint error var to const * Fix eslint * Remove Unused container-fluid and create context. Run Format. Migrate Process Info to daisy * Change to aria label * Use Daisy UI tool tips * Remove Unused Styles * Use Semantic Colors * Add Theme Manager to settings Right now this is a separate card but can be changed whenever * Standardize spacing and Padding as well as component usage * Fix Profile pages and use consistent styling * Improve Dark style ? * add aria * Fix Save * Consistent Styles. Use 10/5 Grid Layout * Fix Button Spacing * Prevent race condition * Fix button Position and use 5/10 layout on home page * fix card class again * javascript:void(0) * simple bp * add theme urls * add safelist * fix profile cards * FMT and When saving profile rout back to profile list * Clarify Settings Card * Fix Chart Height * This needs a bit of testing but should fix card duplication * Add Switching the layout of the home page * Format and Fix Lint errors * Fix some code reviews * Update index.jsx * Split Settings Page up a bit * Clean up Inputs * Fix Radix --------- Co-authored-by: Jochen Niebuhr <kontakt@ju-hh.de> * feat: Add landscape dashboard layout, fix profile edit --------- Co-authored-by: DreadPirateRoberts <46958197+ManfredRichthofen@users.noreply.github.com>
1 parent 138b657 commit a16a117

38 files changed

Lines changed: 2622 additions & 1903 deletions

‎src/display/plugins/WebUIPlugin.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ void WebUIPlugin::setupServer() {
180180
if (doc["mode"].is<uint8_t>()) {
181181
auto mode = doc["mode"].as<uint8_t>();
182182
controller->deactivate();
183+
controller->clear();
183184
controller->setMode(mode);
184185
}
185186
} else if (msgType == "req:change-brew-target") {

‎web/.prettierrc‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
{
2-
"trailingComma": "es5",
2+
"printWidth": 100,
33
"tabWidth": 2,
4+
"useTabs": false,
45
"semi": true,
56
"singleQuote": true,
6-
"printWidth": 130
7+
"jsxSingleQuote": true,
8+
"trailingComma": "all",
9+
"bracketSpacing": true,
10+
"bracketSameLine": false,
11+
"arrowParens": "avoid",
12+
"endOfLine": "lf",
13+
"proseWrap": "preserve",
14+
"htmlWhitespaceSensitivity": "css",
15+
"quoteProps": "as-needed",
16+
"plugins": ["prettier-plugin-tailwindcss"]
717
}

‎web/dashboard.html‎

Lines changed: 0 additions & 148 deletions
This file was deleted.

‎web/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/>
2424
<title>Gaggimate Web UI</title>
2525
</head>
26-
<body class="bg-slate-100 dark:bg-slate-900">
26+
<body class="bg-base-100">
2727
<div id="app"></div>
2828
<script type="module" src="/src/index.jsx"></script>
2929
</body>

‎web/package-lock.json‎

Lines changed: 117 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"@preact/signals": "^1.3.1",
1414
"chart.js": "^4.4.8",
1515
"chartjs-adapter-dayjs-4": "^1.0.4",
16+
"daisyui": "^5.0.50",
1617
"dayjs": "^1.11.13",
1718
"preact": "^10.22.1",
1819
"preact-fetching": "^1.0.0",
@@ -25,7 +26,8 @@
2526
"autoprefixer": "^10.4.20",
2627
"eslint": "^8.57.1",
2728
"eslint-config-preact": "^1.5.0",
28-
"prettier": "^3.4.2",
29+
"prettier": "^3.6.2",
30+
"prettier-plugin-tailwindcss": "^0.6.14",
2931
"tailwindcss": "^4.1.11",
3032
"vite": "^7.0.5"
3133
},

0 commit comments

Comments
 (0)