Merge remote-tracking branch 'origin/Sprint2Jorge' into sprint2

fast_med_flutter/android/app/build.gradle

@@ -26,7 +26,9 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 28
+    //compile 'com.google.firebase:firebase-auth:10.0.1'
+
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -37,12 +39,15 @@ android {
     }
 
     defaultConfig {
+        multiDexEnabled true
+
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.fast_med_flutter"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -59,5 +64,17 @@ flutter {
 }
 
 dependencies {
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    implementation platform('com.google.firebase:firebase-bom:25.12.0')
+    implementation 'com.google.firebase:firebase-analytics-ktx'
+    implementation 'com.google.firebase:firebase-auth-ktx'
+    implementation 'com.google.firebase:firebase-firestore-ktx'
+
 }
+
+
+apply plugin: 'com.google.gms.google-services'

fast_med_flutter/android/app/google-services.json

@@ -0,0 +1,40 @@
+{
+  "project_info": {
+    "project_number": "874246220025",
+    "firebase_url": "https://calendar-flutter-d7b6e.firebaseio.com",
+    "project_id": "calendar-flutter-d7b6e",
+    "storage_bucket": "calendar-flutter-d7b6e.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:874246220025:android:4c604be741056a86019a28",
+        "android_client_info": {
+          "package_name": "com.example.fast_med_flutter"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "874246220025-abmjr89mo81oqrrrjd83on3faphkv14r.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBQ9tzZnjbFvTw-7ROUH-6a8Cb8Ae3Ddn8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "874246220025-abmjr89mo81oqrrrjd83on3faphkv14r.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

fast_med_flutter/android/build.gradle

@@ -8,6 +8,8 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.google.gms:google-services:4.3.4'
+        classpath 'com.google.gms:google-services:3.0.0'
     }
 }
 

fast_med_flutter/android/settings.gradle

@@ -9,3 +9,17 @@ localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
 def flutterSdkPath = properties.getProperty("flutter.sdk")
 assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
 apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+
+def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+
+def plugins = new Properties()
+def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
+if (pluginsFile.exists()) {
+    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
+}
+
+plugins.each { name, path ->
+    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
+    include ":$name"
+    project(":$name").projectDir = pluginDirectory
+}

fast_med_flutter/lib/main.dart

@@ -20,4 +20,4 @@ void main() => runApp(MaterialApp(
           '/MyApp': (context) => MyApp(),
           '/album': (context) => album(),
     }
-));
+));

fast_med_flutter/lib/model/event.dart

@@ -0,0 +1,36 @@
+import 'package:firebase_helpers/firebase_helpers.dart';
+
+class EventModel extends DatabaseItem{
+  final String id;
+  final String title;
+  final String description;
+  final DateTime eventDate;
+
+  EventModel({this.id,this.title, this.description, this.eventDate}):super(id);
+
+  factory EventModel.fromMap(Map data) {
+    return EventModel(
+      title: data['title'],
+      description: data['description'],
+      eventDate: data['event_date'],
+    );
+  }
+
+  factory EventModel.fromDS(String id, Map<String,dynamic> data) {
+    return EventModel(
+      id: id,
+      title: data['title'],
+      description: data['description'],
+      eventDate: data['event_date'].toDate(),
+    );
+  }
+
+  Map<String,dynamic> toMap() {
+    return {
+      "title":title,
+      "description": description,
+      "event_date":eventDate,
+      "id":id,
+    };
+  }
+}

fast_med_flutter/lib/res/event_firestore_service.dart

@@ -0,0 +1,6 @@
+import 'package:firebase_helpers/firebase_helpers.dart';
+import '../model/event.dart';
+
+DatabaseService<EventModel> eventDBS = DatabaseService<EventModel>
+  ("events",fromDS: (id,data) => EventModel.fromDS(id, data), toMap:
+    (event) => event.toMap());

fast_med_flutter/lib/routes/calendario.dart

@@ -1,19 +1,25 @@
+import 'dart:convert';
 import 'package:flutter/material.dart';
-import 'package:intl/date_symbol_data_local.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'package:table_calendar/table_calendar.dart';
+import 'package:fast_med_flutter/ui/pages/add_event.dart';
+import 'model/event.dart';
 
-// Dias sin Citas Disponibles
-final Map<DateTime, List> _holidays = {
-  DateTime(2020, 11, 6): ['No Hay Citas'],
-  DateTime(2020, 11, 3): ['Dia Elecciones'],
+// Dias de Citas No Disponibles
 
+final Map<DateTime, List> _holidays = {
+DateTime(2020, 11, 6): ['No Hay Citas'],
+DateTime(2020, 11, 3): ['Dia Elecciones'],
+DateTime(2020,12,25): ['Chrismas'],
+DateTime(2020,12,31): ['Despedida del anyo nuevo'],
+  DateTime(2021,1,1): ['Anyo nuevo'],
 };
 
-void main() {
-  initializeDateFormatting().then((_) => runApp(Calendario()));
-}
+//Iniciar la Seccion de las Citas
 
+void main() => runApp(Calendario());
 
+//Inicio del Area de las Citas Disponibles
 
 class Calendario extends StatelessWidget {
   @override
@@ -23,325 +29,186 @@ class Calendario extends StatelessWidget {
       theme: ThemeData(
         primarySwatch: Colors.blue,
       ),
-      home: MyHomePage(title: 'Citas Disponibles'),
+      home: MyHomePage(),
+      routes:{
+        "add_event": (_) => AddEventPage(),
+      },
     );
   }
 }
 
 class MyHomePage extends StatefulWidget {
-  MyHomePage({Key key, this.title}) : super(key: key);
-
-  final String title;
-
   @override
-  _MyHomePageState createState() => _MyHomePageState();
+  _HomePageState createState() => _HomePageState();
 }
 
