Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac849d2eb1 | ||
|
|
80cb152b73 |
BIN
build/windows/MicrosoftEdgeWebview2Setup.exe
Normal file
BIN
build/windows/MicrosoftEdgeWebview2Setup.exe
Normal file
Binary file not shown.
@@ -12,7 +12,7 @@ RequestExecutionLevel admin
|
||||
!define MUI_UNICON "icon.ico"
|
||||
!define MUI_ABORTWARNING
|
||||
!define MUI_WELCOMEPAGE_TITLE "Speiseplan Setup"
|
||||
!define MUI_WELCOMEPAGE_TEXT "Dieses Programm installiert den Kita-Wochenspeiseplan auf Ihrem Computer.$\r$\n$\r$\nKlicken Sie auf Weiter, um fortzufahren."
|
||||
!define MUI_WELCOMEPAGE_TEXT "Dieses Programm installiert den Kita-Wochenspeiseplan auf Ihrem Computer.$\r$\n$\r$\nBenötigte Komponenten (WebView2) werden automatisch mitinstalliert.$\r$\n$\r$\nKlicken Sie auf Weiter, um fortzufahren."
|
||||
|
||||
; Seiten
|
||||
!insertmacro MUI_PAGE_WELCOME
|
||||
@@ -28,6 +28,30 @@ RequestExecutionLevel admin
|
||||
; Sprache
|
||||
!insertmacro MUI_LANGUAGE "German"
|
||||
|
||||
; WebView2 Check Funktion
|
||||
Function CheckWebView2
|
||||
; Prüfe ob WebView2 bereits installiert ist
|
||||
ReadRegStr $0 HKLM "SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" "pv"
|
||||
${If} $0 == ""
|
||||
ReadRegStr $0 HKCU "SOFTWARE\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" "pv"
|
||||
${EndIf}
|
||||
${If} $0 == ""
|
||||
; WebView2 nicht gefunden — installieren
|
||||
DetailPrint "WebView2 Runtime wird installiert..."
|
||||
SetOutPath "$TEMP"
|
||||
File "MicrosoftEdgeWebview2Setup.exe"
|
||||
ExecWait '"$TEMP\MicrosoftEdgeWebview2Setup.exe" /silent /install' $1
|
||||
${If} $1 != 0
|
||||
MessageBox MB_OK|MB_ICONEXCLAMATION "WebView2 konnte nicht installiert werden (Fehler: $1).$\r$\nBitte installieren Sie es manuell von https://developer.microsoft.com/microsoft-edge/webview2/"
|
||||
${Else}
|
||||
DetailPrint "WebView2 Runtime erfolgreich installiert."
|
||||
${EndIf}
|
||||
Delete "$TEMP\MicrosoftEdgeWebview2Setup.exe"
|
||||
${Else}
|
||||
DetailPrint "WebView2 Runtime bereits installiert (Version: $0)."
|
||||
${EndIf}
|
||||
FunctionEnd
|
||||
|
||||
; Hauptinstallation
|
||||
Section "Speiseplan (erforderlich)" SecMain
|
||||
SectionIn RO
|
||||
@@ -35,9 +59,15 @@ Section "Speiseplan (erforderlich)" SecMain
|
||||
File "..\..\build\bin\speiseplan.exe"
|
||||
File "icon.ico"
|
||||
|
||||
; WebView2 prüfen und ggf. installieren
|
||||
Call CheckWebView2
|
||||
|
||||
; Registry
|
||||
WriteRegStr HKLM "Software\Speiseplan" "Install_Dir" "$INSTDIR"
|
||||
WriteRegStr HKLM "Software\Speiseplan" "Version" "0.4.7"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Speiseplan" "DisplayName" "Speiseplan"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Speiseplan" "DisplayVersion" "0.4.7"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Speiseplan" "Publisher" "Kita Ortrand"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Speiseplan" "DisplayIcon" "$INSTDIR\icon.ico"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Speiseplan" "UninstallString" '"$INSTDIR\uninstall.exe"'
|
||||
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Speiseplan" "NoModify" 1
|
||||
@@ -57,7 +87,7 @@ SectionEnd
|
||||
|
||||
; Komponentenbeschreibungen
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecMain} "Das Speiseplan-Programm (erforderlich)."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecMain} "Das Speiseplan-Programm (erforderlich). WebView2 wird automatisch mitinstalliert."
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} "Erstellt eine Verknüpfung auf dem Desktop."
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ import { Layout, useSelectedWeek } from './components/Layout';
|
||||
import { WeekPlanner } from './components/WeekPlanner';
|
||||
import { ProductList } from './components/ProductList';
|
||||
import { InfoPage } from './components/InfoPage';
|
||||
import { ErrorBoundary } from './components/ErrorBoundary';
|
||||
import { useProducts } from './hooks/useProducts';
|
||||
import './styles/globals.css';
|
||||
|
||||
@@ -68,6 +69,7 @@ function ProductsPage() {
|
||||
// Main App Component
|
||||
function App() {
|
||||
return (
|
||||
<ErrorBoundary>
|
||||
<Router>
|
||||
<div className="App min-h-screen bg-gray-50 text-contrast-aa">
|
||||
<Routes>
|
||||
@@ -87,6 +89,7 @@ function App() {
|
||||
</Routes>
|
||||
</div>
|
||||
</Router>
|
||||
</ErrorBoundary>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
58
frontend/src/components/ErrorBoundary.tsx
Normal file
58
frontend/src/components/ErrorBoundary.tsx
Normal file
@@ -0,0 +1,58 @@
|
||||
import { Component, ErrorInfo, ReactNode } from 'react';
|
||||
|
||||
interface Props {
|
||||
children: ReactNode;
|
||||
}
|
||||
|
||||
interface State {
|
||||
hasError: boolean;
|
||||
error: Error | null;
|
||||
}
|
||||
|
||||
export class ErrorBoundary extends Component<Props, State> {
|
||||
constructor(props: Props) {
|
||||
super(props);
|
||||
this.state = { hasError: false, error: null };
|
||||
}
|
||||
|
||||
static getDerivedStateFromError(error: Error): State {
|
||||
return { hasError: true, error };
|
||||
}
|
||||
|
||||
componentDidCatch(error: Error, errorInfo: ErrorInfo) {
|
||||
console.error('ErrorBoundary caught:', error, errorInfo);
|
||||
}
|
||||
|
||||
render() {
|
||||
if (this.state.hasError) {
|
||||
return (
|
||||
<div className="min-h-screen flex items-center justify-center bg-gray-50 p-8">
|
||||
<div className="text-center max-w-md">
|
||||
<svg className="mx-auto h-16 w-16 text-red-400 mb-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.996-.833-2.764 0L3.732 16c-.77.833.192 2.5 1.732 2.5z" />
|
||||
</svg>
|
||||
<h1 className="text-2xl font-bold text-gray-900 mb-2">
|
||||
Etwas ist schiefgelaufen
|
||||
</h1>
|
||||
<p className="text-gray-600 mb-6">
|
||||
Ein unerwarteter Fehler ist aufgetreten. Bitte laden Sie die Seite neu.
|
||||
</p>
|
||||
{this.state.error && (
|
||||
<p className="text-sm text-red-600 mb-6 font-mono bg-red-50 p-3 rounded">
|
||||
{this.state.error.message}
|
||||
</p>
|
||||
)}
|
||||
<button
|
||||
onClick={() => window.location.reload()}
|
||||
className="px-6 py-3 bg-blue-600 text-white rounded-md hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 transition-colors text-lg"
|
||||
>
|
||||
Seite neu laden
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return this.props.children;
|
||||
}
|
||||
}
|
||||
@@ -85,8 +85,8 @@ export function WeekPlanner({ year, week, className = '' }: WeekPlannerProps) {
|
||||
setPdfSuccess(null);
|
||||
|
||||
try {
|
||||
const result = await ExportPDF(weekPlan.id, '');
|
||||
setPdfSuccess(result || 'PDF wurde erfolgreich erstellt.');
|
||||
await ExportPDF(weekPlan.id, '');
|
||||
setPdfSuccess('PDF wurde erfolgreich erstellt.');
|
||||
|
||||
// Success-Nachricht nach 5 Sekunden ausblenden
|
||||
setTimeout(() => {
|
||||
|
||||
@@ -66,7 +66,9 @@ export function useProducts() {
|
||||
data.additiveIds
|
||||
);
|
||||
|
||||
if (newProduct) {
|
||||
setProducts(prev => [...prev, newProduct]);
|
||||
}
|
||||
return newProduct;
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Fehler beim Erstellen des Produkts');
|
||||
@@ -90,7 +92,9 @@ export function useProducts() {
|
||||
data.additiveIds
|
||||
);
|
||||
|
||||
if (updatedProduct) {
|
||||
setProducts(prev => prev.map(p => p.id === id ? updatedProduct : p));
|
||||
}
|
||||
return updatedProduct;
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Fehler beim Bearbeiten des Produkts');
|
||||
|
||||
@@ -96,11 +96,12 @@ export function useWeekPlan(year: number, week: number) {
|
||||
groupLabel ?? null
|
||||
);
|
||||
|
||||
// State aktualisieren
|
||||
if (newEntry) {
|
||||
setWeekPlan(prev => prev ? {
|
||||
...prev,
|
||||
entries: [...prev.entries, newEntry]
|
||||
} : null);
|
||||
}
|
||||
|
||||
return newEntry;
|
||||
} catch (err) {
|
||||
@@ -138,11 +139,12 @@ export function useWeekPlan(year: number, week: number) {
|
||||
// Go: UpdatePlanEntry(id int, productID *int, customText *string, groupLabel *string)
|
||||
const updatedEntry = await UpdatePlanEntry(entryId, productId ?? null, customText ?? null, groupLabel ?? null);
|
||||
|
||||
// State aktualisieren
|
||||
if (updatedEntry) {
|
||||
setWeekPlan(prev => prev ? {
|
||||
...prev,
|
||||
entries: prev.entries.map(e => e.id === entryId ? updatedEntry : e)
|
||||
} : null);
|
||||
}
|
||||
|
||||
return updatedEntry;
|
||||
} catch (err) {
|
||||
|
||||
Reference in New Issue
Block a user