Merge pull request cretueusebiu#131 from cretueusebiu/next

Next

.editorconfig

@@ -1,16 +1,15 @@
 root = true
 
 [*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
 indent_style = space
 indent_size = 4
-end_of_line = lf
-charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
 
-[*.{vue,js,json,html,scss,blade.php}]
-indent_style = space
+[*.{vue,js,json,html,scss,blade.php,yml}]
 indent_size = 2

.env.example

@@ -2,9 +2,11 @@ APP_NAME="Laravel Nuxt"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://localhost
+APP_LOG_LEVEL=debug
+APP_URL=http://localhost:8000
 
 LOG_CHANNEL=stack
+LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
@@ -23,12 +25,14 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=smtp
+MAIL_MAILER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
 
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
@@ -40,4 +44,8 @@ PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
 PUSHER_APP_CLUSTER=mt1
 
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
 JWT_TTL=1440
+JWT_SECRET=

.eslintrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    parser: '@babel/eslint-parser',
+    sourceType: 'module',
+    requireConfigFile: false
+  },
+  extends: [
+    '@nuxtjs'
+  ],
+  rules: {
+    'vue/max-attributes-per-line': 'off'
+  }
+}

.gitattributes

@@ -5,3 +5,5 @@
 CHANGELOG.md export-ignore
 README.md export-ignore
 .travis.yml export-ignore
+.env.dusk.local export-ignore
+.env.dusk.testing export-ignore

.github/workflows/tests.yml

@@ -0,0 +1,42 @@
+name: tests
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  tests:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Get Composer cache directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - uses: actions/cache@v2
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Install composer dependencies
+        run: composer install -q --no-ansi --no-interaction --no-progress --no-suggest --prefer-dist --optimize-autoloader
+
+      - name: Directory permissions
+        run: chmod -R 777 storage bootstrap/cache
+
+      - name: Run tests (Unit and Feature)
+        run: vendor/bin/phpunit

.styleci.yml

