Merge pull request #578 from bounswe/feature/MB/469/mobile-user-profi…

…le-page #469 mobile-user-profile-page
bounswe · Nov 27, 2023 · b94a2fb · b94a2fb
2 parents 13feba4 + be3568c
commit b94a2fb
Show file tree

Hide file tree

Showing 17 changed files with 642 additions and 38 deletions.
diff --git a/ludos/mobile/assets/images/Epic-Games-Emblem.png b/ludos/mobile/assets/images/Epic-Games-Emblem.png
diff --git a/ludos/mobile/assets/images/ealogo800.jpg b/ludos/mobile/assets/images/ealogo800.jpg
diff --git a/ludos/mobile/assets/images/steam-logo-black-transparent.png b/ludos/mobile/assets/images/steam-logo-black-transparent.png
diff --git a/ludos/mobile/ios/Flutter/Debug.xcconfig b/ludos/mobile/ios/Flutter/Debug.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/ludos/mobile/ios/Flutter/Release.xcconfig b/ludos/mobile/ios/Flutter/Release.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/ludos/mobile/ios/Podfile b/ludos/mobile/ios/Podfile
@@ -0,0 +1,44 @@
+# Uncomment this line to define a global platform for your project
+# platform :ios, '11.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_ios_build_settings(target)
+  end
+end
diff --git a/ludos/mobile/lib/edit_game_second.dart b/ludos/mobile/lib/edit_game_second.dart
@@ -383,6 +383,7 @@ class _EditGamePageStateSecond extends State<EditGamePageSecond> {
                                     context,
                                     MaterialPageRoute(
                                         builder: (context) => GamePage(
+                                              onRefresh: () {},
                                               id: widget.id,
                                               token: widget.token,
                                               userProvider: widget.userProvider,
@@ -397,6 +398,7 @@ class _EditGamePageStateSecond extends State<EditGamePageSecond> {
                                 context,
                                 MaterialPageRoute(
                                     builder: (context) => GamePage(
+                                          onRefresh: () {},
                                           id: widget.id,
                                           token: widget.token,
                                           userProvider: widget.userProvider,

diff --git a/ludos/mobile/lib/game_page.dart b/ludos/mobile/lib/game_page.dart
@@ -18,15 +18,11 @@ import 'login_page.dart';
 import 'main.dart';
 
 class GamePage extends StatefulWidget {
+  final VoidCallback onRefresh;
   final UserProvider userProvider;
   final String? token;
   final String id;
-  const GamePage(
-      {required this.id,
-      required this.token,
-      Key? key,
-      required this.userProvider})
-      : super(key: key);
+  const GamePage({required this.id, required this.token, Key? key, required this.userProvider, required this.onRefresh}) : super(key: key);
   @override
   State<GamePage> createState() => _GamePageState();
 }
@@ -455,32 +451,34 @@ class _GamePageState extends State<GamePage> {
                               ),
                             ),
                           )
-                          .closed
-                          .then((reason) => {});
-                    } else {
-                      bool state = false;
-                      Future<bool> executeAsyncActions() async {
-                        bool state = false;
-                        try {
-                          if (followState) {
-                            http.Response token = await APIService()
-                                .unfollowGame(widget.token, widget.id);
-                            if (token.statusCode == 200) {
-                              state = false;
-                              print("Unfollowed");
+                              .closed
+                              .then((reason) => {});
+                        }else{
+                          bool state = false;
+                          Future<bool> executeAsyncActions() async {
+                            bool state = false;
+                          try {
+                            if (followState) {
+                              http.Response token = await APIService()
+                                  .unfollowGame(widget.token, widget.id);
+                              if (token.statusCode == 200) {
+                                state = false;
+                                widget.onRefresh();
+                                print("Unfollowed");
+                              } else {
+                                print("Error: ${token.statusCode}");
+                              }
                             } else {
-                              print("Error: ${token.statusCode}");
+                              http.Response token = await APIService().followGame(
+                                  widget.token, widget.id);
+                              if (token.statusCode == 200) {
+                                state = true;
+                                widget.onRefresh();
+                                print("Followed");
+                              } else {
+                                print("Error: ${token.statusCode}");
+                              }
                             }
-                          } else {
-                            http.Response token = await APIService()
-                                .followGame(widget.token, widget.id);
-                            if (token.statusCode == 200) {
-                              state = true;
-                              print("Followed");
-                            } else {
-                              print("Error: ${token.statusCode}");
-                            }
-                          }
                         } catch (error) {
                           print("Error: $error");
                         }
@@ -684,6 +682,7 @@ class _GamePageState extends State<GamePage> {
                                       context,
                                       MaterialPageRoute(
                                           builder: (context) => GamePage(
+                                              onRefresh: widget.onRefresh,
                                               token: widget.token,
                                               userProvider: widget.userProvider,
                                               id: widget.id)),
@@ -697,6 +696,7 @@ class _GamePageState extends State<GamePage> {
                                   context,
                                   MaterialPageRoute(
                                       builder: (context) => GamePage(
+                                          onRefresh: widget.onRefresh,
                                           token: widget.token,
                                           userProvider: widget.userProvider,
                                           id: widget.id)),

diff --git a/ludos/mobile/lib/helper/APIService.dart b/ludos/mobile/lib/helper/APIService.dart
@@ -191,6 +191,14 @@ class APIService {
     });
     return response;
   }
+  Future<http.Response> userById(String? authToken, String userID) async {
+    var uri = Uri.parse("$baseURL/user/byId/$userID");
+    final response = await http.get(uri, headers: {
+      'content-type': "application/json",
+      'Authorization': 'Bearer $authToken'
+    });
+    return response;
+  }
 
   Future<Map<String, dynamic>> getGame(String id, String? authToken) async {
     var uri = Uri.parse("$baseURL/game/$id");

diff --git a/ludos/mobile/lib/main.dart b/ludos/mobile/lib/main.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:ludos_mobile_app/change_password.dart';
+import 'package:ludos_mobile_app/user_profile_page.dart';
 import 'package:ludos_mobile_app/reusable_widgets/forum_thread.dart';
 import 'package:ludos_mobile_app/reusable_widgets/home_game_sum.dart';
 import 'helper/APIService.dart';
@@ -113,9 +114,63 @@ class _HomeState extends State<Home> {
                       const TextStyle(color: MyColors.darkBlue), // Text color
                 ),
                 accountEmail: null,
-                currentAccountPicture: const CircleAvatar(
-                  backgroundColor: MyColors.white,
-                  child: Icon(Icons.person),
+                currentAccountPicture: ElevatedButton(
+                  style: ElevatedButton.styleFrom(
+                    elevation: 15.0,
+                    backgroundColor: MyColors.white,
+                    shape: const CircleBorder(),
+                    padding: const EdgeInsets.all(0.0),
+                  ),
+                  child: const CircleAvatar(
+                    backgroundColor: MyColors.white,
+                    child: Icon(Icons.person),
+                  ),
+                  onPressed: () {
+                    if(userProvider.isLoggedIn){
+                      Navigator.of(context).push(MaterialPageRoute(
+                        builder: (context) => UserProfilePage(userProvider: userProvider, id: userProvider.username),
+                      ));
+                    }
+                    else{
+                      Navigator.pop(context);
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        SnackBar(
+                          content: const Row(
+                            children: [
+                              Icon(Icons.error, color: MyColors.blue),
+                              SizedBox(width: 8),
+                              Expanded(
+                                child: Text(
+                                  'Please log in to view profile page',
+                                  style: TextStyle(
+                                    color: MyColors.blue,
+                                    fontSize: 16,
+                                  ),
+                                ),
+                              ),
+                            ],
+                          ),
+                          backgroundColor: MyColors.blue2,
+                          duration: const Duration(seconds: 5),
+                          action: SnackBarAction(
+                            label: 'Log In',
+                            textColor: MyColors.blue,
+                            onPressed: () {
+                              ScaffoldMessenger.of(context)
+                                  .hideCurrentSnackBar();
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                    builder: (context) => LoginPage()),
+                              );
+                            },
+                          ),
+                        ),
+                      )
+                          .closed
+                          .then((reason) => {});
+                    }
+                  },
                 ),
                 decoration: const BoxDecoration(
                   color: MyColors.blue, // Header background color

diff --git a/ludos/mobile/lib/reusable_widgets/forum_thread.dart b/ludos/mobile/lib/reusable_widgets/forum_thread.dart
@@ -219,7 +219,9 @@ class _ThreadSummaryState extends State<ThreadSummary> {
                             builder: (context) => GamePage(
                                 id: gameId,
                                 token: widget.token,
-                                userProvider: widget.userProvider),
+                                userProvider: widget.userProvider,
+                                onRefresh: () {},
+                            ),
                           ),
                         );
                       },

diff --git a/ludos/mobile/lib/reusable_widgets/game_summary.dart b/ludos/mobile/lib/reusable_widgets/game_summary.dart
@@ -95,7 +95,12 @@ class _GameSummaryState extends State<GameSummary> {
             Navigator.push(
               context,
               MaterialPageRoute(
-                builder: (context) => GamePage(id: id, token: token, userProvider: userProvider),
+                builder: (context) => GamePage(
+                    id: id,
+                    token: token,
+                    userProvider: userProvider,
+                    onRefresh: () {},
+                ),
               ),
             );
 

diff --git a/ludos/mobile/lib/reusable_widgets/home_game_sum.dart b/ludos/mobile/lib/reusable_widgets/home_game_sum.dart
@@ -73,7 +73,7 @@ class _HomeGameSumState extends State<HomeGameSum> {
             Navigator.push(
               context,
               MaterialPageRoute(
-                builder: (context) => GamePage(id: id, token: token, userProvider: userProvider),
+                builder: (context) => GamePage(id: id, token: token, userProvider: userProvider,  onRefresh: () {}),
               ),
             );
             // Handle button press for the specific game

diff --git a/ludos/mobile/lib/thread_page.dart b/ludos/mobile/lib/thread_page.dart
@@ -234,7 +234,9 @@ class _ThreadPageState extends State<ThreadPage>
                                       builder: (context) => GamePage(
                                           id: threadData['game']['id'],
                                           token: widget.token,
-                                          userProvider: widget.userProvider),
+                                          userProvider: widget.userProvider,
+                                          onRefresh: (){},
+                                      ),
                                     ),
                                   );
                                 },