Merge branch 'develop' of https://github.com/viralsolani/laravel-adminpanel into develop

.gitignore

@@ -33,3 +33,5 @@ public/js/skins/*.js
 composer.lock
 public/img/backend/blog_images/*
 public/mix-manifest.json
+public/access.log
+public/error.log
\ No newline at end of file

README.md

@@ -27,6 +27,8 @@ Give your project a Head Start by using [laravel-adminpanel](https://github.com/
 ## Built-in Laravel Boilerplate Module Generator
 It gives you the ability to create a module using a sweet GUI, where you put in the Module Name and it will generate all the necessary files for you, like Model, Traits, Relationship, Migration, Controllers, Views and routes. So when you are done creating a module, you can directly go to the route generated and see your new module. Since, this does not have the ability to generate table fields for now, so you have to write the migration file that is generated and run a manual php artisan migrate command, and you are good to go.
 
+We are using the module generator as a package, you can find it here: [Module Generator For Laravel Adminpanel](https://github.com/bvipul/generator).
+
 ## Installation
 
 Please check the official laravel installation guide for server requirements before you start. [Official Documentation](https://laravel.com/docs/5.6/installation#installation)

app/Http/Controllers/Backend/Access/Permission/PermissionController.php

@@ -3,18 +3,18 @@
 namespace App\Http\Controllers\Backend\Access\Permission;
 
 use App\Http\Controllers\Controller;
-use App\Http\Responses\ViewResponse;
-use App\Http\Responses\RedirectResponse;
-use App\Models\Access\Permission\Permission;
-use App\Http\Responses\Backend\Access\Permission\EditResponse;
-use App\Http\Responses\Backend\Access\Permission\CreateResponse;
-use App\Repositories\Backend\Access\Permission\PermissionRepository;
-use App\Http\Requests\Backend\Access\Permission\EditPermissionRequest;
-use App\Http\Requests\Backend\Access\Permission\StorePermissionRequest;
 use App\Http\Requests\Backend\Access\Permission\CreatePermissionRequest;
 use App\Http\Requests\Backend\Access\Permission\DeletePermissionRequest;
+use App\Http\Requests\Backend\Access\Permission\EditPermissionRequest;
 use App\Http\Requests\Backend\Access\Permission\ManagePermissionRequest;
+use App\Http\Requests\Backend\Access\Permission\StorePermissionRequest;
 use App\Http\Requests\Backend\Access\Permission\UpdatePermissionRequest;
+use App\Http\Responses\Backend\Access\Permission\CreateResponse;
+use App\Http\Responses\Backend\Access\Permission\EditResponse;
+use App\Http\Responses\RedirectResponse;
+use App\Http\Responses\ViewResponse;
+use App\Models\Access\Permission\Permission;
+use App\Repositories\Backend\Access\Permission\PermissionRepository;
 
 /**
  * Class PermissionController.

app/Http/Controllers/Backend/BlogCategories/BlogCategoriesController.php

@@ -3,16 +3,16 @@
 namespace App\Http\Controllers\Backend\BlogCategories;
 
 use App\Http\Controllers\Controller;
-use App\Http\Responses\ViewResponse;
-use App\Http\Responses\RedirectResponse;
-use App\Models\BlogCategories\BlogCategory;
-use App\Repositories\Backend\BlogCategories\BlogCategoriesRepository;
-use App\Http\Requests\Backend\BlogCategories\EditBlogCategoriesRequest;
-use App\Http\Requests\Backend\BlogCategories\StoreBlogCategoriesRequest;
 use App\Http\Requests\Backend\BlogCategories\CreateBlogCategoriesRequest;
 use App\Http\Requests\Backend\BlogCategories\DeleteBlogCategoriesRequest;
+use App\Http\Requests\Backend\BlogCategories\EditBlogCategoriesRequest;
 use App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest;
+use App\Http\Requests\Backend\BlogCategories\StoreBlogCategoriesRequest;
 use App\Http\Requests\Backend\BlogCategories\UpdateBlogCategoriesRequest;
+use App\Http\Responses\RedirectResponse;
+use App\Http\Responses\ViewResponse;
+use App\Models\BlogCategories\BlogCategory;
+use App\Repositories\Backend\BlogCategories\BlogCategoriesRepository;
 
 /**
  * Class BlogCategoriesController.

app/Http/Controllers/Backend/BlogTags/BlogTagsController.php

@@ -2,18 +2,18 @@
 
 namespace App\Http\Controllers\Backend\BlogTags;
 
-use App\Models\BlogTags\BlogTag;
 use App\Http\Controllers\Controller;
-use App\Http\Responses\ViewResponse;
-use App\Http\Responses\RedirectResponse;
-use App\Http\Responses\Backend\BlogTag\EditResponse;
-use App\Repositories\Backend\BlogTags\BlogTagsRepository;
-use App\Http\Requests\Backend\BlogTags\EditBlogTagsRequest;
-use App\Http\Requests\Backend\BlogTags\StoreBlogTagsRequest;
 use App\Http\Requests\Backend\BlogTags\CreateBlogTagsRequest;
 use App\Http\Requests\Backend\BlogTags\DeleteBlogTagsRequest;
+use App\Http\Requests\Backend\BlogTags\EditBlogTagsRequest;
 use App\Http\Requests\Backend\BlogTags\ManageBlogTagsRequest;
+use App\Http\Requests\Backend\BlogTags\StoreBlogTagsRequest;
 use App\Http\Requests\Backend\BlogTags\UpdateBlogTagsRequest;
+use App\Http\Responses\Backend\BlogTag\EditResponse;
+use App\Http\Responses\RedirectResponse;
+use App\Http\Responses\ViewResponse;
+use App\Models\BlogTags\BlogTag;
+use App\Repositories\Backend\BlogTags\BlogTagsRepository;
 
 /**
  * Class BlogTagsController.

app/Http/Controllers/Backend/Faqs/FaqsController.php

@@ -2,23 +2,23 @@
 
 namespace App\Http\Controllers\Backend\Faqs;
 
-use App\Models\Faqs\Faq;
 use App\Http\Controllers\Controller;
-use App\Http\Responses\ViewResponse;
-use App\Http\Responses\RedirectResponse;
-use App\Http\Responses\Backend\Faq\EditResponse;
-use App\Repositories\Backend\Faqs\FaqsRepository;
-use App\Http\Requests\Backend\Faqs\EditFaqsRequest;
-use App\Http\Requests\Backend\Faqs\StoreFaqsRequest;
 use App\Http\Requests\Backend\Faqs\CreateFaqsRequest;
 use App\Http\Requests\Backend\Faqs\DeleteFaqsRequest;
+use App\Http\Requests\Backend\Faqs\EditFaqsRequest;
 use App\Http\Requests\Backend\Faqs\ManageFaqsRequest;
+use App\Http\Requests\Backend\Faqs\StoreFaqsRequest;
 use App\Http\Requests\Backend\Faqs\UpdateFaqsRequest;
+use App\Http\Responses\Backend\Faq\EditResponse;
+use App\Http\Responses\RedirectResponse;
+use App\Http\Responses\ViewResponse;
+use App\Models\Faqs\Faq;
+use App\Repositories\Backend\Faqs\FaqsRepository;
 
 class FaqsController extends Controller
 {
     /**
-     * Faq Repository
+     * Faq Repository.
      *
      * @var \App\Repositories\Backend\Faqs\FaqsRepository
      */

