First commit

fast_med_flutter/.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 84f3d28555368a70270e9ac8390a9441df95e752
+  revision: 8874f21e79d7ec66d0457c7ab338348e31b17f1d
   channel: stable
 
 project_type: app

fast_med_flutter/API/.ftpconfig

@@ -0,0 +1,23 @@
+{
+    "protocol": "sftp",
+    "host": "ada.uprrp.edu",
+    "port": 22,
+    "user": "hector.sierra",
+    "pass": "thegamer",
+    "promptForPass": false,
+    "remote": "/home/users/hector.sierra/public_html/FastMed/API/",
+    "local": "/home/boyuva/Projects/Apps/fastmed/API",
+    "agent": "",
+    "privatekey": "",
+    "passphrase": "",
+    "hosthash": "",
+    "ignorehost": true,
+    "connTimeout": 100000,
+    "keepalive": 100000,
+    "keyboardInteractive": false,
+    "keyboardInteractiveForPass": false,
+    "remoteCommand": "",
+    "remoteShell": "",
+    "watch": [],
+    "watchTimeout": 500
+}

fast_med_flutter/API/config.php

@@ -0,0 +1,17 @@
+<?php
+
+	$username="FastMed";//change username
+	$password="skA4KCZUMZfQ6ijL"; //change password
+	$host="localhost";
+	$db_name="FastMed"; //change databasename
+
+	$connect=mysqli_connect($host,$username,$password,$db_name);
+
+	if(!$connect)
+	{
+		echo json_encode("Connection Failed");
+	}
+
+    $connect->set_charset('utf-8');
+
+?>

fast_med_flutter/API/getcitas.php

@@ -0,0 +1,31 @@
+<?php
+    include "config.php";
+
+
+    // $email = mysqli_real_escape_string($connect, $POST['email']);
+    // $password = mysqli_real_escape_string($connect, $POST['password']);
+
+
+    $email = $_POST['email'];
+    $password = $_POST['password'];
+
+
+    $query = "SELECT * FROM Citas";
+
+
+    $results = mysqli_query($connect, $query);
+
+    // var_dump($results);
+
+
+
+    echo $results;
+
+    if($results == True)
+    {
+      echo "user registered";
+    }
+    else {
+        echo "user not registered";
+    }
+?>

fast_med_flutter/API/insert_user.php

@@ -0,0 +1,33 @@
+<?php
+    include "config.php";
+
+
+    // $email = mysqli_real_escape_string($connect, $POST['email']);
+    // $password = mysqli_real_escape_string($connect, $POST['password']);
+
+
+    $email = $_POST['email'];
+    $password = $_POST['password'];
+
+
+    $query = "INSERT INTO Users (email, password) VALUES ('$email', '$password')";
+
+    // var_dump($query);
+    // echo "Despues\n";
+
+    $results = mysqli_query($connect, $query);
+
+    // var_dump($results);
+
+
+
+    echo $results;
+
+    if($results == True)
+    {
+      echo "user registered";
+    }
+    else {
+        echo "user not registered";
+    }
+?>

fast_med_flutter/API/login.php

@@ -0,0 +1,25 @@
+<?php
+    include "config.php";
+
+
+
+    $email = $_POST['email'];
+    $password = $_POST['password'];
+
+
+    $query = "INSERT INTO Users (email, password) VALUES ('$email', '$password')";
+
+
+    $results = mysqli_query($connect, $query);
+
+
+    // echo $results;
+
+    if($results == True)
+    {
+
+    }
+    else {
+        echo "User not registered";
+    }
+?>

fast_med_flutter/API/update_profile.php

@@ -0,0 +1,36 @@
+<?php
+    include "config.php";
+
+
+
+
+    $firstN = $_POST['first_name'];
+    $lastN = $_POST['last_name'];
+    $country = $_POST['country'];
+    $city = $_POST['city'];
+    $phone = $_POST['phone'];
+    $healthcare = $_POST['healthcare'];
+
+
+
+
+// have tp change from insert to update or add update
+    $query = "INSERT INTO Profile (first_name, last_name, country, city, phone_number, healthcare_provider)
+              VALUES ('$firstN', '$lastN', '$country', '$city', $phone, '$healthcare')";
+
+
+    $results = mysqli_query($connect, $query);
+
+
+
+
+    echo $results;
+
+    if($results == True)
+    {
+
+    }
+    else {
+        echo "User not registered";
+    }
+?>

fast_med_flutter/README.md

@@ -1,6 +1,6 @@
-# fast_med_flutter
+# hello
 
-A new Flutter application.
+A new Flutter project.
 
 ## Getting Started
 

fast_med_flutter/android/app/build.gradle

