Merge pull request #348 from jeremykenedy/laravel7

Laravel7

Author: jeremykenedy

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2

.env.example

@@ -3,16 +3,16 @@ APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
-APP_PROJECT_VERSION=6
+APP_PROJECT_VERSION=7
 
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=laravelAuth
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+DB_DATABASE=laravel
+DB_USERNAME=root
+DB_PASSWORD=
 
 BROADCAST_DRIVER=pusher
 CACHE_DRIVER=file
@@ -24,23 +24,27 @@ 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=
-MAIL_FROM_NAME=''
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
 
 EMAIL_EXCEPTION_ENABLED=false
-EMAIL_EXCEPTION_FROM=[email protected]
+EMAIL_EXCEPTION_FROM="${MAIL_FROM_ADDRESS}"
 EMAIL_EXCEPTION_TO='[email protected], [email protected]'
 EMAIL_EXCEPTION_CC=''
 EMAIL_EXCEPTION_BCC=''
 EMAIL_EXCEPTION_SUBJECT=''
 
+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=
@@ -64,7 +68,7 @@ LARAVEL_2STEP_ENABLED=false
 LARAVEL_2STEP_DATABASE_CONNECTION=mysql
 LARAVEL_2STEP_DATABASE_TABLE=laravel2step
 LARAVEL_2STEP_USER_MODEL=App\User
-LARAVEL_2STEP_EMAIL_FROM="[email protected]"
+LARAVEL_2STEP_EMAIL_FROM=
 LARAVEL_2STEP_EMAIL_FROM_NAME="Laravel 2 Step Verification"
 LARAVEL_2STEP_EMAIL_SUBJECT='Laravel 2 Step Verification'
 LARAVEL_2STEP_EXCEEDED_COUNT=3
@@ -143,53 +147,53 @@ ROLES_GUI_FLASH_MESSAGES_ENABLED=false
 ROLES_GUI_BLADE_PLACEMENT_CSS=template_linked_css
 ROLES_GUI_BLADE_PLACEMENT_JS=footer_scripts
 
-// NOTE: YOU CAN REMOVE THE KEY CALL IN app.blade.php IF YOU GET A POP UP AND DO NOT WANT TO SETUP A KEY FOR DEV
+# NOTE: YOU CAN REMOVE THE KEY CALL IN app.blade.php IF YOU GET A POP UP AND DO NOT WANT TO SETUP A KEY FOR DEV
 # Google Maps API v3 Key - https://developers.google.com/maps/documentation/javascript/get-api-key#get-an-api-key
 GOOGLEMAPS_API_STATUS=true
 GOOGLEMAPS_API_KEY=YOURGOOGLEMAPSkeyHERE
 
-# https://console.developers.google.com/ - NEED OAUTH CREDS
-GOOGLE_ID=YOURGOOGLEPLUSidHERE
-GOOGLE_SECRET=YOURGOOGLEPLUSsecretHERE
-GOOGLE_REDIRECT=http://yourwebsiteURLhere.com/social/handle/google
-
 # https://www.google.com/recaptcha/admin#list
 ENABLE_RECAPTCHA=true
 RE_CAP_SITE=YOURGOOGLECAPTCHAsitekeyHERE
 RE_CAP_SECRET=YOURGOOGLECAPTCHAsecretHERE
 
+# https://console.developers.google.com/ - NEED OAUTH CREDS
+GOOGLE_ID=YOURGOOGLEPLUSidHERE
+GOOGLE_SECRET=YOURGOOGLEPLUSsecretHERE
+GOOGLE_REDIRECT=https://YOURWEBURLHERE.COM/social/handle/google
+
 # https://developers.facebook.com/
 FB_ID=YOURFACEBOOKidHERE
 FB_SECRET=YOURFACEBOOKsecretHERE
-FB_REDIRECT=http://yourwebsiteURLhere.com/social/handle/facebook
+FB_REDIRECT=https://YOURWEBURLHERE.COM/social/handle/facebook
 
 # https://apps.twitter.com/
 TW_ID=YOURTWITTERidHERE
 TW_SECRET=YOURTWITTERkeyHERE
