user, general document, login flow, oracle conn completed

# Conflicts:
#	resources/views/admin/account-lawyer/index.blade.php
#	resources/views/admin/general-documents/index.blade.php

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# interactive rebase in progress; onto e0b5c48
# Last command done (1 command done):
#    pick bfe1519 # user, general document, login flow, oracle conn completed
# No commands remaining.
# You are currently rebasing branch 'phase1_conflict_fix' on 'e0b5c48'.
#
# Changes to be committed:
#	new file:   .claude/settings.local.json
#	modified:   .gitignore
#	modified:   app/Http/Controllers/Admin/AccountLawyerMappingController.php
#	modified:   app/Http/Controllers/Admin/GeneralDocumentController.php
#	new file:   app/Http/Controllers/Admin/OracleApiController.php
#	new file:   app/Http/Controllers/Admin/ProfileController.php
#	modified:   app/Http/Controllers/Admin/UserController.php
#	modified:   app/Http/Controllers/Auth/LoginController.php
#	modified:   app/Http/Kernel.php
#	new file:   app/Http/Middleware/EnsurePasswordChanged.php
#	modified:   app/Http/Middleware/EnsureUserIsAdmin.php
#	new file:   app/Http/View/Composers/SidebarComposer.php
#	new file:   app/Mail/LoginOtpMail.php
#	new file:   app/Mail/NewUserWelcomeMail.php
#	new file:   app/Models/AccountLawyerMapping.php
#	new file:   app/Models/AccountLawyerMappingLawyer.php
#	new file:   app/Models/CountryPhoneCode.php
#	new file:   app/Models/Department.php
#	new file:   app/Models/DocumentType.php
#	new file:   app/Models/GeneralDocument.php
#	new file:   app/Models/GeneralDocumentAttachment.php
#	new file:   app/Models/GeneralDocumentShare.php
#	modified:   app/Models/Module.php
#	new file:   app/Models/ModulePermission.php
#	new file:   app/Models/Role.php
#	modified:   app/Models/User.php
#	new file:   app/Models/UserModulePermission.php
#	modified:   app/Providers/AppServiceProvider.php
#	new file:   bootstrap/cache/.gitignore
#	new file:   check_oracle.php
#	modified:   composer.json
#	modified:   composer.lock
#	modified:   config/app.php
#	modified:   config/database.php
#	new file:   database/migrations/2024_01_01_000006_update_modules_table_schema.php
#	new file:   database/migrations/2024_01_01_000007_create_roles_table.php
#	new file:   database/migrations/2024_01_01_000008_create_role_module_table.php
#	new file:   database/migrations/2024_01_01_000009_create_departments_table.php
#	new file:   database/migrations/2024_01_01_000010_update_users_table_schema.php
#	new file:   database/migrations/2024_01_01_000011_create_module_permissions_table.php
#	new file:   database/migrations/2024_01_01_000012_create_user_module_permissions_table.php
#	new file:   database/migrations/2024_01_01_000013_add_mobile_prefix_to_users_table.php
#	new file:   database/migrations/2024_01_01_000014_add_must_change_password_to_users_table.php
#	new file:   database/migrations/2024_01_01_000015_create_country_phone_codes_table.php
#	new file:   database/migrations/2024_01_01_000016_create_document_types_table.php
#	new file:   database/migrations/2024_01_01_000017_create_general_documents_table.php
#	new file:   database/migrations/2024_01_01_000018_create_general_document_attachments_table.php
#	new file:   database/migrations/2024_01_01_000019_create_general_document_shares_table.php
#	new file:   database/migrations/2024_01_01_000020_add_document_type_id_to_general_document_attachments.php
#	new file:   database/migrations/2024_01_01_000021_add_lawyer_name_remove_department_from_users.php
#	new file:   database/migrations/2024_01_01_000022_create_account_lawyer_mappings_table.php
#	modified:   database/seeders/AdminSeeder.php
#	new file:   database/seeders/CountryPhoneCodeSeeder.php
#	modified:   database/seeders/DatabaseSeeder.php
#	new file:   database/seeders/DepartmentSeeder.php
#	new file:   database/seeders/DocumentTypeSeeder.php
#	new file:   database/seeders/ModulePermissionSeeder.php
#	new file:   database/seeders/ModuleSeeder.php
#	new file:   database/seeders/RoleModuleSeeder.php
#	new file:   database/seeders/RoleSeeder.php
#	new file:   database/seeders/UserModulePermissionSeeder.php
#	deleted:    public/hot
#	modified:   resources/views/admin/account-lawyer/create.blade.php
#	new file:   resources/views/admin/account-lawyer/edit.blade.php
#	modified:   resources/views/admin/account-lawyer/index.blade.php
#	modified:   resources/views/admin/account-lawyer/search_account.blade.php
#	modified:   resources/views/admin/account-lawyer/search_lawyer.blade.php
#	modified:   resources/views/admin/account-lawyer/success.blade.php
#	modified:   resources/views/admin/general-documents/index.blade.php
#	modified:   resources/views/admin/layouts/app.blade.php
#	modified:   resources/views/admin/partials/sidebar.blade.php
#	new file:   resources/views/admin/profile/index.blade.php
#	modified:   resources/views/admin/users/index.blade.php
#	new file:   resources/views/auth/change-password.blade.php
#	modified:   resources/views/auth/login.blade.php
#	modified:   resources/views/auth/otp.blade.php
#	new file:   resources/views/emails/login-otp.blade.php
#	new file:   resources/views/emails/new-user.blade.php
#	modified:   routes/web.php
#	new file:   setup_oracle.php
#	new file:   test.php
#
