From 5a0e30b3452ed8f89899b2c22ea60487382e12fd Mon Sep 17 00:00:00 2001
From: Palash Mittal <pmittal00@gmail.com>
Date: Sat, 2 Sep 2023 19:00:03 +0530
Subject: [PATCH 1/4] acad disscussion forum

---
 android/build.gradle                             | 2 +-
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 macos/Flutter/GeneratedPluginRegistrant.swift    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index c00cf1a7..4bdaab5d 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -30,6 +30,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index bc6a58af..cfe88f69 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index d6e284f9..6d5c33d8 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,6 +5,7 @@
 import FlutterMacOS
 import Foundation
 
+import device_info_plus_macos
 import firebase_core
 import firebase_messaging
 import flutter_local_notifications
@@ -12,12 +13,12 @@ import flutter_native_timezone
 import location
 import package_info_plus_macos
 import path_provider_macos
-import shared_preferences_macos
+import shared_preferences_foundation
 import sqflite
 import url_launcher_macos
-import wakelock_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
   FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin"))
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
@@ -28,5 +29,4 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
-  WakelockMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockMacosPlugin"))
 }

From 644630253c4f5cba2ca07f3ed6734c7b6d9aab87 Mon Sep 17 00:00:00 2001
From: Tarus <taruspande02@gmail.com>
Date: Sat, 9 Sep 2023 15:27:30 +0530
Subject: [PATCH 2/4] set up flutter

---
 assets/login/login.html                                     | 2 +-
 assets/login/login_dark.html                                | 2 +-
 ios/Runner.xcodeproj/project.pbxproj                        | 4 ++--
 ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme | 2 +-
 lib/src/api/apiclient.dart                                  | 6 +++---
 lib/src/api/apiclient.g.dart                                | 3 +--
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/assets/login/login.html b/assets/login/login.html
index d4a509fe..9b017590 100644
--- a/assets/login/login.html
+++ b/assets/login/login.html
@@ -107,7 +107,7 @@
   <div class="lowerdiv">
     <div class="logindiv">
       <a class="login"
-        href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=vR1pU7wXWyve1rUkg0fMS6StL1Kr6paoSmRIiLXJ&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html">
+        href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=HeKlfCluQLxa5cG5c4yHYiAEFZynroiKwylpiwNV&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html">
         <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=5jyMJufq0Vk0aDlj9Hnudsj84UfbFZlYRUnn02Xd&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html"> -->
         <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=MQXcx3EHMqoGW57dXM27j2HSzEpvGAARASXraRmX&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html"> -->
         <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=gxzx6u7aw6wco6SJBioORPwum5Sug7OrIPrm8r2W&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html"> -->
diff --git a/assets/login/login_dark.html b/assets/login/login_dark.html
index 3993c374..015c4946 100644
--- a/assets/login/login_dark.html
+++ b/assets/login/login_dark.html
@@ -113,7 +113,7 @@
     <div class="lowerdiv">
         <div class="logindiv">
             <a class="login"