@@ -38,7 +38,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.fast_med_flutter"
+        applicationId "com.example.hello"
         minSdkVersion 16
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()

fast_med_flutter/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.fast_med_flutter">
+    package="com.example.hello">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

fast_med_flutter/android/app/src/main/AndroidManifest.xml

@@ -1,16 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.fast_med_flutter">
+    package="com.example.hello">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
-    <!-- Required to fetch data from the internet. -->
-    <uses-permission android:name="android.permission.INTERNET" />
-
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="fast_med_flutter"
+        android:label="hello"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

fast_med_flutter/android/app/src/main/kotlin/com/example/fast_med_flutter/MainActivity.kt → fast_med_flutter/android/app/src/main/kotlin/com/example/hello/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.example.fast_med_flutter
+package com.example.hello
 
 import io.flutter.embedding.android.FlutterActivity
 

fast_med_flutter/android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.fast_med_flutter">
+    package="com.example.hello">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

fast_med_flutter/ios/Runner.xcodeproj/project.pbxproj

@@ -299,7 +299,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.fastMedFlutter;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.hello;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -431,7 +431,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.fastMedFlutter;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.hello;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -458,7 +458,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.fastMedFlutter;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.hello;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

fast_med_flutter/ios/Runner/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>fast_med_flutter</string>
+	<string>hello</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

fast_med_flutter/lib/OfficeScreen.dart

@@ -0,0 +1,61 @@
+import 'package:flutter/material.dart';
+import 'dart:convert';
+import 'package:hello/Offices.dart';
+import 'package:hello/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]
+      ),
+    );
+    print(ofi.variable);
+    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/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/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 'package:hello/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/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/home.dart

@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+
+class HomePage extends StatelessWidget{
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Container(
+      padding: EdgeInsets.all(25.0),
+      child: Text("HOME PAGE"),
+    );
+
+  }
+}

fast_med_flutter/lib/main.dart

@@ -1,19 +1,36 @@
-import 'package:fast_med_flutter/routes/home.dart';
-import 'package:fast_med_flutter/routes/ver_oficinas.dart';
-import 'package:fast_med_flutter/routes/calendario.dart';
-import 'package:fast_med_flutter/routes/main.dart';
-import 'package:fast_med_flutter/routes/register.dart';
-import 'package:fast_med_flutter/routes/welcome.dart';
+
+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 'package:hello/profileinfo.dart';
+import 'register.dart';
+import 'welcome.dart';
+import 'navigation.dart';
+import 'profileinfo.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: NavigationPage(),
+    );
+  }
 
-void main() => runApp(MaterialApp(
-    initialRoute: '/home',
-    routes: {
-      '/home': (context) => Home(),
-      '/verOficinas': (context) => VerOficinas(),
-      '/calendario': (context) => Calendario(),
-      '/welcome': (context) => WelcomePage(),
-      '/register': (context) => RegisterPage(),
-      '/MyApp': (context) => MyApp(),
-    }
-));
+}

fast_med_flutter/lib/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 'package:hello/home.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';
+
+
+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(),
+    AppointmentPage()
+  ];
+
+  // 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/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/register.dart

@@ -0,0 +1,274 @@
+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 "."
+//  Hash the passwords
+//  Allow users to login
+//  Verify password and confirm password match
+//
+
+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 name = new TextEditingController();
+  TextEditingController email = new TextEditingController();
+  TextEditingController password = new TextEditingController() ;
+  TextEditingController confirmpass = new TextEditingController();
+
+
+  Future<List> send_data() async {
+
+
+    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");
+    }
+
+  }
+
+  bool _SamePass() {
+    if (password.text == confirmpass.text) {
+      return true;
+    }
+    else {
+      return false;
+    }
+  }
+
+  _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: () {
+        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();
+        // _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,
+        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: 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(
+
+              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: 700,
+                          ),
+                          _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),
+                ),
+              ],
+
+            ),
+          )
+      );
+    }
+  }
+

fast_med_flutter/lib/routes/calendario.dart

