Fix events for inno23 (#214)

* fix: Hide expired events * fix: Schema update for event name and subheading * chore: Manually update the event type and order Note: Needs to be made dynamic * fix: View more by default will filter by the event type selected * fix: Partial title hidden in speaker event cart * fix: Only show active events * fix: Only show "other" event type when the list is not empty * chore: change graphql queries acc. to backend * chore: Update HN card * fix: Minor change in getUser * chore: Updated registration button to visit website button * fix: Temporary fix for isVerified function * fix: Registration for Inno23 --------- Co-authored-by: Ashish Padhy <[email protected]>
dscnitrourkela · Oct 29, 2023 · af02714 · af02714
1 parent 2bedf0e
commit af02714
Show file tree

Hide file tree

Showing 19 changed files with 265 additions and 110 deletions.
diff --git a/elaichi/assets/images/hn_title.png b/elaichi/assets/images/hn_title.png
diff --git a/elaichi/lib/data/remote/graphql/graphql_service.dart b/elaichi/lib/data/remote/graphql/graphql_service.dart
@@ -1,13 +1,15 @@
 // ignore_for_file: avoid_dynamic_calls
 
 import 'package:elaichi/data/constants/app_env.dart';
+import 'package:elaichi/data/constants/global_enums.dart';
 import 'package:elaichi/data/remote/graphql/mutations.dart';
 import 'package:elaichi/data/remote/graphql/queries.dart';
 import 'package:elaichi/domain/models/event/event.dart';
 import 'package:elaichi/domain/models/event_registration/event_registration.dart';
 import 'package:elaichi/domain/models/mm_article/mm_article.dart';
 import 'package:elaichi/domain/models/org/org.dart';
 import 'package:elaichi/domain/models/user/user.dart';
+import 'package:elaichi/presentation/components/toasts/toast_util.dart';
 import 'package:flutter/foundation.dart';
 import 'package:graphql/client.dart';
 
@@ -112,7 +114,14 @@ class GraphQLService {
           .map((e) => Event.fromJson(e as Map<String, dynamic>))
           .toList();
 
-      return events;
+      final finalEvents = <Event>[];
+      for (final event in events) {
+        if (event.status == StatusType.ACTIVE) {
+          finalEvents.add(event);
+        }
+      }
+
+      return finalEvents;
     } catch (e) {
       rethrow;
     }
@@ -143,7 +152,7 @@ class GraphQLService {
       final result =
           await query(queryString: Queries.getUser, variables: {'uid': uid});
 
-      final userList = (result.data!['user'] as List<dynamic>)
+      final userList = (result.data!["user"]["data"] as List<dynamic>)
           .map((e) => User.fromJson(e as Map<String, dynamic>))
           .toList();
 
@@ -186,7 +195,7 @@ class GraphQLService {
     }
   }
 
-  Future<EventRegistration> createEventRegistration({
+  Future<EventRegistration?> createEventRegistration({
     required String eventID,
     required String userID,
   }) async {
@@ -204,7 +213,12 @@ class GraphQLService {
       );
       return eventRegistration;
     } catch (e) {
-      rethrow;
+      final toastUtil = ToastUtil.getInstance();
+      toastUtil.showToast(
+        mode: ToastMode.Info,
+        title: 'You have already registerd',
+      );
+      return null;
     }
   }
 

diff --git a/elaichi/lib/data/remote/graphql/queries.dart b/elaichi/lib/data/remote/graphql/queries.dart
@@ -17,9 +17,9 @@ class Queries {
     }
 ''';
 
-  static const getOrgs = r'''
-  query Org ($pagination: paginationInputType, $orgType: OrgType){
-    org(pagination: $pagination, orgType: $orgType){
+  static const getOrgs = '''
+  query Org {
+    org {
       id
       name
       description
@@ -42,14 +42,17 @@ class Queries {
   static const getUser = r'''
     query User($uid: ID) {
       user(uid: $uid) {
-        id
-        email
-        uid
-        name
-        photo
-        rollNumber
-        college
-        mobile
+        data {
+          id
+          email
+          uid
+          name
+          photo
+          rollNumber
+          college
+          mobile
+          festID
+        }
       }
     }
 ''';

diff --git a/elaichi/lib/domain/repositories/events_repository.dart b/elaichi/lib/domain/repositories/events_repository.dart
@@ -43,7 +43,7 @@ class EventRepository {
     }
   }
 
-  Future<Either<CustomException, EventRegistration>> createEventRegistration({
+  Future<Either<CustomException, EventRegistration?>> createEventRegistration({
     required String eventID,
     required String userID,
   }) async {
@@ -82,7 +82,14 @@ class EventRepository {
   }
 
   Map<String, List<Event>> getCategorisedEvents(List<Event> events) {
-    final map = <String, List<Event>>{};
+    final map = <String, List<Event>>{
+      'TECHNICAL': [],
+      'PRO': [],
+      'GUEST-LECTURES': [],
+      'EXHIBITIONS': [],
+      'FUN': [],
+      'WORKSHOP': [],
+    };
 
     for (final element in events) {
       if (map.keys.contains(element.type)) {

diff --git a/elaichi/lib/domain/repositories/user_repository.dart b/elaichi/lib/domain/repositories/user_repository.dart
@@ -76,7 +76,7 @@ class UserRepository {
     }
   }
 
-  Future<void> getUser() async {
+  Future<User?> getUser() async {
     try {
       final user =
           await _graphQLService.getUser(_firebaseAuth.currentUser!.uid);
@@ -86,13 +86,17 @@ class UserRepository {
       if (user.rollNumber != null) {
         _localStorageService.rollNumber = user.rollNumber;
       }
+      return user;
     } catch (e) {
       debugPrint(e.toString());
     }
+    return null;
   }
 
-  Future<void> getOrCreateUser(
-      {required String rollNumber, required String mobileNumber,}) async {
+  Future<void> getOrCreateUser({
+    required String rollNumber,
+    required String mobileNumber,
+  }) async {
     try {
       if (user == null) {
         final fbUser = _firebaseAuth.currentUser;

diff --git a/elaichi/lib/presentation/browse/browse_page.dart b/elaichi/lib/presentation/browse/browse_page.dart
@@ -68,7 +68,7 @@ class EventCard extends StatelessWidget {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Text(
-                  jsonDecode(event.name)['subHeading'].toString(),
+                  event.subHeading,
                   style: interTextTheme.bodyMedium!.copyWith(
                     fontWeight: FontWeight.w700,
                     color: AppColors.grey3,
@@ -78,7 +78,7 @@ class EventCard extends StatelessWidget {
                 ),
                 const SizedBox(height: 6),
                 Text(
-                  jsonDecode(event.name)['heading'].toString(),
+                  event.name,
                   style: interTextTheme.bodyMedium!.copyWith(
                     fontWeight: FontWeight.w700,
                     color: AppColors.grey2,

diff --git a/elaichi/lib/presentation/core/router/app_router.dart b/elaichi/lib/presentation/core/router/app_router.dart
@@ -68,6 +68,7 @@ class AppRouter {
           settings: settings,
           builder: (context) => AllEventsPage(
             events: map['events'] as Map<String, Map<String, List<Event>>>,
+            controllIndex: map['index'] as int,
           ),
         );
 
@@ -81,7 +82,7 @@ class AppRouter {
         return AppPageRoute(
           settings: settings,
           builder: (context) => const RegistrationDetails(),
-         );
+        );
       case privacyPolicy:
         return AppPageRoute<void>(
           settings: settings,

diff --git a/elaichi/lib/presentation/core/utils/event_type_map.dart b/elaichi/lib/presentation/core/utils/event_type_map.dart
@@ -6,4 +6,5 @@ Map<String, String> get eventTypeMapping => {
       'EXHIBITIONS': 'Exhibitions',
       'FUN': 'Fun Events',
       'WORKSHOP': 'Workshops',
+      'OTHER': 'Others',
     };
diff --git a/elaichi/lib/presentation/core/utils/strings.dart b/elaichi/lib/presentation/core/utils/strings.dart
@@ -27,7 +27,7 @@ abstract class Strings {
       'https://images.hindustantimes.com/img/2022/06/29/1600x900/NIT_Rourkela_main_entrance_(1)_1656490094321_1656490107321.jpg';
   static const String kNitrImage = 'assets/images/nitr.png';
   static const String kShaderImage = 'assets/images/shader.png';
-  static const String hackNITR = 'assets/images/hack_nitr.png';
+  static const String hackNITR = 'assets/images/hn_title.png';
   static const String kStoriesthisWeek = '  Stories this week';
   static const String kToday = 'Today';
   static const String kViewCalendar = 'View Calendar';

diff --git a/elaichi/lib/presentation/core/utils/urlLauncher.dart b/elaichi/lib/presentation/core/utils/urlLauncher.dart
@@ -1,8 +1,9 @@
 import 'package:url_launcher/url_launcher.dart';
 
-launchURL(String url) async {
-  if (await canLaunch(url)) {
-    await launch(url, enableJavaScript: true);
+void launchURL(String url) async {
+  final uri = Uri.parse(url);
+  if (await canLaunchUrl(uri)) {
+    await launchUrl(uri);
   } else {
     throw 'Could not launch $url';
   }

diff --git a/elaichi/lib/presentation/home/fest/bloc/fest_bloc.dart b/elaichi/lib/presentation/home/fest/bloc/fest_bloc.dart
@@ -23,7 +23,7 @@ class FestBloc extends Bloc<FestEvent, FestState> {
       (event, emit) async {
         await event.when(
           started: () async {
-            final status = isVerified();
+            final status = await isVerified();
 
             final fests = await _eventRepository.getFests();
 
@@ -44,8 +44,8 @@ class FestBloc extends Bloc<FestEvent, FestState> {
               },
             );
           },
-          webMailLogIn: () {
-            final status = isVerified();
+          webMailLogIn: () async {
+            final status = await isVerified();
             emit(
               (state as _Initial).copyWith(
                 webMailState: status
@@ -82,7 +82,9 @@ class FestBloc extends Bloc<FestEvent, FestState> {
     }
   }
 
-  bool isVerified() {
+  Future<bool> isVerified() async {
+    final user = await _userRepository.getUser();
+    if (user == null) return false;
     if (_userRepository.rollNumber != null) {
       return true;
     } else {

diff --git a/elaichi/lib/presentation/home/fest/explore/all_events/all_events_page.dart b/elaichi/lib/presentation/home/fest/explore/all_events/all_events_page.dart
@@ -11,9 +11,14 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 
 class AllEventsPage extends StatefulWidget {
-  const AllEventsPage({super.key, required this.events});
+  const AllEventsPage({
+    super.key,
+    required this.events,
+    required this.controllIndex,
+  });
 
   final Map<String, Map<String, List<Event>>> events;
+  final int controllIndex;
 
   @override
   State<AllEventsPage> createState() => _AllEventsPageState();
@@ -46,6 +51,7 @@ class _AllEventsPageState extends State<AllEventsPage> {
       setState(() {});
     });
     _cubit = AllEventsCubit();
+    _cubit.selectChip(widget.controllIndex);
     super.initState();
   }
 

diff --git a/elaichi/lib/presentation/home/fest/explore/cubit/registration_cubit.dart b/elaichi/lib/presentation/home/fest/explore/cubit/registration_cubit.dart
@@ -31,6 +31,11 @@ class RegistrationCubit extends Cubit<RegistrationState> {
       eventRegistration.fold(
         (exception) => emit(RegistrationState.error(error: exception.message!)),
         (eventRegistration) async {
+          eventRegistration ??= EventRegistration(
+            id: 'abc',
+            eventID: event.id,
+            userID: user.id,
+          );
           eventRegistrations.add(eventRegistration);
           emit(const RegistrationState.success());
           emit(

diff --git a/elaichi/lib/presentation/home/fest/explore/event_details_page.dart b/elaichi/lib/presentation/home/fest/explore/event_details_page.dart
@@ -153,7 +153,8 @@ class EventDetailsPage extends StatelessWidget {
                           Text(
                             description[index]['desc'].toString(),
                             style: interTextTheme.bodyLarge!.copyWith(
-                                color: AppColors.grey6.withOpacity(0.8),),
+                              color: AppColors.grey6.withOpacity(0.8),
+                            ),
                           ),
                           const SizedBox(height: 14),
                         ],