Merge pull request #173 from COS301-SE-2023/dev

Merge Dev into Main

.github/workflows/main2.yml

@@ -53,6 +53,12 @@ jobs:
         run: flutter test
         working-directory: client
 
+      - name: Decode keystore file
+        env:
+          KEYSTORE: ${{ secrets.KEYSTORE }}
+        run: |
+          echo $KEYSTORE | base64 --decode > /home/runner/work/Koja/Koja/client/android/app/mykey.jks
+
       - name: Build Flutter app
         run: flutter build apk
         working-directory: client

README.md

@@ -5,33 +5,39 @@
 [![Repo Size](https://img.shields.io/github/repo-size/COS301-SE-2023/Koja.svg)](https://github.com/COS301-SE-2023/Koja)
 [![Koja Build Status](https://github.com/COS301-SE-2023/Koja/actions/workflows/main2.yml/badge.svg)](https://github.com/COS301-SE-2023/Koja/actions/workflows/main2.yml)
 
+
+<p align="center">
+  <img src="client/assets/icons/koja.png" alt="Koja Icon" style="height: 200px;">
+</p>
+
 ## Project Description:
 Koja is a system that enables more efficient time utilisation through dynamic and fixed time allocation for specific tasks a user wants to complete. Koja's aim is to minimise solve the burden of schedule management while requiring  minimal effort from the user.
 
+# Advertisement
+https://github.com/COS301-SE-2023/Koja/assets/105129419/1d39ca2c-c081-4534-94d4-7558d399c484
+
 # Documentation
 * [SRSv4](https://www.canva.com/design/DAFm6EdVuUo/d1PDPN7l5k5e_cx3V7UT1A/edit?utm_content=DAFm6EdVuUo&utm_campaign=designshare&utm_medium=link2&utm_source=sharebutton)
 * [Project Board](https://github.com/orgs/COS301-SE-2023/projects/37)
 
-## Demo Videos
-* [Team Caffeine-Demo1](https://drive.google.com/file/d/165ckgDKdO0YbYHQ_8qtw9sJ56FZ6jSGC/view?usp=sharing)
+## Demo Slide & Video
+* [Team Caffeine - Demo Slide](https://www.canva.com/design/DAFuI_vIphg/Ux_tSd2K-evrvKIDnCR8PA/edit?utm_content=DAFuI_vIphg&utm_campaign=designshare&utm_medium=link2&utm_source=sharebutton)
 
-* [Team Caffeine-Demo2](https://www.canva.com/design/DAFmn-ECx6w/1bhJhvtIjHPHMSG7kXUJhA/edit?utmcontent=DAFmn-ECx6w&utm_campaign=designshare&utm_medium=link2&utm_source=sharebutton)
+* [Team Caffeine - Demo Video](https://drive.google.com/file/d/1HWAUgzdQUKvIi33rHqagadPkk6OxEqA-/view?usp=drive_link)
 
-* [Team Caffeine-Demo3](https://www.canva.com/design/DAFoP47g3sw/_QjN9Yd8liAkDbpPl9SBhg/edit?utm_content=DAFoP47g3sw&utm_campaign=designshare&utm_medium=link2&utm_source=sharebutton)
-
-* [Team Caffeine-Demo4](https://www.canva.com/design/DAFuI_vIphg/Ux_tSd2K-evrvKIDnCR8PA/edit?utm_content=DAFuI_vIphg&utm_campaign=designshare&utm_medium=link2&utm_source=sharebutton)
 
 ## Additional Documentations
 * [Technical Installation Manual](https://docs.google.com/document/d/1pdzUM2YM_lkqxtvTfs2MToCcu3zSB6QwQbP5pfhyjHk/edit?usp=sharing)
 
 * [User Manual](https://docs.google.com/presentation/d/1cPbn8JxNLQUwRQt_2Euw9KsLvmQ2d15Y-28ukS4Yh1A/edit?usp=drive_link)
 
-* [Contributions](https://docs.google.com/document/d/1OVnDnd-1888-pUsX0dXAO_8Iy7R1oDDPmhMQqGZD8TI/edit?usp=sharing)
-
 * [Coding Standards](https://docs.google.com/document/d/1jZFns50dd7gQlAGJpq--38faijdhuxrOiWK_JtvKXQI/edit?usp=sharing)
 
 * [Architectural Design](https://docs.google.com/document/d/1hVQcrOcnCRzHyd9Y-aXYuAfyRZxVVZTiJyluJbr_0RY/edit?usp=sharing)
 
+* [Testing Policy Document](https://docs.google.com/document/d/10JTOApaAbRHdl4zoTkm39UPMgZYwPrVCrqgX5lBN5EA/edit?usp=sharing)
+# Technologies
+* Flutter, SpringBoot, Kotlin, Amazon RDS, Amazon DynamoDB
 # Team
 📧 Team email: [[email protected]](mailto:[email protected])
 

client/analysis_options.yaml

@@ -1,6 +1,3 @@
-
-include: package:lints/recommended.yaml
-
 linter:
   rules:
     avoid_print: true

client/android/app/build.gradle

@@ -45,7 +45,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.client"
+        applicationId "com.teamcaffeine.koja"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion 21
@@ -67,7 +67,7 @@ android {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            // signingConfig signingConfigs.debug
+             signingConfig signingConfigs.debug
         }
 
         debug{

client/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
-        android:label="client"
+        android:label="Koja"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -23,13 +23,18 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            <intent-filter android:label="flutter_web_auth_2    ">
+        </activity>
+        <activity
+            android:name="com.linusu.flutter_web_auth_2.CallbackActivity"
+            android:exported="true">
+            <intent-filter android:label="flutter_web_auth_2">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="koja-login-callback" />
             </intent-filter>
         </activity>
+
 
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

client/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

client/android/app/src/main/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#6B1DE2</color>
+</resources>

client/ios/Runner/Info.plist

@@ -7,15 +7,15 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Client</string>
+	<string>Koja</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>client</string>
+	<string>Koja</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

client/lib/Utils/environment_variable_constants.dart

@@ -1,20 +1,5 @@
 class EnvironmentVariableConstant {
-  static const String kojaAwsRdsDatabaseUrl = "KOJA_AWS_RDS_DATABASE_URL";
-  static const String kojaAwsRdsDatabaseAdminUsername = "KOJA_AWS_RDS_DATABASE_ADMIN_USERNAME";
-  static const String kojaAwsRdsDatabaseAdminPassword = "KOJA_AWS_RDS_DATABASE_ADMIN_PASSWORD";
-  static const String kojaAwsDynamodbAccessKeyId = "KOJA_AWS_DYNAMODB_ACCESS_KEY_ID";
-  static const String kojaAwsDynamodbAccessKeySecret = "KOJA_AWS_DYNAMODB_ACCESS_KEY_SECRET";
-  static const String googleClientId = "GOOGLE_CLIENT_ID";
-  static const String googleClientSecret = "GOOGLE_CLIENT_SECRET";
-  static const String googleMapsApiKey = "GOOGLE_MAPS_API_KEY";
-  static const String kojaJwtSecret = "KOJA_JWT_SECRET";
-  static const String openaiApiKey = "OPENAI_API_KEY";
-  static const String kojaIdSecret = "KOJA_ID_SECRET";
-  static const String coverallsRepoToken = "COVERALLS_REPO_TOKEN";
-  static const String kojaPrivateKeyPass = "KOJA_PRIVATE_KEY_PASS";
-  static const String kojaPrivateKeySalt = "KOJA_PRIVATE_KEY_SALT";
-  static const String aiPrivateKeyPass = "AI_PRIVATE_KEY_PASS";
-  static const String aiPrivateKeySalt = "AI_PRIVATE_KEY_SALT";
-  static const String serverAddress = "SERVER_ADDRESS";
-  static const String serverPort = "SERVER_PORT";
+  static const String googleMapsApiKey = "koja_google_maps_api_key";
+  static const String serverAddress = "koja_server_address";
+  static const String serverPort = "koja_server_port";
 }

client/lib/providers/service_provider.dart

@@ -158,7 +158,7 @@ class ServiceProvider with ChangeNotifier {
   }
 
   /// This function will attempt to add another email using UserAccountController
-  Future<bool> addEmail({required ContextProvider eventProvider}) async {
+  Future<bool?> addEmail({required ContextProvider eventProvider}) async {
     final String authUrl =
         '$_serverAddress:$_serverPort/api/v1/user/auth/add-email/google?token=$_accessToken';
 
@@ -169,11 +169,16 @@ class ServiceProvider with ChangeNotifier {
       callbackUrlScheme: callbackUrlScheme,
     );
 
-    response = Uri.parse(response).queryParameters['token'];
+    final parsedResponse = Uri.parse(response).queryParameters;
 
-    setAccessToken(response, eventProvider);
-
-    return accessToken != null;
+    if(parsedResponse.containsKey("token")) {
+      setAccessToken(parsedResponse["token"], eventProvider);
+      return true;
+    }
+    else if(parsedResponse.containsKey("error"))
+    {
+      return null;
+    } else return false;
   }
 
   /// This function will attempt to delete an email from the user's account

client/lib/screens/suggestions_screens.dart

@@ -3,6 +3,7 @@ import 'package:koja/Utils/event_util.dart';
 import 'package:koja/providers/context_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:syncfusion_flutter_calendar/calendar.dart';
+import 'package:lottie/lottie.dart';
 
 import '../providers/service_provider.dart';
 import '../widgets/calendar_widget.dart';
@@ -125,8 +126,34 @@ class _SuggestionsTasksScreenState extends State<SuggestionsTasksScreen> {
           }
           else
           {
+            // return Center(
+            //   child: Text('Koja\'s suggestion engine is still learning.\nPlease try again soon.'),
+            // );
             return Center(
-              child: Text('Koja\'s suggestion engine is still learning.\nPlease try again soon.'),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Container(
+                    alignment: Alignment.center,
+                    child: Lottie.asset(
+                      'assets/animations/ai.json',
+                      height: 200,
+                      width: 300,
+                      repeat: false,
+                    ),
+                  ),
+                  Center(
+                    child: Text(
+                      'Koja\'s suggestion engine is still learning.\nPlease try again soon.',
+                      style: TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.w500,
+                          fontFamily: 'Raleway'),
+                           textAlign: TextAlign.center,
+                    ),
+                  ),
+                ],
+              ),
             );
           }
         }

client/lib/widgets/about_us_widget.dart

@@ -53,7 +53,7 @@ class AboutUsWidget extends StatelessWidget {
               ],
             ),
           ),
-          Text("Version 0.0.4",
+          Text("Version 1.0.0",
             style: GoogleFonts.ubuntu(
               fontSize: 14,
               fontWeight: FontWeight.w400,

client/lib/widgets/add_email_widget.dart

@@ -27,22 +27,33 @@ class _AddEmailModalState extends State<AddEmailModal> {
           children: [
             ElevatedButton(
                 onPressed: () async {
-                  if (await serviceProvider.addEmail(
-                      eventProvider: eventProvider)) {
+                  final addResult = await serviceProvider.addEmail(
+                      eventProvider: eventProvider
+                  );
+                  if (addResult != null && addResult) {
                     Navigator.pop(context);
                     ScaffoldMessenger.of(context).showSnackBar(
                       const SnackBar(
                         content: Text('Email was added'),
                       ),
                     );
-                  } else {
+                  } else if(addResult != null && !addResult) {
                     Navigator.pop(context);
                     ScaffoldMessenger.of(context).showSnackBar(
                       const SnackBar(
                         content: Text('Email was not added'),
                       ),
                     );
                   }
+                  else
+                  {
+                    Navigator.pop(context);
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      const SnackBar(
+                        content: Text('Not added - User email already added'),
+                      ),
+                    );
+                  }
                 },
                 child: const SizedBox(
                   height: 30,

client/lib/widgets/event_editing_widget.dart

@@ -582,7 +582,7 @@ class EventEditingState extends State<EventEditing> {
       final date = await showDatePicker(
         context: context,
         initialDate: initialDate,
-        firstDate: DateTime(initialDate.year - 5),
+        firstDate: DateTime.now(),
         lastDate: DateTime(initialDate.year + 10),
       );
 

client/lib/widgets/tasks_widget.dart

@@ -63,6 +63,7 @@ class TasksWidgetState extends State<TasksWidget> {
               'assets/animations/empty.json',
               height: 200,
               width: 300,
+              repeat: false,
             ),
           ),
         ],