-class _MyHomePageState extends State<MyHomePage> with TickerProviderStateMixin {
-  Map<DateTime, List> _events;
-  List _selectedEvents;
-  AnimationController _animationController;
-  CalendarController _calendarController;
-
-  @override
-  void initState() {
-    super.initState();
-    final _selectedDay = DateTime.now();
+//Definimos los controladores del Calendario
 
-    _events = {
+class _HomePageState extends State<MyHomePage> {
+  CalendarController _controller;
+  Map<DateTime, List<dynamic>> _events;
+  List<dynamic> _selectedEvents;
+  TextEditingController _eventController;
+  SharedPreferences prefs;
 
-      _selectedDay.add(Duration(days: 3)): Set.from([ 'Cita Cardiologo', 'Cita Dentista']).toList(),
-      _selectedDay.add(Duration(days: 22)): ['Cita Cardiologo', 'Cita Dentista'],
 
-    };
-
-    _selectedEvents = _events[_selectedDay] ?? [];
-    _calendarController = CalendarController();
-
-    _animationController = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 400),
-    );
-
-    _animationController.forward();
-  }
 
   @override
-  void dispose() {
-    _animationController.dispose();
-    _calendarController.dispose();
-    super.dispose();
+  void initState() {
+    super.initState();
+    _controller = CalendarController();
+    _eventController = TextEditingController();
+    _events = {};
+    _selectedEvents = [];
+    final _selectedDay = DateTime.now();
+    initPrefs();
   }
 
-  void _onDaySelected(DateTime day, List events, List holidays) {
-    print('CALLBACK: _onDaySelected');
+  initPrefs() async {
+    prefs = await SharedPreferences.getInstance();
     setState(() {
-      _selectedEvents = events;
+      _events = Map<DateTime, List<dynamic>>.from(
+          decodeMap(json.decode(prefs.getString("events") ?? "{}")));
+    });
+  }
+  // Definimos las fechas en la area de citas
+
+  Map<DateTime, List<dynamic>> _groupEvents(List<EventModel> events) {
+    Map<DateTime,List<dynamic>> data = {};
+    events.forEach((event) {
+      DateTime date = DateTime(event.eventDate.year, event.eventDate.month,
+          event.eventDate.day, 12);
+      if(data[date] == null) data[date] = [];
+      data[date].add(event);
     });
+    return data;
   }
 
-  void _onVisibleDaysChanged(DateTime first, DateTime last, CalendarFormat format) {
-    print('CALLBACK: _onVisibleDaysChanged');
+  Map<String, dynamic> encodeMap(Map<DateTime, dynamic> map) {
+    Map<String, dynamic> newMap = {};
+    map.forEach((key, value) {
+      newMap[key.toString()] = map[key];
+    });
+    return newMap;
   }
 
-  void _onCalendarCreated(DateTime first, DateTime last, CalendarFormat format) {
-    print('CALLBACK: _onCalendarCreated');
+  Map<DateTime, dynamic> decodeMap(Map<String, dynamic> map) {
+    Map<DateTime, dynamic> newMap = {};
+    map.forEach((key, value) {
+      newMap[DateTime.parse(key)] = map[key];
+    });
+    return newMap;
   }
 
+
+//Definimos el estilo del area de las Citas Disponibles.
+  //En este ejemplo, el calendario comenzara mostrandose por meses.
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(widget.title),
+        title: Text('Citas Disponibles'),
       ),
-      body: Column(
-        mainAxisSize: MainAxisSize.max,
-        children: <Widget>[
-          // Switch out 2 lines below to play with TableCalendar's settings
-          //-----------------------
-          _buildTableCalendar(),
-          // _buildTableCalendarWithBuilders(),
-          const SizedBox(height: 8.0),
-          _buildButtons(),
-          const SizedBox(height: 8.0),
-          Expanded(child: _buildEventList()),
-        ],
-      ),
-    );
-  }
-  //Back button
-  Widget BackButton(BuildContext context){
-    return InkWell(
-      onTap: (){
-        Navigator.pop(context);
-      },
-      child: Row(
+      body: SingleChildScrollView(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
-            Container(
-              padding: EdgeInsets.only(left: 0, top:10, bottom: 10),
-              child: Icon(Icons.arrow_back_ios, color: Colors.black),
+            TableCalendar(
+              events: _events,
+              holidays: _holidays,
+              initialCalendarFormat: CalendarFormat.month,
+              calendarStyle: CalendarStyle(
+                  canEventMarkersOverflow: true,
+                  todayColor: Colors.orange,
+                  selectedColor: Theme.of(context).primaryColor,
+                  todayStyle: TextStyle(
+                      fontWeight: FontWeight.bold,
+                      fontSize: 18.0,
+                      color: Colors.white)),
+              headerStyle: HeaderStyle(
+                centerHeaderTitle: true,
+                formatButtonDecoration: BoxDecoration(
+                  color: Colors.orange,
+                  borderRadius: BorderRadius.circular(20.0),
+                ),
+                formatButtonTextStyle: TextStyle(color: Colors.white),
+                formatButtonShowsNext: false,
+              ),
+              startingDayOfWeek: StartingDayOfWeek.monday,
+
+              builders: CalendarBuilders(
+                selectedDayBuilder: (context, date, events) => Container(
+                    margin: const EdgeInsets.all(4.0),
+                    alignment: Alignment.center,
+                    decoration: BoxDecoration(
+                        color: Theme.of(context).primaryColor,
+                        borderRadius: BorderRadius.circular(10.0)),
+                    child: Text(
+                      date.day.toString(),
+                      style: TextStyle(color: Colors.white),
+                    )),
+                todayDayBuilder: (context, date, events) => Container(
+                    margin: const EdgeInsets.all(4.0),
+                    alignment: Alignment.center,
+                    decoration: BoxDecoration(
+                        color: Colors.orange,
+                        borderRadius: BorderRadius.circular(10.0)),
+                    child: Text(
+                      date.day.toString(),
+                      style: TextStyle(color: Colors.white),
+                    )),
+              ),
+              calendarController: _controller,
             ),
-            Text("Black",
-                style: TextStyle(fontSize: 12, fontWeight: FontWeight.w500))
-          ]
-      ),
-    );
-  }
-
-  // Simple TableCalendar configuration (using Styles)
-  Widget _buildTableCalendar() {
-    return TableCalendar(
-      calendarController: _calendarController,
-      events: _events,
-      holidays: _holidays,
-      startingDayOfWeek: StartingDayOfWeek.monday,
-      calendarStyle: CalendarStyle(
-        selectedColor: Colors.lightBlueAccent,
-        todayColor: Colors.blueAccent,
-        markersColor: Colors.brown,
-        outsideDaysVisible: false,
-      ),
-      headerStyle: HeaderStyle(
-        formatButtonTextStyle: TextStyle().copyWith(color: Colors.white, fontSize: 15.0),
-        formatButtonDecoration: BoxDecoration(
-          color: Colors.lightBlue,
-          borderRadius: BorderRadius.circular(16.0),
+            ..._selectedEvents.map((event) => ListTile(
+              title: Text(event),
+            )),
+          ],
         ),
       ),
-      onDaySelected: _onDaySelected,
-      onVisibleDaysChanged: _onVisibleDaysChanged,
-      onCalendarCreated: _onCalendarCreated,
-    );
-  }
-
-  // More advanced TableCalendar configuration (using Builders & Styles)
-  Widget _buildTableCalendarWithBuilders() {
-    return TableCalendar(
-      locale: 'pl_PL',
-      calendarController: _calendarController,
-      events: _events,
-      holidays: _holidays,
-      initialCalendarFormat: CalendarFormat.month,
-      formatAnimation: FormatAnimation.slide,
-      startingDayOfWeek: StartingDayOfWeek.sunday,
-      availableGestures: AvailableGestures.all,
-      availableCalendarFormats: const {
-        CalendarFormat.month: '',
-        CalendarFormat.week: '',
-      },
-      calendarStyle: CalendarStyle(
-        outsideDaysVisible: false,
-        weekendStyle: TextStyle().copyWith(color: Colors.blue),
-        holidayStyle: TextStyle().copyWith(color: Colors.blue),
-      ),
-      daysOfWeekStyle: DaysOfWeekStyle(
-        weekendStyle: TextStyle().copyWith(color: Colors.blue),
+      floatingActionButton: FloatingActionButton(
+        child: Icon(Icons.add),
+        onPressed: _showAddDialog,
       ),
-      headerStyle: HeaderStyle(
-        centerHeaderTitle: true,
-        formatButtonVisible: false,
-      ),
-      builders: CalendarBuilders(
-        selectedDayBuilder: (context, date, _) {
-          return FadeTransition(
-            opacity: Tween(begin: 0.0, end: 1.0).animate(_animationController),
-            child: Container(
-              margin: const EdgeInsets.all(4.0),
-              padding: const EdgeInsets.only(top: 5.0, left: 6.0),
-              color: Colors.green,
-              width: 100,
-              height: 100,
-              child: Text(
-                '${date.day}',
-                style: TextStyle().copyWith(fontSize: 16.0),
-              ),
-            ),
-          );
-        },
-        todayDayBuilder: (context, date, _) {
-          return Container(
-            margin: const EdgeInsets.all(4.0),
-            padding: const EdgeInsets.only(top: 5.0, left: 6.0),
-            color: Colors.amber,
-            width: 100,
-            height: 100,
-            child: Text(
-              '${date.day}',
-              style: TextStyle().copyWith(fontSize: 16.0),
-            ),
-          );
-        },
-        markersBuilder: (context, date, events, holidays) {
-          final children = <Widget>[];
-
-          if (events.isNotEmpty) {
-            children.add(
-              Positioned(
-                right: 1,
-                bottom: 1,
-                child: _buildEventsMarker(date, events),
-              ),
-            );
-          }
-
-          if (holidays.isNotEmpty) {
-            children.add(
-              Positioned(
-                right: -2,
-                top: -2,
-                child: _buildHolidaysMarker(),
-              ),
-            );
-          }
-
-          return children;
-        },
-      ),
-      onDaySelected: (date, events, holidays) {
-        _onDaySelected(date, events, holidays);
-        _animationController.forward(from: 0.0);
-      },
-      onVisibleDaysChanged: _onVisibleDaysChanged,
-      onCalendarCreated: _onCalendarCreated,
     );
   }
 
-  Widget _buildEventsMarker(DateTime date, List events) {
-    return AnimatedContainer(
-      duration: const Duration(milliseconds: 300),
-      decoration: BoxDecoration(
-        shape: BoxShape.rectangle,
-        color: _calendarController.isSelected(date)
-            ? Colors.brown[500]
-            : _calendarController.isToday(date) ? Colors.brown : Colors.blue,
-      ),
-      width: 16.0,
-      height: 16.0,
-      child: Center(
-        child: Text(
-          '${events.length}',
-          style: TextStyle().copyWith(
-            color: Colors.green,
-            fontSize: 12.0,
+  //Definimos el boton para crear Citas.
+
+  _showAddDialog() async {
+    await showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          content: TextField(
+            controller: _eventController,
+            decoration: InputDecoration(
+                labelText: "Razon para crear su cita",
+                filled: true,
+                fillColor: Colors.white,
+                border: OutlineInputBorder(borderRadius: BorderRadius.circular(10))),
           ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildHolidaysMarker() {
-    return Icon(
-      Icons.add_box,
-      size: 20.0,
-      color: Colors.blueGrey,
-    );
-  }
-
-  Widget _buildButtons() {
-    final dateTime = _events.keys.elementAt(_events.length - 2);
-
-    return Column(
-      children: <Widget>[
-        Row(
-          mainAxisSize: MainAxisSize.max,
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          children: <Widget>[
-            RaisedButton(
-              child: Text('Mes'),
-              onPressed: () {
-                setState(() {
-                  _calendarController.setCalendarFormat(CalendarFormat.month);
-                });
-              },
-            ),
-            RaisedButton(
-              child: Text('2 Semanas'),
+          actions: <Widget>[
+            FlatButton(
+              child: Text("Crear Su Cita Ahora"),
               onPressed: () {
-                setState(() {
-                  _calendarController.setCalendarFormat(CalendarFormat.twoWeeks);
-                });
+                if (_eventController.text.isEmpty) return;
+                if (_events[_controller.selectedDay] != null) {
+                  _events[_controller.selectedDay]
+                      .add(_eventController.text);
+                } else {
+                  _events[_controller.selectedDay] = [
+                    _eventController.text
+                  ];
+                }
+                prefs.setString("events", json.encode(encodeMap(_events)));
+                _eventController.clear();
+                Navigator.pop(context);
               },
-            ),
-            RaisedButton(
-              child: Text('Semana'),
-              onPressed: () {
-                setState(() {
-                  _calendarController.setCalendarFormat(CalendarFormat.week);
-                });
-              },
-            ),
+            )
           ],
-        ),
-        const SizedBox(height: 8.0),
-        RaisedButton(
-          child: Text('Recuerde Cita ${dateTime.day}-${dateTime.month}-${dateTime.year}'),
-          onPressed: () {
-            _calendarController.setSelectedDay(
-              DateTime(dateTime.year, dateTime.month, dateTime.day),
-              runCallback: true,
-            );
-          },
-        ),
-      ],
-    );
-  }
-
-
-  Widget _buildEventList() {
-    return ListView(
-      children: _selectedEvents
-          .map((event) => Container(
-        decoration: BoxDecoration(
-          border: Border.all(width: 0.8),
-          borderRadius: BorderRadius.circular(12.0),
-        ),
-        margin: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
-        child: ListTile(
-          title: Text(event.toString()),
-          onTap: () => print('$event tapped!'),
-        ),
-      ))
-          .toList(),
-    );
+        ));
+    setState(() {
+      _selectedEvents = _events[_controller.selectedDay];
+    });
   }
 }

fast_med_flutter/lib/routes/home.dart

@@ -21,18 +21,73 @@ class _HomeState extends State<Home>{
         child: ListView(
           //mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: [
-            newButton(context,'/verOficinas','Ver Oficinas'),
-            spaceBetween(),
-            // newButton(context,'/calendario','Calendario'),
-            // spaceBetween(),
-            // newButton(context,'/register','Register'),
-            // spaceBetween(),
-            // newButton(context,'/welcome','Welcome'),
-            // spaceBetween(),
-            // newButton(context,'/MyApp','MyApp'),
-            // spaceBetween(),
-            // newButton(context,'/album','Ver Oficinas 2: electr'),
-            // spaceBetween(),
+
+          //estos dos estaban sin comentar originalmente
+          //newButton(context,'/verOficinas','Ver Oficinas'),
+          //spaceBetween(),
+
+          //aqui comienza lo que merge
+            new FlatButton(
+              minWidth: 300.0,
+              height: 100.0,
+              onPressed: (){
+                Navigator.pushNamed(context, '/verOficinas');
+              },
+              child: Text('Ver Oficinas',
+                style: TextStyle(fontSize: 36),
+              ),
+              color: Colors.purple,
+
+            ),
+            new FlatButton(
+              minWidth: 300.0,
+              height: 100.0,
+              onPressed: (){
+                Navigator.pushNamed(context, '/calendario');
+              },
+              child: Text('Buscar Citas',
+                style: TextStyle(fontSize: 36),
+              ),
+              color: Colors.purple,
+
+            ),
+            new FlatButton(
+              minWidth: 300.0,
+              height: 100.0,
+              onPressed: (){
+                Navigator.pushNamed(context, '/register');
+              },
+              child: Text('register',
+                style: TextStyle(fontSize: 36),
+              ),
+              color: Colors.purple,
+
+            ),
+            new FlatButton(
+              minWidth: 300.0,
+              height: 100.0,
+              onPressed: (){
+                Navigator.pushNamed(context, '/welcome');
+              },
+              child: Text('welcome',
+                style: TextStyle(fontSize: 36),
+              ),
+              color: Colors.purple,
+
+            ),
+            new FlatButton(
+              minWidth: 300.0,
+              height: 100.0,
+              onPressed: (){
+                Navigator.pushNamed(context, '/MyApp');
+              },
+              child: Text('MyApp',
+                style: TextStyle(fontSize: 36),
+              ),
+              color: Colors.purple,
+
+            ),
+            //aqui termina lo que merge
             ],
         ),
 

fast_med_flutter/lib/routes/model/event.dart

@@ -0,0 +1,38 @@
+import 'package:firebase_helpers/firebase_helpers.dart';
+
+//Variables para cada evento
+
+class EventModel extends DatabaseItem{
+  final String id;
+  final String title;
+  final String description;
+  final DateTime eventDate;
+
+  EventModel({this.id,this.title, this.description, this.eventDate}):super(id);
+
+  factory EventModel.fromMap(Map data) {
+    return EventModel(
+      title: data['title'],
+      description: data['description'],
+      eventDate: data['event_date'],
+    );
+  }
+
+  factory EventModel.fromDS(String id, Map<String,dynamic> data) {
+    return EventModel(
+      id: id,
+      title: data['title'],
+      description: data['description'],
+      eventDate: data['event_date'].toDate(),
+    );
+  }
+
+  Map<String,dynamic> toMap() {
+    return {
+      "title":title,
+      "description": description,
+      "event_date":eventDate,
+      "id":id,
+    };
+  }
+}

fast_med_flutter/lib/routes/register.dart

@@ -11,7 +11,6 @@ import 'package:google_fonts/google_fonts.dart';
 //
 
 class RegisterPage extends StatefulWidget{
-  
   RegisterPage({Key key, this.title}) : super(key: key);
   final String title;
 

fast_med_flutter/lib/ui/pages/add_event.dart

@@ -0,0 +1,145 @@
+import 'package:fast_med_flutter/model/event.dart';
+import 'package:flutter/material.dart';
+import 'package:fast_med_flutter/res/event_firestore_service.dart';
+import 'dart:async';
+
+//File donde definimos los eventos del area de citas
+
+class AddEventPage extends StatefulWidget {
+  final EventModel note;
+
+  const AddEventPage({Key key, this.note}) : super(key: key);
+
+  @override
+  _AddEventPageState createState() => _AddEventPageState();
+}
+
+//Definimos los controler de los eventos
+
+class _AddEventPageState extends State<AddEventPage> {
+  TextStyle style = TextStyle(fontFamily: 'Montserrat', fontSize: 20.0);
+  TextEditingController _title;
+  TextEditingController _description;
+  TextEditingController _reason;
+
+  DateTime _eventDate;
+  DateTime selectedDate = DateTime.now();
+  List data;
+  final _formKey = GlobalKey<FormState>();
+  final _key = GlobalKey<ScaffoldState>();
+  bool processing;
+
+  //Controles donde escribimos el evento
+  @override
+  void initState() {
+    super.initState();
+    _title = TextEditingController(text: widget.note != null ? widget.note.title : "");
+    _description = TextEditingController(text:  widget.note != null ? widget.note.description : "");
+    _eventDate = DateTime.now();
+    processing = false;
+  }
+
+//Construimos el UI para crear la cita
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(widget.note != null ? "Edit Note" : "Crear Su Cita"),
+      ),
+      key: _key,
+      body: Form(
+        key: _formKey,
+        child: Container(
+          alignment: Alignment.center,
+          child: ListView(
+            children: <Widget>[
+
+              //Area Donde el Paciente Anotara Su Cita
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+                child: TextFormField(
+                  controller: _reason,
+                  minLines: 3,
+                  maxLines: 5,
+                  validator: (value) =>
+                      (value.isEmpty) ? "Favor Explicar Razon Para La Cita" : null,
+                  style: style,
+                  decoration: InputDecoration(
+                      labelText: "Razones para su cita",
+                      border: OutlineInputBorder(borderRadius: BorderRadius.circular(10))),
+                ),
+              ),
+              const SizedBox(height: 10.0),
+              ListTile(
+                title: Text("Date (YYYY-MM-DD)"),
+                subtitle: Text("${_eventDate.year} - ${_eventDate.month} - ${_eventDate.day}"),
+                onTap: ()async{
+                  DateTime picked = await showDatePicker(context: context, initialDate: _eventDate, firstDate: DateTime(_eventDate.year-5), lastDate: DateTime(_eventDate.year+5));
+                  if(picked != null) {
+                    setState(() {
+                      _eventDate = picked;
+                    });
+                  }
+                },
+              ),
+
+              SizedBox(height: 10.0),
+              processing
+                  ? Center(child: CircularProgressIndicator())
+                  : Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                child: Material(
+                  elevation: 5.0,
+                  borderRadius: BorderRadius.circular(30.0),
+                  color: Theme.of(context).primaryColor,
+                  child: MaterialButton(
+                    onPressed: () async {
+                      if (_formKey.currentState.validate()) {
+                        setState(() {
+                          processing = true;
+                        });
+                        if(widget.note != null) {
+                          await eventDBS.updateData(widget.note.id,{
+
+
+                          "title": _title.text,
+                          "reason": _reason.text,
+                          "event_date": widget.note.eventDate,
+                          });
+                        }else{
+                          await eventDBS.createItem(EventModel(
+                              title: _title.text,
+                              description: _description.text,
+                              eventDate: _eventDate
+                          ));
+                        }
+                        Navigator.pop(context);
+                        setState(() {
+                          processing = false;
+                        });
+                      }
+                    },
+                    child: Text(
+                      "Crear Su Cita Ahora",
+                      style: style.copyWith(
+                          color: Colors.white,
+                          fontWeight: FontWeight.bold),
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+
+  @override
+  void dispose() {
+    _title.dispose();
+    _description.dispose();
+    super.dispose();
+  }
+}

fast_med_flutter/lib/widgets/date_time_picker_widget.dart

@@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+
+class DateTimePickerWidget extends StatefulWidget {
+  @override
+  _DateTimePickerWidgetState createState() => _DateTimePickerWidgetState();
+}
+
+class _DateTimePickerWidgetState extends State<DateTimePickerWidget> {
+  DateTime selectedDate = DateTime.now();
+
+  final DateFormat dateFormat = DateFormat('yyyy-MM-dd HH:mm');
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: <Widget>[
+        Text(dateFormat.format(selectedDate)),
+        RaisedButton(
+          child: Text('Choose new date time'),
+          onPressed: () async {
+            final selectedDate = await _selectDateTime(context);
+            if (selectedDate == null) return;
+
+            print(selectedDate);
+
+            final selectedTime = await _selectTime(context);
+            if (selectedTime == null) return;
+            print(selectedTime);
+
+            setState(() {
+              this.selectedDate = DateTime(
+                selectedDate.year,
+                selectedDate.month,
+                selectedDate.day,
+                selectedTime.hour,
+                selectedTime.minute,
+              );
+            });
+          },
+        ),
+      ],
+    );
+  }
+
+  Future<TimeOfDay> _selectTime(BuildContext context) {
+    final now = DateTime.now();
+
+    return showTimePicker(
+      context: context,
+      initialTime: TimeOfDay(hour: now.hour, minute: now.minute),
+    );
+  }
+
+  Future<DateTime> _selectDateTime(BuildContext context) => showDatePicker(
+        context: context,
+        initialDate: DateTime.now().add(Duration(seconds: 1)),
+        firstDate: DateTime.now(),
+        lastDate: DateTime(2100),
+      );
+}

fast_med_flutter/lib/widgets/date_time_picker_widget2.dart

@@ -0,0 +1,35 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:fast_med_flutter/widgets/notifcation_dialog.dart';
+
+class DateTimePickerWidget2 extends StatefulWidget {
+  @override
+  _DateTimePickerWidget2State createState() => _DateTimePickerWidget2State();
+}
+
+class _DateTimePickerWidget2State extends State<DateTimePickerWidget2> {
+  DateTime selectedDate = DateTime.now();
+
+  final DateFormat dateFormat = DateFormat('yyyy-MM-dd HH:mm');
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: <Widget>[
+        Text(dateFormat.format(selectedDate)),
+        RaisedButton(
+          child: Text('Choose new date time'),
+          onPressed: () async {
+            showDateTimeDialog(context, initialDate: selectedDate,
+                onSelectedDate: (selectedDate) {
+              setState(() {
+                this.selectedDate = selectedDate;
+              });
+            });
+          },
+        ),
+      ],
+    );
+  }
+}

fast_med_flutter/lib/widgets/notifcation_dialog.dart

@@ -0,0 +1,132 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+
+Future<TimeOfDay> _selectTime(BuildContext context,
+    {@required DateTime initialDate}) {
+  final now = DateTime.now();
+
+  return showTimePicker(
+    context: context,
+    initialTime: TimeOfDay(hour: initialDate.hour, minute: initialDate.minute),
+  );
+}
+
+Future<DateTime> _selectDateTime(BuildContext context,
+    {@required DateTime initialDate}) {
+  final now = DateTime.now();
+  final newestDate = initialDate.isAfter(now) ? initialDate : now;
+
+  return showDatePicker(
+    context: context,
+    initialDate: newestDate.add(Duration(seconds: 1)),
+    firstDate: now,
+    lastDate: DateTime(2100),
+  );
+}
+
+Dialog showDateTimeDialog(
+  BuildContext context, {
+  @required ValueChanged<DateTime> onSelectedDate,
+  @required DateTime initialDate,
+}) {
+  final dialog = Dialog(
+    child: DateTimeDialog(
+        onSelectedDate: onSelectedDate, initialDate: initialDate),
+  );
+
+  showDialog(context: context, builder: (BuildContext context) => dialog);
+}
+
+class DateTimeDialog extends StatefulWidget {
+  final ValueChanged<DateTime> onSelectedDate;
+  final DateTime initialDate;
+
+  const DateTimeDialog({
+    @required this.onSelectedDate,
+    @required this.initialDate,
+    Key key,
+  }) : super(key: key);
+  @override
+  _DateTimeDialogState createState() => _DateTimeDialogState();
+}
+
+class _DateTimeDialogState extends State<DateTimeDialog> {
+  DateTime selectedDate;
+
+  @override
+  void initState() {
+    super.initState();
+
+    selectedDate = widget.initialDate;
+  }
+
+  @override
+  Widget build(BuildContext context) => Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          mainAxisSize: MainAxisSize.min,
+          children: <Widget>[
+            Text(
+              'Select time',
+              style: Theme.of(context).textTheme.title,
+            ),
+            const SizedBox(height: 16),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: <Widget>[
+                RaisedButton(
+                  child: Text(DateFormat('yyyy-MM-dd').format(selectedDate)),
+                  onPressed: () async {
+                    final date = await _selectDateTime(context,
+                        initialDate: selectedDate);
+                    if (date == null) return;
+
+                    setState(() {
+                      selectedDate = DateTime(
+                        date.year,
+                        date.month,
+                        date.day,
+                        selectedDate.hour,
+                        selectedDate.minute,
+                      );
+                    });
+
+                    widget.onSelectedDate(selectedDate);
+                  },
+                ),
+                const SizedBox(width: 8),
+                RaisedButton(
+                  child: Text(DateFormat('HH:mm').format(selectedDate)),
+                  onPressed: () async {
+                    final time =
+                        await _selectTime(context, initialDate: selectedDate);
+                    if (time == null) return;
+
+                    setState(() {
+                      selectedDate = DateTime(
+                        selectedDate.year,
+                        selectedDate.month,
+                        selectedDate.day,
+                        time.hour,
+                        time.minute,
+                      );
+                    });
+
+                    widget.onSelectedDate(selectedDate);
+                  },
+                ),
+              ],
+            ),
+            const SizedBox(height: 16),
+            OutlineButton(
+              child: Text('Schedule!'),
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              highlightColor: Colors.orange,
+            ),
+          ],
+        ),
+      );
+}

fast_med_flutter/pubspec.lock

@@ -36,6 +36,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0-nullsafety.1"
+  cloud_firestore:
+    dependency: "direct main"
+    description:
+      name: cloud_firestore
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.14.3+1"
+  cloud_firestore_platform_interface:
+    dependency: transitive
+    description:
+      name: cloud_firestore_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.0"
+  cloud_firestore_web:
+    dependency: transitive
+    description:
+      name: cloud_firestore_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.1+1"
   collection:
     dependency: transitive
     description:
@@ -85,6 +106,76 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "5.2.1"
+  firebase_auth:
+    dependency: "direct main"
+    description:
+      name: firebase_auth
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.18.3+1"
+  firebase_auth_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_auth_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
+  firebase_auth_web:
+    dependency: transitive
+    description:
+      name: firebase_auth_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.2+1"
+  firebase_core:
+    dependency: "direct main"
+    description:
+      name: firebase_core
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.5.2+1"
+  firebase_core_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_core_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  firebase_core_web:
+    dependency: transitive
+    description:
+      name: firebase_core_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.1+1"
+  firebase_helpers:
+    dependency: "direct main"
+    description:
+      name: firebase_helpers
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.2"
+  firebase_storage:
+    dependency: transitive
+    description:
+      name: firebase_storage
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.1.0"
+  firebase_storage_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_storage_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
+  firebase_storage_web:
+    dependency: transitive
+    description:
+      name: firebase_storage_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.1"
   flushbar:
     dependency: transitive
     description:
@@ -109,6 +200,11 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   font_awesome_flutter:
     dependency: transitive
     description:
@@ -144,6 +240,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.16.1"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.2"
   matcher:
     dependency: transitive
     description:
@@ -249,6 +352,48 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.5"
+  shared_preferences:
+    dependency: "direct main"
+    description:
+      name: shared_preferences
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.5.12+4"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.2+4"
+  shared_preferences_macos:
+    dependency: transitive
+    description:
+      name: shared_preferences_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+11"
+  shared_preferences_platform_interface:
+    dependency: transitive
+    description:
+      name: shared_preferences_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.4"
+  shared_preferences_web:
+    dependency: transitive
+    description:
+      name: shared_preferences_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.2+7"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+3"
   simple_gesture_detector:
     dependency: transitive
     description:
@@ -295,7 +440,7 @@ packages:
       name: table_calendar
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   term_glyph:
     dependency: transitive
     description:
@@ -337,7 +482,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.3"
+    version: "1.7.4"
   xdg_directories:
     dependency: transitive
     description:
@@ -347,4 +492,4 @@ packages:
     version: "0.1.2"
 sdks:
   dart: ">=2.10.0-110 <2.11.0"
-  flutter: ">=1.17.0 <2.0.0"
+  flutter: ">=1.20.0 <2.0.0"

fast_med_flutter/pubspec.yaml

@@ -24,11 +24,17 @@ dependencies:
   flutter:
     sdk: flutter
 
+  firebase_helpers: ^0.2.0
+  firebase_auth: ^0.18.0+1
+  cloud_firestore: ^0.14.0
+  firebase_core: ^0.5.0
+  #cloud_firestore: ^0.14.0
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.0
-  table_calendar: ^2,0,1
+  table_calendar: ^2.2.3
+  shared_preferences: ^0.5.4+5
   flutter_login: ^1.0.14
   google_fonts: ^1.1.1
 

hector/main.dart

@@ -1,33 +0,0 @@
-
-import 'package:flutter/cupertino.dart';
-import 'package:flutter_login/flutter_login.dart';
-import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
-import 'register.dart';
-import 'welcome.dart';
-
-// import 'dashboard_screen.dart';
-
-
-
-void main() =>  runApp(MyApp());
-
-
-
-class MyApp extends StatelessWidget{
-  
-  static const String title = "FastMed";
-
-  @override
-  Widget build(BuildContext context){
-    final textTheme = Theme.of(context).textTheme;
-    return MaterialApp(
-      title: title,
-      theme: ThemeData(
-        textTheme: GoogleFonts.cabinTextTheme(textTheme),
-        ),
-      home: WelcomePage(),
-    );
-  }
-
-}

hector/register.dart

@@ -1,161 +0,0 @@
-import 'package:flutter_login/flutter_login.dart';
-import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
-
-//
-//Still to add: 
-//  Email verification, that the input has "@" and "."
-//  Send email and password to database
-//
-//
-//
-
-class RegisterPage extends StatefulWidget{
-  
-  RegisterPage({Key key, this.title}) : super(key: key);
-  final String title;
-
-  @override
-  _RegisterPageState createState() => _RegisterPageState();
-}
-
-class _RegisterPageState extends State<RegisterPage> {
-
-  TextEditingController email;
-  TextEditingController password;
-  TextEditingController confirmpass;
-
-  // Future<List> send_data() async {
-  //   final data = await
-  // }
-
-  String _SamePass(){
-    if(password == confirmpass){
-      return "Same password";
-    }
-    else{
-      return "Different passwords";
-    }
-  }
-
-  Widget _BackButton(BuildContext context){
-    return InkWell(
-      onTap: (){
-        Navigator.pop(context);
-      },
-      child: Row(
-        children: <Widget>[
-          Container(
-            padding: EdgeInsets.only(left: 0, top: 10, bottom: 10),
-            child: Icon(Icons.arrow_back_ios, color: Colors.black),
-          ),
-          Text("Back",
-          style: TextStyle(fontSize: 12, fontWeight: FontWeight.w500))
-        ]
-      ),
-    );
-  }
-
-  Widget _SubmitButton(BuildContext context){
-    return InkWell(
-       onTap: (){
-
-       },
-      child: Container(
-        padding: EdgeInsets.symmetric(vertical: 10),
-        width: 250,
-        alignment: Alignment.center,
-        decoration: BoxDecoration(
-          color: Colors.red,
-          borderRadius: BorderRadius.circular(30),
-        ),
-        child: Text(
-          "Submit",
-          style: TextStyle(fontSize: 22, color: Colors.white),
-        ),
-      ),
-    );
-  }
-
-  Widget _EntryField(String title, TextEditingController controller, {bool pass = false}){
-    return Container(
-      padding: EdgeInsets.only(left: 0, top: 10, bottom: 10),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-      
-        children: <Widget> [
-          Text(
-            title,
-            style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-          ),
-          SizedBox(
-            height: 30
-          ),
-          TextField(
-            controller: controller,
-            obscureText: pass,
-            decoration: InputDecoration(
-              border: (
-                  UnderlineInputBorder()
-              ),
-            ),
-          )
-        ]
-      ),
-      
-    );
-  }
-
-  Widget _Fills(){
-    return Column(
-      children: <Widget> [
-      _EntryField("Email", email),
-      _EntryField("Password", password, pass: true),
-      _EntryField("Confirm Password", confirmpass, pass: true)
-    
-    ]
-    );
-  }
-
-//add column or stack
-  @override
-  Widget build(BuildContext context) {
-    final height = MediaQuery.of(context).size.height;
-    return Scaffold(
-      body: Container(
-        height: height,
-        child: Stack(
-          
-          children: <Widget>[
-            Container(
-              padding: EdgeInsets.symmetric(horizontal: 20),
-              child: SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: <Widget>[
-                     SizedBox(
-                      height: 200,
-                    ),
-                    _Fills(),
-                    //Add code to verify if password and confirm password match
-                    SizedBox(
-                      height: 20,
-                    ),
-                    _SubmitButton(context),
-                  ],
-                ),
-              )
-            ),
-            Positioned(
-            top: 12, left: 20, child: _BackButton(context),
-          ),
-          ],
-          
-        ),
-      )
-    );
-  }
-    
-}
-

hector/welcome.dart

@@ -1,201 +0,0 @@
-
-
-import 'package:flutter_login/flutter_login.dart';
-import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
-import 'register.dart';
-
-
-
-
-
-class WelcomePage extends StatefulWidget {
-  WelcomePage({Key key, this.title}) : super(key: key);
-
-  final String title;
-
-  @override
-  _WelcomePageState createState() => _WelcomePageState();
-}
-
-class _WelcomePageState extends State<WelcomePage> {
-
-  TextEditingController email;
-  TextEditingController password;
-
-  Widget _message(BuildContext context){
-    return RichText(
-      textAlign: TextAlign.center,
-      text: TextSpan(
-          text: "Don't have an account?",
-          style: GoogleFonts.cabin(
-              fontSize: 18,
-              color: Colors.black
-          )
-      ),
-    );
-  }
-
-  Widget _title(BuildContext context){
-    return RichText(
-      textAlign: TextAlign.center,
-      text: TextSpan(
-          text: "Welcome to FastMed",
-          style: GoogleFonts.cabin(
-              fontSize: 30,
-              color: Colors.red
-          )
-      ),
-    );
-
-  }
-
-  Widget _LoginField(String title, TextEditingController controller, {bool pass = false}){
-    return Container(
-      padding: EdgeInsets.only(left: 0, top: 10, bottom: 10),
-      child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-
-          children: <Widget> [
-            Text(
-              title,
-              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
-            ),
-            SizedBox(
-                height: 30
-            ),
-            TextField(
-              controller: controller,
-              obscureText: pass,
-              decoration: InputDecoration(
-                border: (
-                    UnderlineInputBorder(
-
-                    )
-                ),
-              ),
-            ),
-          ]
-      ),
-
-    );
-  }
-
-  Widget _Fills(){
-    return Column(
-        children: <Widget> [
-          _LoginField("Email", email),
-          _LoginField("Password", password, pass: true),
-
-        ]
-    );
-  }
-
-
-
-  // Widget _LogInButton(BuildContext context){
-  //   return InkWell(
-  //     // onTap: () {
-  //     //   Navigator.push(context, MaterialPageRoute(builder: (context)) => __LoginPage())
-  //     // },
-  //     child: Container(
-  //       // width: MediaQuery.of(context).size.width,
-  //       width: 200,
-  //       // height: ,
-  //       padding: EdgeInsets.symmetric(vertical:8),
-  //       alignment: Alignment.center,
-  //       decoration: BoxDecoration(
-  //         color: Colors.red,
-  //         // shape:
-  //
-  //         borderRadius: BorderRadius.circular(30),
-  //       ),
-  //       child: Text(
-  //         "Login",
-  //         style: TextStyle(fontSize: 25, color: Colors.white),
-  //       ),
-  //
-  //     )
-  //   );
-  // }
-
-  Widget _RegisterButton(BuildContext context){
-    return InkWell(
-        onTap: () {
-          Navigator.push(
-              context, MaterialPageRoute(builder: (context) => RegisterPage()));
-        },
-        child: Container(
-          // width: MediaQuery.of(context).size.width,
-          width: 180,
-          padding: EdgeInsets.symmetric(vertical:8),
-          alignment: Alignment.center,
-          decoration: BoxDecoration(
-            color: Colors.red,
-            // shape:
-
-            borderRadius: BorderRadius.circular(30),
-          ),
-          child: Text(
-            "Register",
-            style: TextStyle(fontSize: 22, color: Colors.white),
-          ),
-
-        )
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final height = MediaQuery.of(context).size.height;
-    return Scaffold(
-        body: Container(
-          height: height,
-          child:Container(
-            width: MediaQuery.of(context).size.width,
-            padding: EdgeInsets.symmetric(horizontal: 20),
-            // height: MediaQuery.of(context).size.height,
-            decoration: BoxDecoration(
-                borderRadius: BorderRadius.all(Radius.circular(4)),
-                boxShadow: [
-                  BoxShadow(
-                      color: Colors.white,
-                      offset: Offset(0,3),
-                      blurRadius: 5,
-                      spreadRadius: 2)
-                ]
-
-            ),
-            child: SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: <Widget> [
-                    SizedBox(
-                      height: 80,
-                    ),
-                    _title(context),
-                    SizedBox(
-                      height: 150,
-                    ),
-                    // _LogInButton(context),
-                    _Fills(),
-                    SizedBox(
-                      height: 60,
-                    ),
-                    _message(context),
-                    SizedBox(
-                      height: 10,
-                    ),
-                    _RegisterButton(context),
-                    SizedBox(
-                      height: 10,
-                    )
-                  ],
-                )
-            ),
-          ),
-        )
-    );
-  }
-}