merge master

.babelrc

@@ -0,0 +1,3 @@
+{
+    "plugins": ["syntax-dynamic-import"]
+  }

.eslintrc

@@ -0,0 +1,15 @@
+{
+    "root": true,
+    "parserOptions": {
+      "parser": "babel-eslint",
+      "ecmaVersion": 2017,
+      "sourceType": "module"
+    },
+    "extends": [
+      "plugin:vue/recommended",
+      "@vue/standard"
+    ],
+    "rules": {
+      "vue/max-attributes-per-line": "off"
+    }
+  }

.gitignore

@@ -1,11 +1,14 @@
 /node_modules
 /public/hot
 /public/storage
+/public/js
+/public/css
 /storage/*.key
 /vendor
 /.idea
 /.vscode
 /.vagrant
+/data
 Homestead.json
 Homestead.yaml
 npm-debug.log

CHANGELOG.md

@@ -0,0 +1,59 @@
+# Changelog
+
+## 4.1.0 - 2018-03-14
+
+- Upgrade to Laravel 5.6
+- Update npm dependencies
+- Enabled Mix [esModule](https://github.com/JeffreyWay/laravel-mix/pull/1526#issuecomment-373044182) by default
+- Lint with eslint-plugin-vue and eslint-config-standard 
+
+## 4.0.0 - 2018-01-23
+
+- Brought back the `layout` property in pages that was removed in 3.0. By default it's set to `default` (`~/layouts/default.vue`).
+
+## 3.0.1 - 2018-01-22
+
+- Removed middleware from routes, since they don't work when you press the back button. Now you have to use the `middleware` property in pages.
+
+## 3.0.0 - 2018-01-22
+
+- Removed `layout` property from pages in favor of explicit layout components
+- Improved middleware system, you can either define it on a route or directly on a component
+- Reorganized components
+- Change jwt token ttl to one day
+- Fixed  hot module replacement
+
+## 2.2.1 - 2018-01-19
+
+- Upgrade to Bootstrap 4
+
+## 2.2.0 - 2018-01-16
+
+- Added dynamic import for pages
+- Added locale with dynamic import
+- Import shakable fontawesome module
+
+## 2.1.0 - 2018-01-10
+
+- Simplifyd password reset
+- Upgrade to Bootstrap 4 beta3
+- Added oauth with popup window
+
+## 2.0.0 - 2017-12-19
+
+- Added support for Socialite
+- Added dropdown to select the locale 
+- Added route middleware 
+- Added Font Awesome 5 icons
+- Added user profile photo in navbar
+- Added Chinese and Spanish translations
+- Upgrade to Bootstrap 4 beta2
+- Fixed router scroll behaviour
+- Namespaced store modules  
+- Published project to Packagist 
+
+## 1.0.0 - 2017-09-02
+
+- Upgrade to Laravel 5.5.
+- Upgrade to Bootstrap 4 beta1.
+- Rework routing and guards.

Dockerfile

@@ -1,9 +1,13 @@
 FROM php:7
-RUN apt-get update -y && apt-get install -y openssl zip unzip git
+RUN apt-get update -y && apt-get install -y openssl zip unzip git zlib1g-dev
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-RUN docker-php-ext-install pdo pdo_mysql
+RUN docker-php-ext-install pdo pdo_mysql zip
 WORKDIR /app
 COPY . /app
 RUN composer install
-CMD php artisan serve --host=0.0.0.0 --port=8000
+
-EXPOSE 8000
+COPY wait.sh /usr/local/bin/wait.sh
+RUN chmod +x /usr/local/bin/wait.sh
+
+CMD /usr/local/bin/wait.sh && php artisan serve --host=0.0.0.0 --port=8000
+EXPOSE 8000

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Cretu Eusebiu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

app/Booking.php

@@ -7,5 +7,6 @@ use Illuminate\Database\Eloquent\Model;
 class Booking extends Model
 {
     // protected $guarded = [];
+    // TODO : add term, amount, rate_id (FK), user_id (FK)
     protected $fillable = ['account_name', 'account_num', 'bank_name', 'bank_branch', 'company_name', 'company_address', 'bank_address', 'swift_code', 'cnap' ];
 }

app/ChinaBankSlip.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ChinaBankSlip extends Model
+{
+    protected $fillable = ['actual_transfer_amount','date','details','china_bank_slips'];
+}

app/Exceptions/EmailTakenException.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class EmailTakenException extends Exception
+{
+    /**
+     * Render the exception as an HTTP response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function render($request)
+    {
+        return response()->view('oauth.emailTaken', [], 400);
+    }
+}

app/Exceptions/Handler.php

@@ -48,6 +48,14 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Exception $exception)
     {
+        // This will replace our 404 response with
+        // a JSON response.
+        if ($exception instanceof ModelNotFoundException) {
+            return response()->json([
+                'error' => 'Resource not found'
+            ], 404);
+        }
+
         return parent::render($request, $exception);
     }
 }

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -2,22 +2,12 @@
 
 namespace App\Http\Controllers\Auth;
 
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 
 class ForgotPasswordController extends Controller
 {
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset emails and
-    | includes a trait which assists in sending these notifications from
-    | your application to your users. Feel free to explore this trait.
-    |
-    */
-
     use SendsPasswordResetEmails;
 
     /**
@@ -29,4 +19,27 @@ class ForgotPasswordController extends Controller
     {
         $this->middleware('guest');
     }
+
+    /**
+     * Get the response for a successful password reset link.
+     *
+     * @param  string  $response
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    protected function sendResetLinkResponse($response)
+    {
+        return ['status' => trans($response)];
+    }
+
+    /**
+     * Get the response for a failed password reset link.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  string  $response
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    protected function sendResetLinkFailedResponse(Request $request, $response)
+    {
+        return response()->json(['email' => trans($response)], 400);
+    }
 }

app/Http/Controllers/Auth/LoginController.php

@@ -2,31 +2,14 @@
 
 namespace App\Http\Controllers\Auth;
 
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 class LoginController extends Controller
 {
-    /*
-    |--------------------------------------------------------------------------
-    | Login Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles authenticating users for the application and
-    | redirecting them to your home screen. The controller uses a trait
-    | to conveniently provide its functionality to your applications.
-    |
-    */
-
     use AuthenticatesUsers;
 
