bugs fixed

This commit is contained in:
meylis98 2023-03-16 05:09:42 +05:00
parent cf3abae5f8
commit 770a9e2e85
17 changed files with 107 additions and 185 deletions

View File

@ -13,9 +13,10 @@ class CustomTextField extends StatefulWidget {
required this.inputType,
required this.isPassword,
this.contentPadding,
required this.errorText,
}) : super(key: key);
final String labelText, hintText;
final String labelText, hintText, errorText;
final TextEditingController controller;
bool obscureText, isPassword;
final TextInputType inputType;
@ -45,6 +46,8 @@ class _CustomTextFieldState extends State<CustomTextField> {
),
labelText: widget.labelText,
hintText: widget.hintText,
// errorText: widget.errorText,
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(10.adaptedPx()),
borderSide: BorderSide(

View File

@ -1,5 +1,3 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:http/http.dart' as http;
import 'package:sapaly_shop/constants/utils.dart';

View File

@ -102,6 +102,7 @@ class _LoginScreenState extends State<LoginScreen> {
controller: emailController,
labelText: 'email'.translation,
hintText: 'gurbanov@gmail.com'.translation,
errorText: 'enter_valid_email'.translation,
isPassword: false,
obscureText: false,
inputType: TextInputType.emailAddress,
@ -112,6 +113,7 @@ class _LoginScreenState extends State<LoginScreen> {
controller: passwordController,
labelText: 'password'.translation,
hintText: 'enter_your_password'.translation,
errorText: 'password_length_8'.translation,
obscureText: true,
isPassword: true,
inputType: TextInputType.visiblePassword,

View File

@ -81,7 +81,7 @@ class _LoginScreenState extends State<RegisterScreen> {
children: [
Padding(
padding: EdgeInsets.symmetric(
vertical: 15.adaptedPx(),
vertical: 10.adaptedPx(),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
@ -105,11 +105,12 @@ class _LoginScreenState extends State<RegisterScreen> {
),
),
Padding(
padding: EdgeInsets.symmetric(vertical: 15.adaptedPx()),
padding: EdgeInsets.only(bottom: 10.adaptedPx()),
child: CustomTextField(
controller: emailController,
labelText: 'email'.translation,
hintText: 'gurbanov@gmail.com'.translation,
errorText: 'enter_valid_email'.translation,
obscureText: false,
isPassword: false,
inputType: TextInputType.emailAddress,
@ -124,11 +125,12 @@ class _LoginScreenState extends State<RegisterScreen> {
inputFormatters: [maskFormatterPhone],
),
Padding(
padding: EdgeInsets.symmetric(vertical: 15.adaptedPx()),
padding: EdgeInsets.symmetric(vertical: 10.adaptedPx()),
child: CustomTextField(
controller: passwordController,
labelText: 'password'.translation,
hintText: 'enter_your_password'.translation,
errorText: 'password_length_8'.translation,
obscureText: true,
isPassword: true,
inputType: TextInputType.visiblePassword,
@ -139,6 +141,7 @@ class _LoginScreenState extends State<RegisterScreen> {
controller: passwordConfirmationController,
labelText: 'repeat_password'.translation,
hintText: 'repeat_password_to_confirm'.translation,
errorText: 'password_no_match'.translation,
obscureText: true,
isPassword: true,
inputType: TextInputType.visiblePassword,

View File

@ -55,7 +55,7 @@ class _ContactsScreenState extends State<ContactsScreen> {
Widget build(BuildContext context) {
var me = Provider.of<UserProvider>(context, listen: false);
return Scaffold(
drawer: SapalyDrawer(),
drawer: const SapalyDrawer(),
backgroundColor: AppTheme.lightBackgroundColor,
appBar: SapalyAppBar(
hasActionButton: true,
@ -86,6 +86,7 @@ class _ContactsScreenState extends State<ContactsScreen> {
CustomTextField(
labelText: 'first_name'.translation,
hintText: 'first_name'.translation,
errorText: 'required_field'.translation,
controller: firstNameController,
obscureText: false,
inputType: TextInputType.text,
@ -99,6 +100,7 @@ class _ContactsScreenState extends State<ContactsScreen> {
child: CustomTextField(
labelText: 'email'.translation,
hintText: 'email'.translation,
errorText: 'required_field'.translation,
controller: emailController,
obscureText: false,
inputType: TextInputType.emailAddress,
@ -109,6 +111,7 @@ class _ContactsScreenState extends State<ContactsScreen> {
CustomTextField(
labelText: 'subject'.translation,
hintText: 'subject'.translation,
errorText: 'required_field'.translation,
controller: subjectController,
obscureText: false,
inputType: TextInputType.text,
@ -124,6 +127,7 @@ class _ContactsScreenState extends State<ContactsScreen> {
child: CustomTextField(
labelText: 'message'.translation,
hintText: 'message'.translation,
errorText: 'required_field'.translation,
controller: messageController,
obscureText: false,
inputType: TextInputType.text,

View File

@ -15,10 +15,10 @@ import 'package:sapaly_shop/features/screens/home/home_screen.dart';
import 'package:sapaly_shop/features/screens/settings/settings_screen.dart';
import 'package:sapaly_shop/features/services/page_navigator.dart';
import 'package:sapaly_shop/features/services/requests.dart';
import 'package:sapaly_shop/features/widgets/sapaly_icon.dart';
import 'package:sapaly_shop/models/category_model.dart';
import 'package:sapaly_shop/models/settings_model.dart';
import 'package:sapaly_shop/providers/user_provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:url_launcher/url_launcher_string.dart';
import '../../../constants/global_variables.dart';
@ -28,7 +28,7 @@ import '../../../themes/app_theme.dart';
import 'about_us.dart';
class SapalyDrawer extends StatefulWidget {
SapalyDrawer({super.key});
const SapalyDrawer({super.key});
@override
State<SapalyDrawer> createState() => _SapalyDrawerState();
@ -89,7 +89,8 @@ class _SapalyDrawerState extends State<SapalyDrawer> {
@override
Widget build(BuildContext context) {
var settings = Provider.of<SettingsModel>(context, listen: false);
var me = Provider.of<UserProvider>(context, listen: false);
var me = Provider.of<UserProvider>(context, listen: false).user;
return Drawer(
backgroundColor: AppTheme.whiteColor,
child: Padding(
@ -111,21 +112,19 @@ class _SapalyDrawerState extends State<SapalyDrawer> {
SizedBox(width: 10.adaptedPx()),
Text(
GlobalVariables.kAppName,
style: GoogleFonts.poppins(
textStyle: Theme.of(context)
.primaryTextTheme
.bodyMedium!
.copyWith(
fontWeight: FontWeight.w600,
fontSize: 18.adaptedPx(),
color: AppTheme.blackColor,
),
),
style: Theme.of(context)
.primaryTextTheme
.bodyMedium
?.copyWith(
fontWeight: FontWeight.w600,
fontSize: 18.adaptedPx(),
color: AppTheme.blackColor,
),
),
],
),
),
me.user.user.email.isEmpty
me.token.isEmpty
? Container()
: GestureDetector(
onTap: () {
@ -136,13 +135,13 @@ class _SapalyDrawerState extends State<SapalyDrawer> {
children: [
Icon(
Icons.account_circle,
size: 35.adaptedPx(),
size: 45.adaptedPx(),
color: AppTheme.lightPrimaryColor,
),
SizedBox(width: 10.adaptedPx()),
SizedBox(width: 5.adaptedPx()),
Expanded(
child: Text(
me.user.user.email,
me.user.email,
softWrap: true,
maxLines: 4,
style: Theme.of(context)
@ -164,7 +163,6 @@ class _SapalyDrawerState extends State<SapalyDrawer> {
onTap: () async {
var lang =
await languagePicker(context, settings.currentLanguage);
if (lang != null) {
await settings.setLanguage(lang);
Navigator.of(context, rootNavigator: true)
@ -198,7 +196,8 @@ class _SapalyDrawerState extends State<SapalyDrawer> {
.bodyMedium
?.copyWith(
color: AppTheme.blackColor,
fontSize: 17.adaptedPx(),
fontWeight: FontWeight.w600,
fontSize: 15.adaptedPx(),
),
),
],
@ -211,7 +210,7 @@ class _SapalyDrawerState extends State<SapalyDrawer> {
itemCount: icons.length,
scrollDirection: Axis.vertical,
separatorBuilder: (context, index) =>
SizedBox(height: 10.adaptedPx()),
SizedBox(height: 8.adaptedPx()),
itemBuilder: (context, index) {
return TextButton(
style: TextButton.styleFrom(
@ -251,7 +250,7 @@ class _SapalyDrawerState extends State<SapalyDrawer> {
);
},
),
SizedBox(height: 30.adaptedPx()),
SizedBox(height: 15.adaptedPx()),
TextButton(
onPressed: () {
launchUrlString('tel://+99363508564');

View File

@ -5,6 +5,7 @@ import 'package:carousel_slider/carousel_slider.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:provider/provider.dart';
import 'package:sapaly_shop/constants/utils.dart';
import 'package:sapaly_shop/models/settings_model.dart';
import 'package:sapaly_shop/models/sliders_model.dart';
@ -13,6 +14,7 @@ import 'package:sapaly_shop/features/screens/drawer/sapaly_drawer.dart';
import 'package:sapaly_shop/features/screens/home/product.dart';
import 'package:sapaly_shop/features/screens/home/search.dart';
import 'package:sapaly_shop/features/services/requests.dart';
import 'package:sapaly_shop/providers/user_provider.dart';
import '../../widgets/sapaly_app_bar.dart';
import '../../../constants/global_variables.dart';
@ -73,7 +75,6 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
void initState() {
getSliders();
getSubCategories();
super.initState();
}
@ -82,7 +83,7 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
return Scaffold(
backgroundColor: AppTheme.lightBackgroundColor,
key: _key,
drawer: SapalyDrawer(),
drawer: const SapalyDrawer(),
appBar: SapalyAppBar(
hasActionButton: true,
title: '',

View File

@ -27,35 +27,37 @@ class AuthService {
try {
var response = await http.post(
Uri.parse('${GlobalVariables.kBaseUrl}/jwt/login'),
body: loginRequestModel.toMap(),
body: loginRequestModel.toJson(),
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json',
});
if (response.statusCode == HttpStatus.ok) {
var data = response.body;
var loginResponse = LoginResponseModel.fromJson(data);
debugPrint('LOGIN ${loginResponse.user.email}');
}
httpErrorHandle(
response: response,
context: context,
onSuccess: () async {
SharedPreferences prefs = await SharedPreferences.getInstance();
Provider.of<UserProvider>(context, listen: false)
.setUser(response.body);
await prefs.setString(
'token', jsonDecode(response.body)['data']['token']);
Navigator.of(context).pushNamedAndRemoveUntil(
HomeScreen.routeName,
(route) => false,
);
showSnackBar(
context,
content: 'login_success'.translation,
backgroundColor: AppTheme.lightPrimaryColor,
textColor: AppTheme.whiteColor,
Future.delayed(
const Duration(seconds: 3),
() async {
Provider.of<UserProvider>(context, listen: false)
.setUser(response.body);
await prefs.setString(
'token', jsonDecode(response.body)['data']['token']);
Navigator.of(context).pushNamedAndRemoveUntil(
HomeScreen.routeName,
(route) => false,
);
showSnackBar(
context,
content: 'login_success'.translation,
backgroundColor: AppTheme.lightPrimaryColor,
textColor: AppTheme.whiteColor,
);
},
);
},
);
@ -120,18 +122,20 @@ class AuthService {
}
// get user data
Future<void> getUserData({
required BuildContext context,
}) async {
Future<String> getUserData(BuildContext context) async {
try {
var user = Provider.of<UserProvider>(context, listen: false).user;
SharedPreferences prefs = await SharedPreferences.getInstance();
String? token = prefs.getString('token');
user.token = token!;
if (token == null) {
prefs.setString('token', '');
}
// await http.post(Uri.parse('$uri'));
} catch (e) {}
return user.token;
} catch (e) {
debugPrint(e.toString());
return e.toString();
}
}
// send message

View File

@ -8,8 +8,6 @@ import 'package:sapaly_shop/models/settings_model.dart';
import 'package:sapaly_shop/themes/app_theme.dart';
import '../screens/auth/login/login_screen.dart';
import '../screens/drawer/sapaly_drawer.dart';
import 'button.dart';
class UnAuthenticated extends StatefulWidget {
const UnAuthenticated({Key? key}) : super(key: key);

View File

@ -9,7 +9,6 @@ import 'package:sapaly_shop/features/screens/home/home_screen.dart';
import 'package:sapaly_shop/features/screens/auth/login/login_screen.dart';
import 'package:sapaly_shop/features/screens/home/onboarding.dart';
import 'package:sapaly_shop/features/screens/settings/settings_screen.dart';
import 'package:sapaly_shop/features/services/auth_service.dart';
import 'package:sapaly_shop/providers/user_provider.dart';
import 'package:sapaly_shop/router.dart';
import 'package:sapaly_shop/themes/app_theme.dart';
@ -20,17 +19,18 @@ import 'models/settings_model.dart';
Future<void> main() async {
WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
Future.delayed(const Duration(seconds: 5));
SharedPreferences prefs = await SharedPreferences.getInstance();
FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
Future.delayed(const Duration(seconds: 4));
await SettingsModel.initLocalization(
prefs.getString('language') ?? kDefaultLanguage);
runApp(
MultiProvider(
providers: [
ChangeNotifierProvider(create: (_) => SettingsModel(prefs)),
ChangeNotifierProvider(create: (_) => UserProvider()),
ChangeNotifierProvider(create: (_) => SettingsModel(prefs)),
],
child: const MyApp(),
),
@ -38,16 +38,9 @@ Future<void> main() async {
FlutterNativeSplash.remove();
}
class MyApp extends StatefulWidget {
class MyApp extends StatelessWidget {
const MyApp({super.key});
@override
State<MyApp> createState() => _MyAppState();
}
class _MyAppState extends State<MyApp> {
final AuthService service = AuthService();
@override
Widget build(BuildContext context) {
return SizeInitializer(
@ -60,7 +53,7 @@ class _MyAppState extends State<MyApp> {
onGenerateRoute: (settings) => generateRoute(settings),
routes: <String, WidgetBuilder>{
'/onboarding': (context) => const Onboarding(),
'/drawer': (context) => SapalyDrawer(),
'/drawer': (context) => const SapalyDrawer(),
'/home': (context) => const HomeScreen(),
'/category': (context) => const CategoryScreen(),
'/login': (context) => const LoginScreen(),

View File

@ -1,8 +1,8 @@
import 'dart:convert';
class LoginRequestModel {
final String email;
final String password;
String email;
String password;
LoginRequestModel({
required this.email,
required this.password,

View File

@ -1,25 +1,16 @@
import 'dart:convert';
import 'package:flutter/material.dart';
// To parse this JSON data, do
//
// final userResponseModel = userResponseModelFromJson(jsonString);
class LoginResponseModel {
final String token;
final String expires;
final User user;
String token;
User user;
LoginResponseModel({
required this.token,
required this.expires,
required this.user,
});
Map<String, dynamic> toMap() {
return {
'token': token,
'expires': expires,
'user': user.toMap(),
};
}
@ -27,8 +18,10 @@ class LoginResponseModel {
factory LoginResponseModel.fromMap(Map<String, dynamic> map) {
return LoginResponseModel(
token: map['data']['token'] ?? '',
expires: map['data']['expires'] ?? '',
user: User.fromMap(map['data']['user']),
// user: User.fromMap(map['data']['user'] ?? ''),
user: (map['data']["user"] != null)
? User.fromMap(map['data']["user"])
: null!,
);
}
@ -43,29 +36,13 @@ class User {
final String email;
final String name;
final String lastName;
final String middleName;
final String phone;
final String phoneShort;
final bool isActivated;
final String lastLogin;
final int isSuperuser;
final String createdAt;
final String updatedAt;
final List<String> phoneList;
User({
required this.id,
required this.email,
required this.name,
required this.lastName,
required this.middleName,
required this.phone,
required this.phoneShort,
required this.isActivated,
required this.lastLogin,
required this.isSuperuser,
required this.createdAt,
required this.updatedAt,
required this.phoneList,
});
Map<String, dynamic> toMap() {
@ -73,16 +50,8 @@ class User {
'id': id,
'email': email,
'name': name,
'lastName': lastName,
'middleName': middleName,
'last_name': lastName,
'phone': phone,
'phoneShort': phoneShort,
'isActivated': isActivated,
'lastLogin': lastLogin,
'isSuperuser': isSuperuser,
'createdAt': createdAt,
'updatedAt': updatedAt,
'phone_list': phoneList,
};
}
@ -91,16 +60,8 @@ class User {
id: map['id'] ?? 0,
email: map['email'] ?? '',
name: map['name'] ?? '',
lastName: map['lastName'] ?? '',
middleName: map['middleName'] ?? '',
lastName: map['last_name'] ?? '',
phone: map['phone'] ?? '',
phoneShort: map['phoneShort'] ?? '',
isActivated: map['isActivated'] ?? false,
lastLogin: map['lastLogin'] ?? '',
isSuperuser: map['isSuperuser'] ?? 0,
createdAt: map['createdAt'] ?? '',
updatedAt: map['updatedAt'] ?? '',
phoneList: List<String>.from(map['phone_list']),
);
}

View File

@ -4,8 +4,6 @@
import 'dart:convert';
import 'package:meta/meta.dart';
RegisterResponseModel registerResponseModelFromJson(String str) =>
RegisterResponseModel.fromJson(json.decode(str));
@ -27,7 +25,9 @@ class RegisterResponseModel {
RegisterResponseModel(
token: json['data']["token"],
expires: DateTime.parse(json['data']["expires"]),
user: User.fromJson(json['data']["user"]),
user: (json['data']["user"] != null)
? User.fromMap(json['data']["user"])
: null!,
);
Map<String, dynamic> toJson() => {
@ -42,29 +42,13 @@ class User {
final String email;
final String name;
final String lastName;
final String middleName;
final String phone;
final String phoneShort;
final bool isActivated;
final DateTime lastLogin;
final int isSuperuser;
final DateTime createdAt;
final DateTime updatedAt;
final List<String> phoneList;
User({
required this.id,
required this.email,
required this.name,
required this.lastName,
required this.middleName,
required this.phone,
required this.phoneShort,
required this.isActivated,
required this.lastLogin,
required this.isSuperuser,
required this.createdAt,
required this.updatedAt,
required this.phoneList,
});
Map<String, dynamic> toMap() {
@ -72,16 +56,8 @@ class User {
'id': id,
'email': email,
'name': name,
'lastName': lastName,
'middleName': middleName,
'last_name': lastName,
'phone': phone,
'phoneShort': phoneShort,
'isActivated': isActivated,
'lastLogin': lastLogin.millisecondsSinceEpoch,
'isSuperuser': isSuperuser,
'createdAt': createdAt.millisecondsSinceEpoch,
'updatedAt': updatedAt.millisecondsSinceEpoch,
'phone_list': phoneList,
};
}
@ -90,16 +66,8 @@ class User {
id: map['id']?.toInt() ?? 0,
email: map['email'] ?? '',
name: map['name'] ?? '',
lastName: map['lastName'] ?? '',
middleName: map['middleName'] ?? '',
lastName: map['last_name'] ?? '',
phone: map['phone'] ?? '',
phoneShort: map['phoneShort'] ?? '',
isActivated: map['isActivated'] ?? false,
lastLogin: DateTime.fromMillisecondsSinceEpoch(map['lastLogin']),
isSuperuser: map['isSuperuser']?.toInt() ?? 0,
createdAt: DateTime.fromMillisecondsSinceEpoch(map['createdAt']),
updatedAt: DateTime.fromMillisecondsSinceEpoch(map['updatedAt']),
phoneList: List<String>.from(map['phone_list']),
);
}

View File

@ -4,27 +4,19 @@ import 'package:sapaly_shop/models/auth/login/login_response_model.dart';
class UserProvider extends ChangeNotifier {
LoginResponseModel _user = LoginResponseModel(
token: '',
expires: '',
user: User(
id: 0,
email: '',
name: '',
lastName: '',
middleName: '',
phone: '',
phoneShort: '',
isActivated: true,
lastLogin: '',
isSuperuser: 0,
createdAt: '',
updatedAt: '',
phoneList: [],
),
);
LoginResponseModel get user => _user;
void setUser(String user) {
_user = LoginResponseModel.fromJson(user);
debugPrint(user);
notifyListeners();
}
}

View File

@ -1,27 +1,23 @@
import 'package:flutter/material.dart';
import 'package:sapaly_shop/features/screens/home/home_screen.dart';
import 'features/screens/auth/login/login_screen.dart';
import 'features/screens/home/onboarding.dart';
Route<dynamic> generateRoute(RouteSettings routeSettings) {
switch (routeSettings.name) {
case HomeScreen.routeName:
case Onboarding.routeName:
return MaterialPageRoute(
builder: (_) => const HomeScreen(),
builder: (context) => const Onboarding(),
);
case LoginScreen.routeName:
return MaterialPageRoute(
builder: (_) => const LoginScreen(),
);
case Onboarding.routeName:
return MaterialPageRoute(
builder: (context) => const Onboarding(),
);
default:
return MaterialPageRoute(
settings: routeSettings,
builder: (_) => const HomeScreen(),
builder: (_) => const Onboarding(),
);
}
}

View File

@ -248,10 +248,10 @@ packages:
dependency: "direct main"
description:
name: flutter_svg
sha256: "017cb37b3e9bee44cc800e35469f295d537484602f02ce6ceb5876236cc7e1fe"
sha256: "12006889e2987c549c4c1ec1a5ba4ec4b24d34d2469ee5f9476c926dcecff266"
url: "https://pub.dev"
source: hosted
version: "2.0.3"
version: "2.0.4"
flutter_test:
dependency: "direct dev"
description: flutter
@ -759,26 +759,26 @@ packages:
dependency: transitive
description:
name: vector_graphics
sha256: "2f317d969a9f1eb59d1890643107da749698b7c08c4b0532fc95c8a7130d2803"
sha256: "4cf8e60dbe4d3a693d37dff11255a172594c0793da542183cbfe7fe978ae4aaa"
url: "https://pub.dev"
source: hosted
version: "1.1.3"
version: "1.1.4"
vector_graphics_codec:
dependency: transitive
description:
name: vector_graphics_codec
sha256: "13cccfda2dd61232a19dfb769b7a907e2ab23aabfebb9053c81e29c6c11b1766"
sha256: "278ad5f816f58b1967396d1f78ced470e3e58c9fe4b27010102c0a595c764468"
url: "https://pub.dev"
source: hosted
version: "1.1.3"
version: "1.1.4"
vector_graphics_compiler:
dependency: transitive
description:
name: vector_graphics_compiler
sha256: "524c9889a1327401124fe068840a8867f0d57987c1219a2a696ade629ec2bec3"
sha256: "0bf61ad56e6fd6688a2865d3ceaea396bc6a0a90ea0d7ad5049b1b76c09d6163"
url: "https://pub.dev"
source: hosted
version: "1.1.3"
version: "1.1.4"
vector_math:
dependency: transitive
description:
@ -820,5 +820,5 @@ packages:
source: hosted
version: "3.1.1"
sdks:
dart: ">=2.19.0 <3.0.0"
dart: ">=2.19.2 <3.0.0"
flutter: ">=3.7.0-0"

View File

@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1
environment:
sdk: '>=2.19.0 <3.0.0'
sdk: '>=2.19.2 <3.0.0'
# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions