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 Nov 26, 2024
2 parents 3b8fe82 + 0954b67 commit fba7cd8
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 9 deletions.
31 changes: 31 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,37 @@ Links to phone install are usually saved in info section.
---
## Latest development

**2024.11**
- Cyber Space game added to the app, enabling group gameplay and submission of codes found in the real world.
- Schedule event editing page introduced, along with a new quick add button for the schedule.
- Songbook now supports a changeable dark/light theme and adjustable text size.
- Food support added, including information about user's choice.
- Accommodation support added with links to places on the map.
- Invitation based system implemented using invitation codes.
- Progress dialog in DataGrids now indicates success or error, with the option to cancel mid-action.
- Update prompt now allows setting a minimum version requirement for each platform.
- Launch event logging includes app version and platform details.
- Install screen updated with enhancements and instructions.
- Profile button moved to the bottom app bar.
- Admin page refined with sub-tabs, preparing for dynamic configuration features.
- Event page sign-in link is now clickable for easier access.

**2024.10**
- Support for multi-organizations.
- New bottom app bar.
- Dark/light mode, styles, and colors refactoring (e.g., clickable links are in different colors now).

**2024.09**
- Refactoring and support for multiple events.
- Support for linking multiple events.

**2024.08**
- Admin dashboard to support multiple events.
- Better support of linking of anything inside the app.
- Optimized loading for information.
- Compression for large images and automatically converting links, emails, and phone numbers to clickable hypertext.
- Colorful emoji for web.

**2024.07**
- Full support for offline display mode on web (and pwa app).
- Notifications support for web (and pwa app).
Expand Down
2 changes: 1 addition & 1 deletion lib/dataServices/DbEvents.dart
Original file line number Diff line number Diff line change
Expand Up @@ -588,8 +588,8 @@ class DbEvents {
}
var updatedEvent = EventModel.fromJson(eventData);

await removeEventFromEventGroups(updatedEvent);
if(event.parentEventIds?.isNotEmpty ?? false) {
await removeEventFromEventGroups(updatedEvent);
var insert = [];
for(var eParent in event.parentEventIds!)
{
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/SongDialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class _SongDialogState extends State<SongDialog> {

double buttonVisibleOpacity(BuildContext context) =>
ThemeConfig.isDarkMode(context) ? 1 : 0.9;
static const double buttonHiddenOpacity = 0.3;
static const double buttonHiddenOpacity = 0.4;
static const int buttonFadeAnimationDuration = 400;

@override
Expand Down
10 changes: 5 additions & 5 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
sdk: flutter
flutter:
sdk: flutter
flutter_svg: ^2.0.14
flutter_svg: ^2.0.15
fluttertoast: ^8.2.8

# The following adds the Cupertino Icons font to your application.
Expand All @@ -43,7 +43,7 @@ dependencies:
flutter_map_marker_popup: ^7.0.0
# flutter_map_marker_popup:
# path: ./pckgs/flutter_map_marker_popup-master
supabase_flutter: ^2.8.0
supabase_flutter: ^2.8.1
flutter_secure_storage: ^9.2.2
timelines: ^0.1.0
intl: ^0.19.0
Expand All @@ -62,9 +62,9 @@ dependencies:
sembast_web: ^2.4.0+4
path_provider: ^2.1.5
select_dialog: ^2.0.1
onesignal_flutter: ^5.2.6
onesignal_flutter: ^5.2.7
package_info_plus: ^8.1.1
flutter_animate: ^4.3.0
flutter_animate: ^4.5.2
easy_localization: ^3.0.7
flutter_map_cancellable_tile_provider: ^3.0.2
simple_shadow: ^0.3.1
Expand All @@ -76,7 +76,7 @@ dependencies:
image_downloader_web: ^2.0.4
mobile_scanner: ^6.0.2
flutter_map_pmtiles: ^1.0.4
flutter_map_animations: ^0.7.1
flutter_map_animations: ^0.8.0
auto_route: ^9.2.2
adaptive_theme: ^3.6.0
connectivity_plus: ^6.1.0
Expand Down
7 changes: 5 additions & 2 deletions scripts/database/functions/game_guess.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
CREATE OR REPLACE FUNCTION game_guess(check_point_id BIGINT, guess TEXT)
RETURNS JSONB AS $$
RETURNS JSONB
LANGUAGE plpgsql VOLATILE
SECURITY DEFINER
AS $$
DECLARE
hidden_value TEXT;
correct_reference BIGINT;
Expand Down Expand Up @@ -113,4 +116,4 @@ BEGIN
RETURN jsonb_build_object('code', 4001, 'message', 'Incorrect guess');
END IF;
END;
$$ LANGUAGE plpgsql;
$$;

0 comments on commit fba7cd8

Please sign in to comment.