-    /**
-     * Where to redirect users after login.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/home';
-
     /**
      * Create a new controller instance.
      *
@@ -36,4 +19,54 @@ class LoginController extends Controller
     {
         $this->middleware('guest')->except('logout');
     }
+
+    /**
+     * Attempt to log the user into the application.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return bool
+     */
+    protected function attemptLogin(Request $request)
+    {
+        $token = $this->guard()->attempt($this->credentials($request));
+
+        if ($token) {
+            $this->guard()->setToken($token);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Send the response after the user was authenticated.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    protected function sendLoginResponse(Request $request)
+    {
+        $this->clearLoginAttempts($request);
+
+        $token = (string) $this->guard()->getToken();
+        $expiration = $this->guard()->getPayload()->get('exp');
+
+        return [
+            'token' => $token,
+            'token_type' => 'bearer',
+            'expires_in' => $expiration - time(),
+        ];
+    }
+
+    /**
+     * Log the user out of the application.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function logout(Request $request)
+    {
+        $this->guard()->logout();
+    }
 }

app/Http/Controllers/Auth/OAuthController.php

@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\User;
+use App\OAuthProvider;
+use App\Http\Controllers\Controller;
+use App\Exceptions\EmailTakenException;
+use Laravel\Socialite\Facades\Socialite;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
+
+class OAuthController extends Controller
+{
+    use AuthenticatesUsers;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        config([
+            'services.github.redirect' => route('oauth.callback', 'github'),
+        ]);
+    }
+
+    /**
+     * Redirect the user to the provider authentication page.
+     *
+     * @param  string $provider
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function redirectToProvider($provider)
+    {
+        return [
+            'url' => Socialite::driver($provider)->stateless()->redirect()->getTargetUrl(),
+        ];
+    }
+
+    /**
+     * Obtain the user information from the provider.
+     *
+     * @param  string $driver
+     * @return \Illuminate\Http\Response
+     */
+    public function handleProviderCallback($provider)
+    {
+        $user = Socialite::driver($provider)->stateless()->user();
+        $user = $this->findOrCreateUser($provider, $user);
+
+        $this->guard()->setToken(
+            $token = $this->guard()->login($user)
+        );
+
+        return view('oauth/callback', [
+            'token' => $token,
+            'token_type' => 'bearer',
+            'expires_in' => $this->guard()->getPayload()->get('exp') - time(),
+        ]);
+    }
+
+    /**
+     * @param  string $provider
+     * @param  \Laravel\Socialite\Contracts\User $sUser
+     * @return \App\User|false
+     */
+    protected function findOrCreateUser($provider, $user)
+    {
+        $oauthProvider = OAuthProvider::where('provider', $provider)
+            ->where('provider_user_id', $user->getId())
+            ->first();
+
+        if ($oauthProvider) {
+            $oauthProvider->update([
+                'access_token' => $user->token,
+                'refresh_token' => $user->refreshToken,
+            ]);
+
+            return $oauthProvider->user;
+        }
+
+        if (User::where('email', $user->getEmail())->exists()) {
+            throw new EmailTakenException;
+        }
+
+        return $this->createUser($provider, $user);
+    }
+
+    /**
+     * @param  string $provider
+     * @param  \Laravel\Socialite\Contracts\User $sUser
+     * @return \App\User
+     */
+    protected function createUser($provider, $sUser)
+    {
+        $user = User::create([
+            'name' => $sUser->getName(),
+            'email' => $sUser->getEmail(),
+        ]);
+
+        $user->oauthProviders()->create([
+            'provider' => $provider,
+            'provider_user_id' => $sUser->getId(),
+            'access_token' => $sUser->token,
+            'refresh_token' => $sUser->refreshToken,
+        ]);
+
+        return $user;
+    }
+}

app/Http/Controllers/Auth/RegisterController.php

@@ -3,33 +3,16 @@
 namespace App\Http\Controllers\Auth;
 
 use App\User;
+use App\Role;
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
 
 class RegisterController extends Controller
 {
-    /*
-    |--------------------------------------------------------------------------
-    | Register Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles the registration of new users as well as their
-    | validation and creation. By default this controller uses a trait to
-    | provide this functionality without requiring any additional code.
-    |
-    */
-
     use RegistersUsers;
 
-    /**
-     * Where to redirect users after registration.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/home';
-
     /**
      * Create a new controller instance.
      *
@@ -40,6 +23,18 @@ class RegisterController extends Controller
         $this->middleware('guest');
     }
 
+    /**
+     * The user has been registered.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  mixed  $user
+     * @return mixed
+     */
+    protected function registered(Request $request, $user)
+    {
+        return $user;
+    }
+
     /**
      * Get a validator for an incoming registration request.
      *
@@ -49,9 +44,9 @@ class RegisterController extends Controller
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'name' => 'required|string|max:255',
+            'name' => 'required|max:255',
-            'email' => 'required|string|email|max:255|unique:users',
+            'email' => 'required|email|max:255|unique:users',
-            'password' => 'required|string|min:6|confirmed',
+            'password' => 'required|min:6|confirmed',
         ]);
     }
 
@@ -59,14 +54,19 @@ class RegisterController extends Controller
      * Create a new user instance after a valid registration.
      *
      * @param  array  $data
-     * @return \App\User
+     * @return User
      */
     protected function create(array $data)
     {
-        return User::create([
+        $role = Role::where('name','=','member')->first();
-            'name' => $data['name'],
+        $user = new User();
-            'email' => $data['email'],
+        $user->name = $data['name'];
-            'password' => Hash::make($data['password']),
+        $user->email = $data['email'];
-        ]);
+        $user->password = bcrypt($data['password']);
+        $user->save();
+        $user->attachRole($role);
+
+        return $user;
+    
     }
 }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -2,31 +2,14 @@
 
 namespace App\Http\Controllers\Auth;
 
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
 class ResetPasswordController extends Controller
 {
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset requests
-    | and uses a simple trait to include this behavior. You're free to
-    | explore this trait and override any methods you wish to tweak.
-    |
-    */
-
     use ResetsPasswords;
 
-    /**
-     * Where to redirect users after resetting their password.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/home';
-
     /**
      * Create a new controller instance.
      *
@@ -36,4 +19,27 @@ class ResetPasswordController extends Controller
     {
         $this->middleware('guest');
     }
+
+    /**
+     * Get the response for a successful password reset.
+     *
+     * @param  string  $response
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    protected function sendResetResponse($response)
+    {
+        return ['status' => trans($response)];
+    }
+
+    /**
+     * Get the response for a failed password reset.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  string  $response
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    protected function sendResetFailedResponse(Request $request, $response)
+    {
+        return response()->json(['email' => trans($response)], 400);
+    }
 }

app/Http/Controllers/AuthController.php

@@ -1,154 +0,0 @@
-<?php
-namespace App\Http\Controllers;
-use Illuminate\Http\Request;
-use App\User;
-use JWTAuth;
-use Tymon\JWTAuth\Exceptions\JWTException;
-use Validator, DB, Hash, Mail, Illuminate\Support\Facades\Password;
-
-class AuthController extends Controller
-{
-    /**
-     * API Register
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function register(Request $request)
-    {
-        $credentials = $request->only('name', 'email', 'password');
-        
-        $rules = [
-            'name' => 'required|max:255',
-            'email' => 'required|email|max:255|unique:users'
-        ];
-        $validator = Validator::make($credentials, $rules);
-        if($validator->fails()) {
-            return response()->json(['success'=> false, 'error'=> $validator->messages()]);
-        }
-        $name = $request->name;
-        $email = $request->email;
-        $password = $request->password;
-        
-        $user = User::create(['name' => $name, 'email' => $email, 'password' => Hash::make($password)]);
-        $verification_code = str_random(30); //Generate verification code
-        DB::table('user_verifications')->insert(['user_id'=>$user->id,'token'=>$verification_code]);
-        $subject = "Please verify your email address.";
-       /* Mail::send('email.verify', ['name' => $name, 'verification_code' => $verification_code],
-            function($mail) use ($email, $name, $subject){
-                $mail->from(getenv('FROM_EMAIL_ADDRESS'), "From User/Company Name Goes Here");
-                $mail->to($email, $name);
-                $mail->subject($subject);
-            });
-            */
-        return response()->json(['success'=> true, 'message'=> 'Thanks for signing up! Please check your email to complete your registration.']);
-    }
-
-    /**
-     * API Login, on success return JWT Auth token
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function login(Request $request)
-    {
-        $credentials = $request->only('email', 'password');
-        
-        $rules = [
-            'email' => 'required|email',
-            'password' => 'required',
-        ];
-        $validator = Validator::make($credentials, $rules);
-        if($validator->fails()) {
-            return response()->json(['success'=> false, 'error'=> $validator->messages()]);
-        }
-        
-        $credentials['is_verified'] = 1;
-        
-        try {
-            // attempt to verify the credentials and create a token for the user
-            if (! $token = JWTAuth::attempt($credentials)) {
-                return response()->json(['success' => false, 'error' => 'We cant find an account with this credentials. Please make sure you entered the right information and you have verified your email address.'], 401);
-            }
-        } catch (JWTException $e) {
-            // something went wrong whilst attempting to encode the token
-            return response()->json(['success' => false, 'error' => 'Failed to login, please try again.'], 500);
-        }
-        // all good so return the token
-        return response()->json(['success' => true, 'data'=> [ 'token' => $token ]]);
-    }
-
-    /**
-     * Log out
-     * Invalidate the token, so user cannot use it anymore
-     * They have to relogin to get a new token
-     *
-     * @param Request $request
-     */
-    public function logout(Request $request) {
-        $this->validate($request, ['token' => 'required']);
-        
-        try {
-            JWTAuth::invalidate($request->input('token'));
-            return response()->json(['success' => true, 'message'=> "You have successfully logged out."]);
-        } catch (JWTException $e) {
-            // something went wrong whilst attempting to encode the token
-            return response()->json(['success' => false, 'error' => 'Failed to logout, please try again.'], 500);
-        }
-    }
-
-     /**
-     * API Recover Password
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function recover(Request $request)
-    {
-        $user = User::where('email', $request->email)->first();
-        if (!$user) {
-            $error_message = "Your email address was not found.";
-            return response()->json(['success' => false, 'error' => ['email'=> $error_message]], 401);
-        }
-        try {
-            Password::sendResetLink($request->only('email'), function (Message $message) {
-                $message->subject('Your Password Reset Link');
-            });
-        } catch (\Exception $e) {
-            //Return with error
-            $error_message = $e->getMessage();
-            return response()->json(['success' => false, 'error' => $error_message], 401);
-        }
-        return response()->json([
-            'success' => true, 'data'=> ['message'=> 'A reset email has been sent! Please check your email.']
-        ]);
-    }
-
-    /**
-     * API Verify User
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function verifyUser($verification_code)
-    {
-        $check = DB::table('user_verifications')->where('token',$verification_code)->first();
-        if(!is_null($check)){
-            $user = User::find($check->user_id);
-            if($user->is_verified == 1){
-                return response()->json([
-                    'success'=> true,
-                    'message'=> 'Account already verified..'
-                ]);
-            }
-            $user->update(['is_verified' => 1]);
-            DB::table('user_verifications')->where('token',$verification_code)->delete();
-            return response()->json([
-                'success'=> true,
-                'message'=> 'You have successfully verified your email address.'
-            ]);
-        }
-        return response()->json(['success'=> false, 'error'=> "Verification code is invalid."]);
-    }
-
-}

app/Http/Controllers/BookingController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use App\Booking;
+use App\Rate;
 
 class BookingController extends Controller
 {
@@ -35,8 +36,24 @@ class BookingController extends Controller
      */
     public function store(Request $request)
     {
-        $booking = Booking::create($request->all());
+        $rates = Rate::find(1);
-        return response()->json($booking, 201);
+        $term = $request->input('term');
+        $rate = 1;
+
+         switch($term){
+             case "x1_cash":
+                 $rate = $rates->x1_cash;
+                 break;
+            default:
+            $rate = "no";
+            break;
+         }
+       return $rate;
+       
+        
+        //$booking = Booking::create($request->all());
+        //return response()->json($booking, 201);
+       
     }
 
     /**

app/Http/Controllers/ChinaBankSlipController.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\ChinaBankSlip;
+use Illuminate\Http\Request;
+
+class ChinaBankSlipController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        // Handle File Upload
+        if($request->hasFile('china_bank_slips')){
+            // Get filename with the extension
+            $filenameWithExt = $request->file('china_bank_slips')->getClientOriginalName();
+            // Get just filename
+            $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME);
+            // Get just ext
+            $extension = $request->file('china_bank_slips')->getClientOriginalExtension();
+            // Filename to store
+            $fileNameToStore= $filename.'_'.time().'.'.$extension;
+            // Upload Image
+            $path = $request->file('china_bank_slips')->storeAs('public/bankslip', $fileNameToStore);
+        } else {
+            $fileNameToStore = 'hello.jpg';
+        }
+        // Create Post
+        $post = new ChinaBankSlip;
+        $post->actual_transfer_amount = $request->input('actual_transfer_amount');
+        $post->date = $request->input('date');
+        $post->details = $request->input('details');
+        $post->china_bank_slips = $fileNameToStore;
+        $post->save();;
+    }
+
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\ChinaBankSlip  $chinaBankSlip
+     * @return \Illuminate\Http\Response
+     */
+    public function show(ChinaBankSlip $chinaBankSlip)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\ChinaBankSlip  $chinaBankSlip
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(ChinaBankSlip $chinaBankSlip)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\ChinaBankSlip  $chinaBankSlip
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, ChinaBankSlip $chinaBankSlip)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\ChinaBankSlip  $chinaBankSlip
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(ChinaBankSlip $chinaBankSlip)
+    {
+        //
+    }
+}

