Merge branch 'next'

Author: cretueusebiu

.env.example

@@ -1,23 +1,23 @@
-APP_NAME=LaravelNuxt
+APP_NAME="Laravel Nuxt"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_LOG_LEVEL=debug
+APP_URL=http://localhost
 
-APP_URL=http://api.laravel-nuxt.test
-CLIENT_URL=http://localhost:3000
+LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+DB_DATABASE=laravel
+DB_USERNAME=root
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
-QUEUE_DRIVER=sync
+SESSION_LIFETIME=120
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
@@ -30,8 +30,14 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
 
 JWT_TTL=1440

.eslintrc

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

.gitignore

@@ -3,13 +3,14 @@
 /public/storage
 /storage/*.key
 /vendor
-/.idea
-/.vagrant
+.env
+.env.backup
+.phpunit.result.cache
 Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
-.env
 .nuxt
 /dist
 /public/_nuxt
+*.code-workspace

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - 7.1
   - 7.2
+  - 7.3
 
 install:
   - travis_retry composer install --no-interaction --prefer-dist --no-suggest

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.0.0 - 2019-07-26
+
+- Upgrade to Nuxt 2.8
+- Upgrade to Laravel 5.8
+- Added email verification
+- SPA mode by default
+- Update npm dependencies
+- Removed yarn.lock in favor of package-lock.json
+
 ## 1.1.0 - 2018-05-10
 
 - Upgrade to Laravel 5.6

README.md

@@ -12,22 +12,20 @@
 
 ## Features
 
-- Laravel 5.6
-- Nuxt 1.4
-- VueI18n
-- SSR or SPA 
-- Authentication with JWT
+- Nuxt 2.8
+- Laravel 5.8
+- SPA or SSR
 - Socialite integration
-- Bootstrap 4 + Font Awesome 5
-- Login, register, password reset and profile pages
+- VueI18n + ESlint + Bootstrap 4 + Font Awesome 5
+- Login, register, email verification and password reset
 
 ## Installation
 
 - `composer create-project --prefer-dist cretueusebiu/laravel-nuxt`
 - Edit `.env` to set your database connection details and `APP_URL` (the url to your Laravel application)
 - (When installed via git clone or download, run `php artisan key:generate` and `php artisan jwt:secret`)
 - `php artisan migrate`
-- `yarn` / `npm install`
+- `npm install`
 
 ## Usage
 
@@ -37,21 +35,30 @@
 npm run dev
 ```
 
-### Production with SSR
+You can access your application at `http://localhost:3000`.
+
+### Production
 
 ```bash
 npm run build
-npm run start
 ```
 
+You can access your application the url you set `APP_URL` to.
+
+### Enable SSR
+
+- Remove `mode: 'spa'` and `'~plugins/nuxt-client-init'` from `client/nuxt.config.js` 
+- Edit `.env` to set `APP_URL=http://api.example.com` and `CLIENT_URL=http://example.com`
+- Run `npm run build` and `npm run start`
+
 #### Nginx Proxy
 
 For Nginx you can add a proxy using the follwing location block:
 
 ```
 server {
     location / {
-        proxy_pass http://HOST:PORT;
+        proxy_pass http://http://127.0.0.1:3000;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection 'upgrade';
@@ -61,8 +68,6 @@ server {
 }
 ```
 
-Where `HOST` is the ip address of your server and `PORT` is the port you're running the application (3000 by default).
-
 #### Process Manager
 
 In production you need a process manager to keep the Node server alive forever:
@@ -90,15 +95,6 @@ After each deploy you'll need to restart the process:
 pm2 restart laravel-nuxt 
 ```
 
-### Production without SSR
-
-If you don't want server side rendering you can use the [mode](https://nuxtjs.org/api/configuration-mode#the-mode-property) option:
-
-- Uncomment `mode: 'spa'` and `'~plugins/nuxt-client-init'` in `client/nuxt.config.js` 
-- Uncomment `// ->prefix('api')` in `app/Providers/RouteServiceProvider.php` 
-- Set `APP_URL=http://example.com/api` and `CLIENT_URL=http://example.com` in your `.env`
-- Run `npm run build`
-
 Make sure to read the [Nuxt docs](https://nuxtjs.org/).
 
 ## Notes

app/Exceptions/Handler.php

@@ -3,6 +3,7 @@
 namespace App\Exceptions;
 
 use Exception;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -50,4 +51,18 @@ public function render($request, Exception $exception)
     {
         return parent::render($request, $exception);
     }
+
+    /**
+     * Convert an authentication exception into a response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Auth\AuthenticationException  $exception
+     * @return \Illuminate\Http\Response
+     */
+    protected function unauthenticated($request, AuthenticationException $exception)
+    {
+        return $request->expectsJson()
+                    ? response()->json(['message' => $exception->getMessage()], 401)
+                    : redirect()->guest(url('/login'));
+    }
 }

app/Exceptions/VerifyEmailException.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Exceptions;
+
+use Illuminate\Validation\ValidationException;
+
+class VerifyEmailException extends ValidationException
+{
+    /**
+     * @param  \App\User $user
+     * @return static
+     */
+    public static function forUser($user)
+    {
+        return static::withMessages([
+            'email' => [__('You must :linkOpen verify :linkClose your email first.', [
+                'linkOpen' => '<a href="/email/resend?email='.urlencode($user->email).'">',
+                'linkClose' => '</a>',
+            ])],
+        ]);
+    }
+}

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -23,10 +23,11 @@ public function __construct()
     /**
      * Get the response for a successful password reset link.
      *
+     * @param  \Illuminate\Http\Request $request
      * @param  string  $response
      * @return \Illuminate\Http\RedirectResponse
      */
-    protected function sendResetLinkResponse($response)
+    protected function sendResetLinkResponse(Request $request, $response)
     {
         return ['status' => trans($response)];
     }

app/Http/Controllers/Auth/LoginController.php

@@ -4,6 +4,9 @@
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Exceptions\VerifyEmailException;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Validation\ValidationException;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 class LoginController extends Controller
@@ -30,20 +33,25 @@ protected function attemptLogin(Request $request)
     {
         $token = $this->guard()->attempt($this->credentials($request));
 
-        if ($token) {
-            $this->guard()->setToken($token);
+        if (! $token) {
+            return false;
+        }
 
-            return true;
+        $user = $this->guard()->user();
+        if ($user instanceof MustVerifyEmail && ! $user->hasVerifiedEmail()) {
+            return false;
         }
 
-        return false;
+        $this->guard()->setToken($token);
+
+        return true;
     }
 
     /**
      * Send the response after the user was authenticated.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     protected function sendLoginResponse(Request $request)
     {
@@ -52,11 +60,31 @@ protected function sendLoginResponse(Request $request)
         $token = (string) $this->guard()->getToken();
         $expiration = $this->guard()->getPayload()->get('exp');
 
-        return [
+        return response()->json([
             'token' => $token,
             'token_type' => 'bearer',
             'expires_in' => $expiration - time(),
-        ];
+        ]);
+    }
+
+    /**
+     * Get the failed login response instance.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    protected function sendFailedLoginResponse(Request $request)
+    {
+        $user = $this->guard()->user();
+        if ($user instanceof MustVerifyEmail && ! $user->hasVerifiedEmail()) {
+            throw VerifyEmailException::forUser($user);
+        }
+
+        throw ValidationException::withMessages([
+            $this->username() => [trans('auth.failed')],
+        ]);
     }
 
     /**