Merge branch 'main' into prod/festapp

.github/workflows/web.yml

@@ -15,7 +15,9 @@ jobs:
       - name: Flutter
         uses: subosito/flutter-action@v2
         with:
+          flutter-version: '3.24.5'
           channel: 'stable'
+
       - run: flutter build web --web-renderer canvaskit --release --base-href /
 
       - name: Deploy

assets/translations/cs.json

@@ -296,5 +296,57 @@
   "The processing has been cancelled.": "Zpracování bylo zrušeno.",
   "The processing has completed successfully.": "Zpracování bylo úspěšně dokončeno.",
   "Saving changes": "Ukládání změn",
+  "Total Price: {price}": "Celková cena: {price}",
+  "Price": "Cena",
+  "Ticket": "Vstupenka",
+  "Drop file here": "Přetáhněte soubor sem",
+  "Continue": "Pokračovat",
+  "Spot": "Místo",
+  "Back to Form": "Zpět k formuláři",
+  "Close": "Zavřít",
+  "Your order was accepted!": "Vaše objednávka byla přijata!",
+  "Order Failed": "Objednávka se nezdařila",
+  "Payment information has been sent to your email.": "Informace o platbě byly odeslány na váš e-mail.",
+  "An error occurred while processing your order.": "Při zpracování vaší objednávky došlo k chybě.",
+  "Please select a seat.": "Vyberte prosím místo.",
+  "Summary": "Souhrn",
+  "Submit order": "Odeslat objednávku",
+  "It is not possible to select more tickets.": "Více vstupenek není možné vybrat.",
+  "Seat selection": "Výběr místa",
+  "Change title": "Změnit název",
+  "Click an option in the legend to add seats.": "Klikněte na možnost v legendě pro přidání sedadel.",
+  "Groups (Tables):": "Skupiny (Stoly):",
+  "Add new": "Přidat nový",
+  "Rename": "Přejmenovat",
+  "Group number": "Číslo skupiny",
+  "Black area": "Černá plocha",
+  "Available": "Dostupné",
+  "Empty": "Prázdné",
+  "Selected": "Vybrané",
+  "Width": "Šířka",
+  "Height": "Výška",
+  "Import SVG background": "Importovat SVG pozadí",
+  "File uploaded successfully.": "Soubor byl úspěšně nahrán.",
+  "Import background": "Importovat pozadí",
+  "Places that are occupied cannot be changed.": "Místa, která jsou obsazená, není možné měnit.",
+  "First, select or create a group to add a spot (on the right).": "Nejdřív vyberte nebo vytvořte skupinu pro přidání místa (vpravo).",
+  "Spot added:": "Přidáno místo:",
+  "Spot removed.": "Odstraněno místo.",
+  "Area removed.": "Odstraněna plocha.",
+  "Ticket Symbol": "Symbol vstupenky",
+  "Created": "Vytvořeno",
+  "Products": "Produkty",
+  "Hidden note": "Skrytá poznámka",
+  "Order Symbol": "Symbol objednávky",
+  "Customer": "Zákazník",
+  "Amount": "Částka",
+  "Paid amount": "Zaplacená částka",
+  "Variable symbol": "Variabilní symbol",
+  "Deadline": "Termín",
+  "Form": "Formulář",
+  "Blueprint": "Plánek",
+  "Tickets": "Vstupenky",
+  "Orders": "Objednávky",
+  "State": "Stav",
   "_": "_"
 }

assets/translations/en.json

@@ -296,5 +296,57 @@
   "The processing has been cancelled.": "The processing has been cancelled.",
   "The processing has completed successfully.": "The processing has completed successfully.",
   "Saving changes": "Saving changes",