app/Http/Controllers/Backend/Menu/MenuController.php

@@ -2,42 +2,41 @@
 
 namespace App\Http\Controllers\Backend\Menu;
 
-use App\Models\Menu\Menu;
-use Bvipul\Generator\Module;
-use Illuminate\Support\Facades\DB;
 use App\Http\Controllers\Controller;
-use App\Http\Responses\ViewResponse;
-use App\Http\Responses\RedirectResponse;
-use App\Http\Responses\Backend\Menu\EditResponse;
-use App\Repositories\Backend\Menu\MenuRepository;
-use App\Http\Requests\Backend\Menu\EditMenuRequest;
-use App\Http\Responses\Backend\Menu\CreateResponse;
-use App\Http\Requests\Backend\Menu\StoreMenuRequest;
 use App\Http\Requests\Backend\Menu\CreateMenuRequest;
 use App\Http\Requests\Backend\Menu\DeleteMenuRequest;
+use App\Http\Requests\Backend\Menu\EditMenuRequest;
 use App\Http\Requests\Backend\Menu\ManageMenuRequest;
+use App\Http\Requests\Backend\Menu\StoreMenuRequest;
 use App\Http\Requests\Backend\Menu\UpdateMenuRequest;
+use App\Http\Responses\Backend\Menu\CreateResponse;
+use App\Http\Responses\Backend\Menu\EditResponse;
+use App\Http\Responses\RedirectResponse;
+use App\Http\Responses\ViewResponse;
+use App\Models\Menu\Menu;
+use App\Repositories\Backend\Menu\MenuRepository;
+use Bvipul\Generator\Module;
 
 class MenuController extends Controller
 {
     /**
-     * Menu Model Object
+     * Menu Model Object.
      *
      * @var \App\Models\Menu\Menu
      */
     protected $menu;
 
     /**
-     * Module Model Object
+     * Module Model Object.
      *
      * @var \Bvipul\Generator\Module
      */
     protected $modules;
 
     /**
-     * Menu Types
+     * Menu Types.
      *
-     * @var Array
+     * @var array
      */
     protected $types;
 
@@ -54,7 +53,6 @@ class MenuController extends Controller
             'backend'  => 'Backend',
             'frontend' => 'Frontend',
         ];
