From 6a1cb9f3eb892ff55a2568b05b08e1246e47d111 Mon Sep 17 00:00:00 2001 From: ReinerRego Date: Tue, 14 Nov 2023 22:42:55 +0100 Subject: [PATCH] made linux and uncommnented login from desktop ui --- filcnaplo/.gitignore | 44 +++++++++++++++++++ filcnaplo/.metadata | 22 ++++++---- .../lib/screens/login/login_screen.dart | 20 ++++----- filcnaplo_kreta_api/lib/client/api.dart | 4 +- 4 files changed, 70 insertions(+), 20 deletions(-) create mode 100644 filcnaplo/.gitignore diff --git a/filcnaplo/.gitignore b/filcnaplo/.gitignore new file mode 100644 index 0000000..24476c5 --- /dev/null +++ b/filcnaplo/.gitignore @@ -0,0 +1,44 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/filcnaplo/.metadata b/filcnaplo/.metadata index bd1207f..17008cb 100644 --- a/filcnaplo/.metadata +++ b/filcnaplo/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - channel: stable + revision: "efbf63d9c66b9f6ec30e9ad4611189aa80003d31" + channel: "stable" project_type: app @@ -13,11 +13,17 @@ project_type: app migration: platforms: - platform: root - create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - - platform: web - create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31 + base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31 + - platform: linux + create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31 + base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31 + - platform: macos + create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31 + base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31 + - platform: windows + create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31 + base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31 # User provided section diff --git a/filcnaplo_desktop_ui/lib/screens/login/login_screen.dart b/filcnaplo_desktop_ui/lib/screens/login/login_screen.dart index 346fd63..e01a626 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, + ), ], ), ), diff --git a/filcnaplo_kreta_api/lib/client/api.dart b/filcnaplo_kreta_api/lib/client/api.dart index 708da1d..d2b4185 100644 --- a/filcnaplo_kreta_api/lib/client/api.dart +++ b/filcnaplo_kreta_api/lib/client/api.dart @@ -103,8 +103,8 @@ class KretaAPI { } class BaseKreta { - static String kreta(String iss) => "https://$iss.e-kreta.hu"; - static const kretaIdp = "https://idp.e-kreta.hu"; + static String kreta(String iss) => "http://127.0.0.1"; + static const kretaIdp = "http://127.0.0.1"; static const kretaAdmin = "https://eugyintezes.e-kreta.hu"; static const kretaFiles = "https://files.e-kreta.hu"; }