Repository navigation
Conversation
Co-authored-by: Copilot <[email protected]>
catch corrupt log files on update Co-authored-by: Copilot <[email protected]>
* Koala - Add custom colors - charge points * Koala - Add custom colors - battery * Daily totals - multiple batteries dropdown - icons: user defined colors * Add user defined colors to history chart * Add user defined colors to energy flow chart * Add user defined colors to vehicle cards * Add user defined colors to tables (vehicle & charge points) * Use vite-svg-loader for svg icons * Make CSS consistent of all components --------- Co-authored-by: Lutz Bender <[email protected]> Co-authored-by: LKuemmel <[email protected]> Co-authored-by: benderl <[email protected]> Co-authored-by: Copilot <[email protected]>
* Flow chart new design * DailyTotals new design * fix battery color in flow diagram * History chart new design * Flow chart drop shadows for Safari * Flow chart CCS for Safari * Charge point cards new design * Charge point & vehicle select buttons update to new design * update icon color * Vehicle Card new design * Battery card new design * Update table background * custom color card border left * Change carousel button background color * new energy flow animation * fix custom symbol color - Daily totals * formatting * Carousel control CSS global in quasar variables file * update carousel CSS * update dropdown menu CSS * new design CSS for button groups * flow chart resize soc clip to prevent overlap * formatting * update card background - dark theme * update battery mode buttons to new design * apply new design to dark theme * Adjust CSS * update global CSS * reorder global CSS color variables * cleanup global color variables light and dark themes * remove unused colors * Global CSS consolidate CSS selectors * Scheduled /Time plan buttons / plan details info-box - new design * Centralize message/info box CSS in global file * update jsdoc for store
* Flow chart new design * DailyTotals new design * fix battery color in flow diagram * History chart new design * Flow chart drop shadows for Safari * Flow chart CCS for Safari * Charge point cards new design * Charge point & vehicle select buttons update to new design * update icon color * Vehicle Card new design * Battery card new design * Update table background * custom color card border left * Change carousel button background color * new energy flow animation * fix custom symbol color - Daily totals * formatting * Carousel control CSS global in quasar variables file * update carousel CSS * update dropdown menu CSS * new design CSS for button groups * flow chart resize soc clip to prevent overlap * formatting * update card background - dark theme * update battery mode buttons to new design * apply new design to dark theme * Adjust CSS * update global CSS * reorder global CSS color variables * cleanup global color variables light and dark themes * remove unused colors * Global CSS consolidate CSS selectors * Scheduled /Time plan buttons / plan details info-box - new design * Centralize message/info box CSS in global file * update jsdoc for store * setting build custom colors
* Flow chart new design * DailyTotals new design * fix battery color in flow diagram * History chart new design * Flow chart drop shadows for Safari * Flow chart CCS for Safari * Charge point cards new design * Charge point & vehicle select buttons update to new design * update icon color * Vehicle Card new design * Battery card new design * Update table background * custom color card border left * Change carousel button background color * new energy flow animation * fix custom symbol color - Daily totals * formatting * Carousel control CSS global in quasar variables file * update carousel CSS * update dropdown menu CSS * new design CSS for button groups * flow chart resize soc clip to prevent overlap * formatting * update card background - dark theme * update battery mode buttons to new design * apply new design to dark theme * Adjust CSS * update global CSS * reorder global CSS color variables * cleanup global color variables light and dark themes * remove unused colors * Global CSS consolidate CSS selectors * Scheduled /Time plan buttons / plan details info-box - new design * Centralize message/info box CSS in global file * update jsdoc for store * setting build custom colors * New design Koala build
There was a problem hiding this comment.
Pull request overview
Aktualisiert das Koala-Theme gemäß neuem Design: zentrale Farbanpassungen über Quasar-Variablen, Entfernen von benutzerdefinierten Farben für bestimmte Komponenten (EVU/PV/Speicher) sowie UI-Anpassungen im Energieflussdiagramm (Textfarben, Clip-Path, Spaltenabstände, Schriftart).
Changes:
- Entfernt Battery-/PV-Farb-APIs aus dem MQTT-Store und passt abhängige Charts auf Theme-Variablen um.
- Aktualisiert Quasar Theme-Variablen (inkl. neuer
--q-vehicle-fill) und reduziert Tint-Intensität. - Überarbeitet Energieflussdiagramm (responsive Breite/Spaltenabstände, Clip-Path für Textanimation, Roboto, dynamische Textfarbe passend zum Symbol).
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| packages/modules/web_themes/koala/source/src/stores/mqtt-store.ts | Entfernt PV-/Battery-Farb-Exports (Aggregate/Custom) aus Store-API. |
| packages/modules/web_themes/koala/source/src/css/quasar.variables.scss | Neue Design-Farben, ergänzt --q-vehicle-fill, Anpassung Tint-Amount. |
| packages/modules/web_themes/koala/source/src/components/charts/historyChart/HistoryChart.vue | Nutzt Theme-Farben statt Store-Aggregate-Farben für Grid/PV/Battery. |
| packages/modules/web_themes/koala/source/src/components/charts/energyFlowChart/EnergyFlowChart.vue | Responsive Chartbreite, neuer Clip-Path, Textfarbe an Symbolfarbe, Roboto, Iconfarben angepasst. |
| packages/modules/web_themes/koala/source/src/components/charts/energyFlowChart/energy-flow-chart-models.ts | ComponentClass: ersetzt valueLabel durch optionales valueLabelColor. |
| packages/modules/web_themes/koala/source/src/components/charts/dailyTotals/DailyTotalsRow.vue | Entfernt feste Icon-Farbe aus CSS (Farbe kommt per Inline-Style). |
| packages/modules/web_themes/koala/source/src/components/charts/dailyTotals/DailyTotals.vue | Setzt mehrere Komponentenfarben auf Theme-Variablen, entfernt Grid-ID-Farbableitung. |
| packages/modules/web_themes/koala/source/src/components/BatteryCard.vue | Entfernt Styling für benutzerdefinierte Battery-Farbe (Border-left). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| batteryDailyImportedTotal, | ||
| batteryDailyExportedTotal, | ||
| batteryTotalPower, | ||
| batteryChargePriorityRange, | ||
| batteryMode, | ||
| batteryAggregateColor, | ||
| batteryColor, | ||
| // Grid data | ||
| gridId, |
There was a problem hiding this comment.
Build-Dateien waren hier nur erzeugt um das experimental Branch anzushauen, sie werden neu erzeugt beim merge in Master branch
| :header-class=" | ||
| item.id === 'chargepoint' && individualChargePointData.length > 1 | ||
| ? 'cursor-pointer' | ||
| : item.id === 'battery' && individualBatteryData.length > 1 | ||
| ? 'cursor-pointer' | ||
| : 'no-pointer' | ||
| : item.id === 'pv' && individualPvData.length > 1 | ||
| ? 'cursor-pointer' | ||
| : 'no-pointer' | ||
| " | ||
| > | ||
| <template #header> | ||
| <DailyTotalsRow | ||
| :item="item" | ||
| :rowHeight="rowHeight" | ||
| :rowExpanded="expanded[item.id]" | ||
| :secondaryComponentsConfigured=" | ||
| item.id === 'chargepoint' | ||
| ? individualChargePointData.length > 1 | ||
| : item.id === 'battery' | ||
| ? individualBatteryData.length > 1 | ||
| : false | ||
| : item.id === 'pv' | ||
| ? individualPvData.length > 1 | ||
| : false | ||
| " |
There was a problem hiding this comment.
Die beiden (inzwischen etwas unübersichtlichen) Ausdrücke für header-class und secondaryComponentsConfigured sehen unterschiedlich aus, erreichen jedoch das selbe Ergebnis. Für Zähler gibt es die selbe Logik als Computed Property secondaryCountersConfigured. Für Ladepunkte gibt es chargePointConfigured. Höchste Zeit, ein zentrales Computed Property dafür einzuführen. ;-)
Vorschlag:
const secondaryComponentsConfigured = computed(() => {
return (componentType: string): boolean => {
switch (componentType) {
case 'counter':
return secondaryCounterData.value.length > 0;
case 'chargepoint':
return individualChargePointData.value.length > 1;
case 'battery':
return individualBatteryData.value.length > 1;
case 'pv':
return individualPvData.value.length > 1;
default:
return false;
}
};
});
There was a problem hiding this comment.
central computed Funktion implementiert.
| */ | ||
| const pvColor = computed(() => { | ||
| return (pvId: number): string | null => { | ||
| const DEFAULT_COLOR = '#28a745'; |
There was a problem hiding this comment.
In der Datei sind insgesamt 6 Farben fest als String hinterlegt. Siehst Du eine Möglichkeit, das hier zu entfernen und auf die globalen Farbdefinitionen aus quasar.variables.scss zuzugreifen?
There was a problem hiding this comment.
Die sechs fest hinterlegten Farben sind die Bootstrap-Standardfarben, die das Backend in die Konfiguration schreibt (aus der Settings UI). Sie unterscheiden sich daher bewusst von den Koala-Farben. In resolveComponentColor dienen sie lediglich als Sentinel-Werte: Wenn die gespeicherte Farbe dem Standardwert entspricht, geben wir null zurück, sodass die Komponente auf die Theme-Variable var(--q-*) zurückfällt.
Aus diesem Grund können die Werte nicht direkt aus quasar.variables.scss übernommen werden – es handelt sich schlicht um andere Farben.
Ein möglicher Ansatz wäre, die Farben im Settings-Projekt auf die Koala-Farben umzustellen, sodass Standard- und Theme-Farben übereinstimmen. Das Problem dabei ist, dass das Backend nur einen statischen Wert speichert, während der Ladepunkt inzwischen unterschiedliche Farben für das Light- und Dark-Theme verwendet (#153357 bzw. #3874db), nachdem ich die Ladepunkt-Farbe für das Dark-Theme angepasst habe. Ein statischer Backend-Wert kann beide Varianten nicht abbilden, sodass der Fallback über var(--q-*) weiterhin erforderlich wäre.
Mein Vorschlag wäre daher, die sechs Werte in einer zentralen Konstante (z. B. einer SETTINGS_UI_COLORS_-Map) zusammenzufassen. Dadurch würden die verstreuten String-Literale verschwinden und es gäbe eine einzige Quelle der Wahrheit, ohne die Erkennungslogik oder das Backend ändern zu müssen.
406e24e to
71561a9
Compare
* custom vehicle and charge point colors * custom component colors * update config step 1 * fix upgrade config * fix component setup * extend setdata for new vehicle topic * use bootstrap primary color for charge points * update logfiles * rename color constants * upgrade method * update dynsec roles * update dynsec role acls for vehicle color * Apply suggestions from code review Co-authored-by: Copilot <[email protected]> * fix missing color references * Update packages/helpermodules/update_config.py catch corrupt log files on update Co-authored-by: Copilot <[email protected]> * formatting * add logging in ComponentSetup * Koala user defined custom colors (#3361) * Koala - Add custom colors - charge points * Koala - Add custom colors - battery * Daily totals - multiple batteries dropdown - icons: user defined colors * Add user defined colors to history chart * Add user defined colors to energy flow chart * Add user defined colors to vehicle cards * Add user defined colors to tables (vehicle & charge points) * Use vite-svg-loader for svg icons * Make CSS consistent of all components --------- Co-authored-by: Lutz Bender <[email protected]> Co-authored-by: LKuemmel <[email protected]> Co-authored-by: benderl <[email protected]> Co-authored-by: Copilot <[email protected]> * fix typescript errors, formatting * update dependencies * Koala new design custom colors (#3500) * Flow chart new design * DailyTotals new design * fix battery color in flow diagram * History chart new design * Flow chart drop shadows for Safari * Flow chart CCS for Safari * Charge point cards new design * Charge point & vehicle select buttons update to new design * update icon color * Vehicle Card new design * Battery card new design * Update table background * custom color card border left * Change carousel button background color * new energy flow animation * fix custom symbol color - Daily totals * formatting * Carousel control CSS global in quasar variables file * update carousel CSS * update dropdown menu CSS * new design CSS for button groups * flow chart resize soc clip to prevent overlap * formatting * update card background - dark theme * update battery mode buttons to new design * apply new design to dark theme * Adjust CSS * update global CSS * reorder global CSS color variables * cleanup global color variables light and dark themes * remove unused colors * Global CSS consolidate CSS selectors * Scheduled /Time plan buttons / plan details info-box - new design * Centralize message/info box CSS in global file * update jsdoc for store * Koala design custom colors settings build (#3512) * Flow chart new design * DailyTotals new design * fix battery color in flow diagram * History chart new design * Flow chart drop shadows for Safari * Flow chart CCS for Safari * Charge point cards new design * Charge point & vehicle select buttons update to new design * update icon color * Vehicle Card new design * Battery card new design * Update table background * custom color card border left * Change carousel button background color * new energy flow animation * fix custom symbol color - Daily totals * formatting * Carousel control CSS global in quasar variables file * update carousel CSS * update dropdown menu CSS * new design CSS for button groups * flow chart resize soc clip to prevent overlap * formatting * update card background - dark theme * update battery mode buttons to new design * apply new design to dark theme * Adjust CSS * update global CSS * reorder global CSS color variables * cleanup global color variables light and dark themes * remove unused colors * Global CSS consolidate CSS selectors * Scheduled /Time plan buttons / plan details info-box - new design * Centralize message/info box CSS in global file * update jsdoc for store * setting build custom colors * New design Koala build (#3518) * Flow chart new design * DailyTotals new design * fix battery color in flow diagram * History chart new design * Flow chart drop shadows for Safari * Flow chart CCS for Safari * Charge point cards new design * Charge point & vehicle select buttons update to new design * update icon color * Vehicle Card new design * Battery card new design * Update table background * custom color card border left * Change carousel button background color * new energy flow animation * fix custom symbol color - Daily totals * formatting * Carousel control CSS global in quasar variables file * update carousel CSS * update dropdown menu CSS * new design CSS for button groups * flow chart resize soc clip to prevent overlap * formatting * update card background - dark theme * update battery mode buttons to new design * apply new design to dark theme * Adjust CSS * update global CSS * reorder global CSS color variables * cleanup global color variables light and dark themes * remove unused colors * Global CSS consolidate CSS selectors * Scheduled /Time plan buttons / plan details info-box - new design * Centralize message/info box CSS in global file * update jsdoc for store * setting build custom colors * New design Koala build * remove user defined battery color * Always use Standard colors for PV, EVU, no user defined colors * Charge points revert back to standard color when no user defined color * update charge point default color * Update global CSS colors - new design * Update home icon color - remove q-diagram-color where not required * Make power and charge mode text same color as icons * Energy flow chart - responsive column spacing * Energy flow chart - Set font - Roboto * Energy flow chart - Change clip path for label animation * Daily totals - update secondary counter color * DailyTotals - Secondary counter custom color * reinstate custom colors for all components * Standard color displayed in charts * remove redundant store function * daily totals add dropdown for multiple pv systems * use lighter blue primary color in dark theme * centralize logic for secondary components configured * formatting * centralize settings UI colors --------- Co-authored-by: Lutz Bender <[email protected]> Co-authored-by: LKuemmel <[email protected]> Co-authored-by: benderl <[email protected]> Co-authored-by: Copilot <[email protected]>
Farben gemäß dem neuen Design aktualisiert
Benutzerdefinierte Farben für EVU, PV und Speicher entfernt
Textfarbe im Energieflussdiagramm an die jeweilige Symbolfarbe angepasst
Clip-Path für die Textanimation angepasst, sodass der Text bei der Animation von Ladepunkt und Fahrzeug korrekt ausgeblendet wird
Spaltenabstände im Energieflussdiagramm für größere Bildschirme vergrößert
Schriftart im Energieflussdiagramm aktualisiert