sprint 3 hector integrado

fast_med_flutter/lib/main.dart

@@ -10,7 +10,7 @@ import 'package:flutter/material.dart';
 import 'package:fast_med_flutter/routes/especialidades.dart';
 
 void main() => runApp(MaterialApp(
-    initialRoute: '/home',
+    initialRoute: '/welcome',
     routes: {
       '/home': (context) => Home(),
       '/verOficinas': (context) => VerOficinas(),

fast_med_flutter/lib/routes/OfficeScreen.dart

@@ -0,0 +1,60 @@
+import 'package:flutter/material.dart';
+import 'dart:convert';
+import 'Offices.dart';
+import 'appointments.dart';
+import 'package:flutter/foundation.dart';
+
+
+class OfficesScreen extends StatelessWidget {
+  final List<Offices> off;
+  Offices ofi;
+  // final Offices Of;
+  // final offlist = List<Offices>.generate(
+  //   2,
+  //       (i) => Offices(
+  //         'Office $i',
+  //         docs[i], spec[i], addrs[i],
+  //   ),
+  // );
+
+  var docs = ["Collazo", "Albizu"];
+  var spec = ["General", "Pediatra"];
+  var addrs = ["Bo. Montellano, Cayey", "Las Dalias, Mayagüez"];
+
+  //requiring the list of todos
+  OfficesScreen({Key key, @required this.off}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    // print(docs[0]);
+
+    final offlist = List<Offices>.generate(
+      2,
+          (i) => Offices(
+            'Office $i',
+            // "sds", "gfdf", "fvfgv",
+            docs[i], spec[i], addrs[i]
+      ),
+    );
+    return Scaffold(
+
+      appBar: AppBar(
+        title: Text('Todos'),
+      ),
+      //passing in the ListView.builder
+      body: ListView.builder(
+        itemCount: offlist.length,
+        itemBuilder: (context, index) {
+          return ListTile(
+              title: Text(offlist[index].office),
+              onTap: (){
+                Navigator.push(context, MaterialPageRoute(builder: (context) => 
+                AppointmentPage(O: offlist[index])),
+                );
+              },
+          );
+        },
+      ),
+    );
+  }
+}

fast_med_flutter/lib/routes/Offices.dart

@@ -0,0 +1,69 @@
+// import 'package:flutter/material.dart';
+// import 'dart:convert';
+// import 'package:flutter/foundation.dart';
+// import 'OfficeScreen.dart';
+// import 'appointments.dart';
+//
+// class Officess {
+//   final String office;
+//   final String doctor;
+//   final String specialty;
+//   final String address;
+//
+//   Officess({this.office, this.doctor, this.specialty, this.address});
+//
+//   factory Officess.fromJson(Map<String, dynamic> json) {
+//     return Officess(
+//       office: json['office'],
+//       doctor: json['doctor'],
+//       specialty: json['id'],
+//       address: json['title'],
+//     );
+//   }
+// }
+
+class Offices {
+  final String office;
+  final String doctor;
+  final String specialty;
+  final String address;
+
+  var variable = 32;
+
+  var docs = ["Collazo", "Albizu"];
+  var spec = ["General", "Pediatra"];
+  var addrs = ["Bo. Montellano, Cayey", "Las Dalias, Mayagüez"];
+
+  Offices(this.office, this.doctor, this.specialty, this.address);
+
+
+}
+// var docs = List<String> ("juan", "pedro");
+
+
+// final off = List<Offices>.generate(
+//   2,
+//       (i) => Offices(
+//     'Office $i',
+//     docs[i], spec[i], addrs[i],
+//   ),
+// );
+
+
+
+
+
+
+// final off = List<Offices>.generate(
+//   2,
+//       (i) => Offices(
+//     'Office $i',
+//     docs[i],
+//     spec[i],
+//     addrs[i],
+//   ),
+// );
+
+
+
+

fast_med_flutter/lib/routes/appointments.dart

@@ -0,0 +1,135 @@
+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 'Offices.dart';
+import 'dynamic.dart';
+import 'Offices.dart';
+import 'OfficeScreen.dart';
+import 'package:flutter/foundation.dart';
+import 'package:http/http.dart' as http;
+
+//This page only works when called by other OfficeScreenPage()
+//Need to add the functionality to work on its own
+
+
+class AppointmentPage extends StatelessWidget {
+
+
+  final Offices O;
+  AppointmentPage({Key key, @required this.O}) :super(key: key);
+  // AppointmentPage({Key key, @required this.O}) : super(key: key);
+
+  // final String title;
+  //
+  // Future<http.Response> fetchAlbum() {
+  //   return http.get('https://ada.uprrp.edu/~hector.sierra/FastMed/API/API/getcitas.php');
+  // }
+
+
+
+  // List<dynamicWidget> listDynamic = [];
+  // List<String> data = [];
+  // Icon floatingIcon = new Icon(Icons.add);
+  //
+  // addDynamic() {
+  //   if (data.length != 0) {
+  //     floatingIcon = new Icon(Icons.add);
+  //     data = [];
+  //     listDynamic = [];
+  //     print('if');
+  //   }
+  //   setState(() {});
+  //   if (listDynamic.length >= 5) {
+  //     return;
+  //   }
+  //   listDynamic.add(new dynamicWidget());
+  // }
+  //
+
+  // var docs = ["Collazo", "Albizu"];
+  // var spec = ["General", "Pediatra"];
+  // var addrs = ["Bo. Montellano, Cayey", "Las Dalias, Mayagüez"];
+
+
+  @override
+  Widget card() {
+  return SizedBox(
+    width: 380,
+    height: 150,
+      child: Card(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              ListTile(
+
+                leading: Icon(
+                  Icons.check,
+                  color: Colors.green,
+                  size: 60,
+              ),
+                title: Text( O.doctor + "\n" + O.specialty, textScaleFactor: 1.5,),
+                subtitle: Text(O.address, textScaleFactor: 1.45,),
+                trailing: Text("\n10:45 - 11:45      ", textScaleFactor: 1.30,),
+
+              ),
+              // ListTile(
+              //   leading: Icon(
+              //     Icons.check,
+              //     color: Colors.green,
+              //     size: 60,
+              //   ),
+              //   title: Text("Figueroa" + "\n" + "Gastrointerologo", textScaleFactor: 1.5,),
+              //   subtitle: Text("Las Dalias, Mayagüez", textScaleFactor: 1.45,),
+              //   trailing: Text("\n10:45 - 11:45      ", textScaleFactor: 1.30,),
+              //
+              // )
+           ],
+          ),
+        ),
+      );
+    }
+
+  @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,
+                    ),
+                    card(),
+                    SizedBox(
+                      height: 25,
+                    ),
+                    // card(docs[1], spec[1], addrs[1]),
+                  ],
+                )
+            ),
+          ),
+        )
+    );
+  }
+}

