n8r/rluv_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Removed helpers lib and updated to flutter 3.22

Browse Source
This commit is contained in:
Nathan Anderson
2024-05-30 20:44:06 -06:00
parent 64baa04a47
commit 000f409052
19 changed files with 242 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/account/account_create_screen.dart
+4 -9
View File
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/misc_build/build_media.dart';
import 'package:rluv/features/account/signup.dart';
import 'package:rluv/global/styles.dart';
@@ -13,8 +12,7 @@ class AccountCreateScreen extends ConsumerStatefulWidget {
const AccountCreateScreen({super.key});
@override
ConsumerState<AccountCreateScreen> createState() =>
_AccountCreateScreenState();
ConsumerState<AccountCreateScreen> createState() => _AccountCreateScreenState();
}
enum _AccountScreen { options, login, signup }
@@ -40,7 +38,7 @@ class _AccountCreateScreenState extends ConsumerState<AccountCreateScreen> {
},
);
}
final screen = BuildMedia(context).size;
final screen = MediaQuery.of(context).size;
return Scaffold(
backgroundColor: Styles.purpleNurple,
body: SafeArea(
@@ -60,11 +58,8 @@ class _AccountCreateScreenState extends ConsumerState<AccountCreateScreen> {
Padding(
padding: const EdgeInsets.symmetric(vertical: 40.0),
child: Image.asset("assets/app_icon.png",
height:
screen.width > 500 ? 250 : screen.width * 0.5,
width: screen.width > 500
? 250
: screen.width * 0.5),
height: screen.width > 500 ? 250 : screen.width * 0.5,
width: screen.width > 500 ? 250 : screen.width * 0.5),
),
UiButton(
color: Styles.sunflower,
lib/features/account/login.dart
+12 -27
View File
@@ -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);
}
}
}
lib/features/account/signup.dart
+12 -24
View File
@@ -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';
@@ -36,7 +35,7 @@ class _SignupState extends ConsumerState<Signup> {
@override
Widget build(BuildContext context) {
final screen = BuildMedia(context).size;
final screen = MediaQuery.of(context).size;
return Form(
key: widget.formKey,
child: Stack(
@@ -126,8 +125,7 @@ class _SignupState extends ConsumerState<Signup> {
),
UiButton(
width: screen.width * 0.4,
icon: const Icon(Icons.cancel,
color: Styles.washedStone, size: 20),
icon: const Icon(Icons.cancel, color: Styles.washedStone, size: 20),
onPressed: () {
setState(
() => hasFamilyCode = false,
@@ -140,9 +138,7 @@ class _SignupState extends ConsumerState<Signup> {
: Padding(
padding: const EdgeInsets.all(8.0),
child: UiButton(
width: screen.width * 0.5 > 400
? 400
: screen.width * 0.5,
width: screen.width * 0.5 > 400 ? 400 : screen.width * 0.5,
text: 'JOIN FAMILY',
// color: Styles.flounderBlue,
onPressed: () {
@@ -190,8 +186,7 @@ class _SignupState extends ConsumerState<Signup> {
text,
style: TextStyle(fontSize: size.width < 350 ? 16 : 20),
),
if (subtext != null)
Text(subtext, style: const TextStyle(fontSize: 12)),
if (subtext != null) Text(subtext, style: const TextStyle(fontSize: 12)),
],
),
),
@@ -223,36 +218,29 @@ class _SignupState extends ConsumerState<Signup> {
Future signup() 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/signup', data: {
final data = await ref.read(apiProvider.notifier).post(path: 'auth/signup', data: {
'name': nameCotroller.text,
'username':
usernameController.text.isEmpty ? null : usernameController.text,
'username': usernameController.text.isEmpty ? null : usernameController.text,
'email': emailController.text.isEmpty ? null : emailController.text,
'password': passwordController.text,
'family_code': familyCodeController.text.isEmpty
? null
: familyCodeController.text.toUpperCase(),
'family_code': familyCodeController.text.isEmpty ? null : familyCodeController.text.toUpperCase(),
'budget_name': 'Budget'
});
final success = data?['success'] ?? false;
showSnack(
ref: ref,
text: data?['message'] ?? success
? 'Login successful'
: 'Login unsuccessful',
text: data?['message'] ?? success ? 'Login successful' : 'Login unsuccessful',
type: !success ? SnackType.error : SnackType.success);
printAmber(data);
printColor(data, textColor: TextColor.yellow);
// final user = User.fromJson(data?['user']);
// ref.read(tokenProvider.notifier).state =
} catch (err) {
printRed(err);
printColor(err, textColor: TextColor.red);
}
}
}