Merge branch 'master' of https://github.com/viralsolani/laravel-adminpanel into test-cases

.env.example

-APP_NAME=Laravel
+APP_NAME="Laravel Admin Panel"
 APP_ENV=local
 APP_KEY=base64:O+TrollIDwasHEREtMG9kBc+/Q32exQLusNVhnq558w=
 APP_DEBUG=true

app/Http/Controllers/Backend/DashboardController.php

@@ -44,12 +44,6 @@ class DashboardController extends Controller
         $user = User::find($userId);
         $user->first_name = $input['first_name'];
         $user->last_name = $input['last_name'];
-        $user->address = $input['address'];
-        $user->state_id = $input['state_id'];
-        $user->country_id = config('access.constants.default_country');
-        $user->city_id = $input['city_id'];
-        $user->zip_code = $input['zip_code'];
-        $user->ssn = $input['ssn'];
         $user->updated_by = access()->user()->id;
 
         if ($user->save()) {

composer.json

@@ -27,10 +27,10 @@
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.0",
-        "bvipul/generator": "v0.9.1",
+        "bvipul/generator": "^0.9.1",
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
-        "laravel/dusk": "^2.0",
+        "laravel/browser-kit-testing": "^2.0",
         "mockery/mockery": "0.9.*",
         "phpunit/phpunit": "~6.0",
         "xethron/migrations-generator": "2.0.2"

public/mix-manifest.json

 {
-  "/js/frontend.js": "/js/frontend.945469bbbc12df3ad9e1.js",
-  "/js/backend.js": "/js/backend.79d9e4698dadbc0d93c7.js",
+  "/js/frontend.js": "/js/frontend.70ee44a92d84e7318a9d.js",
+  "/js/backend.js": "/js/backend.9cdae6ab449e701ce881.js",
   "/mix.js": "/mix.247ab120fe7680658924.js",
   "/css/frontend.css": "/css/frontend.3af0a6cbd7d1d8d042f2a37e97008b7c.css",
   "/css/backend.css": "/css/backend.f8550f50504e5b8ef6055285205f223a.css",
-  "/css/backend-custom.css": "/css/backend-custom.6366f7137897ebe08267f74909121944.css",
-  "/js/backend-custom.js": "/js/backend-custom.e6ea05e1824d0dd8e7c62027c135b7f2.js",
+  "/css/backend-custom.css": "/css/backend-custom.18e74fbe4c755b817a022d6d3d4e76b1.css",
+  "/js/backend-custom.js": "/js/backend-custom.694670b0d97bf54111bac3bd91ba3fcf.js",
   "/js/dataTable.js": "/js/dataTable.f968d300a6a0b871f138f114361259c8.js"
 }
\ No newline at end of file

resources/views/backend/access/users/profile-edit.blade.php

@@ -30,45 +30,6 @@
                 </div>
             </div>
 
-            <div class="form-group">
-                {{ Form::label('address', trans('validation.attributes.frontend.register-user.address'), ['class' => 'col-lg-2 control-label']) }}
-                <div class="col-lg-10">
-                    {{ Form::input('textarea', 'address', null, ['class' => 'form-control box-size', 'placeholder' => trans('validation.attributes.frontend.register-user.address')]) }}
-                </div>
-            </div>
-
-            {{-- state --}}
-            <div class="form-group">
-                {{ Form::label('state_id', trans('validation.attributes.frontend.register-user.state'), ['class' => 'col-lg-2 control-label']) }}
-                <div class="col-lg-10">
-                    {{ Form::select('state_id', [] , null, ['class' => 'form-control box-size st', 'placeholder' => trans('validation.attributes.frontend.register-user.state'), 'id' => 'state']) }}
-                </div><!--col-lg-10-->
-            </div><!--form-group-->
-
-            {{-- city --}}
-            <div class="form-group">
-                {{ Form::label('city_id', trans('validation.attributes.frontend.register-user.city'), ['class' => 'col-lg-2 control-label']) }}
-                <div class="col-lg-10">
-                    {{ Form::select('city_id', [], null, ['class' => 'form-control box-size ct', 'placeholder' => trans('validation.attributes.frontend.register-user.city'), 'id' => 'city']) }}
-                </div><!--col-lg-10-->
-            </div><!--form-group-->
-
-            {{-- zipcode --}}
-            <div class="form-group">
-                {{ Form::label('zip_code', trans('validation.attributes.frontend.register-user.zipcode'), ['class' => 'col-lg-2 control-label']) }}
-                <div class="col-lg-10">
-                    {{ Form::input('name', 'zip_code', null, ['class' => 'form-control box-size', 'placeholder' => trans('validation.attributes.frontend.register-user.zipcode')]) }}
-                </div><!--col-lg-10-->
-            </div><!--form-group-->
-
-            {{-- SSN --}}
-            <div class="form-group">
-                {{ Form::label('ssn', trans('validation.attributes.frontend.register-user.ssn'), ['class' => 'col-lg-2 control-label']) }}
-                <div class="col-lg-10">
-                    {{ Form::input('name', 'ssn', null, ['class' => 'form-control box-size', 'placeholder' => trans('validation.attributes.frontend.register-user.ssn')]) }}
-                </div><!--col-lg-10-->
-            </div><!--form-group-->
-
             <div class="form-group">
                 <div class="col-lg-10 col-md-offset-4">
                     {{ Form::submit(trans('labels.general.buttons.update'), ['class' => 'btn btn-primary', 'id' => 'update-profile']) }}
@@ -83,57 +44,6 @@
 <script type="text/javascript">
     $(document).ready(function() {
         Backend.Profile.init();
-        //Getting States of default contry
-        ajaxCall("{{route('admin.get.states')}}");
-
-
-
-        //Getting Cities of select State
-        $("#state").on("change", function() {
-            var stateId = $(this).val();
-            var url = "{{route('admin.get.cities')}}";
-            ajaxCall(url, stateId);
-        });
-
-        function ajaxCall(url, data = null)
-        {
-            $.ajax({
-                url: url,
-                type: "POST",
-                data: {stateId: data},
-                success: function(result) {
-                    if(result != null)
-                    {
-                        if(result.status == "city")
-                        {
-                            var userCity = "{{ $logged_in_user->city_id }}";
-                            var options;
-                            $.each(result.data, function(key, value) {
-                                if(key == userCity)
-                                    options += "<option value='" + key + "' selected>" + value + "</option>";
-                                else
-                                    options += "<option value='" + key + "'>" + value + "</option>";
-                            });
-                            $("#city").html('');
-                            $("#city").append(options);
-                        }
-                        else
-                        {
-                            var userState = "{{ $logged_in_user->state_id }}";
-                            var options;
-                            $.each(result.data, function(key, value) {
-                                if(key == userState)
-                                    options += "<option value='" + key + "' selected>" + value + "</option>";
-                                else
-                                    options += "<option value='" + key + "'>" + value + "</option>";
-                            });
-                            $("#state").append(options);
-                            $("#state").trigger('change');
-                        }
-                    }
-                }
-            });
-        }
     });
 </script>
-@endsection
+@endsection
\ No newline at end of file

resources/views/backend/menus/form.blade.php

@@ -56,7 +56,6 @@
 @section("after-scripts")
     {{ Html::script('js/nestable2/jquery.nestable.js') }}
     <script type="text/javascript">
-        //FinBuilders.Blog.init();
         var formName = '_add_custom_url_form';
         var lastId = null;
         $('#menu-items').nestable({

resources/views/backend/menus/index.blade.php

@@ -64,7 +64,7 @@
 @section('after-scripts')
     {{-- For DataTables --}}
     @include('includes.datatables')
-    
+
     <script>
         $(function() {
             var dataTable = $('#menus-table').dataTable({
@@ -94,7 +94,7 @@
                 }
             });
 
-            FinBuilders.DataTableSearch.init(dataTable);
+            Backend.DataTableSearch.init(dataTable);
         });
     </script>
-@endsection
+@endsection
\ No newline at end of file

resources/views/vendor/generator/index.blade.php

@@ -68,7 +68,7 @@
 @section('after-scripts')
     {{-- For DataTables --}}
     {{ Html::script(mix('js/dataTable.js')) }}
-    
+
     <script>
         $(function() {
             var dataTable = $('#modules-table').dataTable({
@@ -98,7 +98,7 @@
                 }
             });
 
-            FinBuilders.DataTableSearch.init(dataTable);
+            Backend.DataTableSearch.init(dataTable);
         });
     </script>
-@endsection
+@endsection
\ No newline at end of file