fast_med_flutter/lib/routes/dynamic.dart

@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+
+
+class dynamicWidget extends StatelessWidget {
+  TextEditingController Product = new TextEditingController();
+  TextEditingController Price = new TextEditingController();
+
+  @override
+  Widget build(BuildContext context) {
+
+    Widget card() {
+      return SizedBox(
+        width: 380,
+        height: 140,
+        child: Card(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              const ListTile(
+
+                leading: Icon(
+                  Icons.check,
+                  color: Colors.green,
+                  size: 60,
+                ),
+                title: Text("\nVacunación\nDr. Jímenez", textScaleFactor: 1.15,),
+                subtitle: Text("Bo. Montellano, Cayey", textScaleFactor: 1.25,),
+                trailing: Text("\n10:45 - 11:45      ", textScaleFactor: 1.30,),
+
+              ),
+            ],
+          ),
+        ),
+      );
+    }
+
+  }
+
+}

fast_med_flutter/lib/routes/navigation.dart

@@ -0,0 +1,88 @@
+
+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 'profileinfo.dart';
+import 'appointments.dart';
+import 'package:http/http.dart' as http;
+import 'OfficeScreen.dart';
+import 'Offices.dart';
+import 'package:fast_med_flutter/routes/home.dart';
+
+
+class NavigationPage extends StatefulWidget{
+
+  NavigationPage({Key key, this.title}) : super(key: key);
+  final String title;
+
+  @override
+  _NavigationPageState createState() => _NavigationPageState();
+}
+
+class _NavigationPageState extends State<NavigationPage>{
+
+
+  int _selectedIndex = 0;
+
+  static const TextStyle optionStyle = TextStyle(fontSize: 30, fontWeight: FontWeight.bold);
+
+  final _pageOptions = [
+    OfficesScreen(),
+    ProfilePage(),
+    Home()
+  ];
+
+  // static const List<Navigator> _widgetOptions = <Navigator>[
+  // //   Navigator.push(
+  // // context, MaterialPageRoute(builder: (context) => ProfilePage()));
+  // ];
+
+
+  // void _onItemTapped(int index) {
+  //   setState(() {
+  //     _selectedIndex = index;
+  //   });
+  // }
+  @override
+  Widget build(BuildContext context) {
+    final height = MediaQuery.of(context).size.height;
+    return Scaffold(
+      // appBar: AppBar(
+      //   title: Text("Title"),
+      // ),
+      body:  _pageOptions[_selectedIndex],
+      bottomNavigationBar: BottomNavigationBar(
+        onTap: (int index){
+          setState(() {
+            _selectedIndex = index;
+          });
+        },
+          selectedItemColor: Colors.red[800],
+        currentIndex: _selectedIndex,
+        // onTap: ,
+        // currentIndex: ,
+        // selectedItemColor: Colors.red, onTap: ,
+        //
+
+        items: [
+          BottomNavigationBarItem(icon: Icon(Icons.medical_services),
+              label: 'FastMed'),
+          BottomNavigationBarItem(icon: Icon(Icons.person_rounded),
+              label: 'Profile'),
+          BottomNavigationBarItem(icon: Icon(Icons.event_note_rounded),
+              label: 'Appointments')
+        ],
+
+      ),
+      // body: Container(
+      //
+      // ),
+    );
+    // TODO: implement build
+    throw UnimplementedError();
+  }
+
+
+}