app/Http/Controllers/RateController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Rate;
+use Illuminate\Http\Request;
+
+class RateController extends Controller
+{
+    public function index()
+    {
+        return Rate::all();
+    }
+
+    public function show(Rate $rate)
+    {
+        return $rate;
+    }
+
+    public function store(Request $request)
+    {
+        $rate = Rate::create($request->all());
+
+        return response()->json($rate, 201);
+    }
+
+    public function update(Request $request, Rate $rate)
+    {
+        $rate->update($request->all());
+
+        return response()->json($rate, 200);
+    }
+
+    public function delete(Rate $rate)
+    {
+        $rate->delete();
+
+        return response()->json(null, 204);
+    }
+}

app/Http/Controllers/SettingBeneficiaryController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\SettingBeneficiary;
+use Illuminate\Http\Request;
+
+class SettingBeneficiaryController extends Controller
+{
+    public function index()
+    {
+        return SettingBeneficiary::all();
+    }
+
+    public function show(SettingBeneficiary $beneficiary)
+    {
+        return $beneficiary;
+    }
+
+    public function store(Request $request)
+    {
+        $beneficiary = SettingBeneficiary::create($request->all());
+
+        return response()->json($beneficiary, 201);
+    }
+
+    public function update(Request $request, SettingBeneficiary $beneficiary)
+    {
+        $beneficiary->update($request->all());
+
+        return response()->json($beneficiary, 200);
+    }
+
+    public function delete(SettingBeneficiary $beneficiary)
+    {
+        $beneficiary->delete();
+
+        return response()->json(null, 204);
+    }
+}

