Merge pull request #2 from viralsolani/master

Pull request

README.md

 # laravel-adminpanel
-[![License](https://img.shields.io/badge/License-MIT-red.svg)](https://github.com/viralsolani/laravel-adminpanel/blob/master/LICENSE.txt)
-[![StyleCI](https://styleci.io/repos/30171828/shield?style=plastic)](https://styleci.io/repos/105789824/shield?style=plastic)
+[![GitHub license](https://img.shields.io/github/license/viralsolani/laravel-adminpanel.svg?style=plastic)](https://github.com/viralsolani/laravel-adminpanel/blob/master/LICENSE.txt)
+[![GitHub stars](https://img.shields.io/github/stars/viralsolani/laravel-adminpanel.svg?style=plastic)](https://github.com/viralsolani/laravel-adminpanel/stargazers)
+[![GitHub forks](https://img.shields.io/github/forks/viralsolani/laravel-adminpanel.svg?style=plastic)](https://github.com/viralsolani/laravel-adminpanel/network)
+[![GitHub issues](https://img.shields.io/github/issues/viralsolani/laravel-adminpanel.svg?style=plastic)](https://github.com/viralsolani/laravel-adminpanel/issues)
+![StyleCI](https://img.shields.io/badge/styleCI-passed-brightgreen.svg?style=plastic)
 
 
 ## Introduction
@@ -17,7 +20,7 @@ For Laravel 5 Boilerplate Features : [Features](https://github.com/rappasoft/lar
 * Email Template Module
 * Blog Module
 * FAQ Module
-* API Boilerplate - Coming Soon.
+* API Boilerplate.
 
 Give your project a Head Start by using [laravel-adminpanel](https://github.com/viralsolani/laravel-adminpanel).
 
@@ -64,7 +67,7 @@ Install the javascript dependencies using npm
 
 Compile the dependencies
 
-   npm run development
+    npm run development
 
 Start the local development server
 
@@ -83,6 +86,27 @@ You can now access the server at http://localhost:8000
     php artisan key:generate
     php artisan jwt:generate
 
+## Logging In
+
+`php artisan db:seed` adds three users with respective roles. The credentials are as follows:
+
+* Admin Istrator: `admin@admin.com`
+* Backend User: `executive@executive.com`
+* Default User: `user@user.com`
+
+Password: `1234`
+
+## ScreenShots
+
+## Dashboard
+![Screenshot](screenshots/dashboard.png)
+
+## User Listing
+![Screenshot](screenshots/users.png)
+
+## Settings
+![Screenshot](screenshots/settings.png)
+
 ## Issues
 
 If you come across any issues please report them [here](https://github.com/viralsolani/laravel-adminpanel/issues).
@@ -92,4 +116,4 @@ Feel free to create any pull requests for the project. For propsing any new chan
 
 ## License
 
-[MIT LICENSE](https://github.com/viralsolani/laravel-adminpanel/blob/master/LICENSE.txt)
+[MIT LICENSE](https://github.com/viralsolani/laravel-adminpanel/blob/master/LICENSE.txt)
\ No newline at end of file

app/Http/Breadcrumbs/Backend/Backend.php

@@ -8,7 +8,7 @@ require __DIR__.'/Search.php';
 require __DIR__.'/Access/User.php';
 require __DIR__.'/Access/Role.php';
 require __DIR__.'/Access/Permission.php';
-require __DIR__.'/CMS_Page.php';
+require __DIR__.'/Page.php';
 require __DIR__.'/Email_Template.php';
 require __DIR__.'/Setting.php';
 require __DIR__.'/Blog_Category.php';

app/Http/Breadcrumbs/Backend/CMS_Page.php

-<?php
-
-Breadcrumbs::register('admin.cmspages.index', function ($breadcrumbs) {
-    $breadcrumbs->parent('admin.dashboard');
-    $breadcrumbs->push(trans('menus.backend.cmspages.management'), route('admin.cmspages.index'));
-});
-
-Breadcrumbs::register('admin.cmspages.create', function ($breadcrumbs) {
-    $breadcrumbs->parent('admin.cmspages.index');
-    $breadcrumbs->push(trans('menus.backend.cmspages.create'), route('admin.cmspages.create'));
-});
-
-Breadcrumbs::register('admin.cmspages.edit', function ($breadcrumbs, $id) {
-    $breadcrumbs->parent('admin.cmspages.index');
-    $breadcrumbs->push(trans('menus.backend.cmspages.edit'), route('admin.cmspages.edit', $id));
-});

app/Http/Breadcrumbs/Backend/Page.php

+<?php
+
+Breadcrumbs::register('admin.pages.index', function ($breadcrumbs) {
+    $breadcrumbs->parent('admin.dashboard');
+    $breadcrumbs->push(trans('menus.backend.pages.management'), route('admin.pages.index'));
+});
+
+Breadcrumbs::register('admin.pages.create', function ($breadcrumbs) {
+    $breadcrumbs->parent('admin.pages.index');
+    $breadcrumbs->push(trans('menus.backend.pages.create'), route('admin.pages.create'));
+});
+
+Breadcrumbs::register('admin.pages.edit', function ($breadcrumbs, $id) {
+    $breadcrumbs->parent('admin.pages.index');
+    $breadcrumbs->push(trans('menus.backend.pages.edit'), route('admin.pages.edit', $id));
+});

app/Http/Controllers/Api/V1/APIController.php

@@ -33,7 +33,7 @@ class APIController extends Controller
      *
      * @param [type] $statusCode [description]
      *
-     * @return mix
+     * @return statuscode
      */
     public function setStatusCode($statusCode)
     {
@@ -42,37 +42,13 @@ class APIController extends Controller
         return $this;
     }
 
-    /**
-     * responsd not found.
-     *
-     * @param string $message
-     *
-     * @return mix
-     */
-    public function respondNotFound($message = 'Not Found')
-    {
-        return $this->setStatusCode(IlluminateResponse::HTTP_NOT_FOUND)->respondWithError($message);
-    }
-
-    /**
-     * Respond with error.
-     *
-     * @param string $message
-     *
-     * @return mix
-     */
-    public function respondInternalError($message = 'Internal Error')
-    {
-        return $this->setStatusCode('500')->respondWithError($message);
-    }
-
     /**
      * Respond.
      *
      * @param array $data
      * @param array $headers
      *
-     * @return mix
+     * @return \Illuminate\Http\JsonResponse
      */
     public function respond($data, $headers = [])
     {
@@ -85,7 +61,7 @@ class APIController extends Controller
      * @param Paginator $items
      * @param array     $data
      *
-     * @return mix
+     * @return \Illuminate\Http\JsonResponse
      */
     public function respondWithPagination($items, $data)
     {
@@ -101,12 +77,38 @@ class APIController extends Controller
         return $this->respond($data);
     }
 
+    /**
+     * Respond Created.
+     *
+     * @param string $message
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function respondCreated($data)
+    {
+        return $this->setStatusCode(201)->respond([
+            'data' => $data,
+        ]);
+    }
+
+    /**
+     * Respond Created with data.
+     *
+     * @param string $message
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function respondCreatedWithData($data)
+    {
+        return $this->setStatusCode(201)->respond($data);
+    }
+
     /**
      * respond with error.
      *
      * @param $message
      *
-     * @return mix
+     * @return \Illuminate\Http\JsonResponse
      */
     public function respondWithError($message)
     {
@@ -119,17 +121,61 @@ class APIController extends Controller
     }
 
     /**
-     * Respond Created.
+     * responsd not found.
      *
      * @param string $message
      *
-     * @return mix
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function respondCreated($message)
+    public function respondNotFound($message = 'Not Found')
     {
-        return $this->setStatusCode(201)->respond([
-            'message' => $message,
-        ]);
+        return $this->setStatusCode(IlluminateResponse::HTTP_NOT_FOUND)->respondWithError($message);
+    }
+
+    /**
+     * Respond with error.
+     *
+     * @param string $message
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function respondInternalError($message = 'Internal Error')
+    {
+        return $this->setStatusCode(500)->respondWithError($message);
+    }
+
+    /**
+     * Respond with unauthorized.
+     *
+     * @param string $message
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    protected function respondUnauthorized($message = 'Unauthorized')
+    {
+        return $this->setStatusCode(401)->respondWithError($message);
+    }
+
+    /**
+     * Respond with forbidden.
+     *
+     * @param string $message
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    protected function respondForbidden($message = 'Forbidden')
+    {
+        return $this->setStatusCode(403)->respondWithError($message);
+    }
+
+    /**
+     * Respond with no content.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    protected function respondWithNoContent()
+    {
+        return $this->setStatusCode(204)->respond(null);
     }
 
     /**

app/Http/Controllers/Api/V1/AuthController.php

@@ -2,77 +2,52 @@
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Models\Access\User\User;
-use App\Notifications\Activated;
-use App\Notifications\Activation;
-use App\Notifications\PasswordReset;
-use App\Notifications\PasswordResetted;
 use Illuminate\Http\Request;
 use JWTAuth;
 use Tymon\JWTAuth\Exceptions\JWTException;
 use Validator;
 
-/**
- * AuthController.
- */
 class AuthController extends APIController
 {
     /**
-     * Authenticate User.
+     * Log the user in.
      *
      * @param Request $request
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function authenticate(Request $request)
+    public function login(Request $request)
     {
-        $credentials = $request->only('email', 'password');
+        $validation = Validator::make($request->all(), [
+            'email'     => 'required|email',
+            'password'  => 'required|min:4',
+        ]);
+
+        if ($validation->fails()) {
+            return $this->throwValidation($validation->messages()->first());
+        }
+
+        $credentials = $request->only(['email', 'password']);
 
         try {
             if (!$token = JWTAuth::attempt($credentials)) {
-                return $this->throwValidation('Invalid Credentials! Please try again.');
+                return $this->throwValidation(trans('api.messages.login.failed'));
             }
         } catch (JWTException $e) {
-            return $this->respondInternalError('This is something wrong. Please try again!');
-        }
-
-        $user = User::whereEmail(request('email'))->first();
-
-        if ($user->status != 1) {
-            return $this->throwValidation('Your account hasn\'t been activated. Please check your email & activate account.');
+            return $this->respondInternalError($e->getMessage());
         }
 
         return $this->respond([
-            'message'   => 'You are successfully logged in!',
+            'message'   => trans('api.messages.login.success'),
             'token'     => $token,
         ]);
     }
 
     /**
-     * Check if user is authenticated or not.
+     * Log the user out (Invalidate the token).
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function check()
-    {
-        try {
-            JWTAuth::parseToken()->authenticate();
-        } catch (JWTException $e) {
-            return $this->respond([
-                'authenticated'  => false,
-            ]);
-        }
-
-        return $this->respond([
-            'authenticated'  => true,
-        ]);
-    }
-
-    /**
-     * Log Out.
-     *
-     *  @return \Illuminate\Http\JsonResponse
-     */
     public function logout()
     {
         try {
@@ -82,190 +57,36 @@ class AuthController extends APIController
                 JWTAuth::invalidate($token);
             }
         } catch (JWTException $e) {
-            return $this->respondInternalError('This is something wrong. Please try again!');
+            return $this->respondInternalError($e->getMessage());
         }
 
         return $this->respond([
-            'message'   => 'You are successfully logged out!',
-        ]);
-    }
-
-    /**
-     * Register User.
-     *
-     * @param Request $request
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function register(Request $request)
-    {
-        $validation = Validator::make($request->all(), [
-            'first_name'            => 'required',
-            'last_name'             => 'required',
-            'email'                 => 'required|email|unique:users',
-            'password'              => 'required|min:6',
-            'password_confirmation' => 'required|same:password',
-        ]);
-
-        if ($validation->fails()) {
-            return $this->throwValidation($validation->messages()->first());
-        }
-
-        $user = User::create([
-            'first_name'    => request('first_name'),
-            'last_name'     => request('last_name'),
-            'email'         => request('email'),
-            'status'        => '0',
-            'password'      => bcrypt(request('password')),
-            'country_id'    => 1,
-            'state_id'      => 1,
-            'city_id'       => 1,
-            'zip_code'      => 1,
-            'ssn'           => 123456789,
-            'created_by'    => 1,
-        ]);
-
-        $user->confirmation_code = generateUuid();
-        $user->save();
-
-        $user->notify(new Activation($user));
-
-        return $this->respondCreated([
-           'You have registered successfully. Please check your email for activation!',
+            'message'   => trans('api.messages.logout.success'),
         ]);
     }
 
     /**
-     * Activate User.
-     *
-     * @param  $activation_token [description]
+     * Refresh a token.
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function activate($activation_token)
+    public function refresh()
     {
-        $user = User::whereConfirmationCode($activation_token)->first();
+        $token = JWTAuth::getToken();
 
-        if (!$user) {
-            return $this->throwValidation('Invalid activation token!');
+        if (!$token) {
+            $this->respondUnauthorized(trans('api.messages.refresh.token.not_provided'));
         }
 
-        if ($user->status == 1) {
-            return $this->throwValidation('Your account has already been activated!');
+        try {
+            $refreshedToken = JWTAuth::refresh($token);
+        } catch (JWTException $e) {
+            return $this->respondInternalError($e->getMessage());
         }
 
-        $user->confirmed = 1;
-        $user->status = 1;
-        $user->save();
-        $user->notify(new Activated($user));
-
         return $this->respond([
-            'message'  => 'Your account has been activated!',
-        ]);
-    }
-
-    public function password(Request $request)
-    {
-        $validation = Validator::make($request->all(), [
-            'email' => 'required|email',
+            'status' => trans('api.messages.refresh.status'),
+            'token'  => $refreshedToken,
         ]);
-
-        if ($validation->fails()) {
-            return response()->json(['message' => $validation->messages()->first()], 422);
-        }
-
-        $user = User::whereEmail(request('email'))->first();
-
-        if (!$user) {
-            return response()->json(['message' => 'We couldn\'t found any user with this email. Please try again!'], 422);
-        }
-
-        $token = generateUuid();
-        \DB::table('password_resets')->insert([
-            'email' => request('email'),
-            'token' => $token,
-        ]);
-        $user->notify(new PasswordReset($user, $token));
-
-        return response()->json(['message' => 'We have sent reminder email. Please check your inbox!']);
-    }
-
-    public function validatePasswordReset(Request $request)
-    {
-        $validate_password_request = \DB::table('password_resets')->where('token', '=', request('token'))->first();
-
-        if (!$validate_password_request) {
-            return response()->json(['message' => 'Invalid password reset token!'], 422);
-        }
-
-        if (date('Y-m-d H:i:s', strtotime($validate_password_request->created_at.'+30 minutes')) < date('Y-m-d H:i:s')) {
-            return response()->json(['message' => 'Password reset token is expired. Please request reset password again!'], 422);
-        }
-
-        return response()->json(['message' => '']);
-    }
-
-    public function reset(Request $request)
-    {
-        $validation = Validator::make($request->all(), [
-            'email'                 => 'required|email',
-            'password'              => 'required|min:6',
-            'password_confirmation' => 'required|same:password',
-        ]);
-
-        if ($validation->fails()) {
-            return response()->json(['message' => $validation->messages()->first()], 422);
-        }
-
-        $user = User::whereEmail(request('email'))->first();
-
-        if (!$user) {
-            return response()->json(['message' => 'We couldn\'t found any user with this email. Please try again!'], 422);
-        }
-
-        $validate_password_request = \DB::table('password_resets')->where('email', '=', request('email'))->where('token', '=', request('token'))->first();
-
-        if (!$validate_password_request) {
-            return response()->json(['message' => 'Invalid password reset token!'], 422);
-        }
-
-        if (date('Y-m-d H:i:s', strtotime($validate_password_request->created_at.'+30 minutes')) < date('Y-m-d H:i:s')) {
-            return response()->json(['message' => 'Password reset token is expired. Please request reset password again!'], 422);
-        }
-
-        $user->password = bcrypt(request('password'));
-        $user->save();
-
-        $user->notify(new PasswordResetted($user));
-
-        return response()->json(['message' => 'Your password has been reset. Please login again!']);
-    }
-
-    public function changePassword(Request $request)
-    {
-        if (env('IS_DEMO')) {
-            return response()->json(['message' => 'You are not allowed to perform this action in this mode.'], 422);
-        }
-
-        $validation = Validator::make($request->all(), [
-            'current_password'          => 'required',
-            'new_password'              => 'required|confirmed|different:current_password|min:6',
-            'new_password_confirmation' => 'required|same:new_password',
-        ]);
-
-        if ($validation->fails()) {
-            return response()->json(['message' => $validation->messages()->first()], 422);
-        }
-
-        $user = JWTAuth::parseToken()->authenticate();
-
-        if (!\Hash::check(request('current_password'), $user->password)) {
-            return response()->json(['message' => 'Old password does not match! Please try again!'], 422);
-        }
-
-        $user->password = bcrypt(request('new_password'));
-        $user->save();
-
-        return response()->json(['message' => 'Your password has been changed successfully!']);
     }
 }

app/Http/Controllers/Api/V1/ForgotPasswordController.php

+<?php
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Models\User\User;
+use App\Notifications\Frontend\Auth\UserNeedsPasswordReset;
+use App\Repositories\Frontend\Access\User\UserRepository;
+use Illuminate\Http\Request;
+use Validator;
+
+class ForgotPasswordController extends APIController
+{
+    /**
+     * __construct.
+     *
+     * @param $repository
+     */
+    public function __construct(UserRepository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Send a reset link to the given user.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function sendResetLinkEmail(Request $request)
+    {
+        $validation = Validator::make($request->all(), [
+            'email' => 'required|email',
+        ]);
+
+        if ($validation->fails()) {
+            return $this->throwValidation($validation->messages()->first());
+        }
+
+        $user = $this->repository->findByEmail($request->get('email'));
+
+        if (!$user) {
+            return $this->respondNotFound(trans('api.messages.forgot_password.validation.email_not_found'));
+        }
+
+        $token = $this->repository->saveToken();
+
+        $user->notify(new UserNeedsPasswordReset($token));
+
+        return $this->respond([
+            'status'    => 'ok',
+            'message'   => trans('api.messages.forgot_password.success'),
+        ]);
+    }
+}

app/Http/Controllers/Api/V1/RegisterController.php

+<?php
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Models\User\User;
+use App\Repositories\Frontend\Access\User\UserRepository;
+use Config;
+use Illuminate\Http\Request;
+use JWTAuth;
+use Validator;
+
+class RegisterController extends APIController
+{
+    protected $repository;
+
+    /**
+     * __construct.
+     *
+     * @param $repository
+     */
+    public function __construct(UserRepository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Register User.
+     *
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function register(Request $request)
+    {
+        $validation = Validator::make($request->all(), [
+            'first_name'            => 'required',
+            'last_name'             => 'required',
+            'email'                 => 'required|email|unique:users',
+            'password'              => 'required|min:4',
+            'password_confirmation' => 'required|same:password',
+            'is_term_accept'        => 'required',
+        ]);
+
+        if ($validation->fails()) {
+            return $this->throwValidation($validation->messages()->first());
+        }
+
+        $user = $this->repository->create($request->all());
+
+        if (!Config::get('api.register.release_token')) {
+            return $this->respondCreated([
+                'message'  => trans('api.messages.registeration.success'),
+            ]);
+        }
+
+        $token = JWTAuth::fromUser($user);
+
+        return $this->respondCreated([
+            'message'   => trans('api.messages.registeration.success'),
+            'token'     => $token,
+        ]);
+    }
+}

app/Http/Controllers/Api/V1/UsersController.php

+<?php
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Http\Resources\UserResource;
+use App\Models\User\User;
+use App\Repositories\Backend\Access\User\UserRepository;
+use Illuminate\Http\Request;
+use Validator;
+
+class UsersController extends APIController
+{
+    protected $repository;
+
+    /**
+     * __construct.
+     *
+     * @param $repository
+     */
+    public function __construct(UserRepository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Return the users.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $limit = $request->get('paginate') ? $request->get('paginate') : 25;
+
+        return UserResource::collection(
+            $this->repository->getPaginated($limit)
+        );
+    }
+
+    /**
+     * Return the specified resource.
+     *
+     * @param User $user
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function show(User $user)
+    {
+        return new UserResource($user);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, User $user)
+    {
+        $validation = Validator::make($request->all(), [
+            'name'      => 'required',
+            'email'     => 'email|unique:users,email,'.$user->id,
+            'password'  => 'nullable|confirmed',
+        ]);
+
+        if ($validation->fails()) {
+            return $this->throwValidation($validation->messages()->first());
+        }
+
+        $user = $this->repository->update($user->id, $request->all());
+
+        return new UserResource($user);
+    }
+}

app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesController.php

@@ -23,9 +23,9 @@ class EmailTemplatesController extends Controller
     protected $emailtemplates;
 
     /**
-     * Setting the EmailTemplatesRepository instance to class variable.
+     * __construct.
      *
-     * @param EmailTemplatesRepository $emailtemplates
+     * @param \App\Repositories\Backend\EmailTemplates\EmailTemplatesRepository $emailtemplates
      */
     public function __construct(EmailTemplatesRepository $emailtemplates)
     {
@@ -33,9 +33,7 @@ class EmailTemplatesController extends Controller
     }
 
     /**
-     * Use to load index view of EmailTmplates.
-     *
-     * @param ManageEmailTemplatesRequest $request
+     * @param \App\Http\Requests\Backend\EmailTemplates\ManageEmailTemplatesRequest $request
      *
      * @return mixed
      */
@@ -45,18 +43,16 @@ class EmailTemplatesController extends Controller
     }
 
     /**
-     * Use to load edit form of Emailtemplate.
-     *
-     * @param EmailTemplate             $emailtemplate
-     * @param EditEmailTemplatesRequest $request
+     * @param \App\Models\EmailTemplates\EmailTemplate                            $emailtemplate
+     * @param \App\Http\Requests\Backend\EmailTemplates\EditEmailTemplatesRequest $request
      *
      * @return mixed
      */
     public function edit(EmailTemplate $emailtemplate, EditEmailTemplatesRequest
         $request)
     {
-        $emailtemplateTypes = EmailTemplateType::pluck('name', 'id');
-        $emailtemplatePlaceholders = EmailTemplatePlaceholder::pluck('name', 'id');
+        $emailtemplateTypes = EmailTemplateType::getSelectData();
+        $emailtemplatePlaceholders = EmailTemplatePlaceholder::getSelectData();
 
         return view('backend.emailtemplates.edit')
             ->withEmailtemplate($emailtemplate)
@@ -65,27 +61,23 @@ class EmailTemplatesController extends Controller
     }
 
     /**
-     * Use to update an Emailtemplate.
-     *
-     * @param EmailTemplate               $emailtemplate
-     * @param UpdateEmailTemplatesRequest $request
+     * @param \App\Models\EmailTemplates\EmailTemplate                              $emailtemplate
+     * @param \App\Http\Requests\Backend\EmailTemplates\UpdateEmailTemplatesRequest $request
      *
      * @return mixed
      */
     public function update(EmailTemplate $emailtemplate, UpdateEmailTemplatesRequest
         $request)
     {
-        $this->emailtemplates->update($emailtemplate, $request->all());
+        $this->emailtemplates->update($emailtemplate, $request->except(['_method', '_token', 'placeholder']));
 
         return redirect()->route('admin.emailtemplates.index')
             ->withFlashSuccess(trans('alerts.backend.emailtemplates.updated'));
     }
 
     /**
-     * Use to delete an Emailtemplate.
-     *
-     * @param EmailTemplate               $emailtemplate
-     * @param DeleteEmailTemplatesRequest $request
+     * @param \App\Models\EmailTemplates\EmailTemplate                              $emailtemplate
+     * @param \App\Http\Requests\Backend\EmailTemplates\DeleteEmailTemplatesRequest $request
      *
      * @return mixed
      */

app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesTableController.php

@@ -19,7 +19,7 @@ class EmailTemplatesTableController extends Controller
     protected $emailtemplates;
 
     /**
-     * @param EmailTemplatesRepository $emailtemplates
+     * @param \App\Repositories\Backend\EmailTemplates\EmailTemplatesRepository $emailtemplates
      */
     public function __construct(EmailTemplatesRepository $emailtemplates)
     {
@@ -27,7 +27,7 @@ class EmailTemplatesTableController extends Controller
     }
 
     /**
-     * @param ManageEmailTemplatesRequest $request
+     * @param \App\Http\Requests\Backend\EmailTemplates\ManageEmailTemplatesRequest $request
      *
      * @return mixed
      */
@@ -36,11 +36,7 @@ class EmailTemplatesTableController extends Controller
         return Datatables::of($this->emailtemplates->getForDataTable())
             ->escapeColumns(['title'])
             ->addColumn('status', function ($emailtemplates) {
-                if ($emailtemplates->status) {
-                    return '<span class="label label-success">Active</span>';
-                }
-
-                return '<span class="label label-danger">Inactive</span>';
+                return $emailtemplates->status_label;
             })
             ->addColumn('created_at', function ($emailtemplates) {
                 return Carbon::parse($emailtemplates->created_at)->toDateString();

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

@@ -23,7 +23,7 @@ class PagesController extends Controller
     protected $pages;
 
     /**
-     * @param PagesRepository $pages
+     * @param \App\Repositories\Backend\Pages\PagesRepository $pages
      */
     public function __construct(PagesRepository $pages)
     {
@@ -31,7 +31,7 @@ class PagesController extends Controller
     }
 
     /**
-     * @param ManagePageRequest $request
+     * @param \App\Http\Requests\Backend\Pages\ManagePageRequest $request
      *
      * @return mixed
      */
@@ -41,7 +41,7 @@ class PagesController extends Controller
     }
 
     /**
-     * @param CreatePageRequest $request
+     * @param \App\Http\Requests\Backend\Pages\CreatePageRequest $request
      *
      * @return mixed
      */
@@ -51,45 +51,45 @@ class PagesController extends Controller
     }
 
     /**
-     * @param StorePageRequest $request
+     * @param \App\Http\Requests\Backend\Pages\StorePageRequest $request
      *
      * @return mixed
      */
     public function store(StorePageRequest $request)
     {
-        $this->pages->create($request->all());
+        $this->pages->create($request->except(['_token']));
 
         return redirect()->route('admin.pages.index')->withFlashSuccess(trans('alerts.backend.pages.created'));
     }
 
     /**
-     * @param Page            $page
-     * @param EditPageRequest $request
+     * @param \App\Models\Page\Page                            $page
+     * @param \App\Http\Requests\Backend\Pages\EditPageRequest $request
      *
      * @return mixed
      */
     public function edit(Page $page, EditPageRequest $request)
     {
         return view('backend.pages.edit')
-            ->withCmspage($page);
+            ->withPage($page);
     }
 
     /**
-     * @param Page              $page
-     * @param UpdatePageRequest $request
+     * @param \App\Models\Page\Page                              $page
+     * @param \App\Http\Requests\Backend\Pages\UpdatePageRequest $request
      *
      * @return mixed
      */
     public function update(Page $page, UpdatePageRequest $request)
     {
-        $this->pages->update($page, $request->all());
+        $this->pages->update($page, $request->except(['_method', '_token']));
 
         return redirect()->route('admin.pages.index')->withFlashSuccess(trans('alerts.backend.pages.updated'));
     }
 
     /**
-     * @param Page              $page
-     * @param DeletePageRequest $request
+     * @param \App\Models\Page\Page                              $page
+     * @param \App\Http\Requests\Backend\Pages\DeletePageRequest $request
      *
      * @return mixed
      */

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

@@ -36,11 +36,7 @@ class PagesTableController extends Controller
         return Datatables::of($this->pages->getForDataTable())
             ->escapeColumns(['title'])
             ->addColumn('status', function ($pages) {
-                if ($pages->status) {
-                    return '<span class="label label-success">Active</span>';
-                }
-
-                return '<span class="label label-danger">Inactive</span>';
+                return $pages->status_label;
             })
             ->addColumn('created_at', function ($pages) {
                 return Carbon::parse($pages->created_at)->toDateString();

app/Http/Kernel.php

@@ -3,6 +3,8 @@
 namespace App\Http;
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
+use Tymon\JWTAuth\Middleware\GetUserFromToken;
+use Tymon\JWTAuth\Middleware\RefreshToken;
 
 /**
  * Class Kernel.
@@ -73,8 +75,7 @@ class Kernel extends HttpKernel
          */
         'access.routeNeedsRole'       => \App\Http\Middleware\RouteNeedsRole::class,
         'access.routeNeedsPermission' => \App\Http\Middleware\RouteNeedsPermission::class,
-        //'jwt.auth'                    => \App\Http\Middleware\VerifyJWTToken::class,
-        'jwt.auth'                    => \Tymon\JWTAuth\Middleware\GetUserFromToken::class,
-        'jwt.refresh'                 => \Tymon\JWTAuth\Middleware\RefreshToken::class,
+        'jwt.auth'                    => GetUserFromToken::class,
+        'jwt.refresh'                 => RefreshToken::class,
     ];
 }

app/Http/Resources/UserResource.php

+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\Resource;
+
+class UserResource extends Resource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request
+     *
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id'            => $this->id,
+            'name'          => $this->name,
+            'email'         => $this->email,
+            'role'          => $this->roles()->first()->name,
+            'registered_at' => $this->created_at->toIso8601String(),
+        ];
+    }
+}

app/Models/Access/User/User.php

@@ -10,11 +10,12 @@ use App\Models\Access\User\Traits\UserSendPasswordReset;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
+use Tymon\JWTAuth\Contracts\JWTSubject;
 
 /**
  * Class User.
  */
-class User extends Authenticatable
+class User extends Authenticatable implements JWTSubject
 {
     use UserScope,
         UserAccess,
@@ -67,4 +68,24 @@ class User extends Authenticatable
         parent::__construct($attributes);
         $this->table = config('access.users_table');
     }
+
+    /**
+     * Get the identifier that will be stored in the subject claim of the JWT.
+     *
+     * @return mixed
+     */
+    public function getJWTIdentifier()
+    {
+        return $this->getKey();
+    }
+
+    /**
+     * Return a key value array, containing any custom claims to be added to the JWT.
+     *
+     * @return array
+     */
+    public function getJWTCustomClaims()
+    {
+        return [];
+    }
 }

app/Models/EmailTemplatePlaceholders/EmailTemplatePlaceholder.php

@@ -16,6 +16,6 @@ class EmailTemplatePlaceholder extends BaseModel
     public function __construct(array $attributes = [])
     {
         parent::__construct($attributes);
-        $this->table = config('access.email_template_placeholders_table');
+        $this->table = config('module.email_templates.placeholders_table');
     }
 }

app/Models/EmailTemplateTypes/EmailTemplateType.php

@@ -16,6 +16,6 @@ class EmailTemplateType extends BaseModel
     public function __construct(array $attributes = [])
     {
         parent::__construct($attributes);
-        $this->table = config('access.email_template_types_table');
+        $this->table = config('module.email_templates.types_table');
     }
 }

app/Models/EmailTemplates/EmailTemplate.php

@@ -15,6 +15,8 @@ class EmailTemplate extends BaseModel
             // EmailTemplateAttribute::getEditButtonAttribute insteadof ModelTrait;
         }
 
+    protected $guarded = ['id'];
+
     /**
      * The database table used by the model.
      *
@@ -25,6 +27,6 @@ class EmailTemplate extends BaseModel
     public function __construct(array $attributes = [])
     {
         parent::__construct($attributes);
-        $this->table = config('access.email_templates_table');
+        $this->table = config('module.email_templates.table');
     }
 }

app/Models/EmailTemplates/Traits/Attribute/EmailTemplateAttribute.php

@@ -14,4 +14,24 @@ trait EmailTemplateAttribute
     {
         return '<div class="btn-group action-btn">'.$this->getEditButtonAttribute('edit-email-template', 'admin.emailtemplates.edit').'</div>';
     }
+
+    /**
+     * @return string
+     */
+    public function getStatusLabelAttribute()
+    {
+        if ($this->isActive()) {
+            return "<label class='label label-success'>".trans('labels.general.active').'</label>';
+        }
+
+        return "<label class='label label-danger'>".trans('labels.general.inactive').'</label>';
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive()
+    {
+        return $this->status == 1;
+    }
 }

app/Models/Page/Page.php

@@ -22,9 +22,16 @@ class Page extends BaseModel
      */
     protected $table;
 
+    /**
+     * The guarded field which are not mass assignable.
+     *
+     * @var array
+     */
+    protected $guarded = ['id'];
+
     public function __construct(array $attributes = [])
     {
         parent::__construct($attributes);
-        $this->table = config('access.cms_pages_table');
+        $this->table = config('module.pages.table');
     }
 }

app/Models/Page/Traits/Attribute/PageAttribute.php

@@ -17,4 +17,24 @@ trait PageAttribute
                     '.$this->getDeleteButtonAttribute('delete-cms-pages', 'admin.pages.destroy').'
                 </div>';
     }
+
+    /**
+     * @return string
+     */
+    public function getStatusLabelAttribute()
+    {
+        if ($this->isActive()) {
+            return "<label class='label label-success'>".trans('labels.general.active').'</label>';
+        }
+
+        return "<label class='label label-danger'>".trans('labels.general.inactive').'</label>';
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive()
+    {
+        return $this->status == 1;
+    }
 }

app/Repositories/Api/CmsPage/CmsPageRepository.php

-<?php
-
-namespace App\Repositories\Api\CmsPage;
-
-use App\Exceptions\GeneralException;
-use App\Models\CMSPages\CMSPage;
-use App\Repositories\BaseRepository;
-
-/**
- * Class CmsPageRepository.
- */
-class CmsPageRepository extends BaseRepository
-{
-    /**
-     * Associated Repository Model.
-     */
-    const MODEL = CMSPage::class;
-
-    /**
-     * Check given user is exist or not.
-     *
-     * @return mixed
-     */
-    public function findBySlug($page_slug)
-    {
-        if (count($this->query()->wherePage_slug($page_slug)->get()) > 0) {
-            return $this->query()->wherePage_slug($page_slug)->get()->toArray();
-        }
-
-        throw new GeneralException(trans('exceptions.api.cmspage.not_found'));
-    }
-}

app/Repositories/Api/Role/RoleRepository.php

-<?php
-
-namespace App\Repositories\Api\Role;
-
-use App\Models\Access\Role\Role;
-use App\Repositories\BaseRepository;
-
-/**
- * Class RoleRepository.
- */
-class RoleRepository extends BaseRepository
-{
-    /**
-     * Associated Repository Model.
-     */
-    const MODEL = Role::class;
-
-    /**
-     * @return mixed
-     */
-    public function getDefaultUserRole()
-    {
-        if (is_numeric(config('access.users.default_role'))) {
-            return $this->query()->where('id', (int) config('access.users.default_role'))->first();
-        }
-
-        return $this->query()->where('name', config('access.users.default_role'))->first();
-    }
-}

app/Repositories/Api/User/PasswordResetRepository.php

-<?php
-
-namespace App\Repositories\Api\User;
-
-use App\Models\Access\PasswordReset\PasswordReset;
-use App\Repositories\BaseRepository;
-
-/**
- * Class PermissionRepository.
- */
-class PasswordResetRepository extends BaseRepository
-{
-    /**
-     * Associated Repository Model.
-     */
-    const MODEL = PasswordReset::class;
-
-    /**
-     * Get token by email.
-     *
-     * @return mixed
-     */
-    public function getByEmail($email)
-    {
-        return $this->query()->where('email', $email)->get()->toArray();
-    }
-
-    /**
-     * Check if given email exist or not.
-     *
-     * @return mixed
-     */
-    public function checkUser($data)
-    {
-        return $this->query()->where('email', $data['email'])->where('token', $data['token'])->get()->toArray();
-    }
-
-    /**
-     * Create password reset entry.
-     *
-     * @return mixed
-     */
-    public function create($attributes)
-    {
-        return $this->query()->insert($attributes);
-    }
-
-    /**
-     * If token exist for same user then update.
-     *
-     * @return mixed
-     */
-    public function update($attributes)
-    {
-        $token = ['token' => $attributes['token']];
-
-        return $this->query()->where('email', $attributes['email'])->update($attributes);
-    }
-
-    /**
-     * Delete entry after reseting the password.
-     *
-     * @return mixed
-     */
-    public function delete($data)
-    {
-        return $this->query()->where('email', $data['email'])->where('token', $data['token'])->delete();
-    }
-}

app/Repositories/Api/User/UserRepository.php

-<?php
-
-namespace App\Repositories\Api\User;
-
-use App\Mail\ConfirmAcoountMail;
-use App\Models\Access\User\User;
-use App\Repositories\Backend\Access\Role\RoleRepository;
-use App\Repositories\BaseRepository;
-
-/**
- * Class PermissionRepository.
- */
-class UserRepository extends BaseRepository
-{
-    /**
-     * Associated Repository Model.
-     */
-    const MODEL = User::class;
-    /**
-     *   Protected rolerepository.
-     */
-    protected $role;
-
-    /**
-     * @param RoleRepository $role
-     */
-    public function __construct(RoleRepository $role)
-    {
-        $this->role = $role;
-    }
-
-    /**
-     * Check given user is exist or not.
-     *
-     * @return mixed
-     */
-    public function checkUser($email)
-    {
-        return $this->query()->where('email', $email)->get()->toArray();
-    }
-
-    /**
-     * Generate OTP when forgot password.
-     *
-     * @return mixed
-     */
-    public function generateOTP()
-    {
-        return mt_rand(100000, 999999);
-    }
-
-    /**
-     * Reset password.
-     *
-     * @return mixed
-     */
-    public function resetpassword($data)
-    {
-        $pass = ['password' => bcrypt($data['password'])];
-
-        return $this->query()->where('email', $data['email'])->update($pass);
-    }
-
-    /**
-     * Get user details by  id.
-     *
-     * @return mixed
-     */
-    public function getById($id)
-    {
-        return $this->query()
-                    ->select('first_name', 'last_name', 'email', 'address', 'country_id', 'state_id', 'city_id', 'zip_code', 'ssn', 'status', 'created_at', 'updated_at')
-                    ->where('id', $id)
-                    ->with(['country' => function ($query) {
-                        $query->select('id', 'country');
-                    }])
-                    ->with(['state' => function ($query) {
-                        $query->select('id', 'state');
-                    }])
-                    ->with(['city' => function ($query) {
-                        $query->select('id', 'city');
-                    }])
-                    ->get()
-                    ->toArray();
-    }
-
-    /**
-     * Create user account.
-     *
-     * @param array $data
-     * @param bool  $provider
-     *
-     * @return static
-     */
-    public function create(array $data, $provider = false)
-    {
-        $otp = $this->generateOTP();
-        $user = self::MODEL;
-        $user = new $user();
-        $user->first_name = $data['first_name'];
-        $user->last_name = $data['last_name'];
-        $user->address = $data['address'];
-        $user->state_id = $data['state_id'];
-        $user->country_id = config('access.constants.default_country');
-        $user->city_id = $data['city_id'];
-        $user->zip_code = $data['zip_code'];
-        $user->ssn = $data['ssn'];
-        $user->email = $data['email'];
-        $user->confirmation_code = md5($otp);
-        $user->status = 1;
-        $user->password = $provider ? null : bcrypt($data['password']);
-        $user->confirmed = $provider ? 1 : (config('access.users.confirm_email') ? 0 : 1);
-        $user->created_by = 1;
-
-        \DB::transaction(function () use ($user) {
-            if ($user->save()) {
-                /*
-                 * Add the default site role to the new user
-                 */
-                $user->attachRole($this->role->getDefaultUserRole());
-            }
-        });
-        /*
-         * If users have to confirm their email and this is not a social account,
-         * send the confirmation email
-         *
-         * If this is a social account they are confirmed through the social provider by default
-         */
-        if (config('access.users.confirm_email') && $provider === false) {
-            $Confirmation_mail = \Mail::to($data['email'])->send(new ConfirmAcoountMail($otp));
-        }
-
-        /*
-        * Return the user object
-        */
-        return $user;
-    }
-
-    /*
-    * Check user is already confirmed or not
-    */
-    public function checkconfirmation($email)
-    {
-        return $this->query()->where('email', $email)->get()->toArray();
-    }
-
-    /**
-     * Confirm user's account.
-     **/
-    public function confirmUser($email)
-    {
-        $confirmed = ['confirmed' => '1'];
-
-        return $this->query()->where('email', $email)->update($confirmed);
-    }
-}

app/Repositories/Backend/EmailTemplates/EmailTemplatesRepository.php

@@ -7,7 +7,6 @@ use App\Events\Backend\EmailTemplates\EmailTemplateUpdated;
 use App\Exceptions\GeneralException;
 use App\Models\EmailTemplates\EmailTemplate;
 use App\Repositories\BaseRepository;
-use DB;
 
 /**
  * Class EmailTemplatesRepository.
@@ -26,60 +25,53 @@ class EmailTemplatesRepository extends BaseRepository
     {
         return $this->query()
             ->select([
-                config('access.email_templates_table').'.id',
-                config('access.email_templates_table').'.title',
-                config('access.email_templates_table').'.subject',
-                config('access.email_templates_table').'.status',
-                config('access.email_templates_table').'.created_at',
-                config('access.email_templates_table').'.updated_at',
+                config('module.email_templates.table').'.id',
+                config('module.email_templates.table').'.title',
+                config('module.email_templates.table').'.subject',
+                config('module.email_templates.table').'.status',
+                config('module.email_templates.table').'.created_at',
+                config('module.email_templates.table').'.updated_at',
             ]);
     }
 
     /**
-     * @param Model $permission
+     * @param \App\Models\EmailTemplates\EmailTemplate $emailtemplate
      * @param  $input
      *
      * @throws GeneralException
      *
      * return bool
      */
-    public function update(Model $emailtemplate, array $input)
+    public function update(EmailTemplate $emailtemplate, array $input)
     {
-        $emailtemplate->title = $input['title'];
-        $emailtemplate->body = $input['body'];
-        $emailtemplate->type_id = $input['type_id'];
-        $emailtemplate->subject = $input['subject'];
-        $emailtemplate->status = (isset($input['is_active']) && $input['is_active'] == 1) ? 1 : 0;
-        $emailtemplate->updated_by = access()->user()->id;
+        $input['status'] = isset($input['is_active']) ? 1 : 0;
+        unset($input['is_active']);
+        $input['updated_by'] = access()->user()->id;
 
-        DB::transaction(function () use ($emailtemplate, $input) {
-            if ($emailtemplate->save()) {
-                event(new EmailTemplateUpdated($emailtemplate));
+        if ($emailtemplate->update($input)) {
+            event(new EmailTemplateUpdated($emailtemplate));
 
-                return true;
-            }
+            return true;
+        }
 
-            throw new GeneralException(trans('exceptions.backend.emailtemplates.update_error'));
-        });
+        throw new GeneralException(trans('exceptions.backend.emailtemplates.update_error'));
     }
 
     /**
-     * @param Model $emailtemplate
+     * @param \App\Models\EmailTemplates\EmailTemplate $emailtemplate
      *
      * @throws GeneralException
      *
      * @return bool
      */
-    public function delete(Model $emailtemplate)
+    public function delete(EmailTemplate $emailtemplate)
     {
-        DB::transaction(function () use ($emailtemplate) {
-            if ($emailtemplate->delete()) {
-                event(new EmailTemplateDeleted($emailtemplate));
+        if ($emailtemplate->delete()) {
+            event(new EmailTemplateDeleted($emailtemplate));
 
-                return true;
-            }
+            return true;
+        }
 
-            throw new GeneralException(trans('exceptions.backend.emailtemplates.delete_error'));
-        });
+        throw new GeneralException(trans('exceptions.backend.emailtemplates.delete_error'));
     }
 }

app/Repositories/Backend/Pages/PagesRepository.php

@@ -8,7 +8,6 @@ use App\Events\Backend\Pages\PageUpdated;
 use App\Exceptions\GeneralException;
 use App\Models\Page\Page;
 use App\Repositories\BaseRepository;
-use DB;
 
 /**
  * Class PagesRepository.
@@ -27,18 +26,18 @@ class PagesRepository extends BaseRepository
     {
         return $this->query()
             ->select([
-                config('access.pages_table').'.id',
-                config('access.pages_table').'.title',
-                config('access.pages_table').'.status',
-                config('access.pages_table').'.created_at',
-                config('access.pages_table').'.updated_at',
+                config('module.pages.table').'.id',
+                config('module.pages.table').'.title',
+                config('module.pages.table').'.status',
+                config('module.pages.table').'.created_at',
+                config('module.pages.table').'.updated_at',
             ]);
     }
 
     /**
      * @param array $input
      *
-     * @throws GeneralException
+     * @throws \App\Exceptions\GeneralException
      *
      * @return bool
      */
@@ -48,80 +47,63 @@ class PagesRepository extends BaseRepository
             throw new GeneralException(trans('exceptions.backend.pages.already_exists'));
         }
 
-        DB::transaction(function () use ($input) {
-            $pages = self::MODEL;
-            $pages = new $pages();
-            $pages->title = $input['title'];
-            $pages->page_slug = str_slug($input['title']);
-            $pages->description = $input['description'];
-            $pages->cannonical_link = $input['cannonical_link'];
-            $pages->seo_title = $input['seo_title'];
-            $pages->seo_keyword = $input['seo_keyword'];
-            $pages->seo_description = $input['seo_description'];
-            $pages->status = (isset($input['status']) && $input['status'] == 1) ? 1 : 0;
-            $pages->created_by = access()->user()->id;
-
-            if ($pages->save()) {
-                event(new PageCreated($pages));
-
-                return true;
-            }
-
-            throw new GeneralException(trans('exceptions.backend.pages.create_error'));
-        });
+        //Making extra fields
+        $input['page_slug'] = str_slug($input['title']);
+        $input['status'] = isset($input['status']) ? 1 : 0;
+        $input['created_by'] = access()->user()->id;
+
+        if ($page = Page::create($input)) {
+            event(new PageCreated($page));
+
+            return true;
+        }
+
+        throw new GeneralException(trans('exceptions.backend.pages.create_error'));
     }
 
     /**
-     * @param Model $permission
-     * @param  $input
+     * @param \App\Models\Page\Page $page
+     * @param array                 $input
      *
-     * @throws GeneralException
+     * @throws \App\Exceptions\GeneralException
      *
-     * return bool
+     * @return bool
      */
-    public function update(Model $page, array $input)
+    public function update($page, array $input)
     {
         if ($this->query()->where('title', $input['title'])->where('id', '!=', $page->id)->first()) {
             throw new GeneralException(trans('exceptions.backend.pages.already_exists'));
         }
-        $page->title = $input['title'];
-        $page->page_slug = str_slug($input['title']);
-        $page->description = $input['description'];
-        $page->cannonical_link = $input['cannonical_link'];
-        $page->seo_title = $input['seo_title'];
-        $page->seo_keyword = $input['seo_keyword'];
-        $page->seo_description = $input['seo_description'];
-        $page->status = (isset($input['status']) && $input['status'] == 1) ? 1 : 0;
-        $page->updated_by = access()->user()->id;
-
-        DB::transaction(function () use ($page, $input) {
-            if ($page->save()) {
-                event(new PageUpdated($page));
-
-                return true;
-            }
-
-            throw new GeneralException(trans('exceptions.backend.pages.update_error'));
-        });
+
+        //Making extra fields
+        $input['page_slug'] = str_slug($input['title']);
+        $input['status'] = isset($input['status']) ? 1 : 0;
+        $input['updated_by'] = access()->user()->id;
+
+        if ($page->update($input)) {
+            event(new PageUpdated($page));
+
+            return true;
+        }
+
+        throw new GeneralException(trans('exceptions.backend.pages.update_error'));
     }
 
     /**
-     * @param Model $page
+     * @param \App\Models\Page\Page $page
      *
-     * @throws GeneralException
+     * @throws \App\Exceptions\GeneralException
      *
      * @return bool
      */
-    public function delete(Model $page)
+    public function delete($page)
     {
-        DB::transaction(function () use ($page) {
-            if ($page->delete()) {
-                event(new PageDeleted($page));
+        if ($page->delete()) {
+            event(new PageDeleted($page));
 
-                return true;
-            }
+            return true;
+        }
 
-            throw new GeneralException(trans('exceptions.backend.pages.delete_error'));
-        });
+        throw new GeneralException(trans('exceptions.backend.pages.delete_error'));
     }
 }

app/Repositories/BaseRepository.php

@@ -15,6 +15,28 @@ class BaseRepository
         return $this->query()->get();
     }
 
+    /**
+     * Get Paginated.
+     *
+     * @param $per_page
+     * @param string $active
+     * @param string $order_by
+     * @param string $sort
+     *
+     * @return mixed
+     */
+    public function getPaginated($per_page, $active = '', $order_by = 'id', $sort = 'asc')
+    {
+        if ($active) {
+            return $this->query()->where('status', $active)
+                ->orderBy($order_by, $sort)
+                ->paginate($per_page);
+        } else {
+            return $this->query()->orderBy($order_by, $sort)
+                ->paginate($per_page);
+        }
+    }
+
     /**
      * @return mixed
      */

app/Repositories/Frontend/Access/User/UserRepository.php

@@ -11,6 +11,7 @@ use App\Repositories\Backend\Access\Role\RoleRepository;
 use App\Repositories\BaseRepository;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
 
 /**
  * Class UserRepository.
@@ -95,7 +96,6 @@ class UserRepository extends BaseRepository
         $user->password = $provider ? null : bcrypt($data['password']);
         $user->confirmed = $provider ? 1 : (config('access.users.confirm_email') ? 0 : 1);
         $user->is_term_accept = $data['is_term_accept'];
-        $user->created_by = 1;
 
         DB::transaction(function () use ($user) {
             if ($user->save()) {
@@ -287,4 +287,21 @@ class UserRepository extends BaseRepository
 
         throw new GeneralException(trans('exceptions.frontend.auth.password.change_mismatch'));
     }
+
+    /**
+     * Create a new token for the user.
+     *
+     * @return string
+     */
+    public function saveToken()
+    {
+        $token = hash_hmac('sha256', Str::random(40), 'hashKey');
+
+        \DB::table('password_resets')->insert([
+            'email' => request('email'),
+            'token' => $token,
+        ]);
+
+        return $token;
+    }
 }

composer.json

@@ -22,11 +22,12 @@
         "laravel/tinker": "~1.0",
         "laravelcollective/html": "^5.5.0",
         "tymon/jwt-auth": "dev-develop",
+        "unisharp/laravel-filemanager": "~1.8",
         "yajra/laravel-datatables-oracle": "~8.0"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.0",
-        "bvipul/generator": "0.9",
+        "bvipul/generator": "v0.9.1",
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
         "laravel/browser-kit-testing": "^1.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "9a7e5818235f0e24dae12c60b70c8e90",
+    "content-hash": "35d120683a64774aea72f4d4ce891c0e",
     "packages": [
         {
             "name": "arcanedev/log-viewer",
@@ -331,21 +331,21 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "v1.4.0",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "54cacc9b81758b14e3ce750f205a393d52339e97"
+                "reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97",
-                "reference": "54cacc9b81758b14e3ce750f205a393d52339e97",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5beebb01b025c94e93686b7a0ed3edae81fe3e7f",
+                "reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f",
                 "shasum": ""
             },
             "require": {
                 "doctrine/lexer": "1.*",
-                "php": "^5.6 || ^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
                 "doctrine/cache": "1.*",
@@ -354,7 +354,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-master": "1.5.x-dev"
                 }
             },
             "autoload": {
@@ -395,37 +395,41 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2017-02-24T16:22:25+00:00"
+            "time": "2017-07-22T10:58:02+00:00"
         },
         {
             "name": "doctrine/cache",
-            "version": "v1.6.2",
+            "version": "v1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b"
+                "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/eb152c5100571c7a45470ff2a35095ab3f3b900b",
-                "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a",
+                "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a",
                 "shasum": ""
             },
             "require": {
-                "php": "~5.5|~7.0"
+                "php": "~7.1"
             },
             "conflict": {
                 "doctrine/common": ">2.2,<2.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.8|~5.0",
-                "predis/predis": "~1.0",
-                "satooshi/php-coveralls": "~0.6"
+                "alcaeus/mongo-php-adapter": "^1.1",
+                "mongodb/mongodb": "^1.1",
+                "phpunit/phpunit": "^5.7",
+                "predis/predis": "~1.0"
+            },
+            "suggest": {
+                "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6.x-dev"
+                    "dev-master": "1.7.x-dev"
                 }
             },
             "autoload": {
@@ -465,24 +469,24 @@
                 "cache",
                 "caching"
             ],
-            "time": "2017-07-22T12:49:21+00:00"
+            "time": "2017-08-25T07:02:50+00:00"
         },
         {
             "name": "doctrine/collections",
-            "version": "v1.4.0",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/collections.git",
-                "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba"
+                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba",
-                "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba",
+                "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
+                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
                 "doctrine/coding-standard": "~0.1@dev",
@@ -532,20 +536,20 @@
                 "collections",
                 "iterator"
             ],
-            "time": "2017-01-03T10:49:41+00:00"
+            "time": "2017-07-22T10:37:32+00:00"
         },
         {
             "name": "doctrine/common",
-            "version": "v2.7.3",
+            "version": "v2.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/common.git",
-                "reference": "4acb8f89626baafede6ee5475bc5844096eba8a9"
+                "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/4acb8f89626baafede6ee5475bc5844096eba8a9",
-                "reference": "4acb8f89626baafede6ee5475bc5844096eba8a9",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
+                "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
                 "shasum": ""
             },
             "require": {
@@ -554,15 +558,15 @@
                 "doctrine/collections": "1.*",
                 "doctrine/inflector": "1.*",
                 "doctrine/lexer": "1.*",
-                "php": "~5.6|~7.0"
+                "php": "~7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.4.6"
+                "phpunit/phpunit": "^5.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7.x-dev"
+                    "dev-master": "2.8.x-dev"
                 }
             },
             "autoload": {
@@ -605,28 +609,30 @@
                 "persistence",
                 "spl"
             ],
-            "time": "2017-07-22T08:35:12+00:00"
+            "time": "2017-08-31T08:43:38+00:00"
         },
         {
             "name": "doctrine/dbal",
-            "version": "v2.5.13",
+            "version": "v2.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "729340d8d1eec8f01bff708e12e449a3415af873"
+                "reference": "e3eed9b1facbb0ced3a0995244843a189e7d1b13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/729340d8d1eec8f01bff708e12e449a3415af873",
-                "reference": "729340d8d1eec8f01bff708e12e449a3415af873",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/e3eed9b1facbb0ced3a0995244843a189e7d1b13",
+                "reference": "e3eed9b1facbb0ced3a0995244843a189e7d1b13",
                 "shasum": ""
             },
             "require": {
-                "doctrine/common": ">=2.4,<2.8-dev",
-                "php": ">=5.3.2"
+                "doctrine/common": "^2.7.1",
+                "ext-pdo": "*",
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.*",
+                "phpunit/phpunit": "^5.4.6",
+                "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
                 "symfony/console": "2.*||^3.0"
             },
             "suggest": {
@@ -638,7 +644,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5.x-dev"
+                    "dev-master": "2.6.x-dev"
                 }
             },
             "autoload": {
@@ -676,7 +682,7 @@
                 "persistence",
                 "queryobject"
             ],
