Skip to content

Commit

Permalink
Merge branch 'main' into prod/festapp
Browse files Browse the repository at this point in the history
  • Loading branch information
miakh committed Dec 12, 2024
2 parents dd67b73 + c1731ab commit 1a7afa8
Show file tree
Hide file tree
Showing 15 changed files with 727 additions and 505 deletions.
1 change: 1 addition & 0 deletions assets/translations/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@
"Are you sure you want to delete this event?": "Opravdu chcete tuto událost smazat?",
"Advanced Settings": "Pokročilá nastavení",
"Add New Event": "Přidat novou událost",
"Add To Schedule": "Přidat do programu",
"Password or code": "Heslo nebo kód",
"Copy Link": "Kopírovat odkaz",
"Open this website on your Android phone in a browser like Chrome or Edge and hit the Install Now button.": "Otevři tuto webovou stránku na svém telefonu s Androidem v prohlížeči, jako je Chrome nebo Edge, a klikni na tlačítko Nainstalovat teď.",
Expand Down
1 change: 1 addition & 0 deletions assets/translations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@
"Are you sure you want to delete this event?": "Sind Sie sicher, dass Sie dieses Ereignis löschen möchten?",
"Advanced Settings": "Erweiterte Einstellungen",
"Add New Event": "Neue Veranstaltung hinzufügen",
"Add To Schedule": "Zum Zeitplan hinzufügen",
"Password or code": "Passwort oder Code",
"Copy Link": "Link kopieren",
"Open this website on your Android phone in a browser like Chrome or Edge and hit the Install Now button.": "Öffne diese Webseite auf deinem Android-Telefon in einem Browser wie Chrome oder Edge und klicke auf die Schaltfläche Jetzt installieren.",
Expand Down
1 change: 1 addition & 0 deletions assets/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@
"Are you sure you want to delete this event?": "Are you sure you want to delete this event?",
"Advanced Settings": "Advanced Settings",
"Add New Event": "Add New Event",
"Add To Schedule": "Add To Schedule",
"Password or code": "Password or code",
"Copy Link": "Copy Link",
"Open this website on your Android phone in a browser like Chrome or Edge and hit the Install Now button.": "Open this website on your Android phone in a browser like Chrome or Edge and hit the Install Now button.",
Expand Down
1 change: 1 addition & 0 deletions assets/translations/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@
"Are you sure you want to delete this event?": "Czy na pewno chcesz usunąć to wydarzenie?",
"Advanced Settings": "Zaawansowane ustawienia",
"Add New Event": "Dodaj nowe wydarzenie",
"Add To Schedule": "Dodaj do programu",
"Password or code": "Hasło lub kod",
"Copy Link": "Kopiuj link",
"Open this website on your Android phone in a browser like Chrome or Edge and hit the Install Now button.": "Otwórz tę stronę internetową na swoim telefonie z Androidem w przeglądarce, takiej jak Chrome lub Edge, i kliknij przycisk Zainstaluj teraz.",
Expand Down
1 change: 1 addition & 0 deletions assets/translations/sk.json
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@
"Are you sure you want to delete this event?": "Naozaj chcete túto udalosť vymazať?",
"Advanced Settings": "Pokročilé nastavenia",
"Add New Event": "Pridať novú udalosť",
"Add To Schedule": "Pridať do programu",
"Password or code": "Heslo alebo kód",
"Copy Link": "Kopírovať odkaz",
"Open this website on your Android phone in a browser like Chrome or Edge and hit the Install Now button.": "Otvor túto webovú stránku na svojom telefóne s Androidom v prehliadači, ako je Chrome alebo Edge, a klikni na tlačidlo Nainštalovať teraz.",
Expand Down
1 change: 1 addition & 0 deletions assets/translations/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@
"Are you sure you want to delete this event?": "Ви впевнені, що хочете видалити цю подію?",
"Advanced Settings": "Розширені налаштування",
"Add New Event": "Додати нову подію",
"Add To Schedule": "Додати до програми",
"Password or code": "Пароль або код",
"Copy Link": "Скопіювати посилання",
"Open this website on your Android phone in a browser like Chrome or Edge and hit the Install Now button.": "Відкрий цей вебсайт на своєму телефоні з Android у браузері, наприклад Chrome або Edge, і натисни кнопку Встановити зараз.",
Expand Down
2 changes: 2 additions & 0 deletions lib/appConfig.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ class AppConfig {
static const String oneSignalAppId = '73f77f22-961a-4ded-9647-e33a7ac14f90';

static const int organization = 1;
//setup occasion id to force occasion
static const String? occasionLink = null;

static const String webLink = "https://live.festapp.net";
static const String appStoreLink = "https://apps.apple.com/us/app/festapp/id6474078383";
Expand Down
2 changes: 1 addition & 1 deletion lib/components/timeline/ScheduleTimeline.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class _ScheduleTimelineState extends State<ScheduleTimeline> {
Icons.add_circle_outline,
size: 24,
),
label: const Text("Add New Event").tr(),
label: const Text("Add To Schedule").tr(),
style: TextButton.styleFrom(
foregroundColor: ThemeConfig.timelineAddNewEventColor(context),
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
Expand Down
5 changes: 5 additions & 0 deletions lib/dataServices/RightsService.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:fstapp/AppRouter.dart';
import 'package:fstapp/RouterService.dart';
import 'package:fstapp/appConfig.dart';
import 'package:fstapp/dataServices/OfflineDataService.dart';
import 'package:fstapp/dataModels/OccasionUserModel.dart';
import 'package:fstapp/dataServices/SynchroService.dart';
Expand All @@ -21,6 +22,10 @@ class RightsService{
model = LinkModel.extractOccasionLink(Uri.base.toString());
}

if(AppConfig.occasionLink != null) {
model.occasionLink = AppConfig.occasionLink;
}

if (!await RouterService.updateOccasionFromLink(model)) {
throw Exception("Cannot continue.");
}
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/AdminDashboard/OccasionScreen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class _OccasionsScreenState extends State<OccasionsScreen> {
}

void _addNewEvent() {
EventCreationHelper.createNewEvent(context, widget.organizationId, _occasions, _loadOccasions);
EventCreationHelper.createNewOccasion(context, widget.organizationId, _occasions, _loadOccasions);
}

@override
Expand Down
Loading

0 comments on commit 1a7afa8

Please sign in to comment.