@@ -1,347 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:intl/date_symbol_data_local.dart';
-import 'package:table_calendar/table_calendar.dart';
-
-// Dias sin Citas Disponibles
-final Map<DateTime, List> _holidays = {
-  DateTime(2020, 11, 6): ['No Hay Citas'],
-  DateTime(2020, 11, 3): ['Dia Elecciones'],
-
-};
-
-void main() {
-  initializeDateFormatting().then((_) => runApp(Calendario()));
-}
-
-
-
-class Calendario extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      title: 'Citas Disponibles',
-      theme: ThemeData(
-        primarySwatch: Colors.blue,
-      ),
-      home: MyHomePage(title: 'Citas Disponibles'),
-    );
-  }
-}
-
-class MyHomePage extends StatefulWidget {
-  MyHomePage({Key key, this.title}) : super(key: key);
-
-  final String title;
-
-  @override
-  _MyHomePageState createState() => _MyHomePageState();
-}
-
-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();
-
-    _events = {
-
-      _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 _onDaySelected(DateTime day, List events, List holidays) {
-    print('CALLBACK: _onDaySelected');
-    setState(() {
-      _selectedEvents = events;
-    });
-  }
-
-  void _onVisibleDaysChanged(DateTime first, DateTime last, CalendarFormat format) {
-    print('CALLBACK: _onVisibleDaysChanged');
-  }
-
-  void _onCalendarCreated(DateTime first, DateTime last, CalendarFormat format) {
-    print('CALLBACK: _onCalendarCreated');
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(widget.title),
-      ),
-      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(
-          children: <Widget>[
-            Container(
-              padding: EdgeInsets.only(left: 0, top:10, bottom: 10),
-              child: Icon(Icons.arrow_back_ios, color: Colors.black),
-            ),
-            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),
-        ),
-      ),
-      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),
-      ),
-      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,
-          ),
-        ),
-      ),
-    );
-  }
-
-  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'),
-              onPressed: () {
-                setState(() {
-                  _calendarController.setCalendarFormat(CalendarFormat.twoWeeks);
-                });
-              },
-            ),
-            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(),
-    );
-  }
-}

fast_med_flutter/lib/routes/home.dart

@@ -1,87 +0,0 @@
-import 'package:flutter/material.dart';
-
-class Home extends StatefulWidget{
-  @override
-  _HomeState createState() => _HomeState();
-}
-
-class _HomeState extends State<Home>{
-  @override
-  Widget build(BuildContext context){
-    return Scaffold(
-      appBar: AppBar(
-        title: Text('Bienvenido'),
-        centerTitle: true,
-      ),
-      body: Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          children: [
-            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('Calendario',
-                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,
-
-            ),
-            ],
-        ),
-
-      ),
-
-    );
-  }
-}

fast_med_flutter/lib/routes/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(),
-    );
-  }
-
-}

fast_med_flutter/lib/routes/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),
-          ),
-          ],
-          
-        ),
-      )
-    );
-  }
-    
-}
-

fast_med_flutter/lib/routes/ver_oficinas.dart

@@ -1,91 +0,0 @@
-import 'package:flutter/material.dart';
-import '../widgets/DataTableMySqlDemo/Oficina.dart';
-import '../widgets/DataTableMySqlDemo/Services.dart';
-import 'dart:async';
-
-class VerOficinas extends StatefulWidget{
-  VerOficinas() : super();
-  final String title = 'Oficinas';
-  @override
-  State<StatefulWidget> viewOficinas() {
-    //no se que hago, quizas no lo necesite
-    return null;
-  }
-  _VerOficinasState createState() => _VerOficinasState();
-}
-
-class _VerOficinasState extends State<VerOficinas>{
-  List<Oficina> _oficinas;
-  List<Oficina> _filterOficinas;
-  GlobalKey<ScaffoldState> _scaffoldKey;
-  TextEditingController _nameController;//
-  Oficina _selectOficina;
-  bool _isUpdateing;
-
-  @override
-  void initState() {
-    super.initState();
-    _oficinas = [];
-    // _filterOficinas = [];
-    _isUpdateing = false;
-    _scaffoldKey = GlobalKey();
-    _nameController = TextEditingController();
-    _getOficinas();
-  }
-
-  _getOficinas() {
-
-    return _oficinas;
-  }
-
-
-  @override
-  Widget build(BuildContext context){
-    Services.getOficinas().then((Oficinas) {
-      setState(() {
-        _oficinas = Oficinas;
-        //print(_oficinas);
-        //print("Length ${Oficinas.length}");
-      });
-
-    });
-    List<Oficina> lista =  _oficinas;
-    return Scaffold(
-      key: _scaffoldKey,
-      appBar: AppBar(
-        title: Text('Oficinas'),
-        centerTitle: true,
-        backgroundColor: Colors.purple,
-
-      ),
-      body: Center(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-            children: lista.map((Oficina data) {
-              return FlatButton(
-                minWidth: 300.0,
-                height: 100.0,
-                child: Text(data.name,
-                style: TextStyle(fontSize: 36),
-                ),
-                onPressed: () {
-                  print(data.name);
-                },
-                padding: new EdgeInsets.all(0.0),
-                color: Colors.purple,
-
-              );
-            }).toList(),
-          ),
-          // child: FlatButton(
-          //   onPressed: (){
-          //     _getOficinas();
-          //   },
-          //   child: Text('Ver Oficinas'),
-          //   color: Colors.purple,
-          // )
-      ),
-
-    );
-  }
-}