-            "time": "2017-07-22T20:44:48+00:00"
+            "time": "2017-11-19T13:38:54+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -1202,6 +1208,76 @@
             ],
             "time": "2017-09-07T02:36:51+00:00"
         },
+        {
+            "name": "intervention/image",
+            "version": "2.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Intervention/image.git",
+                "reference": "3603dbcc9a17d307533473246a6c58c31cf17919"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/3603dbcc9a17d307533473246a6c58c31cf17919",
+                "reference": "3603dbcc9a17d307533473246a6c58c31cf17919",
+                "shasum": ""
+            },
+            "require": {
+                "ext-fileinfo": "*",
+                "guzzlehttp/psr7": "~1.1",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "~0.9.2",
+                "phpunit/phpunit": "^4.8 || ^5.7"
+            },
+            "suggest": {
+                "ext-gd": "to use GD library based image processing.",
+                "ext-imagick": "to use Imagick based image processing.",
+                "intervention/imagecache": "Caching extension for the Intervention Image library"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Intervention\\Image\\ImageServiceProvider"
+                    ],
+                    "aliases": {
+                        "Image": "Intervention\\Image\\Facades\\Image"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Intervention\\Image\\": "src/Intervention/Image"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Oliver Vogel",
+                    "email": "oliver@olivervogel.com",
+                    "homepage": "http://olivervogel.com/"
+                }
+            ],
+            "description": "Image handling and manipulation library with support for Laravel integration",
+            "homepage": "http://image.intervention.io/",
+            "keywords": [
+                "gd",
+                "image",
+                "imagick",
+                "laravel",
+                "thumbnail",
+                "watermark"
+            ],
+            "time": "2017-09-21T16:29:17+00:00"
+        },
         {
             "name": "jakub-onderka/php-console-color",
             "version": "0.1",
@@ -1291,16 +1367,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.5.21",
+            "version": "v5.5.22",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "6321069a75723d88103526903d3192f0b231544a"
+                "reference": "2404af887ca8272d721628a99bbc721ac3b692e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/6321069a75723d88103526903d3192f0b231544a",
-                "reference": "6321069a75723d88103526903d3192f0b231544a",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/2404af887ca8272d721628a99bbc721ac3b692e7",
+                "reference": "2404af887ca8272d721628a99bbc721ac3b692e7",
                 "shasum": ""
             },
             "require": {
@@ -1420,7 +1496,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2017-11-14T15:08:13+00:00"
+            "time": "2017-11-27T15:29:55+00:00"
         },
         {
             "name": "laravel/socialite",
@@ -2501,44 +2577,45 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.3.13",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "63cd7960a0a522c3537f6326706d7f3b8de65805"
+                "reference": "9468ad3fba3a5e1f0dc12a96e50e84cddb923cf0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/63cd7960a0a522c3537f6326706d7f3b8de65805",
-                "reference": "63cd7960a0a522c3537f6326706d7f3b8de65805",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9468ad3fba3a5e1f0dc12a96e50e84cddb923cf0",
+                "reference": "9468ad3fba3a5e1f0dc12a96e50e84cddb923cf0",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
-                "symfony/debug": "~2.8|~3.0",
+                "symfony/debug": "~2.8|~3.0|~4.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<3.3"
+                "symfony/dependency-injection": "<3.4",
+                "symfony/process": "<3.3"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~3.3",
-                "symfony/dependency-injection": "~3.3",
-                "symfony/event-dispatcher": "~2.8|~3.0",
-                "symfony/filesystem": "~2.8|~3.0",
-                "symfony/process": "~2.8|~3.0"
+                "symfony/config": "~3.3|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+                "symfony/lock": "~3.4|~4.0",
+                "symfony/process": "~3.3|~4.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
                 "symfony/event-dispatcher": "",
-                "symfony/filesystem": "",
+                "symfony/lock": "",
                 "symfony/process": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -2565,20 +2642,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-16T15:24:32+00:00"
+            "time": "2017-11-29T13:28:14+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.3.13",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "66e6e046032ebdf1f562c26928549f613d428bd1"
+                "reference": "7134b93e90ea7e7881fcb2da006d21b4c5f31908"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/66e6e046032ebdf1f562c26928549f613d428bd1",
-                "reference": "66e6e046032ebdf1f562c26928549f613d428bd1",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/7134b93e90ea7e7881fcb2da006d21b4c5f31908",
+                "reference": "7134b93e90ea7e7881fcb2da006d21b4c5f31908",
                 "shasum": ""
             },
             "require": {
@@ -2587,7 +2664,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -2618,20 +2695,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-05T15:47:03+00:00"
+            "time": "2017-11-05T16:10:10+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.3.13",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "74557880e2846b5c84029faa96b834da37e29810"
+                "reference": "fb2001e5d85f95d8b6ab94ae3be5d2672df128fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/74557880e2846b5c84029faa96b834da37e29810",
-                "reference": "74557880e2846b5c84029faa96b834da37e29810",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/fb2001e5d85f95d8b6ab94ae3be5d2672df128fd",
+                "reference": "fb2001e5d85f95d8b6ab94ae3be5d2672df128fd",
                 "shasum": ""
             },
             "require": {
@@ -2642,12 +2719,12 @@
                 "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
             },
             "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0"