-                href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=vR1pU7wXWyve1rUkg0fMS6StL1Kr6paoSmRIiLXJ&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html">
+                href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=HeKlfCluQLxa5cG5c4yHYiAEFZynroiKwylpiwNV&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html">
                 <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=8iPdGfcUEoe6P3IHmQQ63CuPW4glQd1mbsdQtHkW&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html"> -->
                 <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=MQXcx3EHMqoGW57dXM27j2HSzEpvGAARASXraRmX&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html"> -->
                 LOG IN VIA SSO
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 9980b282..afd73b88 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -255,7 +255,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1340;
-				LastUpgradeCheck = 1340;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "The Chromium Authors";
 				TargetAttributes = {
 					15B703D127F86A110040D0AD = {
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index a0f64538..c87d15a3 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1340"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/lib/src/api/apiclient.dart b/lib/src/api/apiclient.dart
index c43febea..a219a510 100644
--- a/lib/src/api/apiclient.dart
+++ b/lib/src/api/apiclient.dart
@@ -44,7 +44,7 @@ part 'apiclient.g.dart';
 
 // @rt.RestApi(baseUrl: "http://192.168.230.89:8000/api")
 // @rt.RestApi(baseUrl: "http://10.105.177.150/api")
-@rt.RestApi(baseUrl: "https://gymkhana.iitb.ac.in/instiapp/api")
+@rt.RestApi(baseUrl: "https://2ddd-103-21-126-76.ngrok-free.app/api")
 // @rt.RestApi(baseUrl: "https://0ac7-103-21-125-80.in.ngrok.io/api")
 abstract class InstiAppApi {
   factory InstiAppApi(Dio dio, {String baseUrl}) = _InstiAppApi;
@@ -338,9 +338,9 @@ abstract class InstiAppApi {
       @rt.Query("status") int? status,
       @rt.Query("query") String query);
 
-  @rt.GET("/communityposts/{id}")
+  @rt.GET("/communityposts/{postID}")
   Future<CommunityPost> getCommunityPost(
-      @rt.Header("Cookie") String sessionId, @rt.Path() String id);
+      @rt.Header("Cookie") String sessionId, @rt.Path() String postID);
 
   @rt.POST("/communityposts")
   Future<void> createCommunityPost(
diff --git a/lib/src/api/apiclient.g.dart b/lib/src/api/apiclient.g.dart
index ba05b785..e2ea1300 100644
--- a/lib/src/api/apiclient.g.dart
+++ b/lib/src/api/apiclient.g.dart
@@ -8,8 +8,7 @@ part of 'apiclient.dart';
 
 class _InstiAppApi implements InstiAppApi {
   _InstiAppApi(this._dio, {this.baseUrl}) {
-    // baseUrl ??= 'http://192.168.230.89:8000/api';
-    baseUrl ??= 'https://gymkhana.iitb.ac.in/instiapp/api';
+    baseUrl ??= 'https://2ddd-103-21-126-76.ngrok-free.app/api';
   }
 
   final Dio _dio;

From d367a5bb8a801159be4e06cdf0e108ca15568e94 Mon Sep 17 00:00:00 2001
From: Tarus <taruspande02@gmail.com>
Date: Sun, 1 Oct 2023 20:52:11 +0530
Subject: [PATCH 3/4] multiple communities now visible, moderator issue fixed,
 posts are loading

---
 lib/src/api/apiclient.dart             |  7 ++++---
 lib/src/api/apiclient.g.dart           |  5 +++--
 lib/src/blocs/community_post_bloc.dart | 13 +++++++++----
 lib/src/drawer.dart                    |  2 +-
 lib/src/routes/communitydetails.dart   | 24 +++++++++++++++---------
 lib/src/routes/communitypage.dart      | 10 +++++-----
 6 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/lib/src/api/apiclient.dart b/lib/src/api/apiclient.dart
index a219a510..b46b9921 100644
--- a/lib/src/api/apiclient.dart
+++ b/lib/src/api/apiclient.dart
@@ -336,11 +336,12 @@ abstract class InstiAppApi {
   Future<CommunityPostListResponse> getCommunityPosts(
       @rt.Header("Cookie") String sessionId,
       @rt.Query("status") int? status,
-      @rt.Query("query") String query);
+      @rt.Query("query") String query,
+      @rt.Query("community") String id);
 
-  @rt.GET("/communityposts/{postID}")
+  @rt.GET("/communityposts/{id}")
   Future<CommunityPost> getCommunityPost(
-      @rt.Header("Cookie") String sessionId, @rt.Path() String postID);
+      @rt.Header("Cookie") String sessionId, @rt.Path() String id);
 
   @rt.POST("/communityposts")
   Future<void> createCommunityPost(
diff --git a/lib/src/api/apiclient.g.dart b/lib/src/api/apiclient.g.dart
index e2ea1300..a2f981f9 100644
--- a/lib/src/api/apiclient.g.dart
+++ b/lib/src/api/apiclient.g.dart
@@ -1163,11 +1163,12 @@ class _InstiAppApi implements InstiAppApi {
 
   @override
   Future<CommunityPostListResponse> getCommunityPosts(
-      sessionId, status, query) async {
+      sessionId, status, query, id) async {
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{
       r'status': status,
-      r'query': query
+      r'query': query,
+      r'community': id
     };
     queryParameters.removeWhere((k, v) => v == null);
     final _headers = <String, dynamic>{r'Cookie': sessionId};
diff --git a/lib/src/blocs/community_post_bloc.dart b/lib/src/blocs/community_post_bloc.dart
index b0259738..83ac4c00 100644
--- a/lib/src/blocs/community_post_bloc.dart
+++ b/lib/src/blocs/community_post_bloc.dart
@@ -41,10 +41,15 @@ class CommunityPostBloc {
         bloc.getSessionIdHeader(), post.id!, reaction);
   }
 
-  Future refresh({CPType type = CPType.All}) async {
+  Future refresh({CPType type = CPType.All, required String? id}) async {
     // _communityPosts = defCommunities;
     // _communitySubject.add(defCommunities);
     // print("refresh");
+    if (id == null) {
+      _communitySubject.add([]);
+      return;
+    }
+
     int? status;
     switch (type) {
       case CPType.All:
@@ -60,9 +65,9 @@ class CommunityPostBloc {
         status = null;
         break;
     }
-    _communityPosts = (await bloc.client
-                .getCommunityPosts(bloc.getSessionIdHeader(), status, query))
-            .data ??
+    _communityPosts = (await bloc.client.getCommunityPosts(
+        bloc.getSessionIdHeader(), status, query, id))
+        .data ??
         [];
 
     // print("community" + _communityPosts.toString());
diff --git a/lib/src/drawer.dart b/lib/src/drawer.dart
index 1068eb53..2f3313d7 100644
--- a/lib/src/drawer.dart
+++ b/lib/src/drawer.dart
@@ -164,7 +164,7 @@ class _NavDrawerState extends State<NavDrawer> {
                       ),
                       15: NavListTile(
                         icon: Icons.forum_outlined,
-                        title: "Insight Discussion Forum",
+                        title: "Communities",
                         onTap: () {
                           changeSelection(15, drawerState!);
                           navigateNamed('/groups');
diff --git a/lib/src/routes/communitydetails.dart b/lib/src/routes/communitydetails.dart
index 3628214f..e2273858 100644
--- a/lib/src/routes/communitydetails.dart
+++ b/lib/src/routes/communitydetails.dart
@@ -79,11 +79,11 @@ class _CommunityDetailsState extends State<CommunityDetails> {
         appBarSearchStyle:
             AppBarSearchStyle(hintText: "Search " + (community?.name ?? "")),
         //TODO: Uncomment leading style
-        // leadingStyle: LeadingStyle(
-        //     icon: Icons.arrow_back,
-        //     onPressed: () async {
-        //       Navigator.of(context).pop();
-        //     }),
+        leadingStyle: LeadingStyle(
+            icon: Icons.arrow_back,
+            onPressed: () async {
+              Navigator.of(context).pop();
+            }),
       ),
       drawer: NavDrawer(),
       bottomNavigationBar: MyBottomAppBar(
@@ -496,7 +496,7 @@ class _CommunityPostSectionState extends State<CommunityPostSection> {
 
     if (firstBuild) {
       communityPostBloc.query = "";
-      communityPostBloc.refresh();
+      communityPostBloc.refresh(id: widget.community?.id);
       firstBuild = false;
     }
 
@@ -527,7 +527,9 @@ class _CommunityPostSectionState extends State<CommunityPostSection> {
                               loading = true;
                               cpType = CPType.All;
                             });
-                            await communityPostBloc.refresh(type: CPType.All);
+                            await communityPostBloc.refresh(
+                                type: CPType.All,
+                                id: widget.community?.id);
                             setState(() {
                               loading = false;
                             });
@@ -546,7 +548,8 @@ class _CommunityPostSectionState extends State<CommunityPostSection> {
                               cpType = CPType.YourPosts;
                             });
                             await communityPostBloc.refresh(
-                                type: CPType.YourPosts);
+                                type: CPType.YourPosts,
+                                id: widget.community?.id);
                             setState(() {
                               loading = false;
                             });
@@ -567,7 +570,9 @@ class _CommunityPostSectionState extends State<CommunityPostSection> {
                                     cpType = CPType.PendingPosts;
                                   });
                                   await communityPostBloc.refresh(
-                                      type: CPType.PendingPosts);
+                                      type: CPType.PendingPosts,
+                                      id: widget.community?.id
+                                  );
                                   setState(() {
                                     loading = false;
                                   });
@@ -590,6 +595,7 @@ class _CommunityPostSectionState extends State<CommunityPostSection> {
                                   });
                                   await communityPostBloc.refresh(
                                     type: CPType.ReportedContent,
+                                    id: widget.community?.id,
                                   );
                                   setState(() {
                                     loading = false;
diff --git a/lib/src/routes/communitypage.dart b/lib/src/routes/communitypage.dart
index 087a0fad..27e1fa01 100644
--- a/lib/src/routes/communitypage.dart
+++ b/lib/src/routes/communitypage.dart
@@ -204,11 +204,11 @@ class _CommunityPageState extends State<CommunityPage> {
       //move to next page
 
       if (firstCallBack) {
-        //TODO: Remove this navigation if more than one community
-        WidgetsBinding.instance?.addPostFrameCallback((timeStamp) {
-          Navigator.of(context).pop();
-          CommunityDetails.navigateWith(context, communityBloc, communities[0]);
-        });
+        // //TODO: Remove this navigation if more than one community
+        // WidgetsBinding.instance?.addPostFrameCallback((timeStamp) {
+        //   Navigator.of(context).pop();
+        //   CommunityDetails.navigateWith(context, communityBloc, communities[0]);
+        // });
         firstCallBack = false;
       }
 

From bfd64341fe247c253e51bd99956aa9316ba2c00a Mon Sep 17 00:00:00 2001
From: Krishna-Baldwa <krishnabaldwa1101.com>
Date: Fri, 8 Dec 2023 19:35:06 +0530
Subject: [PATCH 4/4] Fix background-image issue

---
 lib/src/routes/communitypage.dart | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/src/routes/communitypage.dart b/lib/src/routes/communitypage.dart
index 27e1fa01..e5d96089 100644
--- a/lib/src/routes/communitypage.dart
+++ b/lib/src/routes/communitypage.dart
@@ -244,8 +244,7 @@ class _CommunityPageState extends State<CommunityPage> {
               .cover, //I assumed you want to occupy the entire space of the card
           image: community.coverImg != null
               ? CachedNetworkImageProvider(community.coverImg!)
-              : CachedNetworkImageProvider(
-                  "https://devcom-iitb.org/images/logos/DC_logo.png"),
+              : Image.asset('assets/buynsell/DevcomLogo.png').image,
           colorFilter:
               ColorFilter.mode(Colors.black.withOpacity(0.3), BlendMode.darken),
         ),