diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvPresenter.php b/addons/default/visiosoft/advs-module/src/Adv/AdvPresenter.php index 78c748412..db31f6274 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvPresenter.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvPresenter.php @@ -4,7 +4,6 @@ use Anomaly\Streams\Platform\Entry\EntryPresenter; use Anomaly\Streams\Platform\Model\Cloudinary\CloudinaryVideoEntryModel; use Anomaly\Streams\Platform\Model\Users\UsersUsersEntryModel; use Illuminate\Routing\Route; -use Visiosoft\ProfileModule\Profile\ProfileModel; class AdvPresenter extends EntryPresenter { diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 03be0a7de..97822f8bb 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -13,6 +13,7 @@ use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Cookie; use Illuminate\Support\Facades\DB; use Visiosoft\LocationModule\City\CityRepository; +use Visiosoft\StoreModule\User\Contract\UserRepositoryInterface; use function PMA\Util\get; use Sunra\PhpSimple\HtmlDomParser; use Visiosoft\AdvsModule\Adv\AdvModel; @@ -44,8 +45,6 @@ use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface; use Visiosoft\LocationModule\Country\Contract\CountryRepositoryInterface; use Anomaly\Streams\Platform\Message\MessageBag; use Visiosoft\PackagesModule\Package\PackageModel; -use Visiosoft\ProfileModule\Profile\Contract\ProfileRepositoryInterface; -use Visiosoft\ProfileModule\Profile\ProfileModel; use Anomaly\Streams\Platform\Model\Customfields\CustomfieldsCustomFieldsEntryModel; use Anomaly\Streams\Platform\Model\Customfields\CustomfieldsCustomFieldAdvsEntryModel; @@ -57,6 +56,8 @@ use Visiosoft\StoreModule\Ad\AdModel; class AdvsController extends PublicController { + private $userRepository; + private $adv_model; private $adv_repository; @@ -71,9 +72,6 @@ class AdvsController extends PublicController private $village_model; - private $profile_model; - private $profile_repository; - private $category_model; private $category_repository; @@ -82,6 +80,8 @@ class AdvsController extends PublicController private $event; public function __construct( + UserRepositoryInterface $userRepository, + AdvModel $advModel, AdvRepositoryInterface $advRepository, @@ -96,9 +96,6 @@ class AdvsController extends PublicController VillageModel $village_model, - ProfileModel $profile_model, - ProfileRepositoryInterface $profile_repository, - CategoryModel $categoryModel, CategoryRepositoryInterface $category_repository, @@ -109,6 +106,8 @@ class AdvsController extends PublicController Request $request ) { + $this->userRepository = $userRepository; + $this->adv_model = $advModel; $this->adv_repository = $advRepository; @@ -123,10 +122,6 @@ class AdvsController extends PublicController $this->village_model = $village_model; - - $this->profile_model = $profile_model; - $this->profile_repository = $profile_repository; - $this->category_model = $categoryModel; $this->category_repository = $category_repository; @@ -262,8 +257,7 @@ class AdvsController extends PublicController } if (!empty($param['user'])) { - $user = $this->profile_repository->getUser($param['user']); - $userProfile = $this->profile_repository->getProfile($user->id); + $user = $this->userRepository->find($param['user']); } Cookie::queue(Cookie::make('last_search', $this->requestHttp->getRequestUri(), 84000)); @@ -271,7 +265,7 @@ class AdvsController extends PublicController $viewType = $this->requestHttp->cookie('viewType'); $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'request', 'param', - 'user', 'userProfile', 'featured_advs', 'viewType', 'topfields', 'ranges', 'seenList', 'searchedCountry', 'radio'); + 'user', 'featured_advs', 'viewType', 'topfields', 'ranges', 'seenList', 'searchedCountry', 'radio'); return $this->viewTypeBasedRedirect($viewType, $compact); } @@ -786,14 +780,15 @@ class AdvsController extends PublicController return $this->view->make('theme::addons/anomaly/pages-module/page', compact('cats')); } - public function map(AdvRepositoryInterface $advRepository, - CategoryRepositoryInterface $categories, - CountryRepositoryInterface $countries, - ProfileRepositoryInterface $profileRepository, - Request $request) + public function map( + AdvRepositoryInterface $advRepository, + CategoryRepositoryInterface $categories, + CountryRepositoryInterface $countries, + Request $request + ) { - return $this->index($advRepository, $categories, $countries, $profileRepository, $request, true); + return $this->index($advRepository, $categories, $countries, $request, true); } diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/ProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/ProfileController.php deleted file mode 100644 index 4366c54cf..000000000 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/ProfileController.php +++ /dev/null @@ -1,93 +0,0 @@ -setColumns([ - 'email' => [ - 'value' => function (EntryModel $entry) { - $user = User::query()->find($entry->id); - if (!is_null($user)) - return $user->email; - } - ], - 'gsm_phone' - ]); - return $table->render(); - } - - /** - * Create a new entry. - * - * @param ProfileFormBuilder $form - * @return \Symfony\Component\HttpFoundation\Response - */ - public function edit(ProfileFormBuilder $form, $id) - { - $users = UsersUsersEntryModel::find($id); - $profiles = ProfileModel::query()->where('user_id', $id)->orderBy("id")->first(); - if ($profiles == null) { - $newProfile = []; - $newProfile ['user_id'] = $id; - $newProfile ['country_id'] = null; - ProfileModel::query()->create($newProfile); - $profiles = ProfileModel::query()->where('user_id', $id)->orderBy("id")->first(); - } - $country = CountryModel::all(); - return $this->view->make('visiosoft.module.profile::admin.profile.edit', compact('users', 'profiles', 'country', 'form')); - } - - public function update(ProfileFormBuilder $form, Request $request, $id) - { - $all = $request->all(); - if ($all['email'] == "" OR $all['username'] == "") { - $error = []; - if ($all['email'] == "") { - $error[] = trans('visiosoft.module.profile::message.email'); - } - if ($all['username'] == "") { - $error[] = trans('visiosoft.module.profile::message.username'); - } - return Redirect::back()->with('error', $error); - } - - $userModule = []; - $userModule['email'] = $all['email']; - $userModule['username'] = $all['username']; - $userModule['display_name'] = $all['display_name']; - $userModule['first_name'] = $all['first_name']; - $userModule['last_name'] = $all['last_name']; - $userModule['activated'] = $all['activated']; - $userModule['enabled'] = $all['enabled']; - UsersUsersEntryModel::query()->find($id)->update($userModule); - foreach ($userModule as $key => $val) { - unset($all[$key]); - } - $all['file_id'] = $all['file']; - unset($all['file']); - unset($all['_token'], $all['action']); - ProfileModel::query()->where('user_id', $id)->update($all); - $message = []; - $message[] = trans('visiosoft.module.profile::message.success_update'); - return redirect('admin/profile')->with('success', $message); - } -} diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php index b87b2ea92..4ee253165 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php @@ -42,12 +42,9 @@ use Visiosoft\PackagesModule\User\UserModel; use Visiosoft\ProfileModule\Adress\AdressModel; use Visiosoft\ProfileModule\Adress\Contract\AdressRepositoryInterface; use Visiosoft\ProfileModule\Adress\Form\AdressFormBuilder; -use Visiosoft\ProfileModule\Profile\Contract\ProfileRepositoryInterface; use Visiosoft\ProfileModule\Profile\Form\ProfileFormBuilder; -use Visiosoft\ProfileModule\Profile\ProfileModel; use Illuminate\Contracts\Events\Dispatcher; - class MyProfileController extends PublicController { private $adressRepository; @@ -316,8 +313,7 @@ class MyProfileController extends PublicController { $all = $request->all(); unset($all['_']); - $profileModel = new ProfileModel(); - $status = $profileModel->getProfile(Auth::id())->update($all); + $status = $this->userRepository->newQuery()->where('id', Auth::id())->update($all); return response()->json($status); } diff --git a/addons/default/visiosoft/profile-module/src/Profile/Command/FindUserProfile.php b/addons/default/visiosoft/profile-module/src/Profile/Command/FindUserProfile.php deleted file mode 100644 index 140dc0598..000000000 --- a/addons/default/visiosoft/profile-module/src/Profile/Command/FindUserProfile.php +++ /dev/null @@ -1,33 +0,0 @@ -id = $id; - } - - /** - * @param ProfileRepositoryInterface $profileRepository - * @return |null - */ - public function handle(ProfileRepositoryInterface $profileRepository) - { - if ($this->id) { - return $profileRepository->findByUserID($this->id); - } - return null; - } -} diff --git a/addons/default/visiosoft/profile-module/src/Profile/Contract/ProfileInterface.php b/addons/default/visiosoft/profile-module/src/Profile/Contract/ProfileInterface.php deleted file mode 100644 index f5f397d91..000000000 --- a/addons/default/visiosoft/profile-module/src/Profile/Contract/ProfileInterface.php +++ /dev/null @@ -1,8 +0,0 @@ -request = $request; - $this->settings = $settings; - } - - public function getRequest() - { - return $this; - } -} diff --git a/addons/default/visiosoft/profile-module/src/Profile/Handler/registerType.php b/addons/default/visiosoft/profile-module/src/Profile/Handler/registerType.php deleted file mode 100644 index 32c6b0164..000000000 --- a/addons/default/visiosoft/profile-module/src/Profile/Handler/registerType.php +++ /dev/null @@ -1,16 +0,0 @@ -setOptions( - [ - '1' => trans('visiosoft.module.profile::field.individual.name'), - '2' => trans('visiosoft.module.profile::field.corporate.name') - ] - ); - } -} \ No newline at end of file diff --git a/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php index a72b2a450..45d6a0a0e 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php @@ -1,7 +1,6 @@ query()->where('user_id', $id); - } - return $this->query(); - } -} diff --git a/addons/default/visiosoft/profile-module/src/Profile/ProfileObserver.php b/addons/default/visiosoft/profile-module/src/Profile/ProfileObserver.php deleted file mode 100644 index 4e9b4c7eb..000000000 --- a/addons/default/visiosoft/profile-module/src/Profile/ProfileObserver.php +++ /dev/null @@ -1,8 +0,0 @@ -model = $model; - } - - public function getUser($id) - { - return UsersUsersEntryModel::query()->where('users_users.id', $id)->first(); - } - - public function getProfile($id) - { - return ProfileModel::query()->where('user_id', $id)->first(); - } - - public function findUserForLogin($field, $val) - { - $user = UserModel::query()->where($field, $val)->first(); - if ($user == null) { - $profile = $this->findProfileForLogin('gsm_phone', $val); - if ($profile != null) { - $user = UserModel::query()->find($profile->user_id); - } - } - return $user; - } - - public function findProfileForLogin($field, $val) - { - return ProfileModel::query()->where($field, $val)->first(); - } - - public function validPasswordByEmail($email) - { - return $this->oldUserSendForgotMail($this->findUserForLogin('email', $email)); - } - - public function validPasswordByUsername($username) - { - return $this->oldUserSendForgotMail($this->findUserForLogin('username', $username)); - } - - public function oldUserSendForgotMail($user) - { - if ($user == null) { - return "noUser"; - } - if ($user->password == "alp236330" OR $user->password == "") { - if ($user->email == "user2019" . $user->id . "@mail.com") { - return "noMail"; - } - $users = new UserPassword(); - $users->send($user, '/'); - return "reset"; - } - return "yes"; - } - - public function updateUserField($fields) - { - $userModule = []; - $userModule['display_name'] = $fields['first_name'] . " " . $fields['last_name']; - $userModule['first_name'] = $fields['first_name']; - $userModule['last_name'] = $fields['last_name']; - //Core User Module - UsersUsersEntryModel::query()->find(Auth::id())->update($userModule); - foreach ($userModule as $key => $val) { - unset($fields[$key]); - } - return $fields; - - } - - public function changePassword($fields, $userPassword) - { - if ($fields['new_password'] != $fields['re_new_password']) { - $errorList[] = trans('anomaly.module.users::field.confirm_password.name'); - $fields['error'] = $errorList; - return $fields; - } - - $validator = $userPassword->validate($fields['new_password']); - $errorList = array(); - foreach ($validator->errors()->all() as $error) { - $errorList[] = $error; - } - if (count($errorList) != 0) { - $fields['error'] = $errorList; - return $fields; - } - - UsersUsersEntryModel::query()->find(Auth::id())->update(['password' => Hash::make($fields['new_password'])]); - unset($fields['new_password'], $fields['re_new_password'], $fields['confirm_password_input']); - return $fields; - } - - public function findByUserID($id) - { - return $this->model->where('user_id', $id)->first(); - } - - public function CheckPhoneNumber($phoneNumber) - { - return $this->model - ->where('gsm_phone', $phoneNumber) - ->where('user_id','!=', Auth::id()) - ->first(); - } - - public function findPhoneNumber($phone_number) - { - return $this->model->where('gsm_phone', $phone_number) - ->first(); - } - - -} diff --git a/addons/default/visiosoft/profile-module/src/Profile/ProfileRouter.php b/addons/default/visiosoft/profile-module/src/Profile/ProfileRouter.php deleted file mode 100644 index be022739d..000000000 --- a/addons/default/visiosoft/profile-module/src/Profile/ProfileRouter.php +++ /dev/null @@ -1,8 +0,0 @@ - [ 'required' => true, ], - 'phone' => [ - 'type' => 'anomaly.field_type.text', - ], 'first_name' => [ 'instructions' => false, 'required' => true, diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php index 9a979f0a6..afad09739 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php @@ -3,7 +3,6 @@ use Anomaly\UsersModule\User\Contract\UserInterface; use Anomaly\UsersModule\User\Contract\UserRepositoryInterface; use Anomaly\UsersModule\User\Event\UserHasRegistered; -use Visiosoft\ProfileModule\Profile\ProfileModel; use Anomaly\UsersModule\User\UserActivator; use Illuminate\Contracts\Config\Repository; use Illuminate\Contracts\Events\Dispatcher; diff --git a/addons/default/visiosoft/profile-module/src/Profile/Table/ProfileTableBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Table/ProfileTableBuilder.php deleted file mode 100644 index 394c4b6ba..000000000 --- a/addons/default/visiosoft/profile-module/src/Profile/Table/ProfileTableBuilder.php +++ /dev/null @@ -1,79 +0,0 @@ - [ - 'filter' => 'search', - 'fields' => [ - 'gsm_phone', - 'land_phone','office_phone','register_type', - 'identification_number', - ], - ], - ]; - - /** - * The table columns. - * - * @var array|string - */ - protected $columns = [ - 'username','first_name','last_name' - ]; - - /** - * The table buttons. - * - * @var array|string - */ - protected $buttons = [ - 'go_user'=> [ - 'type' => 'info', - 'icon' => 'fa fa-user', - 'href' => '/admin/users/edit/{entry.user_id}' - ], - 'edit' => [ - 'text' => 'visiosoft.module.profile::button.go_profile' - ], - ]; - - /** - * The table actions. - * - * @var array|string - */ - protected $actions = [ - 'delete' - ]; - - /** - * The table options. - * - * @var array - */ - protected $options = []; - - /** - * The table assets. - * - * @var array - */ - protected $assets = []; - -} diff --git a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php index f25fb4630..3fe5271ed 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php @@ -6,7 +6,6 @@ use Anomaly\UsersModule\User\Contract\UserInterface; use Anomaly\UsersModule\User\Contract\UserRepositoryInterface; use Illuminate\Http\RedirectResponse; use Symfony\Component\HttpFoundation\Response; -use Visiosoft\ProfileModule\Profile\Contract\ProfileRepositoryInterface; use Visiosoft\ProfileModule\Profile\SignIn\SignInFormBuilder; @@ -14,13 +13,11 @@ class ValidateCredentials { public function __construct( ExtensionCollection $extensions, - UserRepositoryInterface $userRepository, - ProfileRepositoryInterface $profileRepository + UserRepositoryInterface $userRepository ) { $this->extensions = $extensions; $this->repository = $userRepository; - $this->profile = $profileRepository; } public function authenticate(array $credentials) diff --git a/addons/default/visiosoft/profile-module/src/ProfileModule.php b/addons/default/visiosoft/profile-module/src/ProfileModule.php index 5935beaa7..69b94033e 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModule.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModule.php @@ -25,13 +25,6 @@ class ProfileModule extends Module * @var array */ protected $sections = [ - 'profile' => [ - 'buttons' => [ - 'new_profile'=> [ - 'href' => 'admin/users/create', - ], - ], - ], 'adress' => [ 'buttons' => [ 'new_adress', diff --git a/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php b/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php index 8f6e6a8cf..9debabbd6 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php @@ -2,28 +2,15 @@ use Anomaly\Streams\Platform\Addon\Plugin\Plugin; use Visiosoft\ProfileModule\Adress\Command\GetAddress; -use Visiosoft\ProfileModule\Profile\Command\FindUserProfile; class ProfileModulePlugin extends Plugin { - /** * @return array */ public function getFunctions() { return [ - new \Twig_SimpleFunction( - 'findUserProfile', - function ($id) { - - if (!$ad = $this->dispatch(new FindUserProfile($id))) { - return null; - } - - return $ad; - } - ), new \Twig_SimpleFunction( 'getAddress', function ($id) { diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php b/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php index fa7262ed1..158ad05c8 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php @@ -3,9 +3,6 @@ use Anomaly\FilesModule\Disk\Contract\DiskRepositoryInterface; use Anomaly\FilesModule\Folder\Contract\FolderRepositoryInterface; use Anomaly\Streams\Platform\Database\Seeder\Seeder; -use Illuminate\Database\Eloquent\Model; -use Chumper\Zipper\Zipper; -use Illuminate\Support\Facades\DB; use Visiosoft\ProfileModule\Seed\UsersFieldsSeeder; class ProfileModuleSeeder extends Seeder @@ -47,46 +44,20 @@ class ProfileModuleSeeder extends Seeder // Users Fields Seeder $this->call(UsersFieldsSeeder::class); - $disk = $this->disks->findBySlug('local'); + if (is_null($this->folders->findBy('slug', 'favicon'))) { + $disk = $this->disks->findBySlug('local'); - $this->folders->create([ - 'en' => [ - 'name' => 'ADV LISTING PAGE IMAGE', - 'description' => 'A folder for adv listing page images.', - ], - 'slug' => 'adv_listing_page', - 'disk' => $disk, - 'allowed_types' => [ - 'png', - 'jpeg', - 'jpg', - ], - ]); - - $disk = $this->disks->findBySlug('local'); - - $this->folders->create([ - 'en' => [ - 'name' => 'Favicon', - 'description' => 'A folder for Favicon.', - ], - 'slug' => 'favicon', - 'disk' => $disk, - 'allowed_types' => [ - 'ico','png', - ], - ]); - - $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/"; - file_put_contents(__DIR__ . "/advListingPage.sql", fopen($repository . "advListingPage.sql", 'r')); - file_put_contents("adv_listing_page.zip", fopen($repository . "adv_listing_page.zip", 'r')); - $zipper = new Zipper(); - $zipper->make('adv_listing_page.zip')->folder('adv_listing_page')->extractTo(base_path() . '/public/app/default/files-module/local/adv_listing_page/'); - $zipper->close(); - - Model::unguard(); - DB::unprepared(file_get_contents(__DIR__ . '/advListingPage.sql')); - Model::reguard(); + $this->folders->create([ + 'en' => [ + 'name' => 'Favicon', + 'description' => 'A folder for Favicon.', + ], + 'slug' => 'favicon', + 'disk' => $disk, + 'allowed_types' => [ + 'ico','png', + ], + ]); + }; } - } \ No newline at end of file diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php index 0269016f8..0430f036e 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php @@ -6,12 +6,8 @@ use Visiosoft\ProfileModule\Adress\Contract\AdressRepositoryInterface; use Visiosoft\ProfileModule\Adress\AdressRepository; use Anomaly\Streams\Platform\Model\Profile\ProfileAdressEntryModel; use Visiosoft\ProfileModule\Adress\AdressModel; -use Visiosoft\ProfileModule\Profile\Contract\ProfileRepositoryInterface; use Visiosoft\ProfileModule\Profile\Password\PasswordFormBuilder; use Visiosoft\ProfileModule\Profile\Profile\ProfileFormBuilder; -use Visiosoft\ProfileModule\Profile\ProfileRepository; -use Anomaly\Streams\Platform\Model\Profile\ProfileProfileEntryModel; -use Visiosoft\ProfileModule\Profile\ProfileModel; use Illuminate\Routing\Router; use Visiosoft\ProfileModule\Profile\Register2\Register2FormBuilder; use Visiosoft\ProfileModule\Profile\SignIn\SignInFormBuilder; @@ -64,11 +60,11 @@ class ProfileModuleServiceProvider extends AddonServiceProvider ], /*Address */ - 'admin/profile/adress' => 'Visiosoft\ProfileModule\Http\Controller\Admin\AdressController@index', - 'admin/profile/adress/create' => 'Visiosoft\ProfileModule\Http\Controller\Admin\AdressController@create', - 'admin/profile/adress/edit/{id}' => 'Visiosoft\ProfileModule\Http\Controller\Admin\AdressController@adresList', - 'admin/profile/adress/editAdress/{id}' => 'Visiosoft\ProfileModule\Http\Controller\Admin\AdressController@edit', - 'admin/profile/adress/update/{id}' => 'Visiosoft\ProfileModule\Http\Controller\Admin\AdressController@adressupdate', + 'admin/profile' => 'Visiosoft\ProfileModule\Http\Controller\Admin\AdressController@index', + 'admin/profile/create' => 'Visiosoft\ProfileModule\Http\Controller\Admin\AdressController@create', + 'admin/profile/edit/{id}' => 'Visiosoft\ProfileModule\Http\Controller\Admin\AdressController@adresList', + 'admin/profile/editAdress/{id}' => 'Visiosoft\ProfileModule\Http\Controller\Admin\AdressController@edit', + 'admin/profile/update/{id}' => 'Visiosoft\ProfileModule\Http\Controller\Admin\AdressController@adressupdate', 'profile/adress/update/{id}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@adressUpdate', 'profile/address' => [ 'as' => 'profile::address', @@ -100,9 +96,6 @@ class ProfileModuleServiceProvider extends AddonServiceProvider ], /* Profile */ - 'admin/profile' => 'Visiosoft\ProfileModule\Http\Controller\Admin\ProfileController@index', - 'admin/profile/edit/{id}' => 'Visiosoft\ProfileModule\Http\Controller\Admin\ProfileController@edit', - 'admin/profile/update/{id}' => 'Visiosoft\ProfileModule\Http\Controller\Admin\ProfileController@update', 'profile/edit' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@edit', 'profile/update' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@update', 'profile' => [ @@ -190,7 +183,6 @@ class ProfileModuleServiceProvider extends AddonServiceProvider 'profile' => ProfileFormBuilder::class, 'signIn' => SignInFormBuilder::class, ProfileAdressEntryModel::class => AdressModel::class, - ProfileProfileEntryModel::class => ProfileModel::class, ]; /** @@ -200,7 +192,6 @@ class ProfileModuleServiceProvider extends AddonServiceProvider */ protected $singletons = [ AdressRepositoryInterface::class => AdressRepository::class, - ProfileRepositoryInterface::class => ProfileRepository::class, 'register2' => Register2FormBuilder::class, 'sites' => SitesFormBuilder::class, ];