+  "Total Price: {price}": "Total Price: {price}",
+  "Price": "Price",
+  "Ticket": "Ticket",
+  "Drop file here": "Drop file here",
+  "Continue": "Continue",
+  "Spot": "Spot",
+  "Back to Form":"Back to Form",
+  "Close": "Close",
+  "Your order was accepted!":"Your order was accepted!",
+  "Order Failed": "Order Failed",
+  "Payment information has been sent to your email.":"Payment information has been sent to your email.",
+  "An error occurred while processing your order.": "An error occurred while processing your order.",
+  "Please select a seat.": "Please select a seat.",
+  "Summary": "Summary",
+  "Submit order": "Submit order",
+  "It is not possible to select more tickets.": "It is not possible to select more tickets.",
+  "Seat selection": "Seat selection",
+  "Change title": "Change title",
+  "Click an option in the legend to add seats.": "Click an option in the legend to add seats.",
+  "Groups (Tables):": "Groups (Tables):",
+  "Add new": "Add new",
+  "Rename": "Rename",
+  "Group number": "Group number",
+  "Black area": "Black area",
+  "Available": "Available",
+  "Empty": "Empty",
+  "Selected": "Selected",
+  "Width": "Width",
+  "Height": "Height",
+  "Import SVG background": "Import SVG background",
+  "File uploaded successfully.": "File uploaded successfully.",
+  "Import background": "Import background",
+  "Places that are occupied cannot be changed.": "Places that are occupied cannot be changed.",
+  "First, select or create a group to add a spot (on the right).": "First, select or create a group to add a spot (on the right).",
+  "Spot added:": "Spot added:",
+  "Spot removed.": "Spot removed.",
+  "Area removed.": "Area removed.",
+  "Ticket Symbol": "Ticket Symbol",
+  "Created": "Created",
+  "Products": "Products",
+  "Hidden note": "Hidden note",
+  "Order Symbol": "Order Symbol",
+  "Customer": "Customer",
+  "Amount": "Amount",
+  "Paid amount": "Paid amount",
+  "Variable symbol": "Variable symbol",
+  "Deadline": "Deadline",
+  "Form": "Form",
+  "Blueprint": "Blueprint",
+  "Tickets": "Tickets",
+  "Orders": "Orders",
+  "State": "State",
   "_":"_"
 }

lib/AppRouter.dart

@@ -5,6 +5,7 @@ import 'package:fstapp/pages/AdminDashboardPage.dart';
 import 'package:fstapp/pages/CheckPage.dart';
 import 'package:fstapp/pages/EventEditPage.dart';
 import 'package:fstapp/pages/EventPage.dart';
+import 'package:fstapp/pages/Eshop/FormPage.dart';
 import 'package:fstapp/pages/HtmlEditorPage.dart';
 import 'package:fstapp/pages/InfoPage.dart';
 import 'package:fstapp/pages/InstallPage.dart';
@@ -15,7 +16,6 @@ import 'package:fstapp/pages/NewsPage.dart';
 import 'package:fstapp/pages/MySchedulePage.dart';
 import 'package:fstapp/pages/ResetPasswordPage.dart';
 import 'package:fstapp/pages/ForgotPasswordPage.dart';
-import 'package:fstapp/pages/SchedulePage.dart';
 import 'package:fstapp/pages/SettingsPage.dart';
 import 'package:fstapp/pages/SignupPage.dart';
 import 'package:fstapp/pages/SongPage.dart';
@@ -42,6 +42,9 @@ class AppRouter extends RootStackRouter {
     AutoRoute(page: SettingsRoute.page, path: sl(SettingsPage.ROUTE)),
     AutoRoute(page: InstallRoute.page, path: sl(InstallPage.ROUTE)),
     AutoRoute(page: AdminDashboardRoute.page, path: sl(AdminDashboardPage.ROUTE)),
+    AutoRoute(page: AdminDashboardRoute.page, path: sl(AdminDashboardPage.ROUTE)),
+    AutoRoute(page: FormRoute.page, path: "/${FormPage.ROUTE}/:id"),
+    AutoRoute(page: FormEditRoute.page, path: "/${FormPage.ROUTE}/:formKey/edit"),
     AutoRoute(page: CheckRoute.page, path: "/:{$LINK}/${CheckPage.ROUTE}/:id"),
     AutoRoute(page: NewsFormRoute.page, path: "/:{$LINK}/${NewsFormPage.ROUTE}"),
     AutoRoute(page: HtmlEditorRoute.page, path: "/:{$LINK}/${HtmlEditorPage.ROUTE}"),
@@ -54,7 +57,7 @@ class AppRouter extends RootStackRouter {
       AutoRoute(path: ':id', page: EventEditRoute.page,),
     ]),
     AutoRoute(page: OccasionHomeRoute.page, path: "/:{$LINK}", children: [
-      AutoRoute(page: UserRoute.page, path: "${UserPage.ROUTE}"),
+      AutoRoute(page: UserRoute.page, path: UserPage.ROUTE),
       AutoRoute(page: ScheduleNavigationRoute.page, path: EventPage.ROUTE, children: [
                   AutoRoute(page: ScheduleRoute.page, path: "", initial: true),
                   AutoRoute(page: EventRoute.page, path: ":id")
@@ -89,6 +92,7 @@ class AppRouter extends RootStackRouter {
       SettingsPage.ROUTE,
       InstallPage.ROUTE,
       AdminDashboardPage.ROUTE,
+      FormPage.ROUTE,
     ];
   }
 }