Removed helpers lib and updated to flutter 3.22
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
import 'package:colorful_print/colorful_print.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:helpers/helpers/misc_build/build_media.dart';
|
||||
import 'package:helpers/helpers/print.dart';
|
||||
|
||||
import '../../global/api.dart';
|
||||
import '../../global/styles.dart';
|
||||
@@ -19,7 +18,7 @@ class Login extends ConsumerStatefulWidget {
|
||||
}
|
||||
|
||||
class _LoginState extends ConsumerState<Login> {
|
||||
bool usingUsername = false;
|
||||
bool usingUsername = true;
|
||||
final emailController = TextEditingController();
|
||||
final usernameController = TextEditingController();
|
||||
final passwordController = TextEditingController();
|
||||
@@ -32,7 +31,7 @@ class _LoginState extends ConsumerState<Login> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final screen = BuildMedia(context).size;
|
||||
final screen = MediaQuery.of(context).size;
|
||||
return Form(
|
||||
key: widget.formKey,
|
||||
child: Stack(
|
||||
@@ -134,7 +133,7 @@ class _LoginState extends ConsumerState<Login> {
|
||||
text: 'Password: ',
|
||||
validatorFunc: (s) {
|
||||
if (s != null && s.length < 6) {
|
||||
return 'Please do a better password (you have to)';
|
||||
return 'Please do a better password, at least 6 characters (you have to)';
|
||||
}
|
||||
return null;
|
||||
},
|
||||
@@ -205,35 +204,21 @@ class _LoginState extends ConsumerState<Login> {
|
||||
|
||||
Future login() async {
|
||||
try {
|
||||
if (widget.formKey.currentState != null &&
|
||||
!widget.formKey.currentState!.validate()) {
|
||||
if (widget.formKey.currentState != null && !widget.formKey.currentState!.validate()) {
|
||||
return;
|
||||
}
|
||||
final data =
|
||||
await ref.read(apiProvider.notifier).post(path: 'auth/login', data: {
|
||||
'username':
|
||||
usernameController.text.isEmpty ? null : usernameController.text,
|
||||
final Map<String, dynamic>? data = await ref.read(apiProvider.notifier).post(path: 'auth/login', data: {
|
||||
'username': usernameController.text.isEmpty ? null : usernameController.text,
|
||||
'email': emailController.text.isEmpty ? null : emailController.text,
|
||||
'password': passwordController.text,
|
||||
});
|
||||
|
||||
String message = 'Login unsuccessful';
|
||||
bool success = data?['success'] == 'false';
|
||||
if (data != null) {
|
||||
if (data['message'] != null) {
|
||||
message = data['message'];
|
||||
} else if (success) {
|
||||
message = 'Logged in!';
|
||||
}
|
||||
}
|
||||
// final bool success = data?['success'] ?? false;
|
||||
printAmber(data);
|
||||
showSnack(
|
||||
ref: ref,
|
||||
text: message,
|
||||
type: !success ? SnackType.error : SnackType.success);
|
||||
bool success = data?['success'] ?? false;
|
||||
String message = data?['message'] ?? (success ? 'Login success!' : 'Login unsuccessful.');
|
||||
printColor(data, textColor: TextColor.yellow);
|
||||
showSnack(ref: ref, text: message, type: success ? SnackType.success : SnackType.error);
|
||||
} catch (err, st) {
|
||||
printRed('Error in login: $err\n$st');
|
||||
printColor('Error in login: $err\n$st', textColor: TextColor.red);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user