ammar/syncrow-web
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/web.git synced 2025-07-09 22:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Home page

Browse Source
This commit is contained in:
mohammad
2024-08-06 11:21:14 +03:00
parent 09dc49b630
commit 1f5a119c60
11 changed files with 521 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/main.dart
View File

@ -33,6 +33,11 @@ class MyApp extends StatelessWidget {
}, },
), ),
theme: ThemeData( theme: ThemeData(
textTheme: const TextTheme(
bodySmall:TextStyle(),
bodyLarge:TextStyle(),
bodyMedium:TextStyle(),
),
colorScheme: ColorScheme.fromSeed( colorScheme: ColorScheme.fromSeed(
seedColor: Colors.deepPurple), // Set up color scheme seedColor: Colors.deepPurple), // Set up color scheme
useMaterial3: true, // Enable Material 3 useMaterial3: true, // Enable Material 3

36
lib/pages/auth/bloc/auth_bloc.dart
View File

@ -1,11 +1,11 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:syncrow_web/pages/auth/bloc/auth_event.dart'; import 'package:syncrow_web/pages/auth/bloc/auth_event.dart';
import 'package:syncrow_web/pages/auth/bloc/auth_state.dart'; import 'package:syncrow_web/pages/auth/bloc/auth_state.dart';
import 'package:syncrow_web/pages/auth/model/login_with_email_model.dart'; import 'package:syncrow_web/pages/auth/model/login_with_email_model.dart';
import 'package:syncrow_web/pages/auth/model/region_model.dart';
import 'package:syncrow_web/pages/auth/model/token.dart'; import 'package:syncrow_web/pages/auth/model/token.dart';
import 'package:syncrow_web/pages/auth/model/user_model.dart'; import 'package:syncrow_web/pages/auth/model/user_model.dart';
import 'package:syncrow_web/services/auth_api.dart'; import 'package:syncrow_web/services/auth_api.dart';
@ -22,35 +22,32 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
on<StopTimerEvent>(_onStopTimer); on<StopTimerEvent>(_onStopTimer);
on<UpdateTimerEvent>(_onUpdateTimer); on<UpdateTimerEvent>(_onUpdateTimer);
on<PasswordVisibleEvent>(_passwordVisible); on<PasswordVisibleEvent>(_passwordVisible);
on<RegionInitialEvent>(_fetchRegion);
} }
////////////////////////////// forget password ////////////////////////////////// ////////////////////////////// forget password //////////////////////////////////
final TextEditingController forgetEmailController = TextEditingController(); final TextEditingController forgetEmailController = TextEditingController();
final TextEditingController forgetPasswordController = TextEditingController(); final TextEditingController forgetPasswordController = TextEditingController();
final TextEditingController forgetOtp = TextEditingController(); final TextEditingController forgetOtp = TextEditingController();
final forgetFormKey = GlobalKey<FormState>(); final forgetFormKey = GlobalKey<FormState>();
Timer? _timer; Timer? _timer;
int _remainingTime = 0; int _remainingTime = 0;
List<RegionModel>? regionList;
Future<void> _onStartTimer(StartTimerEvent event, Emitter<AuthState> emit) async { Future<void> _onStartTimer(StartTimerEvent event, Emitter<AuthState> emit) async {
if (_validateInputs(emit)) return; if (_validateInputs(emit)) return;
print("StartTimerEvent received");
if (_timer != null && _timer!.isActive) { if (_timer != null && _timer!.isActive) {
print("Timer is already active");
return; return;
} }
_remainingTime = 60; _remainingTime = 60;
add(UpdateTimerEvent( add(UpdateTimerEvent(
remainingTime: _remainingTime, isButtonEnabled: false)); remainingTime: _remainingTime, isButtonEnabled: false));
print("Timer started, initial remaining time: $_remainingTime");
await AuthenticationAPI.sendOtp(email: forgetEmailController.text); await AuthenticationAPI.sendOtp(email: forgetEmailController.text);
_timer = Timer.periodic(const Duration(seconds: 1), (timer) { _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
_remainingTime--; _remainingTime--;
print("Timer tick, remaining time: $_remainingTime"); // Debug print
if (_remainingTime <= 0) { if (_remainingTime <= 0) {
_timer?.cancel(); _timer?.cancel();
add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true)); add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true));
print("Timer finished"); // Debug print
} else { } else {
add(UpdateTimerEvent( add(UpdateTimerEvent(
remainingTime: _remainingTime, isButtonEnabled: false)); remainingTime: _remainingTime, isButtonEnabled: false));
@ -92,8 +89,6 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
///////////////////////////////////// login ///////////////////////////////////// ///////////////////////////////////// login /////////////////////////////////////
final TextEditingController loginEmailController = TextEditingController(); final TextEditingController loginEmailController = TextEditingController();
final TextEditingController loginPasswordController = TextEditingController(); final TextEditingController loginPasswordController = TextEditingController();
@ -108,7 +103,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
bool showValidationMessage = false; bool showValidationMessage = false;
void _login(LoginButtonPressed event, Emitter<AuthState> emit) async { void _login(LoginButtonPressed event, Emitter<AuthState> emit) async {
emit(LoginLoading()); emit(AuthLoading());
if (isChecked) { if (isChecked) {
try { try {
if (event.username.isEmpty || event.password.isEmpty) { if (event.username.isEmpty || event.password.isEmpty) {
@ -128,7 +123,6 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
return; return;
} }
if (token.accessTokenIsNotEmpty) { if (token.accessTokenIsNotEmpty) {
debugPrint('token: ${token.accessToken}');
FlutterSecureStorage storage = const FlutterSecureStorage(); FlutterSecureStorage storage = const FlutterSecureStorage();
await storage.write( await storage.write(
key: Token.loginAccessTokenKey, value: token.accessToken); key: Token.loginAccessTokenKey, value: token.accessToken);
@ -148,7 +142,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
} }
checkBoxToggle(CheckBoxEvent event, Emitter<AuthState> emit,) { checkBoxToggle(CheckBoxEvent event, Emitter<AuthState> emit,) {
emit(LoginLoading()); emit(AuthLoading());
isChecked = event.newValue!; isChecked = event.newValue!;
emit(LoginInitial()); emit(LoginInitial());
} }
@ -161,15 +155,13 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
} }
void _passwordVisible(PasswordVisibleEvent event, Emitter<AuthState> emit) { void _passwordVisible(PasswordVisibleEvent event, Emitter<AuthState> emit) {
emit(LoginLoading()); emit(AuthLoading());
obscureText = !event.newValue!; obscureText = !event.newValue!;
emit(PasswordVisibleState()); emit(PasswordVisibleState());
} }
void launchURL(String url) { void launchURL(String url) {
if (kDebugMode) {
print('Launching URL: $url');
}
} }
@ -320,6 +312,18 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
} }
} }
void _fetchRegion(RegionInitialEvent event, Emitter<AuthState> emit) async {
try {
emit(AuthLoading());
regionList = await AuthenticationAPI.fetchRegion();
emit(LoginSuccess());
} catch (e) {
emit( LoginFailure(error: e.toString()));
}
}
} }

7
lib/pages/auth/bloc/auth_event.dart
View File

@ -17,7 +17,6 @@ class LoginButtonPressed extends AuthEvent {
List<Object> get props => [username, password]; List<Object> get props => [username, password];
} }
class CheckBoxEvent extends AuthEvent { class CheckBoxEvent extends AuthEvent {
final bool? newValue; final bool? newValue;
@ -49,4 +48,8 @@ class PasswordVisibleEvent extends AuthEvent{
final bool? newValue; final bool? newValue;
const PasswordVisibleEvent({required this.newValue,}); const PasswordVisibleEvent({required this.newValue,});
} }
class RegionInitialEvent extends AuthEvent {}
class SelectRegionEvent extends AuthEvent {}

4
lib/pages/auth/bloc/auth_state.dart
View File

@ -11,7 +11,7 @@ class LoginInitial extends AuthState {}
class AuthTokenLoading extends AuthState {} class AuthTokenLoading extends AuthState {}
class LoginLoading extends AuthState {} class AuthLoading extends AuthState {}
class LoginSuccess extends AuthState {} class LoginSuccess extends AuthState {}
@ -74,5 +74,3 @@ class AuthSuccess extends AuthState {}
class AuthTokenSuccess extends AuthSuccess {} class AuthTokenSuccess extends AuthSuccess {}
// class AuthState extends AuthState {}

25
lib/pages/auth/model/region_model.dart Normal file
View File

@ -0,0 +1,25 @@
class RegionModel {
final String name;
final String id;
RegionModel({
required this.name,
required this.id,
});
factory RegionModel.fromJson(Map<String, dynamic> json) {
return RegionModel(
name: json['regionName'],
id: json['uuid'].toString(), // Ensure id is a String
);
}
Map<String, dynamic> toJson() {
return {
'regionName': name,
'uuid': id,
};
}
}

405
lib/pages/auth/view/forget_password_web_page.dart
View File

@ -19,9 +19,7 @@ class ForgetPasswordWebPage extends StatelessWidget {
create: (context) => AuthBloc(), create: (context) => AuthBloc(),
child: BlocConsumer<AuthBloc, AuthState>( child: BlocConsumer<AuthBloc, AuthState>(
listener: (context, state) { listener: (context, state) {
if (state is LoadingForgetState) { if (state is SuccessForgetState){
} else if (state is SuccessForgetState){
Navigator.of(context).pop(); Navigator.of(context).pop();
} }
else if (state is FailureForgetState) { else if (state is FailureForgetState) {
@ -47,232 +45,237 @@ class ForgetPasswordWebPage extends StatelessWidget {
Widget _buildForm(BuildContext context, AuthState state) { Widget _buildForm(BuildContext context, AuthState state) {
final forgetBloc = BlocProvider.of<AuthBloc>(context); final forgetBloc = BlocProvider.of<AuthBloc>(context);
return FirstLayer( return FirstLayer(
second: Container( second: Center(
padding:const EdgeInsets.all(50) , child: ListView(
margin: const EdgeInsets.all(50), children: [
decoration: BoxDecoration( Container(
color: Colors.black.withOpacity(0.3), padding:const EdgeInsets.all(50) ,
borderRadius: const BorderRadius.all(Radius.circular(20)), margin: const EdgeInsets.all(90),
), decoration: BoxDecoration(
child: Center( color: Colors.black.withOpacity(0.3),
child: ListView( borderRadius: const BorderRadius.all(Radius.circular(20)),
shrinkWrap: true, ),
children: [ child: Center(
Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
const Spacer(), const Spacer(),
Expanded( Expanded(
flex: 2, flex: 3,
child: SvgPicture.asset( child: SvgPicture.asset(
Assets.loginLogo, Assets.loginLogo,
),
), ),
), const Spacer(),
const Spacer(), Expanded(
Container( flex: 3,
decoration: BoxDecoration( child: Container(
color: Colors.white.withOpacity(0.1), decoration: BoxDecoration(
borderRadius: const BorderRadius.all(Radius.circular(30)), color: Colors.white.withOpacity(0.1),
border: Border.all(color: ColorsManager.graysColor.withOpacity(0.2)), borderRadius: const BorderRadius.all(Radius.circular(30)),
), border: Border.all(color: ColorsManager.graysColor.withOpacity(0.2)),
child: Form( ),
key: forgetBloc.forgetFormKey, child: Form(
child: Padding( key: forgetBloc.forgetFormKey,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 40, vertical: 25), padding: const EdgeInsets.symmetric(horizontal: 40, vertical: 25),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
const SizedBox(height: 10),
const Text(
'Forget Password',
style: TextStyle(
color: Colors.white,
fontSize: 24,
fontWeight: FontWeight.bold),
),
const SizedBox(height: 20),
Text(
'Please fill in your account information to\n retrieve your password',
style: smallTextStyle,
),
const SizedBox(height: 20),
Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, children: <Widget>[
children: [ const SizedBox(height: 10),
const Text(
'Forget Password',
style: TextStyle(
color: Colors.white,
fontSize: 24,
fontWeight: FontWeight.bold),
),
const SizedBox(height: 20),
Text( Text(
"Country/Region", 'Please fill in your account information to\nretrieve your password',
style: smallTextStyle, style: smallTextStyle,
), ),
const SizedBox(height: 10), const SizedBox(height: 20),
SizedBox( Column(
width: MediaQuery.of(context).size.width * 0.2, crossAxisAlignment: CrossAxisAlignment.start,
child: DropdownButtonFormField<String>( mainAxisAlignment: MainAxisAlignment.start,
validator: forgetBloc.validateRegion, children: [
icon: const Icon( Text(
Icons.keyboard_arrow_down_outlined, "Country/Region",
style: smallTextStyle,
), ),
decoration: textBoxDecoration()!.copyWith( const SizedBox(height: 10),
hintText: null, SizedBox(
child: DropdownButtonFormField<String>(
validator: forgetBloc.validateRegion,
icon: const Icon(
Icons.keyboard_arrow_down_outlined,
),
decoration: textBoxDecoration()!.copyWith(
hintText: null,
),
hint: SizedBox(
width: MediaQuery.sizeOf(context).width * 0.11,
child: const Align(
alignment: Alignment.centerLeft,
child: Text(
'Select your region/country',
textAlign: TextAlign.center,
overflow: TextOverflow.ellipsis,
),
),
),
isDense: true,
style: const TextStyle(color: Colors.black),
items: forgetBloc.regions.map((String region) {
return DropdownMenuItem<String>(
value: region,
child: Text(region),
);
}).toList(),
onChanged: (String? value) {
print(value);
},
),
)
],
),
const SizedBox(height: 20),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("Account",
style: smallTextStyle,
), ),
hint: const Align( const SizedBox(height: 10),
alignment: Alignment.centerLeft, SizedBox(
child: Text( child: TextFormField(
'Select your region/country', validator: forgetBloc.validateEmail,
textAlign: TextAlign.center, controller: forgetBloc.forgetEmailController,
decoration: textBoxDecoration()!.copyWith(hintText: 'Enter your email'),
style: const TextStyle(color: Colors.black),
), ),
), ),
isDense: true, ],
style: const TextStyle(color: Colors.black),
items: forgetBloc.regions.map((String region) {
return DropdownMenuItem<String>(
value: region,
child: Text(region),
);
}).toList(),
onChanged: (String? value) {
print(value);
},
),
)
],
),
const SizedBox(height: 20),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("Account",
style: smallTextStyle,),
const SizedBox(height: 10),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
child: TextFormField(
validator: forgetBloc.validateEmail,
controller: forgetBloc.forgetEmailController,
decoration: textBoxDecoration()!.copyWith(hintText: 'Enter your email'),
style: const TextStyle(color: Colors.black),
),
), ),
], const SizedBox(height: 20.0),
), Column(
const SizedBox(height: 20.0), crossAxisAlignment: CrossAxisAlignment.start,
Column( mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
mainAxisAlignment: MainAxisAlignment.start, Text("One Time Password",
children: [ style: smallTextStyle,),
Text("One Time Password", const SizedBox(height: 10),
style: smallTextStyle,), SizedBox(
const SizedBox(height: 10), child: TextFormField(
SizedBox( validator: forgetBloc.validateCode,
width: MediaQuery.sizeOf(context).width * 0.2, keyboardType: TextInputType.visiblePassword,
child: TextFormField( controller: forgetBloc.forgetOtp,
validator: forgetBloc.validateCode, decoration: textBoxDecoration()!.copyWith(
keyboardType: TextInputType.visiblePassword, hintText: 'Enter Code',
controller: forgetBloc.forgetOtp, suffixIcon: SizedBox(
decoration: textBoxDecoration()!.copyWith( width: 100,
hintText: 'Enter Code', child: Center(
suffixIcon: SizedBox( child: InkWell(
width: 100, onTap: () {
child: Center( BlocProvider.of<AuthBloc>(context).add(StartTimerEvent());
child: InkWell( },
onTap: () { child: Text(
BlocProvider.of<AuthBloc>(context).add(StartTimerEvent()); 'Get Code ${state is TimerState && !state.isButtonEnabled ? "(${state.remainingTime.toString()})" : ""}',
}, style: TextStyle(
child: Text( color: state is TimerState && !state.isButtonEnabled
'Get Code ${state is TimerState && !state.isButtonEnabled ? "(${state.remainingTime.toString()})" : ""}', ? Colors.grey
style: TextStyle( : ColorsManager.btnColor,
color: state is TimerState && !state.isButtonEnabled ),
? Colors.grey ),
: ColorsManager.btnColor,
), ),
), ),
), ),
), ),
style: const TextStyle(color: Colors.black),
), ),
), ),
style: const TextStyle(color: Colors.black), ],
),
), ),
], const SizedBox(height: 20.0),
), Column(
const SizedBox(height: 20.0), crossAxisAlignment: CrossAxisAlignment.start,
Column( mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
mainAxisAlignment: MainAxisAlignment.start, Text("Password",
children: [ style: smallTextStyle,),
Text("Password", const SizedBox(height: 10),
style: smallTextStyle,), SizedBox(
const SizedBox(height: 10), child: TextFormField(
validator: forgetBloc.passwordValidator,
keyboardType: TextInputType.visiblePassword,
controller: forgetBloc.forgetPasswordController,
decoration: textBoxDecoration()!.copyWith(
hintText: 'At least 8 characters',
),
style: const TextStyle(color: Colors.black),
),
),
],
),
const SizedBox(
height: 10,
),
const SizedBox(height: 20.0),
SizedBox( SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2, width: MediaQuery.sizeOf(context).width * 0.2,
child: TextFormField( child: DefaultButton(
validator: forgetBloc.passwordValidator, backgroundColor: ColorsManager.btnColor,
keyboardType: TextInputType.visiblePassword, child: const Text('Submit'),
controller: forgetBloc.forgetPasswordController, onPressed: () {
decoration: textBoxDecoration()!.copyWith( if (forgetBloc.forgetFormKey.currentState!.validate()) {
hintText: 'At least 8 characters', forgetBloc.add(ChangePasswordEvent());
), }
style: const TextStyle(color: Colors.black), },
), ),
), ),
SizedBox(height: 10,),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const Flexible(
child: Text(
"Do you have an account? ",
style: TextStyle(color: Colors.white),
)),
InkWell(
onTap: () {
Navigator.pop(context);
},
child: const Flexible(
child: Text(
"Sign in",
)),
),
],
),
)
], ],
), ),
const SizedBox( ),
height: 10,
),
const SizedBox(height: 20.0),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
child: DefaultButton(
backgroundColor: ColorsManager.btnColor,
child: const Text('Submit'),
onPressed: () {
if (forgetBloc.forgetFormKey.currentState!.validate()) {
forgetBloc.add(ChangePasswordEvent());
}
},
),
),
SizedBox(height: 10,),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const Flexible(
child: Text(
"Do you have an account? ",
style: TextStyle(color: Colors.white),
)),
InkWell(
onTap: () {
Navigator.pop(context);
},
child: const Flexible(
child: Text(
"Sign in",
)),
),
],
),
)
],
), ),
), ),
), ),
), const Spacer(),
const Spacer(), ],
], ),
), ),
], ),
), ],
), ),
), )
); );
} }
} }