fast_med_flutter/lib/routes/profileinfo.dart

@@ -0,0 +1,226 @@
+
+
+import 'package:flutter_login/flutter_login.dart';
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'register.dart';
+import 'package:http/http.dart' as http;
+
+
+
+class ProfilePage extends StatefulWidget{
+
+  ProfilePage({Key key, this.title}) : super(key: key);
+  final String title;
+
+  @override
+  _ProfilePageState createState() => _ProfilePageState();
+}
+
+class _ProfilePageState extends State<ProfilePage>{
+  TextEditingController first_name = new TextEditingController();
+  TextEditingController last_name = new TextEditingController() ;
+  TextEditingController country = new TextEditingController();
+  TextEditingController city = new TextEditingController();
+  TextEditingController phone = new TextEditingController();
+  TextEditingController healthcare = new TextEditingController();
+
+  // trying to create a an array of controllers
+  // final List<TextEditingController> controllers = List();
+  // controllers.add(first_name);
+
+  Future<List> clear_controllers() async {
+    first_name.text = "";
+    last_name.text = "";
+    country.text = "";
+    city.text = "";
+    phone.text = "";
+    healthcare.text = "";
+  }
+
+
+  _Notice(BuildContext context, String message, int r, int g, int b){
+    showDialog<void>(
+        context: context,
+        barrierDismissible: false,
+        barrierColor: Colors.transparent,
+
+        builder: (BuildContext context){
+          Future.delayed(Duration(seconds: 3), () {
+            Navigator.of(context).pop(true);
+          });
+
+          return Material(
+              color: Colors.transparent,
+              child: InkResponse(
+                child: Container(
+
+                  alignment: Alignment.bottomCenter,
+                  padding: EdgeInsets.only(bottom: 130),
+                  child: Text(
+                    message,
+                    style: TextStyle(fontSize: 20, color: Color.fromARGB(255, r, g, b)),),
+
+                ),
+              )
+          );  
+        }
+      );
+  }
+  Future<List> send_data() async {
+
+
+    var url = 'https://ada.uprrp.edu/~hector.sierra/FastMed/UpdateProfile.php';
+    final data = await http.post(url, body: {
+      "first_name": first_name.text,
+      "last_name": last_name.text,
+      "country": country.text,
+      "city": city.text,
+      "phone": phone.text,
+      "healthcare": healthcare.text,
+    });
+    print(data.body);
+    if("User not registered" == data.body){
+      _Notice(context, "Error, unable to update profile", 255, 0, 0);
+    }
+    else{
+      _Notice(context, "Profile Updated", 0, 255, 0);
+    }
+
+  }
+
+  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: 14, fontWeight: FontWeight.w500))
+          ]
+      ),
+    );
+  }
+
+
+  Widget _SubmitButton(BuildContext context) {
+    return InkResponse(
+      onTap: () {
+        send_data();
+        // clear_controllers();
+      },
+      child: Material(
+        borderRadius: BorderRadius.circular(30),
+        elevation: 3,
+        child: Container(
+          padding: EdgeInsets.symmetric(vertical: 10),
+          width: 250,
+          alignment: Alignment.center,
+          decoration: BoxDecoration(
+            color: Colors.red,
+            borderRadius: BorderRadius.circular(30),
+          ),
+
+          child: Text(
+            "Update",
+            style: TextStyle(fontSize: 22, color: Colors.white),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _Fills() {
+    return Column(
+        children: <Widget>[
+          _EntryField("First Name", first_name),
+          _EntryField("Last Name", last_name),
+          _EntryField("Country", country),
+          _EntryField("City", city),
+          _EntryField("Phone Number", phone),
+          _EntryField("Healthcare Provider", healthcare),
+        ]
+    );
+  }
+
+  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: 18),
+            ),
+            SizedBox(
+                height: 30
+            ),
+            TextField(
+              controller: controller,
+              obscureText: pass,
+              decoration: InputDecoration(
+                border: (
+                    UnderlineInputBorder()
+                ),
+              ),
+            )
+          ]
+      ),
+
+    );
+  }
+
+
+
+  @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: 60,
+                        ),
+                        _Fills(),
+                        //Add code to verify if password and confirm password match
+                        SizedBox(
+                          height: 80,
+                        ),
+                        _SubmitButton(context),
+                        SizedBox(
+                          height: 50,
+                        ),
+                        // ElevatedButton(
+                        //     onPressed: send_data, child: Text("Register")),
+                      ],
+                    ),
+                  )
+              ),
+              // Positioned(
+              //   top: 15, left: 20, child: _BackButton(context),
+              // ),
+            ],
+
+          ),
+        )
+    );
+  }
+}

