Merge branch 'master' of https://github.com/DevCom-IITB/instiapp-flutter

 into new_mess_qr

.env

@@ -0,0 +1 @@
+KEY="Enter KEY Here";

.github/workflows/fortify.yml

@@ -0,0 +1,98 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+################################################################################################################################################
+# Fortify lets you build secure software fast with an appsec platform that automates testing throughout the DevSecOps pipeline. Fortify static,#
+# dynamic, interactive, and runtime security testing is available on premises or as a service. To learn more about Fortify, start a free trial #
+# or contact our sales team, visit microfocus.com/appsecurity.                                                                                 #
+#                                                                                                                                              #
+# Use this workflow template as a basis for integrating Fortify on Demand Static Application Security Testing(SAST) into your GitHub workflows.#
+# This template demonstrates the steps to prepare the code+dependencies, initiate a scan, download results once complete and import into       #
+# GitHub Security Code Scanning Alerts. Existing customers should review inputs and environment variables below to configure scanning against  #
+# an existing application in your Fortify on Demand tenant. Additional information is available in the comments throughout the workflow, the   #
+# documentation for the Fortify actions used, and the Fortify on Demand / ScanCentral Client product documentation. If you need additional     #
+# assistance with configuration, feel free to create a help ticket in the Fortify on Demand portal.                                            #
+################################################################################################################################################
+
+name: Fortify on Demand Scan
+
+# TODO: Customize trigger events based on your DevSecOps processes and typical FoD SAST scan time
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "master" ]
+  schedule:
+    - cron: '28 12 * * 1'
+
+jobs:
+  FoD-SAST-Scan:
+    # Use the appropriate runner for building your source code.
+    # TODO: Use a Windows runner for .NET projects that use msbuild. Additional changes to RUN commands will be required to switch to Windows syntax.
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+      # Check out source code
+      - name: Check Out Source Code
+        uses: actions/checkout@v3
+
+      # Java is required to run the various Fortify utilities.
+      # When scanning a Java application, please use the appropriate Java version for building your application.
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: 8
+          distribution: 'temurin'
+
+      # Prepare source+dependencies for upload. The default example is for a Maven project that uses pom.xml.
+      # TODO: Update PACKAGE_OPTS based on the ScanCentral Client documentation for your project's included tech stack(s). Helpful hints:
+      #   ScanCentral Client will download dependencies for maven (-bt mvn) and gradle (-bt gradle).
+      #   ScanCentral Client can download dependencies for msbuild projects (-bt msbuild); however, you must convert the workflow to use a Windows runner.
+      #   ScanCentral has additional options that should be set for PHP and Python projects
+      #   For other build tools, add your build commands to download necessary dependencies and prepare according to Fortify on Demand Packaging documentation.
+      #   ScanCentral Client documentation is located at https://www.microfocus.com/documentation/fortify-software-security-center/
+      - name: Download Fortify ScanCentral Client
+        uses: fortify/gha-setup-scancentral-client@5b7382f8234fb9840958c49d5f32ae854115f9f3
+      - name: Package Code + Dependencies
+        run: scancentral package $PACKAGE_OPTS -o package.zip
+        env:
+          PACKAGE_OPTS: "-bt mvn"
+
+      # Start Fortify on Demand SAST scan and wait until results complete. For more information on FoDUploader commands, see https://github.com/fod-dev/fod-uploader-java
+      # TODO: Update ENV variables for your application and create the necessary GitHub Secrets.  Helpful hints:
+      #   Credentials and release ID should be obtained from your FoD tenant (either Personal Access Token or API Key can be used).
+      #   Automated Audit preference should be configured for the release's Static Scan Settings in the Fortify on Demand portal.
+      - name: Download Fortify on Demand Universal CI Tool
+        uses: fortify/gha-setup-fod-uploader@6e6bb8a33cb476e240929fa8ebc739ff110e7433
+      - name: Perform SAST Scan
+        run: java -jar $FOD_UPLOAD_JAR -z package.zip -aurl $FOD_API_URL -purl $FOD_URL -rid "$FOD_RELEASE_ID" -tc "$FOD_TENANT" -uc "$FOD_USER" "$FOD_PAT" $FOD_UPLOADER_OPTS -n "$FOD_UPLOADER_NOTES"
+        env:
+          FOD_URL: "https://ams.fortify.com/"
+          FOD_API_URL: "https://api.ams.fortify.com/"
+          FOD_TENANT: ${{ secrets.FOD_TENANT }}
+          FOD_USER: ${{ secrets.FOD_USER }}
+          FOD_PAT: ${{ secrets.FOD_PAT }}
+          FOD_RELEASE_ID: ${{ secrets.FOD_RELEASE_ID }}
+          FOD_UPLOADER_OPTS: "-ep 2 -pp 0 -I 1 -apf"
+          FOD_UPLOADER_NOTES: 'Triggered by GitHub Actions (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})'
+
+      # Once scan completes, pull SAST issues from Fortify on Demand and generate SARIF output.
+      - name: Export results to GitHub-optimized SARIF
+        uses: fortify/gha-export-vulnerabilities@fcb374411cff9809028c911dabb8b57dbdae623b
+        with:
+          fod_base_url: "https://ams.fortify.com/"
+          fod_tenant: ${{ secrets.FOD_TENANT }}
+          fod_user: ${{ secrets.FOD_USER }}
+          fod_password: ${{ secrets.FOD_PAT }}
+          fod_release_id: ${{ secrets.FOD_RELEASE_ID }}
+
+      # Import Fortify on Demand results to GitHub Security Code Scanning
+      - name: Import Results
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: ./gh-fortify-sast.sarif