-
     }
 
     /**

app/Http/Controllers/Backend/Pages/PagesController.php

@@ -2,18 +2,18 @@
 
 namespace App\Http\Controllers\Backend\Pages;
 
-use App\Models\Page\Page;
 use App\Http\Controllers\Controller;
-use App\Http\Responses\ViewResponse;
-use App\Http\Responses\RedirectResponse;
-use App\Http\Responses\Backend\Page\EditResponse;
-use App\Repositories\Backend\Pages\PagesRepository;
-use App\Http\Requests\Backend\Pages\EditPageRequest;
-use App\Http\Requests\Backend\Pages\StorePageRequest;
 use App\Http\Requests\Backend\Pages\CreatePageRequest;
 use App\Http\Requests\Backend\Pages\DeletePageRequest;
+use App\Http\Requests\Backend\Pages\EditPageRequest;
 use App\Http\Requests\Backend\Pages\ManagePageRequest;
+use App\Http\Requests\Backend\Pages\StorePageRequest;
 use App\Http\Requests\Backend\Pages\UpdatePageRequest;
+use App\Http\Responses\Backend\Page\EditResponse;
+use App\Http\Responses\RedirectResponse;
+use App\Http\Responses\ViewResponse;
+use App\Models\Page\Page;
+use App\Repositories\Backend\Pages\PagesRepository;
 
 /**
  * Class PagesController.

app/Http/Controllers/Backend/Settings/SettingsController.php

@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\Backend\Settings;
 
-use App\Models\Settings\Setting;
 use App\Http\Controllers\Controller;
-use App\Http\Responses\RedirectResponse;
-use App\Http\Responses\Backend\Setting\EditResponse;
-use App\Repositories\Backend\Settings\SettingsRepository;
 use App\Http\Requests\Backend\Settings\ManageSettingsRequest;
 use App\Http\Requests\Backend\Settings\UpdateSettingsRequest;
+use App\Http\Responses\Backend\Setting\EditResponse;
+use App\Http\Responses\RedirectResponse;
+use App\Models\Settings\Setting;
+use App\Repositories\Backend\Settings\SettingsRepository;
 
 /**
  * Class SettingsController.

app/Http/Controllers/Frontend/FrontendController.php

@@ -22,14 +22,6 @@ class FrontendController extends Controller
         return view('frontend.index', compact('google_analytics', $google_analytics));
     }
 
-    /**
-     * @return \Illuminate\View\View
-     */
-    public function macros()
-    {
-        return view('frontend.macros');
-    }
-
     /**
      * show page by $page_slug.
      */

app/Http/Responses/Backend/Access/Permission/EditResponse.php

@@ -20,9 +20,10 @@ class EditResponse implements Responsable
     }
 
     /**
-     * toReponse
+     * toReponse.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)

app/Http/Responses/Backend/BlogCategory/EditResponse.php

@@ -20,9 +20,10 @@ class EditResponse implements Responsable
     }
 
     /**
-     * toReponse
+     * toReponse.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)

app/Http/Responses/Backend/BlogTag/EditResponse.php

@@ -20,9 +20,10 @@ class EditResponse implements Responsable
     }
 
     /**
-     * toReponse
+     * toReponse.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)

app/Http/Responses/Backend/Faq/EditResponse.php

@@ -20,9 +20,10 @@ class EditResponse implements Responsable
     }
 
     /**
-     * toReponse
+     * toReponse.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)

app/Http/Responses/Backend/Menu/CreateResponse.php

@@ -7,7 +7,7 @@ use Illuminate\Contracts\Support\Responsable;
 class CreateResponse implements Responsable
 {
     /**
-     * @var Array
+     * @var array
      */
     protected $types;
 
@@ -17,7 +17,7 @@ class CreateResponse implements Responsable
     protected $modules;
 
     /**
-     * @param Array                     $types
+     * @param array                    $types
      * @param \Bvipul\Generator\Module $modules
      */
     public function __construct($types, $modules)

app/Http/Responses/Backend/Menu/EditResponse.php

