Merge pull request #31 from AkkuFresh/master

Admin General Namespace and User.php model @AkkuFresh

Author: bpocallaghan

README.md

@@ -12,6 +12,7 @@ A Laravel CMS Starter project with AdminLTE theme and core features.
 
 ### What is New?
 - Upgraded to Laravel 5.6'
+- App\User model was changed to App\Models\User model
 - Add config/app.php - "is_preview". This is to prevent users to delete pages and users from the demo site.
 - Add admin/accounts. The clients index.blade.php is a good example when working with 1+K entries. It use Laravel Paginator via Ajax pages and filter.
 
@@ -33,6 +34,8 @@ A Laravel CMS Starter project with AdminLTE theme and core features.
 ## Setup (Basic)
 - ```composer create-project bpocallaghan/laravel-admin-starter:dev-master laravel-admin-starter```
 - open .env and set the app info (url, title, description, etc)
+- check the installation with file search by Notepad++ (App\Models\User the new place instead of the the App\User model)
+- check ..TableSeeder.php files because the DB::delete('TRUNCATE.. lines will generate DB errors, comment out them
 - create your database and set db name in .env
 - ```php artisan migrate```
 - ```php artisan db:seed```

app/Events/UserRegistered.php

@@ -3,7 +3,7 @@
 namespace App\Events;
 
 use App\Models\UserInvite;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use App\Models\Role;
 use Illuminate\Queue\SerializesModels;

app/Helpers/admin_helpers.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\User;
+use App\Models\User;
 use App\Models\Role;
 
 if (!function_exists('notify_admins')) {
@@ -19,4 +19,4 @@ function notify_admins($class, $argument, $forceEmail = "")
             }
         }
     }
-}
+}

app/Http/Controllers/Admin/Accounts/AdministratorsController.php

@@ -6,7 +6,7 @@
 use App\Mail\AdminInvitRegistration;
 use App\Models\Role;
 use App\Models\UserInvite;
-use App\User;
+use App\Models\User;
 use App\Models\UsersInvite;
 use Illuminate\Http\Request;
 use Mail;
@@ -128,4 +128,4 @@ public function destroy(User $administrator, Request $request)
 
         return redirect_to_resource();
     }
-}
+}

app/Http/Controllers/Admin/Accounts/ClientsController.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Validation\Rule;
 use Password;
-use App\User;
+use App\Models\User;
 use App\Models\Role;
 use App\Http\Requests;
 use Illuminate\Http\Request;

app/Http/Controllers/Admin/General/BannersController.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\Admin\General;
 
 use Image;
 use Redirect;
 use App\Http\Requests;
 use App\Models\Banner;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Admin\AdminController;
 
 class BannersController extends AdminController
 {

app/Http/Controllers/Admin/General/BannersOrderController.php

@@ -1,10 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\Admin\General;
 
 use App\Models\Banner;
 use App\Http\Requests;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Admin\AdminController;
 
 class BannersOrderController extends AdminController
 {
@@ -35,4 +36,4 @@ public function update(Request $request)
 
         return ['result' => 'success'];
     }
-}
+}

app/Http/Controllers/Admin/General/ClientsController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\Admin\General;
 
 use Password;
 use App\Models\Role;

app/Http/Controllers/Admin/General/TagsController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\Admin\General;
 
 use Redirect;
 use App\Http\Requests;

app/Http/Controllers/Admin/ProfileController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use Image;
-use App\User;
+use App\Models\User;
 use App\Http\Requests;
 use Illuminate\Http\Request;
 
@@ -88,4 +88,4 @@ private function uploadProfilePicture($file)
 
         return $filename;
     }
-}
+}