-TW_REDIRECT=http://yourwebsiteURLhere.com/social/handle/twitter
+TW_REDIRECT=https://YOURWEBURLHERE.COM/social/handle/twitter
 
 # https://github.com/settings/applications/new
 GITHUB_ID=YOURIDHERE
 GITHUB_SECRET=YOURSECRETHERE
-GITHUB_URL=https://larablog.io/social/handle/github
+GITHUB_URL=https://YOURWEBURLHERE.COM/social/handle/github
 
 # https://developers.google.com/youtube/v3/getting-started
 YOUTUBE_KEY=YOURKEYHERE
 YOUTUBE_SECRET=YOURSECRETHERE
-YOUTUBE_REDIRECT_URI=https://larablog.io/social/handle/youtube
+YOUTUBE_REDIRECT_URI=https://YOURWEBURLHERE.COM/social/handle/youtube
 
-# http://www.twitch.tv/kraken/oauth2/clients/new
+# https://dev.twitch.tv/docs/authentication/
 TWITCH_KEY=YOURKEYHERE
 TWITCH_SECRET=YOURSECRETHERE
-TWITCH_REDIRECT_URI=http://laravel-authentication.local/social/handle/twitch
+TWITCH_REDIRECT_URI=https://YOURWEBURLHERE.COM/social/handle/twitch
 
 # https://instagram.com/developer/register/
 INSTAGRAM_KEY=YOURKEYHERE
 INSTAGRAM_SECRET=YOURSECRETHERE
-INSTAGRAM_REDIRECT_URI=http://laravel-authentication.local/social/handle/instagram
+INSTAGRAM_REDIRECT_URI=https://YOURWEBURLHERE.COM/social/handle/instagram
 
 # https://basecamp.com/
 # https://github.com/basecamp/basecamp-classic-api
 37SIGNALS_KEY=YOURKEYHERE
 37SIGNALS_SECRET=YOURSECRETHERE
-37SIGNALS_REDIRECT_URI=http://laravel-authentication.local/social/handle/37signals
+37SIGNALS_REDIRECT_URI=https://YOURWEBURLHERE.COM/social/handle/37signals

.gitattributes

@@ -1,3 +1,5 @@
 * text=auto
 *.css linguist-vendored
 *.scss linguist-vendored
+*.js linguist-vendored
+CHANGELOG.md export-ignore

.gitignore

@@ -44,6 +44,8 @@ yarn.lock
 /storage/logs
 /storage/users
 packages/
+.phpunit.result.cache
+.env.backup
 
 # Debug Files
 npm-debug.log

.styleci.yml

@@ -0,0 +1,15 @@
+preset: laravel
+
+enabled:
+  - strict
+  - align_double_arrow
+
+disabled:
+  - unused_use
+
+finder:
+  not-name:
+    - index.php
+    - server.php
+    - CheckIsUserActivated.php
+    - SocialController.php

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - 7.2
+  - 7.2.5
   - 7.3
 
 services:

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2019 jeremykenedy
+Copyright (c) 2017-2020 jeremykenedy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
-## Laravel-Auth
+## Laravel Auth
 
