diff --git a/sigap-mobile/lib/main.dart b/sigap-mobile/lib/main.dart index 0d9c8b0..44778cf 100644 --- a/sigap-mobile/lib/main.dart +++ b/sigap-mobile/lib/main.dart @@ -1,16 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; -import 'package:get/get.dart'; import 'package:get_storage/get_storage.dart'; import 'package:mapbox_maps_flutter/mapbox_maps_flutter.dart'; import 'package:sigap/app.dart'; -import 'package:sigap/src/utils/constants/app_routes.dart'; - import 'package:supabase_flutter/supabase_flutter.dart'; -import 'navigation_menu.dart'; - Future main() async { final widgetsBinding = WidgetsFlutterBinding.ensureInitialized(); diff --git a/sigap-mobile/lib/src/cores/routes/app_pages.dart b/sigap-mobile/lib/src/cores/routes/app_pages.dart index bdcefd2..25417df 100644 --- a/sigap-mobile/lib/src/cores/routes/app_pages.dart +++ b/sigap-mobile/lib/src/cores/routes/app_pages.dart @@ -2,10 +2,10 @@ import 'package:get/get.dart'; import 'package:sigap/navigation_menu.dart'; import 'package:sigap/src/features/auth/presentasion/pages/email-verification/email_verification_screen.dart'; import 'package:sigap/src/features/auth/presentasion/pages/forgot-password/forgot_password.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/liveness_detection_screen.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/registraion_form_screen.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/selfie-verification/liveness_detection_screen.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/main/registraion_form_screen.dart'; import 'package:sigap/src/features/auth/presentasion/pages/signin/signin_screen.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/signup/signup_with_role_screen.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/main/signup_with_role_screen.dart'; import 'package:sigap/src/features/onboarding/presentasion/pages/location-warning/location_warning_screen.dart'; import 'package:sigap/src/features/onboarding/presentasion/pages/onboarding/onboarding_screen.dart'; import 'package:sigap/src/features/onboarding/presentasion/pages/role-selection/role_selection_screen.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/bindings/auth_bindings.dart b/sigap-mobile/lib/src/features/auth/presentasion/bindings/auth_bindings.dart index dae8a7c..fb5274b 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/bindings/auth_bindings.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/bindings/auth_bindings.dart @@ -1,10 +1,9 @@ import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/others/email_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/others/forgot_password_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/other/registration_form_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/email-verification/email_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/forgot-password/forgot_password_controller.dart'; import 'package:sigap/src/features/auth/presentasion/controllers/signin/signin_controller.dart'; - -import 'package:sigap/src/features/auth/presentasion/controllers/signup/signup_with_role_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/main/registration_form_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/main/signup_with_role_controller.dart'; class AuthControllerBindings extends Bindings { @override diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/others/email_verification_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/email-verification/email_verification_controller.dart similarity index 100% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/others/email_verification_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/email-verification/email_verification_controller.dart diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/others/forgot_password_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/forgot-password/forgot_password_controller.dart similarity index 100% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/others/forgot_password_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/forgot-password/forgot_password_controller.dart diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/registration_form_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/main/registration_form_controller.dart similarity index 98% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/registration_form_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/main/registration_form_controller.dart index a81a158..7cbe37b 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/registration_form_controller.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/main/registration_form_controller.dart @@ -4,13 +4,13 @@ import 'package:get_storage/get_storage.dart'; import 'package:logger/logger.dart'; import 'package:sigap/src/cores/services/supabase_service.dart'; import 'package:sigap/src/features/auth/data/repositories/authentication_repository.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/identity-verification/identity_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/officer-information/officer_info_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/officer-information/unit_info_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/selfie_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/id-card-verification/id_card_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/viewer-information/personal_info_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/identity-verification/identity_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/officer-information/officer_info_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/officer-information/unit_info_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/selfie_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/id-card-verification/id_card_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/viewer-information/personal_info_controller.dart'; import 'package:sigap/src/features/daily-ops/data/models/index.dart'; import 'package:sigap/src/features/personalization/data/models/index.dart'; import 'package:sigap/src/features/personalization/data/models/models/user_metadata_model.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/signup_with_role_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/main/signup_with_role_controller.dart similarity index 100% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/signup_with_role_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/main/signup_with_role_controller.dart index b8eaa2b..2e48ce8 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/signup_with_role_controller.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/main/signup_with_role_controller.dart @@ -4,9 +4,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:get_storage/get_storage.dart'; import 'package:logger/logger.dart'; -import 'package:sigap/src/features/personalization/data/models/models/user_metadata_model.dart'; import 'package:sigap/src/features/auth/data/repositories/authentication_repository.dart'; import 'package:sigap/src/features/personalization/data/models/index.dart'; +import 'package:sigap/src/features/personalization/data/models/models/user_metadata_model.dart'; import 'package:sigap/src/features/personalization/data/repositories/roles_repository.dart'; import 'package:sigap/src/utils/constants/app_routes.dart'; import 'package:sigap/src/utils/helpers/network_manager.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/id-card-verification/id_card_verification_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/id-card-verification/id_card_verification_controller.dart similarity index 100% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/id-card-verification/id_card_verification_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/id-card-verification/id_card_verification_controller.dart diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/id-card-verification/image_verification_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/id-card-verification/image_verification_controller.dart similarity index 100% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/id-card-verification/image_verification_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/id-card-verification/image_verification_controller.dart diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/identity-verification/identity_verification_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/identity-verification/identity_verification_controller.dart similarity index 98% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/identity-verification/identity_verification_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/identity-verification/identity_verification_controller.dart index bc8a057..5f34ac6 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/identity-verification/identity_verification_controller.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/identity-verification/identity_verification_controller.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:sigap/src/features/auth/data/models/face_model.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/basic/registration_form_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/id-card-verification/id_card_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/facial_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/selfie_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/viewer-information/personal_info_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/main/registration_form_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/id-card-verification/id_card_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/facial_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/selfie_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/viewer-information/personal_info_controller.dart'; class IdentityVerificationController extends GetxController { // Singleton instance diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/others/location_selection_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/identity-verification/location_selection_controller.dart similarity index 97% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/others/location_selection_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/identity-verification/location_selection_controller.dart index 1c3773d..97a1cb6 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/controllers/others/location_selection_controller.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/identity-verification/location_selection_controller.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:sigap/src/features/auth/data/models/administrative_division.dart'; import 'package:sigap/src/features/map/data/repositories/location_repository.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/widgets/city_selection.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/city_selection.dart'; class LocationSelectionController extends GetxController { final AdiminstrativeLocationRepository _AdiminstrativeLocationRepository = diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/officer-information/officer_info_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/officer-information/officer_info_controller.dart similarity index 100% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/officer-information/officer_info_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/officer-information/officer_info_controller.dart diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/officer-information/unit_info_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/officer-information/unit_info_controller.dart similarity index 100% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/officer-information/unit_info_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/officer-information/unit_info_controller.dart diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart similarity index 100% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/selfie-verification/facial_verification_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/selfie-verification/facial_verification_controller.dart similarity index 98% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/selfie-verification/facial_verification_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/selfie-verification/facial_verification_controller.dart index e63037e..7c7e2a1 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/selfie-verification/facial_verification_controller.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/selfie-verification/facial_verification_controller.dart @@ -3,7 +3,7 @@ import 'package:get/get.dart'; import 'package:image_picker/image_picker.dart'; import 'package:sigap/src/cores/services/edge_function_service.dart'; import 'package:sigap/src/features/auth/data/models/face_model.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart'; /// Service for handling facial verification /// This class serves as a bridge between UI controllers and face detection functionality diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/selfie-verification/selfie_verification_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/selfie-verification/selfie_verification_controller.dart similarity index 98% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/selfie-verification/selfie_verification_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/selfie-verification/selfie_verification_controller.dart index 06174a1..20c1754 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/selfie-verification/selfie_verification_controller.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/selfie-verification/selfie_verification_controller.dart @@ -4,8 +4,8 @@ import 'package:get/get.dart'; import 'package:image_picker/image_picker.dart'; import 'package:sigap/src/cores/services/edge_function_service.dart'; import 'package:sigap/src/features/auth/data/models/face_model.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/id-card-verification/id_card_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/id-card-verification/id_card_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart'; import 'package:sigap/src/utils/constants/app_routes.dart'; class SelfieVerificationController extends GetxController { diff --git a/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/viewer-information/personal_info_controller.dart b/sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/viewer-information/personal_info_controller.dart similarity index 100% rename from sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/viewer-information/personal_info_controller.dart rename to sigap-mobile/lib/src/features/auth/presentasion/controllers/signup/step/viewer-information/personal_info_controller.dart diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/email-verification/email_verification_screen.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/email-verification/email_verification_screen.dart index 68a5688..c5e58cc 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/email-verification/email_verification_screen.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/email-verification/email_verification_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/others/email_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/email-verification/email_verification_controller.dart'; import 'package:sigap/src/features/auth/presentasion/widgets/auth_button.dart'; import 'package:sigap/src/features/auth/presentasion/widgets/auth_header.dart'; import 'package:sigap/src/features/auth/presentasion/widgets/otp_input_field.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/forgot-password/forgot_password.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/forgot-password/forgot_password.dart index 46b67ea..00aa0cb 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/forgot-password/forgot_password.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/forgot-password/forgot_password.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/others/forgot_password_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/forgot-password/forgot_password_controller.dart'; import 'package:sigap/src/features/auth/presentasion/widgets/auth_button.dart'; import 'package:sigap/src/features/auth/presentasion/widgets/auth_header.dart'; import 'package:sigap/src/shared/widgets/text/custom_text_field.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/registraion_form_screen.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/main/registraion_form_screen.dart similarity index 87% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/registraion_form_screen.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/main/registraion_form_screen.dart index 4bfbbab..1ae6b93 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/registraion_form_screen.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/main/registraion_form_screen.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/basic/registration_form_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/id_card_verification_step.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/identity_verification_step.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/personal_info_step.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/selfie_verification_step.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/officer/officer_info_step.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/officer/unit_info_step.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/main/registration_form_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/id-card-verification/id_card_verification_step.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/identity-verification/identity_verification_step.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/officer-information/officer_info_step.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/officer-information/unit_info_step.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/personal-information/personal_info_step.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/selfie-verification/selfie_verification_step.dart'; import 'package:sigap/src/features/auth/presentasion/widgets/auth_button.dart'; import 'package:sigap/src/shared/widgets/indicators/step_indicator/step_indicator.dart'; import 'package:sigap/src/utils/constants/colors.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/signup_with_role_screen.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/main/signup_with_role_screen.dart similarity index 99% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/signup/signup_with_role_screen.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/main/signup_with_role_screen.dart index b6e8bd7..95c0359 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/signup_with_role_screen.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/main/signup_with_role_screen.dart @@ -3,7 +3,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/signup_with_role_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/main/signup_with_role_controller.dart'; import 'package:sigap/src/features/auth/presentasion/widgets/auth_button.dart'; import 'package:sigap/src/features/auth/presentasion/widgets/auth_divider.dart'; import 'package:sigap/src/features/auth/presentasion/widgets/password_field.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/id_card_verification_step.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/id-card-verification/id_card_verification_step.dart similarity index 95% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/id_card_verification_step.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/id-card-verification/id_card_verification_step.dart index 5ca8ada..ed433bb 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/id_card_verification_step.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/id-card-verification/id_card_verification_step.dart @@ -2,9 +2,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:sigap/src/features/auth/data/models/kta_model.dart'; import 'package:sigap/src/features/auth/data/models/ktp_model.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/basic/registration_form_controller.dart'; - -import 'package:sigap/src/features/auth/presentasion/controllers/signup/id-card-verification/id_card_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/main/registration_form_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/id-card-verification/id_card_verification_controller.dart'; import 'package:sigap/src/shared/widgets/image_upload/image_source_dialog.dart'; import 'package:sigap/src/shared/widgets/image_upload/image_uploader.dart'; import 'package:sigap/src/shared/widgets/info/tips_container.dart'; @@ -120,7 +119,6 @@ class IdCardVerificationStep extends StatelessWidget { hasConfirmed: controller.hasConfirmedIdCard.value, onConfirm: controller.confirmIdCardImage, onTryAnother: controller.clearIdCardImage, - ), ) : const SizedBox.shrink(), @@ -142,9 +140,7 @@ class IdCardVerificationStep extends StatelessWidget { '$idCardType Verification', style: Theme.of( context, - ).textTheme.headlineSmall?.copyWith( - fontWeight: FontWeight.bold, - ), + ).textTheme.headlineSmall?.copyWith(fontWeight: FontWeight.bold), ), const SizedBox(height: TSizes.sm), Text( @@ -312,9 +308,7 @@ class IdCardVerificationStep extends StatelessWidget { 'Extracted $cardType Information', style: Theme.of( context, - ).textTheme.titleMedium?.copyWith( - fontWeight: FontWeight.bold, - ), + ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold), ), ), ], @@ -333,17 +327,12 @@ class IdCardVerificationStep extends StatelessWidget { '$label:', style: Theme.of( context, - ).textTheme.bodyMedium?.copyWith( - fontWeight: FontWeight.bold, - ), + ).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.bold), ), ), const SizedBox(width: TSizes.sm), Expanded( - child: Text( - value, - style: Theme.of(context).textTheme.bodyMedium, - ), + child: Text(value, style: Theme.of(context).textTheme.bodyMedium), ), ], ), diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/identity_verification_step.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/identity_verification_step.dart similarity index 97% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/identity_verification_step.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/identity_verification_step.dart index ca58022..71feedb 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/identity_verification_step.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/identity_verification_step.dart @@ -1,11 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:logger/logger.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/basic/registration_form_controller.dart'; - -import 'package:sigap/src/features/auth/presentasion/controllers/signup/identity-verification/identity_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/selfie_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/id_info_form.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/main/registration_form_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/identity-verification/identity_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/selfie_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/id_info_form.dart'; import 'package:sigap/src/shared/widgets/form/form_section_header.dart'; import 'package:sigap/src/utils/constants/colors.dart'; import 'package:sigap/src/utils/constants/sizes.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/city_selection.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/city_selection.dart similarity index 99% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/city_selection.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/city_selection.dart index f4eed25..d65c13b 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/city_selection.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/city_selection.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:sigap/src/features/auth/data/models/administrative_division.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/others/location_selection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/identity-verification/location_selection_controller.dart'; import 'package:sigap/src/utils/constants/colors.dart'; import 'package:sigap/src/utils/constants/sizes.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/face_verification_section.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/face_verification_section.dart similarity index 97% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/face_verification_section.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/face_verification_section.dart index 1aabc2e..2f2bcdb 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/face_verification_section.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/face_verification_section.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/identity-verification/identity_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/facial_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/identity-verification/identity_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/facial_verification_controller.dart'; import 'package:sigap/src/shared/widgets/form/form_section_header.dart'; import 'package:sigap/src/shared/widgets/form/verification_status.dart'; import 'package:sigap/src/shared/widgets/info/tips_container.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/id_info_form.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/id_info_form.dart similarity index 95% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/id_info_form.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/id_info_form.dart index 487b847..ddc0927 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/id_info_form.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/id_info_form.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/identity-verification/identity_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/place_of_birth_field.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/verification_status_message.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/identity-verification/identity_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/place_of_birth_field.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/verification_status_message.dart'; import 'package:sigap/src/shared/widgets/form/date_picker_field.dart'; import 'package:sigap/src/shared/widgets/form/gender_selection.dart'; import 'package:sigap/src/shared/widgets/form/verification_status.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/place_of_birth_field.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/place_of_birth_field.dart similarity index 94% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/place_of_birth_field.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/place_of_birth_field.dart index 3ee9267..037d679 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/place_of_birth_field.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/place_of_birth_field.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:sigap/src/features/auth/data/models/administrative_division.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/identity-verification/identity_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/widgets/city_selection.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/identity-verification/identity_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/city_selection.dart'; import 'package:sigap/src/utils/constants/colors.dart'; import 'package:sigap/src/utils/constants/sizes.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/verification_action_button.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/verification_action_button.dart similarity index 97% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/verification_action_button.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/verification_action_button.dart index 7b952c7..1758511 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/verification_action_button.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/verification_action_button.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/identity-verification/identity_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/identity-verification/identity_verification_controller.dart'; import 'package:sigap/src/shared/widgets/buttons/custom_elevated_button.dart'; import 'package:sigap/src/utils/constants/sizes.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/verification_status_message.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/verification_status_message.dart similarity index 93% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/verification_status_message.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/verification_status_message.dart index 47d2465..2e3b3b3 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/identity_verification/verification_status_message.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/verification_status_message.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/identity-verification/identity_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/identity-verification/identity_verification_controller.dart'; import 'package:sigap/src/shared/widgets/verification/validation_message_card.dart'; import 'package:sigap/src/utils/constants/sizes.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/verification_summary.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/verification_summary.dart similarity index 100% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/widgets/verification_summary.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/identity-verification/widgets/verification_summary.dart diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/officer/officer_info_step.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/officer-information/officer_info_step.dart similarity index 95% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/officer/officer_info_step.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/officer-information/officer_info_step.dart index 2210ac4..40bde0b 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/officer/officer_info_step.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/officer-information/officer_info_step.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/basic/registration_form_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/officer-information/officer_info_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/main/registration_form_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/officer-information/officer_info_controller.dart'; import 'package:sigap/src/shared/widgets/form/form_section_header.dart'; import 'package:sigap/src/shared/widgets/text/custom_text_field.dart'; import 'package:sigap/src/utils/constants/sizes.dart'; @@ -26,7 +26,7 @@ class OfficerInfoStep extends StatelessWidget { title: 'Officer Information', subtitle: 'Please provide your officer details', ), - + const SizedBox(height: TSizes.spaceBtwItems), // NRP field diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/officer/unit_info_step.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/officer-information/unit_info_step.dart similarity index 96% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/officer/unit_info_step.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/officer-information/unit_info_step.dart index b633964..838ab91 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/officer/unit_info_step.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/officer-information/unit_info_step.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/basic/registration_form_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/officer-information/unit_info_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/main/registration_form_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/officer-information/unit_info_controller.dart'; import 'package:sigap/src/shared/widgets/dropdown/custom_dropdown.dart'; import 'package:sigap/src/shared/widgets/form/form_section_header.dart'; import 'package:sigap/src/shared/widgets/text/custom_text_field.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/personal_info_step.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/personal-information/personal_info_step.dart similarity index 97% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/personal_info_step.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/personal-information/personal_info_step.dart index df64159..7cf78fb 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/personal_info_step.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/personal-information/personal_info_step.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/basic/registration_form_controller.dart'; - -import 'package:sigap/src/features/auth/presentasion/controllers/signup/viewer-information/personal_info_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/main/registration_form_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/viewer-information/personal_info_controller.dart'; import 'package:sigap/src/shared/widgets/form/form_section_header.dart'; import 'package:sigap/src/shared/widgets/text/custom_text_field.dart'; import 'package:sigap/src/utils/constants/sizes.dart'; @@ -27,7 +26,7 @@ class PersonalInfoStep extends StatelessWidget { title: 'Personal Information', subtitle: 'Please provide your personal details', ), - + const SizedBox(height: TSizes.spaceBtwItems), // First Name field diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/liveness_detection_screen.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/liveness_detection_screen.dart similarity index 88% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/liveness_detection_screen.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/liveness_detection_screen.dart index 44b9a36..6855f60 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/liveness_detection_screen.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/liveness_detection_screen.dart @@ -2,15 +2,15 @@ import 'dart:developer' as dev; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/selfie_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/widgets/camera_preview_widget.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/widgets/captured_selfie_view.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/widgets/countdown_overlay_widget.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/widgets/debug_panel.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/widgets/error_state_widget.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/widgets/instruction_banner.dart'; -import 'package:sigap/src/features/auth/presentasion/pages/registration-form/basic/widgets/verification_progress_widget.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/selfie_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/camera_preview_widget.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/captured_selfie_view.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/countdown_overlay_widget.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/debug_panel.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/error_state_widget.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/instruction_banner.dart'; +import 'package:sigap/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/verification_progress_widget.dart'; import 'package:sigap/src/utils/constants/colors.dart'; class LivenessDetectionPage extends StatelessWidget { diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/selfie_verification_step.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/selfie_verification_step.dart similarity index 99% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/selfie_verification_step.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/selfie_verification_step.dart index 8972f57..a738dc3 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/selfie_verification_step.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/selfie_verification_step.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/basic/registration_form_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/facial_verification_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/selfie_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/main/registration_form_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/facial_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/selfie_verification_controller.dart'; import 'package:sigap/src/shared/widgets/image_upload/image_uploader.dart'; import 'package:sigap/src/shared/widgets/info/tips_container.dart'; import 'package:sigap/src/shared/widgets/verification/validation_message_card.dart'; diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/camera_preview_widget.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/camera_preview_widget.dart similarity index 99% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/camera_preview_widget.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/camera_preview_widget.dart index 7cac4c1..b92662c 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/camera_preview_widget.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/camera_preview_widget.dart @@ -1,7 +1,7 @@ import 'package:camera/camera.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart'; import 'package:sigap/src/utils/constants/colors.dart'; class CameraPreviewWidget extends StatelessWidget { diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/captured_selfie_view.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/captured_selfie_view.dart similarity index 98% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/captured_selfie_view.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/captured_selfie_view.dart index d5ed1f0..da454fb 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/captured_selfie_view.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/captured_selfie_view.dart @@ -3,8 +3,8 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/selfie_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/selfie_verification_controller.dart'; import 'package:sigap/src/utils/constants/colors.dart'; class CapturedSelfieView extends StatefulWidget { diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/countdown_overlay_widget.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/countdown_overlay_widget.dart similarity index 97% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/countdown_overlay_widget.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/countdown_overlay_widget.dart index 1cecddd..e205c8d 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/countdown_overlay_widget.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/countdown_overlay_widget.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart'; import 'package:sigap/src/utils/constants/colors.dart'; class CountdownOverlayWidget extends StatelessWidget { diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/debug_panel.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/debug_panel.dart similarity index 98% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/debug_panel.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/debug_panel.dart index 1f1d1fc..296900b 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/debug_panel.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/debug_panel.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/selfie_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/selfie_verification_controller.dart'; /// Shows the debug panel for liveness detection void showLivenessDebugPanel( diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/error_state_widget.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/error_state_widget.dart similarity index 97% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/error_state_widget.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/error_state_widget.dart index bf527ad..6592e55 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/error_state_widget.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/error_state_widget.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart'; import 'package:sigap/src/utils/constants/colors.dart'; class ErrorStateWidget extends StatelessWidget { diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/instruction_banner.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/instruction_banner.dart similarity index 97% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/instruction_banner.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/instruction_banner.dart index 29add4b..a0e1e09 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/instruction_banner.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/instruction_banner.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart'; import 'package:sigap/src/utils/constants/colors.dart'; class InstructionBanner extends StatelessWidget { diff --git a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/verification_progress_widget.dart b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/verification_progress_widget.dart similarity index 98% rename from sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/verification_progress_widget.dart rename to sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/verification_progress_widget.dart index 868050a..496e5b7 100644 --- a/sigap-mobile/lib/src/features/auth/presentasion/pages/registration-form/basic/widgets/verification_progress_widget.dart +++ b/sigap-mobile/lib/src/features/auth/presentasion/pages/signup/step/selfie-verification/widgets/verification_progress_widget.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart'; import 'package:sigap/src/utils/constants/colors.dart'; class VerificationProgressWidget extends StatelessWidget { diff --git a/sigap-mobile/lib/src/utils/debug/liveness_debug_utils.dart b/sigap-mobile/lib/src/utils/debug/liveness_debug_utils.dart index a22222b..f3e8fb8 100644 --- a/sigap-mobile/lib/src/utils/debug/liveness_debug_utils.dart +++ b/sigap-mobile/lib/src/utils/debug/liveness_debug_utils.dart @@ -2,8 +2,8 @@ import 'dart:developer' as dev; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/face_liveness_detection_controller.dart'; -import 'package:sigap/src/features/auth/presentasion/controllers/signup/selfie-verification/selfie_verification_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/face_liveness_detection_controller.dart'; +import 'package:sigap/src/features/auth/presentasion/controllers/signup/step/selfie-verification/selfie_verification_controller.dart'; /// Utility class for debugging the liveness detection and verification process class LivenessDebugUtils {