+                "symfony/http-kernel": "~2.8|~3.0|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -2674,34 +2751,34 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-10T16:38:39+00:00"
+            "time": "2017-11-21T09:01:46+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.3.13",
+            "version": "v4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "271d8c27c3ec5ecee6e2ac06016232e249d638d9"
+                "reference": "6223fb2b68e7059e8d5843c0103999a84e7275cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/271d8c27c3ec5ecee6e2ac06016232e249d638d9",
-                "reference": "271d8c27c3ec5ecee6e2ac06016232e249d638d9",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6223fb2b68e7059e8d5843c0103999a84e7275cf",
+                "reference": "6223fb2b68e7059e8d5843c0103999a84e7275cf",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<3.3"
+                "symfony/dependency-injection": "<3.4"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/dependency-injection": "~3.3",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/stopwatch": "~2.8|~3.0"
+                "symfony/config": "~3.4|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/expression-language": "~3.4|~4.0",
+                "symfony/stopwatch": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -2710,7 +2787,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -2737,20 +2814,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-05T15:47:03+00:00"
+            "time": "2017-11-09T17:30:28+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.3.13",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "138af5ec075d4b1d1bd19de08c38a34bb2d7d880"
+                "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/138af5ec075d4b1d1bd19de08c38a34bb2d7d880",
-                "reference": "138af5ec075d4b1d1bd19de08c38a34bb2d7d880",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/dac8d7db537bac7ad8143eb11360a8c2231f251a",
+                "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a",
                 "shasum": ""
             },
             "require": {
@@ -2759,7 +2836,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -2786,33 +2863,34 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-05T15:47:03+00:00"
+            "time": "2017-11-05T16:10:10+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.3.13",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "5943f0f19817a7e05992d20a90729b0dc93faf36"
+                "reference": "d9625c8abb907e0ca2d7506afd7a719a572c766f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5943f0f19817a7e05992d20a90729b0dc93faf36",
-                "reference": "5943f0f19817a7e05992d20a90729b0dc93faf36",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d9625c8abb907e0ca2d7506afd7a719a572c766f",
+                "reference": "d9625c8abb907e0ca2d7506afd7a719a572c766f",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-mbstring": "~1.1"
+                "symfony/polyfill-mbstring": "~1.1",
+                "symfony/polyfill-php70": "~1.6"
             },
             "require-dev": {
-                "symfony/expression-language": "~2.8|~3.0"
+                "symfony/expression-language": "~2.8|~3.0|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -2839,56 +2917,58 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-13T18:13:16+00:00"
+            "time": "2017-11-30T14:56:21+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v3.3.13",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "a2a942172b742217ab2ccd9399494af2aa17c766"
+                "reference": "2df856c9dd8a1e1f11439b12e58c474afc1aac0d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a2a942172b742217ab2ccd9399494af2aa17c766",
-                "reference": "a2a942172b742217ab2ccd9399494af2aa17c766",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2df856c9dd8a1e1f11439b12e58c474afc1aac0d",
+                "reference": "2df856c9dd8a1e1f11439b12e58c474afc1aac0d",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
                 "psr/log": "~1.0",
-                "symfony/debug": "~2.8|~3.0",
-                "symfony/event-dispatcher": "~2.8|~3.0",
-                "symfony/http-foundation": "^3.3.11"
+                "symfony/debug": "~2.8|~3.0|~4.0",
+                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+                "symfony/http-foundation": "^3.3.11|~4.0"
             },
             "conflict": {
                 "symfony/config": "<2.8",
-                "symfony/dependency-injection": "<3.3",
+                "symfony/dependency-injection": "<3.4",
                 "symfony/var-dumper": "<3.3",
                 "twig/twig": "<1.34|<2.4,>=2"
             },
