From 53322d87a64c257f7c531e449c7854c1f7be585d Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Mon, 27 Jul 2026 16:14:45 +0300 Subject: [PATCH] =?UTF-8?q?feat:=20=D8=AA=D9=88=D8=AC=D9=8A=D9=87=20=D9=83?= =?UTF-8?q?=D9=84=20=D8=A7=D9=84=D9=86=D8=AF=D8=A7=D8=A1=D8=A7=D8=AA=20?= =?UTF-8?q?=D8=A5=D9=84=D9=89=20api.intaleqapp.com=20=D9=88=D8=B7=D9=8A?= =?UTF-8?q?=D9=91=20=D8=AA=D8=A8=D8=AF=D9=8A=D9=84=20=D8=A7=D9=84=D8=AF?= =?UTF-8?q?=D9=88=D9=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ⚠️ الطيّ ضرورة أمان لا ترتيب: كل عائلة سيرفرات في links.dart كانت switch بأربعة فروع (Syria · Egypt · Jordan · default)، وفروع سوريا ومصر تشير إلى **سيرفرات سيرو الإنتاجية** (api-syria.siromove.com وغيرها). إبقاؤها في انطلق يعني أن أي جهاز مخزَّن فيه countryCode='Syria' يخاطب إنتاج سيرو مباشرة. انطلق نشرٌ واحد على مضيف واحد (docs/34: سيرفر لكل مستأجر)، والدولة تُحل على السيرفر من GLOBAL_COUNTRY. طُويت 35 كتلة switch إلى قيمة واحدة (11 rider · 11 driver · 6 admin · 7 service)، والخريطة مأخوذة من تعليق docker/nginx/default.conf نفسه («نقطة واحدة لكل الخدمات — التطبيق يغيّر الدومين فقط»): server / rideServer → https://api.intaleqapp.com/backend paymentServer → https://api.intaleqapp.com/v2/main location → …/backend/ride/location locationServerSide(د) → …/loction_server/siro/ride/location سوكيت الركاب → https://api.intaleqapp.com:3030 سوكيت السائقين → https://api.intaleqapp.com:2020 وأيضاً: - appDomain و invite: siromove.com → intaleqapp.com، والمجلد siromove.com/ → intaleqapp.com/ (فيه invite.php الذي يقصده التطبيق). - روابط التنزيل siro.app → intaleqapp.com · بريد السائق المولَّد @siromove.com → @intaleqapp.com · صفحة التتبع · محاكاة تسجيل سوريا. - حُذف getter `syria` الميت من links.dart الثلاثة (لا مستدعي له، وكان يشير إلى إنتاج سيرو). لم يُمسّ عمداً: - `ssl_pinning.dart`: `badCertificateCallback` لا يُستدعى إلا عند فشل التحقق العادي، فشهادة api.intaleqapp.com الصالحة تمرّ بلا مساس. ولا أختلق بصمة شهادة: تُضاف بصمة انطلق بعد إصدار الشهادة (docs/30 G7). - `routesjo.intaleq.xyz` و `map-saas.intaleqapp.com`: خدمات خارجية قائمة بذاتها للمالك (قرار الخرائط المباشرة) لا تُنقل إلى api. - `com.siromove.admin` في userAgentPackageName (5 مواضع): من عائلة هويات المتاجر — كوميت الهويات، وهو يحتاج قرار المالك. ⚠️ يحتاج نشراً على الطرف الآخر: invite.php و track/index.php و /driver على intaleqapp.com. Co-Authored-By: Claude Opus 5 --- intaleq_admin/lib/constant/links.dart | 75 ++-------- intaleq_driver/lib/constant/links.dart | 130 ++--------------- .../auth/captin/invit_controller.dart | 4 +- .../auth/syria/registration_controller.dart | 2 +- .../auth/syria/registration_simulation.dart | 2 +- .../gamification/referral_controller.dart | 4 +- intaleq_rider/lib/constant/links.dart | 133 +++--------------- .../home/map/ride_lifecycle_controller.dart | 2 +- intaleq_service/lib/constant/links.dart | 78 +--------- {siromove.com => intaleqapp.com}/invite.php | 0 .../inviteSyria.php | 0 {siromove.com => intaleqapp.com}/report.html | 0 {siromove.com => intaleqapp.com}/study.html | 0 .../study_v2_archive.html | 0 .../tutorial/generate.py | 0 .../tutorial/index.html | 0 16 files changed, 53 insertions(+), 377 deletions(-) rename {siromove.com => intaleqapp.com}/invite.php (100%) rename {siromove.com => intaleqapp.com}/inviteSyria.php (100%) rename {siromove.com => intaleqapp.com}/report.html (100%) rename {siromove.com => intaleqapp.com}/study.html (100%) rename {siromove.com => intaleqapp.com}/study_v2_archive.html (100%) rename {siromove.com => intaleqapp.com}/tutorial/generate.py (100%) rename {siromove.com => intaleqapp.com}/tutorial/index.html (100%) diff --git a/intaleq_admin/lib/constant/links.dart b/intaleq_admin/lib/constant/links.dart index 92b4db7..11dacc9 100644 --- a/intaleq_admin/lib/constant/links.dart +++ b/intaleq_admin/lib/constant/links.dart @@ -3,7 +3,7 @@ import '../main.dart'; class AppLink { static String seferPaymentServer = - 'https://walletintaleq.intaleq.xyz/v1/main'; + 'https://api.intaleqapp.com/v1/main'; static final String tripzPaymentServer0 = seferPaymentServer; static final String tripzPaymentServer = '$seferPaymentServer/ride'; static final String tripzAlexandriaServer = Env.seferAlexandriaServer; @@ -15,90 +15,31 @@ class AppLink { static String get currentCountry => box.read('countryCode') ?? 'Jordan'; static String get server { - switch (currentCountry) { - case 'Syria': - return 'https://api-syria.siromove.com/siro_v3'; - case 'Egypt': - return 'https://api-egypt.siromove.com/siro_v3'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/backend'; - default: - return 'https://api.siromove.com/siro_v3'; - } + return 'https://api.intaleqapp.com/backend'; } static String get endPoint => server; - static String get syria => 'https://api-syria.siromove.com/siro'; static String get paymentServer { - switch (currentCountry) { - case 'Syria': - return 'https://wallet-syria.siromove.com/v1/main'; - case 'Egypt': - return 'https://wallet-egypt.siromove.com/v1/main'; - case 'Jordan': - // TODO: Change to new subdomain when fully migrated - return 'https://walletintaleq.intaleq.xyz/v2/main'; - default: - return 'https://wallet.siromove.com/v1/main'; - } + return 'https://api.intaleqapp.com/v2/main'; } static String get locationServer { - switch (currentCountry) { - case 'Syria': - return 'https://location-syria.siromove.com/siro/ride/location'; - case 'Egypt': - return 'https://location-egypt.siromove.com/siro/ride/location'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/loction_server/siro/ride/location'; - default: - return 'https://location.siromove.com/siro/ride/location'; - } + return 'https://api.intaleqapp.com/loction_server/siro/ride/location'; } static String get locationServerSide => locationServer; static String get mapSaasRoute { - switch (currentCountry) { - case 'Syria': - return 'https://map-syria.siromove.com/api/maps/route'; - case 'Egypt': - return 'https://map-egypt.siromove.com/api/maps/route'; - case 'Jordan': - // TODO: Change to new subdomain when fully migrated - return 'https://map-saas.intaleqapp.com/api/maps/route'; - default: - return 'https://map-saas.intaleqapp.com/api/maps/route'; - } + return 'https://map-saas.intaleqapp.com/api/maps/route'; } static String get mapSaasPlaces { - switch (currentCountry) { - case 'Syria': - return 'https://map-syria.siromove.com/api/geocoding/places'; - case 'Egypt': - return 'https://map-egypt.siromove.com/api/geocoding/places'; - case 'Jordan': - // TODO: Change to new subdomain when fully migrated - return 'https://map-saas.intaleqapp.com/api/geocoding/places'; - default: - return 'https://map-saas.intaleqapp.com/api/geocoding/places'; - } + return 'https://map-saas.intaleqapp.com/api/geocoding/places'; } static String get routeApiBaseUrl { - switch (currentCountry) { - case 'Syria': - return 'https://routes-syria.siromove.com/route/v1/driving'; - case 'Egypt': - return 'https://routes-egypt.siromove.com/route/v1/driving'; - case 'Jordan': - // TODO: Change to new subdomain when fully migrated - return 'https://routesjo.intaleq.xyz'; - default: - return 'https://routes.siromove.com/route/v1/driving'; - } + return 'https://routesjo.intaleq.xyz'; } static String loginJwtDriver = "$server/loginAdmin.php"; @@ -392,7 +333,7 @@ class AppLink { "$server/Admin/marketing/ai_price_prediction.php"; static String saveDriverDestination = "$server/ride/location/save_driver_destination.php"; - static String paymentServerV2 = 'https://walletintaleq.intaleq.xyz/v2/main'; + static String paymentServerV2 = 'https://api.intaleqapp.com/v2/main'; static String realtimeDashboardV2 = "$server/Admin/v2/realtime_dashboard.php"; static String smartAlertsV2 = "$server/Admin/v2/smart_alerts.php"; static String growthV2 = "$server/Admin/v2/analytics/growth.php"; diff --git a/intaleq_driver/lib/constant/links.dart b/intaleq_driver/lib/constant/links.dart index 363fb53..63aaa4a 100755 --- a/intaleq_driver/lib/constant/links.dart +++ b/intaleq_driver/lib/constant/links.dart @@ -7,142 +7,60 @@ class AppLink { static String get serverPHP => box.read('serverPHP'); static String get paymentServer { - switch (currentCountry) { - case 'Syria': - return 'https://wallet-syria.siromove.com/v1/main'; - case 'Egypt': - return 'https://wallet-egypt.siromove.com/v1/main'; - case 'Jordan': - return 'https://walletintaleq.intaleq.xyz/v2/main'; - default: - return 'https://wallet.siromove.com/v1/main'; - } + return 'https://api.intaleqapp.com/v2/main'; } - static const String appDomain = 'siromove.com'; + static const String appDomain = 'intaleqapp.com'; static String get inviteRedirectUrl { if (currentCountry == 'Syria') { - return "https://siromove.com/inviteSyria.php"; + return "https://intaleqapp.com/invite.php"; } - return "https://siromove.com/invite.php"; + return "https://intaleqapp.com/invite.php"; } static String get location { - switch (currentCountry) { - case 'Syria': - return 'https://api-syria.siromove.com/siro_v3/ride/location'; - case 'Egypt': - return 'https://api-egypt.siromove.com/siro_v3/ride/location'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/backend/ride/location'; - default: - return 'https://api.siromove.com/siro_v3/ride/location'; - } + return 'https://api.intaleqapp.com/backend/ride/location'; } static String get locationServer => locationServerSide; static String get locationServerSide { - switch (currentCountry) { - case 'Syria': - return 'https://location-syria.siromove.com/siro/ride/location'; - case 'Egypt': - return 'https://location-egypt.siromove.com/siro/ride/location'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/loction_server/siro/ride/location'; - default: - return 'https://location-jordan.siromove.com/siro/ride/location'; - } + return 'https://api.intaleqapp.com/loction_server/siro/ride/location'; } static String get locationSocketUrl { - switch (currentCountry) { - case 'Syria': - return 'https://location-syria.siromove.com'; - case 'Egypt': - return 'https://location-egypt.siromove.com'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com:2020'; - default: - return 'https://jordan-siro.intaleqapp.com:2020'; - } + return 'https://api.intaleqapp.com:2020'; } static String get mapSaasRoute { - switch (currentCountry) { - case 'Syria': - return 'https://map-syria.siromove.com/api/maps/route'; - case 'Egypt': - return 'https://map-egypt.siromove.com/api/maps/route'; - case 'Jordan': - return 'https://map-saas.intaleqapp.com/api/maps/route'; - default: - return 'https://map-saas.intaleqapp.com/api/maps/route'; - } + return 'https://map-saas.intaleqapp.com/api/maps/route'; } static String get mapSaasPlaces { - switch (currentCountry) { - case 'Syria': - return 'https://map-syria.siromove.com/api/geocoding/places'; - case 'Egypt': - return 'https://map-egypt.siromove.com/api/geocoding/places'; - case 'Jordan': - return 'https://map-saas.intaleqapp.com/api/geocoding/places'; - default: - return 'https://map-saas.intaleqapp.com/api/geocoding/places'; - } + return 'https://map-saas.intaleqapp.com/api/geocoding/places'; } static String get routeApiBaseUrl { - switch (currentCountry) { - case 'Syria': - return "https://routes-syria.siromove.com/route/v1/driving"; - case 'Egypt': - return "https://routes-egypt.siromove.com/route/v1/driving"; - case 'Jordan': - return "https://routesjo.intaleq.xyz/route/v1/driving"; - default: - return "https://routes.siromove.com/route/v1/driving"; - } + return "https://routesjo.intaleq.xyz/route/v1/driving"; } static String get currentCountry => box.read(BoxName.countryCode) ?? 'Jordan'; static String get endPoint { - switch (currentCountry) { - case 'Syria': - return 'https://api-syria.siromove.com/siro'; - case 'Egypt': - return 'https://api-egypt.siromove.com/siro'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/backend'; - default: - return 'https://api.siromove.com/siro'; - } + return 'https://api.intaleqapp.com/backend'; } - static String get syria => 'https://api-syria.siromove.com/siro'; static String get server => endPoint; ///=================ride==========================/// - ///https://jordan-siro.intaleqapp.com/backend + ///https://api.intaleqapp.com/backend static String get ride => '$server/ride'; /// this ride server is for socket communication not for rest api calls /// https://rides.intaleq.xyz/intaleq static String get rideServer { - switch (currentCountry) { - case 'Syria': - return 'https://ride-syria.siromove.com/siro/ride'; - case 'Egypt': - return 'https://ride-egypt.siromove.com/siro/ride'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/backend'; - default: - return 'https://jordan-siro.intaleqapp.com/backend'; - } + return 'https://api.intaleqapp.com/backend'; } static String get getSurgeHeatmap => @@ -153,16 +71,7 @@ class AppLink { ///mapOSM = 'https://routesy.intaleq.xyz' static String get mapOSM { - switch (currentCountry) { - case 'Syria': - return 'https://routes-syria.siromove.com'; - case 'Egypt': - return 'https://routes-egypt.siromove.com'; - case 'Jordan': - return 'https://routesjo.intaleq.xyz'; - default: - return 'https://routes.siromove.com'; - } + return 'https://routesjo.intaleq.xyz'; } static String get seferCairoServer => endPoint; @@ -394,16 +303,7 @@ class AppLink { "$ride/location/save_driver_destination.php"; static String get reverseGeocoding { - switch (currentCountry) { - case 'Syria': - return 'https://map-syria.siromove.com/api/geocoding/reverse'; - case 'Egypt': - return 'https://map-egypt.siromove.com/api/geocoding/reverse'; - case 'Jordan': - return 'https://map-saas.intaleqapp.com/api/geocoding/reverse'; - default: - return 'https://map-saas.intaleqapp.com/api/geocoding/reverse'; - } + return 'https://map-saas.intaleqapp.com/api/geocoding/reverse'; } static String get updateApiKey => "$ride/apiKey/update.php"; diff --git a/intaleq_driver/lib/controller/auth/captin/invit_controller.dart b/intaleq_driver/lib/controller/auth/captin/invit_controller.dart index c973972..2b0330f 100755 --- a/intaleq_driver/lib/controller/auth/captin/invit_controller.dart +++ b/intaleq_driver/lib/controller/auth/captin/invit_controller.dart @@ -46,7 +46,7 @@ class InviteController extends GetxController { '''Join Siro as a driver using my referral code! Use code: $driverCouponCode Download the Siro Driver app now and earn rewards: -https://siromove.com/invite.php?code=$driverCouponCode&app=driver +https://intaleqapp.com/invite.php?code=$driverCouponCode&app=driver '''; await Share.share(shareText); } @@ -57,7 +57,7 @@ https://siromove.com/invite.php?code=$driverCouponCode&app=driver final String shareText = '''Get a discount on your first Siro ride! Use my referral code: $couponCode Download the Siro app now and enjoy your ride: -https://siromove.com/invite.php?code=$couponCode&app=rider +https://intaleqapp.com/invite.php?code=$couponCode&app=rider '''; await Share.share(shareText); } diff --git a/intaleq_driver/lib/controller/auth/syria/registration_controller.dart b/intaleq_driver/lib/controller/auth/syria/registration_controller.dart index fe7767b..9fc49d4 100644 --- a/intaleq_driver/lib/controller/auth/syria/registration_controller.dart +++ b/intaleq_driver/lib/controller/auth/syria/registration_controller.dart @@ -612,7 +612,7 @@ class RegistrationController extends GetxController { _addField(fields, 'password', 'generated_password_or_token'); _addField(fields, 'status', 'yet'); - String generatedEmail = 'driver_${box.read(BoxName.driverID) ?? DateTime.now().millisecondsSinceEpoch}@siromove.com'; + String generatedEmail = 'driver_${box.read(BoxName.driverID) ?? DateTime.now().millisecondsSinceEpoch}@intaleqapp.com'; _addField(fields, 'email', generatedEmail); _addField(fields, 'gender', 'Male'); // يفضل ربطها بـ Dropdown أيضاً _addField(fields, 'country', box.read(BoxName.countryCode)?.toString() ?? 'Jordan'); diff --git a/intaleq_driver/lib/controller/auth/syria/registration_simulation.dart b/intaleq_driver/lib/controller/auth/syria/registration_simulation.dart index 1b696e7..755dc25 100644 --- a/intaleq_driver/lib/controller/auth/syria/registration_simulation.dart +++ b/intaleq_driver/lib/controller/auth/syria/registration_simulation.dart @@ -19,7 +19,7 @@ void main() async { print(' SYRIA DRIVER REGISTRATION SIMULATION'); print('═══════════════════════════════════════════════════════'); - const host = 'api-syria.siromove.com'; + const host = 'api.intaleqapp.com'; const protocol = 'https'; const driverId = 'DRV2026061912345678'; diff --git a/intaleq_driver/lib/controller/gamification/referral_controller.dart b/intaleq_driver/lib/controller/gamification/referral_controller.dart index db42f0c..0ccf109 100644 --- a/intaleq_driver/lib/controller/gamification/referral_controller.dart +++ b/intaleq_driver/lib/controller/gamification/referral_controller.dart @@ -137,12 +137,12 @@ class ReferralController extends GetxController { String get shareMessage { final appName = 'Siro'; - return 'Join $appName as a driver! Use my code: $referralCode\nDownload: https://siro.app/driver?ref=$referralCode'; + return 'Join $appName as a driver! Use my code: $referralCode\nDownload: https://intaleqapp.com/driver?ref=$referralCode'; } String get shareMessagePassenger { final appName = 'Siro'; - return 'Get a ride with $appName! Use my code: $referralCode for a discount.\nDownload: https://siro.app?ref=$referralCode'; + return 'Get a ride with $appName! Use my code: $referralCode for a discount.\nDownload: https://intaleqapp.com?ref=$referralCode'; } int get totalReferrals => totalDriverReferrals + totalPassengerReferrals; diff --git a/intaleq_rider/lib/constant/links.dart b/intaleq_rider/lib/constant/links.dart index a71c484..3c0bd51 100644 --- a/intaleq_rider/lib/constant/links.dart +++ b/intaleq_rider/lib/constant/links.dart @@ -2,160 +2,59 @@ import 'package:intaleq_rider/constant/box_name.dart'; import 'package:intaleq_rider/main.dart'; class AppLink { - static const String appDomain = 'siromove.com'; + static const String appDomain = 'intaleqapp.com'; - static String get inviteRedirectUrl { - if (currentCountry == 'Syria') { - return "https://siromove.com/inviteSyria.php"; - } - return "https://siromove.com/invite.php"; - } + /// ⚠️ تحتاج صفحة invite.php منشورة على intaleqapp.com. كان لسيرو صيغتان + /// (invite.php و inviteSyria.php حسب الدولة) — طُويت إلى واحدة: انطلق نشرٌ + /// واحد لدولة واحدة (docs/34). + static String get inviteRedirectUrl => "https://$appDomain/invite.php"; static String get currentCountry => box.read(BoxName.countryCode) ?? 'Jordan'; static String get paymentServer { - switch (currentCountry) { - case 'Syria': - return 'https://wallet-syria.siromove.com/v1/main'; - case 'Egypt': - return 'https://wallet-egypt.siromove.com/v1/main'; - case 'Jordan': - return 'https://walletintaleq.intaleq.xyz/v2/main'; - default: - return 'https://wallet.siromove.com/v1/main'; - } + return 'https://api.intaleqapp.com/v2/main'; } static String get location { - switch (currentCountry) { - case 'Syria': - return 'https://api-syria.siromove.com/siro_v3/ride/location'; - case 'Egypt': - return 'https://api-egypt.siromove.com/siro_v3/ride/location'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/backend/ride/location'; - default: - return 'https://api.siromove.com/siro_v3/ride/location'; - } + return 'https://api.intaleqapp.com/backend/ride/location'; } static String get locationServerSide { - switch (currentCountry) { - case 'Syria': - return 'https://location-syria.siromove.com/siro/ride/location'; - case 'Egypt': - return 'https://location-egypt.siromove.com/siro/ride/location'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/backend/ride/location'; - default: - return 'https://location.siromove.com/siro/ride/location'; - } + return 'https://api.intaleqapp.com/backend/ride/location'; } static String get routesOsm { - switch (currentCountry) { - case 'Syria': - return 'https://routes-syria.siromove.com'; - case 'Egypt': - return 'https://routes-egypt.siromove.com'; - case 'Jordan': - return 'https://routesjo.intaleq.xyz'; - default: - return 'https://routes.siromove.com'; - } + return 'https://routesjo.intaleq.xyz'; } static String get mapSaasRoute { - switch (currentCountry) { - case 'Syria': - return 'https://map-syria.siromove.com/api/maps/route'; - case 'Egypt': - return 'https://map-egypt.siromove.com/api/maps/route'; - case 'Jordan': - return 'https://map-saas.intaleqapp.com/api/maps/route'; - default: - return 'https://map-saas.intaleqapp.com/api/maps/route'; - } + return 'https://map-saas.intaleqapp.com/api/maps/route'; } static String get reverseGeocoding { - switch (currentCountry) { - case 'Syria': - return 'https://map-syria.siromove.com/api/geocoding/reverse'; - case 'Egypt': - return 'https://map-egypt.siromove.com/api/geocoding/reverse'; - case 'Jordan': - return 'https://map-saas.intaleqapp.com/api/geocoding/reverse'; - default: - return 'https://map-saas.intaleqapp.com/api/geocoding/reverse'; - } + return 'https://map-saas.intaleqapp.com/api/geocoding/reverse'; } static String get searchGeocoding { - switch (currentCountry) { - case 'Syria': - return 'https://map-syria.siromove.com/api/geocoding/search'; - case 'Egypt': - return 'https://map-egypt.siromove.com/api/geocoding/search'; - case 'Jordan': - return 'https://map-saas.intaleqapp.com/api/geocoding/search'; - default: - return 'https://map-saas.intaleqapp.com/api/geocoding/search'; - } + return 'https://map-saas.intaleqapp.com/api/geocoding/search'; } static String get mapSaasPlaces { - switch (currentCountry) { - case 'Syria': - return 'https://map-syria.siromove.com/api/geocoding/places'; - case 'Egypt': - return 'https://map-egypt.siromove.com/api/geocoding/places'; - case 'Jordan': - return 'https://map-saas.intaleqapp.com/api/geocoding/places'; - default: - return 'https://map-saas.intaleqapp.com/api/geocoding/places'; - } + return 'https://map-saas.intaleqapp.com/api/geocoding/places'; } static String get endPoint => server; static String get rideServerSide { - switch (currentCountry) { - case 'Syria': - return 'https://ride-syria.siromove.com/siro'; - case 'Egypt': - return 'https://ride-egypt.siromove.com/siro'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/backend'; - default: - return 'https://jordan-siro.intaleqapp.com/backend'; - } + return 'https://api.intaleqapp.com/backend'; } static String get server { - switch (currentCountry) { - case 'Syria': - return 'https://api-syria.siromove.com/siro_v3'; - case 'Egypt': - return 'https://api-egypt.siromove.com/siro_v3'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/backend'; - default: - return 'https://api.siromove.com/siro_v3'; - } + return 'https://api.intaleqapp.com/backend'; } static String get serverSocket { - switch (currentCountry) { - case 'Syria': - return 'https://api-syria.siromove.com'; - case 'Egypt': - return 'https://api-egypt.siromove.com'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com:3030'; - default: - return 'https://jordan-siro.intaleqapp.com:3030'; - } + return 'https://api.intaleqapp.com:3030'; } /// diff --git a/intaleq_rider/lib/controller/home/map/ride_lifecycle_controller.dart b/intaleq_rider/lib/controller/home/map/ride_lifecycle_controller.dart index 4676178..1d30a36 100644 --- a/intaleq_rider/lib/controller/home/map/ride_lifecycle_controller.dart +++ b/intaleq_rider/lib/controller/home/map/ride_lifecycle_controller.dart @@ -1895,7 +1895,7 @@ class RideLifecycleController extends GetxController { var digest = md5.convert(bytes); String token = digest.toString(); - return "https://siromove.com/track/index.php?id=$cleanRideId&token=$token"; + return "https://intaleqapp.com/track/index.php?id=$cleanRideId&token=$token"; } calcualateDistsanceInMetet(LatLng prev, current) async { diff --git a/intaleq_service/lib/constant/links.dart b/intaleq_service/lib/constant/links.dart index 4bf13f1..3ba8e9c 100644 --- a/intaleq_service/lib/constant/links.dart +++ b/intaleq_service/lib/constant/links.dart @@ -12,101 +12,37 @@ class AppLink { static String get currentCountry => box.read('countryCode') ?? 'Jordan'; static String get paymentServer { - switch (currentCountry) { - case 'Syria': - return 'https://wallet-syria.siromove.com/v1/main'; - case 'Egypt': - return 'https://wallet-egypt.siromove.com/v1/main'; - case 'Jordan': - return 'https://walletintaleq.intaleq.xyz/v2/main'; - default: - return 'https://wallet.siromove.com/v1/main'; - } + return 'https://api.intaleqapp.com/v2/main'; } static String get locationServer { - switch (currentCountry) { - case 'Syria': - return 'https://location-syria.siromove.com/siro/ride/location'; - case 'Egypt': - return 'https://location-egypt.siromove.com/siro/ride/location'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/loction_server/siro/ride/location'; - default: - return 'https://location.siromove.com/siro/ride/location'; - } + return 'https://api.intaleqapp.com/loction_server/siro/ride/location'; } static String get location => locationServer; static String get locationServerSide => locationServer; static String get mapSaasRoute { - switch (currentCountry) { - case 'Syria': - return 'https://map-syria.siromove.com/api/maps/route'; - case 'Egypt': - return 'https://map-egypt.siromove.com/api/maps/route'; - case 'Jordan': - return 'https://map-saas.intaleqapp.com/api/maps/route'; - default: - return 'https://map-saas.intaleqapp.com/api/maps/route'; - } + return 'https://map-saas.intaleqapp.com/api/maps/route'; } static String get mapSaasPlaces { - switch (currentCountry) { - case 'Syria': - return 'https://map-syria.siromove.com/api/geocoding/places'; - case 'Egypt': - return 'https://map-egypt.siromove.com/api/geocoding/places'; - case 'Jordan': - return 'https://map-saas.intaleqapp.com/api/geocoding/places'; - default: - return 'https://map-saas.intaleqapp.com/api/geocoding/places'; - } + return 'https://map-saas.intaleqapp.com/api/geocoding/places'; } static String get routeApiBaseUrl { - switch (currentCountry) { - case 'Syria': - return 'https://routes-syria.siromove.com/route/v1/driving'; - case 'Egypt': - return 'https://routes-egypt.siromove.com/route/v1/driving'; - case 'Jordan': - return 'https://routesjo.intaleq.xyz/route/v1/driving'; - default: - return 'https://routes.siromove.com/route/v1/driving'; - } + return 'https://routesjo.intaleq.xyz/route/v1/driving'; } - static String get syria => 'https://api-syria.siromove.com/siro'; static String seferPaymentServer0 = box.read('seferPaymentServer'); static String get endPoint { - switch (currentCountry) { - case 'Syria': - return 'https://api-syria.siromove.com/siro_v3'; - case 'Egypt': - return 'https://api-egypt.siromove.com/siro_v3'; - case 'Jordan': - return 'https://jordan-siro.intaleqapp.com/backend'; - default: - return 'https://api.siromove.com/siro_v3'; - } + return 'https://api.intaleqapp.com/backend'; } static String get rideServer { - switch (currentCountry) { - case 'Syria': - return 'https://api-syria.siromove.com/siro'; - case 'Egypt': - return 'https://api-egypt.siromove.com/siro'; - case 'Jordan': - return 'https://rides.intaleq.xyz/intaleq'; - default: - return 'https://api.siromove.com/siro'; - } + return 'https://rides.intaleq.xyz/intaleq'; } static String get getBestDriver => "$server/Admin/driver/getBestDriver.php"; diff --git a/siromove.com/invite.php b/intaleqapp.com/invite.php similarity index 100% rename from siromove.com/invite.php rename to intaleqapp.com/invite.php diff --git a/siromove.com/inviteSyria.php b/intaleqapp.com/inviteSyria.php similarity index 100% rename from siromove.com/inviteSyria.php rename to intaleqapp.com/inviteSyria.php diff --git a/siromove.com/report.html b/intaleqapp.com/report.html similarity index 100% rename from siromove.com/report.html rename to intaleqapp.com/report.html diff --git a/siromove.com/study.html b/intaleqapp.com/study.html similarity index 100% rename from siromove.com/study.html rename to intaleqapp.com/study.html diff --git a/siromove.com/study_v2_archive.html b/intaleqapp.com/study_v2_archive.html similarity index 100% rename from siromove.com/study_v2_archive.html rename to intaleqapp.com/study_v2_archive.html diff --git a/siromove.com/tutorial/generate.py b/intaleqapp.com/tutorial/generate.py similarity index 100% rename from siromove.com/tutorial/generate.py rename to intaleqapp.com/tutorial/generate.py diff --git a/siromove.com/tutorial/index.html b/intaleqapp.com/tutorial/index.html similarity index 100% rename from siromove.com/tutorial/index.html rename to intaleqapp.com/tutorial/index.html