fast_med_flutter/lib/routes/register.dart

@@ -1,13 +1,19 @@
+import 'dart:convert';
+
 import 'package:flutter_login/flutter_login.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:http/http.dart' as http;
+import 'dart:convert' as convert;
+
+
 
 //
 //Still to add: 
 //  Email verification, that the input has "@" and "."
-//  Send email and password to database
-//
-//
+//  Hash the passwords
+//  Allow users to login
+//  Verify password and confirm password match
 //
 
 class RegisterPage extends StatefulWidget{
@@ -20,48 +26,138 @@ class RegisterPage extends StatefulWidget{
 }
 
 class _RegisterPageState extends State<RegisterPage> {
+  // TextEditingController name = new TextEditingController();
+  TextEditingController email = new TextEditingController();
+  TextEditingController password = new TextEditingController() ;
+  TextEditingController confirmpass = new TextEditingController();
 
-  TextEditingController email;
-  TextEditingController password;
-  TextEditingController confirmpass;
 
-  // Future<List> send_data() async {
-  //   final data = await
-  // }
+  Future<List> send_data() async {
 
-  String _SamePass(){
-    if(password == confirmpass){
-      return "Same password";
+
+    var url = 'https://ada.uprrp.edu/~hector.sierra/FastMed/API/insertuser.php';
+    final data = await http.post(url, body: {
+        "email": email.text,
+        "password": password.text,
+      });
+    print(data.body);
+    if("user not registered" == data.body){
+      print("maybe we use this");
     }
-    else{
-      return "Different passwords";
+
+  }
+
+  bool _SamePass() {
+    if (password.text == confirmpass.text) {
+      return true;
+    }
+    else {
+      return false;
     }
   }
 
-  Widget _BackButton(BuildContext context){
+  _Alerts(BuildContext context){
+
+    TextEditingController msg = new TextEditingController();
+
+
+   //
+   //Useful code for adding pop up messages with animations
+   //
+   //
+
+    // Navigator.of(context).push(
+    //
+    //   PageRouteBuilder(
+    //       transitionDuration: Duration(seconds: 2),
+    //       pageBuilder: (context, animation, secAnimation ) => AlertDialog(
+    //         title: Text("Testing"),
+    //         elevation: 1,
+    //         backgroundColor: Colors.transparent,
+    //
+    //       ),
+    //       opaque: false,
+    //   )
+    //
+    // );
+
+    showDialog<void>(
+      context: context,
+      barrierDismissible: false,
+      barrierColor: Colors.transparent,
+
+      builder: (BuildContext context){
+        Future.delayed(Duration(seconds: 2), () {
+          Navigator.of(context).pop(true);
+        });
+
+        return Material(
+          color: Colors.transparent,
+          child: InkResponse(
+            child: Container(
+
+              alignment: Alignment.bottomCenter,
+              padding: EdgeInsets.only(bottom: 30),
+              child: Text(
+                  "Email address is already registered",
+                  style: TextStyle(fontSize: 18, color: Colors.red),),
+
+            ),
+          )
+        );
+
+        // return Banner(
+        //   location: BannerLocation.bottomEnd,
+        //   message: "Hello there",
+        //
+        // );
+
+        // // allows the message to disappear
+        // Future.delayed(Duration(seconds: 2), () {
+        //   Navigator.of(context).pop(true);
+        // });
+        // return AlertDialog(
+        //   buttonPadding: ,
+        //   title: Text("Testing"),
+        //   elevation: 1,
+        //   backgroundColor: Colors.transparent,
+        // );
+      }
+    );
+  }
+
+
+
+  Widget _BackButton(BuildContext context) {
     return InkWell(
-      onTap: (){
+      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))
-        ]
+          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: 14, fontWeight: FontWeight.w500))
+          ]
       ),
     );
   }
 
-  Widget _SubmitButton(BuildContext context){
-    return InkWell(
-       onTap: (){
-
-       },
-      child: Container(
+  Widget _SubmitButton(BuildContext context) {
+    return InkResponse(
+      onTap: () {
+        send_data();
+        // _Alert(BuildContext);
+        // _Match(context);
+        _Alerts(context);
+      },
+      child: Material(
+        borderRadius: BorderRadius.circular(30),
+        elevation: 3,
+        child: Container(
         padding: EdgeInsets.symmetric(vertical: 10),
         width: 250,
         alignment: Alignment.center,
@@ -69,93 +165,110 @@ class _RegisterPageState extends State<RegisterPage> {
           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 _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: 18),
               ),
-            ),
-          )
-        ]
-      ),
-      
-    );
-  }
+              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(
-          
+    Widget _Fills() {
+      return Column(
           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),
-                  ],
+            _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>[
+                          // Text("Username", style: TextStyle(fontSize: 18.0),),
+                          // TextField(
+                          //   controller: name,
+                          //   decoration: InputDecoration(
+                          //       hintText: 'name'
+                          //   ),
+                          // ),
+                          SizedBox(
+                            height: 100,
+                          ),
+                          _Fills(),
+                          //Add code to verify if password and confirm password match
+                          SizedBox(
+                            height: 20,
+                          ),
+                          _SubmitButton(context),
+                          SizedBox(
+                            height: 10,
+                          ),
+                          // ElevatedButton(
+                          //     onPressed: send_data, child: Text("Register")),
+                        ],
+                      ),
+                    )
                 ),