+            "provide": {
+                "psr/log-implementation": "1.0"
+            },
             "require-dev": {
                 "psr/cache": "~1.0",
-                "symfony/browser-kit": "~2.8|~3.0",
+                "symfony/browser-kit": "~2.8|~3.0|~4.0",
                 "symfony/class-loader": "~2.8|~3.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/console": "~2.8|~3.0",
-                "symfony/css-selector": "~2.8|~3.0",
-                "symfony/dependency-injection": "~3.3",
-                "symfony/dom-crawler": "~2.8|~3.0",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/finder": "~2.8|~3.0",
-                "symfony/process": "~2.8|~3.0",
-                "symfony/routing": "~2.8|~3.0",
-                "symfony/stopwatch": "~2.8|~3.0",
-                "symfony/templating": "~2.8|~3.0",
-                "symfony/translation": "~2.8|~3.0",
-                "symfony/var-dumper": "~3.3"
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/console": "~2.8|~3.0|~4.0",
+                "symfony/css-selector": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/dom-crawler": "~2.8|~3.0|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/finder": "~2.8|~3.0|~4.0",
+                "symfony/process": "~2.8|~3.0|~4.0",
+                "symfony/routing": "~3.4|~4.0",
+                "symfony/stopwatch": "~2.8|~3.0|~4.0",
+                "symfony/templating": "~2.8|~3.0|~4.0",
+                "symfony/translation": "~2.8|~3.0|~4.0",
+                "symfony/var-dumper": "~3.3|~4.0"
             },
             "suggest": {
                 "symfony/browser-kit": "",
-                "symfony/class-loader": "",
                 "symfony/config": "",
                 "symfony/console": "",
                 "symfony/dependency-injection": "",
@@ -2898,7 +2978,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -2925,7 +3005,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-16T18:14:43+00:00"
+            "time": "2017-11-30T16:56:05+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -3042,6 +3122,65 @@
             ],
             "time": "2017-10-11T12:05:26+00:00"
         },