app/Http/Controllers/SettingCreditController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\SettingCredit;
+use Illuminate\Http\Request;
+
+class SettingCreditController extends Controller
+{
+    public function index()
+    {
+        return SettingCredit::all();
+    }
+
+    public function show(SettingCredit $credit)
+    {
+        return $credit;
+    }
+
+    public function store(Request $request)
+    {
+        $credit = SettingCredit::create($request->all());
+
+        return response()->json($credit, 201);
+    }
+
+    public function update(Request $request, SettingCredit $credit)
+    {
+        $credit->update($request->all());
+
+        return response()->json($credit, 200);
+    }
+
+    public function delete(SettingCredit $credit)
+    {
+        $credit->delete();
+
+        return response()->json(null, 204);
+    }
+}

app/Http/Controllers/SettingSupplierController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\SettingSupplier;
+use Illuminate\Http\Request;
+
+class SettingSupplierController extends Controller
+{
+    public function index()
+    {
+        return SettingSupplier::all();
+    }
+
+    public function show(SettingSupplier $supplier)
+    {
+        return $supplier;
+    }
+
+    public function store(Request $request)
+    {
+        $supplier = SettingSupplier::create($request->all());
+
+        return response()->json($supplier, 201);
+    }
+
+    public function update(Request $request, SettingSupplier $supplier)
+    {
+        $supplier->update($request->all());
+
+        return response()->json($supplier, 200);
+    }
+
+    public function delete(SettingSupplier $supplier)
+    {
+        $supplier->delete();
+
+        return response()->json(null, 204);
+    }
+}

