From 67673b29d5746c54bbc0592c97def523acdb8d95 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 9 Mar 2021 11:26:21 +0300 Subject: [PATCH 1/4] #3283 added theme settings in left navigation --- app/Providers/AppServiceProvider.php | 31 ++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index c98476533..c0e457ef1 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,6 +2,8 @@ namespace App\Providers; +use Anomaly\Streams\Platform\Ui\ControlPanel\Component\Navigation\NavigationFactory; +use Anomaly\Streams\Platform\Ui\ControlPanel\ControlPanelBuilder; use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider @@ -12,15 +14,15 @@ class AppServiceProvider extends ServiceProvider * * @return void */ - public function boot() + public function boot(ControlPanelBuilder $builder, NavigationFactory $factory) { - view()->composer('*', function ($view) { + view()->composer('*', function ($view) use ($builder, $factory) { //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; + ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.variables')) ? $navigation->setClass('hidden') : false; + ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.system')) ? $navigation->setClass('hidden') : false; + ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.redirects')) ? $navigation->setClass('hidden') : false; + ($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'])) { @@ -30,6 +32,23 @@ class AppServiceProvider extends ServiceProvider App()->setLocale($lang); Request()->session()->put('_locale', $lang); } + + $newNavigations = [ + [ + 'slug' => setting_value("streams::standard_theme"), + 'icon' => 'fa fa-pencil-square-o', + 'title' => 'visiosoft.theme.defaultadmin::section.theme_settings.name', + 'attributes' => [ + 'href' => url("admin/settings/themes/" . setting_value("streams::standard_theme")) + ] + ] + ]; + $cp = $builder->getControlPanel(); + foreach ($newNavigations as $newNavigation) { + if (!template()->get('cp')->getNavigation()->get($newNavigation['slug'])){ + $cp->addNavigationLink($factory->make($newNavigation)); + } + } }); } From 9136b20a4f70b441ae853b6286f359b4477fa83b Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 9 Mar 2021 12:03:19 +0300 Subject: [PATCH 2/4] #3283 added theme settings in left navigation --- app/Providers/AppServiceProvider.php | 40 +++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index c0e457ef1..cf87ee4f4 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -17,12 +17,31 @@ class AppServiceProvider extends ServiceProvider public function boot(ControlPanelBuilder $builder, NavigationFactory $factory) { view()->composer('*', function ($view) use ($builder, $factory) { - //Hidden menu items in sidebar on dashboard + if (auth()->check() and template()->get('cp')) { - ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.variables')) ? $navigation->setClass('hidden') : false; + //Hidden menu items in sidebar on dashboard + ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.variables')) ? $navigation->setClass('hidden') : false; ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.system')) ? $navigation->setClass('hidden') : false; ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.redirects')) ? $navigation->setClass('hidden') : false; ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.repeaters')) ? $navigation->setClass('hidden') : false; + + // Add new menu items in sidebar on dashboard + $newNavigations = [ + [ + 'slug' => setting_value("streams::standard_theme"), + 'icon' => 'fa fa-pencil-square-o', + 'title' => 'visiosoft.theme.defaultadmin::section.theme_settings.name', + 'attributes' => [ + 'href' => url("admin/settings/themes/" . setting_value("streams::standard_theme")) + ] + ] + ]; + $cp = $builder->getControlPanel(); + foreach ($newNavigations as $newNavigation) { + if (!template()->get('cp')->getNavigation()->get($newNavigation['slug'])){ + $cp->addNavigationLink($factory->make($newNavigation)); + } + } } //Auto Language Switcher if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale')) and isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { @@ -32,23 +51,6 @@ class AppServiceProvider extends ServiceProvider App()->setLocale($lang); Request()->session()->put('_locale', $lang); } - - $newNavigations = [ - [ - 'slug' => setting_value("streams::standard_theme"), - 'icon' => 'fa fa-pencil-square-o', - 'title' => 'visiosoft.theme.defaultadmin::section.theme_settings.name', - 'attributes' => [ - 'href' => url("admin/settings/themes/" . setting_value("streams::standard_theme")) - ] - ] - ]; - $cp = $builder->getControlPanel(); - foreach ($newNavigations as $newNavigation) { - if (!template()->get('cp')->getNavigation()->get($newNavigation['slug'])){ - $cp->addNavigationLink($factory->make($newNavigation)); - } - } }); } From ad827b14816bbd8a64e884a754f2f327ffb9a780 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 9 Mar 2021 12:05:23 +0300 Subject: [PATCH 3/4] #3283 remove placeholder on category --- .../visiosoft/cats-module/src/CatsModule.php | 5 -- .../cats-module/src/CatsModuleSeeder.php | 3 +- .../src/CatsModuleServiceProvider.php | 14 ---- .../Admin/PlaceholderforsearchController.php | 43 ------------ .../PlaceholderforsearchInterface.php | 8 --- ...laceholderforsearchRepositoryInterface.php | 8 --- .../Form/PlaceholderforsearchFormBuilder.php | 66 ------------------- .../PlaceholderforsearchCollection.php | 8 --- .../PlaceholderforsearchCriteria.php | 8 --- .../PlaceholderforsearchModel.php | 9 --- .../PlaceholderforsearchObserver.php | 8 --- .../PlaceholderforsearchPresenter.php | 8 --- .../PlaceholderforsearchRepository.php | 25 ------- .../PlaceholderforsearchRouter.php | 8 --- .../PlaceholderforsearchSeeder.php | 49 -------------- .../PlaceholderforsearchTableBuilder.php | 61 ----------------- 16 files changed, 1 insertion(+), 330 deletions(-) delete mode 100644 addons/default/visiosoft/cats-module/src/Http/Controller/Admin/PlaceholderforsearchController.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/Contract/PlaceholderforsearchInterface.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/Contract/PlaceholderforsearchRepositoryInterface.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/Form/PlaceholderforsearchFormBuilder.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchCollection.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchCriteria.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchModel.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchObserver.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchPresenter.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchRepository.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchRouter.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchSeeder.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/Table/PlaceholderforsearchTableBuilder.php diff --git a/addons/default/visiosoft/cats-module/src/CatsModule.php b/addons/default/visiosoft/cats-module/src/CatsModule.php index 58af83cd1..497cfa1e2 100644 --- a/addons/default/visiosoft/cats-module/src/CatsModule.php +++ b/addons/default/visiosoft/cats-module/src/CatsModule.php @@ -30,11 +30,6 @@ class CatsModule extends Module 'new_category', ], ], - 'placeholderforsearch' => [ - 'buttons' => [ - 'new_placeholderforsearch', - ], - ], ]; } diff --git a/addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php b/addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php index 671d997f4..bd5ebd408 100644 --- a/addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php +++ b/addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php @@ -1,7 +1,6 @@ call(PlaceholderforsearchSeeder::class); + // } } \ No newline at end of file diff --git a/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php b/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php index 9a7ecebf9..e083237e0 100644 --- a/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php +++ b/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php @@ -1,10 +1,6 @@ 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@cleanSubcats', - 'admin/cats/placeholderforsearch' => 'Visiosoft\CatsModule\Http\Controller\Admin\PlaceholderforsearchController@index', - 'admin/cats/placeholderforsearch/create' => 'Visiosoft\CatsModule\Http\Controller\Admin\PlaceholderforsearchController@create', - 'admin/cats/placeholderforsearch/edit/{id}' => 'Visiosoft\CatsModule\Http\Controller\Admin\PlaceholderforsearchController@edit', 'admin/cats' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@index', 'admin/cats/create' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@create', 'admin/cats/edit/{id}' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@edit', @@ -117,7 +110,6 @@ class CatsModuleServiceProvider extends AddonServiceProvider * @type array|null */ protected $bindings = [ - CatsPlaceholderforsearchEntryModel::class => PlaceholderforsearchModel::class, CatsCategoryEntryModel::class => CategoryModel::class, ]; @@ -127,7 +119,6 @@ class CatsModuleServiceProvider extends AddonServiceProvider * @type array|null */ protected $singletons = [ - PlaceholderforsearchRepositoryInterface::class => PlaceholderforsearchRepository::class, CategoryRepositoryInterface::class => CategoryRepository::class, ]; @@ -203,11 +194,6 @@ class CatsModuleServiceProvider extends AddonServiceProvider ], ], ], - 'placeholderforsearch' => [ - 'buttons' => [ - 'new_placeholderforsearch', - ], - ], ]; $this->addon->setSections($sections); } diff --git a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/PlaceholderforsearchController.php b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/PlaceholderforsearchController.php deleted file mode 100644 index dee51c2ec..000000000 --- a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/PlaceholderforsearchController.php +++ /dev/null @@ -1,43 +0,0 @@ -render(); - } - - /** - * Create a new entry. - * - * @param PlaceholderforsearchFormBuilder $form - * @return \Symfony\Component\HttpFoundation\Response - */ - public function create(PlaceholderforsearchFormBuilder $form) - { - return $form->render(); - } - - /** - * Edit an existing entry. - * - * @param PlaceholderforsearchFormBuilder $form - * @param $id - * @return \Symfony\Component\HttpFoundation\Response - */ - public function edit(PlaceholderforsearchFormBuilder $form, $id) - { - return $form->render($id); - } -} diff --git a/addons/default/visiosoft/cats-module/src/Placeholderforsearch/Contract/PlaceholderforsearchInterface.php b/addons/default/visiosoft/cats-module/src/Placeholderforsearch/Contract/PlaceholderforsearchInterface.php deleted file mode 100644 index b6c652c90..000000000 --- a/addons/default/visiosoft/cats-module/src/Placeholderforsearch/Contract/PlaceholderforsearchInterface.php +++ /dev/null @@ -1,8 +0,0 @@ -model = $model; - } -} diff --git a/addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchRouter.php b/addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchRouter.php deleted file mode 100644 index 5eb70879d..000000000 --- a/addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchRouter.php +++ /dev/null @@ -1,8 +0,0 @@ -truncate(); - DB::table('cats_placeholderforsearch_translations')->truncate(); - PlaceholderforsearchModel::create([ - 'en' => [ - 'name' => 'Chevrolet Camaro' - ], - 'tr' => [ - 'name' => 'Chevrolet Camaro' - ] - ]); - PlaceholderforsearchModel::create([ - 'en' => [ - 'name' => 'Xiaomi Black Shark 128 GB' - ], - 'tr' => [ - 'name' => 'Xiaomi Black Shark 128 GB' - ] - ]); - PlaceholderforsearchModel::create([ - 'en' => [ - 'name' => 'Apple MacBook Pro' - ], - 'tr' => [ - 'name' => 'Apple MacBook Pro' - ] - ]); - PlaceholderforsearchModel::create([ - 'en' => [ - 'name' => 'Make your search now' - ], - 'tr' => [ - 'name' => 'Make your search now' - ] - ]); - } -} diff --git a/addons/default/visiosoft/cats-module/src/Placeholderforsearch/Table/PlaceholderforsearchTableBuilder.php b/addons/default/visiosoft/cats-module/src/Placeholderforsearch/Table/PlaceholderforsearchTableBuilder.php deleted file mode 100644 index 0391b56a7..000000000 --- a/addons/default/visiosoft/cats-module/src/Placeholderforsearch/Table/PlaceholderforsearchTableBuilder.php +++ /dev/null @@ -1,61 +0,0 @@ - Date: Tue, 9 Mar 2021 17:36:56 +0300 Subject: [PATCH 4/4] #3515 emlaktown-theme dark mode color add --- .../resources/assets/css/profile-nav.scss | 2 +- .../profile-module/resources/views/profile/index.twig | 2 +- .../resources/views/profile/partials/navigation.twig | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss b/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss index 4fbfa1010..23affb0bd 100644 --- a/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss +++ b/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss @@ -62,7 +62,7 @@ } } - img { + svg { margin-right: .75rem; width: 1.5rem; height: 1.5rem; diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/index.twig b/addons/default/visiosoft/profile-module/resources/views/profile/index.twig index 2d5fd3fe5..7d48583db 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/index.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/index.twig @@ -2,7 +2,7 @@ {{ asset_style("visiosoft.module.profile::assets/css/profile-nav.scss") }} {% endblock %} -
+
{% include "visiosoft.module.profile::profile/partials/navigation" %} diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig b/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig index 5c38fe95f..29b052248 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig @@ -4,26 +4,26 @@