"Update profile page title, refactor login function names, and add user logout functionality"

lib/components/profile_about_me_card.dart → lib/components/profile/about_me_card.dart

@@ -1,11 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:langx_flutter/components/info_svg.dart';
-import 'package:langx_flutter/components/country_svg.dart';
-import 'package:langx_flutter/components/gender_svg.dart';
-import 'package:langx_flutter/components/calendar_svg.dart';
-import 'package:langx_flutter/components/clock_svg.dart';
-import 'package:langx_flutter/components/at_sign_svg.dart';
-import 'package:langx_flutter/components/shield_svg.dart';
+
+// Components Import
+import 'package:langx_flutter/assets/svg/info_svg.dart';
+import 'package:langx_flutter/assets/svg/country_svg.dart';
+import 'package:langx_flutter/assets/svg/gender_svg.dart';
+import 'package:langx_flutter/assets/svg/calendar_svg.dart';
+import 'package:langx_flutter/assets/svg/clock_svg.dart';
+import 'package:langx_flutter/assets/svg/at_sign_svg.dart';
+import 'package:langx_flutter/assets/svg/shield_svg.dart';
 
 class ProfileAboutMeCard extends StatelessWidget {
   final String country;

lib/components/profile_day_streaks_card.dart → lib/components/profile/day_streaks_card.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:langx_flutter/components/info_svg.dart';
+
+// Components Imports
+import 'package:langx_flutter/assets/svg/info_svg.dart';
 
 class ProfileDayStreaksCard extends StatelessWidget {
   final String imgUrl;

lib/components/profile_mother_tongues_card.dart → lib/components/profile/mother_tongues_card.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:langx_flutter/components/word_svg.dart';
+
+// Components Imports
+import 'package:langx_flutter/assets/svg/word_svg.dart';
 
 class MotherTonguesCard extends StatelessWidget {
   final List<String> languages;

lib/components/profile_others_card.dart → lib/components/profile/others_card.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:langx_flutter/components/people_svg.dart';
-import 'package:langx_flutter/components/eye_svg.dart';
+
+// Components Imports
+import 'package:langx_flutter/assets/svg/people_svg.dart';
+import 'package:langx_flutter/assets/svg/eye_svg.dart';
 
 class OthersCard extends StatelessWidget {
   const OthersCard({

lib/components/profile_study_languages_card.dart → lib/components/profile/study_languages_card.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:langx_flutter/components/battery_svg.dart';
+
+// Components Imports
+import 'package:langx_flutter/assets/svg/battery_svg.dart';
 
 class StudyLanguagesCard extends StatelessWidget {
   final List<String> languages;

lib/components/profile_token_card.dart → lib/components/profile/token_card.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:langx_flutter/components/trophy_svg.dart';
-import 'package:langx_flutter/components/info_svg.dart';
+
+// Components Imports
+import 'package:langx_flutter/assets/svg/trophy_svg.dart';
+import 'package:langx_flutter/assets/svg/info_svg.dart';
 
 class ProfileTokenCard extends StatelessWidget {
   final String imgUrl;

lib/main.dart

@@ -1,27 +1,73 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
-//import 'package:langx_flutter/pages/login/login.dart';
+
+// Themes Import
 import 'package:langx_flutter/theme.dart';
 
+// Pages Import
+import 'package:langx_flutter/pages/login/login.dart';
 import 'package:langx_flutter/pages/home/home.dart';
 
+// Providers Import
+import 'package:langx_flutter/providers/auth_provider.dart';
+
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await dotenv.load(fileName: ".env");
 
-  runApp(const Main());
+  runApp(
+    const ProviderScope(
+      child: Main(),
+    ),
+  );
 }
 
-class Main extends StatelessWidget {
+class Main extends ConsumerWidget {
   const Main({super.key});
+
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final authStatus = ref.watch(authProvider);
+    final authNotifier = ref.read(authProvider.notifier);
+
     return MaterialApp(
       theme: whiteTheme(),
       darkTheme: darkTheme(),
-//      home: const LoginScreen(),
-      home: const Home(),
-      // home: const Home(),
+      home: Scaffold(
+        body: Builder(
+          builder: (context) {
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              if (authNotifier.errorMessage != null) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(content: Text(authNotifier.errorMessage!)),
+                );
+                authNotifier
+                    .clearErrorMessage(); // Clear the error message after displaying it
+              }
+            });
+
+            return authStatus == AuthStatus.loading
+                ? const SplashScreen()
+                : authStatus == AuthStatus.authenticated
+                    ? const Home()
+                    : const LoginScreen();
+          },
+        ),
+      ),
+    );
+  }
+}
+
+class SplashScreen extends StatelessWidget {
+  const SplashScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Scaffold(
+      body: Center(
+        child: CircularProgressIndicator(),
+      ),
     );
   }
 }

lib/pages/home/community.dart

@@ -1,14 +1,24 @@
 import 'package:flutter/material.dart';
-import 'package:langx_flutter/components/usercard.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-class Community extends StatefulWidget {
+// Components Import
+import 'package:langx_flutter/components/community/usercard.dart';
+import 'package:langx_flutter/providers/user_provider.dart';
+
+class Community extends ConsumerStatefulWidget {
   const Community({super.key});
 
   @override
-  State<Community> createState() => _CommunityState();
+  ConsumerState<Community> createState() => _CommunityState();
 }
 
-class _CommunityState extends State<Community> {
+class _CommunityState extends ConsumerState<Community> {
+  @override
+  void initState() {
+    super.initState();
+    ref.read(userProvider.notifier).fetchUsers();
+  }
+
   Widget buildCategoryButton(IconData icon, String label, Color iconColor) {
     return GestureDetector(
       onTap: () {},
@@ -49,6 +59,8 @@ class _CommunityState extends State<Community> {
     double width = MediaQuery.of(context).size.width;
     int crossAxisCount = _calculateCrossAxisCount(width);
 
+    final users = ref.watch(userProvider);
+
     return Scaffold(
       backgroundColor: const Color.fromARGB(31, 163, 163, 163),
       body: CustomScrollView(
@@ -140,30 +152,36 @@ class _CommunityState extends State<Community> {
               ),
             ),
           ),
-          SliverPadding(
-            padding: const EdgeInsets.all(8.0),
-            sliver: SliverGrid(
-              delegate: SliverChildBuilderDelegate(
-                (BuildContext context, int index) {
-                  return UserCard(
-                    name: 'User ${index + 1}',
-                    age: 18 + index,
-                    studies: 'Studies info',
-                    speaks: 'Speaks info',
-                    imageUrl: 'assets/images/preview.png',
-                    status: 'Active',
-                  );
-                },
-                childCount: 12,
-              ),
-              gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                crossAxisCount: crossAxisCount,
-                mainAxisSpacing: 10.0,
-                crossAxisSpacing: 10.0,
-                childAspectRatio: 0.75,
-              ),
-            ),
-          ),
+          users.isEmpty
+              ? const SliverToBoxAdapter(
+                  child: Center(child: CircularProgressIndicator()),
+                )
+              : SliverPadding(
+                  padding: const EdgeInsets.all(8.0),
+                  sliver: SliverGrid(
+                    delegate: SliverChildBuilderDelegate(
+                      (BuildContext context, int index) {
+                        final user = users[index].data;
+                        return UserCard(
+                          name: user['name'].toString(),
+                          age: user['age'] ?? 0,
+                          studies: user['studyLanguages'].toString(),
+                          speaks: user['motherLanguages'].toString(),
+                          imageUrl:
+                              user['imageUrl'] ?? 'assets/images/preview.png',
+                          status: user['status'] ?? 'Active',
+                        );
+                      },
+                      childCount: users.length,
+                    ),
+                    gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                      crossAxisCount: crossAxisCount,
+                      mainAxisSpacing: 10.0,
+                      crossAxisSpacing: 10.0,
+                      childAspectRatio: 0.75,
+                    ),
+                  ),
+                ),
         ],
       ),
     );

lib/pages/home/home.dart

@@ -1,6 +1,6 @@
-// import 'package:flutter/cupertino.dart';
-// import 'package:flutter/widgets.dart';
 import 'package:flutter/material.dart';
+
+// Pages Import
 import 'package:langx_flutter/pages/home/community.dart';
 import 'package:langx_flutter/pages/home/profile.dart';
 

lib/pages/home/profile.dart

@@ -1,30 +1,48 @@
 import 'package:flutter/material.dart';
-import 'package:langx_flutter/components/profile_user_card.dart';
-import 'package:langx_flutter/components/profile_token_card.dart';
-import 'package:langx_flutter/components/profile_day_streaks_card.dart';
-import 'package:langx_flutter/components/profile_about_me_card.dart';
-import 'package:langx_flutter/components/profile_study_languages_card.dart';
-import 'package:langx_flutter/components/profile_mother_tongues_card.dart';
-import 'package:langx_flutter/components/profile_badges_card.dart';
-import 'package:langx_flutter/components/profile_others_card.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-class Profile extends StatefulWidget {
+// Providers Import
+import 'package:langx_flutter/providers/auth_provider.dart';
+
+// Components Import
+import 'package:langx_flutter/components/profile/user_card.dart';
+import 'package:langx_flutter/components/profile/token_card.dart';
+import 'package:langx_flutter/components/profile/day_streaks_card.dart';
+import 'package:langx_flutter/components/profile/about_me_card.dart';
+import 'package:langx_flutter/components/profile/study_languages_card.dart';
+import 'package:langx_flutter/components/profile/mother_tongues_card.dart';
+import 'package:langx_flutter/components/profile/badges_card.dart';
+import 'package:langx_flutter/components/profile/others_card.dart';
+
+class Profile extends ConsumerStatefulWidget {
   const Profile({super.key});
 
   @override
-  State<Profile> createState() => _ProfileState();
+  ConsumerState<Profile> createState() => _ProfileState();
 }
 
-class _ProfileState extends State<Profile> {
+class _ProfileState extends ConsumerState<Profile> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: const Text("Profile",
-            style: TextStyle(
-              fontSize: 18,
-              fontWeight: FontWeight.bold,
-            )),
+        title: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            const Text("Profile"),
+            Row(
+              children: [
+                GestureDetector(
+                  onTap: () async {
+                    ref.read(authProvider.notifier).logout(context);
+                  },
+                  child: const Icon(Icons.exit_to_app_outlined, size: 30),
+                ),
+                const SizedBox(width: 10.0),
+              ],
+            ),
+          ],
+        ),
         centerTitle: false,
         backgroundColor: Colors.yellow[700],
       ),
@@ -33,8 +51,8 @@ class _ProfileState extends State<Profile> {
         padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 10.0),
         child: ListView(
           children: const [
-            //Afterwards, it should be modified to take an ID as input and retrieve data based on that ID.
-            //Alternatively, the outer layer retrieves all the data for the cards and inserts them individually.
+            // Afterwards, it should be modified to take an ID as input and retrieve data based on that ID.
+            // Alternatively, the outer layer retrieves all the data for the cards and inserts them individually.
             ProfileUserCard(
               name: 'Addison',
               age: 18,