app/Http/Controllers/Settings/PasswordController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Controllers\Settings;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class PasswordController extends Controller
+{
+    /**
+     * Update the user's password.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request)
+    {
+        $this->validate($request, [
+            'password' => 'required|confirmed|min:6',
+        ]);
+
+        $request->user()->update([
+            'password' => bcrypt($request->password),
+        ]);
+    }
+}

app/Http/Controllers/Settings/ProfileController.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Controllers\Settings;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class ProfileController extends Controller
+{
+    /**
+     * Update the user's profile information.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request)
+    {
+        $user = $request->user();
+
+        $this->validate($request, [
+            'name' => 'required',
+            'email' => 'required|email|unique:users,email,'.$user->id,
+        ]);
+
+        return tap($user)->update($request->only('name', 'email'));
+    }
+}

app/Http/Kernel.php

@@ -18,7 +18,8 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class
+        \App\Http\Middleware\TrustProxies::class,
+        \App\Http\Middleware\SetLocale::class,
     ];
 
     /**
@@ -28,12 +29,12 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
+            // \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+            // \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
+            // \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+            // \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+            // \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
@@ -54,12 +55,11 @@ class Kernel extends HttpKernel
         'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'jwt.auth' => 'Tymon\JWTAuth\Middleware\GetUserFromToken',
+        'ability' => 'App\Http\Middleware\TokenEntrustAbility',
-        'jwt.refresh' => 'Tymon\JWTAuth\Middleware\RefreshToken',
+        'role' => \Zizaco\Entrust\Middleware\EntrustRole::class,
+        'permission' => \Zizaco\Entrust\Middleware\EntrustPermission::class,
     ];
 }

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/home');
+            return response()->json(['error' => 'Already authenticated.'], 400);
         }
 
         return $next($request);

app/Http/Middleware/SetLocale.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class SetLocale
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($locale = $this->parseLocale($request)) {
+            app()->setLocale($locale);
+        }
+
+        return $next($request);
+    }
+
+    /**
+     * @param  \Illuminate\Http\Request $request
+     * @return string|null
+     */
+    protected function parseLocale($request)
+    {
+        $locales = config('app.locales');
+
+        $locale = $request->server('HTTP_ACCEPT_LANGUAGE');
+        $locale = substr($locale, 0, strpos($locale, ',') ?: strlen($locale));
+
+        if (array_key_exists($locale, $locales)) {
+            return $locale;
+        }
+
+        if (array_key_exists($locale, $locales)) {
+            return $locale;
+        }
+
+        $locale = substr($locale, 0, 2);
+        if (array_key_exists($locale, $locales)) {
+            return $locale;
+        }
+    }
+}

app/Http/Middleware/TokenEntrustAbility.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Tymon\JWTAuth\Exceptions\JWTException;
+use Tymon\JWTAuth\Exceptions\TokenExpiredException;
+use Tymon\JWTAuth\Middleware\BaseMiddleware;
+
+class TokenEntrustAbility extends BaseMiddleware
+{
+       public function handle($request, Closure $next, $roles, $permissions, $validateAll = false)
+    {
+
+        if (! $token = $this->auth->setRequest($request)->getToken()) {
+            return $this->respond('tymon.jwt.absent', 'token_not_provided', 400);
+        }
+
+        try {
+            $user = $this->auth->authenticate($token);
+        } catch (TokenExpiredException $e) {
+            return $this->respond('tymon.jwt.expired', 'token_expired', $e->getStatusCode(), [$e]);
+        } catch (JWTException $e) {
+            return $this->respond('tymon.jwt.invalid', 'token_invalid', $e->getStatusCode(), [$e]);
+        }
+
+        if (! $user) {
+            return $this->respond('tymon.jwt.user_not_found', 'user_not_found', 404);
+        }
+
+       if (!$request->user()->ability(explode('|', $roles), explode('|', $permissions), array('validate_all' => $validateAll))) {
+            return $this->respond('tymon.jwt.invalid', 'token_invalid', 401, 'Unauthorized');
+        }
+
+        $this->events->fire('tymon.jwt.valid', $user);
+
+        return $next($request);
+    }
+}

app/Http/Middleware/TrustProxies.php

@@ -15,9 +15,9 @@ class TrustProxies extends Middleware
     protected $proxies;
 
     /**
-     * The headers that should be used to detect proxies.
+     * The current proxy header mappings.
      *
-     * @var string
+     * @var array
      */
     protected $headers = Request::HEADER_X_FORWARDED_ALL;
 }

app/Notifications/ResetPassword.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Notifications;
+
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Auth\Notifications\ResetPassword as Notification;
+
+class ResetPassword extends Notification
+{
+    /**
+     * Build the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+            ->line('You are receiving this email because we received a password reset request for your account.')
+            ->action('Reset Password', url(config('app.url').'/password/reset/'.$this->token).'?email='.urlencode($notifiable->email))
+            ->line('If you did not request a password reset, no further action is required.');
+    }
+}

app/OAuthProvider.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OAuthProvider extends Model
+{
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'oauth_providers';
+
+    /**
+     * The attributes that aren't mass assignable.
+     *
+     * @var array
+     */
+    protected $guarded = ['id'];
+
+    /**
+     * The attributes that should be hidden for arrays.
+     *
+     * @var array
+     */
+    protected $hidden = [
+        'access_token', 'refresh_token',
+    ];
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+}

app/Permission.php