.gitignore

@@ -9,6 +9,7 @@
 .buildlog/
 .history
 .svn/
+*.env
 
 # IntelliJ related
 *.iml

Changelog.md

@@ -2,6 +2,25 @@
 
 ## Unreleased
 
+## 2.4.1
+
+- Move map page outside utilities
+- Implement deep links for map page
+- Fix Android 11+ url open issue
+- Remove Google Maps library (due to iOS limitations)
+
+## 2.4.0
+
+- Implement Buy and Sell
+
+## 2.3.0
+
+- Revert 5 year b'day changes
+
+## 2.2.2 (reverted)
+
+- 5 year b'day changes
+
 ## v2.2.1
 
 - Add a comment in Mess Menu page for hostel councils

README.md

@@ -14,11 +14,12 @@ For help getting started with Flutter, view online
 ## Getting Started
 
 1. Follow instructions at [Flutter Website](https://flutter.io/) to download and setup flutter and its dependencies
-2. Clone this repo
-3. Run `flutter packages get` to get all the dependency packages
-4. Run `flutter packages pub run build_runner build --delete-conflicting-outputs` to generate code for JSON Serailizing and Retrofit ApiClient
-5. Run `flutter run` to run the app on any device/simulator/emulator.
-6. \[_Optional but recommended_\] Use either Visual Studio Code or Android Studio to code/debug.
+2. We use Flutter version 2.10.5
+3. Clone this repo
+4. Run `flutter packages get` to get all the dependency packages
+5. Run `flutter packages pub run build_runner build --delete-conflicting-outputs` to generate code for JSON Serializing and Retrofit ApiClient
+6. Run `flutter run` to run the app on any device/simulator/emulator.
+7. \[_Optional but recommended_\] Use either Visual Studio Code or Android Studio to code/debug.
 
 ## pod install error on M1 mac
 

android/app/build.gradle

@@ -43,9 +43,9 @@ android {
     defaultConfig {
         applicationId "app.insti.flutter"
         minSdkVersion 26
-        targetSdkVersion 31
-        versionCode 25
-        versionName "2.2.1"
+        targetSdkVersion 33
+        versionCode 32
+        versionName "2.4.4"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

android/app/src/main/AndroidManifest.xml

@@ -17,6 +17,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.WRITE_CALENDAR" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application android:icon="@mipmap/ic_launcher_round"
         android:label="InstiApp"
@@ -96,6 +97,7 @@
                 <data android:scheme="https" />
                 <data android:host="www.insti.app" />
             </intent-filter>
+
             <!-- <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
 
@@ -131,4 +133,12 @@
         </activity>
     </application>
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https" />
+        </intent>
+    </queries>
+
 </manifest>

assets/login/login.html

@@ -83,7 +83,7 @@
       line-height: 1.7em;
       border-radius: 4px;
       font-size: 1.05em;
-      padding: 6px 28%;
+      text-align: center;
       /* background-color: rgb(129, 180, 243); */
     }
 
@@ -95,6 +95,22 @@
       background-color: rgb(255, 215, 64);
       text-decoration: none;
     }
+
+    .loading-circle {display: none;
+      border: 4px solid rgba(255, 255, 255, 0.3);
+      border-top: 4px solid rgb(255, 215, 64);
+      border-radius: 50%;
+      width: 40px;
+      height: 40px;
+      animation: spin 1s linear infinite;
+      margin: 0 auto;
+      margin-top: 10px;
+    }
+
+    @keyframes spin {
+      0% { transform: rotate(0deg); }
+      100% { transform: rotate(360deg); }
+    }
   </style>
 </head>
 
@@ -106,14 +122,15 @@
 
   <div class="lowerdiv">
     <div class="logindiv">
-      <a class="login"
-        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"> -->
-        <!-- href="https://gymkhana.iitb.ac.in/sso/account/login/?next=/sso/oauth/authorize/%3Fclient_id%3Dl3Scj8qKuIRqOg7eaAy54tC8AkEd03Hb9oss8gv7%26response_type%3Dcode%26scope%3Dbasic%2520profile%2520picture%2520sex%2520ldap%2520phone%2520insti_address%2520program%2520secondary_emails%26redirect_uri=https://redirecturi"> -->
+      <a class="login" id="loginLink" onclick="showLoading()"
+      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"> -->
+      <!-- href="https://gymkhana.iitb.ac.in/sso/account/login/?next=/sso/oauth/authorize/%3Fclient_id%3Dl3Scj8qKuIRqOg7eaAy54tC8AkEd03Hb9oss8gv7%26response_type%3Dcode%26scope%3Dbasic%2520profile%2520picture%2520sex%2520ldap%2520phone%2520insti_address%2520program%2520secondary_emails%26redirect_uri=https://redirecturi"> -->
         LOG IN VIA SSO
       </a>
+      <div class="loading-circle" id="loadingSpinner"></div>
       <br><br>
       or
       <br><br>
@@ -128,6 +145,23 @@
       </a>
     </div>
   </div>
+  <script>
+  function showLoading() {
+  var loginLink = document.querySelector(".login");
+  var loadingCircle = document.querySelector(".loading-circle");
+
+  loginLink.style.display = "none";
+  loadingCircle.style.display = "block";
+
+
+  setTimeout(function () {
+    loginLink.style.display = "inline";
+    loadingCircle.style.display = "none";
+  }, 5000);
+}
+
+  </script>
+
 </body>
 
 </html>

assets/login/login_dark.html

@@ -4,6 +4,7 @@
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <style>
+
         a {
             -webkit-tap-highlight-color: transparent;
             -webkit-touch-callout: none;
@@ -83,7 +84,7 @@
             line-height: 1.7em;
             border-radius: 4px;
             font-size: 1.05em;
-            padding: 6px 28%;
+            text-align: center;
             /* background-color: rgb(129, 180, 243); */
         }
 
@@ -100,6 +101,21 @@
             background-color: black;
             color: white;
         }