-#### Laravel-Auth is a Complete Build of Laravel 6 with Email Registration Verification, Social Authentication, User Roles and Permissions, User Profiles, and Admin restricted user management system. Built on Bootstrap 4.
+#### Laravel Auth is a Complete Build of Laravel 7 with Email Registration Verification, Social Authentication, User Roles and Permissions, User Profiles, and Admin restricted user management system. Built on Bootstrap 4.
 [![Build Status](https://travis-ci.org/jeremykenedy/laravel-auth.svg?branch=master)](https://travis-ci.org/jeremykenedy/laravel-auth)
 [![StyleCI](https://styleci.io/repos/44714043/shield?branch=master)](https://styleci.io/repos/44714043)
 [![Build Status](https://scrutinizer-ci.com/g/jeremykenedy/laravel-auth/badges/build.png?b=master)](https://scrutinizer-ci.com/g/jeremykenedy/laravel-auth/build-status/master)
@@ -51,29 +51,29 @@
 - [Contributors](#Contributors)
 
 ### About
-Laravel 6.0 with user authentication, registration with email confirmation, social media authentication, password recovery, and captcha protection. Uses official [Bootstrap 4](https://getbootstrap.com). This also makes full use of Controllers for the routes, templates for the views, and makes use of middleware for routing. Project can be stood up in minutes.
+Laravel 7 with user authentication, registration with email confirmation, social media authentication, password recovery, and captcha protection. Uses official [Bootstrap 4](https://getbootstrap.com). This also makes full use of Controllers for the routes, templates for the views, and makes use of middleware for routing. Project can be stood up in minutes.
 
 ### Features
-#### A [Laravel](https://laravel.com/) 6.0.x with minimal [Bootstrap](https://getbootstrap.com) 4.0.x project.
+#### A [Laravel](https://laravel.com/) 7.x with [Bootstrap](https://getbootstrap.com) 4.x project.
 
-| Laravel-Auth Features  |
+| Laravel Auth Features  |
 | :------------ |
-|Built on [Laravel](https://laravel.com/) 6.0|
+|Built on [Laravel](https://laravel.com/) 7.0|
 |Built on [Bootstrap](https://getbootstrap.com/) 4|
 |Uses [MySQL](https://github.com/mysql) Database (can be changed)|
-|Uses [Artisan](https://laravel.com/docs/6.x/artisan) to manage database migration, schema creations, and create/publish page controller templates|
+|Uses [Artisan](https://laravel.com/docs/master/artisan) to manage database migration, schema creations, and create/publish page controller templates|
 |Dependencies are managed with [COMPOSER](https://getcomposer.org/)|
 |Laravel Scaffolding **User** and **Administrator Authentication**.|
 |User [Socialite Logins](https://github.com/laravel/socialite) ready to go - See API list used below|
 |[Google Maps API v3](https://developers.google.com/maps/documentation/javascript/) for User Location lookup and Geocoding|
 |CRUD (Create, Read, Update, Delete) Themes Management|
 |CRUD (Create, Read, Update, Delete) User Management|
-|Robust [Laravel Logging](https://laravel.com/docs/6.x/errors#logging) with admin UI using MonoLog|
+|Robust [Laravel Logging](https://laravel.com/docs/master/errors#logging) with admin UI using MonoLog|
 |Google [reCaptcha Protection with Google API](https://developers.google.com/recaptcha/)|
 |User Registration with email verification|
-|Makes use of Laravel [Mix](https://laravel.com/docs/6.x/mix) to compile assets|
-|Makes use of [Language Localization Files](https://laravel.com/docs/6.x/localization)|
-|Active Nav states using [Laravel Requests](https://laravel.com/docs/6.x/requests)|
+|Makes use of Laravel [Mix](https://laravel.com/docs/master/mix) to compile assets|
+|Makes use of [Language Localization Files](https://laravel.com/docs/master/localization)|
+|Active Nav states using [Laravel Requests](https://laravel.com/docs/master/requests)|
 |Restrict User Email Activation Attempts|
 |Capture IP to users table upon signup|
 |Uses [Laravel Debugger](https://github.com/barryvdh/laravel-debugbar) for development|
@@ -85,7 +85,7 @@ Laravel 6.0 with user authentication, registration with email confirmation, soci
 |User Login with remember password|
 |User [Roles/ACL Implementation](https://github.com/jeremykenedy/laravel-roles)|
 |Roles and Permissions GUI|
-|Makes use of [Laravel's Soft Delete Structure](https://laravel.com/docs/6.x/eloquent#soft-deleting)|
+|Makes use of [Laravel's Soft Delete Structure](https://laravel.com/docs/master/eloquent#soft-deleting)|
 |Soft Deleted Users Management System|
 |Permanently Delete Soft Deleted Users|
 |User Delete Account with Goodbye email|
@@ -133,10 +133,15 @@ php artisan vendor:publish --tag=laravel2step
 2. From the projects root folder run `yarn run dev` or `yarn run production`
   * You can watch assets with `yarn run watch`
 
+##### Using NPM:
+1. From the projects root folder run `npm install`
+2. From the projects root folder run `npm run dev` or `npm run production`
+  * You can watch assets with `npm run watch`
+
 #### Optionally Build Cache
 1. From the projects root folder run `php artisan config:cache`
 
-###### And thats it with the caveat of setting up and configuring your development environment. I recommend [Laravel Homestead](https://laravel.com/docs/6.x/homestead)
+###### And thats it with the caveat of setting up and configuring your development environment. I recommend [Laravel Homestead](https://laravel.com/docs/master/homestead)
 
 ### Seeds
 ##### Seeded Roles
@@ -551,18 +556,19 @@ INSTAGRAM_REDIRECT_URI=http://laravel-authentication.local/social/handle/instagr
 ```
 
 #### Laravel Developement Packages Used References
-* https://laravel.com/docs/6.x/authentication
-* https://laravel.com/docs/6.x/authorization
-* https://laravel.com/docs/6.x/routing
-* https://laravel.com/docs/6.x/migrations
-* https://laravel.com/docs/6.x/queries
-* https://laravel.com/docs/6.x/views
-* https://laravel.com/docs/6.x/eloquent
-* https://laravel.com/docs/6.x/eloquent-relationships
-* https://laravel.com/docs/6.x/requests
-* https://laravel.com/docs/6.x/errors
+* https://laravel.com/docs/master/authentication
+* https://laravel.com/docs/master/authorization
+* https://laravel.com/docs/master/routing
+* https://laravel.com/docs/master/migrations
+* https://laravel.com/docs/master/queries
+* https://laravel.com/docs/master/views
+* https://laravel.com/docs/master/eloquent
+* https://laravel.com/docs/master/eloquent-relationships
+* https://laravel.com/docs/master/requests
+* https://laravel.com/docs/master/errors
 
 ###### Updates:
+* Update to Laravel 7.0 [See changes in this Commit](https://github.com/jeremykenedy/laravel-auth/commit/038a23f516efc08cd02c4582249234f6f6432c46)
 * Update to Laravel 6.0
 * Update to Laravel 5.8
 * Added [Laravel Blocker Package](https://github.com/jeremykenedy/laravel-blocker)
@@ -575,16 +581,16 @@ INSTAGRAM_REDIRECT_URI=http://laravel-authentication.local/social/handle/instagr
 * Update to Laravel 5.5
 * Added User Delete with Goodbye email
 * Added User Restore Deleted Account from email with secure token
-* Added [Soft Deletes](https://laravel.com/docs/6.x/eloquent#soft-deleting) and Soft Deletes Management panel
+* Added [Soft Deletes](https://laravel.com/docs/master/eloquent#soft-deleting) and Soft Deletes Management panel
 * Added User Account Settings to Profile Edit
 * Added User Change Password to Profile Edit
 * Added User Delete Account to Profile Edit
 * Added [Password Strength Meter](https://github.com/elboletaire/password-strength-meter)
 * Added [hideShowPassword](https://github.com/cloudfour/hideShowPassword)
 * Added Admin Routing Details
 * Admin PHP Information
-* Added Robust [Laravel Logging](https://laravel.com/docs/6.x/errors#logging) with admin UI using MonoLog
-* Added Active Nav states using [Laravel Requests](https://laravel.com/docs/6.x/requests)
+* Added Robust [Laravel Logging](https://laravel.com/docs/master/errors#logging) with admin UI using MonoLog
+* Added Active Nav states using [Laravel Requests](https://laravel.com/docs/master/requests)
 * Added [Laravel Debugger](https://github.com/barryvdh/laravel-debugbar) with Service Provider to manage status in `.env` file.
 * Updated Capture IP not found IP address
 * Added User Avatar Image AJAX Upload with [Dropzone.js](http://www.dropzonejs.com/#configuration)

app/Console/Kernel.php

@@ -25,11 +25,9 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')
-        //          ->hourly();
+        // $schedule->command('inspire')->hourly();
 
-        $schedule->command('activations:clean')
-                    ->daily();
+        $schedule->command('activations:clean')->daily();
     }
 
     /**