@@ -0,0 +1,7 @@
+<?php namespace App;
+
+use Zizaco\Entrust\EntrustPermission;
+
+class Permission extends EntrustPermission
+{
+}

app/Providers/AppServiceProvider.php

@@ -2,8 +2,9 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
+use Laravel\Dusk\DuskServiceProvider;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\ServiceProvider;
 
 
 class AppServiceProvider extends ServiceProvider
@@ -14,7 +15,12 @@ class AppServiceProvider extends ServiceProvider
      * @return void
      */
     public function boot()
-    {
+    {   
+        /*
+        if ($this->app->runningUnitTests()) {
+            Schema::defaultStringLength(191);
+        }
+        */
         Schema::defaultStringLength(191);
     }
 
@@ -25,6 +31,8 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        //
+        if ($this->app->environment('local', 'testing')) {
+            $this->app->register(DuskServiceProvider::class);
+        }
     }
 }

app/Providers/AuthServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
 class AuthServiceProvider extends ServiceProvider

app/Rate.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Rate extends Model
+{
+    protected $fillable = ['x1_cash','x1_cheque','x1_ba','x2_cash','x2_cheque','x2_ba'];
+}

app/Role.php

@@ -0,0 +1,7 @@
+<?php namespace App;
+
+use Zizaco\Entrust\EntrustRole;
+
+class Role extends EntrustRole
+{
+}

app/SettingBeneficiary.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SettingBeneficiary extends Model
+{
+    protected $fillable = ['company_name','bank_name','acc_no','bank_address','swift','cnap','bank_branch'];
+}

app/SettingCredit.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SettingCredit extends Model
+{
+    protected $fillable = ['rmb_credit_limit','usd_credit_limit'];
+}

app/SettingSupplier.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SettingSupplier extends Model
+{
+    protected $fillable = ['company_name','gst_no','supplier_reg_no','bank_name','acc_no'];
+}

app/User.php

@@ -5,10 +5,14 @@ namespace App;
 use Tymon\JWTAuth\Contracts\JWTSubject;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use App\Notifications\ResetPassword as ResetPasswordNotification;
+use Zizaco\Entrust\Traits\EntrustUserTrait;
+
 
 class User extends Authenticatable implements JWTSubject
 {
     use Notifiable;
+    use EntrustUserTrait; 
 
     /**
      * The attributes that are mass assignable.
@@ -16,7 +20,7 @@ class User extends Authenticatable implements JWTSubject
      * @var array
      */
     protected $fillable = [
-       'name', 'email', 'password',
+        'name', 'email', 'password',
     ];
 
     /**
@@ -29,17 +33,64 @@ class User extends Authenticatable implements JWTSubject
     ];
 
     /**
-     * Get the identifier that will be stored in the subject claim of the JWT.
+     * The accessors to append to the model's array form.
      *
-     * @return mixed
+     * @var array
+     */
+    protected $appends = [
+        'photo_url', 'role'
+    ];
+
+    /**
+     * Get the profile photo URL attribute.
+     *
+     * @return string
+     */
+    public function getPhotoUrlAttribute()
+    {
+        return 'https://www.gravatar.com/avatar/'.md5(strtolower($this->email)).'.jpg?s=200&d=mm';
+    }
+
+    /**
+     * Get the role attribute.
+     *
+     * @return string
+     */
+    public function getRoleAttribute()
+    {
+        return $this->roles->first()->name;
+    }
+
+    /**
+     * Get the oauth providers.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function oauthProviders()
+    {
+        return $this->hasMany(OAuthProvider::class);
+    }
+
+    /**
+     * Send the password reset notification.
+     *
+     * @param  string  $token
+     * @return void
+     */
+    public function sendPasswordResetNotification($token)
+    {
+        $this->notify(new ResetPasswordNotification($token));
+    }
+
+    /**
+     * @return int
      */
     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()

composer.json

@@ -1,19 +1,24 @@
 {
-    "name": "laravel/laravel",
+    "name": "cretueusebiu/laravel-vue-spa",
-    "description": "The Laravel Framework.",
+    "description": "A Laravel-Vue SPA starter project template.",
-    "keywords": ["framework", "laravel"],
+    "keywords": ["spa", "laravel", "vue"],
     "license": "MIT",
     "type": "project",
     "require": {
         "php": "^7.1.3",
         "fideloper/proxy": "^4.0",
+        "intervention/image": "^2.4",
         "laravel/framework": "5.6.*",
-        "laravel/tinker": "^1.0",
+        "laravel/socialite": "^3.0",
-        "tymon/jwt-auth": "dev-develop"
+        "laravel/tinker": "~1.0",
+        "tymon/jwt-auth": "^1.0.0-rc.2",
+        "zizaco/entrust": "dev-master",
+        "laravelcollective/html": "^5.6"
     },
     "require-dev": {
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
+        "laravel/dusk": "^3.0",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^2.0",
         "phpunit/phpunit": "^7.0"
@@ -35,6 +40,7 @@
     "extra": {
         "laravel": {
             "dont-discover": [
+              "laravel/dusk"
             ]
         }
     },
@@ -42,19 +48,18 @@
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
-        "post-create-project-cmd": [
-            "@php artisan key:generate"
-        ],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover"
+        ],
+        "post-create-project-cmd": [
+            "@php artisan key:generate",
+            "@php artisan jwt:secret --force"
         ]
     },
     "config": {
         "preferred-install": "dist",
         "sort-packages": true,
         "optimize-autoloader": true
-    },
+    }
-    "minimum-stability": "dev",
-    "prefer-stable": true
 }

config/app.php

@@ -80,6 +80,12 @@ return [
 
     'locale' => 'en',
 
+    'locales' => [
+        'en' => 'EN',
+        'zh-CN' => '中文',
+        'es' => 'ES',
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Application Fallback Locale
@@ -146,10 +152,13 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
+        Collective\Html\HtmlServiceProvider::class,
+
         /*
          * Package Service Providers...
          */
-        Tymon\JWTAuth\Providers\LaravelServiceProvider::class,
+
+        Zizaco\Entrust\EntrustServiceProvider::class,
 
         /*
          * Application Service Providers...
@@ -208,9 +217,8 @@ return [
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
-        'JWTAuth' => Tymon\JWTAuth\Facades\JWTAuth::class,
+        'Html' => Collective\Html\HtmlFacade::class,
-        'JWTFactory' => Tymon\JWTAuth\Facades\JWTFactory::class,
+        'Entrust'   => Zizaco\Entrust\EntrustFacade::class,
-
     ],
 
 ];

config/auth.php

@@ -14,7 +14,7 @@ return [
     */
 
     'defaults' => [
-        'guard' => 'web',
+        'guard' => 'api',
         'passwords' => 'users',
     ],
 
@@ -42,7 +42,7 @@ return [
         ],
 
         'api' => [
-            'driver' => 'token',
+            'driver' => 'jwt',
             'provider' => 'users',
         ],
     ],
@@ -68,6 +68,7 @@ return [
         'users' => [
             'driver' => 'eloquent',
             'model' => App\User::class,
+            'table' => 'users',
         ],
 
         // 'users' => [

config/broadcasting.php

@@ -36,8 +36,7 @@ return [
             'secret' => env('PUSHER_APP_SECRET'),
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
-                'cluster' => env('PUSHER_APP_CLUSTER'),
+                //
-                'encrypted' => true,
             ],
         ],
 

config/cache.php

@@ -86,9 +86,6 @@ return [
     |
     */
 
-    'prefix' => env(
+    'prefix' => 'laravel',
-        'CACHE_PREFIX',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_cache'
-    ),
 
 ];

config/database.php

@@ -50,7 +50,7 @@ return [
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',
-            'strict' => true,
+            'strict' => false,
             'engine' => null,
         ],
 

config/entrust.php

@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * This file is part of Entrust,
+ * a role & permission management solution for Laravel.
+ *
+ * @license MIT
+ * @package Zizaco\Entrust
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Entrust Role Model
+    |--------------------------------------------------------------------------
+    |
+    | This is the Role model used by Entrust to create correct relations.  Update
+    | the role if it is in a different namespace.
+    |
+    */
+    'role' => 'App\Role',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Entrust Roles Table
+    |--------------------------------------------------------------------------
+    |
+    | This is the roles table used by Entrust to save roles to the database.
+    |
+    */
+    'roles_table' => 'roles',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Entrust Permission Model
+    |--------------------------------------------------------------------------
+    |
+    | This is the Permission model used by Entrust to create correct relations.
+    | Update the permission if it is in a different namespace.
+    |
+    */
+    'permission' => 'App\Permission',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Entrust Permissions Table
+    |--------------------------------------------------------------------------
+    |
+    | This is the permissions table used by Entrust to save permissions to the
+    | database.
+    |
+    */
+    'permissions_table' => 'permissions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Entrust permission_role Table
+    |--------------------------------------------------------------------------
+    |
+    | This is the permission_role table used by Entrust to save relationship
+    | between permissions and roles to the database.
+    |
+    */
+    'permission_role_table' => 'permission_role',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Entrust role_user Table
+    |--------------------------------------------------------------------------
+    |
+    | This is the role_user table used by Entrust to save assigned roles to the
+    | database.
+    |
+    */
+    'role_user_table' => 'role_user',
+
+    /*
+    |--------------------------------------------------------------------------
+    | User Foreign key on Entrust's role_user Table (Pivot)
+    |--------------------------------------------------------------------------
+    */
+    'user_foreign_key' => 'user_id',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Role Foreign key on Entrust's role_user Table (Pivot)
+    |--------------------------------------------------------------------------
+    */
+    'role_foreign_key' => 'role_id',
+
+];

config/filesystems.php

