firka/student-legacy
firka/student-legacy
8
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:refilc/naplo into dev

Browse Source
This commit is contained in:
Kima 2023-12-25 21:59:00 +01:00
commit 30bde8b040
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
filcnaplo_desktop_ui/lib/screens/login/login_screen.dart
View File

@ -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(

2
filcnaplo_premium

@ -1 +1 @@
Subproject commit 078142a3dc2fce9eddb6f608923055943ec4d5e6 Subproject commit 268222165be261347c5de5c52c33d444810a9a59