87
lib/pages/auth/view/login_mobile_page.dart
View File

@ -15,7 +15,6 @@ import 'package:syncrow_web/utils/style.dart';
class LoginMobilePage extends StatelessWidget { class LoginMobilePage extends StatelessWidget {
const LoginMobilePage({super.key}); const LoginMobilePage({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@ -39,7 +38,7 @@ class LoginMobilePage extends StatelessWidget {
} }
}, },
builder: (context, state) { builder: (context, state) {
if (state is LoginLoading) { if (state is AuthLoading) {
return const Center(child: CircularProgressIndicator()); return const Center(child: CircularProgressIndicator());
} else { } else {
return _buildLoginForm(context); return _buildLoginForm(context);
@ -311,90 +310,6 @@ class LoginMobilePage extends StatelessWidget {
}, },
), ),
), ),
// Padding(
// padding: const EdgeInsets.all(5.0),
// child: SizedBox(
// width: MediaQuery.sizeOf(context).width * 0.2,
// child: Row(
// mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// Expanded(child: Image.asset(Assets.liftLine)),
// Expanded(
// child: Padding(
// padding: const EdgeInsets.all(5.0),
// child: Text('Or sign in with',
// style: smallTextStyle.copyWith(fontSize: 10),
// ),
// )
// ),
// Expanded(child: Image.asset(Assets.rightLine)),
// ],
// ),
// ),
// ),
// SizedBox(
// width: MediaQuery.sizeOf(context).width * 0.2,
// child: Row(
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// Expanded(
// child: Container(
// decoration: containerDecoration,
// child:InkWell(
// child: Padding(
// padding: const EdgeInsets.all(8.0),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// SvgPicture.asset(
// Assets.google,
// fit: BoxFit.cover,
// ),
// const Flexible(
// child: Text('Google',
// style: TextStyle(color: Colors.black),
// ),
// ),
// ],
// ),
// ),
// onTap: () {},
// ),
// ),
// ),
// SizedBox(width: 10,),
// Expanded(
// child: Container(
// decoration: containerDecoration,
// child:InkWell(
// child: Padding(
// padding: const EdgeInsets.all(8.0),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// SvgPicture.asset(
// Assets.facebook,
// fit: BoxFit.cover,
// ),
// const Flexible(
// child: Text('Facebook',
// style: TextStyle(color: Colors.black),
// ),
// ),
// ],
// ),
// ),
// onTap: () {},
// ),
// ),
// ),
//
// ],
// ),
// ),
const SizedBox( const SizedBox(
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,

559
lib/pages/auth/view/login_web_page.dart
View File

@ -22,7 +22,7 @@ class LoginWebPage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
body: BlocProvider( body: BlocProvider(
create: (context) => AuthBloc(), create: (BuildContext context) => AuthBloc()..add(RegionInitialEvent()),
child: BlocConsumer<AuthBloc, AuthState>( child: BlocConsumer<AuthBloc, AuthState>(
listener: (context, state) { listener: (context, state) {
if (state is LoginSuccess) { if (state is LoginSuccess) {
@ -41,7 +41,7 @@ class LoginWebPage extends StatelessWidget {
} }
}, },
builder: (context, state) { builder: (context, state) {
if (state is LoginLoading) { if (state is AuthLoading) {
return const Center(child: CircularProgressIndicator()); return const Center(child: CircularProgressIndicator());
} else { } else {
return _buildLoginForm(context,state); return _buildLoginForm(context,state);
@ -55,364 +55,265 @@ class LoginWebPage extends StatelessWidget {
Widget _buildLoginForm(BuildContext context,AuthState state) { Widget _buildLoginForm(BuildContext context,AuthState state) {
final loginBloc = BlocProvider.of<AuthBloc>(context); final loginBloc = BlocProvider.of<AuthBloc>(context);
return FirstLayer( return FirstLayer(
second: Container( second: Center(
margin: const EdgeInsets.all(50), child: ListView(
decoration: BoxDecoration( shrinkWrap: true,
color: Colors.black.withOpacity(0.3), children: [
borderRadius: const BorderRadius.all(Radius.circular(20)), Container(
), padding:const EdgeInsets.all(50) ,
child: Center( margin: const EdgeInsets.all(90),
child: ListView( decoration: BoxDecoration(
shrinkWrap: true, color: Colors.black.withOpacity(0.3),
children: [ borderRadius: const BorderRadius.all(Radius.circular(20)),
Row( ),
child: Center(
child:Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
const Spacer(), const Spacer(),
Expanded( Expanded(
flex: 2, flex: 3,
child: SvgPicture.asset( child: SvgPicture.asset(
Assets.loginLogo, Assets.loginLogo,
), ),
), ),
const Spacer(), const Spacer(),
Container( Expanded(
decoration: BoxDecoration( flex: 3,
color: Colors.white.withOpacity(0.1), child: Container(
borderRadius: const BorderRadius.all(Radius.circular(30)), decoration: BoxDecoration(
border: Border.all(color: ColorsManager.graysColor.withOpacity(0.2))), color: Colors.white.withOpacity(0.1),
child: Form( borderRadius: const BorderRadius.all(Radius.circular(30)),
key: loginBloc.loginFormKey, border: Border.all(color: ColorsManager.graysColor.withOpacity(0.2))),
child: Padding( child: Form(
padding: const EdgeInsets.symmetric(horizontal: 50, vertical: 25), key: loginBloc.loginFormKey,
child: Column( child: Padding(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, padding: const EdgeInsets.symmetric(horizontal: 50, vertical: 25),
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: <Widget>[ mainAxisAlignment: MainAxisAlignment.spaceEvenly,
const SizedBox(height: 15), crossAxisAlignment: CrossAxisAlignment.start,
const Text( children: <Widget>[
'Login', const SizedBox(height: 15),
style: TextStyle( const Text(
color: Colors.white, 'Login',
fontSize: 24, style: TextStyle(
fontWeight: FontWeight.bold), color: Colors.white,
), fontSize: 24,
const SizedBox(height: 40), fontWeight: FontWeight.bold),
Column( ),
crossAxisAlignment: CrossAxisAlignment.start, const SizedBox(height: 40),
mainAxisAlignment: MainAxisAlignment.start, Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Text( mainAxisAlignment: MainAxisAlignment.start,
"Country/Region", children: [
style: smallTextStyle, Text(
), "Country/Region",
const SizedBox( style: smallTextStyle,
height: 10, ),
), const SizedBox(height: 10,),
SizedBox( SizedBox(
width: MediaQuery.of(context).size.width * 0.2, child: DropdownButtonFormField<String>(
child: DropdownButtonFormField<String>( validator:loginBloc.validateRegion ,
validator:loginBloc.validateRegion , icon: const Icon(
icon: const Icon( Icons.keyboard_arrow_down_outlined,
Icons.keyboard_arrow_down_outlined, ),
decoration: textBoxDecoration()!.copyWith(
hintText: null,),
hint: SizedBox(
width: MediaQuery.sizeOf(context).width * 0.11,
child: const Align(
alignment: Alignment.centerLeft,
child: Text(
'Select your region/country',
textAlign: TextAlign.center,
style: TextStyle(fontSize: 14),
overflow: TextOverflow.ellipsis,
),
),
),
isDense: true,
style: const TextStyle(color: Colors.black),
items:loginBloc.regions.map((String region) {
return DropdownMenuItem<String>(
value: region,
child: Text(region),
);
}).toList(),
onChanged: (String? value) {
print(value);
},
),
)
],
),
const SizedBox(height: 20.0),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("Email",
style: smallTextStyle,
),
const SizedBox(
height: 10,
),
SizedBox(
child: TextFormField(
validator:loginBloc.validateEmail ,
controller:loginBloc.loginEmailController,
decoration: textBoxDecoration()!.copyWith(hintText: 'Enter your email'),
style: const TextStyle(color: Colors.black),
),
),
],
),
const SizedBox(height: 20.0),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("Password", style: smallTextStyle,),
const SizedBox(
height: 10,
), ),
decoration: textBoxDecoration()!.copyWith( SizedBox(
hintText: null, child: TextFormField(
), validator:loginBloc.validatePassword,
hint: const Align( obscureText:loginBloc.obscureText,
alignment: Alignment.centerLeft, keyboardType: TextInputType.visiblePassword,
child: Text( controller:loginBloc.loginPasswordController,
'Select your region/country', decoration: textBoxDecoration()!.copyWith(
textAlign: TextAlign.center, hintText: 'At least 8 characters',
suffixIcon: IconButton(onPressed: () {
loginBloc.add(PasswordVisibleEvent(newValue: loginBloc.obscureText));
},
icon: SizedBox(
child: SvgPicture.asset(
loginBloc.obscureText?
Assets.visiblePassword :
Assets.invisiblePassword,
height: 15,
width: 15,
),
),
)
),
style: const TextStyle(color: Colors.black),
), ),
), ),
isDense: true, ],
style: const TextStyle(color: Colors.black),
items:loginBloc.regions.map((String region) {
return DropdownMenuItem<String>(
value: region,
child: Text(region),
);
}).toList(),
onChanged: (String? value) {
print(value);
},
),
)
],
),
const SizedBox(height: 20.0),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("Email",
style: smallTextStyle,
), ),
const SizedBox( const SizedBox(
height: 10, height: 20,
), ),
SizedBox( SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2, child: Row(
child: TextFormField( mainAxisAlignment: MainAxisAlignment.end,
validator:loginBloc.validateEmail , children: [
controller:loginBloc.loginEmailController, InkWell(
decoration: textBoxDecoration()!.copyWith(hintText: 'Enter your email'), onTap: () {
style: const TextStyle(color: Colors.black), Navigator.of(context).push(MaterialPageRoute(builder: (context) => const ForgetPasswordPage(),));
), },
), child: Text(
], "Forgot Password?",
), style: smallTextStyle,
const SizedBox(height: 20.0),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("Password", style: smallTextStyle,),
const SizedBox(
height: 10,
),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
child: TextFormField(
validator:loginBloc.validatePassword,
obscureText:loginBloc.obscureText,
keyboardType: TextInputType.visiblePassword,
controller:loginBloc.loginPasswordController,
decoration: textBoxDecoration()!.copyWith(
hintText: 'At least 8 characters',
suffixIcon: IconButton(onPressed: () {
loginBloc.add(PasswordVisibleEvent(newValue: loginBloc.obscureText));
},
icon: SizedBox(
child: SvgPicture.asset(
loginBloc.obscureText?
Assets.visiblePassword :
Assets.invisiblePassword,
height: 15,
width: 15,
), ),
), ),
) ],
),
style: const TextStyle(color: Colors.black),
), ),
), ),
], const SizedBox(
), height: 32,
const SizedBox(
height: 20,
),
SizedBox(
width: MediaQuery.of(context).size.width * 0.2,
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
InkWell(
onTap: () {
Navigator.of(context).push(MaterialPageRoute(builder: (context) => const ForgetPasswordPage(),));
},
child: Text(
"Forgot Password?",
style: smallTextStyle,
),
),
],
),
),
const SizedBox(
height: 32,
),
Row(
children: [
Transform.scale(
scale: 1.2, // Adjust the scale as needed
child: Checkbox(
fillColor: MaterialStateProperty.all<Color>(Colors.white),
activeColor: Colors.white,
value:loginBloc.isChecked,
checkColor: Colors.black,
shape: const CircleBorder(),
onChanged: (bool? newValue) {
loginBloc.add(CheckBoxEvent(newValue: newValue));
},
),
), ),
Row(
children: [
Transform.scale(
scale: 1.2, // Adjust the scale as needed
child: Checkbox(
fillColor: MaterialStateProperty.all<Color>(Colors.white),
activeColor: Colors.white,
value:loginBloc.isChecked,
checkColor: Colors.black,
shape: const CircleBorder(),
onChanged: (bool? newValue) {
loginBloc.add(CheckBoxEvent(newValue: newValue));
},
),
),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.16,
child: RichText(
text: TextSpan(
text: 'Agree to ',
style: const TextStyle(color: Colors.white),
children: [
TextSpan(
text: '(Terms of Service)',
style: const TextStyle(
color: Colors.black,),
recognizer: TapGestureRecognizer()
..onTap = () {
loginBloc.launchURL(
'https://example.com/terms');
},
),
TextSpan(
text: ' (Legal Statement)',
style: const TextStyle(color: Colors.black),
recognizer: TapGestureRecognizer()
..onTap = () {
loginBloc.launchURL(
'https://example.com/legal');
},
),
TextSpan(
text: ' (Privacy Statement)',
style: const TextStyle(
color: Colors.black),
recognizer: TapGestureRecognizer()
..onTap = () {
loginBloc.launchURL(
'https://example.com/privacy');
},
),
],
),
),
),
],
),
const SizedBox(height: 30.0),
SizedBox( SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2, width: MediaQuery.sizeOf(context).width * 0.2,
child: RichText( child: DefaultButton(
text: TextSpan( backgroundColor: loginBloc.isChecked?
text: 'Agree to ', ColorsManager.btnColor:ColorsManager.grayColor,
style: const TextStyle(color: Colors.white), child: const Text('Sign in'),
children: [ onPressed: () {
TextSpan( if (loginBloc.loginFormKey.currentState!.validate()) {
text: '(Terms of Service)', loginBloc.add(LoginButtonPressed(
style: const TextStyle( username: loginBloc.loginEmailController.text,
color: Colors.black), password: loginBloc.loginPasswordController.text,
recognizer: TapGestureRecognizer()
..onTap = () {
loginBloc.launchURL(
'https://example.com/terms');
},
), ),
TextSpan( );
text: ' (Legal Statement)', }
style: const TextStyle(color: Colors.black), },
recognizer: TapGestureRecognizer()
..onTap = () {
loginBloc.launchURL(
'https://example.com/legal');
},
),
TextSpan(
text: ' (Privacy Statement)',
style: const TextStyle(
color: Colors.black),
recognizer: TapGestureRecognizer()
..onTap = () {
loginBloc.launchURL(
'https://example.com/privacy');
},
),
],
),
), ),
), ),
],
),
const SizedBox(height: 30.0),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
child: DefaultButton(
backgroundColor: loginBloc.isChecked?
ColorsManager.btnColor:ColorsManager.grayColor,
child: const Text('Sign in'),
onPressed: () {
if (loginBloc.loginFormKey.currentState!.validate()) {
loginBloc.add(LoginButtonPressed(
username: loginBloc.loginEmailController.text,
password: loginBloc.loginPasswordController.text,
),
);
}
},
),
),
], ],
), ),
), ),
) )
), )),
const Spacer(), const Spacer(),
], ],
), ),),
], )
)), ],
),
), ),
); );
} }
} }
// Padding(
// padding: const EdgeInsets.all(5.0),
// child: SizedBox(
// width: MediaQuery.sizeOf(context).width * 0.2,
// child: Row(
// mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// Expanded(child: Image.asset(Assets.liftLine)),
// Expanded(
// child: Padding(
// padding: const EdgeInsets.all(5.0),
// child: Text('Or sign in with',
// style: smallTextStyle.copyWith(fontSize: 10),
// ),
// )
// ),
// Expanded(child: Image.asset(Assets.rightLine)),
// ],
// ),
// ),
// ),
// SizedBox(
// width: MediaQuery.sizeOf(context).width * 0.2,
// child: Row(
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// Expanded(
// child: Container(
// decoration: containerDecoration,
// child:InkWell(
// child: Padding(
// padding: const EdgeInsets.all(8.0),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// SvgPicture.asset(
// Assets.google,
// fit: BoxFit.cover,
// ),
// const Flexible(
// child: Text('Google',
// style: TextStyle(color: Colors.black),
// ),
// ),
// ],
// ),
// ),
// onTap: () {},
// ),
// ),
// ),
// SizedBox(width: 10,),
// Expanded(
// child: Container(
// decoration: containerDecoration,
// child:InkWell(
// child: Padding(
// padding: const EdgeInsets.all(8.0),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// SvgPicture.asset(
// Assets.facebook,
// fit: BoxFit.cover,
// ),
// const Flexible(
// child: Text('Facebook',
// style: TextStyle(color: Colors.black),
// ),
// ),
// ],
// ),
// ),
// onTap: () {},
// ),
// ),
// ),
//
// ],
// ),
// ),
// SizedBox(
// width: MediaQuery.sizeOf(context).width * 0.2,
// child: const Row(
// mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// Flexible(
// child: Text(
// "Don't you have an account? ",
// style: TextStyle(color: Colors.white),
// )),
// Flexible(
// child: Text(
// "Sign up",
// )),
// ],
// ),
// )

