This commit is contained in:
Hamza-Ayed
2023-11-13 17:34:00 +03:00
parent 8d405c5381
commit 8aab58d4aa
26 changed files with 349 additions and 88 deletions

View File

@@ -11,7 +11,7 @@ import 'package:ride/controller/functions/secure_storage.dart';
import 'package:ride/main.dart';
import 'package:ride/views/auth/verify_email_page.dart';
import 'package:ride/views/home/Captin/home_captin.dart';
import 'package:ride/views/home/map_page.dart';
import 'package:ride/views/home/map_page_passenger.dart';
class LoginCaptinController extends GetxController {
final formKey = GlobalKey<FormState>();

View File

@@ -10,7 +10,7 @@ import 'package:ride/controller/functions/crud.dart';
import 'package:ride/controller/functions/secure_storage.dart';
import 'package:ride/main.dart';
import 'package:ride/views/auth/verify_email_page.dart';
import 'package:ride/views/home/map_page.dart';
import 'package:ride/views/home/map_page_passenger.dart';
class LoginController extends GetxController {
final formKey = GlobalKey<FormState>();
@@ -56,7 +56,7 @@ class LoginController extends GetxController {
box.write(BoxName.name, jsonDecoeded['data'][0]['first_name']);
box.write(BoxName.phone, jsonDecoeded['data'][0]['phone']);
SecureStorage().saveData(BoxName.password, passwordController.text);
Get.offAll(() => MapPage());
Get.offAll(() => MapPagePassenger());
isloading = false;
update();
print(box.read(BoxName.passengerID).toString());
@@ -98,7 +98,7 @@ class LoginController extends GetxController {
goToMapPage() {
if (box.read(BoxName.email) != null) {
Get.offAll(() => const MapPage());
Get.offAll(() => const MapPagePassenger());
}
}

View File

@@ -109,7 +109,7 @@ class CameraClassController extends GetxController {
await http.MultipartFile.fromPath('image', imageFile.path),
); // Add the headers to the request
request.headers.addAll({
// "Content-Type": "application/x-www-form-urlencoded",
"Content-Type": "application/x-www-form-urlencoded",
'Authorization':
'Basic ${base64Encode(utf8.encode(AppCredintials.basicAuthCredentials))}',
});

View File

@@ -27,8 +27,10 @@ class CRUD {
var jsonData = jsonDecode(response.body);
if (jsonData['status'] == 'success') {
print(jsonData);
return response.body;
}
return jsonData['status'];
}
}
@@ -78,7 +80,7 @@ class CRUD {
jsonData['status'],
jsonData['message'],
);
// print(response.body);
return response.body;
}
}

View File

@@ -7,6 +7,7 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:google_polyline_algorithm/google_polyline_algorithm.dart';
import 'package:location/location.dart';
import 'package:ride/constant/box_name.dart';
import 'package:ride/constant/colors.dart';
import 'package:ride/constant/credential.dart';
import 'package:ride/constant/links.dart';
import 'package:ride/controller/firebase/firbase_messge.dart';
@@ -84,6 +85,7 @@ class MapPassengerController extends GetxController {
int remainingTimeTimerRideBegin = 60;
String stringRemainingTimeRideBegin = '';
late String rideId;
bool noCarString = false;
late String driverToken;
int carsOrder = 0;
@@ -415,15 +417,19 @@ class MapPassengerController extends GetxController {
'northeastLon': northeast.longitude.toString(),
});
if (res == 'failure') {
Get.defaultDialog(
title: 'No Car in your site.Sorry!',
middleText: '',
confirm: MyElevatedButton(
title: 'Back',
onPressed: () {
Get.back();
markerReloadingTimer.cancel();
}));
noCarString = true;
update();
// Get.snackbar('No Car in your site.Sorry!'.tr, '',
// backgroundColor: AppColor.redColor);
// Get.defaultDialog(
// title: 'No Car in your site.Sorry!'.tr,
// middleText: '',
// confirm: MyElevatedButton(
// title: 'Back',
// onPressed: () {
// Get.back();
// markerReloadingTimer.cancel();
// }));
} else {
dataCarsLocationByPassenger = jsonDecode(res);
// print(dataCarsLocationByPassenger);

View File

@@ -0,0 +1,45 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/box_name.dart';
import 'package:ride/constant/colors.dart';
import 'package:ride/constant/links.dart';
import 'package:ride/constant/style.dart';
import 'package:ride/controller/functions/crud.dart';
import 'package:ride/main.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
class FeedBackController extends GetxController {
bool isLoading = false;
final formKey = GlobalKey<FormState>();
final feedbackController = TextEditingController();
void addFeedBack() async {
isLoading = true;
update();
var res = await CRUD().post(link: AppLink.addFeedBack, payload: {
'passengerId': box.read(BoxName.passengerID).toString(),
'feedBack': feedbackController.text
});
var d = jsonDecode(res);
// print(d);
if (d['status'].toString() == 'success') {
Get.defaultDialog(
title: 'Success'.tr,
titleStyle: AppStyle.title,
middleText: 'Feedback data saved successfully'.tr,
middleTextStyle: AppStyle.title,
confirm: MyElevatedButton(
kolor: AppColor.greenColor,
title: 'Ok'.tr,
onPressed: () {
Get.back();
Get.back();
}));
}
isLoading = false;
update();
}
}

View File

@@ -2,12 +2,15 @@ import 'dart:convert';
import 'package:get/get.dart';
import 'package:ride/constant/links.dart';
import 'package:ride/constant/style.dart';
import 'package:ride/controller/functions/crud.dart';
import 'package:ride/views/home/map_page_passenger.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
class PromosController extends GetxController {
List<dynamic> promoList = [];
bool isloading = true;
bool isLoading = true;
late String promos;
@override
void onInit() {
getPromoBytody();
@@ -17,16 +20,25 @@ class PromosController extends GetxController {
Future getPromoBytody() async {
var res = await CRUD().get(link: AppLink.getPromoBytody, payload: {});
if (res.toString() == 'failure') {
Get.snackbar('failure', 'message');
isloading = false;
Get.defaultDialog(
title: 'No Promo for tody .'.tr,
middleText: '',
titleStyle: AppStyle.title,
confirm: MyElevatedButton(
title: 'Back'.tr,
onPressed: () {
Get.back();
Get.back();
}));
isLoading = false;
update();
} else {
var jsonDecoded = jsonDecode(res);
promoList = jsonDecoded['message'];
print(promoList);
isloading = false;
isLoading = false;
update();
print(promoList);
}
}
}

View File

@@ -9,7 +9,7 @@ import '../../main.dart';
import '../../onbording_page.dart';
import '../../views/auth/captin/login_captin.dart';
import '../../views/home/Captin/home_captin.dart';
import '../../views/home/map_page.dart';
import '../../views/home/map_page_passenger.dart';
class SplashScreenController extends GetxController
with SingleGetTickerProviderMixin {
@@ -48,7 +48,7 @@ class SplashScreenController extends GetxController
box.read(BoxName.onBoarding) == null
? Get.off(() => OnBoardingPage())
: box.read(BoxName.email) != null
? Get.off(() => const MapPage())
? Get.off(() => const MapPagePassenger())
: box.read(BoxName.emailDriver) == null
? Get.off(() => LoginPage())
: box.read(BoxName.emailDriver) != null

View File

@@ -7,7 +7,7 @@ import 'package:ride/controller/functions/crud.dart';
import 'package:ride/controller/home/map_passenger_controller.dart';
import 'package:ride/main.dart';
import 'package:ride/views/home/Captin/home_captin.dart';
import 'package:ride/views/home/map_page.dart';
import 'package:ride/views/home/map_page_passenger.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
// import '../home/captin/home_captain_controller.dart';
@@ -72,7 +72,7 @@ class RateController extends GetxController {
'comment': comment.text,
}).then((value) {
Get.find<MapPassengerController>().restCounter();
Get.offAll(const MapPage());
Get.offAll(const MapPagePassenger());
});
}
}