-              )
+                Positioned(
+                  top: 15, left: 20, child: _BackButton(context),
+                ),
+              ],
+
             ),
-            Positioned(
-            top: 12, left: 20, child: _BackButton(context),
-          ),
-          ],
-          
-        ),
-      )
-    );
+          )
+      );
+    }
   }
-    
-}
 

fast_med_flutter/lib/routes/welcome.dart

@@ -1,10 +1,14 @@
-
-
+import 'dart:convert';
+// import 'dart:html';
+import 'dart:io';
+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 'package:http/http.dart' as http;
+import 'dart:convert' as convert;
+import 'navigation.dart';
 
 
 
@@ -19,9 +23,34 @@ class WelcomePage extends StatefulWidget {
 }
 
 class _WelcomePageState extends State<WelcomePage> {
+  var Token;
+  TextEditingController email = new TextEditingController();
+  TextEditingController password = new TextEditingController();
+
+
+  Future<List> send_data() async {
+
+    var url = 'https://ada.uprrp.edu/~hector.sierra/FastMed/API/login.php';
+    http.Response response = await http.post(url, body: {
+      "email": email.text,
+      "password": password.text,
+    });
+    print(response.body);
+    print(response.statusCode);
+    print(HttpStatus.ok);
+    if("user not found" == response.body){
+      print("maybe we use this");
+    }
+    else{
+      print("User found");
+      Token = email.text;
+
+      Navigator.push(
+          context, MaterialPageRoute(builder: (context) => NavigationPage()));
+
+    }
+  }
 
-  TextEditingController email;
-  TextEditingController password;
 
   Widget _message(BuildContext context){
     return RichText(
@@ -59,7 +88,7 @@ class _WelcomePageState extends State<WelcomePage> {
           children: <Widget> [
             Text(
               title,
-              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
+              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 18),
             ),
             SizedBox(
                 height: 30
@@ -81,6 +110,8 @@ class _WelcomePageState extends State<WelcomePage> {
     );
   }
 
+
+
   Widget _Fills(){
     return Column(
         children: <Widget> [
@@ -93,31 +124,31 @@ class _WelcomePageState extends State<WelcomePage> {
 
 
 
-  // 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 _SubmitButton(BuildContext context){
+    return InkResponse(
+      onTap: (){
+
+        send_data();
+
+
+      },
+      child: Container(
+        padding: EdgeInsets.symmetric(vertical: 10),
+        width: 180,
+        alignment: Alignment.center,
+        decoration: BoxDecoration(
+          color: Colors.red,
+          borderRadius: BorderRadius.circular(30),
+        ),
+        child: Text(
+          "Login",
+          style: TextStyle(fontSize: 22, color: Colors.white),
+        ),
+      ),
+    );
+  }
+
 
   Widget _RegisterButton(BuildContext context){
     return InkWell(
@@ -183,13 +214,17 @@ class _WelcomePageState extends State<WelcomePage> {
                     SizedBox(
                       height: 60,
                     ),
+                    _SubmitButton(context),
+                    SizedBox(
+                      height: 45,
+                    ),
                     _message(context),
                     SizedBox(
-                      height: 10,
+                      height: 15,
                     ),
                     _RegisterButton(context),
                     SizedBox(
-                      height: 10,
+                      height: 20,
                     )
                   ],
                 )