@@ -7,7 +7,7 @@ use Illuminate\Contracts\Support\Responsable;
 class EditResponse implements Responsable
 {
     /**
-     * @var Array
+     * @var array
      */
     protected $types;
 
@@ -23,7 +23,7 @@ class EditResponse implements Responsable
 
     /**
      * @param \App\Models\Menu\Menu    $menu
-     * @param Array                     $types
+     * @param array                    $types
      * @param \Bvipul\Generator\Module $modules
      */
     public function __construct($menu, $types, $modules)
@@ -34,9 +34,10 @@ class EditResponse implements Responsable
     }
 
     /**
-     * toReponse
+     * toReponse.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)

app/Http/Responses/Backend/Page/EditResponse.php

@@ -20,9 +20,10 @@ class EditResponse implements Responsable
     }
 
     /**
-     * toReponse
+     * toReponse.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)

app/Http/Responses/Backend/Setting/EditResponse.php

@@ -20,9 +20,10 @@ class EditResponse implements Responsable
     }
 
     /**
-     * toReponse
+     * toReponse.
      *
      * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)

package.json

@@ -10,7 +10,7 @@
     "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
   },
   "devDependencies": {
-    "axios": "^0.17",
+    "axios": "^0.18",
     "bootstrap-sass": "^3.3.7",
     "cross-env": "^5.1",
     "font-awesome": "^4.7.0",
@@ -27,6 +27,7 @@
     "datatables.net-buttons": "^1.3.1",
     "moment": "^2.18.1",
     "nestable2": "^1.5.0",
+    "node-sass": "^4.9.0",
     "pluralize": "^7.0.0",
     "select2": "^4.0.4",
     "tinymce": "^4.5.8"

resources/views/frontend/includes/nav.blade.php

@@ -16,9 +16,9 @@
         </div><!--navbar-header-->
 
         <div class="collapse navbar-collapse" id="frontend-navbar-collapse">
-            <ul class="nav navbar-nav">
-                <li>{{ link_to_route('frontend.macros', trans('navs.frontend.macros')) }}</li>
-            </ul>
+            {{-- <ul class="nav navbar-nav">
+                <li></li>
+            </ul> --}}
             <ul class="nav navbar-nav navbar-right">
                 @if (config('locale.status') && count(config('locale.languages')) > 1)
                     <li class="dropdown">

resources/views/frontend/macros.blade.php

-@extends('frontend.layouts.app')
-
-@section('content')
-    <div class="row">
-
-        <div class="col-xs-12">
-
-            <div class="panel panel-default">
-                <div class="panel-heading"><i class="fa fa-home"></i> {{ trans('labels.frontend.macros.macro_examples') }}</div>
-
-                <div class="panel-body">
-                    <div class="form-group">
-                        <label>{{ trans('labels.frontend.macros.state.us.us') }}</label>
-                        {{-- Shorthand for this is just selectState, set which version is shorthanded in Macros/Dropdowns --}}
-                        {{ Form::selectStateUS('state', 'NY', ['class' => 'form-control']) }}
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('labels.frontend.macros.state.us.outlying') }}</label>
-                        {{ Form::selectStateUSOutlyingTerritories('state_outlying', null, ['class' => 'form-control']) }}
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('labels.frontend.macros.state.us.armed') }}</label>
-                        {{ Form::selectStateUSArmedForces('armed_forces', null, ['class' => 'form-control']) }}
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('labels.frontend.macros.territories.canada') }}</label>
-                        {{ Form::selectCanadaTerritories('canada_territories', null, ['class' => 'form-control']) }}
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('labels.frontend.macros.state.mexico') }}</label>
-                        {{ Form::selectStateMexico('mexico', null, ['class' => 'form-control']) }}
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('labels.frontend.macros.country.alpha') }}</label>
-                        {{ Form::selectCountryAlpha('country_alpha', 'ISO 3166-2:US', ['class' => 'form-control']) }}
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('labels.frontend.macros.country.alpha2') }}</label>
-                        {{-- Shorthand for this is just selectCountry, set which version is shorthanded in Macros/Dropdowns --}}
-                        {{ Form::selectCountryAlpha2('country_alpha2', 'US', ['class' => 'form-control']) }}
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('labels.frontend.macros.country.alpha3') }}</label>
-                        {{ Form::selectCountryAlpha3('country_alpha3', 'USA', ['class' => 'form-control']) }}
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('labels.frontend.macros.country.numeric') }}</label>
-                        {{ Form::selectCountryNumeric('country_numeric', '840', ['class' => 'form-control']) }}
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('labels.frontend.macros.timezone') }}</label>
-                        {{ Form::selectTimezone('timezone', 'America/New_York', ['class' => 'form-control']) }}
-                    </div>
-                </div>
-            </div><!-- panel -->
-
-        </div><!-- col-md-10 -->
-
-    </div><!-- row -->
-@endsection
\ No newline at end of file

routes/Frontend/Frontend.php

@@ -5,7 +5,6 @@
  * All route names are prefixed with 'frontend.'.
  */
 Route::get('/', 'FrontendController@index')->name('index');
-Route::get('macros', 'FrontendController@macros')->name('macros');
 Route::post('/get/states', 'FrontendController@getStates')->name('get.states');
 Route::post('/get/cities', 'FrontendController@getCities')->name('get.cities');