+        {
+            "name": "symfony/polyfill-php70",
+            "version": "v1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff",
+                "reference": "0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": "~1.0|~2.0",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php70\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2017-10-11T12:05:26+00:00"
+        },
         {
             "name": "symfony/polyfill-util",
             "version": "v1.6.0",
@@ -3096,16 +3235,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v3.3.13",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "a56a3989fb762d7b19a0cf8e7693ee99a6ffb78d"
+                "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/a56a3989fb762d7b19a0cf8e7693ee99a6ffb78d",
-                "reference": "a56a3989fb762d7b19a0cf8e7693ee99a6ffb78d",
+                "url": "https://api.github.com/repos/symfony/process/zipball/db25e810fd5e124085e3777257d0cf4ae533d0ea",
+                "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea",
                 "shasum": ""
             },
             "require": {
@@ -3114,7 +3253,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -3141,20 +3280,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-13T15:31:11+00:00"
+            "time": "2017-11-22T12:18:49+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v3.3.13",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "cf7fa1dfcfee2c96969bfa1c0341e5627ecb1e95"
+                "reference": "d768aa5b25d98188bae3fe4ce3eb2924c97aafac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/cf7fa1dfcfee2c96969bfa1c0341e5627ecb1e95",
-                "reference": "cf7fa1dfcfee2c96969bfa1c0341e5627ecb1e95",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/d768aa5b25d98188bae3fe4ce3eb2924c97aafac",
+                "reference": "d768aa5b25d98188bae3fe4ce3eb2924c97aafac",
                 "shasum": ""
             },
             "require": {
@@ -3163,17 +3302,17 @@
             "conflict": {
                 "symfony/config": "<2.8",
                 "symfony/dependency-injection": "<3.3",
-                "symfony/yaml": "<3.3"
+                "symfony/yaml": "<3.4"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/common": "~2.2",
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/dependency-injection": "~3.3",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/http-foundation": "~2.8|~3.0",
-                "symfony/yaml": "~3.3"
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "~3.3|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/http-foundation": "~2.8|~3.0|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation loader",
@@ -3186,7 +3325,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -3219,20 +3358,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2017-11-07T14:16:22+00:00"
+            "time": "2017-11-24T14:13:49+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v3.3.13",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "373e553477e55cd08f8b86b74db766c75b987fdb"
+                "reference": "e05b0a5996ad7a35ba3a19ffad8b72c9daa64dfa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/373e553477e55cd08f8b86b74db766c75b987fdb",
-                "reference": "373e553477e55cd08f8b86b74db766c75b987fdb",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/e05b0a5996ad7a35ba3a19ffad8b72c9daa64dfa",
+                "reference": "e05b0a5996ad7a35ba3a19ffad8b72c9daa64dfa",
                 "shasum": ""
             },
             "require": {
@@ -3241,13 +3380,16 @@
             },
             "conflict": {
                 "symfony/config": "<2.8",
-                "symfony/yaml": "<3.3"
+                "symfony/dependency-injection": "<3.4",
+                "symfony/yaml": "<3.4"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/intl": "^2.8.18|^3.2.5",
-                "symfony/yaml": "~3.3"
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/finder": "~2.8|~3.0|~4.0",
+                "symfony/intl": "^2.8.18|^3.2.5|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
                 "psr/log": "To use logging capability in translator",
@@ -3257,7 +3399,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -3284,20 +3426,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-07T14:12:55+00:00"
+            "time": "2017-11-27T14:23:00+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.3.13",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "805de6bd6869073e60610df1b14ab7d969c61b01"
+                "reference": "ec650a975a8e04e0c114d35eab732981243db3a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/805de6bd6869073e60610df1b14ab7d969c61b01",
-                "reference": "805de6bd6869073e60610df1b14ab7d969c61b01",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ec650a975a8e04e0c114d35eab732981243db3a2",
+                "reference": "ec650a975a8e04e0c114d35eab732981243db3a2",
                 "shasum": ""
             },
             "require": {
@@ -3313,12 +3455,13 @@
             },
             "suggest": {
                 "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
+                "ext-intl": "To show region name in time zone dump",
                 "ext-symfony_debug": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -3352,7 +3495,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2017-11-07T14:16:22+00:00"
+            "time": "2017-11-30T14:59:23+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -3475,6 +3618,83 @@
             ],
             "time": "2017-11-17T23:50:47+00:00"
         },
