balint14/student-legacy
balint14/student-legacy
1
Fork 0
forked from firka/student-legacy
Code Pull Requests Activity

Revert "change kretenlogin to widget"

Browse Source 
This reverts commit 2d5c270641308bdd86bca5ce53400118c18ddbfb.
This commit is contained in:
Kima 2024-08-21 23:33:15 +02:00
parent 2d5c270641
commit 9671c250b9
2 changed files with 190 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
refilc_mobile_ui/lib/screens/login/kreten_login.dart
View File

@ -3,17 +3,17 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter/webview_flutter.dart';
class KretenLoginWidget extends StatefulWidget { class KretenLoginScreen extends StatefulWidget {
const KretenLoginWidget({super.key, required this.onLogin}); const KretenLoginScreen({super.key, required this.onLogin});
// final String selectedSchool; // final String selectedSchool;
final void Function(String code) onLogin; final void Function(String code) onLogin;
@override @override
State<KretenLoginWidget> createState() => _KretenLoginWidgetState(); State<KretenLoginScreen> createState() => _KretenLoginScreenState();
} }
class _KretenLoginWidgetState extends State<KretenLoginWidget> { class _KretenLoginScreenState extends State<KretenLoginScreen> {
late final WebViewController controller; late final WebViewController controller;
var loadingPercentage = 0; var loadingPercentage = 0;
var currentUrl = ''; var currentUrl = '';
@ -24,35 +24,71 @@ class _KretenLoginWidgetState extends State<KretenLoginWidget> {
controller = WebViewController() controller = WebViewController()
..setJavaScriptMode(JavaScriptMode.unrestricted) ..setJavaScriptMode(JavaScriptMode.unrestricted)
..setNavigationDelegate(NavigationDelegate( ..setNavigationDelegate(NavigationDelegate(
onPageStarted: (url) async { onNavigationRequest: (n) async {
setState(() { if (n.url.startsWith('https://mobil.e-kreta.hu')) {
loadingPercentage = 0; setState(() {
currentUrl = url; loadingPercentage = 0;
}); currentUrl = n.url;
});
// final String instituteCode = widget.selectedSchool; // final String instituteCode = widget.selectedSchool;
if (!url.startsWith( // if (!n.url.startsWith(
'https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect?code=')) { // 'https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect?code=')) {
return; // return;
// }
List<String> requiredThings = n.url
.replaceAll(
'https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect?code=',
'')
.replaceAll(
'&scope=openid%20email%20offline_access%20kreta-ellenorzo-webapi.public%20kreta-eugyintezes-webapi.public%20kreta-fileservice-webapi.public%20kreta-mobile-global-webapi.public%20kreta-dkt-webapi.public%20kreta-ier-webapi.public&state=refilc_student_mobile&session_state=',
':')
.split(':');
String code = requiredThings[0];
// String sessionState = requiredThings[1];
widget.onLogin(code);
// Future.delayed(const Duration(milliseconds: 500), () {
// Navigator.of(context).pop();
// });
// Navigator.of(context).pop();
return NavigationDecision.prevent;
} else {
return NavigationDecision.navigate;
} }
},
List<String> requiredThings = url onPageStarted: (url) async {
.replaceAll( // setState(() {
'https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect?code=', // loadingPercentage = 0;
'') // currentUrl = url;
.replaceAll(
'&scope=openid%20email%20offline_access%20kreta-ellenorzo-webapi.public%20kreta-eugyintezes-webapi.public%20kreta-fileservice-webapi.public%20kreta-mobile-global-webapi.public%20kreta-dkt-webapi.public%20kreta-ier-webapi.public&state=refilc_student_mobile&session_state=',
':')
.split(':');
String code = requiredThings[0];
// String sessionState = requiredThings[1];
widget.onLogin(code);
// Future.delayed(const Duration(milliseconds: 500), () {
// Navigator.of(context).pop();
// }); // });
// Navigator.of(context).pop();
// // final String instituteCode = widget.selectedSchool;
// if (!url.startsWith(
// 'https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect?code=')) {
// return;
// }
// List<String> requiredThings = url
// .replaceAll(
// 'https://mobil.e-kreta.hu/ellenorzo-student/prod/oauthredirect?code=',
// '')
// .replaceAll(
// '&scope=openid%20email%20offline_access%20kreta-ellenorzo-webapi.public%20kreta-eugyintezes-webapi.public%20kreta-fileservice-webapi.public%20kreta-mobile-global-webapi.public%20kreta-dkt-webapi.public%20kreta-ier-webapi.public&state=refilc_student_mobile&session_state=',
// ':')
// .split(':');
// String code = requiredThings[0];
// // String sessionState = requiredThings[1];
// widget.onLogin(code);
// // Future.delayed(const Duration(milliseconds: 500), () {
// // Navigator.of(context).pop();
// // });
// // Navigator.of(context).pop();
}, },
onProgress: (progress) { onProgress: (progress) {
setState(() { setState(() {
@ -78,18 +114,24 @@ class _KretenLoginWidgetState extends State<KretenLoginWidget> {
// Nonce nonce = getNonce(nonceStr, ); // Nonce nonce = getNonce(nonceStr, );
// } // }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Stack( return Scaffold(
children: [ appBar: AppBar(
WebViewWidget( leading: const BackButton(),
controller: controller, title: const Text('e-KRÉTA Bejelentkezés'),
), ),
if (loadingPercentage < 100) body: Stack(
LinearProgressIndicator( children: [
value: loadingPercentage / 100.0, WebViewWidget(
controller: controller,
), ),
], if (loadingPercentage < 100)
LinearProgressIndicator(
value: loadingPercentage / 100.0,
),
],
),
); );
} }
} }

254
refilc_mobile_ui/lib/screens/login/login_screen.dart
View File

@ -3,19 +3,14 @@
import 'package:refilc/api/client.dart'; import 'package:refilc/api/client.dart';
import 'package:refilc/api/login.dart'; import 'package:refilc/api/login.dart';
import 'package:refilc/theme/colors/colors.dart'; import 'package:refilc/theme/colors/colors.dart';
import 'package:refilc_mobile_ui/common/bottom_sheet_menu/rounded_bottom_sheet.dart';
import 'package:refilc_mobile_ui/common/custom_snack_bar.dart'; import 'package:refilc_mobile_ui/common/custom_snack_bar.dart';
import 'package:refilc_mobile_ui/common/system_chrome.dart'; import 'package:refilc_mobile_ui/common/system_chrome.dart';
import 'package:refilc_mobile_ui/common/widgets/absence/absence_display.dart';
import 'package:refilc_mobile_ui/screens/login/login_button.dart';
import 'package:refilc_mobile_ui/screens/login/login_input.dart';
import 'package:refilc_mobile_ui/screens/login/school_input/school_input.dart'; import 'package:refilc_mobile_ui/screens/login/school_input/school_input.dart';
import 'package:refilc_mobile_ui/screens/settings/privacy_view.dart'; import 'package:refilc_mobile_ui/screens/settings/privacy_view.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'login_screen.i18n.dart'; import 'login_screen.i18n.dart';
import 'package:carousel_slider/carousel_slider.dart'; import 'package:carousel_slider/carousel_slider.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:refilc_mobile_ui/screens/login/kreten_login.dart'; //new library for new web login import 'package:refilc_mobile_ui/screens/login/kreten_login.dart'; //new library for new web login
class LoginScreen extends StatefulWidget { class LoginScreen extends StatefulWidget {
@ -32,8 +27,8 @@ class LoginScreenState extends State<LoginScreen> {
final passwordController = TextEditingController(); final passwordController = TextEditingController();
final schoolController = SchoolInputController(); final schoolController = SchoolInputController();
final _scrollController = ScrollController(); final _scrollController = ScrollController();
// new controllers
final codeController = TextEditingController(); final codeController = TextEditingController();
LoginState _loginState = LoginState.normal; LoginState _loginState = LoginState.normal;
bool showBack = false; bool showBack = false;
@ -59,7 +54,7 @@ class LoginScreenState extends State<LoginScreen> {
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
statusBarColor: Colors.transparent, statusBarColor: Colors.transparent,
statusBarIconBrightness: Brightness.light, statusBarIconBrightness: Brightness.light,
systemNavigationBarColor: Colors.white, systemNavigationBarColor: Color(0xFFDAE4F7),
systemNavigationBarIconBrightness: Brightness.dark, systemNavigationBarIconBrightness: Brightness.dark,
)); ));
@ -85,7 +80,7 @@ class LoginScreenState extends State<LoginScreen> {
precacheImage(const AssetImage('assets/images/showcase2.png'), context); precacheImage(const AssetImage('assets/images/showcase2.png'), context);
precacheImage(const AssetImage('assets/images/showcase3.png'), context); precacheImage(const AssetImage('assets/images/showcase3.png'), context);
precacheImage(const AssetImage('assets/images/showcase4.png'), context); precacheImage(const AssetImage('assets/images/showcase4.png'), context);
bool selected = false; // bool selected = false;
return Scaffold( return Scaffold(
body: Container( body: Container(
@ -102,9 +97,17 @@ class LoginScreenState extends State<LoginScreen> {
children: [ children: [
// app icon // app icon
Padding( Padding(
padding: const EdgeInsets.only(left: 24, top: 20), padding: const EdgeInsets.only(left: 24, top: 0),
child: Row( child: Row(
children: [ children: [
if (showBack)
Material(
type: MaterialType.transparency,
child: showBack
? const BackButton(color: Colors.black)
: const SizedBox(height: 48.0),
),
if (showBack) const SizedBox(width: 8),
Image.asset( Image.asset(
'assets/icons/ic_rounded.png', 'assets/icons/ic_rounded.png',
width: 30.0, width: 30.0,
@ -118,12 +121,6 @@ class LoginScreenState extends State<LoginScreen> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Montserrat'), fontFamily: 'Montserrat'),
), ),
Material(
type: MaterialType.transparency,
child: showBack
? BackButton(color: AppColors.of(context).text)
: const SizedBox(height: 48.0),
),
], ],
)), )),
Stack( Stack(
@ -134,7 +131,7 @@ class LoginScreenState extends State<LoginScreen> {
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
const SizedBox(height: 21), const SizedBox(height: 20),
CarouselSlider( CarouselSlider(
options: CarouselOptions( options: CarouselOptions(
height: MediaQuery.of(context).size.height, height: MediaQuery.of(context).size.height,
@ -201,145 +198,115 @@ class LoginScreenState extends State<LoginScreen> {
], ],
), ),
Container( Container(
height: 300, height: 330,
width: double.infinity, width: double.infinity,
decoration: const BoxDecoration( decoration: const BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
colors: [Color(0x00DAE4F7), Color(0xFFDAE4F7)], colors: [Color(0x00DAE4F7), Color(0xFFDAE4F7)],
stops: [0, 0.12], stops: [0, 0.24],
begin: Alignment.topCenter, begin: Alignment.topCenter,
end: Alignment.bottomCenter, end: Alignment.bottomCenter,
), ),
), ),
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 50, top: 90,
bottom: MediaQuery.of(context).viewInsets.bottom), bottom: MediaQuery.of(context).viewInsets.bottom),
child: Column( child: Column(
children: [ children: [
SizedBox( SizedBox(
height: 48, height: 52,
width: double.infinity, width: double.infinity,
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 16), horizontal: 16),
child: FilledButton( child: GestureDetector(
style: ButtonStyle( onTap: () {
shape: WidgetStateProperty.all< final NavigatorState navigator =
RoundedRectangleBorder>( Navigator.of(context);
const RoundedRectangleBorder( navigator
borderRadius: BorderRadius.all( .push(
Radius.circular(12)), MaterialPageRoute(
))), builder: (context) =>
onPressed: () { KretenLoginScreen(
showModalBottomSheet( onLogin: (String code) {
backgroundColor: Colors.transparent, codeController.text = code;
context: context, navigator.pop();
isScrollControlled: },
true, // This ensures the modal accommodates input fields properly ),
builder: (BuildContext context) { ),
return Container( )
height: MediaQuery.of(context) .then((value) {
.size if (codeController.text != "") {
.height * _NewLoginAPI(context: context);
0.8 + }
MediaQuery.of(context) });
.viewInsets },
.bottom, child: Container(
decoration: const BoxDecoration( width:
color: Color(0xFFDAE4F7), MediaQuery.of(context).size.width *
borderRadius: BorderRadius.only( 0.75,
topRight: height: 60.0,
Radius.circular(24.0), decoration: BoxDecoration(
topLeft: // image: const DecorationImage(
Radius.circular(24.0), // image:
), // AssetImage('assets/images/btn_kreten_login.png'),
// fit: BoxFit.scaleDown,
// ),
borderRadius:
BorderRadius.circular(12.0),
color: const Color(0xFF0097C1),
),
padding: const EdgeInsets.only(
top: 5.0,
left: 5.0,
right: 5.0,
bottom: 5.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Image.asset(
'assets/images/btn_kreten_login.png',
),
const SizedBox(
width: 10.0,
),
Container(
width: 1.0,
height: 30.0,
color: Colors.white,
),
const SizedBox(
width: 10.0,
),
Text(
'login_w_kreta_acc'.i18n,
textAlign: TextAlign.center,
style: const TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 14.0,
), ),
child: Column( ),
crossAxisAlignment: ],
CrossAxisAlignment.center, )),
mainAxisAlignment: ),
MainAxisAlignment.start, ),
children: [ ),
Padding( const SizedBox(height: 17),
padding: const EdgeInsets // privacy policy
.symmetric( GestureDetector(
vertical: 18), onTap: () => PrivacyView.show(context),
child: Container( child: Text(
decoration: 'privacy'.i18n,
const BoxDecoration( style: const TextStyle(
color: color: Colors.black,
Color(0xFFB9C8E5), fontWeight: FontWeight.w500,
borderRadius: fontSize: 14.0,
BorderRadius.only( ),
topRight:
Radius.circular(
2.0),
topLeft:
Radius.circular(
2.0),
),
),
width: 40,
height: 4,
),
),
Expanded(
child: Padding(
padding:
const EdgeInsets.only(
right: 14,
left: 14,
bottom: 24),
child: ClipRRect(
borderRadius:
BorderRadius
.circular(16),
child: Container(
decoration:
BoxDecoration(
borderRadius:
BorderRadius
.circular(
16),
),
child:
KretenLoginWidget(
onLogin:
(String code) {
codeController
.text = code;
Navigator.of(
context)
.pop();
},
),
),
),
),
)
],
),
);
},
).then((value) {
// After closing the modal bottom sheet, check if the code is set
if (codeController.text.isNotEmpty) {
// Call your API after retrieving the code
_NewLoginAPI(context: context);
}
});
},
child: Text(
"login_w_kreta_acc".i18n,
style: const TextStyle(
fontFamily: 'Montserrat',
fontSize: 16,
fontWeight: FontWeight.w700),
)),
), ),
), ),
const SizedBox(height: 8),
], ],
), ),
), ),
@ -367,18 +334,6 @@ class LoginScreenState extends State<LoginScreen> {
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
), ),
// privacy policy
GestureDetector(
onTap: () => PrivacyView.show(context),
child: Text(
'privacy'.i18n,
style: TextStyle(
color: AppColors.of(context).loginSecondary,
fontWeight: FontWeight.w500,
fontSize: 14.0,
),
),
),
], ],
), ),
), ),
@ -435,6 +390,13 @@ class LoginScreenState extends State<LoginScreen> {
// }), // }),
// ); // );
// } // }
// setState(() => _loginState = LoginState.inProgress);
// _callAPI();
// }
// new login api
// ignore: non_constant_identifier_names
void _NewLoginAPI({required BuildContext context}) { void _NewLoginAPI({required BuildContext context}) {
String code = codeController.text; String code = codeController.text;