1
lib/services/api/http_interceptor.dart
View File

@ -13,6 +13,7 @@ class HTTPInterceptor extends InterceptorsWrapper {
List<String> headerExclusionListOfAddedParameters = [ List<String> headerExclusionListOfAddedParameters = [
ApiEndpoints.login, ApiEndpoints.login,
ApiEndpoints.getRegion
]; ];
@override @override

56
lib/services/auth_api.dart
View File

@ -1,5 +1,6 @@
import 'dart:convert'; import 'dart:convert';
import 'package:syncrow_web/pages/auth/model/region_model.dart';
import 'package:syncrow_web/pages/auth/model/token.dart'; import 'package:syncrow_web/pages/auth/model/token.dart';
import 'package:syncrow_web/services/api/http_service.dart'; import 'package:syncrow_web/services/api/http_service.dart';
import 'package:syncrow_web/utils/constants/api_const.dart'; import 'package:syncrow_web/utils/constants/api_const.dart';
@ -17,51 +18,50 @@ class AuthenticationAPI {
return response; return response;
} }
static Future forgetPassword({ required var email, required var password}) async { static Future forgetPassword(
{required var email, required var password}) async {
final response = await HTTPService().post( final response = await HTTPService().post(
path: ApiEndpoints.forgetPassword, path: ApiEndpoints.forgetPassword,
body: { body: {"email": email, "password": password},
"email": email,
"password": password
},
showServerMessage: true, showServerMessage: true,
expectedResponseModel: (json) { expectedResponseModel: (json) {});
});
return response; return response;
} }
static Future sendOtp({ required var email}) async { static Future sendOtp({required var email}) async {
final response = await HTTPService().post( final response = await HTTPService().post(
path: ApiEndpoints.sendOtp, path: ApiEndpoints.sendOtp,
body: { body: {"email": email, "type": "VERIFICATION"},
"email": email,
"type": "VERIFICATION"
},
showServerMessage: true, showServerMessage: true,
expectedResponseModel: (json) { expectedResponseModel: (json) {});
print('json===$json');
});
return response; return response;
} }
static Future<bool> verifyOtp({ required String email, required String otpCode}) async { static Future<bool> verifyOtp(
{required String email, required String otpCode}) async {
final response = await HTTPService().post( final response = await HTTPService().post(
path: ApiEndpoints.verifyOtp, path: ApiEndpoints.verifyOtp,
body: { body: {"email": email, "type": "VERIFICATION", "otpCode": otpCode},
"email": email,
"type": "VERIFICATION",
"otpCode": otpCode
},
showServerMessage: true, showServerMessage: true,
expectedResponseModel: (json) { expectedResponseModel: (json) {
print('json===${json['message']}'); if (json['message'] == 'Otp Verified Successfully') {
if(json['message']=='Otp Verified Successfully'){ return true;
return true; } else {
}else{ return false;
return false; }
}
}); });
return response; return response;
} }
static Future<List<RegionModel>> fetchRegion() async {
final response = await HTTPService().get(
path: ApiEndpoints.getRegion,
showServerMessage: true,
expectedResponseModel: (json) {
return (json as List).map((zone) => RegionModel.fromJson(zone)).toList();
}
);
return response as List<RegionModel>;
}
} }

1
lib/utils/constants/api_const.dart
View File

@ -8,4 +8,5 @@ abstract class ApiEndpoints {
static const String forgetPassword = '$baseUrl/authentication/user/forget-password'; static const String forgetPassword = '$baseUrl/authentication/user/forget-password';
static const String sendOtp = '$baseUrl/authentication/user/send-otp'; static const String sendOtp = '$baseUrl/authentication/user/send-otp';
static const String verifyOtp = '$baseUrl/authentication/user/verify-otp'; static const String verifyOtp = '$baseUrl/authentication/user/verify-otp';
static const String getRegion = '$baseUrl/region';
} }