+        {
+            "name": "unisharp/laravel-filemanager",
+            "version": "v1.8.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/UniSharp/laravel-filemanager.git",
+                "reference": "13abe4d61233848fb64f17fbc8528bb4245d6e93"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/UniSharp/laravel-filemanager/zipball/13abe4d61233848fb64f17fbc8528bb4245d6e93",
+                "reference": "13abe4d61233848fb64f17fbc8528bb4245d6e93",
+                "shasum": ""
+            },
+            "require": {
+                "ext-exif": "*",
+                "ext-fileinfo": "*",
+                "illuminate/support": ">=4.2.0",
+                "intervention/image": "2.*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "~3.0",
+                "phpspec/phpspec": "~2.1",
+                "phpunit/phpunit": "~4.8"
+            },
+            "suggest": {
+                "ext-gd": "to use GD library based image processing.",
+                "ext-imagick": "to use Imagick based image processing."
+            },
+            "bin": [
+                "bin/debug"
+            ],
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Unisharp\\Laravelfilemanager\\LaravelFilemanagerServiceProvider",
+                        "Intervention\\Image\\ImageServiceProvider"
+                    ],
+                    "aliases": {
+                        "Image": "Intervention\\Image\\Facades\\Image"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Unisharp\\Laravelfilemanager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Trevor Sawler",
+                    "email": "trevor.sawler@gmail.com"
+                },
+                {
+                    "name": "UniSharp Ltd.",
+                    "email": "unisharp-service@unisharp.com"
+                }
+            ],
+            "description": "A file upload/editor intended for use with Laravel 5 and CKEditor / TinyMCE",
+            "keywords": [
+                "CKEditor",
+                "file",
+                "filemanager",
+                "image",
+                "laravel",
+                "manager",
+                "tinymce",
+                "upload"
+            ],
+            "time": "2017-10-20T18:56:52+00:00"
+        },
         {
             "name": "vlucas/phpdotenv",
             "version": "v2.4.0",
@@ -3667,16 +3887,16 @@
         },
         {
             "name": "bvipul/generator",
-            "version": "0.9",
+            "version": "v0.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bvipul/generator.git",
-                "reference": "c72ff9d734c353e06b46c3248d7797aacbb5cc31"
+                "reference": "e909ea2f6b031d6425f530aa66b948fde303e1d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bvipul/generator/zipball/c72ff9d734c353e06b46c3248d7797aacbb5cc31",
-                "reference": "c72ff9d734c353e06b46c3248d7797aacbb5cc31",
+                "url": "https://api.github.com/repos/bvipul/generator/zipball/e909ea2f6b031d6425f530aa66b948fde303e1d7",
+                "reference": "e909ea2f6b031d6425f530aa66b948fde303e1d7",
                 "shasum": ""
             },
             "type": "package",
@@ -3696,36 +3916,36 @@
                 }
             ],
             "description": "To create a whole module with all related files like model, controller, repository, routes, views etc with a simple GUI.",