+        .loading-circle {display: none;
+      border: 4px solid rgba(255, 255, 255, 0.3);
+      border-top: 4px solid #0028BF;
+      border-radius: 50%;
+      width: 40px;
+      height: 40px;
+      animation: spin 1s linear infinite;
+      margin: 0 auto;
+      margin-top: 10px;
+    }
+
+    @keyframes spin {
+      0% { transform: rotate(0deg); }
+      100% { transform: rotate(360deg); }
+    }
     </style>
 </head>
 
@@ -112,12 +128,14 @@
 
     <div class="lowerdiv">
         <div class="logindiv">
-            <a class="login"
+            <a class="login" onclick="showLoading()"
                 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=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
             </a>
+            <div class="loading-circle" id="loadingSpinner"></div>
             <br><br>
             or
             <br><br>
@@ -132,6 +150,22 @@
             </a>
         </div>
     </div>
+    <script>
+  function showLoading() {
+  var loginLink = document.querySelector(".login");
+  var loadingCircle = document.querySelector(".loading-circle");
+
+  loginLink.style.display = "none";
+  loadingCircle.style.display = "block";
+
+
+  setTimeout(function () {
+    loginLink.style.display = "inline";
+    loadingCircle.style.display = "none";
+  }, 5000);
+}
+
+  </script>
 </body>
 
 </html>

ios/GoogleService-Info.plist

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>259853447628-c8oqskpps37cp7utc9eg66cfverl1uou.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.259853447628-c8oqskpps37cp7utc9eg66cfverl1uou</string>
+	<key>ANDROID_CLIENT_ID</key>
+	<string>259853447628-6hcftl72mg4ku9qvigs89f2etit8096f.apps.googleusercontent.com</string>
+	<key>API_KEY</key>
+	<string>AIzaSyBh5H5f1gSyCjV7Gp3UnKAsT8ORR3IpMcY</string>
+	<key>GCM_SENDER_ID</key>
+	<string>259853447628</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>app.instiapp.flutter</string>
+	<key>PROJECT_ID</key>
+	<string>astral-theory-207617</string>
+	<key>STORAGE_BUCKET</key>
+	<string>astral-theory-207617.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:259853447628:ios:9e225f255f93748e70ed69</string>
+	<key>DATABASE_URL</key>
+	<string>https://astral-theory-207617.firebaseio.com</string>
+</dict>
+</plist>