@@ -0,0 +1,13 @@
+php:
+  preset: laravel
+  disabled:
+    - no_unused_imports
+  finder:
+    not-name:
+      - index.php
+      - server.php
+js:
+  finder:
+    not-name:
+      - webpack.mix.js
+css: true

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.0.0 - 2020-11-28
+
+- Upgrade to Laravel 8
+- Update dependencies
+- Catch validation errors [#105](https://github.com/cretueusebiu/laravel-nuxt/pull/105)
+
 ## 2.2.0 - 2020-01-12
 
 - Upgrade to Nuxt 2.11

README.md

@@ -1,6 +1,6 @@
 # Laravel-Nuxt
 
-<a href="https://travis-ci.org/cretueusebiu/laravel-nuxt"><img src="https://travis-ci.org/cretueusebiu/laravel-nuxt.svg?branch=master" alt="Build Status"></a>
+<a href="https://github.com/cretueusebiu/laravel-nuxt/actions"><img src="https://github.com/cretueusebiu/laravel-nuxt/workflows/tests/badge.svg" alt="Build Status"></a>
 <a href="https://packagist.org/packages/cretueusebiu/laravel-nuxt"><img src="https://poser.pugx.org/cretueusebiu/laravel-nuxt/d/total.svg" alt="Total Downloads"></a>
 <a href="https://packagist.org/packages/cretueusebiu/laravel-nuxt"><img src="https://poser.pugx.org/cretueusebiu/laravel-nuxt/v/stable.svg" alt="Latest Stable Version"></a>
 
@@ -12,8 +12,8 @@
 
 ## Features
 
-- Nuxt 2.11
-- Laravel 6
+- Nuxt 2
+- Laravel 8
 - SPA or SSR
 - Socialite integration
 - VueI18n + ESlint + Bootstrap 4 + Font Awesome 5
@@ -22,7 +22,7 @@
 ## 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)
+- Edit `.env` and set your database connection details 
 - (When installed via git clone or download, run `php artisan key:generate` and `php artisan jwt:secret`)
 - `php artisan migrate`
 - `npm install`
@@ -32,22 +32,24 @@
 ### Development
 
 ```bash
+# start Laravel
+php artisan serve
+
+# start Nuxt
 npm run dev
 ```
 
-You can access your application at `http://localhost:3000`.
+Access your application at `http://localhost:3000`.
 
 ### Production
 
 ```bash
 npm run build
 ```
 
-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 `client/nuxt.config.js` and set `ssr: true` 
 - Edit `.env` to set `APP_URL=http://api.example.com` and `CLIENT_URL=http://example.com`
 - Run `npm run build` and `npm run start`
 

app/Console/Kernel.php

@@ -24,8 +24,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')
-        //          ->hourly();
+        // $schedule->command('inspire')->hourly();
     }
 
     /**

app/Exceptions/Handler.php

@@ -2,7 +2,6 @@
 
 namespace App\Exceptions;
 
-use Exception;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
@@ -27,31 +26,6 @@ class Handler extends ExceptionHandler
         'password_confirmation',
     ];
 
-    /**
-     * Report or log an exception.
-     *
-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-     *
-     * @param  \Exception  $exception
-     * @return void
-     */
-    public function report(Exception $exception)
-    {
-        parent::report($exception);
-    }
-
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Exception $exception)
-    {
-        return parent::render($request, $exception);
-    }
-
     /**
      * Convert an authentication exception into a response.
      *

app/Http/Controllers/Auth/OAuthController.php

@@ -4,8 +4,8 @@
 
 use App\Exceptions\EmailTakenException;
 use App\Http\Controllers\Controller;
-use App\OAuthProvider;
-use App\User;
+use App\Models\OAuthProvider;
+use App\Models\User;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Laravel\Socialite\Facades\Socialite;
 
@@ -31,7 +31,7 @@ public function __construct()
      * @param  string $provider
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function redirectToProvider($provider)
+    public function redirect($provider)
     {
         return [
             'url' => Socialite::driver($provider)->stateless()->redirect()->getTargetUrl(),
@@ -44,7 +44,7 @@ public function redirectToProvider($provider)
      * @param  string $driver
      * @return \Illuminate\Http\Response
      */
-    public function handleProviderCallback($provider)
+    public function handleCallback($provider)
     {
         $user = Socialite::driver($provider)->stateless()->user();
         $user = $this->findOrCreateUser($provider, $user);
@@ -63,7 +63,7 @@ public function handleProviderCallback($provider)
     /**
      * @param  string $provider
      * @param  \Laravel\Socialite\Contracts\User $sUser
-     * @return \App\User|false
+     * @return \App\Models\User
      */
     protected function findOrCreateUser($provider, $user)
     {
@@ -90,7 +90,7 @@ protected function findOrCreateUser($provider, $user)
     /**
      * @param  string $provider
      * @param  \Laravel\Socialite\Contracts\User $sUser
-     * @return \App\User
+     * @return \App\Models\User
      */
     protected function createUser($provider, $sUser)
     {

app/Http/Controllers/Auth/RegisterController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
@@ -49,7 +49,7 @@ protected function validator(array $data)
     {
         return Validator::make($data, [
             'name' => 'required|max:255',
-            'email' => 'required|email|max:255|unique:users',
+            'email' => 'required|email:filter|max:255|unique:users',
             'password' => 'required|min:6|confirmed',
         ]);
     }

app/Http/Controllers/Auth/UserController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class UserController extends Controller
+{
+    /**
+     * Get authenticated user.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function current(Request $request)
+    {
+        return response()->json($request->user());
+    }
+}

app/Http/Controllers/Auth/VerificationController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Events\Verified;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\URL;

app/Http/Controllers/Settings/PasswordController.php

@@ -16,7 +16,7 @@ class PasswordController extends Controller
     public function update(Request $request)
     {
         $this->validate($request, [
-            'password' => 'required|confirmed|min:8',
+            'password' => 'required|confirmed|min:6',
         ]);
 
         $request->user()->update([