fast_med_flutter/lib/routes/welcome.dart → fast_med_flutter/lib/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,
                     )
                   ],
                 )

fast_med_flutter/lib/widgets/DataTableMySqlDemo/Oficina.dart

@@ -1,13 +0,0 @@
-class Oficina {
-  String id;
-  String name;
-
-  Oficina({this.id, this.name});
-
-  factory Oficina.fromJson(Map<String, dynamic> json) {
-    return Oficina (
-      id :json['id'] as String,
-      name: json['name'] as String,
-    );
-  }
-}

fast_med_flutter/lib/widgets/DataTableMySqlDemo/Services.dart

@@ -1,46 +0,0 @@
-import 'dart:convert';
-import 'package:http/http.dart'
-  as http;
-import 'Oficina.dart';
-
-class Services {
-  static const URL = 'https://ada.uprrp.edu/~oniel.mendez2/json/oficinas.php';
-  static const URL_GET_ALL = 'ada.uprrp.edu/~oniel.mendez2/json/getOficinas.php';
-  static const URL_LOCAL = 'http://localhost/test/getOficinas.json';
-  static const _GET_ALL = "GET_ALL";
-
-  //get all oficinas
-  static Future<List<Oficina>> getOficinas() async {
-    try {
-      var map = Map<String, dynamic>();
-      map['action'] = _GET_ALL;
-      //print('antes');
-      final response = await http.get(URL_GET_ALL);
-      // print('despues');
-      // print('getOficinas Response: ${response.body}');
-      if (200 == response.statusCode) {
-        List<Oficina> list = parseResponse(response.body);
-
-        return list;
-      } else {
-        final response = '[{"id":"1","name":"no"},{"id":"2","name":"respondio"},{"id":"3","name":"code: 200"}]';
-        List<Oficina> list = parseResponse(response);
-        return list; // return an empty list on exception/error
-      }
-    } catch (e) {
-      final response = '[{"id":"1","name":"este"},{"id":"2","name":"es el"},{"id":"3","name":"catch(e)"}]';
-      List<Oficina> list = parseResponse(response);
-      return list; // return an empty list on exception/error
-    }
-  }
-
-  static List<Oficina> parseResponse(String responseBody) {
-    final parsed = json.decode(responseBody).cast<Map<String, dynamic>>();
-    return parsed.map<Oficina>((json) => Oficina.fromJson(json)).toList();
-  }
-
-  Future<http.Response> fetchAlbum() {
-    return http.get('https://jsonplaceholder.typicode.com/albums/1');
-  }
-
-}

fast_med_flutter/lib/widgets/MySQL_DataTable/dud.dart

@@ -1 +0,0 @@
-import 'dart:convert';

fast_med_flutter/lib/widgets/dud.dart

@@ -1 +0,0 @@
-import 'dart:convert';

fast_med_flutter/pubspec.lock

@@ -178,7 +178,7 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.24"
+    version: "1.6.22"
   path_provider_linux:
     dependency: transitive
     description:
@@ -192,21 +192,21 @@ packages:
       name: path_provider_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.4+6"
+    version: "0.0.4+4"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.3"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.4+3"
+    version: "0.0.4+1"
   pedantic:
     dependency: transitive
     description:
@@ -248,14 +248,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.5"
-  simple_gesture_detector:
-    dependency: transitive
-    description:
-      name: simple_gesture_detector
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.4"
+    version: "2.1.4+1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -289,13 +282,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0-nullsafety.1"
-  table_calendar:
-    dependency: "direct main"
-    description:
-      name: table_calendar
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.3.0"
   term_glyph:
     dependency: transitive
     description:

fast_med_flutter/pubspec.yaml

@@ -1,5 +1,5 @@
-name: fast_med_flutter
-description: A new Flutter application.
+name: hello
+description: A new Flutter project.
 
 # The following line prevents the package from being accidentally published to
 # pub.dev using `pub publish`. This is preferred for private packages.
@@ -21,19 +21,20 @@ environment:
   sdk: ">=2.7.0 <3.0.0"
 
 dependencies:
+  http: ^0.12.2
   flutter:
     sdk: flutter
+  
+  
 
 
   # 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
   flutter_login: ^1.0.14
   google_fonts: ^1.1.1
 
-  #
-  http: ^0.12.2
+
 
 dev_dependencies:
   flutter_test:

fast_med_flutter/test/widget_test.dart

@@ -8,12 +8,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:fast_med_flutter/main.dart';
+import 'package:hello/main.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(MaterialApp());
+    await tester.pumpWidget(MyApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);