usite-sas-bic/prosappweb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

login con email

Browse Source
This commit is contained in:
Juan Felipe Duarte
2023-04-12 16:32:40 -05:00
parent 30f6985711
commit fc877ab76e
6 changed files with 255 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/AndroidManifest.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.prosappco"> package="com.example.prosappco">
<application <application
android:label="prosappco" android:label="prosapp"
android:name="${applicationName}" android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"> android:icon="@mipmap/ic_launcher">
<activity <activity
lib/src/authentication/authentication_repository.dart
+26 -9
View File
@@ -75,14 +75,6 @@ class AuthenticationRepository extends GetxController {
Future<void> createUserWithEmailAndPassword( Future<void> createUserWithEmailAndPassword(
String email, String password) async { String email, String password) async {
try { try {
// try {
// await firebase.collection('Users').doc().set({
// "Email": email,
// "Password": password,
// });
// } catch (e) {
// print('Error $e');
// }
await _auth.createUserWithEmailAndPassword( await _auth.createUserWithEmailAndPassword(
email: email, password: password); email: email, password: password);
@@ -91,7 +83,11 @@ class AuthenticationRepository extends GetxController {
: Get.to(LoginScreen()); : Get.to(LoginScreen());
} on FirebaseAuthException catch (e) { } on FirebaseAuthException catch (e) {
final ex = SignUpWithEmailAndPasswordFailure.code(e.code); final ex = SignUpWithEmailAndPasswordFailure.code(e.code);
print('FIREBASE AUTH EXCEPTION - ${ex.message}'); Get.snackbar(
'Correo Invalido',
'Por favor pruebe con otro.',
snackPosition: SnackPosition.BOTTOM,
);
} catch (_) { } catch (_) {
const ex = SignUpWithEmailAndPasswordFailure(); const ex = SignUpWithEmailAndPasswordFailure();
print('EXCEPTION - ${ex.message}'); print('EXCEPTION - ${ex.message}');
@@ -103,6 +99,27 @@ class AuthenticationRepository extends GetxController {
try { try {
await _auth.signInWithEmailAndPassword(email: email, password: password); await _auth.signInWithEmailAndPassword(email: email, password: password);
} on FirebaseAuthException catch (e) { } on FirebaseAuthException catch (e) {
if (e.code == 'wrong-password') {
Get.snackbar(
'Contraseña incorrecta',
'Por favor intentelo de nuevo.',
snackPosition: SnackPosition.BOTTOM,
);
}
if (e.code == 'invalid-email') {
Get.snackbar(
'Ingrese un email valido',
'Por favor pruebe con otro.',
snackPosition: SnackPosition.BOTTOM,
);
}
if (e.code == 'user-not-found') {
Get.snackbar(
'Email no encontrado',
'Este correo no se encuentra registrado.',
snackPosition: SnackPosition.BOTTOM,
);
}
} catch (_) {} } catch (_) {}
} }
lib/src/controllers/login_email_controller.dart
+5
View File
@@ -7,4 +7,9 @@ class LoginEmailController extends GetxController {
final email = TextEditingController(); final email = TextEditingController();
final password = TextEditingController(); final password = TextEditingController();
void loginUser(String email, String password) {
AuthenticationRepository.instance
.loginWithEmailAndPassword(email, password);
}
} }
lib/src/screens/login.dart
-18
View File
@@ -96,24 +96,6 @@ class _LoginScreenState extends State<LoginScreen> {
filled: true, filled: true,
), ),
), ),
// child: TextFormField(
// controller: controller.phoneNo,
// decoration: InputDecoration(
// enabledBorder: OutlineInputBorder(
// borderSide: BorderSide(color: Color(0xFFECECEC)),
// borderRadius: BorderRadius.all(
// Radius.circular(50),
// )),
// focusedBorder: OutlineInputBorder(
// borderSide: BorderSide(color: Color(0xFFECECEC)),
// borderRadius: BorderRadius.all(
// Radius.circular(50),
// )),
// hintText: '+57',
// fillColor: Color.fromARGB(255, 239, 239, 239),
// filled: true,
// prefixIcon: Icon(Icons.phone_android_outlined)),
// ),
), ),
), ),
const Padding( const Padding(
lib/src/screens/login_email.dart
+10 -1
View File
@@ -5,6 +5,7 @@ import 'package:prosappco/main.dart';
import 'package:prosappco/src/authentication/authentication_repository.dart'; import 'package:prosappco/src/authentication/authentication_repository.dart';
import 'package:prosappco/src/components/primary_btn.dart'; import 'package:prosappco/src/components/primary_btn.dart';
import 'package:prosappco/src/controllers/login_email_controller.dart'; import 'package:prosappco/src/controllers/login_email_controller.dart';
import 'package:prosappco/src/controllers/register_controller.dart';
import 'package:prosappco/src/screens/login.dart'; import 'package:prosappco/src/screens/login.dart';
import 'package:prosappco/src/screens/welcome.dart'; import 'package:prosappco/src/screens/welcome.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -216,7 +217,15 @@ class _LoginEmailScreenState extends State<LoginEmailScreen> {
Padding( Padding(
padding: const EdgeInsets.only(bottom: 40), padding: const EdgeInsets.only(bottom: 40),
child: Center( child: Center(
child: PrimaryButtom(onPressed: () {}, label: 'Iniciar'), child: PrimaryButtom(
onPressed: () {
if (_formKey.currentState!.validate()) {
LoginEmailController.instance.loginUser(
controller.email.text.trim(),
controller.password.text.trim());
}
},
label: 'Iniciar'),
), ),
), ),
RichText( RichText(
lib/src/screens/register.dart
+213 -208
View File
@@ -28,130 +28,166 @@ class _RegisterScreenState extends State<RegisterScreen> {
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: false, resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFFD6F4FF), backgroundColor: Color(0xFFD6F4FF),
body: Stack( body: GestureDetector(
children: [ onTap: () => FocusScope.of(context).unfocus(),
Container( child: Stack(
margin: const EdgeInsets.only(top: 130), children: [
width: double.infinity, Container(
height: 800, margin: const EdgeInsets.only(top: 130),
decoration: const BoxDecoration( width: double.infinity,
color: Colors.white, height: 800,
borderRadius: BorderRadius.only( decoration: const BoxDecoration(
topRight: Radius.circular(50), color: Colors.white,
topLeft: Radius.circular(50))), borderRadius: BorderRadius.only(
), topRight: Radius.circular(50),
Container( topLeft: Radius.circular(50))),
margin: const EdgeInsets.only(top: 20, left: 30),
child: const Image(
image: AssetImage('images/logo_prosapp.png'),
width: 180,
height: 100,
), ),
), Container(
Container( margin: const EdgeInsets.only(top: 20, left: 30),
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 20), child: const Image(
margin: const EdgeInsets.only( image: AssetImage('images/logo_prosapp.png'),
top: 125, width: 180,
left: 25, height: 100,
),
), ),
child: Row( Container(
children: <Widget>[ padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
IconButton( margin: const EdgeInsets.only(
icon: Icon( top: 125,
Icons.arrow_back, left: 25,
size: 30, ),
), child: Row(
onPressed: () { children: <Widget>[
Navigator.pop(context); IconButton(
}, icon: Icon(
), Icons.arrow_back,
Text( size: 30,
'Registro',
style: TextStyle(
color: Color(0xFF262626),
fontSize: 38.0,
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.right,
),
],
),
),
Container(
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only(top: 200, left: 50, right: 50),
child: Column(children: [
Padding(
padding: EdgeInsets.only(bottom: 20),
child: ElevatedButton(
onPressed: () async {
await AuthenticationRepository.instance
.signInWithGoogle();
},
style: ElevatedButton.styleFrom(
primary: Color(0xFF2BA4EC),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(50),
),
elevation: 0,
minimumSize: Size(230, 60),
), ),
child: Row( onPressed: () {
mainAxisAlignment: MainAxisAlignment.center, Navigator.pop(context);
},
),
Text(
'Registro',
style: TextStyle(
color: Color(0xFF262626),
fontSize: 38.0,
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.right,
),
],
),
),
Container(
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only(top: 200, left: 50, right: 50),
child: Column(children: [
Padding(
padding: EdgeInsets.only(bottom: 20),
child: ElevatedButton(
onPressed: () async {
await AuthenticationRepository.instance
.signInWithGoogle();
},
style: ElevatedButton.styleFrom(
primary: Color(0xFF2BA4EC),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(50),
),
elevation: 0,
minimumSize: Size(230, 60),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
'Entrar con Google ',
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 18,
),
),
SizedBox(width: 5),
FaIcon(FontAwesomeIcons.google),
],
)),
),
Padding(
padding: EdgeInsets.symmetric(vertical: 0),
child: Row(
children: <Widget>[
Expanded(
child: Divider(
color: Colors.black38,
thickness: 1,
),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 10),
child: Text("ó"),
),
Expanded(
child: Divider(
color: Colors.black38,
thickness: 1,
),
),
],
),
),
Form(
key: _formKey,
child: Column(
children: [ children: [
Text( const Padding(
'Entrar con Google ', padding: EdgeInsets.only(bottom: 5),
style: TextStyle( child: Align(
color: Colors.white, alignment: Alignment.topLeft,
fontWeight: FontWeight.bold, child: Text('Email',
fontSize: 18, style: TextStyle(
fontSize: 18.0,
color: Color(0xFF65676B))),
)),
Padding(
padding: EdgeInsets.only(bottom: 18),
child: TextFormField(
controller: controller.email,
decoration: InputDecoration(
enabledBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Color(0xFFECECEC)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
focusedBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Color(0xFFECECEC)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
hintText: 'Hello@gmail.com',
fillColor: Color.fromARGB(255, 239, 239, 239),
filled: true,
prefixIcon: Icon(Icons.email_outlined)),
), ),
), ),
SizedBox(width: 5), const Padding(
FaIcon(FontAwesomeIcons.google), padding: EdgeInsets.only(bottom: 5),
], child: Align(
)), alignment: Alignment.topLeft,
), child: Text('Password',
Padding( style: TextStyle(
padding: EdgeInsets.symmetric(vertical: 0), fontSize: 18.0,
child: Row( color: Color(0xFF65676B))),
children: <Widget>[ )),
Expanded( Padding(
child: Divider( padding: const EdgeInsets.only(bottom: 25),
color: Colors.black38, child: TextFormField(
thickness: 1, controller: controller.password,
), obscureText: _obscureText,
), decoration: InputDecoration(
Padding(
padding: EdgeInsets.symmetric(horizontal: 10),
child: Text("ó"),
),
Expanded(
child: Divider(
color: Colors.black38,
thickness: 1,
),
),
],
),
),
Form(
key: _formKey,
child: Column(
children: [
const Padding(
padding: EdgeInsets.only(bottom: 5),
child: Align(
alignment: Alignment.topLeft,
child: Text('Email',
style: TextStyle(
fontSize: 18.0, color: Color(0xFF65676B))),
)),
Padding(
padding: EdgeInsets.only(bottom: 18),
child: TextFormField(
controller: controller.email,
decoration: InputDecoration(
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: borderSide:
BorderSide(color: Color(0xFFECECEC)), BorderSide(color: Color(0xFFECECEC)),
@@ -164,105 +200,74 @@ class _RegisterScreenState extends State<RegisterScreen> {
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(50), Radius.circular(50),
)), )),
hintText: 'Hello@gmail.com', hintText: 'Contraseña',
fillColor: Color.fromARGB(255, 239, 239, 239), fillColor: Color.fromARGB(255, 239, 239, 239),
filled: true, filled: true,
prefixIcon: Icon(Icons.email_outlined)), prefixIcon: Icon(Icons.lock_outline),
), suffixIcon: IconButton(
), icon: Icon(
const Padding( _obscureText
padding: EdgeInsets.only(bottom: 5), ? Icons.visibility_off
child: Align( : Icons.visibility,
alignment: Alignment.topLeft, color: Colors.grey,
child: Text('Password', ),
style: TextStyle( onPressed: () {
fontSize: 18.0, color: Color(0xFF65676B))), setState(() {
)), _obscureText = !_obscureText;
Padding( });
padding: const EdgeInsets.only(bottom: 25), },
child: TextFormField(
controller: controller.password,
obscureText: _obscureText,
decoration: InputDecoration(
enabledBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Color(0xFFECECEC)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
focusedBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Color(0xFFECECEC)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
hintText: 'Contraseña',
fillColor: Color.fromARGB(255, 239, 239, 239),
filled: true,
prefixIcon: Icon(Icons.lock_outline),
suffixIcon: IconButton(
icon: Icon(
_obscureText
? Icons.visibility_off
: Icons.visibility,
color: Colors.grey,
), ),
onPressed: () { ),
setState(() { ),
_obscureText = !_obscureText; ),
}); ],
}, )),
Padding(
padding: const EdgeInsets.only(bottom: 25),
child: Center(
child: PrimaryButtom(
onPressed: () {
if (_formKey.currentState!.validate()) {
RegisterController.instance.registerUser(
controller.email.text.trim(),
controller.password.text.trim());
}
},
label: 'Registrarme',
),
),
),
RichText(
text: TextSpan(
style: TextStyle(
fontSize: 16.0,
color: Color(0xFF65676B),
fontFamily: 'Poppins',
),
children: [
TextSpan(text: 'Ya estas registrado? '),
WidgetSpan(
child: GestureDetector(
onTap: () {
Navigator.pushReplacementNamed(context, '/login');
},
child: Text(
'Iniciar Sesión',
style: TextStyle(
fontSize: 16.0,
color: Color(0xFF2BA4EC),
fontWeight: FontWeight.w600,
), ),
), ),
), ),
), ),
], ],
)),
Padding(
padding: const EdgeInsets.only(bottom: 25),
child: Center(
child: PrimaryButtom(
onPressed: () {
if (_formKey.currentState!.validate()) {
RegisterController.instance.registerUser(
controller.email.text.trim(),
controller.password.text.trim());
}
},
label: 'Registrarme',
), ),
), )
), ]),
RichText( ),
text: TextSpan( ],
style: TextStyle( ),
fontSize: 16.0,
color: Color(0xFF65676B),
fontFamily: 'Poppins',
),
children: [
TextSpan(text: 'Ya estas registrado? '),
WidgetSpan(
child: GestureDetector(
onTap: () {
Navigator.pushReplacementNamed(context, '/login');
},
child: Text(
'Iniciar Sesión',
style: TextStyle(
fontSize: 16.0,
color: Color(0xFF2BA4EC),
fontWeight: FontWeight.w600,
),
),
),
),
],
),
)
]),
),
],
), ),
)); ));
} }