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

Merged with dev

Browse Source
This commit is contained in:
Abdullah Alassaf
2024-08-08 14:07:11 +03:00
parent eb686b20cf 8e62177a54
commit b177010c73
16 changed files with 643 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/main.dart
View File

@ -4,6 +4,7 @@ import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
import 'package:syncrow_web/pages/auth/view/login_page.dart';
import 'package:syncrow_web/pages/home/view/home_page.dart';
import 'package:syncrow_web/services/locator.dart';
import 'package:syncrow_web/utils/color_manager.dart';
Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();
@ -33,14 +34,23 @@ class MyApp extends StatelessWidget {
},
),
theme: ThemeData(
colorScheme: ColorScheme.fromSeed(
seedColor: Colors.deepPurple), // Set up color scheme
textTheme: const TextTheme(
bodySmall: TextStyle(
fontSize: 13, color: ColorsManager.whiteColors, fontWeight: FontWeight.bold),
bodyMedium: TextStyle(color: Colors.black87, fontSize: 14),
bodyLarge: TextStyle(fontSize: 16, color: Colors.white),
headlineSmall: TextStyle(color: Colors.black87, fontSize: 18),
headlineMedium: TextStyle(color: Colors.black87, fontSize: 20),
headlineLarge: TextStyle(
color: Colors.white,
fontSize: 24,
fontWeight: FontWeight.bold,
),
),
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), // Set up color scheme
useMaterial3: true, // Enable Material 3
),
home: isLoggedIn == 'Success'?
const HomePage()
:
const LoginPage(),
home: isLoggedIn == 'Success' ? const HomePage() : const LoginPage(),
);
}
}

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

@ -1,11 +1,11 @@
import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.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_state.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/user_model.dart';
import 'package:syncrow_web/services/auth_api.dart';
@ -22,6 +22,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
on<StopTimerEvent>(_onStopTimer);
on<UpdateTimerEvent>(_onUpdateTimer);
on<PasswordVisibleEvent>(_passwordVisible);
on<RegionInitialEvent>(_fetchRegion);
}
////////////////////////////// forget password //////////////////////////////////
@ -31,26 +32,22 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
final forgetFormKey = GlobalKey<FormState>();
Timer? _timer;
int _remainingTime = 0;
List<RegionModel>? regionList;
Future<void> _onStartTimer(StartTimerEvent event, Emitter<AuthState> emit) async {
if (_validateInputs(emit)) return;
print("StartTimerEvent received");
if (_timer != null && _timer!.isActive) {
print("Timer is already active");
return;
}
_remainingTime = 60;
add(UpdateTimerEvent(
remainingTime: _remainingTime, isButtonEnabled: false));
print("Timer started, initial remaining time: $_remainingTime");
await AuthenticationAPI.sendOtp(email: forgetEmailController.text);
_timer = Timer.periodic(const Duration(seconds: 1), (timer) {
_remainingTime--;
print("Timer tick, remaining time: $_remainingTime"); // Debug print
if (_remainingTime <= 0) {
_timer?.cancel();
add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true));
print("Timer finished"); // Debug print
} else {
add(UpdateTimerEvent(
remainingTime: _remainingTime, isButtonEnabled: false));
@ -92,8 +89,6 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
///////////////////////////////////// login /////////////////////////////////////
final TextEditingController loginEmailController = TextEditingController();
final TextEditingController loginPasswordController = TextEditingController();
@ -103,12 +98,13 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
String newPassword = '';
String maskedEmail = '';
String otpCode = '';
String validate = '';
static Token token = Token.emptyConstructor();
static UserModel? user;
bool showValidationMessage = false;
void _login(LoginButtonPressed event, Emitter<AuthState> emit) async {
emit(LoginLoading());
emit(AuthLoading());
if (isChecked) {
try {
if (event.username.isEmpty || event.password.isEmpty) {
@ -123,12 +119,12 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
),
);
} catch (failure) {
validate='Something went wrong';
emit(const LoginFailure(error: 'Something went wrong'));
// emit(LoginFailure(error: failure.toString()));
return;
}
if (token.accessTokenIsNotEmpty) {
debugPrint('token: ${token.accessToken}');
FlutterSecureStorage storage = const FlutterSecureStorage();
await storage.write(
key: Token.loginAccessTokenKey, value: token.accessToken);
@ -148,7 +144,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
}
checkBoxToggle(CheckBoxEvent event, Emitter<AuthState> emit,) {
emit(LoginLoading());
emit(AuthLoading());
isChecked = event.newValue!;
emit(LoginInitial());
}
@ -161,15 +157,13 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
}
void _passwordVisible(PasswordVisibleEvent event, Emitter<AuthState> emit) {
emit(LoginLoading());
emit(AuthLoading());
obscureText = !event.newValue!;
emit(PasswordVisibleState());
}
void launchURL(String url) {
if (kDebugMode) {
print('Launching URL: $url');
}
}
@ -320,6 +314,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()));
}
}
}

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

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

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

