diff --git a/frontend/memoree_client/lib/app_scaffold.dart b/frontend/memoree_client/lib/app_scaffold.dart index cd0de17..aabca10 100755 --- a/frontend/memoree_client/lib/app_scaffold.dart +++ b/frontend/memoree_client/lib/app_scaffold.dart @@ -4,7 +4,8 @@ import 'package:memoree_client/widgets/grid_results.dart'; import 'drawer.dart'; class AppScaffold extends StatelessWidget { - const AppScaffold({Key key}) : super(key: key); + final String page; + const AppScaffold({Key key, this.page}) : super(key: key); @override Widget build(BuildContext context) { @@ -12,34 +13,21 @@ class AppScaffold extends StatelessWidget { final bool isTabletLayout = MediaQuery.of(context).size.width < 1008; return Scaffold( - appBar: CustomAppBar( - isMobile: isMobileLayout, - isTablet: isTabletLayout - ), - drawer: isMobileLayout ? AppDrawer() : null, - body: SafeArea( - child: Container( - child: Row( - children: [ - if(!isMobileLayout) - AppDrawer(), - Container( - child: Expanded( - child: ContentGrid() - ) - ) - ] - ) - ) - ) - ); + appBar: + CustomAppBar(isMobile: isMobileLayout, isTablet: isTabletLayout), + drawer: isMobileLayout ? AppDrawer() : null, + body: SafeArea( + child: Container( + child: Row(children: [ + if (!isMobileLayout) AppDrawer(), + Container( + child: Expanded(child: page == "videos" ? ContentGrid() : null)) + ])))); } - Widget appDrawer(bool isMobile, bool isTablet) - { - if(isMobile) - return AppDrawer(); + Widget appDrawer(bool isMobile, bool isTablet) { + if (isMobile) return AppDrawer(); return null; } -} \ No newline at end of file +} diff --git a/frontend/memoree_client/lib/main.dart b/frontend/memoree_client/lib/main.dart index 11eabdc..d2b417e 100755 --- a/frontend/memoree_client/lib/main.dart +++ b/frontend/memoree_client/lib/main.dart @@ -1,8 +1,10 @@ +import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; +import 'package:memoree_client/app/models/user.dart'; +import 'package:memoree_client/app/services/firebase_auth.dart'; import 'package:memoree_client/app_scaffold.dart'; import 'package:memoree_client/constants.dart'; -import 'package:memoree_client/drawer.dart'; -import 'package:memoree_client/search.dart'; +import 'package:memoree_client/pages/login.dart'; import 'package:memoree_client/themes.dart'; void main() => runApp(MyApp()); @@ -11,16 +13,10 @@ class MyApp extends StatelessWidget { // This widget is the root of your application. @override Widget build(BuildContext context) { - return MaterialApp( - debugShowCheckedModeBanner: false, - title: PageTitles.appName, - theme: AppTheme.lightTheme, - initialRoute: '/', - routes: { - '/': (context) => AppScaffold(), - '/login': (context) => Text("Under construction") - } - ); + debugShowCheckedModeBanner: false, + title: PageTitles.appName, + theme: AppTheme.lightTheme, + home: LoginPage()); } } diff --git a/frontend/memoree_client/web/index.html b/frontend/memoree_client/web/index.html index c7bb06e..40b31cf 100755 --- a/frontend/memoree_client/web/index.html +++ b/frontend/memoree_client/web/index.html @@ -26,10 +26,20 @@ - memoree_client + Memoree + + + + @@ -40,6 +50,29 @@ }); } + + + + + +