-            "time": "2017-11-14T15:50:43+00:00"
+            "time": "2017-11-30T18:31:14+00:00"
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.0.5",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3,<8.0-DEV"
+                "php": "^7.1"
             },
             "require-dev": {
                 "athletic/athletic": "~0.1.8",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "phpunit/phpunit": "^6.2.3",
+                "squizlabs/php_codesniffer": "^3.0.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -3750,7 +3970,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14T21:17:01+00:00"
+            "time": "2017-07-22T11:58:36+00:00"
         },
         {
             "name": "filp/whoops",
@@ -4284,29 +4504,35 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "4.1.1",
+            "version": "4.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2"
+                "reference": "66465776cfc249844bde6d117abff1d22e06c2da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2",
-                "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66465776cfc249844bde6d117abff1d22e06c2da",
+                "reference": "66465776cfc249844bde6d117abff1d22e06c2da",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/reflection-common": "^1.0.0",
                 "phpdocumentor/type-resolver": "^0.4.0",
                 "webmozart/assert": "^1.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^4.4"
+                "doctrine/instantiator": "~1.0.5",
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^6.4"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "phpDocumentor\\Reflection\\": [
@@ -4325,7 +4551,7 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-08-30T18:51:59+00:00"
+            "time": "2017-11-27T17:38:31+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -4439,16 +4665,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "5.2.3",
+            "version": "5.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d"
+                "reference": "033ec97498cf530cc1be4199264cad568b19be26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d",
-                "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/033ec97498cf530cc1be4199264cad568b19be26",
+                "reference": "033ec97498cf530cc1be4199264cad568b19be26",
                 "shasum": ""
             },
             "require": {
@@ -4457,7 +4683,7 @@
                 "php": "^7.0",
                 "phpunit/php-file-iterator": "^1.4.2",
                 "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^2.0",
+                "phpunit/php-token-stream": "^2.0.1",
                 "sebastian/code-unit-reverse-lookup": "^1.0.1",
                 "sebastian/environment": "^3.0",
                 "sebastian/version": "^2.0.1",
@@ -4499,20 +4725,20 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-11-03T13:47:33+00:00"
+            "time": "2017-11-27T09:00:30+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.4.3",
+            "version": "1.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "8ebba84e5bd74fc5fdeb916b38749016c7232f93"
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/8ebba84e5bd74fc5fdeb916b38749016c7232f93",
-                "reference": "8ebba84e5bd74fc5fdeb916b38749016c7232f93",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
                 "shasum": ""
             },
             "require": {
@@ -4546,7 +4772,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2017-11-24T15:00:59+00:00"
+            "time": "2017-11-27T13:52:08+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -4689,16 +4915,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "6.4.4",
+            "version": "6.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932"
+                "reference": "8eea3cfbfe3c8363f8111e24569bdb6ead71ea6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/562f7dc75d46510a4ed5d16189ae57fbe45a9932",
-                "reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8eea3cfbfe3c8363f8111e24569bdb6ead71ea6e",
+                "reference": "8eea3cfbfe3c8363f8111e24569bdb6ead71ea6e",
                 "shasum": ""
             },
             "require": {
@@ -4712,12 +4938,12 @@
                 "phar-io/version": "^1.0",
                 "php": "^7.0",
                 "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^5.2.2",
-                "phpunit/php-file-iterator": "^1.4.2",
+                "phpunit/php-code-coverage": "^5.2.3",
+                "phpunit/php-file-iterator": "^1.4.3",
                 "phpunit/php-text-template": "^1.2.1",
                 "phpunit/php-timer": "^1.0.9",
-                "phpunit/phpunit-mock-objects": "^4.0.3",
-                "sebastian/comparator": "^2.0.2",
+                "phpunit/phpunit-mock-objects": "^5.0",
+                "sebastian/comparator": "^2.1",
                 "sebastian/diff": "^2.0",
                 "sebastian/environment": "^3.1",
                 "sebastian/exporter": "^3.1",
@@ -4743,7 +4969,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.4.x-dev"
+                    "dev-master": "6.5.x-dev"
                 }
             },
             "autoload": {
@@ -4769,20 +4995,20 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-11-08T11:26:09+00:00"
+            "time": "2017-12-01T09:57:23+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "4.0.4",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "2f789b59ab89669015ad984afa350c4ec577ade0"
+                "reference": "a58b8fc03ca12d8bf6122ea942bc72c99c7cda4a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0",
-                "reference": "2f789b59ab89669015ad984afa350c4ec577ade0",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a58b8fc03ca12d8bf6122ea942bc72c99c7cda4a",
+                "reference": "a58b8fc03ca12d8bf6122ea942bc72c99c7cda4a",
                 "shasum": ""
             },
             "require": {
@@ -4795,7 +5021,7 @@
                 "phpunit/phpunit": "<6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^6.5"
             },
             "suggest": {
                 "ext-soap": "*"
@@ -4803,7 +5029,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0.x-dev"
+                    "dev-master": "5.0.x-dev"
                 }
             },
             "autoload": {
@@ -4818,7 +5044,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -4828,7 +5054,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2017-08-03T14:08:16+00:00"
+            "time": "2017-12-01T16:12:08+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -5391,16 +5617,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v3.3.13",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "cebe3c068867956e012d9135282ba6a05d8a259e"
+                "reference": "7bf68716e400997a291ad42c9f9fe7972e6656d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/cebe3c068867956e012d9135282ba6a05d8a259e",
-                "reference": "cebe3c068867956e012d9135282ba6a05d8a259e",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7bf68716e400997a291ad42c9f9fe7972e6656d2",
+                "reference": "7bf68716e400997a291ad42c9f9fe7972e6656d2",
                 "shasum": ""
             },
             "require": {
@@ -5408,7 +5634,7 @@
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
-                "symfony/css-selector": "~2.8|~3.0"
+                "symfony/css-selector": "~2.8|~3.0|~4.0"
             },
             "suggest": {
                 "symfony/css-selector": ""
@@ -5416,7 +5642,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -5443,7 +5669,7 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2017-11-05T15:47:03+00:00"
+            "time": "2017-11-05T16:10:10+00:00"
         },
         {
             "name": "theseer/tokenizer",

config/access.php

@@ -60,26 +60,6 @@ return [
      */
     'cities_table' => 'cities',
 
-    /*
-     * cmspages table used to store cmspages
-     */
-    'pages_table' => 'pages',
-
-    /*
-     * email template placeholders table used to store email template placeholders
-     */
-    'email_template_placeholders_table' => 'email_template_placeholders',
-
-    /*
-     * email template types table used to store email template types
-     */
-    'email_template_types_table' => 'email_template_types',
-
-    /*
-     * Email templates table used to store Email templates
-     */
-    'email_templates_table' => 'email_templates',
-
     /*
      * Email templates table used to store Email templates
      */

config/api.php

 <?php
 
-
 return [
 
-    /*
-    |--------------------------------------------------------------------------
-    | Standards Tree
-    |--------------------------------------------------------------------------
-    |
-    | Versioning an API with Dingo revolves around content negotiation and
-    | custom MIME types. A custom type will belong to one of three
-    | standards trees, the Vendor tree (vnd), the Personal tree
-    | (prs), and the Unregistered tree (x).
-    |
-    | By default the Unregistered tree (x) is used, however, should you wish
-    | to you can register your type with the IANA. For more details:
-    | https://tools.ietf.org/html/rfc6838
-    |
-    */
-
-    'standardsTree' => env('API_STANDARDS_TREE', 'x'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | API Subtype
-    |--------------------------------------------------------------------------
-    |
-    | Your subtype will follow the standards tree you use when used in the
-    | "Accept" header to negotiate the content type and version.
-    |
-    | For example: Accept: application/x.SUBTYPE.v1+json
-    |
-    */
-
-    'subtype' => env('API_SUBTYPE', ''),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default API Version
-    |--------------------------------------------------------------------------
-    |
-    | This is the default version when strict mode is disabled and your API
-    | is accessed via a web browser. It's also used as the default version
-    | when generating your APIs documentation.
-    |
-    */
-
-    'version' => env('API_VERSION', 'v1'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default API Prefix
-    |--------------------------------------------------------------------------
-    |
-    | A default prefix to use for your API routes so you don't have to
-    | specify it for each group.
-    |
-    */
-
-    'prefix' => env('API_PREFIX', null),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default API Domain
-    |--------------------------------------------------------------------------
-    |
-    | A default domain to use for your API routes so you don't have to
-    | specify it for each group.
-    |
-    */
-
-    'domain' => env('API_DOMAIN', null),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Name
-    |--------------------------------------------------------------------------
-    |
-    | When documenting your API using the API Blueprint syntax you can
-    | configure a default name to avoid having to manually specify
-    | one when using the command.
-    |
-    */
-
-    'name' => env('API_NAME', null),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Conditional Requests
-    |--------------------------------------------------------------------------
-    |
-    | Globally enable conditional requests so that an ETag header is added to
-    | any successful response. Subsequent requests will perform a check and
-    | will return a 304 Not Modified. This can also be enabled or disabled
-    | on certain groups or routes.
-    |
-    */
-
-    'conditionalRequest' => env('API_CONDITIONAL_REQUEST', true),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Strict Mode
-    |--------------------------------------------------------------------------
-    |
-    | Enabling strict mode will require clients to send a valid Accept header
-    | with every request. This also voids the default API version, meaning
-    | your API will not be browsable via a web browser.
-    |
-    */
-
-    'strict' => env('API_STRICT', false),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Debug Mode
-    |--------------------------------------------------------------------------
-    |
-    | Enabling debug mode will result in error responses caused by thrown
-    | exceptions to have a "debug" key that will be populated with
-    | more detailed information on the exception.
-    |
-    */
-
-    'debug' => env('API_DEBUG', false),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Generic Error Format
-    |--------------------------------------------------------------------------
-    |
-    | When some HTTP exceptions are not caught and dealt with the API will
-    | generate a generic error response in the format provided. Any
-    | keys that aren't replaced with corresponding values will be
-    | removed from the final response.
-    |
-    */
-
-    'errorFormat' => [
-        'message'     => ':message',
-        'errors'      => ':errors',
-        'code'        => ':code',
-        'status_code' => ':status_code',
-        'debug'       => ':debug',
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | API Middleware
-    |--------------------------------------------------------------------------
-    |
-    | Middleware that will be applied globally to all API requests.
-    |
-    */
-
-    'middleware' => [
+    // these options are related to the sign-up procedure
+    'register' => [
 
+        // this option must be set to true if you want to release a token
+        // when your user successfully terminates the sign-in procedure
+        'release_token' => env('SIGN_UP_RELEASE_TOKEN', true),
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Authentication Providers
-    |--------------------------------------------------------------------------
-    |
-    | The authentication providers that should be used when attempting to
-    | authenticate an incoming API request.
-    |
-    */
-
-    'auth' => [
-            'jwt' => 'Dingo\Api\Auth\Provider\JWT',
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Throttling / Rate Limiting
-    |--------------------------------------------------------------------------
-    |
-    | Consumers of your API can be limited to the amount of requests they can
-    | make. You can create your own throttles or simply change the default
-    | throttles.
-    |
-    */
-
-    'throttling' => [
-
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Response Transformer
-    |--------------------------------------------------------------------------
-    |
-    | Responses can be transformed so that they are easier to format. By
-    | default a Fractal transformer will be used to transform any
-    | responses prior to formatting. You can easily replace
-    | this with your own transformer.
-    |
-    */
-
-    'transformer' => env('API_TRANSFORMER', Dingo\Api\Transformer\Adapter\Fractal::class),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Response Formats
-    |--------------------------------------------------------------------------
-    |
-    | Responses can be returned in multiple formats by registering different
-    | response formatters. You can also customize an existing response
-    | formatter.
-    |
-    */
-
-    'defaultFormat' => env('API_DEFAULT_FORMAT', 'json'),
-
-    'formats' => [
-
-        'json' => Dingo\Api\Http\Response\Format\Json::class,
+    // these options are related to the password recovery procedure
+    'reset_password' => [
 
+        // this option must be set to true if you want to release a token
+        // when your user successfully terminates the password reset procedure
+        'release_token' => env('PASSWORD_RESET_RELEASE_TOKEN', false),
     ],
 
 ];

config/api_validation.php

-<?php
-
-return [
-    /*
-    *  Validation rules for all api.
-    */
-    'login' => [
-        'rules' => [
-            'email'    => 'required|email',
-            'password' => 'required',
-        ],
-    ],
-
-    'forgotpassword' => [
-        'rules' => [
-            'email' => 'required|email',
-        ],
-    ],
-
-    'resetpassword' => [
-        'rules' => [
-            'email'                 => 'required|email',
-            'password_confirmation' => 'required',
-            'password'              => 'required|confirmed',
-            'token'                 => 'required',
-        ],
-    ],
-
-    'register' => [
-        'rules' => [
-            'first_name' => 'required|max:255',
-            'last_name'  => 'required|max:255',
-            'email'      => 'required|email|max:255|unique:users',
-            'password'   => 'required|min:6|confirmed',
-            'state_id'   => 'required',
-            'city_id'    => 'required',
-            'zip_code'   => 'required',
-            'ssn'        => 'required',
-        ],
-    ],
-
-    'confirmaccount' => [
-         'rules' => [
-             'email' => 'required|email',
-             'otp'   => 'required',
-         ],
-    ],
-
-];

config/auth.php

@@ -44,7 +44,7 @@ return [
         ],
 
         'api' => [
-            'driver'   => 'token',
+            'driver'   => 'jwt',
             'provider' => 'users',
         ],
     ],

config/database.php

@@ -50,8 +50,17 @@ return [
             'charset'     => 'utf8mb4',
             'collation'   => 'utf8mb4_unicode_ci',
             'prefix'      => '',
-            'strict'      => true,
+            'strict'      => false, //If you set strict to true, then make sure to enable which modes you want to enable by looking at 'modes' key in this config
             'engine'      => null,
+            'modes'       => [
+                // "ONLY_FULL_GROUP_BY",
+                // "STRICT_TRANS_TABLES",
+                // "NO_ZERO_IN_DATE",
+                // "NO_ZERO_DATE",
+                // "ERROR_FOR_DIVISION_BY_ZERO",
+                // "NO_AUTO_CREATE_USER",
+                // "NO_ENGINE_SUBSTITUTION",
+            ],
         ],
 
         'pgsql' => [

config/jwt.php

@@ -16,12 +16,74 @@ return [
     | JWT Authentication Secret
     |--------------------------------------------------------------------------
     |
-    | Don't forget to set this, as it will be used to sign your tokens.
-    | A helper command is provided for this: `php artisan jwt:generate`
+    | Don't forget to set this in your .env file, as it will be used to sign
+    | your tokens. A helper command is provided for this:
+    | `php artisan jwt:secret`
+    |
+    | Note: This will be used for Symmetric algorithms only (HMAC),
+    | since RSA and ECDSA use a private/public key combo (See below).
     |
     */
 
-    'secret' => env('JWT_SECRET', '3M0tGfsEolZsrst5wrJgUOWk5Zkqzx5A'),
+    'secret' => env('JWT_SECRET'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | JWT Authentication Keys
+    |--------------------------------------------------------------------------
+    |
+    | The algorithm you are using, will determine whether your tokens are
+    | signed with a random string (defined in `JWT_SECRET`) or using the
+    | following public & private keys.
+    |
+    | Symmetric Algorithms:
+    | HS256, HS384 & HS512 will use `JWT_SECRET`.
+    |
+    | Asymmetric Algorithms:
+    | RS256, RS384 & RS512 / ES256, ES384 & ES512 will use the keys below.
+    |
+    */
+
+    'keys' => [
+
+        /*
+        |--------------------------------------------------------------------------
+        | Public Key
+        |--------------------------------------------------------------------------
+        |
+        | A path or resource to your public key.
+        |
+        | E.g. 'file://path/to/public/key'
+        |
+        */
+
+        'public' => env('JWT_PUBLIC_KEY'),
+
+        /*
+        |--------------------------------------------------------------------------
+        | Private Key
+        |--------------------------------------------------------------------------
+        |
+        | A path or resource to your private key.
+        |
+        | E.g. 'file://path/to/private/key'
+        |
+        */
+
+        'private' => env('JWT_PRIVATE_KEY'),
+
+        /*
+        |--------------------------------------------------------------------------
+        | Passphrase
+        |--------------------------------------------------------------------------
+        |
+        | The passphrase for your private key. Can be null if none set.
+        |
+        */
+
+        'passphrase' => env('JWT_PASSPHRASE'),
+
+    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -29,11 +91,16 @@ return [
     |--------------------------------------------------------------------------
     |
     | Specify the length of time (in minutes) that the token will be valid for.
-    | Defaults to 1 hour
+    | Defaults to 1 hour.
+    |
+    | You can also set this to null, to yield a never expiring token.
+    | Some people may want this behaviour for e.g. a mobile app.
+    | This is not particularly recommended, so make sure you have appropriate
+    | systems in place to revoke the token if necessary.
     |
     */
 
-    'ttl' => 60,
+    'ttl' => env('JWT_TTL', 60),
 
     /*
     |--------------------------------------------------------------------------
@@ -43,11 +110,16 @@ return [
     | Specify the length of time (in minutes) that the token can be refreshed
     | within. I.E. The user can refresh their token within a 2 week window of
     | the original token being created until they must re-authenticate.
-    | Defaults to 2 weeks
+    | Defaults to 2 weeks.
+    |
+    | You can also set this to null, to yield an infinite refresh time.
+    | Some may want this instead of never expiring tokens for e.g. a mobile app.
+    | This is not particularly recommended, so make sure you have appropriate
+    | systems in place to revoke the token if necessary.
     |
     */
 
-    'refresh_ttl' => 20160,
+    'refresh_ttl' => env('JWT_REFRESH_TTL', 20160),
 
     /*
     |--------------------------------------------------------------------------
@@ -56,61 +128,95 @@ return [
     |
     | Specify the hashing algorithm that will be used to sign the token.
     |
-    | See here: https://github.com/namshi/jose/tree/2.2.0/src/Namshi/JOSE/Signer
-    | for possible values
+    | See here: https://github.com/namshi/jose/tree/master/src/Namshi/JOSE/Signer/OpenSSL
+    | for possible values.
     |
     */
 
-    'algo' => 'HS256',
+    'algo' => env('JWT_ALGO', 'HS256'),
 
     /*
     |--------------------------------------------------------------------------
-    | User Model namespace
+    | Required Claims
     |--------------------------------------------------------------------------
     |
-    | Specify the full namespace to your User model.
-    | e.g. 'Acme\Entities\User'
+    | Specify the required claims that must exist in any token.
+    | A TokenInvalidException will be thrown if any of these claims are not
+    | present in the payload.
     |
     */
 
-    'user' => 'App\Models\Access\User\User',
+    'required_claims' => [
+        'iss',
+        'iat',
+        'exp',
+        'nbf',
+        'sub',
+        'jti',
+    ],
 
     /*
     |--------------------------------------------------------------------------
-    | User identifier
+    | Persistent Claims
     |--------------------------------------------------------------------------
     |
-    | Specify a unique property of the user that will be added as the 'sub'
-    | claim of the token payload.
+    | Specify the claim keys to be persisted when refreshing a token.
+    | `sub` and `iat` will automatically be persisted, in
+    | addition to the these claims.
+    |
+    | Note: If a claim does not exist then it will be ignored.
     |
     */
 
-    'identifier' => 'id',
+    'persistent_claims' => [
+        // 'foo',
+        // 'bar',
+    ],
 
     /*
     |--------------------------------------------------------------------------
-    | Required Claims
+    | Blacklist Enabled
     |--------------------------------------------------------------------------
     |
-    | Specify the required claims that must exist in any token.
-    | A TokenInvalidException will be thrown if any of these claims are not
-    | present in the payload.
+    | In order to invalidate tokens, you must have the blacklist enabled.
+    | If you do not want or need this functionality, then set this to false.
+    |
+    */
+
+    'blacklist_enabled' => env('JWT_BLACKLIST_ENABLED', true),
+
+    /*
+    | -------------------------------------------------------------------------
+    | Blacklist Grace Period
+    | -------------------------------------------------------------------------
+    |
+    | When multiple concurrent requests are made with the same JWT,
+    | it is possible that some of them fail, due to token regeneration
+    | on every request.
+    |
+    | Set grace period in seconds to prevent parallel request failure.
     |
     */
 
-    'required_claims' => ['iss', 'iat', 'exp', 'nbf', 'sub', 'jti'],
+    'blacklist_grace_period' => env('JWT_BLACKLIST_GRACE_PERIOD', 0),
 
     /*
     |--------------------------------------------------------------------------
-    | Blacklist Enabled
+    | Cookies encryption
     |--------------------------------------------------------------------------
     |
-    | In order to invalidate tokens, you must have the blacklist enabled.
-    | If you do not want or need this functionality, then set this to false.
+    | By default Laravel encrypt cookies for security reason.
+    | If you decide to not decrypt cookies, you will have to configure Laravel
+    | to not encrypt your cookie token by adding its name into the $except
+    | array available in the middleware "EncryptCookies" provided by Laravel.
+    | see https://laravel.com/docs/master/responses#cookies-and-encryption
+    | for details.
+    |
+    | Set it to false if you don't want to decrypt cookies.
     |
     */
 
-    'blacklist_enabled' => env('JWT_BLACKLIST_ENABLED', true),
+    'decrypt_cookies' => true,
 
     /*
     |--------------------------------------------------------------------------
@@ -123,18 +229,6 @@ return [
 
     'providers' => [
 
-        /*
-        |--------------------------------------------------------------------------
-        | User Provider
-        |--------------------------------------------------------------------------
-        |
-        | Specify the provider that is used to find the user based
-        | on the subject claim
-        |
-        */
-
-        'user' => 'Tymon\JWTAuth\Providers\User\EloquentUserAdapter',
-
         /*
         |--------------------------------------------------------------------------
         | JWT Provider
@@ -144,7 +238,7 @@ return [
         |
         */
 
-        'jwt' => 'Tymon\JWTAuth\Providers\JWT\NamshiAdapter',
+        'jwt' => Tymon\JWTAuth\Providers\JWT\Namshi::class,
 
         /*
         |--------------------------------------------------------------------------
@@ -155,18 +249,18 @@ return [
         |
         */
 
-        'auth' => 'Tymon\JWTAuth\Providers\Auth\IlluminateAuthAdapter',
+        'auth' => Tymon\JWTAuth\Providers\Auth\Illuminate::class,
 
         /*
         |--------------------------------------------------------------------------
         | Storage Provider
         |--------------------------------------------------------------------------
         |
-        | Specify the provider that is used to store tokens in the blacklist
+        | Specify the provider that is used to store tokens in the blacklist.
         |
         */
 
-        'storage' => 'Tymon\JWTAuth\Providers\Storage\IlluminateCacheAdapter',
+        'storage' => Tymon\JWTAuth\Providers\Storage\Illuminate::class,
 
     ],
 

config/lfm.php

+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Routing
+    |--------------------------------------------------------------------------
+    */
+
+    // Include to pre-defined routes from package or not. Middlewares
+    'use_package_routes' => true,
+
+    // Middlewares which should be applied to all package routes.
+    // For laravel 5.1 and before, remove 'web' from the array.
+    'middlewares' => ['web', 'auth'],
+
+    // The url to this package. Change it if necessary.
+    'url_prefix' => 'laravel-filemanager',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Multi-User Mode
+    |--------------------------------------------------------------------------
+    */
+
+    // If true, private folders will be created for each signed-in user.
+    'allow_multi_user' => true,
+    // If true, share folder will be created when allow_multi_user is true.
+    'allow_share_folder' => true,
+
+    // Flexible way to customize client folders accessibility
+    // If you want to customize client folders, publish tag="lfm_handler"
+    // Then you can rewrite userField function in App\Handler\ConfigHander class
+    // And set 'user_field' to App\Handler\ConfigHander::class
+    // Ex: The private folder of user will be named as the user id.
+    'user_field' => Unisharp\Laravelfilemanager\Handlers\ConfigHandler::class,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Working Directory
+    |--------------------------------------------------------------------------
+    */
+
+    // Which folder to store files in project, fill in 'public', 'resources', 'storage' and so on.
+    // You should create routes to serve images if it is not set to public.
+    'base_directory' => 'public',
+
+    'images_folder_name' => 'photos',
+    'files_folder_name'  => 'files',
+
+    'shared_folder_name' => 'shares',
+    'thumb_folder_name'  => 'thumbs',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Startup Views
+    |--------------------------------------------------------------------------
+    */
+
+    // The default display type for items.
+    // Supported: "grid", "list"
+    'images_startup_view' => 'grid',
+    'files_startup_view'  => 'list',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Upload / Validation
+    |--------------------------------------------------------------------------
+    */
+
+    // If true, the uploaded file will be renamed to uniqid() + file extension.
+    'rename_file' => false,
+
+    // If rename_file set to false and this set to true, then non-alphanumeric characters in filename will be replaced.
+    'alphanumeric_filename' => false,
+
+    // If true, non-alphanumeric folder name will be rejected.
+    'alphanumeric_directory' => false,
+
+    // If true, the uploading file's size will be verified for over than max_image_size/max_file_size.
+    'should_validate_size' => false,
+
+    'max_image_size' => 50000,
+    'max_file_size'  => 50000,
+
+    // If true, the uploading file's mime type will be valid in valid_image_mimetypes/valid_file_mimetypes.
+    'should_validate_mime' => false,
+
+    // available since v1.3.0
+    'valid_image_mimetypes' => [
+        'image/jpeg',
+        'image/pjpeg',
+        'image/png',
+        'image/gif',
+        'image/svg+xml',
+    ],
+
+    // If true, image thumbnails would be created during upload
+    'should_create_thumbnails' => true,
+
+    // Create thumbnails automatically only for listed types.
+    'raster_mimetypes' => [
+        'image/jpeg',
+        'image/pjpeg',
+        'image/png',
+    ],
+
+    // permissions to be set when create a new folder or when it creates automatically with thumbnails
+    'create_folder_mode' => 0755,
+
+    // permissions to be set on file upload.
+    'create_file_mode' => 0644,
+
+    // available since v1.3.0
+    // only when '/laravel-filemanager?type=Files'
+    'valid_file_mimetypes' => [
+        'image/jpeg',
+        'image/pjpeg',
+        'image/png',
+        'image/gif',
+        'image/svg+xml',
+        'application/pdf',
+        'text/plain',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Image / Folder Setting
+    |--------------------------------------------------------------------------
+    */
+
+    'thumb_img_width'  => 200,
+    'thumb_img_height' => 200,
+
+    /*
+    |--------------------------------------------------------------------------
+    | File Extension Information
+    |--------------------------------------------------------------------------
+    */
+
+    'file_type_array' => [
+        'pdf'  => 'Adobe Acrobat',
+        'doc'  => 'Microsoft Word',
+        'docx' => 'Microsoft Word',
+        'xls'  => 'Microsoft Excel',
+        'xlsx' => 'Microsoft Excel',
+        'zip'  => 'Archive',
+        'gif'  => 'GIF Image',
+        'jpg'  => 'JPEG Image',
+        'jpeg' => 'JPEG Image',
+        'png'  => 'PNG Image',
+        'ppt'  => 'Microsoft PowerPoint',
+        'pptx' => 'Microsoft PowerPoint',
+    ],
+
+    'file_icon_array' => [
+        'pdf'  => 'fa-file-pdf-o',
+        'doc'  => 'fa-file-word-o',
+        'docx' => 'fa-file-word-o',
+        'xls'  => 'fa-file-excel-o',
+        'xlsx' => 'fa-file-excel-o',
+        'zip'  => 'fa-file-archive-o',
+        'gif'  => 'fa-file-image-o',
+        'jpg'  => 'fa-file-image-o',
+        'jpeg' => 'fa-file-image-o',
+        'png'  => 'fa-file-image-o',
+        'ppt'  => 'fa-file-powerpoint-o',
+        'pptx' => 'fa-file-powerpoint-o',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | php.ini override
+    |--------------------------------------------------------------------------
+    |
+    | These values override your php.ini settings before uploading files
+    | Set these to false to ingnore and apply your php.ini settings
+    |
+    | Please note that the 'upload_max_filesize' & 'post_max_size'
+    | directives are not supported.
+    */
+    'php_ini_overrides' => [
+        'memory_limit'        => '256M',
+    ],
+
+];

config/module.php

+<?php
+
+return [
+    'pages' => [
+        'table' => 'pages',
+    ],
+    'email_templates'=> [
+        'table'              => 'email_templates',
+        'placeholders_table' => 'email_template_placeholders',
+        'types_table'        => 'email_template_types',
+    ],
+];

database/seeds/EmailTemplatePlaceholderTableSeeder.php

@@ -14,7 +14,7 @@ class EmailTemplatePlaceholderTableSeeder extends Seeder
     public function run()
     {
         if (env('DB_CONNECTION') == 'mysql') {
-            DB::table(config('access.email_template_placeholders_table'))->truncate();
+            DB::table(config('module.email_templates.placeholders_table'))->truncate();
         }
 
         $data = [
@@ -75,6 +75,6 @@ class EmailTemplatePlaceholderTableSeeder extends Seeder
             ],
         ];
 
-        DB::table(config('access.email_template_placeholders_table'))->insert($data);
+        DB::table(config('module.email_templates.placeholders_table'))->insert($data);
     }
 }

database/seeds/EmailTemplateTableSeeder.php

@@ -14,7 +14,7 @@ class EmailTemplateTableSeeder extends Seeder
     public function run()
     {
         if (env('DB_CONNECTION') == 'mysql') {
-            DB::table(config('access.email_templates_table'))->truncate();
+            DB::table(config('module.email_templates.table'))->truncate();
         }
 
         $data = [
@@ -285,6 +285,6 @@ class EmailTemplateTableSeeder extends Seeder
             ],
         ];
 
-        DB::table(config('access.email_templates_table'))->insert($data);
+        DB::table(config('module.email_templates.table'))->insert($data);
     }
 }

database/seeds/EmailTemplateTypeTableSeeder.php

@@ -14,7 +14,7 @@ class EmailTemplateTypeTableSeeder extends Seeder
     public function run()
     {
         if (env('DB_CONNECTION') == 'mysql') {
-            DB::table(config('access.email_template_types_table'))->truncate();
+            DB::table(config('module.email_templates.types_table'))->truncate();
         }
 
         $data = [
@@ -43,6 +43,6 @@ class EmailTemplateTypeTableSeeder extends Seeder
             ],
         ];
 
-        DB::table(config('access.email_template_types_table'))->insert($data);
+        DB::table(config('module.email_templates.types_table'))->insert($data);
     }
 }

database/seeds/PagesTableSeeder.php

@@ -18,7 +18,7 @@ class PagesTableSeeder extends Seeder
     public function run()
     {
         $this->disableForeignKeys();
-        $this->truncate(config('access.pages_table'));
+        $this->truncate(config('module.pages.table'));
 
         $page = [
             [
@@ -32,7 +32,7 @@ class PagesTableSeeder extends Seeder
             ],
         ];
 
-        DB::table(config('access.pages_table'))->insert($page);
+        DB::table(config('module.pages.table'))->insert($page);
 
         $this->enableForeignKeys();
     }

public/mix-manifest.json

 {
-  "/js/frontend.js": "/js/frontend.70ee44a92d84e7318a9d.js",
-  "/js/backend.js": "/js/backend.9cdae6ab449e701ce881.js",
+  "/js/frontend.js": "/js/frontend.d3a9d9963b6da237bfe8.js",
+  "/js/backend.js": "/js/backend.51a14fd841ccd198e500.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.50f14193ab908e3cf471dea6cb6616ae.css",
-  "/js/backend-custom.js": "/js/backend-custom.694670b0d97bf54111bac3bd91ba3fcf.js",
+  "/js/backend-custom.js": "/js/backend-custom.69e7d487a5a38a38520a62a5c53584f9.js",
   "/js/dataTable.js": "/js/dataTable.f968d300a6a0b871f138f114361259c8.js"
 }
\ No newline at end of file

resources/lang/en/api.php

+<?php
+
+return [
+
+    'messages' => [
+        'registeration' => [
+            'success' => 'You have registered successfully. Please check your email for activation!',
+        ],
+        'login' => [
+            'success' => 'Login Successfull.',
+            'failed'  => 'Invalid Credentials! Please try again.',
+        ],
+        'logout' => [
+            'success' => 'Successfully logged out.',
+        ],
+        'forgot_password' => [
+            'success'    => 'We have sent email with reset password link. Please check your inbox!.',
+            'validation' => [
+                'email_not_found' => 'This email address is not registered.',
+            ],
+        ],
+        'refresh' => [
+            'token' => [
+                'not_provided' => 'Token not provided.',
+            ],
+            'status' => 'Ok',
+        ],
+    ],
+
+];

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

@@ -92,11 +92,11 @@
                     type: 'post'
                 },
                 columns: [
-                    {data: 'title', name: '{{config('access.email_templates_table')}}.title'},
-                    {data: 'subject', name: '{{config('access.email_templates_table')}}.subject'},
-                    {data: 'status', name: '{{config('access.email_templates_table')}}.status'},
-                    {data: 'created_at', name: '{{config('access.email_templates_table')}}.created_at'},
-                    {data: 'updated_at', name: '{{config('access.email_templates_table')}}.updated_at'},
+                    {data: 'title', name: '{{config('module.email_templates.table')}}.title'},
+                    {data: 'subject', name: '{{config('module.email_templates.table')}}.subject'},
+                    {data: 'status', name: '{{config('module.email_templates.table')}}.status'},
+                    {data: 'created_at', name: '{{config('module.email_templates.table')}}.created_at'},
+                    {data: 'updated_at', name: '{{config('module.email_templates.table')}}.updated_at'},
                     {data: 'actions', name: 'actions', searchable: false, sortable: false}
                 ],
                 order: [[3, "asc"]],

resources/views/backend/includes/footer.blade.php

@@ -2,7 +2,7 @@
 <footer class="main-footer">
     <!-- To the right -->
     <div class="pull-right hidden-xs">
-        <a href="http://laravel-boilerplate.com" target="_blank">{{ trans('strings.backend.general.boilerplate_link') }}</a>
+        <a href="http://laravel-admin.com" target="_blank">{{ trans('strings.backend.general.boilerplate_link') }}</a>
     </div>
     <!-- Default to the left -->
     <strong>Copyright &copy; {{ date('Y') }} <a href="#">{{ app_name() }}</a>.</strong> {{ trans('strings.backend.general.all_rights_reserved') }}

resources/views/backend/layouts/app.blade.php

@@ -11,8 +11,8 @@
         <!-- Meta -->
         <meta name="description" content="@yield('meta_description', 'Default Description')">
         <meta name="author" content="@yield('meta_author', 'Viral Solani')">
-        <!--Lato Fonts Included-->
-        <link href="https://fonts.googleapis.com/css?family=Lato:300,300i,400,400i,700,700i,900,900i" rel="stylesheet">
+       {{--  <!--Lato Fonts Included-->
+        <link href="https://fonts.googleapis.com/css?family=Lato:300,300i,400,400i,700,700i,900,900i" rel="stylesheet"> --}}
         @yield('meta')
 
         <!-- Styles -->
@@ -55,7 +55,7 @@
                 <section class="content-header">
                     @yield('page-header')
                     <!-- Breadcrumbs would render from routes/breadcrumb.php -->
-                    {!! Breadcrumbs::render() !!}
+
                 </section>
 
                 <!-- Main content -->

resources/views/backend/pages/edit.blade.php

@@ -10,7 +10,7 @@
 @endsection
 
 @section('content')
-    {{ Form::model($cmspage, ['route' => ['admin.pages.update', $cmspage], 'class' => 'form-horizontal', 'role' => 'form', 'method' => 'PATCH', 'id' => 'edit-role']) }}
+    {{ Form::model($page, ['route' => ['admin.pages.update', $page], 'class' => 'form-horizontal', 'role' => 'form', 'method' => 'PATCH', 'id' => 'edit-role']) }}
 
         <div class="box box-success">
             <div class="box-header with-border">
@@ -76,7 +76,7 @@
                     <div class="col-lg-10">
                         <div class="control-group">
                             <label class="control control--checkbox">
-                                {{ Form::checkbox('status', 1, ($cmspage->status == 1) ? true : false ) }}
+                                {{ Form::checkbox('status', 1, ($page->status == 1) ? true : false ) }}
                                 <div class="control__indicator"></div>
                             </label>
                         </div>

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

@@ -74,10 +74,10 @@
                     type: 'post'
                 },
                 columns: [
-                    {data: 'title', name: '{{config('access.pages_table')}}.title'},
-                    {data: 'status', name: '{{config('access.pages_table')}}.status'},
-                    {data: 'created_at', name: '{{config('access.pages_table')}}.created_at'},
-                    {data: 'updated_at', name: '{{config('access.pages_table')}}.updated_at'},
+                    {data: 'title', name: '{{config('module.pages.table')}}.title'},
+                    {data: 'status', name: '{{config('module.pages.table')}}.status'},
+                    {data: 'created_at', name: '{{config('module.pages.table')}}.created_at'},
+                    {data: 'updated_at', name: '{{config('module.pages.table')}}.updated_at'},
                     {data: 'actions', name: 'actions', searchable: false, sortable: false}
                 ],
                 order: [[3, "asc"]],

routes/Backend/Dashboard.php

@@ -20,17 +20,6 @@ Route::any('generateSlug', function (\Illuminate\Http\Request $request) {
     return str_slug($request['text']);
 })->name('generate.slug');
 
-/*
- * Email Templates Management
- */
-Route::group(['namespace' => 'EmailTemplates'], function () {
-    Route::resource('emailtemplates', 'EmailTemplatesController', ['except' => ['show', 'create', 'save']]);
-
-    //For DataTables
-    Route::post('emailtemplates/get', 'EmailTemplatesTableController')
-        ->name('emailtemplates.get');
-});
-
 /*
  * Settings Management
  */

routes/Backend/EmailTemplates.php

+<?php
+
+/*
+ * Email Templates Management
+ */
+Route::group(['namespace' => 'EmailTemplates'], function () {
+    Route::resource('emailtemplates', 'EmailTemplatesController', ['except' => ['show', 'create', 'save']]);
+
+    //For DataTables
+    Route::post('emailtemplates/get', 'EmailTemplatesTableController')
+        ->name('emailtemplates.get');
+});

routes/api.php

@@ -14,13 +14,21 @@
 
 Route::group(['namespace' => 'Api\V1', 'prefix' => 'v1', 'as' => 'v1.'], function () {
     Route::group(['prefix' => 'auth'], function () {
-        Route::post('/login', 'AuthController@authenticate');
-        Route::post('/logout', 'AuthController@logout');
-        Route::post('/check', 'AuthController@check');
-        Route::post('/register', 'AuthController@register');
-        Route::get('/activate/{token}', 'AuthController@activate');
-        Route::post('/password', 'AuthController@password');
-        Route::post('/validate-password-reset', 'AuthController@validatePasswordReset');
-        Route::post('/reset', 'AuthController@reset');
+        Route::post('register', 'RegisterController@register');
+        Route::post('login', 'AuthController@login');
+    });
+
+    Route::group(['middleware' => ['jwt.auth']], function () {
+        Route::group(['prefix' => 'auth'], function () {
+            Route::post('logout', 'AuthController@logout');
+            Route::post('refresh', 'AuthController@refresh');
+
+            // Password Reset Routes
+            Route::post('password/email', 'ForgotPasswordController@sendResetLinkEmail');
+            Route::post('password/reset', 'ResetPasswordController@reset')->name('password.reset');
+        });
+
+        // Users
+        Route::resource('users', 'UsersController');
     });
 });

tests/BrowserKitTestCase.php

@@ -23,7 +23,9 @@ abstract class BrowserKitTestCase extends BaseTestCase
      *
      * @var string
      */
-    protected $baseUrl = 'http://l5boilerplate.dev';
+    protected $baseUrl = '     */
+     */
+http://laraveladminpanel.dev';
 
     /**
      * @var
@@ -62,7 +64,9 @@ abstract class BrowserKitTestCase extends BaseTestCase
     {
         parent::setUp();
 
-        $this->baseUrl = config('app.url', 'http://l5boilerplate.dev');
+        $this->baseUrl = config('app.url', '     */
+     */
+http://laraveladminpanel.dev');
 
         // Set up the database
         Artisan::call('migrate:refresh');

tests/TestCase.php

@@ -19,7 +19,9 @@ abstract class TestCase extends Illuminate\Foundation\Testing\TestCase
      *
      * @var string
      */
-    protected $baseUrl = 'http://l5boilerplate.dev';
+    protected $baseUrl = '     */
+     */
+http://laraveladminpanel.dev';
 
     /**
      * @var