Merge pull request #20 from ieeeuoft/reorganize-structure

Reorganize structure
ieeeuoft · Nov 17, 2023 · 30f13d2 · 30f13d2
2 parents 575316b + 4b51dc2
commit 30f13d2
Show file tree

Hide file tree

Showing 7 changed files with 289 additions and 108 deletions.
diff --git a/app/lib/account/widgets/get_started_button.dart b/app/lib/account/widgets/get_started_button.dart
@@ -36,9 +36,9 @@ class _GetStartedButtonState extends State<GetStartedButton> {
               borderRadius: BorderRadius.circular(10),
               color: const Color.fromARGB(255, 224, 227, 231),
             ),
-            child: const Row(
+            child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
-              children: [
+              children: const [
                 Text(
                   "Get Started",
                   style: TextStyle(

diff --git a/app/lib/features/authentication/sign_in_page.dart b/app/lib/features/authentication/sign_in_page.dart
@@ -27,7 +27,7 @@ class SignInPageState extends State<SignInPage> {
           child: Column(
             mainAxisSize: MainAxisSize.max,
             children: [
-              const Row(),
+              Row(),
               Expanded(
                 child: Column(
                   mainAxisSize: MainAxisSize.min,

diff --git a/app/lib/main.dart b/app/lib/main.dart
@@ -1,8 +1,5 @@
+import 'package:app/page_viewer.dart';
 import 'package:app/app/app_routes.dart';
-import 'package:app/features/home/home_page.dart';
-import 'package:app/features/profile/profile_page.dart';
-import 'package:app/features/blog/blog_page_test.dart';
-import 'package:app/features/team/team_page.dart';
 import 'package:flutter/material.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'firebase_options.dart';
@@ -22,73 +19,25 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
-      home: const MainScaffold(),
+      home: const PageViewer(),
       routes: AppRoutes.routes,
     );
   }
 }
-enum AppTab { Home, Blog, Team, Profile }
 
-class MainScaffold extends StatefulWidget {
-  const MainScaffold({super.key});
-
-  @override
-  _MainScaffoldState createState() => _MainScaffoldState();
-}
-
-class _MainScaffoldState extends State<MainScaffold> {
-  AppTab _selectedTab = AppTab.Home;
+// class MainScaffold extends StatefulWidget {
+//   @override
+//   _MainScaffoldState createState() => _MainScaffoldState();
+// }
 
-  void _onTabTapped(int index) {
-    setState(() {
-      _selectedTab = AppTab.values[index];
-    });
-  }
+// class _MainScaffoldState extends State<MainScaffold> {
+//   AppTab _selectedTab = AppTab.Home;
 
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      bottomNavigationBar: BottomNavigationBar(
-        items: const <BottomNavigationBarItem>[
-          BottomNavigationBarItem(
-            icon: Icon(Icons.home),
-            label: 'Home',
-          ),
-          BottomNavigationBarItem(
-            icon: Icon(Icons.notifications),
-            label: 'Blog',
-           ),
-          BottomNavigationBarItem(
-            icon: Icon(Icons.group),
-            label: 'Team',
-          ),
-          BottomNavigationBarItem(
-            icon: Icon(Icons.person),
-            label: 'Profile',
-          ),
-        ],
-        currentIndex: _selectedTab.index,
-        onTap: _onTabTapped,
-      ),
-      body: _buildBody(),
-    );
-  }
-
-  Widget _buildBody() {
-    switch (_selectedTab) {
-      case AppTab.Home:
-        return const HomePage();
-       case AppTab.Blog:
-        return const BlogPage();
-      case AppTab.Team:
-        return const TeamPage();
-      case AppTab.Profile:
-        return const ProfilePage();
-      default:
-        return Container();
-    }
-  }
-}
+//   void _onTabTapped(int index) {
+//     setState(() {
+//       _selectedTab = AppTab.values[index];
+//     });
+//   }
 
 // class AuthService {
 //   final FirebaseAuth _auth = FirebaseAuth.instance;

diff --git a/app/lib/page_viewer.dart b/app/lib/page_viewer.dart
@@ -0,0 +1,46 @@
+import 'package:app/features/blog/blog_page.dart';
+import 'package:app/features/home/home_page.dart';
+import 'package:app/features/profile/profile_page.dart';
+import 'package:app/features/team/team_page.dart';
+import 'package:flutter/material.dart';
+
+class PageViewer extends StatelessWidget {
+  const PageViewer({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const DefaultTabController(
+      length: 4, // make sure that this matches the amount of pages
+      child: Scaffold(
+      body: TabBarView(
+        children:[
+          HomePage(),
+          BlogPage(),
+          TeamPage(),
+          ProfilePage(),
+        ]
+      ),
+      bottomNavigationBar: TabBar(
+          tabs: [
+            Tab(
+              icon: Icon(Icons.home)
+            ),
+            Tab(
+              icon: Icon(Icons.book)
+            ),
+            Tab(
+              icon: Icon(Icons.group)
+            ),
+            Tab(
+              icon: Icon(Icons.person)
+            ),
+          ],
+          labelColor: Color(0xff2B7BBC),
+          unselectedLabelColor: Color(0xff141D1D),
+          indicatorColor: Color(0xff2B7BBC),
+        ),
+        backgroundColor: Color(0xffEFEFEF),
+      ),
+    );
+    }
+}
diff --git a/app/macos/Flutter/GeneratedPluginRegistrant.swift b/app/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -8,9 +8,11 @@ import Foundation
 import cloud_firestore
 import firebase_auth
 import firebase_core
+import wakelock_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin"))
   FLTFirebaseAuthPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAuthPlugin"))
   FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
+  WakelockMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockMacosPlugin"))
 }