From b69a52a5a846722cce48071ab9d1514feb4392a8 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Tue, 18 Nov 2025 12:42:22 +0200 Subject: [PATCH] Mih File Structure enhancement --- Frontend/flutter_launcher_icons.yaml | 20 +- Frontend/lib/main.dart | 26 +- .../Example/package_test.dart | 196 ---- .../mih_delete_message.dart | 530 ---------- .../mih_error_message.dart | 909 ------------------ .../mih_success_message.dart | 150 --- .../mih_warning_message.dart | 519 ---------- Frontend/lib/mih_config/mih_go_router.dart | 6 +- Frontend/lib/mih_config/mih_theme.dart | 20 +- .../mih_objects/access_request.dart | 0 .../mih_objects/app_user.dart | 0 .../mih_objects/appointment.dart | 0 .../mih_objects/arguments.dart | 0 .../mih_objects/bookmarked_business.dart | 0 .../mih_objects/business.dart | 0 .../mih_objects/business_employee.dart | 0 .../mih_objects/business_review.dart | 0 .../mih_objects/business_user.dart | 0 .../mih_objects/claim_statement_file.dart | 0 .../mih_objects/currency.dart | 0 .../email_and_patient_screen_args.dart | 0 .../mih_objects/files.dart | 0 .../mih_objects/icd10_code.dart.dart | 0 .../mih_objects/loyalty_card.dart | 0 .../mih_objects/medicine.dart | 0 .../mih_objects/minesweeper_player_score.dart | 0 .../mih_objects/notes.dart | 0 .../mih_objects/notification.dart | 0 .../mih_objects/patient_access.dart | 0 .../mih_objects/patient_queue.dart | 0 .../mih_objects/patients.dart | 0 .../mih_objects/perscription.dart | 0 .../mih_objects/session_st.dart | 0 .../mih_objects/user_consent.dart | 0 .../Example/package_test.dart | 137 +++ .../package_tiles/test_package_tile.dart | 8 +- .../package_tools/package_tool_one.dart | 48 +- .../package_tools/package_tool_two.dart | 6 +- .../assets/fonts/Mih_Icons.ttf | Bin .../assets/fonts/icomoon_link.txt | 0 .../assets/fonts/style.css | 0 .../assets/images/app_icon/circle_logo.png | Bin .../assets/images/app_icon/mih_app_icon.png | Bin .../assets/images/app_icon/mih_logo_app.png | Bin .../images/app_icon/mih_logo_app_w4c.png | Bin .../assets/images/app_icon/mih_logo_web.png | Bin .../images/app_icon/mih_logo_web_w4c.png | Bin .../assets/images/founder.jpg | Bin .../assets/images/i-dont-know-dark.png | Bin .../assets/images/i-dont-know-light.png | Bin .../assets/images/logo_light.png | Bin .../loyalty_cards/mini/apple_tree-min.png | Bin .../images/loyalty_cards/mini/auchan-min.png | Bin .../loyalty_cards/mini/best_before-min.png | Bin .../loyalty_cards/mini/big_save-min.png | Bin .../images/loyalty_cards/mini/boxer-min.png | Bin .../images/loyalty_cards/mini/bp-min.png | Bin .../loyalty_cards/mini/builders-min.png | Bin .../loyalty_cards/mini/carrefour-min.png | Bin .../loyalty_cards/mini/checkers-min.png | Bin .../loyalty_cards/mini/choppies-min.png | Bin .../images/loyalty_cards/mini/clicks-min.png | Bin .../loyalty_cards/mini/continente-min.png | Bin .../loyalty_cards/mini/cotton_on-min.png | Bin .../images/loyalty_cards/mini/dischem-min.png | Bin .../images/loyalty_cards/mini/edgars-min.png | Bin .../images/loyalty_cards/mini/engen-min.png | Bin .../images/loyalty_cards/mini/eskom-min.png | Bin .../mini/exclusive_books-min.png | Bin .../loyalty_cards/mini/fresh_stop-min.png | Bin .../loyalty_cards/mini/fresmart-min.png | Bin .../loyalty_cards/mini/infinity-min.png | Bin .../images/loyalty_cards/mini/jet-min.png | Bin .../loyalty_cards/mini/justrite-min.png | Bin .../images/loyalty_cards/mini/kero-min.png | Bin .../loyalty_cards/mini/leroy_merlin-min.png | Bin .../images/loyalty_cards/mini/makro-min.png | Bin .../images/loyalty_cards/mini/naivas-min.png | Bin .../images/loyalty_cards/mini/ok_food-min.png | Bin .../loyalty_cards/mini/panarottis-min.png | Bin .../loyalty_cards/mini/pick_n_pay-min.png | Bin .../loyalty_cards/mini/plus_more-min.png | Bin .../images/loyalty_cards/mini/pna-min.png | Bin .../images/loyalty_cards/mini/pq-min.png | Bin .../images/loyalty_cards/mini/rage-min.png | Bin .../images/loyalty_cards/mini/sasol-min.png | Bin .../loyalty_cards/mini/sefalana-min.png | Bin .../images/loyalty_cards/mini/shell-min.png | Bin .../loyalty_cards/mini/shoprite-min.png | Bin .../mini/signature_cosmetics-min.png | Bin .../images/loyalty_cards/mini/spar-min.png | Bin .../images/loyalty_cards/mini/spur-min.png | Bin .../images/loyalty_cards/mini/tfg-min.png | Bin .../loyalty_cards/mini/total_energies-min.png | Bin .../images/loyalty_cards/mini/toysrus-min.png | Bin .../loyalty_cards/mini/woermann_brock-min.png | Bin .../loyalty_cards/mini/woolworths-min.png | Bin .../splash_screen/mih_branding_splash.png | Bin .../mih_branding_splash_temp.gif | Bin .../images/splash_screen/mih_image_splash.png | Bin .../mih_image_splash_android.png | Bin .../splash_screen/mih_image_splash_temp.gif | Bin .../mih_package_components/mih_banner_ad.dart | 2 +- .../mih_business_profile_preview.dart | 8 +- .../mih_package_components/mih_button.dart | 0 .../mih_package_components/mih_calendar.dart | 2 +- .../mih_circle_avatar.dart | 6 +- .../mih_date_field.dart | 0 .../mih_dropdwn_field.dart | 0 .../mih_floating_menu.dart | 0 .../mih_package_components/mih_form.dart | 0 .../mih_package_components/mih_icons.dart | 0 .../mih_image_display.dart | 0 .../mih_loading_circle.dart | 34 +- .../mih_notification_drawer.dart | 21 +- .../mih_notification_message.dart | 5 +- .../mih_numeric_stepper.dart | 2 +- .../mih_package_components/mih_package.dart | 4 +- .../mih_package_action.dart | 0 .../mih_package_alert.dart | 0 .../mih_package_tile.dart | 8 +- .../mih_package_tool_body.dart | 0 .../mih_package_tools.dart | 0 .../mih_package_window.dart | 6 +- .../mih_personal_profile_preview.dart | 6 +- .../mih_radio_options.dart | 0 .../mih_package_components/mih_scack_bar.dart | 0 .../mih_search_bar.dart | 0 .../mih_single_child_scroll.dart | 0 .../mih_text_form_field.dart | 0 .../mih_time_field.dart | 0 .../mih_package_components/mih_toggle.dart | 0 .../mih_yt_video_player.dart | 0 .../lib/mih_packages/about_mih/about_mih.dart | 8 +- .../policy_and_terms_text.dart | 2 +- .../package_tile/about_mih_tile.dart | 4 +- .../package_tools/mih_ attributes.dart | 8 +- .../about_mih/package_tools/mih_info.dart | 14 +- .../package_tools/mih_privacy_policy.dart | 6 +- .../package_tools/mih_terms_of_service.dart | 6 +- .../builder/build_access_request_list.dart | 99 +- .../builder/build_business_access_list.dart | 37 +- .../access_review/mih_access.dart | 12 +- .../package_tile/mih_access_tile.dart | 4 +- .../package_tools/mih_access_requests.dart | 14 +- .../calculator/mih_calculator.dart | 8 +- .../package_tiles/mih_calculator_tile.dart | 4 +- .../package_tools/currency_exchange_rate.dart | 21 +- .../calculator/package_tools/simple_calc.dart | 6 +- .../calculator/package_tools/tip_calc.dart | 20 +- .../builder/build_access_request_list.dart | 105 +- .../builder/build_appointment_list.dart | 85 +- .../calendar/builder/build_queue_list.dart | 41 +- .../calendar/mzansi_calendar.dart | 12 +- .../package_tiles/mzansi_calendar_tile.dart | 4 +- .../calendar/package_tools/appointments.dart | 55 +- .../mih_auth_forgot_password.dart | 6 +- .../mih_auth_password_reset.dart | 8 +- .../mih_authentication.dart | 10 +- .../package_tools/mih_forgot_password.dart | 26 +- .../package_tools/mih_register.dart | 79 +- .../package_tools/mih_reset_password.dart | 43 +- .../package_tools/mih_sign_in.dart | 43 +- .../components/mih_print_prevew.dart | 6 +- .../mih_file_viewer/mih_fle_viewer.dart | 8 +- .../package_tools/mih_expanded_file_view.dart | 6 +- .../mih_home/components/mih_app_drawer.dart | 28 +- .../lib/mih_packages/mih_home/mih_home.dart | 30 +- .../mih_packages/mih_home/mih_home_error.dart | 10 +- .../mih_home/mih_route_error.dart | 12 +- .../package_tools/mih_business_home.dart | 14 +- .../package_tools/mih_personal_home.dart | 20 +- .../build_minesweeper_leaderboard_list.dart | 6 +- .../builders/build_my_scoreboard_list.dart | 4 +- .../components/leaderboard_user_ranking.dart | 2 +- .../mih_mine_sweeper_start_game_window.dart | 10 +- .../mine_sweeper/components/mine_tile.dart | 2 +- .../mine_sweeper/mih_mine_sweeper.dart | 14 +- .../package_tiles/mih_mine_sweeper_tile.dart | 4 +- .../mih_mine_sweeper_leader_board.dart | 10 +- .../package_tools/mine_sweeper_game.dart | 20 +- .../mine_sweeper_quick_start_guide.dart | 4 +- .../package_tools/my_score_board.dart | 14 +- .../lib/mih_packages/mzansi_ai/mzansi_ai.dart | 12 +- .../package_tiles/mzansi_ai_tile.dart | 4 +- .../mzansi_ai/package_tools/ai_chat.dart | 20 +- .../mzansi_ai/package_tools/mih_ai_chat.dart | 8 +- .../build_business_search_resultsList.dart | 6 +- .../build_favourite_businesses_list.dart | 6 +- .../build_user_search_results_list.dart | 6 +- .../mzansi_directory/mzansi_directory.dart | 14 +- .../package_tiles/mzansi_directory_tile.dart | 4 +- .../package_tools/mih_contacts.dart | 6 +- .../mih_favourite_businesses.dart | 14 +- .../package_tools/mih_search_mzansi.dart | 22 +- .../builders/build_employee_list.dart | 4 +- .../builders/build_user_list.dart | 2 +- .../business_profile/busines_profile.dart | 10 +- .../components/mih_add_bookmark_alert.dart | 14 +- .../components/mih_add_employee_window.dart | 42 +- .../components/mih_business_info_card.dart | 14 +- .../components/mih_delete_bookmark_alert.dart | 14 +- .../mih_edit_employee_details_window.dart | 62 +- .../mih_review_business_window.dart | 29 +- .../mih_update_business_details_window.dart | 40 +- .../mzansi_business_profile_view.dart | 12 +- .../mzansi_set_up_business_profile.dart | 8 +- .../mzansi_business_profile_tile.dart | 4 +- .../mzansi_setup_business_profile_tile.dart | 6 +- .../package_tools/mih_business_details.dart | 10 +- .../mih_business_details_set_up.dart | 50 +- .../mih_business_details_view.dart | 10 +- .../package_tools/mih_business_qr_code.dart | 29 +- .../package_tools/mih_business_reviews.dart | 10 +- .../mih_business_user_search.dart | 12 +- .../package_tools/mih_my_business_team.dart | 10 +- .../package_tools/mih_my_business_user.dart | 39 +- .../mih_edit_personal_profile_window.dart | 44 +- .../personal_profile/mzansi_profile.dart | 10 +- .../personal_profile/mzansi_profile_view.dart | 6 +- .../package_tiles/mzansi_profile_tile.dart | 4 +- .../mzansi_setup_profile_tile.dart | 4 +- .../package_tools/mih_personal_profile.dart | 12 +- .../mih_personal_profile_view.dart | 10 +- .../package_tools/mih_personal_settings.dart | 10 +- .../builder/build_loyalty_card_list.dart | 102 +- .../components/mih_add_card_window.dart | 41 +- .../components/mih_barcode_scanner.dart | 2 +- .../components/mih_card_display.dart | 92 +- .../mzansi_wallet/mih_wallet.dart | 12 +- .../package_tiles/mih_wallet_tile.dart | 4 +- .../package_tools/mih_card_favourites.dart | 8 +- .../package_tools/mih_cards.dart | 28 +- .../build_mih_patient_search_list.dart | 29 +- .../build_my_patient_list_list.dart | 61 +- .../package_tiles/pat_manager_tile.dart | 6 +- .../package_tools/mih_patient_search.dart | 14 +- .../package_tools/my_patient_list.dart | 14 +- .../package_tools/waiting_room.dart | 57 +- .../pat_manager/pat_manager.dart | 14 +- .../components/claim_statement_window.dart | 33 +- .../components/icd10_search_window.dart | 6 +- .../components/medicine_search.dart | 19 +- .../mih_edit_patient_details_window.dart | 22 +- .../pat_profile/components/prescip_input.dart | 154 +-- .../build_claim_statement_files_list.dart | 111 ++- .../list_builders/build_file_view.dart | 4 +- .../list_builders/build_files_list.dart | 166 ++-- .../list_builders/build_icd10_code_list.dart | 2 +- .../list_builders/build_med_list.dart | 2 +- .../list_builders/build_notes_list.dart | 49 +- .../package_tiles/patient_profile_tile.dart | 6 +- .../patient_claim_or_statement.dart | 8 +- .../package_tools/patient_consultation.dart | 138 ++- .../package_tools/patient_documents.dart | 52 +- .../package_tools/patient_info.dart | 16 +- .../package_tools/patient_setup_form.dart | 28 +- .../pat_profile/patient_profile.dart | 12 +- .../pat_profile/patient_set_up.dart | 8 +- .../mih_providers/about_mih_provider.dart | 0 .../mih_access_controlls_provider.dart | 2 +- .../mih_authentication_provider.dart | 0 .../mih_providers/mih_banner_ad_provider.dart | 0 .../mih_calculator_provider.dart | 0 .../mih_providers/mih_calendar_provider.dart | 2 +- .../mih_file_viewer_provider.dart | 0 .../mih_mine_sweeper_provider.dart | 2 +- .../mih_providers/mzansi_ai_provider.dart | 4 +- .../mzansi_directory_provider.dart | 6 +- .../mzansi_profile_provider.dart | 10 +- .../mih_providers/mzansi_wallet_provider.dart | 2 +- .../mih_providers/ollama_provider.dart | 0 .../patient_manager_provider.dart | 10 +- .../mih_access_controls_services.dart | 27 +- .../lib/mih_services/mih_alert_services.dart | 752 ++++++++++++++- .../mih_authentication_services.dart | 163 ++-- .../mih_business_details_services.dart | 16 +- .../mih_business_employee_services.dart | 8 +- ...h_claim_statement_generation_services.dart | 99 +- .../mih_currency_exchange_rate_services.dart | 4 +- .../mih_data_helper_services.dart | 6 +- .../lib/mih_services/mih_file_services.dart | 79 +- .../mih_services/mih_icd10_code_services.dart | 4 +- .../mih_services/mih_location_services.dart | 17 +- .../mih_minesweeper_services.dart | 6 +- .../mih_my_business_user_services.dart | 21 +- .../mih_mzansi_calendar_services.dart | 91 +- .../mih_mzansi_directory_services.dart | 6 +- .../mih_mzansi_wallet_services.dart | 87 +- .../mih_notification_services.dart | 92 +- .../mih_services/mih_patient_services.dart | 12 +- .../mih_user_consent_services.dart | 4 +- .../lib/mih_services/mih_user_services.dart | 31 +- Frontend/pubspec.yaml | 26 +- 294 files changed, 2782 insertions(+), 4473 deletions(-) delete mode 100644 Frontend/lib/mih_components/mih_package_components/Example/package_test.dart delete mode 100644 Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart delete mode 100644 Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart delete mode 100644 Frontend/lib/mih_components/mih_pop_up_messages/mih_success_message.dart delete mode 100644 Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart rename Frontend/lib/{mih_components => }/mih_objects/access_request.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/app_user.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/appointment.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/arguments.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/bookmarked_business.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/business.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/business_employee.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/business_review.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/business_user.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/claim_statement_file.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/currency.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/email_and_patient_screen_args.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/files.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/icd10_code.dart.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/loyalty_card.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/medicine.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/minesweeper_player_score.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/notes.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/notification.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/patient_access.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/patient_queue.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/patients.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/perscription.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/session_st.dart (100%) rename Frontend/lib/{mih_components => }/mih_objects/user_consent.dart (100%) create mode 100644 Frontend/lib/mih_package_components/Example/package_test.dart rename Frontend/lib/{mih_components => }/mih_package_components/Example/package_tiles/test_package_tile.dart (82%) rename Frontend/lib/{mih_components => }/mih_package_components/Example/package_tools/package_tool_one.dart (94%) rename Frontend/lib/{mih_components => }/mih_package_components/Example/package_tools/package_tool_two.dart (86%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/fonts/Mih_Icons.ttf (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/fonts/icomoon_link.txt (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/fonts/style.css (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/app_icon/circle_logo.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/app_icon/mih_app_icon.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/app_icon/mih_logo_app.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/app_icon/mih_logo_web.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/app_icon/mih_logo_web_w4c.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/founder.jpg (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/i-dont-know-dark.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/i-dont-know-light.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/logo_light.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/apple_tree-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/auchan-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/best_before-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/big_save-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/boxer-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/bp-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/builders-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/carrefour-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/checkers-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/choppies-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/clicks-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/continente-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/cotton_on-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/dischem-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/edgars-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/engen-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/eskom-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/exclusive_books-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/fresh_stop-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/fresmart-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/infinity-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/jet-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/justrite-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/kero-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/leroy_merlin-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/makro-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/naivas-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/ok_food-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/panarottis-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/pick_n_pay-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/plus_more-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/pna-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/pq-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/rage-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/sasol-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/sefalana-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/shell-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/shoprite-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/signature_cosmetics-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/spar-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/spur-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/tfg-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/total_energies-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/toysrus-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/woermann_brock-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/loyalty_cards/mini/woolworths-min.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/splash_screen/mih_branding_splash.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/splash_screen/mih_branding_splash_temp.gif (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/splash_screen/mih_image_splash.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/splash_screen/mih_image_splash_android.png (100%) rename Frontend/lib/{mih_components => }/mih_package_components/assets/images/splash_screen/mih_image_splash_temp.gif (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_banner_ad.dart (94%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_business_profile_preview.dart (92%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_button.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_calendar.dart (97%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_circle_avatar.dart (94%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_date_field.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_dropdwn_field.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_floating_menu.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_form.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_icons.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_image_display.dart (100%) rename Frontend/lib/{mih_components/mih_pop_up_messages => mih_package_components}/mih_loading_circle.dart (79%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_notification_drawer.dart (93%) rename Frontend/lib/{mih_components/mih_pop_up_messages => mih_package_components}/mih_notification_message.dart (97%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_numeric_stepper.dart (98%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_package.dart (97%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_package_action.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_package_alert.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_package_tile.dart (94%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_package_tool_body.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_package_tools.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_package_window.dart (95%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_personal_profile_preview.dart (92%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_radio_options.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_scack_bar.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_search_bar.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_single_child_scroll.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_text_form_field.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_time_field.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_toggle.dart (100%) rename Frontend/lib/{mih_components => }/mih_package_components/mih_yt_video_player.dart (100%) rename Frontend/lib/{mih_components => }/mih_providers/about_mih_provider.dart (100%) rename Frontend/lib/{mih_components => }/mih_providers/mih_access_controlls_provider.dart (90%) rename Frontend/lib/{mih_components => }/mih_providers/mih_authentication_provider.dart (100%) rename Frontend/lib/{mih_components => }/mih_providers/mih_banner_ad_provider.dart (100%) rename Frontend/lib/{mih_components => }/mih_providers/mih_calculator_provider.dart (100%) rename Frontend/lib/{mih_components => }/mih_providers/mih_calendar_provider.dart (96%) rename Frontend/lib/{mih_components => }/mih_providers/mih_file_viewer_provider.dart (100%) rename Frontend/lib/{mih_components => }/mih_providers/mih_mine_sweeper_provider.dart (94%) rename Frontend/lib/{mih_components => }/mih_providers/mzansi_ai_provider.dart (98%) rename Frontend/lib/{mih_components => }/mih_providers/mzansi_directory_provider.dart (90%) rename Frontend/lib/{mih_components => }/mih_providers/mzansi_profile_provider.dart (89%) rename Frontend/lib/{mih_components => }/mih_providers/mzansi_wallet_provider.dart (93%) rename Frontend/lib/{mih_components => }/mih_providers/ollama_provider.dart (100%) rename Frontend/lib/{mih_components => }/mih_providers/patient_manager_provider.dart (86%) diff --git a/Frontend/flutter_launcher_icons.yaml b/Frontend/flutter_launcher_icons.yaml index f9524c8e..8d972e9f 100644 --- a/Frontend/flutter_launcher_icons.yaml +++ b/Frontend/flutter_launcher_icons.yaml @@ -1,46 +1,46 @@ # flutter pub run flutter_launcher_icons flutter_launcher_icons: # Original - # image_path: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_app.png" + # image_path: "lib/mih_package_components/assets/images/app_icon/mih_logo_app.png" # Women For Change - image_path: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png" + image_path: "lib/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png" android: "launcher_icon" min_sdk_android: 21 # android min sdk min:16, default 21 # Original # adaptive_icon_background: "#3A4454" - # adaptive_icon_foreground: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_app.png" + # adaptive_icon_foreground: "lib/mih_package_components/assets/images/app_icon/mih_logo_app.png" # Women For Change adaptive_icon_background: "#6641b2" - adaptive_icon_foreground: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png" + adaptive_icon_foreground: "lib/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png" ios: true # Original - # image_path_ios: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_app.png" + # image_path_ios: "lib/mih_package_components/assets/images/app_icon/mih_logo_app.png" # Women For Change - image_path_ios: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png" + image_path_ios: "lib/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png" remove_alpha_channel_ios: true web: generate: true # Original - # image_path: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_web.png" + # image_path: "lib/mih_package_components/assets/images/app_icon/mih_logo_web.png" # background_color: "#3A4454" # theme_color: "#3A4454" # Women For Change - image_path: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_web_w4c.png" + image_path: "lib/mih_package_components/assets/images/app_icon/mih_logo_web_w4c.png" background_color: "#6641b2" theme_color: "#6641b2" windows: generate: true - image_path: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_web.png" + image_path: "lib/mih_package_components/assets/images/app_icon/mih_logo_web.png" icon_size: 48 # min:48, max:256, default: 48 macos: generate: true - image_path: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_web.png" + image_path: "lib/mih_package_components/assets/images/app_icon/mih_logo_web.png" diff --git a/Frontend/lib/main.dart b/Frontend/lib/main.dart index 17470637..d7c10422 100644 --- a/Frontend/lib/main.dart +++ b/Frontend/lib/main.dart @@ -2,19 +2,19 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/about_mih_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_access_controlls_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_authentication_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_banner_ad_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calculator_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calendar_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_file_viewer_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_ai_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_wallet_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/about_mih_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_access_controlls_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_authentication_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_banner_ad_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calculator_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calendar_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_file_viewer_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_ai_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:provider/provider.dart'; import 'package:quick_actions/quick_actions.dart'; import 'package:upgrader/upgrader.dart'; diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart b/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart deleted file mode 100644 index e73525b4..00000000 --- a/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart +++ /dev/null @@ -1,196 +0,0 @@ -import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/Example/package_tools/package_tool_two.dart'; -import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; -import 'package:mzansi_innovation_hub/mih_services/mih_data_helper_services.dart'; -import 'package:provider/provider.dart'; - -class PackageTest extends StatefulWidget { - const PackageTest({ - super.key, - }); - - @override - State createState() => _PackageTestState(); -} - -class _PackageTestState extends State { - int _selcetedIndex = 0; - bool _isLoadingInitialData = true; - - Future _loadInitialData() async { - setState(() { - _isLoadingInitialData = true; - }); - MzansiProfileProvider mzansiProfileProvider = - context.read(); - await MihDataHelperServices().loadUserDataWithBusinessesData( - mzansiProfileProvider, - ); - setState(() { - _isLoadingInitialData = false; - }); - } - - MihPackageAction getAction() { - return MihPackageAction( - icon: const Icon(Icons.arrow_back), - iconSize: 35, - onTap: () { - context.goNamed( - 'mihHome', - extra: true, - ); - FocusScope.of(context).unfocus(); - // Navigator.of(context).pop(); - // Navigator.of(context).popAndPushNamed( - // '/', - // arguments: AuthArguments(true, false), - // ); - }, - ); - } - - MihPackageTools getTools() { - Map temp = Map(); - temp[const Icon(Icons.inbox)] = () { - setState(() { - _selcetedIndex = 0; - }); - }; - temp[const Icon(Icons.outbond)] = () { - setState(() { - _selcetedIndex = 1; - }); - }; - return MihPackageTools( - tools: temp, - selcetedIndex: _selcetedIndex, - ); - } - - void showAlert() { - showDialog( - context: context, - builder: (context) { - return MihPackageAlert( - alertIcon: Icon( - Icons.warning_amber_rounded, - size: 100, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - alertTitle: "Oops! Looks like some fields are missing.", - alertBody: Column( - children: [ - Text( - "We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: 15, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 25), - RichText( - text: TextSpan( - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: 15, - fontWeight: FontWeight.bold, - ), - children: [ - TextSpan( - text: "Here's a quick tip: ", - style: TextStyle( - fontStyle: FontStyle.italic, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == - "Dark"))), - const TextSpan(text: "Look for fields with an asterisk ("), - TextSpan( - text: "*", - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == - "Dark"))), - const TextSpan( - text: ") next to them, as these are mandatory."), - ], - ), - ), - ], - ), - alertColour: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ); - }, - ); - } - - List getToolBody() { - MzansiProfileProvider profileProvider = - context.read(); - List toolBodies = [ - PackageToolOne( - user: profileProvider.user!, - business: profileProvider.business, - ), - const PackageToolTwo(), - ]; - return toolBodies; - } - - List getToolTitle() { - List toolTitles = [ - "Tool One", - "Tool Two", - ]; - return toolTitles; - } - - @override - void initState() { - super.initState(); - _loadInitialData(); - } - - @override - Widget build(BuildContext context) { - return Consumer( - builder: - (BuildContext context, MzansiProfileProvider value, Widget? child) { - if (_isLoadingInitialData) { - return Scaffold( - body: Center( - child: Mihloadingcircle(), - ), - ); - } - return MihPackage( - appActionButton: getAction(), - appTools: getTools(), - appBody: getToolBody(), - appToolTitles: getToolTitle(), - selectedbodyIndex: _selcetedIndex, - onIndexChange: (newValue) { - setState(() { - _selcetedIndex = newValue; - }); - print("Index: $_selcetedIndex"); - }, - ); - }, - ); - } -} diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart deleted file mode 100644 index c3f4abba..00000000 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart +++ /dev/null @@ -1,530 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; -import '../../main.dart'; - -class MIHDeleteMessage extends StatefulWidget { - final String deleteType; - final void Function() onTap; - const MIHDeleteMessage({ - super.key, - required this.deleteType, - required this.onTap, - }); - - @override - State createState() => _MIHDeleteMessageState(); -} - -class _MIHDeleteMessageState extends State { - var messageTypes = {}; - late double popUpWidth; - late double? popUpheight; - late double popUpTitleSize; - late double popUpSubtitleSize; - late double popUpBodySize; - late double popUpIconSize; - late double popUpPaddingSize; - late double width; - late double height; - - void checkScreenSize() { - if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { - setState(() { - popUpWidth = (width / 4) * 2; - popUpheight = null; - popUpTitleSize = 25.0; - popUpSubtitleSize = 20.0; - popUpBodySize = 15; - popUpPaddingSize = 25.0; - popUpIconSize = 100; - }); - } else { - setState(() { - popUpWidth = width - (width * 0.1); - popUpheight = null; - popUpTitleSize = 20.0; - popUpSubtitleSize = 18.0; - popUpBodySize = 15; - popUpPaddingSize = 15.0; - popUpIconSize = 100; - }); - } - } - - void setDeleteNote() { - messageTypes["Note"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Are you sure you want to delete this?", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "This note will be deleted permanently. Are you certain you want to delete it?", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - MihButton( - onPressed: widget.onTap, - buttonColor: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 300, - child: Text( - "Delete", - style: TextStyle( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == - "Dark"), - fontSize: 20, - fontWeight: FontWeight.bold, - ), - ), - ), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setFileNote() { - messageTypes["File"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Are you sure you want to delete this?", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "This file will be deleted permanently. Are you certain you want to delete it?", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - MihButton( - onPressed: widget.onTap, - buttonColor: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 300, - child: Text( - "Delete", - style: TextStyle( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == - "Dark"), - fontSize: 20, - fontWeight: FontWeight.bold, - ), - ), - ), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setDeleteEmployee() { - messageTypes["Employee"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Are you sure you want to delete this?", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "This team member will be deleted permanently from the business profile. Are you certain you want to delete it?", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - - MihButton( - onPressed: widget.onTap, - buttonColor: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 300, - child: Text( - "Delete", - style: TextStyle( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == - "Dark"), - fontSize: 20, - fontWeight: FontWeight.bold, - ), - ), - ), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setDeleteAppointment() { - messageTypes["Appointment"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Are you sure you want to delete this?", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "This appointment will be deleted permanently from your calendar. Are you certain you want to delete it?", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - MihButton( - onPressed: widget.onTap, - buttonColor: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 300, - child: Text( - "Delete", - style: TextStyle( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == - "Dark"), - fontSize: 20, - fontWeight: FontWeight.bold, - ), - ), - ), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setDeleteLoyaltyCard() { - messageTypes["Loyalty Card"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Are you sure you want to delete this?", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "This Card will be deleted permanently from your Mzansi Wallet. Are you certain you want to delete it?", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - MihButton( - onPressed: widget.onTap, - buttonColor: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 300, - child: Text( - "Delete", - style: TextStyle( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == - "Dark"), - fontSize: 20, - fontWeight: FontWeight.bold, - ), - ), - ), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - Widget? getDeleteMessage(String type) { - return messageTypes[type]; - } - - @override - void dispose() { - super.dispose(); - } - - @override - Widget build(BuildContext context) { - var size = MediaQuery.of(context).size; - setState(() { - width = size.width; - height = size.height; - }); - checkScreenSize(); - setDeleteNote(); - setFileNote(); - setDeleteEmployee(); - setDeleteAppointment(); - setDeleteLoyaltyCard(); - //print(size); - // setState(() { - // width = size.width; - // height = size.height; - // }); - return Dialog(child: getDeleteMessage(widget.deleteType)); - } -} diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart deleted file mode 100644 index 933a69ef..00000000 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart +++ /dev/null @@ -1,909 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; -import '../../main.dart'; - -class MIHErrorMessage extends StatefulWidget { - final String errorType; - const MIHErrorMessage({ - super.key, - required this.errorType, - }); - - @override - State createState() => _MIHErrorMessageState(); -} - -class _MIHErrorMessageState extends State { - var messageTypes = {}; - late double popUpWidth; - late double? popUpheight; - late double popUpTitleSize; - late double popUpSubtitleSize; - late double popUpBodySize; - late double popUpIconSize; - late double popUpPaddingSize; - Size? size; - - void checkScreenSize() { - if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { - setState(() { - popUpWidth = (size!.width / 4) * 2; - popUpheight = null; - popUpTitleSize = 25.0; - popUpSubtitleSize = 20.0; - popUpBodySize = 15; - popUpPaddingSize = 25.0; - popUpIconSize = 100; - }); - } else { - setState(() { - popUpWidth = size!.width - (size!.width * 0.1); - popUpheight = null; - popUpTitleSize = 20.0; - popUpSubtitleSize = 18.0; - popUpBodySize = 15; - popUpPaddingSize = 15.0; - popUpIconSize = 100; - }); - } - } - - void setInputError() { - messageTypes["Input Error"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 5), - Text( - "Oops! Looks like some fields are missing.", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 25), - RichText( - text: TextSpan( - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == - "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - children: [ - TextSpan( - text: "Here's a quick tip: ", - style: TextStyle( - fontStyle: FontStyle.italic, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == - "Dark"))), - const TextSpan( - text: "Look for fields with an asterisk ("), - TextSpan( - text: "*", - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == - "Dark"))), - const TextSpan( - text: ") next to them, as these are mandatory."), - ], - ), - ), - const SizedBox(height: 10), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setPasswordRequirementsError() { - messageTypes["Password Requirements"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Password Doesn't Meet Requirements", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "Oops! Your password doesn't quite meet our standards. To keep your account secure, please make sure your password meets the following requirements", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 25), - RichText( - text: TextSpan( - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == - "Dark"), - fontSize: 15.0, - fontWeight: FontWeight.bold, - ), - children: [ - TextSpan( - text: "Requirements:\n", - style: TextStyle( - fontStyle: FontStyle.italic, - fontSize: popUpBodySize, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == - "Dark"))), - const TextSpan( - text: "1) Contailes at least 8 characters\n", - ), - const TextSpan( - text: "2) Contains at least 1 uppercase letter (A-Z)\n", - ), - const TextSpan( - text: "3) Contains at least 1 lowercase letter (a-z)\n", - ), - const TextSpan( - text: "4) Contains at least 1 number (0-9)\n", - ), - const TextSpan( - text: - "5) Contains at least 1 special character (!@#\$%^&*)\n", - ), - ], - ), - ), - const SizedBox(height: 10), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setInvalidUsernameError() { - messageTypes["Invalid Username"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Let's Fix That Username", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "Let's create a great username for you! Just a few quick tips:\n• Your username should start with a letter.\n• You can use letters, numbers, and/ or underscores.\n• Keep it between 6 and 20 characters.\n• Avoid special characters like @, #, or \$.\"", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 25), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setInvalidEmailError() { - messageTypes["Invalid Email"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Oops! Invalid Email", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "Looks like there's a little hiccup with that email address. Please double-check that you've entered it correctly, including the \"@\" symbol and a domain (like example@email.com).", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 25), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setUserExistsError() { - messageTypes["User Exists"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //SizedBox(height: 15), - Text( - "Email Already Exists", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "An account is already registered with this email address. Please try logging in or use a different email.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 10), - Text( - "Here are some things to keep in mind:", - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpSubtitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 10), - Text( - "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.", - textAlign: TextAlign.left, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: 15.0, - fontWeight: FontWeight.bold, - ), - ), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setPwdMatchError() { - messageTypes["Password Match"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //SizedBox(height: 15), - Text( - "Passwords Don't Match", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "The password and confirm password fields do not match. Please make sure they are identical.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 10), - Text( - "Here are some things to keep in mind:", - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpSubtitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 10), - Text( - "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.", - textAlign: TextAlign.left, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 10), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setinvalidCredError() { - messageTypes["Invalid Credentials"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //SizedBox(height: 15), - Text( - "Uh oh! Login attempt unsuccessful.", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "The email address or password you entered doesn't seem to match our records. Please double-check your information and try again.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 10), - Text( - "Here are some things to keep in mind:", - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpSubtitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 10), - Text( - "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.", - textAlign: TextAlign.left, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 10), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setInternetError() { - messageTypes["Internet Connection"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Internet Connection Lost!", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "We seem to be having some trouble connecting you to the internet. This could be due to a temporary outage or an issue with your device's connection.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 10), - Text( - "Here are a few things you can try:", - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpSubtitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 10), - Text( - "1) Check your Wi-Fi signal strength or try connecting to a different network.\n2) Restart your device (computer, phone, etc.) and your router/modem.\n3) If you're using cellular data, ensure you have a strong signal and haven't reached your data limit.", - textAlign: TextAlign.left, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 10), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setLocationError() { - messageTypes["Location Denied"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Location Services Not Enabled", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "To get the most out of MIH, we need your location. Please go to the site settings of the app and enable location services. Once you do that, we can start showing you relevant information based on your location.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - // const SizedBox(height: 15), - // Text( - // "Here are a few things you can try:", - // style: TextStyle( - // color: MihColors.getRedColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - // fontSize: popUpSubtitleSize, - // fontWeight: FontWeight.bold, - // ), - // ), - // const SizedBox(height: 10), - // Text( - // "1) Check your Wi-Fi signal strength or try connecting to a different network.\n2) Restart your device (computer, phone, etc.) and your router/modem.\n3) If you're using cellular data, ensure you have a strong signal and haven't reached your data limit.", - // textAlign: TextAlign.left, - // style: TextStyle( - // color: - // MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - // fontSize: popUpBodySize, - // fontWeight: FontWeight.bold, - // ), - // ), - const SizedBox(height: 10), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - Widget? getErrorMessage(String type) { - return messageTypes[type]; - } - - @override - void dispose() { - super.dispose(); - } - - @override - Widget build(BuildContext context) { - size = MediaQuery.of(context).size; - checkScreenSize(); - setInputError(); - setinvalidCredError(); - setInternetError(); - setUserExistsError(); - setPwdMatchError(); - setPasswordRequirementsError(); - setInvalidEmailError(); - setInvalidUsernameError(); - setLocationError(); - //print(size); - // setState(() { - // width = size.width; - // height = size.height; - // }); - return Dialog(child: getErrorMessage(widget.errorType)); - } -} diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_success_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_success_message.dart deleted file mode 100644 index d91a2fc8..00000000 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_success_message.dart +++ /dev/null @@ -1,150 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; -import '../../main.dart'; - -class MIHSuccessMessage extends StatefulWidget { - final String successType; - final String successMessage; - const MIHSuccessMessage({ - super.key, - required this.successType, - required this.successMessage, - }); - - @override - State createState() => _MIHSuccessMessageState(); -} - -class _MIHSuccessMessageState extends State { - var messageTypes = {}; - late String message; - late double popUpWidth; - late double? popUpheight; - late double popUpTitleSize; - late double popUpSubtitleSize; - late double popUpBodySize; - late double popUpIconSize; - late double popUpPaddingSize; - late Size? size; - - void checkScreenSize() { - if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { - setState(() { - popUpWidth = (size!.width / 4) * 2; - popUpheight = null; - popUpTitleSize = 25.0; - popUpSubtitleSize = 20.0; - popUpBodySize = 15; - popUpPaddingSize = 25.0; - popUpIconSize = 100; - }); - } else { - setState(() { - popUpWidth = size!.width - (size!.width * 0.1); - popUpheight = null; - popUpTitleSize = 20.0; - popUpSubtitleSize = 18.0; - popUpBodySize = 15; - popUpPaddingSize = 15.0; - popUpIconSize = 100; - }); - } - } - - void setSuccessmessage() { - messageTypes["Success"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getGreenColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.check_circle_outline_rounded, - size: popUpIconSize, - color: MihColors.getGreenColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Success!", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getGreenColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Center( - child: Text( - message, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - ), - const SizedBox(height: 15), - MihButton( - onPressed: () { - Navigator.pop(context); - }, - buttonColor: MihColors.getGreenColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 300, - child: Text( - "Dismiss", - style: TextStyle( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: 20, - fontWeight: FontWeight.bold, - ), - ), - ), - ], - ), - ), - ], - ); - } - - Widget? getSuccessMessage(String type) { - return messageTypes[type]; - } - - @override - void dispose() { - super.dispose(); - } - - @override - void initState() { - super.initState(); - } - - @override - Widget build(BuildContext context) { - size = MediaQuery.of(context).size; - checkScreenSize(); - message = widget.successMessage; - setSuccessmessage(); - return Dialog(child: getSuccessMessage(widget.successType)); - } -} diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart deleted file mode 100644 index 356d0f5e..00000000 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart +++ /dev/null @@ -1,519 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; -import '../../main.dart'; - -class MIHWarningMessage extends StatefulWidget { - final String warningType; - const MIHWarningMessage({ - super.key, - required this.warningType, - }); - - @override - State createState() => _MIHDeleteMessageState(); -} - -class _MIHDeleteMessageState extends State { - var messageTypes = {}; - late double popUpWidth; - late double? popUpheight; - late double popUpTitleSize; - late double popUpSubtitleSize; - late double popUpBodySize; - late double popUpIconSize; - late double popUpPaddingSize; - late double width; - late double height; - - void checkScreenSize() { - if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { - setState(() { - popUpWidth = (width / 4) * 2; - popUpheight = null; - popUpTitleSize = 25.0; - popUpSubtitleSize = 20.0; - popUpBodySize = 15; - popUpPaddingSize = 25.0; - popUpIconSize = 100; - }); - } else { - setState(() { - popUpWidth = width - (width * 0.1); - popUpheight = null; - popUpTitleSize = 20.0; - popUpSubtitleSize = 18.0; - popUpBodySize = 15; - popUpPaddingSize = 15.0; - popUpIconSize = 100; - }); - } - } - - void setNoAccess() { - messageTypes["No Access"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Access Pending", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "Your access request is currently being reviewed.\nOnce approved, you'll be able to view patient data.\nPlease follow up with the patient to approve your access request.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setNoPatientAccess() { - messageTypes["No Patient Access"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Patient Profile Access Needed", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "To proceed with booking an appointment, you must have access to the patient's profile. This will allow you to view their medical history and other relevant information. Please contact the appropriate administrator to request access.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setAppointmentCanelled() { - messageTypes["Appointment Canelled"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Appointment Cancelled", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "This appointment has been canceled. As a result, you no longer have access to the patient's profile. If you would like to view the patient's profile again, please book a new appointment.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setAccessCanelled() { - messageTypes["Access Cancelled"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Access Cancelled", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "This appointment has been canceled. As a result, access has been cancelled and the doctor no longer have access to the patient's profile. If you would like them to view the patient's profile again, please book a new appointment through them.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setAccessDeclined() { - messageTypes["Access Declined"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Access Declined", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "Your request to access the patient's profile has been denied. Please contact the patient directly to inquire about the reason for this restriction.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - void setExpiredAccess() { - messageTypes["Expired Access"] = Stack( - children: [ - Container( - padding: EdgeInsets.all(popUpPaddingSize), - width: popUpWidth, - height: popUpheight, - decoration: BoxDecoration( - color: MihColors.getPrimaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - width: 5.0), - ), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.warning_amber_rounded, - size: popUpIconSize, - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - //const SizedBox(height: 15), - Text( - "Access Expired", - textAlign: TextAlign.center, - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpTitleSize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - Text( - "You no longer have access to this patient profile. The authorized access period has ended. Access to a patients profile is limited to 7 days from appointment date.", - style: TextStyle( - color: MihColors.getSecondaryColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: popUpBodySize, - fontWeight: FontWeight.bold, - ), - ), - const SizedBox(height: 15), - ], - ), - ), - ), - Positioned( - top: 5, - right: 5, - width: 50, - height: 50, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Icon( - Icons.close, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - size: 35, - ), - ), - ), - ], - ); - } - - Widget? getDeleteMessage(String type) { - return messageTypes[type]; - } - - @override - void dispose() { - super.dispose(); - } - - @override - Widget build(BuildContext context) { - var size = MediaQuery.of(context).size; - setState(() { - width = size.width; - height = size.height; - }); - checkScreenSize(); - setNoAccess(); - setExpiredAccess(); - setAccessDeclined(); - setAppointmentCanelled(); - setAccessCanelled(); - //print(size); - // setState(() { - // width = size.width; - // height = size.height; - // }); - return Dialog(child: getDeleteMessage(widget.warningType)); - } -} diff --git a/Frontend/lib/mih_config/mih_go_router.dart b/Frontend/lib/mih_config/mih_go_router.dart index ea306bdd..f23dbfcf 100644 --- a/Frontend/lib/mih_config/mih_go_router.dart +++ b/Frontend/lib/mih_config/mih_go_router.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_file_viewer/components/mih_print_prevew.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/Example/package_test.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/Example/package_test.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/about_mih/about_mih.dart'; import 'package:mzansi_innovation_hub/mih_packages/access_review/mih_access.dart'; import 'package:mzansi_innovation_hub/mih_packages/calculator/mih_calculator.dart'; diff --git a/Frontend/lib/mih_config/mih_theme.dart b/Frontend/lib/mih_config/mih_theme.dart index f6fa2ac3..ca2b5a6a 100644 --- a/Frontend/lib/mih_config/mih_theme.dart +++ b/Frontend/lib/mih_config/mih_theme.dart @@ -236,11 +236,11 @@ class MihTheme { // AssetImage loadingImage() { // if (mode == "Dark") { // loading = const AssetImage( - // 'lib/mih_components/mih_package_components/assets/images/loading_light.gif', + // 'lib/mih_package_components/assets/images/loading_light.gif', // ); // } else { // loading = const AssetImage( - // 'lib/mih_components/mih_package_components/assets/images/loading_dark.gif', + // 'lib/mih_package_components/assets/images/loading_dark.gif', // ); // } // return loading; @@ -249,11 +249,11 @@ class MihTheme { // AssetImage altLoadingImage() { // if (mode == "Dark") { // loading = const AssetImage( - // 'lib/mih_components/mih_package_components/assets/images/loading_dark.gif', + // 'lib/mih_package_components/assets/images/loading_dark.gif', // ); // } else { // loading = const AssetImage( - // 'lib/mih_components/mih_package_components/assets/images/loading_light.gif', + // 'lib/mih_package_components/assets/images/loading_light.gif', // ); // } // return loading; @@ -262,10 +262,10 @@ class MihTheme { // String loadingImageLocation() { // if (mode == "Dark") { // loadingAssetText = - // 'lib/mih_components/mih_package_components/assets/images/loading_light.gif'; + // 'lib/mih_package_components/assets/images/loading_light.gif'; // } else { // loadingAssetText = - // 'lib/mih_components/mih_package_components/assets/images/loading_dark.gif'; + // 'lib/mih_package_components/assets/images/loading_dark.gif'; // } // return loadingAssetText; // } @@ -273,10 +273,10 @@ class MihTheme { // String altLoadingImageLocation() { // if (mode == "Dark") { // loadingAssetText = - // 'lib/mih_components/mih_package_components/assets/images/loading_dark.gif'; + // 'lib/mih_package_components/assets/images/loading_dark.gif'; // } else { // loadingAssetText = - // 'lib/mih_components/mih_package_components/assets/images/loading_light.gif'; + // 'lib/mih_package_components/assets/images/loading_light.gif'; // } // return loadingAssetText; // } @@ -284,11 +284,11 @@ class MihTheme { // AssetImage aiLogoImage() { // if (mode == "Dark") { // return const AssetImage( - // 'lib/mih_components/mih_package_components/assets/images/mzansi_ai-dark.png', + // 'lib/mih_package_components/assets/images/mzansi_ai-dark.png', // ); // } else { // return const AssetImage( - // 'lib/mih_components/mih_package_components/assets/images/mzansi_ai-light.png', + // 'lib/mih_package_components/assets/images/mzansi_ai-light.png', // ); // } // } diff --git a/Frontend/lib/mih_components/mih_objects/access_request.dart b/Frontend/lib/mih_objects/access_request.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/access_request.dart rename to Frontend/lib/mih_objects/access_request.dart diff --git a/Frontend/lib/mih_components/mih_objects/app_user.dart b/Frontend/lib/mih_objects/app_user.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/app_user.dart rename to Frontend/lib/mih_objects/app_user.dart diff --git a/Frontend/lib/mih_components/mih_objects/appointment.dart b/Frontend/lib/mih_objects/appointment.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/appointment.dart rename to Frontend/lib/mih_objects/appointment.dart diff --git a/Frontend/lib/mih_components/mih_objects/arguments.dart b/Frontend/lib/mih_objects/arguments.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/arguments.dart rename to Frontend/lib/mih_objects/arguments.dart diff --git a/Frontend/lib/mih_components/mih_objects/bookmarked_business.dart b/Frontend/lib/mih_objects/bookmarked_business.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/bookmarked_business.dart rename to Frontend/lib/mih_objects/bookmarked_business.dart diff --git a/Frontend/lib/mih_components/mih_objects/business.dart b/Frontend/lib/mih_objects/business.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/business.dart rename to Frontend/lib/mih_objects/business.dart diff --git a/Frontend/lib/mih_components/mih_objects/business_employee.dart b/Frontend/lib/mih_objects/business_employee.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/business_employee.dart rename to Frontend/lib/mih_objects/business_employee.dart diff --git a/Frontend/lib/mih_components/mih_objects/business_review.dart b/Frontend/lib/mih_objects/business_review.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/business_review.dart rename to Frontend/lib/mih_objects/business_review.dart diff --git a/Frontend/lib/mih_components/mih_objects/business_user.dart b/Frontend/lib/mih_objects/business_user.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/business_user.dart rename to Frontend/lib/mih_objects/business_user.dart diff --git a/Frontend/lib/mih_components/mih_objects/claim_statement_file.dart b/Frontend/lib/mih_objects/claim_statement_file.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/claim_statement_file.dart rename to Frontend/lib/mih_objects/claim_statement_file.dart diff --git a/Frontend/lib/mih_components/mih_objects/currency.dart b/Frontend/lib/mih_objects/currency.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/currency.dart rename to Frontend/lib/mih_objects/currency.dart diff --git a/Frontend/lib/mih_components/mih_objects/email_and_patient_screen_args.dart b/Frontend/lib/mih_objects/email_and_patient_screen_args.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/email_and_patient_screen_args.dart rename to Frontend/lib/mih_objects/email_and_patient_screen_args.dart diff --git a/Frontend/lib/mih_components/mih_objects/files.dart b/Frontend/lib/mih_objects/files.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/files.dart rename to Frontend/lib/mih_objects/files.dart diff --git a/Frontend/lib/mih_components/mih_objects/icd10_code.dart.dart b/Frontend/lib/mih_objects/icd10_code.dart.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/icd10_code.dart.dart rename to Frontend/lib/mih_objects/icd10_code.dart.dart diff --git a/Frontend/lib/mih_components/mih_objects/loyalty_card.dart b/Frontend/lib/mih_objects/loyalty_card.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/loyalty_card.dart rename to Frontend/lib/mih_objects/loyalty_card.dart diff --git a/Frontend/lib/mih_components/mih_objects/medicine.dart b/Frontend/lib/mih_objects/medicine.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/medicine.dart rename to Frontend/lib/mih_objects/medicine.dart diff --git a/Frontend/lib/mih_components/mih_objects/minesweeper_player_score.dart b/Frontend/lib/mih_objects/minesweeper_player_score.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/minesweeper_player_score.dart rename to Frontend/lib/mih_objects/minesweeper_player_score.dart diff --git a/Frontend/lib/mih_components/mih_objects/notes.dart b/Frontend/lib/mih_objects/notes.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/notes.dart rename to Frontend/lib/mih_objects/notes.dart diff --git a/Frontend/lib/mih_components/mih_objects/notification.dart b/Frontend/lib/mih_objects/notification.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/notification.dart rename to Frontend/lib/mih_objects/notification.dart diff --git a/Frontend/lib/mih_components/mih_objects/patient_access.dart b/Frontend/lib/mih_objects/patient_access.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/patient_access.dart rename to Frontend/lib/mih_objects/patient_access.dart diff --git a/Frontend/lib/mih_components/mih_objects/patient_queue.dart b/Frontend/lib/mih_objects/patient_queue.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/patient_queue.dart rename to Frontend/lib/mih_objects/patient_queue.dart diff --git a/Frontend/lib/mih_components/mih_objects/patients.dart b/Frontend/lib/mih_objects/patients.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/patients.dart rename to Frontend/lib/mih_objects/patients.dart diff --git a/Frontend/lib/mih_components/mih_objects/perscription.dart b/Frontend/lib/mih_objects/perscription.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/perscription.dart rename to Frontend/lib/mih_objects/perscription.dart diff --git a/Frontend/lib/mih_components/mih_objects/session_st.dart b/Frontend/lib/mih_objects/session_st.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/session_st.dart rename to Frontend/lib/mih_objects/session_st.dart diff --git a/Frontend/lib/mih_components/mih_objects/user_consent.dart b/Frontend/lib/mih_objects/user_consent.dart similarity index 100% rename from Frontend/lib/mih_components/mih_objects/user_consent.dart rename to Frontend/lib/mih_objects/user_consent.dart diff --git a/Frontend/lib/mih_package_components/Example/package_test.dart b/Frontend/lib/mih_package_components/Example/package_test.dart new file mode 100644 index 00000000..cd1a500d --- /dev/null +++ b/Frontend/lib/mih_package_components/Example/package_test.dart @@ -0,0 +1,137 @@ +import 'package:go_router/go_router.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/Example/package_tools/package_tool_one.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/Example/package_tools/package_tool_two.dart'; +import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_data_helper_services.dart'; +import 'package:provider/provider.dart'; + +class PackageTest extends StatefulWidget { + const PackageTest({ + super.key, + }); + + @override + State createState() => _PackageTestState(); +} + +class _PackageTestState extends State { + int _selcetedIndex = 0; + bool _isLoadingInitialData = true; + + Future _loadInitialData() async { + setState(() { + _isLoadingInitialData = true; + }); + MzansiProfileProvider mzansiProfileProvider = + context.read(); + await MihDataHelperServices().loadUserDataWithBusinessesData( + mzansiProfileProvider, + ); + setState(() { + _isLoadingInitialData = false; + }); + } + + MihPackageAction getAction() { + return MihPackageAction( + icon: const Icon(Icons.arrow_back), + iconSize: 35, + onTap: () { + context.goNamed( + 'mihHome', + extra: true, + ); + FocusScope.of(context).unfocus(); + // Navigator.of(context).pop(); + // Navigator.of(context).popAndPushNamed( + // '/', + // arguments: AuthArguments(true, false), + // ); + }, + ); + } + + MihPackageTools getTools() { + Map temp = Map(); + temp[const Icon(Icons.inbox)] = () { + setState(() { + _selcetedIndex = 0; + }); + }; + temp[const Icon(Icons.outbond)] = () { + setState(() { + _selcetedIndex = 1; + }); + }; + return MihPackageTools( + tools: temp, + selcetedIndex: _selcetedIndex, + ); + } + + void showAlert() { + MihAlertServices().inputErrorMessage(context); + } + + List getToolBody() { + MzansiProfileProvider profileProvider = + context.read(); + List toolBodies = [ + PackageToolOne( + user: profileProvider.user!, + business: profileProvider.business, + ), + const PackageToolTwo(), + ]; + return toolBodies; + } + + List getToolTitle() { + List toolTitles = [ + "Tool One", + "Tool Two", + ]; + return toolTitles; + } + + @override + void initState() { + super.initState(); + _loadInitialData(); + } + + @override + Widget build(BuildContext context) { + return Consumer( + builder: + (BuildContext context, MzansiProfileProvider value, Widget? child) { + if (_isLoadingInitialData) { + return Scaffold( + body: Center( + child: Mihloadingcircle(), + ), + ); + } + return MihPackage( + appActionButton: getAction(), + appTools: getTools(), + appBody: getToolBody(), + appToolTitles: getToolTitle(), + selectedbodyIndex: _selcetedIndex, + onIndexChange: (newValue) { + setState(() { + _selcetedIndex = newValue; + }); + print("Index: $_selcetedIndex"); + }, + ); + }, + ); + } +} diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_tiles/test_package_tile.dart b/Frontend/lib/mih_package_components/Example/package_tiles/test_package_tile.dart similarity index 82% rename from Frontend/lib/mih_components/mih_package_components/Example/package_tiles/test_package_tile.dart rename to Frontend/lib/mih_package_components/Example/package_tiles/test_package_tile.dart index 7ef12f06..6cf7c228 100644 --- a/Frontend/lib/mih_components/mih_package_components/Example/package_tiles/test_package_tile.dart +++ b/Frontend/lib/mih_package_components/Example/package_tiles/test_package_tile.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class TestPackageTile extends StatefulWidget { diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart b/Frontend/lib/mih_package_components/Example/package_tools/package_tool_one.dart similarity index 94% rename from Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart rename to Frontend/lib/mih_package_components/Example/package_tools/package_tool_one.dart index 4cd410d5..662142c8 100644 --- a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart +++ b/Frontend/lib/mih_package_components/Example/package_tools/package_tool_one.dart @@ -5,35 +5,35 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:geolocator/geolocator.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_business_profile_preview.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_personal_profile_preview.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_banner_ad.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_business_profile_preview.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_personal_profile_preview.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart'; // import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_location_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_date_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_numeric_stepper.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_image_display.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_radio_options.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_time_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_toggle.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_date_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_numeric_stepper.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_image_display.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_radio_options.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_time_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_toggle.dart'; import 'package:redacted/redacted.dart'; class PackageToolOne extends StatefulWidget { @@ -645,7 +645,7 @@ class _PackageToolOneState extends State { const SnackBar(content: Text("Input Valid")), ); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getSecondaryColor( diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_two.dart b/Frontend/lib/mih_package_components/Example/package_tools/package_tool_two.dart similarity index 86% rename from Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_two.dart rename to Frontend/lib/mih_package_components/Example/package_tools/package_tool_two.dart index 01a6e072..f6713a51 100644 --- a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_two.dart +++ b/Frontend/lib/mih_package_components/Example/package_tools/package_tool_two.dart @@ -1,9 +1,9 @@ import 'package:custom_rating_bar/custom_rating_bar.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class PackageToolTwo extends StatefulWidget { diff --git a/Frontend/lib/mih_components/mih_package_components/assets/fonts/Mih_Icons.ttf b/Frontend/lib/mih_package_components/assets/fonts/Mih_Icons.ttf similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/fonts/Mih_Icons.ttf rename to Frontend/lib/mih_package_components/assets/fonts/Mih_Icons.ttf diff --git a/Frontend/lib/mih_components/mih_package_components/assets/fonts/icomoon_link.txt b/Frontend/lib/mih_package_components/assets/fonts/icomoon_link.txt similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/fonts/icomoon_link.txt rename to Frontend/lib/mih_package_components/assets/fonts/icomoon_link.txt diff --git a/Frontend/lib/mih_components/mih_package_components/assets/fonts/style.css b/Frontend/lib/mih_package_components/assets/fonts/style.css similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/fonts/style.css rename to Frontend/lib/mih_package_components/assets/fonts/style.css diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/circle_logo.png b/Frontend/lib/mih_package_components/assets/images/app_icon/circle_logo.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/circle_logo.png rename to Frontend/lib/mih_package_components/assets/images/app_icon/circle_logo.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/mih_app_icon.png b/Frontend/lib/mih_package_components/assets/images/app_icon/mih_app_icon.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/mih_app_icon.png rename to Frontend/lib/mih_package_components/assets/images/app_icon/mih_app_icon.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_app.png b/Frontend/lib/mih_package_components/assets/images/app_icon/mih_logo_app.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_app.png rename to Frontend/lib/mih_package_components/assets/images/app_icon/mih_logo_app.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png b/Frontend/lib/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png rename to Frontend/lib/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_web.png b/Frontend/lib/mih_package_components/assets/images/app_icon/mih_logo_web.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_web.png rename to Frontend/lib/mih_package_components/assets/images/app_icon/mih_logo_web.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_web_w4c.png b/Frontend/lib/mih_package_components/assets/images/app_icon/mih_logo_web_w4c.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/mih_logo_web_w4c.png rename to Frontend/lib/mih_package_components/assets/images/app_icon/mih_logo_web_w4c.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/founder.jpg b/Frontend/lib/mih_package_components/assets/images/founder.jpg similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/founder.jpg rename to Frontend/lib/mih_package_components/assets/images/founder.jpg diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/i-dont-know-dark.png b/Frontend/lib/mih_package_components/assets/images/i-dont-know-dark.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/i-dont-know-dark.png rename to Frontend/lib/mih_package_components/assets/images/i-dont-know-dark.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/i-dont-know-light.png b/Frontend/lib/mih_package_components/assets/images/i-dont-know-light.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/i-dont-know-light.png rename to Frontend/lib/mih_package_components/assets/images/i-dont-know-light.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/logo_light.png b/Frontend/lib/mih_package_components/assets/images/logo_light.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/logo_light.png rename to Frontend/lib/mih_package_components/assets/images/logo_light.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/apple_tree-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/apple_tree-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/apple_tree-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/apple_tree-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/auchan-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/auchan-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/auchan-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/auchan-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/best_before-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/best_before-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/best_before-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/best_before-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/big_save-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/big_save-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/big_save-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/big_save-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/boxer-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/boxer-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/boxer-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/boxer-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/bp-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/bp-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/bp-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/bp-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/builders-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/builders-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/builders-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/builders-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/carrefour-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/carrefour-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/carrefour-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/carrefour-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/checkers-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/checkers-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/checkers-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/checkers-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/choppies-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/choppies-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/choppies-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/choppies-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/clicks-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/clicks-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/clicks-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/clicks-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/continente-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/continente-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/continente-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/continente-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/cotton_on-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/cotton_on-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/cotton_on-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/cotton_on-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/dischem-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/dischem-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/dischem-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/dischem-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/edgars-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/edgars-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/edgars-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/edgars-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/engen-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/engen-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/engen-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/engen-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/eskom-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/eskom-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/eskom-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/eskom-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/exclusive_books-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/exclusive_books-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/exclusive_books-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/exclusive_books-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/fresh_stop-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/fresh_stop-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/fresh_stop-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/fresh_stop-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/fresmart-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/fresmart-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/fresmart-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/fresmart-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/infinity-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/infinity-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/infinity-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/infinity-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/jet-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/jet-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/jet-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/jet-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/justrite-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/justrite-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/justrite-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/justrite-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/kero-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/kero-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/kero-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/kero-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/leroy_merlin-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/leroy_merlin-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/leroy_merlin-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/leroy_merlin-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/makro-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/makro-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/makro-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/makro-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/naivas-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/naivas-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/naivas-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/naivas-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/ok_food-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/ok_food-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/ok_food-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/ok_food-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/panarottis-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/panarottis-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/panarottis-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/panarottis-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pick_n_pay-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/pick_n_pay-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pick_n_pay-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/pick_n_pay-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/plus_more-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/plus_more-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/plus_more-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/plus_more-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pna-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/pna-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pna-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/pna-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pq-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/pq-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pq-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/pq-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/rage-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/rage-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/rage-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/rage-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/sasol-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/sasol-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/sasol-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/sasol-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/sefalana-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/sefalana-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/sefalana-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/sefalana-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/shell-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/shell-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/shell-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/shell-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/shoprite-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/shoprite-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/shoprite-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/shoprite-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/signature_cosmetics-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/signature_cosmetics-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/signature_cosmetics-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/signature_cosmetics-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/spar-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/spar-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/spar-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/spar-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/spur-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/spur-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/spur-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/spur-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/tfg-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/tfg-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/tfg-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/tfg-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/total_energies-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/total_energies-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/total_energies-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/total_energies-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/toysrus-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/toysrus-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/toysrus-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/toysrus-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/woermann_brock-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/woermann_brock-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/woermann_brock-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/woermann_brock-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/woolworths-min.png b/Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/woolworths-min.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/woolworths-min.png rename to Frontend/lib/mih_package_components/assets/images/loyalty_cards/mini/woolworths-min.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/splash_screen/mih_branding_splash.png b/Frontend/lib/mih_package_components/assets/images/splash_screen/mih_branding_splash.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/splash_screen/mih_branding_splash.png rename to Frontend/lib/mih_package_components/assets/images/splash_screen/mih_branding_splash.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/splash_screen/mih_branding_splash_temp.gif b/Frontend/lib/mih_package_components/assets/images/splash_screen/mih_branding_splash_temp.gif similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/splash_screen/mih_branding_splash_temp.gif rename to Frontend/lib/mih_package_components/assets/images/splash_screen/mih_branding_splash_temp.gif diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/splash_screen/mih_image_splash.png b/Frontend/lib/mih_package_components/assets/images/splash_screen/mih_image_splash.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/splash_screen/mih_image_splash.png rename to Frontend/lib/mih_package_components/assets/images/splash_screen/mih_image_splash.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/splash_screen/mih_image_splash_android.png b/Frontend/lib/mih_package_components/assets/images/splash_screen/mih_image_splash_android.png similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/splash_screen/mih_image_splash_android.png rename to Frontend/lib/mih_package_components/assets/images/splash_screen/mih_image_splash_android.png diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/splash_screen/mih_image_splash_temp.gif b/Frontend/lib/mih_package_components/assets/images/splash_screen/mih_image_splash_temp.gif similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/assets/images/splash_screen/mih_image_splash_temp.gif rename to Frontend/lib/mih_package_components/assets/images/splash_screen/mih_image_splash_temp.gif diff --git a/Frontend/lib/mih_components/mih_package_components/mih_banner_ad.dart b/Frontend/lib/mih_package_components/mih_banner_ad.dart similarity index 94% rename from Frontend/lib/mih_components/mih_package_components/mih_banner_ad.dart rename to Frontend/lib/mih_package_components/mih_banner_ad.dart index 61abe627..fa2807db 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_banner_ad.dart +++ b/Frontend/lib/mih_package_components/mih_banner_ad.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:google_mobile_ads/google_mobile_ads.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_banner_ad_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_banner_ad_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_components/mih_package_components/mih_business_profile_preview.dart b/Frontend/lib/mih_package_components/mih_business_profile_preview.dart similarity index 92% rename from Frontend/lib/mih_components/mih_package_components/mih_business_profile_preview.dart rename to Frontend/lib/mih_package_components/mih_business_profile_preview.dart index 4249084c..45864d3d 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_business_profile_preview.dart +++ b/Frontend/lib/mih_package_components/mih_business_profile_preview.dart @@ -1,10 +1,10 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_location_services.dart'; diff --git a/Frontend/lib/mih_components/mih_package_components/mih_button.dart b/Frontend/lib/mih_package_components/mih_button.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_button.dart rename to Frontend/lib/mih_package_components/mih_button.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_calendar.dart b/Frontend/lib/mih_package_components/mih_calendar.dart similarity index 97% rename from Frontend/lib/mih_components/mih_package_components/mih_calendar.dart rename to Frontend/lib/mih_package_components/mih_calendar.dart index 8989da51..4fcfd7c0 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_calendar.dart +++ b/Frontend/lib/mih_package_components/mih_calendar.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calendar_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calendar_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:provider/provider.dart'; import 'package:table_calendar/table_calendar.dart'; diff --git a/Frontend/lib/mih_components/mih_package_components/mih_circle_avatar.dart b/Frontend/lib/mih_package_components/mih_circle_avatar.dart similarity index 94% rename from Frontend/lib/mih_components/mih_package_components/mih_circle_avatar.dart rename to Frontend/lib/mih_package_components/mih_circle_avatar.dart index c64aaa75..68cb393f 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_circle_avatar.dart +++ b/Frontend/lib/mih_package_components/mih_circle_avatar.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihCircleAvatar extends StatefulWidget { @@ -41,11 +41,11 @@ class _MihCircleAvatarState extends State { // if (widget.backgroundColor == dark) { // print("here in light icon"); // return const AssetImage( - // 'lib/mih_components/mih_package_components/assets/images/i-dont-know-light.png'); + // 'lib/mih_package_components/assets/images/i-dont-know-light.png'); // } else { // print("here in dark icon"); // return const AssetImage( - // 'lib/mih_components/mih_package_components/assets/images/i-dont-know-dark.png'); + // 'lib/mih_package_components/assets/images/i-dont-know-dark.png'); // } } else { return widget.imageFile; diff --git a/Frontend/lib/mih_components/mih_package_components/mih_date_field.dart b/Frontend/lib/mih_package_components/mih_date_field.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_date_field.dart rename to Frontend/lib/mih_package_components/mih_date_field.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_dropdwn_field.dart b/Frontend/lib/mih_package_components/mih_dropdwn_field.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_dropdwn_field.dart rename to Frontend/lib/mih_package_components/mih_dropdwn_field.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_floating_menu.dart b/Frontend/lib/mih_package_components/mih_floating_menu.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_floating_menu.dart rename to Frontend/lib/mih_package_components/mih_floating_menu.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_form.dart b/Frontend/lib/mih_package_components/mih_form.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_form.dart rename to Frontend/lib/mih_package_components/mih_form.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_icons.dart b/Frontend/lib/mih_package_components/mih_icons.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_icons.dart rename to Frontend/lib/mih_package_components/mih_icons.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_image_display.dart b/Frontend/lib/mih_package_components/mih_image_display.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_image_display.dart rename to Frontend/lib/mih_package_components/mih_image_display.dart diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart b/Frontend/lib/mih_package_components/mih_loading_circle.dart similarity index 79% rename from Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart rename to Frontend/lib/mih_package_components/mih_loading_circle.dart index 5172d15f..5e9f76c2 100644 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart +++ b/Frontend/lib/mih_package_components/mih_loading_circle.dart @@ -1,11 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; -import '../../main.dart'; +import '../main.dart'; class Mihloadingcircle extends StatefulWidget { final String? message; - const Mihloadingcircle({super.key, this.message}); + const Mihloadingcircle({ + super.key, + this.message, + }); @override State createState() => _MihloadingcircleState(); @@ -16,33 +19,12 @@ class _MihloadingcircleState extends State late AnimationController _controller; late Animation _animation; - late double popUpPaddingSize; - late double popUpWidth; - late double? popUpheight; - late double width; late double height; - void checkScreenSize() { - if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { - setState(() { - popUpWidth = 250; - popUpheight = 250; - popUpPaddingSize = 25.0; - }); - } else { - setState(() { - popUpWidth = 250; - popUpheight = 250; - popUpPaddingSize = 15.0; - }); - } - } - @override void initState() { super.initState(); - checkScreenSize(); _controller = AnimationController( duration: const Duration( milliseconds: 500), // Duration for one pulse (grow and shrink) @@ -70,9 +52,7 @@ class _MihloadingcircleState extends State child: IntrinsicWidth( child: IntrinsicHeight( child: Container( - padding: EdgeInsets.all(popUpPaddingSize), - // width: 250, - // height: 275, + padding: EdgeInsets.all(15), decoration: BoxDecoration( color: MihColors.getPrimaryColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), diff --git a/Frontend/lib/mih_components/mih_package_components/mih_notification_drawer.dart b/Frontend/lib/mih_package_components/mih_notification_drawer.dart similarity index 93% rename from Frontend/lib/mih_components/mih_package_components/mih_notification_drawer.dart rename to Frontend/lib/mih_package_components/mih_notification_drawer.dart index b2ca0662..33f12eca 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_notification_drawer.dart +++ b/Frontend/lib/mih_package_components/mih_notification_drawer.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/notification.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_objects/notification.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:supertokens_flutter/http.dart' as http; -import '../../mih_config/mih_env.dart'; -import '../mih_pop_up_messages/mih_error_message.dart'; class MIHNotificationDrawer extends StatefulWidget { final AppUser signedInUser; @@ -43,19 +43,10 @@ class _MIHNotificationDrawerState extends State { arguments: widget.signedInUser, ); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - List> setTempNofitications() { List> temp = []; temp.add(["Notification 1", "Notification Description 1"]); diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart b/Frontend/lib/mih_package_components/mih_notification_message.dart similarity index 97% rename from Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart rename to Frontend/lib/mih_package_components/mih_notification_message.dart index 521fdb49..4df6b8a2 100644 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart +++ b/Frontend/lib/mih_package_components/mih_notification_message.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; -import '../../main.dart'; -import '../../mih_components/mih_objects/arguments.dart'; +import '../main.dart'; +import '../mih_objects/arguments.dart'; class MIHNotificationMessage extends StatefulWidget { final NotificationArguments arguments; @@ -55,7 +55,6 @@ class _MIHNotificationMessageState extends State } Widget notifyPopUp() { - //messageTypes["Input Error"] = return GestureDetector( onTap: widget.arguments.onTap, child: Container( diff --git a/Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.dart b/Frontend/lib/mih_package_components/mih_numeric_stepper.dart similarity index 98% rename from Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.dart rename to Frontend/lib/mih_package_components/mih_numeric_stepper.dart index 29017db8..9e836b25 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.dart +++ b/Frontend/lib/mih_package_components/mih_numeric_stepper.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; class MihNumericStepper extends StatefulWidget { final TextEditingController controller; diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package.dart b/Frontend/lib/mih_package_components/mih_package.dart similarity index 97% rename from Frontend/lib/mih_components/mih_package_components/mih_package.dart rename to Frontend/lib/mih_package_components/mih_package.dart index b431df5f..7665556d 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package.dart +++ b/Frontend/lib/mih_package_components/mih_package.dart @@ -2,9 +2,9 @@ import 'package:flutter/services.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_scack_bar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_scack_bar.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_home/components/mih_app_drawer.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; import 'package:flutter/material.dart'; // ignore: must_be_immutable diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_action.dart b/Frontend/lib/mih_package_components/mih_package_action.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_package_action.dart rename to Frontend/lib/mih_package_components/mih_package_action.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart b/Frontend/lib/mih_package_components/mih_package_alert.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart rename to Frontend/lib/mih_package_components/mih_package_alert.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart b/Frontend/lib/mih_package_components/mih_package_tile.dart similarity index 94% rename from Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart rename to Frontend/lib/mih_package_components/mih_package_tile.dart index 93538ce0..1236ea65 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart +++ b/Frontend/lib/mih_package_components/mih_package_tile.dart @@ -2,10 +2,10 @@ import 'package:app_settings/app_settings.dart'; import 'package:flutter/foundation.dart'; import 'package:local_auth/local_auth.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_yt_video_player.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_yt_video_player.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_tool_body.dart b/Frontend/lib/mih_package_components/mih_package_tool_body.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_package_tool_body.dart rename to Frontend/lib/mih_package_components/mih_package_tool_body.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_tools.dart b/Frontend/lib/mih_package_components/mih_package_tools.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_package_tools.dart rename to Frontend/lib/mih_package_components/mih_package_tools.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_window.dart b/Frontend/lib/mih_package_components/mih_package_window.dart similarity index 95% rename from Frontend/lib/mih_components/mih_package_components/mih_package_window.dart rename to Frontend/lib/mih_package_components/mih_package_window.dart index 4461ca0f..e2dc8720 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package_window.dart +++ b/Frontend/lib/mih_package_components/mih_package_window.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihPackageWindow extends StatefulWidget { diff --git a/Frontend/lib/mih_components/mih_package_components/mih_personal_profile_preview.dart b/Frontend/lib/mih_package_components/mih_personal_profile_preview.dart similarity index 92% rename from Frontend/lib/mih_components/mih_package_components/mih_personal_profile_preview.dart rename to Frontend/lib/mih_package_components/mih_personal_profile_preview.dart index 670317b3..a08f266e 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_personal_profile_preview.dart +++ b/Frontend/lib/mih_package_components/mih_personal_profile_preview.dart @@ -1,9 +1,9 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; diff --git a/Frontend/lib/mih_components/mih_package_components/mih_radio_options.dart b/Frontend/lib/mih_package_components/mih_radio_options.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_radio_options.dart rename to Frontend/lib/mih_package_components/mih_radio_options.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_scack_bar.dart b/Frontend/lib/mih_package_components/mih_scack_bar.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_scack_bar.dart rename to Frontend/lib/mih_package_components/mih_scack_bar.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_search_bar.dart b/Frontend/lib/mih_package_components/mih_search_bar.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_search_bar.dart rename to Frontend/lib/mih_package_components/mih_search_bar.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_single_child_scroll.dart b/Frontend/lib/mih_package_components/mih_single_child_scroll.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_single_child_scroll.dart rename to Frontend/lib/mih_package_components/mih_single_child_scroll.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_text_form_field.dart b/Frontend/lib/mih_package_components/mih_text_form_field.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_text_form_field.dart rename to Frontend/lib/mih_package_components/mih_text_form_field.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_time_field.dart b/Frontend/lib/mih_package_components/mih_time_field.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_time_field.dart rename to Frontend/lib/mih_package_components/mih_time_field.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_toggle.dart b/Frontend/lib/mih_package_components/mih_toggle.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_toggle.dart rename to Frontend/lib/mih_package_components/mih_toggle.dart diff --git a/Frontend/lib/mih_components/mih_package_components/mih_yt_video_player.dart b/Frontend/lib/mih_package_components/mih_yt_video_player.dart similarity index 100% rename from Frontend/lib/mih_components/mih_package_components/mih_yt_video_player.dart rename to Frontend/lib/mih_package_components/mih_yt_video_player.dart diff --git a/Frontend/lib/mih_packages/about_mih/about_mih.dart b/Frontend/lib/mih_packages/about_mih/about_mih.dart index 07f69340..dfeb516f 100644 --- a/Frontend/lib/mih_packages/about_mih/about_mih.dart +++ b/Frontend/lib/mih_packages/about_mih/about_mih.dart @@ -1,8 +1,8 @@ import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/about_mih_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_providers/about_mih_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tools/mih_%20attributes.dart'; import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tools/mih_info.dart'; import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tools/mih_privacy_policy.dart'; diff --git a/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart b/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart index c01a1162..90570143 100644 --- a/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart +++ b/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class PolicyAndTermsText { diff --git a/Frontend/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart b/Frontend/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart index 945a4122..e46cbe19 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart @@ -1,8 +1,8 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class AboutMihTile extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart index 1f35132d..abdbff56 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart index 2976640d..389ee65b 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart @@ -1,17 +1,17 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_install_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:redacted/redacted.dart'; @@ -71,7 +71,7 @@ class _MihInfoState extends State { backgroundColor: MihColors.getPrimaryColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), backgroundImage: const AssetImage( - "lib/mih_components/mih_package_components/assets/images/founder.jpg"), + "lib/mih_package_components/assets/images/founder.jpg"), //'https://media.licdn.com/dms/image/D4D03AQGd1-QhjtWWpA/profile-displayphoto-shrink_400_400/0/1671698053061?e=2147483647&v=beta&t=a3dJI5yxs5-KeXjj10LcNCFuC9IOfa8nNn3k_Qyr0CA'), radius: 75, ), diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart index b5054614..0ac7d838 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart @@ -1,7 +1,7 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart'; import 'package:flutter/material.dart'; diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart index e4384464..4f73ea0e 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart @@ -1,7 +1,7 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart'; import 'package:flutter/material.dart'; diff --git a/Frontend/lib/mih_packages/access_review/builder/build_access_request_list.dart b/Frontend/lib/mih_packages/access_review/builder/build_access_request_list.dart index e18906e9..d79a27f0 100644 --- a/Frontend/lib/mih_packages/access_review/builder/build_access_request_list.dart +++ b/Frontend/lib/mih_packages/access_review/builder/build_access_request_list.dart @@ -1,16 +1,15 @@ import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_warning_message.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/access_request.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/access_request.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:supertokens_flutter/http.dart' as http; class BuildAccessRequestList extends StatefulWidget { @@ -71,40 +70,76 @@ class _BuildPatientsListState extends State { } successPopUp(message); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - void successPopUp(String message) { showDialog( context: context, builder: (context) { - return MIHSuccessMessage( - successType: "Success", - successMessage: message, + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.check_circle_outline_rounded, + size: popUpIconSize, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Text( + "Success!", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: popUpTitleSize, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + Center( + child: Text( + message, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: popUpBodySize, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), ); }, ); } - void accessCancelledWarning() { - showDialog( - context: context, - builder: (context) { - return const MIHWarningMessage(warningType: "Access Cancelled"); - }, - ); - } - Widget displayQueue(int index) { String line1 = "Appointment: ${widget.accessRequests[index].date_time.substring(0, 16).replaceAll("T", " ")}"; @@ -175,7 +210,11 @@ class _BuildPatientsListState extends State { // ), onTap: () { if (access == "CANCELLED") { - accessCancelledWarning(); + MihAlertServices().warningMessage( + "Access Cancelled", + "This appointment has been canceled. As a result, access has been cancelled and the doctor no longer have access to the patient's profile. If you would like them to view the patient's profile again, please book a new appointment through them.", + context, + ); } else { viewApprovalPopUp(index); } diff --git a/Frontend/lib/mih_packages/access_review/builder/build_business_access_list.dart b/Frontend/lib/mih_packages/access_review/builder/build_business_access_list.dart index 782c75a3..ab9f6ee7 100644 --- a/Frontend/lib/mih_packages/access_review/builder/build_business_access_list.dart +++ b/Frontend/lib/mih_packages/access_review/builder/build_business_access_list.dart @@ -2,17 +2,16 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_access.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_access_controlls_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patient_access.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_access_controlls_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_access_controls_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_warning_message.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:provider/provider.dart'; class BuildBusinessAccessList extends StatefulWidget { @@ -42,24 +41,6 @@ class _BuildPatientsListState extends State { late double width; late double height; - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - - void accessCancelledWarning() { - showDialog( - context: context, - builder: (context) { - return const MIHWarningMessage(warningType: "Access Cancelled"); - }, - ); - } - Widget displayQueue( MzansiProfileProvider mzansiProfileProvider, MihAccessControllsProvider accessProvider, @@ -369,7 +350,7 @@ class _BuildPatientsListState extends State { successPopUp("Successfully Actioned Request", "You have successfully Declined access request"); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } }, buttonColor: MihColors.getRedColor( @@ -410,7 +391,7 @@ class _BuildPatientsListState extends State { successPopUp("Successfully Actioned Request", "You have successfully Accepted access request"); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/access_review/mih_access.dart b/Frontend/lib/mih_packages/access_review/mih_access.dart index 35a6023c..56646629 100644 --- a/Frontend/lib/mih_packages/access_review/mih_access.dart +++ b/Frontend/lib/mih_packages/access_review/mih_access.dart @@ -1,10 +1,10 @@ import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_access_controlls_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_access_controlls_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/access_review/package_tools/mih_access_requests.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_data_helper_services.dart'; diff --git a/Frontend/lib/mih_packages/access_review/package_tile/mih_access_tile.dart b/Frontend/lib/mih_packages/access_review/package_tile/mih_access_tile.dart index 8574ef9e..e58b387b 100644 --- a/Frontend/lib/mih_packages/access_review/package_tile/mih_access_tile.dart +++ b/Frontend/lib/mih_packages/access_review/package_tile/mih_access_tile.dart @@ -1,7 +1,7 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; diff --git a/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart b/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart index f46fea59..a40ad884 100644 --- a/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart +++ b/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart @@ -1,15 +1,15 @@ import 'package:ken_logger/ken_logger.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_access.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_access_controlls_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patient_access.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_access_controlls_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_packages/access_review/builder/build_business_access_list.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_access_controls_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/calculator/mih_calculator.dart b/Frontend/lib/mih_packages/calculator/mih_calculator.dart index 775a868e..3e78b66e 100644 --- a/Frontend/lib/mih_packages/calculator/mih_calculator.dart +++ b/Frontend/lib/mih_packages/calculator/mih_calculator.dart @@ -1,8 +1,8 @@ import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calculator_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calculator_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/calculator/package_tools/currency_exchange_rate.dart'; import 'package:mzansi_innovation_hub/mih_packages/calculator/package_tools/simple_calc.dart'; import 'package:mzansi_innovation_hub/mih_packages/calculator/package_tools/tip_calc.dart'; diff --git a/Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart b/Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart index a771df6b..62daac41 100644 --- a/Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart +++ b/Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart @@ -1,8 +1,8 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihCalculatorTile extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart b/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart index 6fabe709..f9f2f380 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart @@ -1,15 +1,15 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calculator_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_banner_ad.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calculator_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_currency_exchange_rate_services.dart'; @@ -383,8 +383,7 @@ class _CurrencyExchangeRateState extends State { FocusScope.of(context) .requestFocus(FocusNode()); } else { - MihAlertServices() - .formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart index 966ee6c7..4a5e05fd 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart @@ -1,7 +1,7 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; import 'package:flutter/material.dart'; import 'package:math_expressions/math_expressions.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; diff --git a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart index 58583291..6582755c 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart @@ -1,19 +1,19 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_banner_ad.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_numeric_stepper.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_numeric_stepper.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:math_expressions/math_expressions.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_toggle.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_toggle.dart'; import 'package:provider/provider.dart'; class TipCalc extends StatefulWidget { @@ -392,7 +392,7 @@ class _TipCalcState extends State { if (_formKey.currentState!.validate()) { validateInput(); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart b/Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart index df5a2f8f..26fc990f 100644 --- a/Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart +++ b/Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart @@ -1,20 +1,17 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/access_request.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; +import 'package:go_router/go_router.dart'; +import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_objects/access_request.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; - +import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:supertokens_flutter/http.dart' as http; -import '../../../main.dart'; -import '../../../mih_components/mih_pop_up_messages/mih_error_message.dart'; -import '../../../mih_components/mih_pop_up_messages/mih_success_message.dart'; -import '../../../mih_components/mih_pop_up_messages/mih_warning_message.dart'; -import '../../../mih_config/mih_env.dart'; - class BuildAccessRequestList extends StatefulWidget { final List accessRequests; final AppUser signedInUser; @@ -73,40 +70,76 @@ class _BuildPatientsListState extends State { } successPopUp(message); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - void successPopUp(String message) { showDialog( context: context, builder: (context) { - return MIHSuccessMessage( - successType: "Success", - successMessage: message, + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.check_circle_outline_rounded, + size: popUpIconSize, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Text( + "Success!", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: popUpTitleSize, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + Center( + child: Text( + message, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: popUpBodySize, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), ); }, ); } - void accessCancelledWarning() { - showDialog( - context: context, - builder: (context) { - return const MIHWarningMessage(warningType: "Access Cancelled"); - }, - ); - } - Widget displayQueue(int index) { String line1 = "Appointment: ${widget.accessRequests[index].date_time.substring(0, 16).replaceAll("T", " ")}"; @@ -177,7 +210,11 @@ class _BuildPatientsListState extends State { // ), onTap: () { if (access == "CANCELLED") { - accessCancelledWarning(); + MihAlertServices().warningMessage( + "Access Cancelled", + "This appointment has been canceled. As a result, access has been cancelled and the doctor no longer have access to the patient's profile. If you would like them to view the patient's profile again, please book a new appointment through them.", + context, + ); } else { viewApprovalPopUp(index); } diff --git a/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart b/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart index 32481014..cf372aea 100644 --- a/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart +++ b/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart @@ -2,22 +2,20 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/appointment.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calendar_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/appointment.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calendar_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_calendar_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_date_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_time_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_delete_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_date_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_time_field.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -525,8 +523,7 @@ class _BuildAppointmentListState extends State { updateAppointmentCall(mzansiProfileProvider, mihCalendarProvider, index); } else { - MihAlertServices() - .formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( @@ -572,17 +569,13 @@ class _BuildAppointmentListState extends State { MzansiProfileProvider mzansiProfileProvider, MihCalendarProvider mihCalendarProvider, int index) { - showDialog( - context: context, - barrierDismissible: false, - builder: (context) { - return MIHDeleteMessage( - deleteType: "Appointment", - onTap: () { - deleteAppointmentCall( - mzansiProfileProvider, mihCalendarProvider, index); - }); + MihAlertServices().deleteConfirmationMessage( + "This appointment will be deleted permanently from your calendar. Are you certain you want to delete it?", + () { + deleteAppointmentCall( + mzansiProfileProvider, mihCalendarProvider, index); }, + context, ); } @@ -641,38 +634,11 @@ class _BuildAppointmentListState extends State { context.pop(); successPopUp("Successfully Updated Appointment", "You appointment has been successfully updated."); - // if (!widget.inWaitingRoom) { - // KenLogger.warning("calendar route"); - // context.goNamed( - // "mihCalendar", - // ); - // } else { - // KenLogger.warning("waiting room route"); - // // GoRouter.of(context).refresh(); - // context.goNamed( - // 'mihHome', - // ); - // context.goNamed( - // 'patientManager', - // extra: PatManagerArguments( - // mzansiProfileProvider.user!, - // false, - // mzansiProfileProvider.business, - // mzansiProfileProvider.businessUser, - // ), - // ); - // // context.pop(); - // } } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } } @@ -699,7 +665,7 @@ class _BuildAppointmentListState extends State { successPopUp("Successfully Deleted Appointment", "You appointment has been successfully deleted from your calendar."); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } @@ -758,17 +724,6 @@ class _BuildAppointmentListState extends State { ); } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - bool canEditAppointment(MzansiProfileProvider mzansiProfileProvider, MihCalendarProvider mihCalendarProvider, int index) { List appointmentList = mzansiProfileProvider.personalHome diff --git a/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart b/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart index 3fead192..bef838a1 100644 --- a/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart +++ b/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_queue.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_warning_message.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patient_queue.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; @@ -71,42 +70,6 @@ class _BuildQueueListState extends State { } } - void noAccessWarning() { - showDialog( - context: context, - builder: (context) { - return const MIHWarningMessage(warningType: "No Access"); - }, - ); - } - - void accessDeclinedWarning() { - showDialog( - context: context, - builder: (context) { - return const MIHWarningMessage(warningType: "Access Declined"); - }, - ); - } - - void appointmentCancelledWarning() { - showDialog( - context: context, - builder: (context) { - return const MIHWarningMessage(warningType: "Appointment Canelled"); - }, - ); - } - - void expiredAccessWarning() { - showDialog( - context: context, - builder: (context) { - return const MIHWarningMessage(warningType: "Expired Access"); - }, - ); - } - @override void dispose() { daysExtensionController.dispose(); diff --git a/Frontend/lib/mih_packages/calendar/mzansi_calendar.dart b/Frontend/lib/mih_packages/calendar/mzansi_calendar.dart index 4a25726e..4bf45ca9 100644 --- a/Frontend/lib/mih_packages/calendar/mzansi_calendar.dart +++ b/Frontend/lib/mih_packages/calendar/mzansi_calendar.dart @@ -1,10 +1,10 @@ import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calendar_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calendar_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/calendar/package_tools/appointments.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_data_helper_services.dart'; diff --git a/Frontend/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart b/Frontend/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart index 545aac53..93c1b680 100644 --- a/Frontend/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart +++ b/Frontend/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart @@ -1,7 +1,7 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; diff --git a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart index 26e3b59a..35a70b37 100644 --- a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart +++ b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart @@ -2,27 +2,26 @@ import 'package:flutter/material.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_calendar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calendar_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_calendar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calendar_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_calendar_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_date_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_time_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/appointment.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_date_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_time_field.dart'; +import 'package:mzansi_innovation_hub/mih_objects/appointment.dart'; import 'package:mzansi_innovation_hub/mih_packages/calendar/builder/build_appointment_list.dart'; import 'package:provider/provider.dart'; @@ -213,7 +212,7 @@ class _PatientAccessRequestState extends State { addAppointmentCall( mzansiProfileProvider, mihCalendarProvider); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( @@ -302,15 +301,10 @@ class _PatientAccessRequestState extends State { ); } } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } checkforchange(); } @@ -375,17 +369,6 @@ class _PatientAccessRequestState extends State { ); } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - String getTitle(MzansiProfileProvider mzansiProfileProvider) { if (mzansiProfileProvider.personalHome == false) { return "Business Appointments"; diff --git a/Frontend/lib/mih_packages/mih_authentication/mih_auth_forgot_password.dart b/Frontend/lib/mih_packages/mih_authentication/mih_auth_forgot_password.dart index e8854ebb..1f8ae2df 100644 --- a/Frontend/lib/mih_packages/mih_authentication/mih_auth_forgot_password.dart +++ b/Frontend/lib/mih_packages/mih_authentication/mih_auth_forgot_password.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_authentication/package_tools/mih_forgot_password.dart'; class MihAuthForgotPassword extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/mih_authentication/mih_auth_password_reset.dart b/Frontend/lib/mih_packages/mih_authentication/mih_auth_password_reset.dart index 76cd7b4a..67fbcd50 100644 --- a/Frontend/lib/mih_packages/mih_authentication/mih_auth_password_reset.dart +++ b/Frontend/lib/mih_packages/mih_authentication/mih_auth_password_reset.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_authentication/package_tools/mih_reset_password.dart'; class MihAuthPasswordReset extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/mih_authentication/mih_authentication.dart b/Frontend/lib/mih_packages/mih_authentication/mih_authentication.dart index 3511ed90..0e6c09a8 100644 --- a/Frontend/lib/mih_packages/mih_authentication/mih_authentication.dart +++ b/Frontend/lib/mih_packages/mih_authentication/mih_authentication.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_authentication_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_authentication_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_authentication/package_tools/mih_register.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_authentication/package_tools/mih_sign_in.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_forgot_password.dart b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_forgot_password.dart index d6b7c970..09e92a68 100644 --- a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_forgot_password.dart +++ b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_forgot_password.dart @@ -2,13 +2,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_authentication_services.dart'; @@ -160,22 +159,13 @@ class _MihForgotPasswordState extends State { alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return const MIHSuccessMessage( - // successType: "Success", - // successMessage: - // "We've sent a password reset link to your email address. Please check your inbox, including spam or junk folders.\n\nOnce you find the email, click on the link to reset your password.\n\nIf you don't receive the email within a few minutes, please try resending the reset request.\n\nThe reset link will expire after 2 hours"); }, ); } void validateInput() async { if (emailController.text.isEmpty) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } else { await submitPasswodReset(); if (successfulForgotPassword) { @@ -264,7 +254,7 @@ class _MihForgotPasswordState extends State { if (_formKey.currentState!.validate()) { prePassResteWarning(); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_register.dart b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_register.dart index f16c6ef0..a9e5bb6c 100644 --- a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_register.dart +++ b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_register.dart @@ -3,16 +3,15 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_authentication_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_authentication_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; @@ -78,9 +77,9 @@ class _MihRegisterState extends State { Future signUserUp() async { context.read().reset(); if (!validEmail()) { - emailError(); + MihAlertServices().invalidEmailError(context); } else if (passwordController.text != confirmPasswordController.text) { - passwordError(); + MihAlertServices().passwordMatchError(context); } else { //var _backgroundColor = Colors.transparent; showDialog( @@ -100,7 +99,7 @@ class _MihRegisterState extends State { var userExists = jsonDecode(response.body); if (userExists["exists"]) { Navigator.of(context).pop(); - signUpError(); + MihAlertServices().emailExistsError(context); } else { var response2 = await http.post( Uri.parse("$baseAPI/auth/signup"), @@ -127,10 +126,10 @@ class _MihRegisterState extends State { //print("Here1"); } else if (userCreated["status"] == "FIELD_ERROR") { Navigator.of(context).pop(); - passwordReqError(); + MihAlertServices().passwordRequiredError(context); } else { Navigator.of(context).pop(); - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } } @@ -182,51 +181,6 @@ class _MihRegisterState extends State { ); } - void emailError() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Invalid Email"); - }, - ); - } - - void signUpError() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "User Exists"); - }, - ); - } - - void passwordError() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Password Match"); - }, - ); - } - - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - - void passwordReqError() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Password Requirements"); - }, - ); - } - @override Widget build(BuildContext context) { double screenWidth = MediaQuery.of(context).size.width; @@ -246,7 +200,7 @@ class _MihRegisterState extends State { if (_formKey.currentState!.validate()) { submitFormInput(); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } } }, @@ -348,8 +302,7 @@ class _MihRegisterState extends State { if (_formKey.currentState!.validate()) { submitFormInput(); } else { - MihAlertServices() - .formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_reset_password.dart b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_reset_password.dart index 307292a8..a87ed353 100644 --- a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_reset_password.dart +++ b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_reset_password.dart @@ -2,13 +2,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_authentication_services.dart'; @@ -33,7 +32,7 @@ class _MihResetPasswordState extends State { void submitFormInput() async { if (passwordController.text != confirmPasswordController.text) { - passwordError(); + MihAlertServices().passwordMatchError(context); } else { showDialog( context: context, @@ -47,7 +46,7 @@ class _MihResetPasswordState extends State { if (successfulResetPassword) { resetSuccessfully(); } else { - loginError(); + MihAlertServices().internetConnectionLost(context); } } } @@ -105,28 +104,6 @@ class _MihResetPasswordState extends State { alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return const MIHSuccessMessage( - // successType: "Success", - // successMessage: - // "We've sent a password reset link to your email address. Please check your inbox, including spam or junk folders.\n\nOnce you find the email, click on the link to reset your password.\n\nIf you don't receive the email within a few minutes, please try resending the reset request.\n\nThe reset link will expire after 2 hours"); - }, - ); - } - - void loginError() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Invalid Credentials"); - }, - ); - } - - void passwordError() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Password Match"); }, ); } @@ -150,7 +127,7 @@ class _MihResetPasswordState extends State { if (_formKey.currentState!.validate()) { submitFormInput(); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } } }, @@ -235,7 +212,7 @@ class _MihResetPasswordState extends State { if (_formKey.currentState!.validate()) { submitFormInput(); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_sign_in.dart b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_sign_in.dart index e45de3d0..e48d3369 100644 --- a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_sign_in.dart +++ b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_sign_in.dart @@ -2,15 +2,14 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_authentication_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_authentication_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; @@ -48,12 +47,12 @@ class _MihSignInState extends State { context, ); if (!successfulSignIn) { - loginError(); + MihAlertServices().loginErrorMessage(context); passwordController.clear(); } } on Exception { Navigator.of(context).pop(); - loginError(); + MihAlertServices().internetConnectionLost(context); passwordController.clear(); } } @@ -78,7 +77,7 @@ class _MihSignInState extends State { if (_formKey.currentState!.validate()) { submitSignInForm(); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, appName: "Patient", @@ -101,7 +100,7 @@ class _MihSignInState extends State { if (_formKey.currentState!.validate()) { submitSignInForm(); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, appName: "Doctor", @@ -125,7 +124,7 @@ class _MihSignInState extends State { if (_formKey.currentState!.validate()) { submitSignInForm(); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, appName: "Business", @@ -148,7 +147,7 @@ class _MihSignInState extends State { if (_formKey.currentState!.validate()) { submitSignInForm(); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, appName: "Test", @@ -175,15 +174,6 @@ class _MihSignInState extends State { MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } - void loginError() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Invalid Credentials"); - }, - ); - } - @override void initState() { super.initState(); @@ -211,7 +201,7 @@ class _MihSignInState extends State { if (_formKey.currentState!.validate()) { submitSignInForm(); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } } }, @@ -369,8 +359,7 @@ class _MihSignInState extends State { if (_formKey.currentState!.validate()) { submitSignInForm(); } else { - MihAlertServices() - .formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/mih_file_viewer/components/mih_print_prevew.dart b/Frontend/lib/mih_packages/mih_file_viewer/components/mih_print_prevew.dart index 850bf95e..4b241eae 100644 --- a/Frontend/lib/mih_packages/mih_file_viewer/components/mih_print_prevew.dart +++ b/Frontend/lib/mih_packages/mih_file_viewer/components/mih_print_prevew.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; import 'package:pdf/pdf.dart'; import 'package:printing/printing.dart'; -import '../../../mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import '../../../mih_package_components/mih_loading_circle.dart'; class MIHPrintPreview extends StatefulWidget { final PrintPreviewArguments arguments; diff --git a/Frontend/lib/mih_packages/mih_file_viewer/mih_fle_viewer.dart b/Frontend/lib/mih_packages/mih_file_viewer/mih_fle_viewer.dart index 7738b208..5432ca7a 100644 --- a/Frontend/lib/mih_packages/mih_file_viewer/mih_fle_viewer.dart +++ b/Frontend/lib/mih_packages/mih_file_viewer/mih_fle_viewer.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_file_viewer_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_file_viewer_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_file_viewer/package_tools/mih_expanded_file_view.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mih_file_viewer/package_tools/mih_expanded_file_view.dart b/Frontend/lib/mih_packages/mih_file_viewer/package_tools/mih_expanded_file_view.dart index df106ed4..d1fcdb70 100644 --- a/Frontend/lib/mih_packages/mih_file_viewer/package_tools/mih_expanded_file_view.dart +++ b/Frontend/lib/mih_packages/mih_file_viewer/package_tools/mih_expanded_file_view.dart @@ -3,9 +3,9 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_file_viewer_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_file_viewer_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:provider/provider.dart'; import 'package:syncfusion_flutter_core/theme.dart'; diff --git a/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart b/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart index 6a0e9f27..45a0e89f 100644 --- a/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart +++ b/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart @@ -1,19 +1,19 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/about_mih_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_access_controlls_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_authentication_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_banner_ad_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calculator_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calendar_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_ai_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_wallet_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_providers/about_mih_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_access_controlls_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_authentication_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_banner_ad_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calculator_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calendar_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_ai_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:provider/provider.dart'; import '../../../main.dart'; diff --git a/Frontend/lib/mih_packages/mih_home/mih_home.dart b/Frontend/lib/mih_packages/mih_home/mih_home.dart index afe5fefd..a4ce1881 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home.dart @@ -1,21 +1,21 @@ import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/user_consent.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_scack_bar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/about_mih_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/user_consent.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_scack_bar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/about_mih_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_home/components/mih_app_drawer.dart'; diff --git a/Frontend/lib/mih_packages/mih_home/mih_home_error.dart b/Frontend/lib/mih_packages/mih_home/mih_home_error.dart index e1a293a7..f956a808 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home_error.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home_error.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihHomeError extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/mih_home/mih_route_error.dart b/Frontend/lib/mih_packages/mih_home/mih_route_error.dart index 5805758f..728bc740 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_route_error.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_route_error.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihRouteError extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart b/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart index e1a421ed..a45201db 100644 --- a/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart +++ b/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart @@ -1,12 +1,12 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_ai_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_ai_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tile/about_mih_tile.dart'; import 'package:mzansi_innovation_hub/mih_packages/calculator/package_tiles/mih_calculator_tile.dart'; diff --git a/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart b/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart index 1c3789ed..aa55fed5 100644 --- a/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart +++ b/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart @@ -1,15 +1,15 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/Example/package_tiles/test_package_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_ai_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/Example/package_tiles/test_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_user.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_ai_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tile/about_mih_tile.dart'; import 'package:mzansi_innovation_hub/mih_packages/access_review/package_tile/mih_access_tile.dart'; diff --git a/Frontend/lib/mih_packages/mine_sweeper/builders/build_minesweeper_leaderboard_list.dart b/Frontend/lib/mih_packages/mine_sweeper/builders/build_minesweeper_leaderboard_list.dart index 07b36218..9feb86c2 100644 --- a/Frontend/lib/mih_packages/mine_sweeper/builders/build_minesweeper_leaderboard_list.dart +++ b/Frontend/lib/mih_packages/mine_sweeper/builders/build_minesweeper_leaderboard_list.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mine_sweeper/builders/build_my_scoreboard_list.dart b/Frontend/lib/mih_packages/mine_sweeper/builders/build_my_scoreboard_list.dart index 58dc3b23..44d64644 100644 --- a/Frontend/lib/mih_packages/mine_sweeper/builders/build_my_scoreboard_list.dart +++ b/Frontend/lib/mih_packages/mine_sweeper/builders/build_my_scoreboard_list.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mine_sweeper/components/leaderboard_user_ranking.dart b/Frontend/lib/mih_packages/mine_sweeper/components/leaderboard_user_ranking.dart index e2c4feb2..4bd48355 100644 --- a/Frontend/lib/mih_packages/mine_sweeper/components/leaderboard_user_ranking.dart +++ b/Frontend/lib/mih_packages/mine_sweeper/components/leaderboard_user_ranking.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:redacted/redacted.dart'; diff --git a/Frontend/lib/mih_packages/mine_sweeper/components/mih_mine_sweeper_start_game_window.dart b/Frontend/lib/mih_packages/mine_sweeper/components/mih_mine_sweeper_start_game_window.dart index 3ec5092e..5e2ed861 100644 --- a/Frontend/lib/mih_packages/mine_sweeper/components/mih_mine_sweeper_start_game_window.dart +++ b/Frontend/lib/mih_packages/mine_sweeper/components/mih_mine_sweeper_start_game_window.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mine_sweeper/components/mine_tile.dart b/Frontend/lib/mih_packages/mine_sweeper/components/mine_tile.dart index f6e653d8..d7d00a44 100644 --- a/Frontend/lib/mih_packages/mine_sweeper/components/mine_tile.dart +++ b/Frontend/lib/mih_packages/mine_sweeper/components/mine_tile.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/components/board_square.dart'; diff --git a/Frontend/lib/mih_packages/mine_sweeper/mih_mine_sweeper.dart b/Frontend/lib/mih_packages/mine_sweeper/mih_mine_sweeper.dart index 47c5c9ed..ec066b30 100644 --- a/Frontend/lib/mih_packages/mine_sweeper/mih_mine_sweeper.dart +++ b/Frontend/lib/mih_packages/mine_sweeper/mih_mine_sweeper.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_banner_ad_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_banner_ad_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/package_tools/mih_mine_sweeper_leader_board.dart'; import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/package_tools/mine_sweeper_game.dart'; import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/package_tools/mine_sweeper_quick_start_guide.dart'; diff --git a/Frontend/lib/mih_packages/mine_sweeper/package_tiles/mih_mine_sweeper_tile.dart b/Frontend/lib/mih_packages/mine_sweeper/package_tiles/mih_mine_sweeper_tile.dart index 9654cfcb..1c15c4e9 100644 --- a/Frontend/lib/mih_packages/mine_sweeper/package_tiles/mih_mine_sweeper_tile.dart +++ b/Frontend/lib/mih_packages/mine_sweeper/package_tiles/mih_mine_sweeper_tile.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihMineSweeperTile extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/mine_sweeper/package_tools/mih_mine_sweeper_leader_board.dart b/Frontend/lib/mih_packages/mine_sweeper/package_tools/mih_mine_sweeper_leader_board.dart index d9961c72..d6e74e12 100644 --- a/Frontend/lib/mih_packages/mine_sweeper/package_tools/mih_mine_sweeper_leader_board.dart +++ b/Frontend/lib/mih_packages/mine_sweeper/package_tools/mih_mine_sweeper_leader_board.dart @@ -2,11 +2,11 @@ import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/builders/build_minesweeper_leaderboard_list.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; diff --git a/Frontend/lib/mih_packages/mine_sweeper/package_tools/mine_sweeper_game.dart b/Frontend/lib/mih_packages/mine_sweeper/package_tools/mine_sweeper_game.dart index c701be22..2d9baab8 100644 --- a/Frontend/lib/mih_packages/mine_sweeper/package_tools/mine_sweeper_game.dart +++ b/Frontend/lib/mih_packages/mine_sweeper/package_tools/mine_sweeper_game.dart @@ -5,16 +5,16 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_banner_ad.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/components/board_square.dart'; import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/components/mih_mine_sweeper_start_game_window.dart'; diff --git a/Frontend/lib/mih_packages/mine_sweeper/package_tools/mine_sweeper_quick_start_guide.dart b/Frontend/lib/mih_packages/mine_sweeper/package_tools/mine_sweeper_quick_start_guide.dart index 6e4144c0..939b7055 100644 --- a/Frontend/lib/mih_packages/mine_sweeper/package_tools/mine_sweeper_quick_start_guide.dart +++ b/Frontend/lib/mih_packages/mine_sweeper/package_tools/mine_sweeper_quick_start_guide.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MineSweeperQuickStartGuide extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/mine_sweeper/package_tools/my_score_board.dart b/Frontend/lib/mih_packages/mine_sweeper/package_tools/my_score_board.dart index 7d8316b1..68bdefaa 100644 --- a/Frontend/lib/mih_packages/mine_sweeper/package_tools/my_score_board.dart +++ b/Frontend/lib/mih_packages/mine_sweeper/package_tools/my_score_board.dart @@ -2,13 +2,13 @@ import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/builders/build_my_scoreboard_list.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_minesweeper_services.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart b/Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart index 3628d003..2bb0fabf 100644 --- a/Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart +++ b/Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart @@ -1,11 +1,11 @@ import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_ai_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_ai_provider.dart'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_ai/package_tools/mih_ai_chat.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_data_helper_services.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart b/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart index de331e7a..e2fbcb75 100644 --- a/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart @@ -1,7 +1,7 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart b/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart index dd971442..ae91dda3 100644 --- a/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart +++ b/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart @@ -2,18 +2,18 @@ import 'dart:async'; import 'dart:convert'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_ai_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_ai_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_numeric_stepper.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_radio_options.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_numeric_stepper.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_radio_options.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:flutter/material.dart'; import 'package:flutter_chat_ui/flutter_chat_ui.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_ai/package_tools/mih_ai_chat.dart b/Frontend/lib/mih_packages/mzansi_ai/package_tools/mih_ai_chat.dart index 1888a393..657b7a5f 100644 --- a/Frontend/lib/mih_packages/mzansi_ai/package_tools/mih_ai_chat.dart +++ b/Frontend/lib/mih_packages/mzansi_ai/package_tools/mih_ai_chat.dart @@ -5,10 +5,10 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:flutter_tts/flutter_tts.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_ai_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_ai_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart b/Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart index 6d715696..122d5014 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_business_profile_preview.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_business_profile_preview.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart b/Frontend/lib/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart index 94e2d5ae..665fddd0 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_business_profile_preview.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_business_profile_preview.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart b/Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart index bebd0521..1ba4f568 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_personal_profile_preview.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_personal_profile_preview.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart b/Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart index 954f1ec6..612c3aa6 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart @@ -2,13 +2,13 @@ import 'package:flutter/material.dart'; import 'package:geolocator/geolocator.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart b/Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart index 10dfa6ac..4fe5ae30 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MzansiDirectoryTile extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_contacts.dart b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_contacts.dart index 8d9a8a0d..cc7c8f98 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_contacts.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_contacts.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihContacts extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart index ffc1646b..7c757b49 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart @@ -2,13 +2,13 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart index 472a67db..e43b6d8b 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart index fa7fe96a..6ea114da 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart @@ -1,6 +1,6 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_employee.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_employee.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_edit_employee_details_window.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart index cb3476fa..5e840533 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart @@ -1,5 +1,5 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_add_employee_window.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/busines_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/busines_profile.dart index d1e5bddf..a1fd920e 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/busines_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/busines_profile.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_qr_code.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart index e50a5d59..37d752c2 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_directory_services.dart'; @@ -104,10 +104,6 @@ class _MihAddBookmarkAlertState extends State { alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); }, ); } diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_employee_window.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_employee_window.dart index daf43813..ea2b8dfe 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_employee_window.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_employee_window.dart @@ -1,15 +1,14 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_business_employee_services.dart'; @@ -46,7 +45,7 @@ class _MihAddEmployeeWindowState extends State { "${widget.user.username} is now apart of your team with ${accessController.text} access to ${mzansiProfileProvider.business!.Name}"; successPopUp(message, false); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } @@ -101,19 +100,6 @@ class _MihAddEmployeeWindowState extends State { alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); - }, - ); - } - - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); }, ); } @@ -207,16 +193,10 @@ class _MihAddEmployeeWindowState extends State { if (isRequiredFieldsCaptured()) { createBusinessUserAPICall(mzansiProfileProvider); } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart index 7f5a1b39..a2e719f9 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/bookmarked_business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_review.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/bookmarked_business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_review.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart index c5496820..730e1a01 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/bookmarked_business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_objects/bookmarked_business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_directory_services.dart'; @@ -114,10 +114,6 @@ class _MihDeleteBookmarkAlertState extends State { alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); }, ); } diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_edit_employee_details_window.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_edit_employee_details_window.dart index 0b2bd362..129bbfc8 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_edit_employee_details_window.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_edit_employee_details_window.dart @@ -2,16 +2,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_employee.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_delete_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_employee.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_business_employee_services.dart'; @@ -50,11 +48,11 @@ class _MihEditEmployeeDetailsWindowState String message = "Your employees details have been updated."; successPopUp(message, false); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } - Future deleteNoteApiCall() async { + Future deleteEmployeeApiCall() async { int statusCode = await MihBusinessEmployeeServices().deleteEmployee( context.read(), widget.employee, @@ -65,19 +63,18 @@ class _MihEditEmployeeDetailsWindowState "The employee has been deleted successfully. This means they will no longer have access to your business profile"; successPopUp(message, false); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } void showDeleteWarning() { - showDialog( - context: context, - barrierDismissible: false, - builder: (context) => MIHDeleteMessage( - deleteType: "Employee", - onTap: () { - deleteNoteApiCall(); - })); + MihAlertServices().deleteConfirmationMessage( + "This team member will be deleted permanently from the business profile. Are you certain you want to delete it?", + () { + deleteEmployeeApiCall(); + }, + context, + ); } void successPopUp(String message, bool stayOnPersonalSide) { @@ -131,19 +128,6 @@ class _MihEditEmployeeDetailsWindowState alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); - }, - ); - } - - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); }, ); } @@ -279,16 +263,10 @@ class _MihEditEmployeeDetailsWindowState if (isRequiredFieldsCaptured()) { updateEmployeeAPICall(mzansiProfileProvider); } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart index c26477a5..d5be0f06 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart @@ -3,17 +3,17 @@ import 'package:flutter/material.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_review.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_review.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart'; @@ -299,10 +299,6 @@ class _MihReviewBusinessWindowState extends State { alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); }, ); } @@ -581,8 +577,7 @@ class _MihReviewBusinessWindowState extends State { directoryProvider, ); } else { - MihAlertServices() - .formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_update_business_details_window.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_update_business_details_window.dart index a5cef9de..cae226a2 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_update_business_details_window.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_update_business_details_window.dart @@ -4,16 +4,15 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; @@ -184,10 +183,6 @@ class _MihUpdateBusinessDetailsWindowState alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); }, ); } @@ -299,20 +294,10 @@ class _MihUpdateBusinessDetailsWindowState } else { context.pop(); if (!mounted) return; - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); + MihAlertServices().internetConnectionLost(context); } } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } } @@ -671,8 +656,7 @@ class _MihUpdateBusinessDetailsWindowState if (_formKey.currentState!.validate()) { submitForm(mzansiProfileProvider); } else { - MihAlertServices() - .formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_business_profile_view.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_business_profile_view.dart index 21231d4a..a9cb770b 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_business_profile_view.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_business_profile_view.dart @@ -1,12 +1,12 @@ import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_qr_code.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_set_up_business_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_set_up_business_profile.dart index 4449a393..0c4b10c5 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_set_up_business_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_set_up_business_profile.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_set_up.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart index 96d782bf..825ecc29 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart @@ -1,7 +1,7 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart index 4ae9ec40..418c84c1 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart @@ -1,9 +1,9 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart index c65a144c..2ec28813 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart @@ -1,14 +1,14 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_update_business_details_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; import 'package:provider/provider.dart'; class MihBusinessDetails extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_set_up.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_set_up.dart index 190c3055..b49abaab 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_set_up.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_set_up.dart @@ -5,16 +5,15 @@ import 'package:flutter/services.dart'; import 'package:go_router/go_router.dart'; import 'package:http/http.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_image_display.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_image_display.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; @@ -65,12 +64,7 @@ class _MihBusinessDetailsSetUpState extends State { if (isFieldsFilled()) { createBusinessProfileAPICall(mzansiProfileProvider); } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } } @@ -103,7 +97,7 @@ class _MihBusinessDetailsSetUpState extends State { } await createBusinessUserAPICall(mzansiProfileProvider); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } @@ -129,10 +123,10 @@ class _MihBusinessDetailsSetUpState extends State { "Your business profile is now live! You can now start connecting with customers and growing your business."; successPopUp(message, false); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } @@ -250,19 +244,6 @@ class _MihBusinessDetailsSetUpState extends State { alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); - }, - ); - } - - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); }, ); } @@ -343,7 +324,7 @@ class _MihBusinessDetailsSetUpState extends State { if (_formKey.currentState!.validate()) { submitForm(mzansiProfileProvider); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } } }, @@ -803,8 +784,7 @@ class _MihBusinessDetailsSetUpState extends State { if (_formKey.currentState!.validate()) { submitForm(mzansiProfileProvider); } else { - MihAlertServices() - .formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart index 2e4b0d32..1d4a1adc 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart @@ -2,14 +2,14 @@ import 'package:custom_rating_bar/custom_rating_bar.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; import 'package:provider/provider.dart'; class MihBusinessDetailsView extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_qr_code.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_qr_code.dart index 23079487..257e8284 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_qr_code.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_qr_code.dart @@ -7,19 +7,19 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; import 'package:provider/provider.dart'; import 'package:screenshot/screenshot.dart'; import 'package:share_plus/share_plus.dart'; @@ -92,15 +92,6 @@ class _MihBusinessQrCodeState extends State { } } - void mihLoadingPopUp() { - showDialog( - context: context, - builder: (context) { - return const Mihloadingcircle(); - }, - ); - } - Future downloadQrCode() async { if (_isUserSignedIn) { await screenshotController.capture().then((image) { diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart index f2f34dbd..fd9dd147 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart @@ -1,11 +1,11 @@ import 'package:custom_rating_bar/custom_rating_bar.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_review.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_review.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_directory_services.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart index b614dffb..bab9181f 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart @@ -1,10 +1,10 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart'; import 'package:flutter/material.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart index 4583f888..90b7a440 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart @@ -1,10 +1,10 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_employee.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_employee.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart index 29049149..c49f6bd1 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart @@ -3,21 +3,20 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_my_business_user_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_image_display.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_image_display.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:provider/provider.dart'; @@ -140,20 +139,10 @@ class _MihMyBusinessUserState extends State { ); } } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); + MihAlertServices().internetConnectionLost(context); } } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } } @@ -207,10 +196,6 @@ class _MihMyBusinessUserState extends State { alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); }, ); } @@ -433,7 +418,7 @@ class _MihMyBusinessUserState extends State { if (_formKey.currentState!.validate()) { submitForm(mzansiProfileProvider); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/components/mih_edit_personal_profile_window.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/components/mih_edit_personal_profile_window.dart index bd80f937..e31c1011 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/components/mih_edit_personal_profile_window.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/components/mih_edit_personal_profile_window.dart @@ -3,16 +3,15 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_toggle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_toggle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; @@ -106,7 +105,7 @@ class _MihEditPersonalProfileWindowState message, ); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } @@ -122,7 +121,7 @@ class _MihEditPersonalProfileWindowState if (response == 200) { deleteFileApiCall(mzansiProfileProvider, oldProPicName); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } @@ -138,7 +137,7 @@ class _MihEditPersonalProfileWindowState if (response == 200) { //SQL delete } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } @@ -220,10 +219,6 @@ class _MihEditPersonalProfileWindowState alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); }, ); } @@ -315,19 +310,6 @@ class _MihEditPersonalProfileWindowState alertColour: MihColors.getSecondaryColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); - }, - ); - } - - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); }, ); } @@ -546,7 +528,7 @@ class _MihEditPersonalProfileWindowState if (_formKey.currentState!.validate()) { submitForm(mzansiProfileProvider); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile.dart index 32be96aa..8c482d7a 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile.dart @@ -1,9 +1,9 @@ import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart'; import 'package:flutter/material.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile_view.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile_view.dart index 1eabbf3f..526493f9 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile_view.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile_view.dart @@ -1,7 +1,7 @@ import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart'; import 'package:flutter/material.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart index 3707b877..fd976a2c 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart @@ -1,7 +1,7 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart index abfdf4bf..7d411207 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart @@ -1,7 +1,7 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart index c47af691..2ba0cfae 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart @@ -2,12 +2,12 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/personal_profile/components/mih_edit_personal_profile_window.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart index 502c240e..1e9a8171 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart @@ -1,11 +1,11 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart index 1427074d..465868d8 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart @@ -1,11 +1,11 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart b/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart index 7110a464..801d2e84 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart @@ -3,22 +3,20 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_wallet_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_banner_ad.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_wallet_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_delete_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/loyalty_card.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_objects/loyalty_card.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/components/mih_card_display.dart'; import 'package:flutter/material.dart'; import 'package:barcode_widget/barcode_widget.dart'; @@ -160,33 +158,11 @@ class _BuildLoyaltyCardListState extends State { if (statusCode == 200) { context.pop(); context.pop(); - // context - // .read() - // .editLoyaltyCard( - // updatedCard: MIHLoyaltyCard( - // idloyalty_cards: - // widget.cardList[index].idloyalty_cards, - // app_id: widget.signedInUser.app_id, - // shop_name: widget.cardList[index].shop_name, - // card_number: _cardNumberController.text, - // favourite: widget.cardList[index].favourite, - // priority_index: - // widget.cardList[index].priority_index, - // nickname: _nicknameController.text, - // ), - // ); - // context.goNamed( - // "mzansiWallet", - // extra: WalletArguments( - // widget.signedInUser, - // 0, - // ), - // ); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( @@ -216,29 +192,24 @@ class _BuildLoyaltyCardListState extends State { void deleteCardWindow(MzansiProfileProvider mzansiProfileProvider, MzansiWalletProvider walletProvider, BuildContext ctxt, int index) { - showDialog( - context: context, - barrierDismissible: false, - builder: (context) { - return MIHDeleteMessage( - deleteType: "Loyalty Card", - onTap: () async { - int statusCode = - await MIHMzansiWalletApis.deleteLoyaltyCardAPICall( - walletProvider, - mzansiProfileProvider.user!, - widget.cardList[index].idloyalty_cards, - context, - ); - if (statusCode == 200) { - context.pop(); - context.pop(); - } else { - context.pop(); - internetConnectionPopUp(); - } - }); + MihAlertServices().deleteConfirmationMessage( + "This Card will be deleted permanently from your Mzansi Wallet. Are you certain you want to delete it?", + () async { + int statusCode = await MIHMzansiWalletApis.deleteLoyaltyCardAPICall( + walletProvider, + mzansiProfileProvider.user!, + widget.cardList[index].idloyalty_cards, + context, + ); + if (statusCode == 200) { + context.pop(); + context.pop(); + } else { + context.pop(); + MihAlertServices().internetConnectionLost(context); + } }, + context, ); } @@ -295,7 +266,7 @@ class _BuildLoyaltyCardListState extends State { ); context.read().setToolIndex(1); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } }, buttonColor: MihColors.getGreenColor( @@ -318,17 +289,6 @@ class _BuildLoyaltyCardListState extends State { ); } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - void removeFromFavCardWindow(MzansiProfileProvider mzansiProfileProvider, MzansiWalletProvider walletProvider, BuildContext ctxt, int index) { showDialog( @@ -382,7 +342,7 @@ class _BuildLoyaltyCardListState extends State { ); context.read().setToolIndex(0); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } }, buttonColor: MihColors.getRedColor( diff --git a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_add_card_window.dart b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_add_card_window.dart index d97ded85..b98574bc 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_add_card_window.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_add_card_window.dart @@ -2,15 +2,14 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_wallet_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/components/mih_card_display.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; @@ -34,17 +33,6 @@ class _MihAddCardWindowState extends State { final TextEditingController _nicknameController = TextEditingController(); final ValueNotifier _shopName = ValueNotifier(""); - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - void successPopUp(String title, String message, int packageIndex) { showDialog( context: context, @@ -294,13 +282,7 @@ class _MihAddCardWindowState extends State { onPressed: () async { if (_formKey.currentState!.validate()) { if (_shopController.text == "") { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } else { int statusCode = await MIHMzansiWalletApis .addLoyaltyCardAPICall( @@ -323,11 +305,12 @@ class _MihAddCardWindowState extends State { 0, ); } else { - internetConnectionPopUp(); + MihAlertServices() + .internetConnectionLost(context); } } } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart index ae1c2491..e889cd29 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mobile_scanner/mobile_scanner.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihBarcodeScanner extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart index 4829c409..a7facfc3 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart @@ -20,142 +20,142 @@ class _MihCardDisplayState extends State { switch (widget.shopName.toLowerCase()) { case "apple tree": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/apple_tree-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/apple_tree-min.png'); case "best before": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/best_before-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/best_before-min.png'); case "checkers": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/checkers-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/checkers-min.png'); case "clicks": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/clicks-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/clicks-min.png'); case "cotton:on": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/cotton_on-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/cotton_on-min.png'); case "dis-chem": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/dischem-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/dischem-min.png'); case "pick n pay": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pick_n_pay-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/pick_n_pay-min.png'); case "shoprite": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/shoprite-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/shoprite-min.png'); case "spar": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/spar-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/spar-min.png'); case "woolworths": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/woolworths-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/woolworths-min.png'); case "makro": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/makro-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/makro-min.png'); case "fresh stop": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/fresh_stop-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/fresh_stop-min.png'); case "panarottis": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/panarottis-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/panarottis-min.png'); case "shell": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/shell-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/shell-min.png'); case "edgars": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/edgars-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/edgars-min.png'); case "jet": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/jet-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/jet-min.png'); case "spur": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/spur-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/spur-min.png'); case "infinity": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/infinity-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/infinity-min.png'); case "eskom": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/eskom-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/eskom-min.png'); case "+more": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/plus_more-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/plus_more-min.png'); case "bp": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/bp-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/bp-min.png'); case "builders warehouse": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/builders-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/builders-min.png'); case "exclusive books": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/exclusive_books-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/exclusive_books-min.png'); case "pna": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pna-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/pna-min.png'); case "pq clothing": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pq-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/pq-min.png'); case "rage": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/rage-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/rage-min.png'); case "sasol": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/sasol-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/sasol-min.png'); case "tfg group": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/tfg-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/tfg-min.png'); case "toys r us": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/toysrus-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/toysrus-min.png'); case "leroy merlin": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/leroy_merlin-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/leroy_merlin-min.png'); case "signature cosmetics & fragrances": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/signature_cosmetics-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/signature_cosmetics-min.png'); case "ok foods": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/ok_food-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/ok_food-min.png'); case "choppies": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/choppies-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/choppies-min.png'); case "boxer": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/boxer-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/boxer-min.png'); case "carrefour": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/carrefour-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/carrefour-min.png'); case "sefalana": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/sefalana-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/sefalana-min.png'); case "big save": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/big_save-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/big_save-min.png'); case "justrite": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/justrite-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/justrite-min.png'); case "naivas": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/naivas-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/naivas-min.png'); case "kero": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/kero-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/kero-min.png'); case "auchan": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/auchan-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/auchan-min.png'); case "woermann brock": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/woermann_brock-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/woermann_brock-min.png'); case "continente": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/continente-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/continente-min.png'); case "fresmart": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/fresmart-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/fresmart-min.png'); case "total energies": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/total_energies-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/total_energies-min.png'); case "engen": return Image.asset( - 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/engen-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/mini/engen-min.png'); default: return null; } diff --git a/Frontend/lib/mih_packages/mzansi_wallet/mih_wallet.dart b/Frontend/lib/mih_packages/mzansi_wallet/mih_wallet.dart index 95f2b475..5f1fe247 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/mih_wallet.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/mih_wallet.dart @@ -1,10 +1,10 @@ import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_wallet_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/package_tools/mih_cards.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart b/Frontend/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart index baa72c54..df42f0bb 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart @@ -1,7 +1,7 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart index 5df6695c..726c445a 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_wallet_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/loyalty_card.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_objects/loyalty_card.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart index 65abd81b..c827b917 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart @@ -1,17 +1,16 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_wallet_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/components/mih_add_card_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/loyalty_card.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; +import 'package:mzansi_innovation_hub/mih_objects/loyalty_card.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart'; import 'package:flutter/material.dart'; import 'package:mobile_scanner/mobile_scanner.dart'; @@ -110,17 +109,6 @@ class _MihCardsState extends State { ); } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - void addCardWindow(BuildContext ctxt, double width) { showDialog( context: context, diff --git a/Frontend/lib/mih_packages/patient_manager/pat_manager/list_builders/build_mih_patient_search_list.dart b/Frontend/lib/mih_packages/patient_manager/pat_manager/list_builders/build_mih_patient_search_list.dart index df3bdac4..bf84743f 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_manager/list_builders/build_mih_patient_search_list.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_manager/list_builders/build_mih_patient_search_list.dart @@ -1,18 +1,18 @@ import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_access_controls_services.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_warning_message.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -34,15 +34,6 @@ class _BuildPatientsListState extends State { TextEditingController accessStatusController = TextEditingController(); final baseAPI = AppEnviroment.baseApiUrl; - void noAccessWarning() { - showDialog( - context: context, - builder: (context) { - return const MIHWarningMessage(warningType: "No Access"); - }, - ); - } - Future hasAccessToProfile(MzansiProfileProvider profileProvider, PatientManagerProvider patientManagerProvider, int index) async { var hasAccess = false; @@ -309,7 +300,11 @@ class _BuildPatientsListState extends State { // "business", // )); } else { - noAccessWarning(); + MihAlertServices().warningMessage( + "Access Pending", + "Your access request is currently being reviewed.\nOnce approved, you'll be able to view patient data.\nPlease follow up with the patient to approve your access request.", + context, + ); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/patient_manager/pat_manager/list_builders/build_my_patient_list_list.dart b/Frontend/lib/mih_packages/patient_manager/pat_manager/list_builders/build_my_patient_list_list.dart index a77f4840..ee348ee6 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_manager/list_builders/build_my_patient_list_list.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_manager/list_builders/build_my_patient_list_list.dart @@ -1,8 +1,8 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; @@ -10,14 +10,12 @@ import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_calendar_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_date_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_time_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_warning_message.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_date_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_time_field.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -66,21 +64,10 @@ class _BuildPatientsListState extends State { successPopUp("Successfully Added Appointment", "You appointment has been successfully added to your calendar."); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - void successPopUp(String title, String message) { showDialog( context: context, @@ -255,16 +242,10 @@ class _BuildPatientsListState extends State { submitApointment( profileProvider, patientManagerProvider, index); } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( @@ -295,18 +276,16 @@ class _BuildPatientsListState extends State { void noAccessWarning( PatientManagerProvider patientManagerProvider, int index) { if (patientManagerProvider.myPaitentList![index].status == "pending") { - showDialog( - context: context, - builder: (context) { - return const MIHWarningMessage(warningType: "No Access"); - }, + MihAlertServices().warningMessage( + "Access Pending", + "Your access request is currently being reviewed.\nOnce approved, you'll be able to view patient data.\nPlease follow up with the patient to approve your access request.", + context, ); } else { - showDialog( - context: context, - builder: (context) { - return const MIHWarningMessage(warningType: "Access Declined"); - }, + MihAlertServices().warningMessage( + "Access Declined", + "Your request to access the patient's profile has been denied. Please contact the patient directly to inquire about the reason for this restriction.", + context, ); } } diff --git a/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tiles/pat_manager_tile.dart b/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tiles/pat_manager_tile.dart index 438f411d..d0aa5f42 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tiles/pat_manager_tile.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tiles/pat_manager_tile.dart @@ -1,8 +1,8 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; diff --git a/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/mih_patient_search.dart b/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/mih_patient_search.dart index a795732a..0497e3b9 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/mih_patient_search.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/mih_patient_search.dart @@ -1,14 +1,14 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_access.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patients.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patient_access.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patients.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_manager/list_builders/build_mih_patient_search_list.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/my_patient_list.dart b/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/my_patient_list.dart index f2b426ee..f35c2fa7 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/my_patient_list.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/my_patient_list.dart @@ -1,14 +1,14 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_access.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patient_access.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_manager/list_builders/build_my_patient_list_list.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/waiting_room.dart b/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/waiting_room.dart index 3c407aac..0a38e0d8 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/waiting_room.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_manager/package_tools/waiting_room.dart @@ -1,29 +1,28 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calendar_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calendar_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_calendar_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_calendar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_date_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_time_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_calendar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_date_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_time_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/appointment.dart'; +import 'package:mzansi_innovation_hub/mih_objects/appointment.dart'; import 'package:mzansi_innovation_hub/mih_packages/calendar/builder/build_appointment_list.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -411,7 +410,7 @@ class _WaitingRoomState extends State { addAppointmentCall( profileProvider, mihCalendarProvider); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( @@ -463,30 +462,14 @@ class _WaitingRoomState extends State { "You appointment has been successfully added to your calendar."); _loadInitialAppointments(); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } checkforchange(); } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - void successPopUp(String title, String message) { showDialog( context: context, diff --git a/Frontend/lib/mih_packages/patient_manager/pat_manager/pat_manager.dart b/Frontend/lib/mih_packages/patient_manager/pat_manager/pat_manager.dart index 8a5cba4f..0a6091d6 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_manager/pat_manager.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_manager/pat_manager.dart @@ -1,11 +1,11 @@ import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calendar_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calendar_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_manager/package_tools/mih_patient_search.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_manager/package_tools/my_patient_list.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_manager/package_tools/waiting_room.dart'; diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/components/claim_statement_window.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/components/claim_statement_window.dart index aec587b9..c92a3aed 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/components/claim_statement_window.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/components/claim_statement_window.dart @@ -1,22 +1,21 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_claim_statement_generation_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_icd10_code_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_date_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_radio_options.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/icd10_code.dart.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_date_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_radio_options.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_objects/icd10_code.dart.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/components/icd10_search_window.dart'; import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; @@ -389,16 +388,10 @@ class _ClaimStatementWindowState extends State { AppEnviroment.getEnv(), context); } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/components/icd10_search_window.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/components/icd10_search_window.dart index c6699842..59d25a3b 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/components/icd10_search_window.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/components/icd10_search_window.dart @@ -1,9 +1,9 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/icd10_code.dart.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_objects/icd10_code.dart.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/list_builders/build_icd10_code_list.dart'; import 'package:flutter/material.dart'; diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/components/medicine_search.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/components/medicine_search.dart index f3420c85..9b02a2a7 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/components/medicine_search.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/components/medicine_search.dart @@ -1,11 +1,11 @@ import 'dart:convert'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/medicine.dart'; +import 'package:mzansi_innovation_hub/mih_objects/medicine.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/list_builders/build_med_list.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:supertokens_flutter/http.dart' as http; @@ -38,20 +38,11 @@ class _MedicineSearchState extends State { // medicines.forEach((element) => meds.add(element.name)); return medicines; } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); throw Exception('failed to load medicine'); } } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - @override void dispose() { super.dispose(); diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/components/mih_edit_patient_details_window.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/components/mih_edit_patient_details_window.dart index 87defc63..491b64c6 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/components/mih_edit_patient_details_window.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/components/mih_edit_patient_details_window.dart @@ -2,13 +2,13 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_toggle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_toggle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart'; @@ -136,10 +136,6 @@ class _MihEditPatientDetailsWindowState alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); }, ); } @@ -426,7 +422,7 @@ class _MihEditPatientDetailsWindowState if (_formKey.currentState!.validate()) { updatePatientApiCall(patientManagerProvider); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( @@ -547,7 +543,7 @@ class _MihEditPatientDetailsWindowState if (_formKey.currentState!.validate()) { updatePatientApiCall(patientManagerProvider); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } } }, diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/components/prescip_input.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/components/prescip_input.dart index 543d26a7..cdd1a8f0 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/components/prescip_input.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/components/prescip_input.dart @@ -1,22 +1,21 @@ import 'dart:convert'; +import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_numeric_stepper.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_numeric_stepper.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/components/medicine_search.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patients.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/perscription.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patients.dart'; +import 'package:mzansi_innovation_hub/mih_objects/perscription.dart'; import 'package:flutter/material.dart'; import 'package:supertokens_flutter/http.dart' as http; @@ -103,12 +102,11 @@ class _PrescripInputState extends State { return const Mihloadingcircle(); }, ); - DateTime now = new DateTime.now(); + DateTime now = DateTime.now(); // DateTime date = new DateTime(now.year, now.month, now.day); String fileName = "Perscription-${widget.selectedPatient.first_name} ${widget.selectedPatient.last_name}-${now.toString().substring(0, 19)}.pdf" .replaceAll(RegExp(r' '), '-'); - var response1 = await http.post( Uri.parse("${AppEnviroment.baseApiUrl}/minio/generate/perscription/"), headers: { @@ -148,57 +146,91 @@ class _PrescripInputState extends State { ); //print(response2.statusCode); if (response2.statusCode == 201) { - setState(() { - //To do - widget.medicineController.clear(); - widget.dosageController.clear(); - widget.timesDailyController.clear(); - widget.noDaysController.clear(); - widget.timesDailyController.clear(); - widget.noRepeatsController.clear(); - widget.quantityController.clear(); - widget.outputController.clear(); - // futueFiles = fetchFiles(); - }); + //To do + widget.medicineController.clear(); + widget.dosageController.clear(); + widget.timesDailyController.clear(); + widget.noDaysController.clear(); + widget.timesDailyController.clear(); + widget.noRepeatsController.clear(); + widget.quantityController.clear(); + widget.outputController.clear(); + // futueFiles = fetchFiles(); // end loading circle - Navigator.of(context).pop(); - Navigator.of(context).pop(); - Navigator.of(context).pop(); - Navigator.of(context).pushNamed('/patient-manager/patient', - arguments: PatientViewArguments( - widget.signedInUser, - widget.selectedPatient, - widget.businessUser, - widget.business, - "business", - )); + context.pop(); + context.pop(); String message = "The perscription $fileName has been successfully generated and added to ${widget.selectedPatient.first_name} ${widget.selectedPatient.last_name}'s record. You can now access and download it for their use."; successPopUp(message); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - void successPopUp(String message) { showDialog( context: context, builder: (context) { - return MIHSuccessMessage( - successType: "Success", - successMessage: message, + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.check_circle_outline_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Text( + "Success!", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + Center( + child: Text( + message, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), ); }, ); @@ -453,16 +485,10 @@ class _PrescripInputState extends State { widget.noRepeatsController.text = "0"; }); } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getSecondaryColor( @@ -548,14 +574,8 @@ class _PrescripInputState extends State { if (perscriptionObjOutput.isNotEmpty) { //print(jsonEncode(perscriptionObjOutput)); await generatePerscription(); - Navigator.pop(context); } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_claim_statement_files_list.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_claim_statement_files_list.dart index 137cd93c..fc29a05c 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_claim_statement_files_list.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_claim_statement_files_list.dart @@ -4,18 +4,17 @@ import 'package:fl_downloader/fl_downloader.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_file_viewer_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_file_viewer_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/list_builders/build_file_view.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -52,54 +51,70 @@ class _BuildClaimStatementFileListState return teporaryFileUrl; } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - void successPopUp(String message) { showDialog( context: context, builder: (context) { - return MIHSuccessMessage( - successType: "Success", - successMessage: message, + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + windowBody: Column( + children: [ + Icon( + Icons.check_circle_outline_rounded, + size: 100, + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Text( + "Success!", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + Center( + child: Text( + message, + style: TextStyle( + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), ); }, ); } - // void deleteFilePopUp(String filePath, int fileID) { - // showDialog( - // context: context, - // barrierDismissible: false, - // builder: (context) => MIHDeleteMessage( - // deleteType: "File", - // onTap: () async { - // //API Call here - // await MIHClaimStatementGenerationApi - // .deleteClaimStatementFilesByFileID( - // PatientViewArguments( - // widget.signedInUser, - // widget.selectedPatient, - // widget.businessUser, - // widget.business, - // "business", - // ), - // widget.env, - // filePath, - // fileID, - // context, - // ); - // }, - // ), - // ); - // } - String getFileName(String path) { //print(pdfLink.split(".")[1]); return path.split("/").last; diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_file_view.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_file_view.dart index 454ed488..e78add87 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_file_view.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_file_view.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:syncfusion_flutter_core/theme.dart'; diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_files_list.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_files_list.dart index 4b2dfe39..a6ffd6f1 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_files_list.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_files_list.dart @@ -6,18 +6,17 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_file_viewer_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_file_viewer_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/list_builders/build_file_view.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -52,107 +51,72 @@ class _BuildFilesListState extends State { return teporaryFileUrl; } - // Future deleteFileApiCall(PatientManagerProvider patientManagerProvider, - // String filePath, int fileID) async { - // var response = await MihFileApi.deleteFile( - // patientManagerProvider.selectedPatient!.app_id, - // widget.env, - // "patient_files", - // filePath.split("/").last, - // context, - // ); - // if (response == 200) { - // // delete file from database - // await deletePatientFileLocationToDB(fileID); - // } else { - // String message = - // "The File has not been deleted successfully. Please try again."; - // successPopUp(message); - // } - // } - - // Future deletePatientFileLocationToDB(int fileID) async { - // showDialog( - // context: context, - // builder: (context) { - // return const Mihloadingcircle(); - // }, - // ); - // var response2 = await http.delete( - // Uri.parse("$baseAPI/patient_files/delete/"), - // headers: { - // "Content-Type": "application/json; charset=UTF-8" - // }, - // body: jsonEncode({ - // "idpatient_files": fileID, - // "env": widget.env, - // }), - // ); - // if (response2.statusCode == 200) { - // context.pop(); //Remove Loading Dialog - // context.pop(); //Remove Delete Dialog - // context.pop(); //Remove File View Dialog - // context.pop(); //Remove File List Dialog - // //print(widget.business); - // if (widget.business == null) { - // context.pushNamed('patientManagerPatient', - // extra: PatientViewArguments( - // widget.signedInUser, - // widget.selectedPatient, - // widget.businessUser, - // widget.business, - // "personal")); - // } else { - // context.pushNamed('patientManagerPatient', - // extra: PatientViewArguments( - // widget.signedInUser, - // widget.selectedPatient, - // widget.businessUser, - // widget.business, - // "business")); - // } - // String message = - // "The File has been deleted successfully. This means it will no longer be visible on your and cannot be used for future appointments."; - // successPopUp(message); - // } else { - // internetConnectionPopUp(); - // } - // } - - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - void successPopUp(String message) { showDialog( context: context, builder: (context) { - return MIHSuccessMessage( - successType: "Success", - successMessage: message, + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.check_circle_outline_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Text( + "Success!", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + Center( + child: Text( + message, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), ); }, ); } - // void deleteFilePopUp(String filePath, int fileID) { - // showDialog( - // context: context, - // barrierDismissible: false, - // builder: (context) => MIHDeleteMessage( - // deleteType: "File", - // onTap: () async { - // await deleteFileApiCall(filePath, fileID); - // }, - // ), - // ); - // } - String getFileName(String path) { //print(pdfLink.split(".")[1]); return path.split("/").last; diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_icd10_code_list.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_icd10_code_list.dart index 9412acec..dfc7cf16 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_icd10_code_list.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_icd10_code_list.dart @@ -1,7 +1,7 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/icd10_code.dart.dart'; +import 'package:mzansi_innovation_hub/mih_objects/icd10_code.dart.dart'; import 'package:flutter/material.dart'; class BuildICD10CodeList extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_med_list.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_med_list.dart index 7f0c0db8..235c4617 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_med_list.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_med_list.dart @@ -1,5 +1,5 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/medicine.dart'; +import 'package:mzansi_innovation_hub/mih_objects/medicine.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_notes_list.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_notes_list.dart index 993c12b1..6ac295a0 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_notes_list.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/list_builders/build_notes_list.dart @@ -1,19 +1,18 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_delete_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/notes.dart'; +import 'package:mzansi_innovation_hub/mih_objects/notes.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart'; import 'package:provider/provider.dart'; @@ -46,7 +45,7 @@ class _BuildNotesListState extends State { "The note has been deleted successfully. This means it will no longer be visible on your and cannot be used for future appointments."; successPopUp("Successfuly Deleted", message); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } @@ -101,34 +100,18 @@ class _BuildNotesListState extends State { alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); - }, - ); - } - - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); }, ); } void deletePatientPopUp( PatientManagerProvider patientManagerProvider, int NoteId) { - showDialog( - context: context, - barrierDismissible: false, - builder: (context) => MIHDeleteMessage( - deleteType: "Note", - onTap: () { - deleteNoteApiCall(patientManagerProvider, NoteId); - }, - ), + MihAlertServices().deleteConfirmationMessage( + "This note will be deleted permanently. Are you certain you want to delete it?", + () { + deleteNoteApiCall(patientManagerProvider, NoteId); + }, + context, ); } diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart index 6c64f5c2..c22b49f0 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart @@ -1,8 +1,8 @@ import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_claim_or_statement.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_claim_or_statement.dart index 8477da3d..e28a3bae 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_claim_or_statement.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_claim_or_statement.dart @@ -1,10 +1,10 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/components/claim_statement_window.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/list_builders/build_claim_statement_files_list.dart'; import 'package:flutter/material.dart'; diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_consultation.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_consultation.dart index fdd28fbe..eafbafda 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_consultation.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_consultation.dart @@ -1,19 +1,20 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; +import 'package:go_router/go_router.dart'; +import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/list_builders/build_notes_list.dart'; import 'package:flutter/material.dart'; @@ -38,11 +39,38 @@ class _PatientConsultationState extends State { String endpoint = "${AppEnviroment.baseApiUrl}/notes/patients/"; final _formKey = GlobalKey(); - void addNotePopUp(MzansiProfileProvider profileProvider, double width) { - DateTime now = new DateTime.now(); - DateTime date = new DateTime(now.year, now.month, now.day); + Future addPatientNoteAPICall( + MzansiProfileProvider profileProvider, + PatientManagerProvider patManProvider, + ) async { + int statuscode = await MihPatientServices().addPatientNoteAPICall( + titleController.text, + noteTextController.text, + profileProvider, + patManProvider, + ); + if (statuscode == 201) { + context.pop(); + successPopUp("Note added successfully."); + titleController.clear(); + noteTextController.clear(); + officeController.clear(); + dateController.clear(); + doctorController.clear(); + } else { + MihAlertServices().internetConnectionLost(context); + } + } + + void addNotePopUp( + MzansiProfileProvider profileProvider, + PatientManagerProvider patManProvider, + double width, + ) { + DateTime now = DateTime.now(); + DateTime date = DateTime(now.year, now.month, now.day); var title = ""; - print("Business User: ${profileProvider.businessUser}"); + KenLogger.success("Business User: ${profileProvider.businessUser}"); if (profileProvider.businessUser?.title == "Doctor") { title = "Dr."; } @@ -59,7 +87,7 @@ class _PatientConsultationState extends State { fullscreen: false, windowTitle: "Add Note", onWindowTapClose: () { - Navigator.pop(context); + context.pop(context); titleController.clear(); noteTextController.clear(); }, @@ -172,10 +200,10 @@ class _PatientConsultationState extends State { child: MihButton( onPressed: () { if (_formKey.currentState!.validate()) { - // addPatientNoteAPICall(); - Navigator.pop(context); + addPatientNoteAPICall( + profileProvider, patManProvider); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( @@ -227,23 +255,68 @@ class _PatientConsultationState extends State { showDialog( context: context, builder: (context) { - return MIHSuccessMessage( - successType: "Success", - successMessage: message, + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.check_circle_outline_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Text( + "Success!", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + Center( + child: Text( + message, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), ); }, ); } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - @override void dispose() { titleController.dispose(); @@ -314,7 +387,8 @@ class _PatientConsultationState extends State { "Dark"), onTap: () { // addConsultationNotePopUp(); - addNotePopUp(profileProvider, width); + addNotePopUp( + profileProvider, patientManagerProvider, width); }, ) ], diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_documents.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_documents.dart index 7f278050..f87cf693 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_documents.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_documents.dart @@ -1,24 +1,23 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_date_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_date_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/components/prescip_input.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/list_builders/build_files_list.dart'; @@ -57,12 +56,7 @@ class _PatientDocumentsState extends State { if (isFileFieldsFilled()) { await uploadSelectedFile(patientManagerProvider, selected); } else { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Input Error"); - }, - ); + MihAlertServices().inputErrorMessage(context); } } @@ -87,7 +81,7 @@ class _PatientDocumentsState extends State { "The file $fname has been successfully generated and added to ${patientManagerProvider.selectedPatient!.first_name} ${patientManagerProvider.selectedPatient!.last_name}'s record. You can now access and download it for their use."; successPopUp("Successfully Uplouded File", message); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } @@ -103,7 +97,7 @@ class _PatientDocumentsState extends State { if (response == 200) { await addPatientFileLocationToDB(patientManagerProvider, file); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } @@ -134,7 +128,7 @@ class _PatientDocumentsState extends State { "The medical certificate $fileName has been successfully generated and added to ${patientManagerProvider.selectedPatient!.first_name} ${patientManagerProvider.selectedPatient!.last_name}'s record. You can now access and download it for their use."; successPopUp("Successfully Generated Certificate", message); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } @@ -222,9 +216,8 @@ class _PatientDocumentsState extends State { if (_formKey.currentState!.validate()) { submitDocUploadForm(patientManagerProvider); // uploadSelectedFile(selected); - Navigator.pop(context); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( @@ -310,7 +303,7 @@ class _PatientDocumentsState extends State { profileProvider, patientManagerProvider); //Navigator.pop(context); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( @@ -557,15 +550,6 @@ class _PatientDocumentsState extends State { ); } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - @override void dispose() { startDateController.dispose(); diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_info.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_info.dart index bf34933e..ec5bc678 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_info.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_info.dart @@ -1,13 +1,13 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/components/mih_edit_patient_details_window.dart'; import 'package:provider/provider.dart'; @@ -195,7 +195,7 @@ class _PatientInfoState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "${patientManagerProvider.selectedPatient!.medical_aid} - ${patientManagerProvider.selectedPatient!.medical_aid_scheme}", + "${patientManagerProvider.selectedPatient!.medical_aid_name} - ${patientManagerProvider.selectedPatient!.medical_aid_scheme}", style: titleStyle, ), RichText( diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_setup_form.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_setup_form.dart index c982820a..025159e9 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_setup_form.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_setup_form.dart @@ -1,14 +1,13 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_toggle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_toggle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart'; @@ -66,7 +65,7 @@ class _PatientSetupFormState extends State { "${fnameController.text} ${lnameController.text} patient profile has been successfully added!\n"; successPopUp("Successfully created Patient Profile", message); } else { - internetConnectionPopUp(); + MihAlertServices().internetConnectionLost(context); } } @@ -127,15 +126,6 @@ class _PatientSetupFormState extends State { ); } - void internetConnectionPopUp() { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - void isRequired() { //print("listerner triggered"); if (medAidController.text == "Yes") { @@ -468,7 +458,7 @@ class _PatientSetupFormState extends State { addPatientService( profileProvider, patientManagerProvider); } else { - MihAlertServices().formNotFilledCompletely(context); + MihAlertServices().inputErrorMessage(context); } }, buttonColor: MihColors.getGreenColor( diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart index 839bbb9e..9926f643 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart @@ -1,10 +1,10 @@ import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/package_tools/patient_claim_or_statement.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/package_tools/patient_consultation.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/package_tools/patient_documents.dart'; diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_set_up.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_set_up.dart index 5f4f319d..cc968072 100644 --- a/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_set_up.dart +++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_set_up.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/package_tools/patient_setup_form.dart'; import 'package:provider/provider.dart'; diff --git a/Frontend/lib/mih_components/mih_providers/about_mih_provider.dart b/Frontend/lib/mih_providers/about_mih_provider.dart similarity index 100% rename from Frontend/lib/mih_components/mih_providers/about_mih_provider.dart rename to Frontend/lib/mih_providers/about_mih_provider.dart diff --git a/Frontend/lib/mih_components/mih_providers/mih_access_controlls_provider.dart b/Frontend/lib/mih_providers/mih_access_controlls_provider.dart similarity index 90% rename from Frontend/lib/mih_components/mih_providers/mih_access_controlls_provider.dart rename to Frontend/lib/mih_providers/mih_access_controlls_provider.dart index dd7f11a0..5c6f97fc 100644 --- a/Frontend/lib/mih_components/mih_providers/mih_access_controlls_provider.dart +++ b/Frontend/lib/mih_providers/mih_access_controlls_provider.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_access.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patient_access.dart'; class MihAccessControllsProvider extends ChangeNotifier { int toolIndex; diff --git a/Frontend/lib/mih_components/mih_providers/mih_authentication_provider.dart b/Frontend/lib/mih_providers/mih_authentication_provider.dart similarity index 100% rename from Frontend/lib/mih_components/mih_providers/mih_authentication_provider.dart rename to Frontend/lib/mih_providers/mih_authentication_provider.dart diff --git a/Frontend/lib/mih_components/mih_providers/mih_banner_ad_provider.dart b/Frontend/lib/mih_providers/mih_banner_ad_provider.dart similarity index 100% rename from Frontend/lib/mih_components/mih_providers/mih_banner_ad_provider.dart rename to Frontend/lib/mih_providers/mih_banner_ad_provider.dart diff --git a/Frontend/lib/mih_components/mih_providers/mih_calculator_provider.dart b/Frontend/lib/mih_providers/mih_calculator_provider.dart similarity index 100% rename from Frontend/lib/mih_components/mih_providers/mih_calculator_provider.dart rename to Frontend/lib/mih_providers/mih_calculator_provider.dart diff --git a/Frontend/lib/mih_components/mih_providers/mih_calendar_provider.dart b/Frontend/lib/mih_providers/mih_calendar_provider.dart similarity index 96% rename from Frontend/lib/mih_components/mih_providers/mih_calendar_provider.dart rename to Frontend/lib/mih_providers/mih_calendar_provider.dart index fe4ee6b6..cdcdde0e 100644 --- a/Frontend/lib/mih_components/mih_providers/mih_calendar_provider.dart +++ b/Frontend/lib/mih_providers/mih_calendar_provider.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart'; import 'package:ken_logger/ken_logger.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/appointment.dart'; +import 'package:mzansi_innovation_hub/mih_objects/appointment.dart'; class MihCalendarProvider extends ChangeNotifier { int toolIndex; diff --git a/Frontend/lib/mih_components/mih_providers/mih_file_viewer_provider.dart b/Frontend/lib/mih_providers/mih_file_viewer_provider.dart similarity index 100% rename from Frontend/lib/mih_components/mih_providers/mih_file_viewer_provider.dart rename to Frontend/lib/mih_providers/mih_file_viewer_provider.dart diff --git a/Frontend/lib/mih_components/mih_providers/mih_mine_sweeper_provider.dart b/Frontend/lib/mih_providers/mih_mine_sweeper_provider.dart similarity index 94% rename from Frontend/lib/mih_components/mih_providers/mih_mine_sweeper_provider.dart rename to Frontend/lib/mih_providers/mih_mine_sweeper_provider.dart index 50b58831..dd1e9bf8 100644 --- a/Frontend/lib/mih_components/mih_providers/mih_mine_sweeper_provider.dart +++ b/Frontend/lib/mih_providers/mih_mine_sweeper_provider.dart @@ -1,5 +1,5 @@ import 'package:flutter/widgets.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/minesweeper_player_score.dart'; +import 'package:mzansi_innovation_hub/mih_objects/minesweeper_player_score.dart'; class MihMineSweeperProvider extends ChangeNotifier { String difficulty; diff --git a/Frontend/lib/mih_components/mih_providers/mzansi_ai_provider.dart b/Frontend/lib/mih_providers/mzansi_ai_provider.dart similarity index 98% rename from Frontend/lib/mih_components/mih_providers/mzansi_ai_provider.dart rename to Frontend/lib/mih_providers/mzansi_ai_provider.dart index 574977a0..a74520ca 100644 --- a/Frontend/lib/mih_components/mih_providers/mzansi_ai_provider.dart +++ b/Frontend/lib/mih_providers/mzansi_ai_provider.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_ai_toolkit/flutter_ai_toolkit.dart'; import 'package:flutter_markdown_plus/flutter_markdown_plus.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/ollama_provider.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_providers/ollama_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; diff --git a/Frontend/lib/mih_components/mih_providers/mzansi_directory_provider.dart b/Frontend/lib/mih_providers/mzansi_directory_provider.dart similarity index 90% rename from Frontend/lib/mih_components/mih_providers/mzansi_directory_provider.dart rename to Frontend/lib/mih_providers/mzansi_directory_provider.dart index ef05f620..ed88e863 100644 --- a/Frontend/lib/mih_components/mih_providers/mzansi_directory_provider.dart +++ b/Frontend/lib/mih_providers/mzansi_directory_provider.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/bookmarked_business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/bookmarked_business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; class MzansiDirectoryProvider extends ChangeNotifier { int toolIndex; diff --git a/Frontend/lib/mih_components/mih_providers/mzansi_profile_provider.dart b/Frontend/lib/mih_providers/mzansi_profile_provider.dart similarity index 89% rename from Frontend/lib/mih_components/mih_providers/mzansi_profile_provider.dart rename to Frontend/lib/mih_providers/mzansi_profile_provider.dart index 3570dc3c..33cd651f 100644 --- a/Frontend/lib/mih_components/mih_providers/mzansi_profile_provider.dart +++ b/Frontend/lib/mih_providers/mzansi_profile_provider.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_employee.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/user_consent.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_employee.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/user_consent.dart'; class MzansiProfileProvider extends ChangeNotifier { bool personalHome; diff --git a/Frontend/lib/mih_components/mih_providers/mzansi_wallet_provider.dart b/Frontend/lib/mih_providers/mzansi_wallet_provider.dart similarity index 93% rename from Frontend/lib/mih_components/mih_providers/mzansi_wallet_provider.dart rename to Frontend/lib/mih_providers/mzansi_wallet_provider.dart index e7904531..ac9b13ac 100644 --- a/Frontend/lib/mih_components/mih_providers/mzansi_wallet_provider.dart +++ b/Frontend/lib/mih_providers/mzansi_wallet_provider.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/loyalty_card.dart'; +import 'package:mzansi_innovation_hub/mih_objects/loyalty_card.dart'; class MzansiWalletProvider extends ChangeNotifier { List loyaltyCards; diff --git a/Frontend/lib/mih_components/mih_providers/ollama_provider.dart b/Frontend/lib/mih_providers/ollama_provider.dart similarity index 100% rename from Frontend/lib/mih_components/mih_providers/ollama_provider.dart rename to Frontend/lib/mih_providers/ollama_provider.dart diff --git a/Frontend/lib/mih_components/mih_providers/patient_manager_provider.dart b/Frontend/lib/mih_providers/patient_manager_provider.dart similarity index 86% rename from Frontend/lib/mih_components/mih_providers/patient_manager_provider.dart rename to Frontend/lib/mih_providers/patient_manager_provider.dart index 9f303740..b7fa1b7d 100644 --- a/Frontend/lib/mih_components/mih_providers/patient_manager_provider.dart +++ b/Frontend/lib/mih_providers/patient_manager_provider.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/claim_statement_file.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/files.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/notes.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_access.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patients.dart'; +import 'package:mzansi_innovation_hub/mih_objects/claim_statement_file.dart'; +import 'package:mzansi_innovation_hub/mih_objects/files.dart'; +import 'package:mzansi_innovation_hub/mih_objects/notes.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patient_access.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patients.dart'; class PatientManagerProvider extends ChangeNotifier { int patientProfileIndex; diff --git a/Frontend/lib/mih_services/mih_access_controls_services.dart b/Frontend/lib/mih_services/mih_access_controls_services.dart index 69d40a66..41bd7b14 100644 --- a/Frontend/lib/mih_services/mih_access_controls_services.dart +++ b/Frontend/lib/mih_services/mih_access_controls_services.dart @@ -1,13 +1,13 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_access.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_access_controlls_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patient_access.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_access_controlls_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_notification_services.dart'; import 'package:supertokens_flutter/http.dart' as http; @@ -97,7 +97,7 @@ class MihAccessControlsServices { await MihNotificationApis.addAccessRequestNotificationAPICall( app_id, requested_by, personalSelected, args, context); } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } @@ -135,21 +135,10 @@ class MihAccessControlsServices { app_id, personalSelected, args, context); //notification here } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } - static void internetConnectionPopUp(BuildContext context) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - /// This function is used to UPDATE access the business has. /// /// Patameters:- diff --git a/Frontend/lib/mih_services/mih_alert_services.dart b/Frontend/lib/mih_services/mih_alert_services.dart index 70a59bc5..774353c0 100644 --- a/Frontend/lib/mih_services/mih_alert_services.dart +++ b/Frontend/lib/mih_services/mih_alert_services.dart @@ -1,39 +1,191 @@ import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihAlertServices { - void formNotFilledCompletely(BuildContext context) { + void internetConnectionLost(BuildContext context) { showDialog( context: context, builder: (context) { - return MihPackageAlert( - alertIcon: Icon( - Icons.warning_amber_rounded, - size: 150, - color: MihColors.getRedColor( - MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - ), - alertTitle: "Oops! Looks like some fields are missing.", - alertBody: Column( + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( children: [ + Icon( + Icons.warning_amber_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Center( + child: Text( + "Internet Connection Lost!", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + Text( + "We seem to be having some trouble connecting you to the internet. This could be due to a temporary outage or an issue with your device's connection.", + style: TextStyle( + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), + ); + }, + ); + } + + void locationPermissionError(BuildContext context) { + showDialog( + context: context, + builder: (context) { + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.warning_amber_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Center( + child: Text( + "Location Services Not Enabled", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + Text( + "To get the most out of MIH, we need your location. Please go to the site settings of the app and enable location services. Once you do that, we can start showing you relevant information based on your location.", + style: TextStyle( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), + ); + }, + ); + } + + void inputErrorMessage(BuildContext context) { + showDialog( + context: context, + builder: (context) { + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.warning_amber_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Center( + child: Text( + "Oops! Looks like some fields are missing.", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), Text( "We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.", style: TextStyle( color: MihColors.getSecondaryColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: 15, + fontSize: 20, fontWeight: FontWeight.bold, ), ), - const SizedBox(height: 25), + const SizedBox(height: 15), RichText( text: TextSpan( style: TextStyle( color: MihColors.getSecondaryColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), - fontSize: 15, + fontSize: 20, fontWeight: FontWeight.bold, ), children: [ @@ -44,16 +196,450 @@ class MihAlertServices { color: MihColors.getRedColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"))), + const TextSpan(text: "Look for fields with an asterisk ("), + TextSpan( + text: "*", + style: TextStyle( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"))), const TextSpan( - text: - "Look for fields without the \"(Optional)\" indicator next to them, as these are mandatory."), + text: ") next to them, as these are mandatory."), ], ), ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), ], ), - alertColour: MihColors.getRedColor( + ); + }, + ); + } + + void passwordRequiredError(BuildContext context) { + showDialog( + context: context, + builder: (context) { + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getRedColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.warning_amber_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Center( + child: Text( + "Password Doesn't Meet Requirements", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + Text( + "Oops! Your password doesn't quite meet our standards. To keep your account secure, please make sure your password meets the following requirements", + style: TextStyle( + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + RichText( + text: TextSpan( + style: TextStyle( + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 15.0, + fontWeight: FontWeight.bold, + ), + children: [ + TextSpan( + text: "Requirements:\n", + style: TextStyle( + fontStyle: FontStyle.italic, + fontSize: 20, + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"))), + const TextSpan( + text: "1) Contailes at least 8 characters\n", + ), + const TextSpan( + text: "2) Contains at least 1 uppercase letter (A-Z)\n", + ), + const TextSpan( + text: "3) Contains at least 1 lowercase letter (a-z)\n", + ), + const TextSpan( + text: "4) Contains at least 1 number (0-9)\n", + ), + const TextSpan( + text: + "5) Contains at least 1 special character (!@#\$%^&*)\n", + ), + ], + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), + ); + }, + ); + } + + void passwordMatchError(BuildContext context) { + showDialog( + context: context, + builder: (context) { + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.warning_amber_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Center( + child: Text( + "Passwords Don't Match", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + Text( + "The password and confirm password fields do not match. Please make sure they are identical.", + style: TextStyle( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 10), + Text( + "Here are some things to keep in mind:", + textAlign: TextAlign.left, + style: TextStyle( + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20.0, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), + ); + }, + ); + } + + void loginErrorMessage(BuildContext context) { + showDialog( + context: context, + builder: (context) { + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.warning_amber_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Center( + child: Text( + "Uh oh! Login attempt unsuccessful.", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + Text( + "The email address or password you entered doesn't seem to match our records. Please double-check your information and try again.", + style: TextStyle( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 10), + Text( + "Here are some things to keep in mind:", + textAlign: TextAlign.left, + style: TextStyle( + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20.0, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 10), + Text( + "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.", + textAlign: TextAlign.left, + style: TextStyle( + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20.0, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), + ); + }, + ); + } + + void emailExistsError(BuildContext context) { + showDialog( + context: context, + builder: (context) { + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.warning_amber_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Center( + child: Text( + "Email Already Exists", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + Text( + "Here are some things to keep in mind:", + style: TextStyle( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 10), + Text( + "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.", + textAlign: TextAlign.left, + style: TextStyle( + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 15.0, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), + ); + }, + ); + } + + void invalidEmailError(BuildContext context) { + showDialog( + context: context, + builder: (context) { + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.warning_amber_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Center( + child: Text( + "Oops! Invalid Email", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + Text( + "Looks like there's a little hiccup with that email address. Please double-check that you've entered it correctly, including the \"@\" symbol and a domain (like example@email.com).", + style: TextStyle( + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), ); }, ); @@ -92,6 +678,138 @@ class MihAlertServices { ); } + void warningMessage(String title, String message, BuildContext context) { + showDialog( + context: context, + builder: (context) { + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.warning_amber_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Center( + child: Text( + title, + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + Text( + message, + style: TextStyle( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), + ); + }, + ); + } + + void deleteConfirmationMessage( + String message, void Function()? onpressed, BuildContext context) { + showDialog( + context: context, + barrierDismissible: false, + builder: (context) { + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.warning_amber_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Center( + child: Text( + "Are You Sure?", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + Text( + message, + style: TextStyle( + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: onpressed, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Delete", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), + ); + }, + ); + } + void errorAlert(String title, String message, BuildContext context) { showDialog( context: context, diff --git a/Frontend/lib/mih_services/mih_authentication_services.dart b/Frontend/lib/mih_services/mih_authentication_services.dart index 50c747aa..0f608602 100644 --- a/Frontend/lib/mih_services/mih_authentication_services.dart +++ b/Frontend/lib/mih_services/mih_authentication_services.dart @@ -2,82 +2,17 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; -// import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart'; import 'package:supertokens_flutter/http.dart' as http; -// import 'package:supertokens_flutter/supertokens.dart'; class MihAuthenticationServices { final baseAPI = AppEnviroment.baseApiUrl; - // Future signUserUp( - // TextEditingController emailController, - // TextEditingController passwordController, - // TextEditingController confirmPasswordController, - // BuildContext context, - // ) async { - // showDialog( - // context: context, - // builder: (context) { - // return const Mihloadingcircle(); - // }, - // ); - // try { - // Uri uri = Uri.parse( - // "$baseAPI/auth/emailpassword/email/exists?email=${emailController.text}"); - // var response = await http.get(uri); - // if (response.statusCode == 200) { - // var userExists = jsonDecode(response.body); - // if (userExists["exists"]) { - // Navigator.of(context).pop(); - // signUpError(context); - // } else { - // var response2 = await http.post( - // Uri.parse("$baseAPI/auth/signup"), - // body: - // '{"formFields": [{"id": "email","value": "${emailController.text}"}, {"id": "password","value": "${passwordController.text}"}]}', - // headers: { - // 'Content-type': 'application/json', - // 'Accept': 'application/json', - // "Authorization": "leatucczyixqwkqqdrhayiwzeofkltds" - // }, - // ); - // //print("response 2: ${response2.statusCode}"); - // if (response2.statusCode == 200) { - // //print("response 2: ${response2.body}"); - // var userCreated = jsonDecode(response2.body); - // //print("Created user $userCreated"); - // if (userCreated["status"] == "OK") { - // //print("Here1"); - // //Creat user in db - // String uid = await SuperTokens.getUserId(); - // //print("uid: $uid"); - // await MihUserServices() - // .createUser(emailController.text, uid, context); - // // addUserAPICall(emailController.text, uid); - // Navigator.of(context).pop(); - // //print("Here1"); - // } else if (userCreated["status"] == "FIELD_ERROR") { - // Navigator.of(context).pop(); - // passwordReqError(context); - // } else { - // Navigator.of(context).pop(); - // internetConnectionPopUp(context); - // } - // } - // } - // } - // } on Exception catch (error) { - // Navigator.of(context).pop(); - // loginError(error.toString(), context); - // emailController.clear(); - // passwordController.clear(); - // confirmPasswordController.clear(); - // } - // } - Future signUserIn( String email, String password, @@ -162,15 +97,6 @@ class MihAuthenticationServices { } } - void internetConnectionPopUp(BuildContext context) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } - void loginError(String error, BuildContext context) { showDialog( context: context, @@ -182,20 +108,79 @@ class MihAuthenticationServices { ); } - void passwordReqError(BuildContext context) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Password Requirements"); - }, - ); - } - void signUpError(BuildContext context) { showDialog( context: context, builder: (context) { - return const MIHErrorMessage(errorType: "User Exists"); + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.warning_amber_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Center( + child: Text( + "Email Already Exists", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + Text( + "Here are some things to keep in mind:", + style: TextStyle( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 10), + Text( + "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.", + textAlign: TextAlign.left, + style: TextStyle( + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 15.0, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), + ); }, ); } diff --git a/Frontend/lib/mih_services/mih_business_details_services.dart b/Frontend/lib/mih_services/mih_business_details_services.dart index b0d00423..9240e714 100644 --- a/Frontend/lib/mih_services/mih_business_details_services.dart +++ b/Frontend/lib/mih_services/mih_business_details_services.dart @@ -2,14 +2,13 @@ import 'dart:convert'; import 'package:go_router/go_router.dart'; import 'package:http/http.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; import 'package:supertokens_flutter/supertokens.dart'; -import '../mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:supertokens_flutter/http.dart' as http; class MihBusinessDetailsServices { @@ -328,13 +327,4 @@ class MihBusinessDetailsServices { return 500; } } - - void internetConnectionPopUp(BuildContext context) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } } diff --git a/Frontend/lib/mih_services/mih_business_employee_services.dart b/Frontend/lib/mih_services/mih_business_employee_services.dart index 4518437b..72484693 100644 --- a/Frontend/lib/mih_services/mih_business_employee_services.dart +++ b/Frontend/lib/mih_services/mih_business_employee_services.dart @@ -2,10 +2,10 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_employee.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_employee.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:supertokens_flutter/http.dart' as http; diff --git a/Frontend/lib/mih_services/mih_claim_statement_generation_services.dart b/Frontend/lib/mih_services/mih_claim_statement_generation_services.dart index 7cb073bd..668b81de 100644 --- a/Frontend/lib/mih_services/mih_claim_statement_generation_services.dart +++ b/Frontend/lib/mih_services/mih_claim_statement_generation_services.dart @@ -1,18 +1,20 @@ import 'dart:convert'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/claim_statement_file.dart'; +import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_objects/claim_statement_file.dart'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:supertokens_flutter/http.dart' as http; -import '../mih_components/mih_pop_up_messages/mih_error_message.dart'; -import '../mih_components/mih_pop_up_messages/mih_success_message.dart'; -import '../mih_config/mih_env.dart'; - class MIHClaimStatementGenerationApi { final baseAPI = AppEnviroment.baseApiUrl; @@ -98,10 +100,10 @@ class MIHClaimStatementGenerationApi { "The ${data.document_type}: $fileName has been successfully generated and added to ${data.patient_full_name}'s record. You can now access and download it for their use."; successPopUp(message, context); } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } @@ -230,33 +232,76 @@ class MIHClaimStatementGenerationApi { "The File has been deleted successfully. This means it will no longer be visible on your and cannot be used for future appointments."; successPopUp(message, context); } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } //================== POP UPS ========================================================================== - static void internetConnectionPopUp(BuildContext context) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - static void successPopUp(String message, BuildContext context) { showDialog( context: context, builder: (context) { - return MIHSuccessMessage( - successType: "Success", - successMessage: message, + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.check_circle_outline_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Text( + "Success!", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + Center( + child: Text( + message, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), ); }, ); diff --git a/Frontend/lib/mih_services/mih_currency_exchange_rate_services.dart b/Frontend/lib/mih_services/mih_currency_exchange_rate_services.dart index 02f5bd35..95173c67 100644 --- a/Frontend/lib/mih_services/mih_currency_exchange_rate_services.dart +++ b/Frontend/lib/mih_services/mih_currency_exchange_rate_services.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/currency.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calculator_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/currency.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calculator_provider.dart'; import 'package:provider/provider.dart'; import 'package:supertokens_flutter/http.dart' as http; diff --git a/Frontend/lib/mih_services/mih_data_helper_services.dart b/Frontend/lib/mih_services/mih_data_helper_services.dart index 9553846f..a2dcc3f6 100644 --- a/Frontend/lib/mih_services/mih_data_helper_services.dart +++ b/Frontend/lib/mih_services/mih_data_helper_services.dart @@ -1,6 +1,6 @@ -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_my_business_user_services.dart'; diff --git a/Frontend/lib/mih_services/mih_file_services.dart b/Frontend/lib/mih_services/mih_file_services.dart index 7fbfbcb3..8e42b069 100644 --- a/Frontend/lib/mih_services/mih_file_services.dart +++ b/Frontend/lib/mih_services/mih_file_services.dart @@ -3,9 +3,11 @@ import 'dart:convert'; import 'package:file_picker/file_picker.dart'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart'; +import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:flutter/material.dart'; import 'package:supertokens_flutter/http.dart' as http; @@ -120,24 +122,67 @@ class MihFileApi { //================== POP UPS ========================================================================== - static void internetConnectionPopUp(BuildContext context) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - static void successPopUp(String message, BuildContext context) { showDialog( context: context, builder: (context) { - return MIHSuccessMessage( - successType: "Success", - successMessage: message, + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.check_circle_outline_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Text( + "Success!", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + Center( + child: Text( + message, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), ); }, ); diff --git a/Frontend/lib/mih_services/mih_icd10_code_services.dart b/Frontend/lib/mih_services/mih_icd10_code_services.dart index e0326e2c..8f6ac599 100644 --- a/Frontend/lib/mih_services/mih_icd10_code_services.dart +++ b/Frontend/lib/mih_services/mih_icd10_code_services.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/icd10_code.dart.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_objects/icd10_code.dart.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:flutter/material.dart'; import 'package:supertokens_flutter/http.dart' as http; diff --git a/Frontend/lib/mih_services/mih_location_services.dart b/Frontend/lib/mih_services/mih_location_services.dart index 4cdc0848..92534da7 100644 --- a/Frontend/lib/mih_services/mih_location_services.dart +++ b/Frontend/lib/mih_services/mih_location_services.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:geolocator/geolocator.dart'; -import '../mih_components/mih_pop_up_messages/mih_error_message.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; class MIHLocationAPI { final LocationSettings locationSettings = const LocationSettings( @@ -19,10 +19,10 @@ class MIHLocationAPI { if (permission == LocationPermission.denied) { permission = await Geolocator.requestPermission(); if (permission == LocationPermission.denied) { - showPermissionError(context); + MihAlertServices().locationPermissionError(context); return null; } else if (permission == LocationPermission.deniedForever) { - showPermissionError(context); + MihAlertServices().locationPermissionError(context); return null; } else { Position location = await Geolocator.getCurrentPosition( @@ -30,7 +30,7 @@ class MIHLocationAPI { return location; } } else if (permission == LocationPermission.deniedForever) { - showPermissionError(context); + MihAlertServices().locationPermissionError(context); return null; } else { Position location = await Geolocator.getCurrentPosition( @@ -47,13 +47,4 @@ class MIHLocationAPI { return Geolocator.distanceBetween( startLatitude, startLogitude, endLatitude, endLogitude); } - - void showPermissionError(BuildContext context) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Location Denied"); - }, - ); - } } diff --git a/Frontend/lib/mih_services/mih_minesweeper_services.dart b/Frontend/lib/mih_services/mih_minesweeper_services.dart index 6d5eb524..19edf598 100644 --- a/Frontend/lib/mih_services/mih_minesweeper_services.dart +++ b/Frontend/lib/mih_services/mih_minesweeper_services.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/minesweeper_player_score.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/minesweeper_player_score.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:supertokens_flutter/http.dart' as http; diff --git a/Frontend/lib/mih_services/mih_my_business_user_services.dart b/Frontend/lib/mih_services/mih_my_business_user_services.dart index e69666c8..d453b1da 100644 --- a/Frontend/lib/mih_services/mih_my_business_user_services.dart +++ b/Frontend/lib/mih_services/mih_my_business_user_services.dart @@ -1,13 +1,13 @@ import 'dart:convert'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_user.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; import 'package:supertokens_flutter/supertokens.dart'; -import '../mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:supertokens_flutter/http.dart' as http; class MihMyBusinessUserServices { @@ -70,7 +70,7 @@ class MihMyBusinessUserServices { ); return 201; } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); return 500; } } @@ -123,17 +123,8 @@ class MihMyBusinessUserServices { provider.setBusinessUserSignatureUrl(newProPicUrl); return 200; } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); return 500; } } - - void internetConnectionPopUp(BuildContext context) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage(errorType: "Internet Connection"); - }, - ); - } } diff --git a/Frontend/lib/mih_services/mih_mzansi_calendar_services.dart b/Frontend/lib/mih_services/mih_mzansi_calendar_services.dart index 6c18fb47..2dd01f3e 100644 --- a/Frontend/lib/mih_services/mih_mzansi_calendar_services.dart +++ b/Frontend/lib/mih_services/mih_mzansi_calendar_services.dart @@ -1,17 +1,19 @@ import 'dart:convert'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/appointment.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart'; +import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/appointment.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_user.dart'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calendar_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mih_calendar_provider.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:supertokens_flutter/http.dart' as http; -import '../mih_components/mih_pop_up_messages/mih_error_message.dart'; -import '../mih_components/mih_pop_up_messages/mih_success_message.dart'; -import '../mih_config/mih_env.dart'; class MihMzansiCalendarApis { final baseAPI = AppEnviroment.baseApiUrl; @@ -537,24 +539,67 @@ class MihMzansiCalendarApis { //================== POP UPS ========================================================================== - static void internetConnectionPopUp(BuildContext context) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - static void successPopUp(String message, BuildContext context) { showDialog( context: context, builder: (context) { - return MIHSuccessMessage( - successType: "Success", - successMessage: message, + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.check_circle_outline_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Text( + "Success!", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + Center( + child: Text( + message, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), ); }, ); diff --git a/Frontend/lib/mih_services/mih_mzansi_directory_services.dart b/Frontend/lib/mih_services/mih_mzansi_directory_services.dart index 6b4bc076..a959d4b0 100644 --- a/Frontend/lib/mih_services/mih_mzansi_directory_services.dart +++ b/Frontend/lib/mih_services/mih_mzansi_directory_services.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/bookmarked_business.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_review.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/bookmarked_business.dart'; +import 'package:mzansi_innovation_hub/mih_objects/business_review.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:supertokens_flutter/http.dart' as http; diff --git a/Frontend/lib/mih_services/mih_mzansi_wallet_services.dart b/Frontend/lib/mih_services/mih_mzansi_wallet_services.dart index 1acf927b..3141f7f6 100644 --- a/Frontend/lib/mih_services/mih_mzansi_wallet_services.dart +++ b/Frontend/lib/mih_services/mih_mzansi_wallet_services.dart @@ -2,15 +2,17 @@ import 'dart:convert'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/loyalty_card.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_objects/loyalty_card.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_wallet_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:supertokens_flutter/http.dart' as http; -import '../mih_components/mih_pop_up_messages/mih_error_message.dart'; -import '../mih_components/mih_pop_up_messages/mih_success_message.dart'; -import '../mih_config/mih_env.dart'; class MIHMzansiWalletApis { final baseAPI = AppEnviroment.baseApiUrl; @@ -213,24 +215,67 @@ class MIHMzansiWalletApis { //================== POP UPS ========================================================================== - static void internetConnectionPopUp(BuildContext context) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - static void successPopUp(String message, BuildContext context) { showDialog( context: context, builder: (context) { - return MIHSuccessMessage( - successType: "Success", - successMessage: message, + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.check_circle_outline_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Text( + "Success!", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + Center( + child: Text( + message, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), ); }, ); diff --git a/Frontend/lib/mih_services/mih_notification_services.dart b/Frontend/lib/mih_services/mih_notification_services.dart index 0b45bbd4..9285f1c4 100644 --- a/Frontend/lib/mih_services/mih_notification_services.dart +++ b/Frontend/lib/mih_services/mih_notification_services.dart @@ -1,12 +1,15 @@ import 'dart:convert'; import 'package:go_router/go_router.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/notification.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart'; +import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_objects/notification.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:supertokens_flutter/http.dart' as http; class MihNotificationApis { @@ -73,7 +76,7 @@ class MihNotificationApis { ); successPopUp(message, context); } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } @@ -129,7 +132,7 @@ class MihNotificationApis { // ); successPopUp(message, context); } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } @@ -185,7 +188,7 @@ class MihNotificationApis { successPopUp(message, context); } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } @@ -238,7 +241,7 @@ class MihNotificationApis { "The appointment has been cancelled successfully. This means it will no longer be visible in your waiting room and calender."; successPopUp(message, context); } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } @@ -293,29 +296,72 @@ class MihNotificationApis { "The appointment was been created successfully. This means it will now be visible in your waiting room and calender."; successPopUp(message, context); } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } //================== POP UPS ========================================================================== - static void internetConnectionPopUp(BuildContext context) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - static void successPopUp(String message, BuildContext context) { showDialog( context: context, builder: (context) { - return MIHSuccessMessage( - successType: "Success", - successMessage: message, + return MihPackageWindow( + fullscreen: false, + windowTitle: null, + onWindowTapClose: null, + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + windowBody: Column( + children: [ + Icon( + Icons.check_circle_outline_rounded, + size: 100, + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + ), + Text( + "Success!", + textAlign: TextAlign.center, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 15), + Center( + child: Text( + message, + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + const SizedBox(height: 15), + MihButton( + onPressed: () { + context.pop(); + }, + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 300, + elevation: 10, + child: Text( + "Dismiss", + style: TextStyle( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), + ), + ], + ), ); }, ); diff --git a/Frontend/lib/mih_services/mih_patient_services.dart b/Frontend/lib/mih_services/mih_patient_services.dart index a4b26c4d..bec56256 100644 --- a/Frontend/lib/mih_services/mih_patient_services.dart +++ b/Frontend/lib/mih_services/mih_patient_services.dart @@ -1,12 +1,12 @@ import 'dart:convert'; import 'package:file_picker/file_picker.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/files.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/notes.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_access.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/patients.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/files.dart'; +import 'package:mzansi_innovation_hub/mih_objects/notes.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patient_access.dart'; +import 'package:mzansi_innovation_hub/mih_objects/patients.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:supertokens_flutter/http.dart' as http; diff --git a/Frontend/lib/mih_services/mih_user_consent_services.dart b/Frontend/lib/mih_services/mih_user_consent_services.dart index 6ee52f6e..d8104a49 100644 --- a/Frontend/lib/mih_services/mih_user_consent_services.dart +++ b/Frontend/lib/mih_services/mih_user_consent_services.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/user_consent.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/user_consent.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:supertokens_flutter/http.dart' as http; import 'package:supertokens_flutter/supertokens.dart'; diff --git a/Frontend/lib/mih_services/mih_user_services.dart b/Frontend/lib/mih_services/mih_user_services.dart index af03acc6..034fcbc1 100644 --- a/Frontend/lib/mih_services/mih_user_services.dart +++ b/Frontend/lib/mih_services/mih_user_services.dart @@ -3,15 +3,15 @@ import 'dart:convert'; import 'package:go_router/go_router.dart'; import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart'; +import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; import 'package:provider/provider.dart'; import 'package:supertokens_flutter/http.dart' as http; @@ -73,7 +73,7 @@ class MihUserServices { extra: true, ); } else { - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } @@ -265,23 +265,12 @@ class MihUserServices { } } else { Navigator.of(context).pop(); // Pop loading dialog - internetConnectionPopUp(context); + MihAlertServices().internetConnectionLost(context); } } //================== POP UPS ========================================================================== - static void internetConnectionPopUp(BuildContext context) { - showDialog( - context: context, - builder: (context) { - return const MIHErrorMessage( - errorType: "Internet Connection", - ); - }, - ); - } - static void successPopUp(String title, String message, BuildContext context) { showDialog( context: context, @@ -335,10 +324,6 @@ class MihUserServices { alertColour: MihColors.getGreenColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); - // return MIHSuccessMessage( - // successType: "Success", - // successMessage: message, - // ); }, ); } diff --git a/Frontend/pubspec.yaml b/Frontend/pubspec.yaml index c0aa09bd..21e8835b 100644 --- a/Frontend/pubspec.yaml +++ b/Frontend/pubspec.yaml @@ -74,27 +74,27 @@ dev_dependencies: flutter: uses-material-design: true assets: - - lib/mih_components/mih_package_components/assets/images/ - - lib/mih_components/mih_package_components/assets/fonts/ - - lib/mih_components/mih_package_components/assets/images/loyalty_cards/ - - lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/ - - lib/mih_components/mih_package_components/assets/images/app_icon/ - - lib/mih_components/mih_package_components/assets/images/splash_screen/ + - lib/mih_package_components/assets/images/ + - lib/mih_package_components/assets/fonts/ + - lib/mih_package_components/assets/images/loyalty_cards/ + - lib/mih_package_components/assets/images/loyalty_cards/mini/ + - lib/mih_package_components/assets/images/app_icon/ + - lib/mih_package_components/assets/images/splash_screen/ fonts: - family: MihIcons fonts: - - asset: lib/mih_components/mih_package_components/assets/fonts/Mih_Icons.ttf + - asset: lib/mih_package_components/assets/fonts/Mih_Icons.ttf flutter_native_splash: color: "#3A4454" - image: lib/mih_components/mih_package_components/assets/images/splash_screen/mih_image_splash.png - branding: lib/mih_components/mih_package_components/assets/images/splash_screen/mih_branding_splash.png - image_web: lib/mih_components/mih_package_components/assets/images/splash_screen/mih_image_splash_temp.gif - branding_web: lib/mih_components/mih_package_components/assets/images/splash_screen/mih_branding_splash_temp.gif + image: lib/mih_package_components/assets/images/splash_screen/mih_image_splash.png + branding: lib/mih_package_components/assets/images/splash_screen/mih_branding_splash.png + image_web: lib/mih_package_components/assets/images/splash_screen/mih_image_splash_temp.gif + branding_web: lib/mih_package_components/assets/images/splash_screen/mih_branding_splash_temp.gif branding_mode: bottom branding_bottom_padding: 24 android_12: color: "#3A4454" - image: lib/mih_components/mih_package_components/assets/images/splash_screen/mih_image_splash_android.png - branding: lib/mih_components/mih_package_components/assets/images/splash_screen/mih_branding_splash.png \ No newline at end of file + image: lib/mih_package_components/assets/images/splash_screen/mih_image_splash_android.png + branding: lib/mih_package_components/assets/images/splash_screen/mih_branding_splash.png \ No newline at end of file