Merge pull request #671 from openclassify/diah

Remove unused routes and organize AdvsModuleServiceProvider

addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php

@@ -64,43 +64,19 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
      * @type array|null
      */
     protected $routes = [
-        'admin/advs/advs' => [
+        // Admin AdvsController
+        'admin/advs' => [
             'as' => 'visiosoft.module.advs::admin_advs',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@index',
         ],
-        'admin/advs/advs/create' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@create',
+        'admin/assets/clear' => [
-        'admin/advs/advs/edit/{id}' => [
+            'as' => 'assets_clear',
-            'middleware' => 'auth',
+            'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@assetsClear',
-            'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@edit'
         ],
-        'admin/advs/village' => 'Visiosoft\AdvsModule\Http\Controller\Admin\VillageController@index',
-        'admin/advs/village/create' => 'Visiosoft\AdvsModule\Http\Controller\Admin\VillageController@create',
-        'admin/advs/village/edit/{id}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\VillageController@edit',
-        'categories/checkparent/{id}' => 'Visiosoft\AdvsModule\Http\Controller\advsController@checkParentCat',
-        'admin/advs/ajax' => [
-            'as' => 'visiosoft.module.advs::ajax',
-            'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@locations',
-        ],
-        'ajax/viewed/{id}' => [
-            'as' => 'advs::viewed',
-            'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@viewed',
-        ],
-        'class/ajax' => [
-            'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@locations',
-        ],
-        'class/ajaxCategory' => [
-            'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@categories',
-        ],
-        'admin/advs' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@index',
-        // User choose modal
         'admin/advs-users/choose/{advId}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@choose',
-        'admin/advs/create' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@create',
-        'admin/advs/edit/{id}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@edit',
-        'admin/advs/list' => [
-            'as' => 'visiosoft.module.advs::admin-list',
-            'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@manage'
-        ],
         'admin/class/actions/{id}/{type}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@actions',
+
+        // advsController
         'advs/list' => [
             'as' => 'visiosoft.module.advs::list',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@index'
@@ -113,8 +89,6 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
             'as' => 'visiosoft.module.advs::list_cat',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@index',
         ],
-        'getlocations' => 'Visiosoft\AdvsModule\Http\Controller\advsController@getLocations',
-        'advs/main' => 'Visiosoft\AdvsModule\Http\Controller\advsController@advsMainPage',
         'advs/adv/{id}' => [
             'as' => 'adv_detail_backup',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
@@ -137,15 +111,12 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
         ],
         'advs/map?country={country}&city[]={city}&district={districts}' => [
             'as' => 'visiosoft.module.advs::show_ad_map_location',
-            'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@map'
+            'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@index'
         ],
-        'advs/categories' => 'Visiosoft\AdvsModule\Http\Controller\CategoriesController@index',
-        'advs/c/{cat}' => 'Visiosoft\AdvsModule\Http\Controller\CategoriesController@listByCat',
         'c/{category?}/{city?}' => [
             'as' => 'adv_list_seo',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@index'
         ],
-        'advs/module_active' => 'Visiosoft\AdvsModule\Http\Controller\advsController@index',
         'advs/create_adv' => [
             'as' => "advs::create_adv",
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@cats',
@@ -154,13 +125,10 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
             'as' => 'post_adv',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@create',
         ],
-        'class/getcats/{id}' => 'Visiosoft\AdvsModule\Http\Controller\advsController@getCatsForNewAd',
         'advs/save_adv' => [
             'as' => 'visiosoft.module.advs::post_cat',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@store'
         ],
-        'advs/my_advs' => 'Visiosoft\AdvsModule\Http\Controller\advsController@myAdvs',
-        'advs/my_advs/{params}' => 'Visiosoft\AdvsModule\Http\Controller\advsController@myAdvs',
         'advs/edit_advs/{id}' => [
             'as' => 'visiosoft.module.advs::edit_adv',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@edit',
@@ -169,23 +137,10 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
             'as' => 'visiosoft.module.advs::status',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@statusAds'
         ],
-        'routes' => 'Visiosoft\AdvsModule\Http\Controller\advsController@routes',
-        'advs/map/advs/list' => [
-            'as' => 'advs_map_list',
-            'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@map',
-        ],
-        'advs/map' => [
-            'as' => 'advs_map',
-            'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@map',
-        ],
-        'mapJson' => 'Visiosoft\AdvsModule\Http\Controller\advsController@mapJson',
-        'advs/ttr/{id}' => 'Visiosoft\PackagesModule\Http\Controller\packageFEController@advsStatusbyUser',
         'advs/delete/{id}' => [
             'as' => 'advs::delete',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@deleteAd',
         ],
-        'check_user' => 'Visiosoft\AdvsModule\Http\Controller\advsController@checkUser',
-        'keySearch' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@keySearch',
         'adv/addCart/{id}' => [
             'as' => 'adv_AddCart',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@advAddCart',
@@ -206,10 +161,6 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
             'as' => 'visiosoft.module.advs::view_type',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@viewType',
         ],
-        'admin/assets/clear' => [
-            'as' => 'assets_clear',
-            'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@assetsClear',
-        ],
         'adv/edit/category/{id}' => [
             'as' => 'adv::edit_category',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@editCategoryForAd',
@@ -218,15 +169,6 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
             'as' => 'ajax::getCats',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@getCats',
         ],
-
-        'ajax/getAdvs' => [
-            'as' => 'ajax::getAds',
-            'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@getMyAds'
-        ],
-        'ajax/get-advs-by-category/{categoryID}' => [
-            'as' => 'ajax::getAds',
-            'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@getAdvsByCat'
-        ],
         'advs/extendAll/{isAdmin?}' => [
             'as' => 'advs::extendAll',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@extendAll',
@@ -235,6 +177,38 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
             'as' => 'advs::extendSingle',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@extendSingle',
         ],
+        'categories/checkparent/{id}' => 'Visiosoft\AdvsModule\Http\Controller\advsController@checkParentCat',
+        'getlocations' => 'Visiosoft\AdvsModule\Http\Controller\advsController@getLocations',
+        'class/getcats/{id}' => 'Visiosoft\AdvsModule\Http\Controller\advsController@getCatsForNewAd',
+        'mapJson' => 'Visiosoft\AdvsModule\Http\Controller\advsController@mapJson',
+        'check_user' => 'Visiosoft\AdvsModule\Http\Controller\advsController@checkUser',
+
+        // AjaxController
+        'admin/advs/ajax' => [
+            'as' => 'visiosoft.module.advs::ajax',
+            'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@locations',
+        ],
+        'ajax/viewed/{id}' => [
+            'as' => 'advs::viewed',
+            'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@viewed',
+        ],
+        'ajax/getAdvs' => [
+            'as' => 'ajax::getAds',
+            'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@getMyAds'
+        ],
+        'ajax/get-advs-by-category/{categoryID}' => [
+            'as' => 'ajax::getAds',
+            'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@getAdvsByCat'
+        ],
+        'class/ajax' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@locations',
+        'class/ajaxCategory' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@categories',
+        'keySearch' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@keySearch',
+
+        // CategoriesController
+        'advs/c/{cat}' => 'Visiosoft\AdvsModule\Http\Controller\CategoriesController@listByCat',
+
+        // Others
+        'advs/ttr/{id}' => 'Visiosoft\PackagesModule\Http\Controller\packageFEController@advsStatusbyUser',
     ];
 
     /**

addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php

@@ -218,31 +218,6 @@ class AdvsController extends AdminController
         }
     }
 
-    /**
-     * Create a new entry.
-     *
-     * @param AdvFormBuilder $form
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function create(AdvFormBuilder $form)
-    {
-        // $this->dispatch(new AddEntryFormFromRequest($form));
-        // $this->dispatch(new AddAdvFormFromRequest($form));
-        return $form->render();
-    }
-
-    /**
-     * Edit an existing entry.
-     *
-     * @param AdvFormBuilder $form
-     * @param        $id
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function edit(AdvFormBuilder $form, $id)
-    {
-        return $form->render($id);
-    }
-
     public function actions($id, $type, SettingRepositoryInterface $settings, AdvModel $advModel)
     {
 

addons/default/visiosoft/advs-module/src/Http/Controller/CategoriesController.php

@@ -1,11 +1,10 @@
 <?php namespace Visiosoft\AdvsModule\Http\Controller;
 
 use Anomaly\Streams\Platform\Http\Controller\PublicController;
-use Anomaly\Streams\Platform\Model\Cats\CatsCategoryEntryModel;
 use Illuminate\Support\Facades\DB;
 
-class CategoriesController extends PublicController {
+class CategoriesController extends PublicController
-
+{
     public function listByCat($cat)
     {
         $advs = DB::table('advs_advs')

addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php

@@ -889,18 +889,6 @@ 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,
-        Request $request
-    )
-    {
-
-        return $this->index($advRepository, $categories, $countries, $request, true);
-
-    }
-
     public function mapJson(Request $request, AdvRepositoryInterface $repository)
     {
         $param = $request->toArray();