@@ -37,7 +37,7 @@ return [
     | may even configure multiple disks of the same driver. Defaults have
     | been setup for each driver as an example of the required options.
     |
-    | Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace"
+    | Supported Drivers: "local", "ftp", "s3", "rackspace"
     |
     */
 
@@ -57,11 +57,10 @@ return [
 
         's3' => [
             'driver' => 's3',
-            'key' => env('AWS_ACCESS_KEY_ID'),
+            'key' => env('AWS_KEY'),
-            'secret' => env('AWS_SECRET_ACCESS_KEY'),
+            'secret' => env('AWS_SECRET'),
-            'region' => env('AWS_DEFAULT_REGION'),
+            'region' => env('AWS_REGION'),
             'bucket' => env('AWS_BUCKET'),
-            'url' => env('AWS_URL'),
         ],
 
     ],

config/jwt.php

@@ -0,0 +1,303 @@
+<?php
+
+/*
+ * This file is part of jwt-auth.
+ *
+ * (c) Sean Tymon <tymon148@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | JWT Authentication Secret
+    |--------------------------------------------------------------------------
+    |
+    | 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'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | 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'),
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | JWT time to live
+    |--------------------------------------------------------------------------
+    |
+    | Specify the length of time (in minutes) that the token will be valid for.
+    | 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' => env('JWT_TTL', 60),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Refresh time to live
+    |--------------------------------------------------------------------------
+    |
+    | 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.
+    |
+    | 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' => env('JWT_REFRESH_TTL', 20160),
+
+    /*
+    |--------------------------------------------------------------------------
+    | JWT hashing algorithm
+    |--------------------------------------------------------------------------
+    |
+    | Specify the hashing algorithm that will be used to sign the token.
+    |
+    | See here: https://github.com/namshi/jose/tree/master/src/Namshi/JOSE/Signer/OpenSSL
+    | for possible values.
+    |
+    */
+
+    'algo' => env('JWT_ALGO', 'HS256'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Required Claims
+    |--------------------------------------------------------------------------
+    |
+    | 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.
+    |
+    */
+
+    'required_claims' => [
+        'iss',
+        'iat',
+        'exp',
+        'nbf',
+        'sub',
+        'jti',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Persistent Claims
+    |--------------------------------------------------------------------------
+    |
+    | 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.
+    |
+    */
+
+    'persistent_claims' => [
+        // 'foo',
+        // 'bar',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Lock Subject
+    |--------------------------------------------------------------------------
+    |
+    | This will determine whether a `prv` claim is automatically added to
+    | the token. The purpose of this is to ensure that if you have multiple
+    | authentication models e.g. `App\User` & `App\OtherPerson`, then we
+    | should prevent one authentication request from impersonating another,
+    | if 2 tokens happen to have the same id across the 2 different models.
+    |
+    | Under specific circumstances, you may want to disable this behaviour
+    | e.g. if you only have one authentication model, then you would save
+    | a little on token size.
+    |
+    */
+
+    'lock_subject' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Leeway
+    |--------------------------------------------------------------------------
+    |
+    | This property gives the jwt timestamp claims some "leeway".
+    | Meaning that if you have any unavoidable slight clock skew on
+    | any of your servers then this will afford you some level of cushioning.
+    |
+    | This applies to the claims `iat`, `nbf` and `exp`.
+    |
+    | Specify in seconds - only if you know you need it.
+    |
+    */
+
+    'leeway' => env('JWT_LEEWAY', 0),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Blacklist Enabled
+    |--------------------------------------------------------------------------
+    |
+    | 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.
+    |
+    */
+
+    'blacklist_grace_period' => env('JWT_BLACKLIST_GRACE_PERIOD', 0),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cookies encryption
+    |--------------------------------------------------------------------------
+    |
+    | 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 true if you want to decrypt cookies.
+    |
+    */
+
+    'decrypt_cookies' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Providers
+    |--------------------------------------------------------------------------
+    |
+    | Specify the various providers used throughout the package.
+    |
+    */
+
+    'providers' => [
+
+        /*
+        |--------------------------------------------------------------------------
+        | JWT Provider
+        |--------------------------------------------------------------------------
+        |
+        | Specify the provider that is used to create and decode the tokens.
+        |
+        */
+
+        'jwt' => Tymon\JWTAuth\Providers\JWT\Lcobucci::class,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Authentication Provider
+        |--------------------------------------------------------------------------
+        |
+        | Specify the provider that is used to authenticate users.
+        |
+        */
+
+        'auth' => Tymon\JWTAuth\Providers\Auth\Illuminate::class,
+
+        /*
+        |--------------------------------------------------------------------------
+        | Storage Provider
+        |--------------------------------------------------------------------------
+        |
+        | Specify the provider that is used to store tokens in the blacklist.
+        |
+        */
+
+        'storage' => Tymon\JWTAuth\Providers\Storage\Illuminate::class,
+
+    ],
+
+];

config/queue.php

@@ -4,12 +4,14 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Default Queue Connection Name
+    | Default Queue Driver
     |--------------------------------------------------------------------------
     |
     | Laravel's queue API supports an assortment of back-ends via a single
     | API, giving you convenient access to each back-end using the same
-    | syntax for every one. Here you may define a default connection.
+    | syntax for each one. Here you may set the default queue driver.
+    |
+    | Supported: "sync", "database", "beanstalkd", "sqs", "redis", "null"
     |
     */
 
@@ -24,8 +26,6 @@ return [
     | is used by your application. A default configuration has been added
     | for each back-end shipped with Laravel. You are free to add more.
     |
-    | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
-    |
     */
 
     'connections' => [
@@ -50,11 +50,11 @@ return [
 
         'sqs' => [
             'driver' => 'sqs',
-            'key' => env('SQS_KEY', 'your-public-key'),
+            'key' => 'your-public-key',
-            'secret' => env('SQS_SECRET', 'your-secret-key'),
+            'secret' => 'your-secret-key',
-            'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
+            'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id',
-            'queue' => env('SQS_QUEUE', 'your-queue-name'),
+            'queue' => 'your-queue-name',
-            'region' => env('SQS_REGION', 'us-east-1'),
+            'region' => 'us-east-1',
         ],
 
         'redis' => [
@@ -62,7 +62,6 @@ return [
             'connection' => 'default',
             'queue' => 'default',
             'retry_after' => 90,
-            'block_for' => null,
         ],
 
     ],

config/services.php

@@ -35,4 +35,9 @@ return [
         'secret' => env('STRIPE_SECRET'),
     ],
 
+    'github' => [
+        'client_id' => env('GITHUB_CLIENT_ID'),
+        'client_secret' => env('GITHUB_CLIENT_SECRET'),
+    ],
+
 ];

config/session.php

@@ -29,7 +29,7 @@ return [
     |
     */
 
-    'lifetime' => env('SESSION_LIFETIME', 120),
+    'lifetime' => 120,
 
     'expire_on_close' => false,
 

data/mysql/auto.cnf

@@ -1,2 +0,0 @@
-[auto]
-server-uuid=ff897b63-45fb-11e8-a5e1-0242ac120002

data/mysql/default/db.opt

@@ -1,2 +0,0 @@
-default-character-set=utf8
-default-collation=utf8_general_ci

data/mysql/mysql/db.MYD

@@ -1 +0,0 @@
-ÿ%                                                                                                                                                                                   test                                                                                                                                                                                                                                            


ÿ%                                                                                                                                                                                   test\_%                                                                                                                                                                                                                                         


ÿ%                                                                                                                                                                                   default                                                                                                                                                                                         default