@ -11,7 +11,7 @@ class LoginInitial extends AuthState {}
class AuthTokenLoading extends AuthState {}
class LoginLoading extends AuthState {}
class AuthLoading extends AuthState {}
class LoginSuccess extends AuthState {}
@ -60,7 +60,6 @@ class TimerState extends AuthState {
List<Object> get props => [isButtonEnabled, remainingTime];
}
class AuthError extends AuthState {
final String message;
String? code;
@ -70,9 +69,7 @@ class AuthError extends AuthState {
class AuthTokenError extends AuthError {
AuthTokenError({required super.message, super.code});
}
class AuthSuccess extends AuthState {}
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,
};
}
}

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

@ -11,7 +11,6 @@ import 'package:syncrow_web/utils/constants/assets.dart';
import 'package:syncrow_web/utils/style.dart';
class ForgetPasswordWebPage extends StatelessWidget {
const ForgetPasswordWebPage({super.key});
@override
Widget build(BuildContext context) {
return Scaffold(
@ -19,9 +18,7 @@ class ForgetPasswordWebPage extends StatelessWidget {
create: (context) => AuthBloc(),
child: BlocConsumer<AuthBloc, AuthState>(
listener: (context, state) {
if (state is LoadingForgetState) {
} else if (state is SuccessForgetState){
if (state is SuccessForgetState){
Navigator.of(context).pop();
}
else if (state is FailureForgetState) {
@ -45,32 +42,50 @@ class ForgetPasswordWebPage extends StatelessWidget {
}
Widget _buildForm(BuildContext context, AuthState state) {
late ScrollController _scrollController;
_scrollController = ScrollController();
void _scrollToCenter() {
final double middlePosition = _scrollController.position.maxScrollExtent / 2;
_scrollController.animateTo(
middlePosition,
duration: const Duration(seconds: 1),
curve: Curves.easeInOut,
);
}
WidgetsBinding.instance.addPostFrameCallback((_) {
_scrollToCenter();
});
final forgetBloc = BlocProvider.of<AuthBloc>(context);
Size size = MediaQuery.of(context).size;
return FirstLayer(
second: Container(
padding:const EdgeInsets.all(50) ,
margin: const EdgeInsets.all(50),
second: Center(
child: ListView(
shrinkWrap: true,
controller: _scrollController,
children: [
Container(
padding: EdgeInsets.all(size.width*0.02),
margin: EdgeInsets.all(size.width*0.09),
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.3),
borderRadius: const BorderRadius.all(Radius.circular(20)),
),
child: Center(
child: ListView(
shrinkWrap: true,
children: [
Row(
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Spacer(),
Expanded(
flex: 2,
flex: 3,
child: SvgPicture.asset(
Assets.loginLogo,
),
),
const Spacer(),
Container(
Expanded(
flex: 3,
child: Container(
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.1),
borderRadius: const BorderRadius.all(Radius.circular(30)),
@ -79,8 +94,9 @@ class ForgetPasswordWebPage extends StatelessWidget {
child: Form(
key: forgetBloc.forgetFormKey,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 40, vertical: 25),
padding: EdgeInsets.symmetric(
horizontal: size.width*0.02,
vertical: size.width*0.003),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
@ -93,23 +109,22 @@ class ForgetPasswordWebPage extends StatelessWidget {
fontSize: 24,
fontWeight: FontWeight.bold),
),
const SizedBox(height: 20),
const SizedBox(height: 10),
Text(
'Please fill in your account information to\nretrieve your password',
style: smallTextStyle,
style: Theme.of(context).textTheme.bodySmall,
),
const SizedBox(height: 20),
const SizedBox(height: 10),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
"Country/Region",
style: smallTextStyle,
style: Theme.of(context).textTheme.bodySmall,
),
const SizedBox(height: 10),
SizedBox(
width: MediaQuery.of(context).size.width * 0.2,
child: DropdownButtonFormField<String>(
validator: forgetBloc.validateRegion,
icon: const Icon(
@ -118,11 +133,16 @@ class ForgetPasswordWebPage extends StatelessWidget {
decoration: textBoxDecoration()!.copyWith(
hintText: null,
),
hint: const Align(
hint: SizedBox(
width: size.width * 0.11,
child: const Align(
alignment: Alignment.centerLeft,
child: Text(
'Select your region/country',
textAlign: TextAlign.center,
overflow: TextOverflow.ellipsis,
),
),
),
isDense: true,
@ -146,10 +166,10 @@ class ForgetPasswordWebPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("Account",
style: smallTextStyle,),
style: Theme.of(context).textTheme.bodySmall,
),
const SizedBox(height: 10),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
child: TextFormField(
validator: forgetBloc.validateEmail,
controller: forgetBloc.forgetEmailController,
@ -165,10 +185,9 @@ class ForgetPasswordWebPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("One Time Password",
style: smallTextStyle,),
style: Theme.of(context).textTheme.bodySmall,),
const SizedBox(height: 10),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
child: TextFormField(
validator: forgetBloc.validateCode,
keyboardType: TextInputType.visiblePassword,
@ -205,10 +224,9 @@ class ForgetPasswordWebPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("Password",
style: smallTextStyle,),
style: Theme.of(context).textTheme.bodySmall,),
const SizedBox(height: 10),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
child: TextFormField(
validator: forgetBloc.passwordValidator,
keyboardType: TextInputType.visiblePassword,
@ -225,8 +243,12 @@ class ForgetPasswordWebPage extends StatelessWidget {
height: 10,
),
const SizedBox(height: 20.0),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
width: size.width * 0.2,
child: DefaultButton(
backgroundColor: ColorsManager.btnColor,
child: const Text('Submit'),
@ -237,9 +259,14 @@ class ForgetPasswordWebPage extends StatelessWidget {
},
),
),
],
),
const SizedBox(height: 10.0),
SizedBox(child: Text(forgetBloc.validate,
style: const TextStyle(fontWeight: FontWeight.w700,color: ColorsManager.red ),),),
SizedBox(height: 10,),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
width: size.width * 0.2,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
@ -266,13 +293,15 @@ class ForgetPasswordWebPage extends StatelessWidget {
),
),
),
),
const Spacer(),
],
),
),
),
],
),
),
),
)
);
}
}

95
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 {
const LoginMobilePage({super.key});
@override
Widget build(BuildContext context) {
return Scaffold(
@ -39,7 +38,7 @@ class LoginMobilePage extends StatelessWidget {
}
},
builder: (context, state) {
if (state is LoginLoading) {
if (state is AuthLoading) {
return const Center(child: CircularProgressIndicator());
} else {
return _buildLoginForm(context);
@ -128,7 +127,7 @@ class LoginMobilePage extends StatelessWidget {
children: [
Text(
"Country/Region",
style: smallTextStyle,
style: Theme.of(context).textTheme.bodySmall,
),
SizedBox(
child: DropdownButtonFormField<String>(
@ -169,7 +168,7 @@ class LoginMobilePage extends StatelessWidget {
children: [
Text(
"Email",
style: smallTextStyle,
style: Theme.of(context).textTheme.bodySmall,
),
SizedBox(
child: TextFormField(
@ -189,7 +188,7 @@ class LoginMobilePage extends StatelessWidget {
children: [
Text(
"Password",
style: smallTextStyle,
style: Theme.of(context).textTheme.bodySmall,
),
SizedBox(
child: TextFormField(
@ -222,7 +221,7 @@ class LoginMobilePage extends StatelessWidget {
},
child: Text(
"Forgot Password?",
style: smallTextStyle,
style: Theme.of(context).textTheme.bodySmall,
),
),
],
@ -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(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,

1
lib/pages/auth/view/login_page.dart
View File

@ -7,7 +7,6 @@ import 'package:syncrow_web/utils/responsive_layout.dart';
class LoginPage extends StatelessWidget {
const LoginPage({super.key});
@override
Widget build(BuildContext context) {
return const ResponsiveLayout(

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

@ -15,14 +15,20 @@ import 'package:syncrow_web/utils/constants/assets.dart';
import 'package:syncrow_web/pages/home/view/home_page.dart';
import 'package:syncrow_web/utils/style.dart';
class LoginWebPage extends StatelessWidget {
class LoginWebPage extends StatefulWidget {
const LoginWebPage({super.key});
@override
State<LoginWebPage> createState() => _LoginWebPageState();
}
class _LoginWebPageState extends State<LoginWebPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
body: BlocProvider(
create: (context) => AuthBloc(),
create: (BuildContext context) => AuthBloc(),
child: BlocConsumer<AuthBloc, AuthState>(
listener: (context, state) {
if (state is LoginSuccess) {
@ -41,7 +47,7 @@ class LoginWebPage extends StatelessWidget {
}
},
builder: (context, state) {
if (state is LoginLoading) {
if (state is AuthLoading) {
return const Center(child: CircularProgressIndicator());
} else {
return _buildLoginForm(context,state);
@ -54,30 +60,49 @@ class LoginWebPage extends StatelessWidget {
Widget _buildLoginForm(BuildContext context,AuthState state) {
final loginBloc = BlocProvider.of<AuthBloc>(context);
Size size = MediaQuery.of(context).size;
late ScrollController _scrollController;
_scrollController = ScrollController();
void _scrollToCenter() {
final double middlePosition = _scrollController.position.maxScrollExtent / 2;
_scrollController.animateTo(
middlePosition,
duration: const Duration(seconds: 1),
curve: Curves.easeInOut,
);
}
WidgetsBinding.instance.addPostFrameCallback((_) {
_scrollToCenter();
});
return FirstLayer(
second: Container(
margin: const EdgeInsets.all(50),
second: Center(
child: ListView(
controller: _scrollController,
shrinkWrap: true,
children: [
Container(
padding: EdgeInsets.all(size.width*0.02) ,
margin: EdgeInsets.all(size.width*0.09),
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.3),
borderRadius: const BorderRadius.all(Radius.circular(20)),
),
child: Center(
child: ListView(
shrinkWrap: true,
children: [
Row(
child:Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Spacer(),
Expanded(
flex: 2,
flex: 3,
child: SvgPicture.asset(
Assets.loginLogo,
),
),
const Spacer(),
Container(
Expanded(
flex: 3,
child: Container(
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.1),
borderRadius: const BorderRadius.all(Radius.circular(30)),
@ -85,46 +110,45 @@ class LoginWebPage extends StatelessWidget {
child: Form(
key: loginBloc.loginFormKey,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 50, vertical: 25),
padding: EdgeInsets.symmetric(
horizontal: size.width*0.02,
vertical: size.width*0.003),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
const SizedBox(height: 15),
const Text(
'Login',
style: TextStyle(
color: Colors.white,
fontSize: 24,
fontWeight: FontWeight.bold),
),
const SizedBox(height: 40),
Text(
'Login',
style:Theme.of(context).textTheme.headlineLarge),
SizedBox(height: size.height*0.03),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
"Country/Region",
style: smallTextStyle,
),
const SizedBox(
height: 10,
style: Theme.of(context).textTheme.bodySmall,
),
const SizedBox(height: 10,),
SizedBox(
width: MediaQuery.of(context).size.width * 0.2,
child: DropdownButtonFormField<String>(
validator:loginBloc.validateRegion ,
icon: const Icon(
Icons.keyboard_arrow_down_outlined,
),
decoration: textBoxDecoration()!.copyWith(
hintText: null,
),
hint: const Align(
hintText: null,),
hint: SizedBox(
width: size.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,
@ -135,9 +159,7 @@ class LoginWebPage extends StatelessWidget {
child: Text(region),
);
}).toList(),
onChanged: (String? value) {
print(value);
},
onChanged: (String? value) {},
),
)
],
@ -148,13 +170,12 @@ class LoginWebPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("Email",
style: smallTextStyle,
style: Theme.of(context).textTheme.bodySmall,
),
const SizedBox(
height: 10,
),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
child: TextFormField(
validator:loginBloc.validateEmail ,
controller:loginBloc.loginEmailController,
@ -169,12 +190,11 @@ class LoginWebPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text("Password", style: smallTextStyle,),
Text("Password", style: Theme.of(context).textTheme.bodySmall,),
const SizedBox(
height: 10,
),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
child: TextFormField(
validator:loginBloc.validatePassword,
obscureText:loginBloc.obscureText,
@ -205,7 +225,6 @@ class LoginWebPage extends StatelessWidget {
height: 20,
),
SizedBox(
width: MediaQuery.of(context).size.width * 0.2,
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
@ -215,14 +234,14 @@ class LoginWebPage extends StatelessWidget {
},
child: Text(
"Forgot Password?",
style: smallTextStyle,
style: Theme.of(context).textTheme.bodySmall,
),
),
],
),
),
const SizedBox(
height: 32,
height: 20,
),
Row(
children: [
@ -240,7 +259,7 @@ class LoginWebPage extends StatelessWidget {
),
),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
width:size.width * 0.14,
child: RichText(
text: TextSpan(
text: 'Agree to ',
@ -249,7 +268,7 @@ class LoginWebPage extends StatelessWidget {
TextSpan(
text: '(Terms of Service)',
style: const TextStyle(
color: Colors.black),
color: Colors.black,),
recognizer: TapGestureRecognizer()
..onTap = () {
loginBloc.launchURL(
@ -281,9 +300,9 @@ class LoginWebPage extends StatelessWidget {
),
],
),
const SizedBox(height: 30.0),
const SizedBox(height: 20.0),
SizedBox(
width: MediaQuery.sizeOf(context).width * 0.2,
width:size.width * 0.2,
child: DefaultButton(
backgroundColor: loginBloc.isChecked?
ColorsManager.btnColor:ColorsManager.grayColor,
@ -299,120 +318,24 @@ class LoginWebPage extends StatelessWidget {
},
),
),
const SizedBox(height: 15.0),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [ SizedBox(child: Text(loginBloc.validate,
style: const TextStyle(fontWeight: FontWeight.w700,color: ColorsManager.red ),),)],)
],
),
),
)
),
)),
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",
// )),
// ],
// ),
// )

3
lib/pages/common/default_button.dart
View File

@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:syncrow_web/utils/color_manager.dart';
import 'package:syncrow_web/utils/style.dart';
class DefaultButton extends StatelessWidget {
const DefaultButton({
@ -48,7 +47,7 @@ class DefaultButton extends StatelessWidget {
ButtonStyle(
textStyle: MaterialStateProperty.all(
customTextStyle
?? smallTextStyle.copyWith(
?? Theme.of(context).textTheme.bodySmall!.copyWith(
fontSize: 13,
color: foregroundColor,
fontWeight: FontWeight.normal

12
lib/pages/home/view/home_page_mobile.dart
View File

@ -53,9 +53,9 @@ class HomeMobilePage extends StatelessWidget {
itemBuilder: (context, index) {
return HomeCard(
index: index,
active:ceilingSensorButtons[index]['active'],
name: ceilingSensorButtons[index]['title'],
img:ceilingSensorButtons[index]['icon'] ,
active: homeItems[index]['active'],
name: homeItems[index]['title'],
img: homeItems[index]['icon'],
onTap: () {},
);
},
@ -69,8 +69,7 @@ class HomeMobilePage extends StatelessWidget {
);
}
dynamic ceilingSensorButtons =
[
dynamic homeItems = [
{
'title': 'Access',
'icon': Assets.accessIcon,
@ -108,7 +107,8 @@ class HomeMobilePage extends StatelessWidget {
'icon': Assets.integrationsIcon,
'color': ColorsManager.slidingBlueColor.withOpacity(0.2),
'active': false,
}, {
},
{
'title': 'Asset',
'icon': Assets.assetIcon,
'color': ColorsManager.slidingBlueColor.withOpacity(0.2),

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

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

44
lib/services/auth_api.dart
View File

@ -1,5 +1,6 @@
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/services/api/http_service.dart';
import 'package:syncrow_web/utils/constants/api_const.dart';
@ -17,45 +18,32 @@ class AuthenticationAPI {
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(
path: ApiEndpoints.forgetPassword,
body: {
"email": email,
"password": password
},
body: {"email": email, "password": password},
showServerMessage: true,
expectedResponseModel: (json) {
});
expectedResponseModel: (json) {});
return response;
}
static Future sendOtp({required var email}) async {
final response = await HTTPService().post(
path: ApiEndpoints.sendOtp,
body: {
"email": email,
"type": "VERIFICATION"
},
body: {"email": email, "type": "VERIFICATION"},
showServerMessage: true,
expectedResponseModel: (json) {
print('json===$json');
});
expectedResponseModel: (json) {});
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(
path: ApiEndpoints.verifyOtp,
body: {
"email": email,
"type": "VERIFICATION",
"otpCode": otpCode
},
body: {"email": email, "type": "VERIFICATION", "otpCode": otpCode},
showServerMessage: true,
expectedResponseModel: (json) {
print('json===${json['message']}');
if (json['message'] == 'Otp Verified Successfully') {
return true;
} else {
@ -64,4 +52,16 @@ class AuthenticationAPI {
});
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 sendOtp = '$baseUrl/authentication/user/send-otp';
static const String verifyOtp = '$baseUrl/authentication/user/verify-otp';
static const String getRegion = '$baseUrl/region';
}

6
lib/utils/style.dart
View File

@ -22,11 +22,5 @@ InputDecoration? textBoxDecoration({bool suffixIcon = false}) => InputDecoration
);
TextStyle appBarTextStyle =
const TextStyle(fontSize: 20, color: ColorsManager.whiteColors);
TextStyle smallTextStyle =
const TextStyle(fontSize: 13, color: ColorsManager.whiteColors,fontWeight: FontWeight.bold);
Decoration containerDecoration = const BoxDecoration(color: Colors.white,borderRadius: BorderRadius.all(Radius.circular(20)));

26
lib/web_layout/web_app_bar.dart
View File

@ -16,13 +16,8 @@ class WebAppBar extends StatelessWidget {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
SizedBox(width: 40,),
Expanded(
child: title!
// Text(
// title!,style: const TextStyle(
// fontSize: 30,
// color: Colors.white),)
child: title!,
),
if (body != null)
Expanded(
@ -32,10 +27,12 @@ class WebAppBar extends StatelessWidget {
children: body!,
),
),
const Row(
Row(
children: [
SizedBox(width: 10,),
SizedBox.square(
const SizedBox(
width: 10,
),
const SizedBox.square(
dimension: 40,
child: CircleAvatar(
backgroundColor: Colors.white,
@ -48,10 +45,13 @@ class WebAppBar extends StatelessWidget {
),
),
),
const SizedBox(width: 10,),
const Text('mohamamd alnemer ',style: TextStyle(fontSize: 16,color: Colors.white),),
Icon(Icons.arrow_drop_down,color: ColorsManager.whiteColors,),
SizedBox(width: 40,)
const SizedBox(
width: 10,
),
Text(
'mohamamd alnemer ',
style: Theme.of(context).textTheme.bodyLarge,
),
],
)
],