From e1d993c0b94403e00761b47fbbdc1fd21642f2ff Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 23 Feb 2021 11:54:50 +0300 Subject: [PATCH 1/2] fixed sentry errors && added education seeder --- .../advs-module/src/Adv/AdvModel.php | 2 +- .../resources/lang/it/field.php | 8 ++-- .../src/Education/EducationSeeder.php | 42 ++++++++++++++++++- .../src/ProfileModuleSeeder.php | 8 +++- app/Providers/AppServiceProvider.php | 20 ++++----- 5 files changed, 62 insertions(+), 18 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index 5416c4d80..e7d270457 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -71,7 +71,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface public function userAdv($nullable_ad = false, $checkRole = true) { - if (Auth::user()->hasRole('admin') && $checkRole) { + if ($user = Auth::user() and $user->hasRole('admin') && $checkRole) { return $this->getAdv(null, $nullable_ad); } else { return $this->getAdv(null, $nullable_ad) diff --git a/addons/default/visiosoft/profile-module/resources/lang/it/field.php b/addons/default/visiosoft/profile-module/resources/lang/it/field.php index 1daaf3590..8e94b2a68 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/it/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/it/field.php @@ -50,7 +50,7 @@ return [ 'name' => 'Numero di telefono di terra' ], 'office_phone' => [ - 'name' => 'Numero di telefono dell\\'ufficio' + 'name' => 'Numero di telefono dell\'ufficio' ], 'register_type' => [ 'name' => 'Tipo di registro' @@ -158,7 +158,7 @@ return [ 'name' => 'In attesa di approvazione' ], 'menu_delete_account' => [ - 'name' => 'Chiudere l\\'account' + 'name' => 'Chiudere l\'account' ], 'menu_my_ads' => [ 'name' => 'I miei annunci' @@ -170,7 +170,7 @@ return [ 'name' => 'Ciao' ], 'menu_last_msg' => [ - 'name' => 'Hai effettuato l\\'ultimo accesso alle' + 'name' => 'Hai effettuato l\'ultimo accesso alle' ], 'menu_packages' => [ 'name' => 'I miei pacchetti' @@ -270,7 +270,7 @@ return [ 'name' => 'Totale', ], 'order_date' => [ - 'name' => 'Data dell\\'ordine', + 'name' => 'Data dell\'ordine', ], 'order_no' => [ 'name' => 'ID ordine', diff --git a/addons/default/visiosoft/profile-module/src/Education/EducationSeeder.php b/addons/default/visiosoft/profile-module/src/Education/EducationSeeder.php index d9026d168..d948d41f2 100644 --- a/addons/default/visiosoft/profile-module/src/Education/EducationSeeder.php +++ b/addons/default/visiosoft/profile-module/src/Education/EducationSeeder.php @@ -1,6 +1,7 @@ [ + 'name' => 'Primary School', + ], + 'tr' => [ + 'name' => 'İlk Okul', + ], + ], + [ + 'en' => [ + 'name' => 'Middle School', + ], + 'tr' => [ + 'name' => 'Orta Okul', + ], + ], + [ + 'en' => [ + 'name' => 'High School', + ], + 'tr' => [ + 'name' => 'Lise', + ], + ], + [ + 'en' => [ + 'name' => 'University', + ], + 'tr' => [ + 'name' => 'Üniversite', + ], + ], + ]; + + foreach ($educations as $education) { + $repository->create($education); + } } } diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php b/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php index 50e69cfe6..874069301 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php @@ -3,6 +3,7 @@ use Anomaly\FilesModule\Disk\Contract\DiskRepositoryInterface; use Anomaly\FilesModule\Folder\Contract\FolderRepositoryInterface; use Anomaly\Streams\Platform\Database\Seeder\Seeder; +use Visiosoft\ProfileModule\Education\EducationSeeder; use Visiosoft\ProfileModule\Seed\UsersFieldsSeeder; class ProfileModuleSeeder extends Seeder @@ -25,14 +26,14 @@ class ProfileModuleSeeder extends Seeder /** * Create a new FolderSeeder instance. * - * @param DiskRepositoryInterface $disks + * @param DiskRepositoryInterface $disks * @param FolderRepositoryInterface $folders */ public function __construct(DiskRepositoryInterface $disks, FolderRepositoryInterface $folders) { parent::__construct(); - $this->disks = $disks; + $this->disks = $disks; $this->folders = $folders; } @@ -43,5 +44,8 @@ class ProfileModuleSeeder extends Seeder { // Users Fields Seeder $this->call(UsersFieldsSeeder::class); + + //Educations Seeder + $this->call(EducationSeeder::class); } } \ No newline at end of file diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index e9495c544..c98476533 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -14,16 +14,16 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { - view()->composer('*', function ($view) { - //Hidden menu items in sidebar on dashboard - if (auth()->check() and template()->get('cp')){ - template()->get('cp')->getNavigation()->get('anomaly.module.variables')->setClass('hidden'); - template()->get('cp')->getNavigation()->get('anomaly.module.system')->setClass('hidden'); - template()->get('cp')->getNavigation()->get('anomaly.module.redirects')->setClass('hidden'); - template()->get('cp')->getNavigation()->get('anomaly.module.repeaters')->setClass('hidden'); - } - //Auto Language Switcher - if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale')) and isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { + view()->composer('*', function ($view) { + //Hidden menu items in sidebar on dashboard + if (auth()->check() and template()->get('cp')) { + $is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.variables')) ? $navigation->setClass('hidden') : false; + $is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.system')) ? $navigation->setClass('hidden') : false; + $is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.redirects')) ? $navigation->setClass('hidden') : false; + $is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.repeaters')) ? $navigation->setClass('hidden') : false; + } + //Auto Language Switcher + if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale')) and isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { $lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);//Get Browser Language $acceptLang = config('streams::locales.enabled'); //Supported Language $lang = in_array($lang, $acceptLang) ? $lang : config('streams::locales.default', 'en'); From 7ee853dae47f05d22fecb9757e9c11277b5710f5 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 23 Feb 2021 13:10:58 +0300 Subject: [PATCH 2/2] fixed dashboard design problem for first installation --- database/seeds/DatabaseSeeder.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index b1aff1662..6616a3315 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -14,6 +14,7 @@ use Anomaly\UsersModule\User\UserActivator; use Illuminate\Database\Seeder; use Anomaly\DashboardModule\Widget\Contract\WidgetRepositoryInterface; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\DB; class DatabaseSeeder extends Seeder @@ -190,5 +191,7 @@ class DatabaseSeeder extends Seeder ], ]); }; - } + + Artisan::call('assets:clear'); + } }