changed login screen desktop
This commit is contained in:
parent
50d2d44ac2
commit
fb8b3ae73f
@ -7,7 +7,7 @@ import 'package:filcnaplo/api/client.dart';
|
|||||||
import 'package:filcnaplo/api/login.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_button.dart';
|
||||||
import 'package:filcnaplo_mobile_ui/screens/login/login_input.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/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter_acrylic/flutter_acrylic.dart';
|
import 'package:flutter_acrylic/flutter_acrylic.dart';
|
||||||
@ -36,8 +36,8 @@ class LoginScreen extends StatefulWidget {
|
|||||||
class _LoginScreenState extends State<LoginScreen> {
|
class _LoginScreenState extends State<LoginScreen> {
|
||||||
final usernameController = TextEditingController();
|
final usernameController = TextEditingController();
|
||||||
final passwordController = TextEditingController();
|
final passwordController = TextEditingController();
|
||||||
// final schoolController = SchoolInputController();
|
final schoolController = SchoolInputController();
|
||||||
// final _scrollController = ScrollController();
|
final _scrollController = ScrollController();
|
||||||
|
|
||||||
LoginState _loginState = LoginState.normal;
|
LoginState _loginState = LoginState.normal;
|
||||||
bool showBack = false;
|
bool showBack = false;
|
||||||
@ -57,9 +57,9 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||||||
|
|
||||||
FilcAPI.getSchools().then((schools) {
|
FilcAPI.getSchools().then((schools) {
|
||||||
if (schools != null) {
|
if (schools != null) {
|
||||||
// schoolController.update(() {
|
schoolController.update(() {
|
||||||
// schoolController.schools = schools;
|
schoolController.schools = schools;
|
||||||
// });
|
});
|
||||||
} else {
|
} else {
|
||||||
ElegantNotification.error(
|
ElegantNotification.error(
|
||||||
background: Colors.white,
|
background: Colors.white,
|
||||||
@ -238,10 +238,10 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
// SchoolInput(
|
SchoolInput(
|
||||||
// scroll: _scrollController,
|
scroll: _scrollController,
|
||||||
// controller: schoolController,
|
controller: schoolController,
|
||||||
// ),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@ -321,8 +321,8 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||||||
|
|
||||||
if (username == "" ||
|
if (username == "" ||
|
||||||
password ==
|
password ==
|
||||||
"" /*||
|
"" ||
|
||||||
schoolController.selectedSchool == null*/
|
schoolController.selectedSchool == null
|
||||||
) {
|
) {
|
||||||
return setState(() => _loginState = LoginState.missingFields);
|
return setState(() => _loginState = LoginState.missingFields);
|
||||||
}
|
}
|
||||||
@ -332,8 +332,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||||||
loginAPI(
|
loginAPI(
|
||||||
username: username,
|
username: username,
|
||||||
password: password,
|
password: password,
|
||||||
instituteCode: 'shit',
|
instituteCode: schoolController.selectedSchool!.instituteCode,
|
||||||
// instituteCode: schoolController.selectedSchool!.instituteCode,
|
|
||||||
context: context,
|
context: context,
|
||||||
onLogin: (user) {
|
onLogin: (user) {
|
||||||
ElegantNotification.success(
|
ElegantNotification.success(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user