From fb8b3ae73fc1d42b75110530f1a8e217612853bc Mon Sep 17 00:00:00 2001 From: ReinerRego Date: Fri, 22 Dec 2023 19:21:18 +0100 Subject: [PATCH 1/2] changed login screen desktop --- .../lib/screens/login/login_screen.dart | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/filcnaplo_desktop_ui/lib/screens/login/login_screen.dart b/filcnaplo_desktop_ui/lib/screens/login/login_screen.dart index 346fd63..6d59ee0 100644 --- a/filcnaplo_desktop_ui/lib/screens/login/login_screen.dart +++ b/filcnaplo_desktop_ui/lib/screens/login/login_screen.dart @@ -7,7 +7,7 @@ import 'package:filcnaplo/api/client.dart'; import 'package:filcnaplo/api/login.dart'; import 'package:filcnaplo_mobile_ui/screens/login/login_button.dart'; import 'package:filcnaplo_mobile_ui/screens/login/login_input.dart'; -// import 'package:filcnaplo_desktop_ui/screens/login/school_input/school_input.dart'; +import 'package:filcnaplo_desktop_ui/screens/login/school_input/school_input.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_acrylic/flutter_acrylic.dart'; @@ -36,8 +36,8 @@ class LoginScreen extends StatefulWidget { class _LoginScreenState extends State { final usernameController = TextEditingController(); final passwordController = TextEditingController(); - // final schoolController = SchoolInputController(); - // final _scrollController = ScrollController(); + final schoolController = SchoolInputController(); + final _scrollController = ScrollController(); LoginState _loginState = LoginState.normal; bool showBack = false; @@ -57,9 +57,9 @@ class _LoginScreenState extends State { FilcAPI.getSchools().then((schools) { if (schools != null) { - // schoolController.update(() { - // schoolController.schools = schools; - // }); + schoolController.update(() { + schoolController.schools = schools; + }); } else { ElegantNotification.error( background: Colors.white, @@ -238,10 +238,10 @@ class _LoginScreenState extends State { ), ), ), - // SchoolInput( - // scroll: _scrollController, - // controller: schoolController, - // ), + SchoolInput( + scroll: _scrollController, + controller: schoolController, + ), ], ), ), @@ -321,8 +321,8 @@ class _LoginScreenState extends State { if (username == "" || password == - "" /*|| - schoolController.selectedSchool == null*/ + "" || + schoolController.selectedSchool == null ) { return setState(() => _loginState = LoginState.missingFields); } @@ -332,8 +332,7 @@ class _LoginScreenState extends State { loginAPI( username: username, password: password, - instituteCode: 'shit', - // instituteCode: schoolController.selectedSchool!.instituteCode, + instituteCode: schoolController.selectedSchool!.instituteCode, context: context, onLogin: (user) { ElegantNotification.success( From fdc92761705de34c0d7e3801a7d772874062f6c4 Mon Sep 17 00:00:00 2001 From: ReinerRego Date: Sat, 23 Dec 2023 02:16:44 +0100 Subject: [PATCH 2/2] what --- filcnaplo_premium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filcnaplo_premium b/filcnaplo_premium index 078142a..2682221 160000 --- a/filcnaplo_premium +++ b/filcnaplo_premium @@ -1 +1 @@ -Subproject commit 078142a3dc2fce9eddb6f608923055943ec4d5e6 +Subproject commit 268222165be261347c5de5c52c33d444810a9a59