rutas a files de hector

fast_med_flutter/lib/main.dart

@@ -1,6 +1,9 @@
 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/material.dart';
 
 void main() => runApp(MaterialApp(
@@ -9,5 +12,8 @@ void main() => runApp(MaterialApp(
       '/home': (context) => Home(),
       '/verOficinas': (context) => VerOficinas(),
       '/calendario': (context) => Calendario(),
+      '/welcome': (context) => WelcomePage(),
+      '/register': (context) => RegisterPage(),
+      '/MyApp': (context) => MyApp(),
     }
 ));

fast_med_flutter/lib/routes/home.dart

@@ -33,9 +33,21 @@ class _HomeState extends State<Home>{
               minWidth: 300.0,
               height: 100.0,
               onPressed: (){
-                Navigator.pushNamed(context, '/verOficinas');
+                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('Otro boton',
+              child: Text('welcome',
                 style: TextStyle(fontSize: 36),
               ),
               color: Colors.purple,
@@ -45,9 +57,9 @@ class _HomeState extends State<Home>{
               minWidth: 300.0,
               height: 100.0,
               onPressed: (){
-                Navigator.pushNamed(context, '/calendario');
+                Navigator.pushNamed(context, '/MyApp');
               },
-              child: Text('Calendario',
+              child: Text('MyApp',
                 style: TextStyle(fontSize: 36),
               ),
               color: Colors.purple,

fast_med_flutter/lib/routes/main.dart

@@ -0,0 +1,33 @@
+
+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

@@ -0,0 +1,161 @@
+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/welcome.dart

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

fast_med_flutter/pubspec.lock

@@ -43,6 +43,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0-nullsafety.3"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.5"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -57,16 +71,58 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0-nullsafety.1"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.2.1"
+  flushbar:
+    dependency: transitive
+    description:
+      name: flushbar
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.10.4"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_login:
+    dependency: "direct main"
+    description:
+      name: flutter_login
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.14"
   flutter_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
     version: "0.0.0"
+  font_awesome_flutter:
+    dependency: transitive
+    description:
+      name: font_awesome_flutter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "8.10.0"
+  google_fonts:
+    dependency: "direct main"
+    description:
+      name: google_fonts
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.1"
   http:
     dependency: "direct main"
     description:
@@ -102,6 +158,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0-nullsafety.3"
+  nested:
+    dependency: transitive
+    description:
+      name: nested
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.4"
   path:
     dependency: transitive
     description:
@@ -109,6 +172,41 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0-nullsafety.1"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.6.24"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+2"
+  path_provider_macos:
+    dependency: transitive
+    description:
+      name: path_provider_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.4+6"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.4"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.4+3"
   pedantic:
     dependency: transitive
     description:
@@ -116,6 +214,41 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.9.2"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.1"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.3"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.13"
+  provider:
+    dependency: transitive
+    description:
+      name: provider
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.3.2+2"
+  quiver:
+    dependency: transitive
+    description:
+      name: quiver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.5"
   simple_gesture_detector:
     dependency: transitive
     description:
@@ -177,6 +310,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.19-nullsafety.2"
+  transformer_page_view:
+    dependency: transitive
+    description:
+      name: transformer_page_view
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.6"
   typed_data:
     dependency: transitive
     description:
@@ -191,6 +331,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0-nullsafety.3"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.7.3"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.2"
 sdks:
   dart: ">=2.10.0-110 <2.11.0"
   flutter: ">=1.17.0 <2.0.0"

fast_med_flutter/pubspec.yaml

@@ -29,6 +29,8 @@ dependencies:
   # 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