update to laravel 5.8, fix vue .default, and sm icons

README.md

@@ -1,5 +1,5 @@
 ## Laravel-Auth
-#### Laravel-Auth is a Complete Build of Laravel 5.7 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 5.8 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)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/jeremykenedy/laravel-auth/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/jeremykenedy/laravel-auth/?branch=master)
@@ -42,29 +42,29 @@
 - [Laravel Auth License](#laravel-auth-license)
 
 ### About
-Laravel 5.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.
+Laravel 5.8 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/) 5.7.x with minimal [Bootstrap](https://getbootstrap.com) 4.0.x project.
+#### A [Laravel](https://laravel.com/) 5.8.x with minimal [Bootstrap](https://getbootstrap.com) 4.0.x project.
 
 | Laravel-Auth Features  |
 | :------------ |
-|Built on [Laravel](https://laravel.com/) 5.7|
+|Built on [Laravel](https://laravel.com/) 5.8|
 |Built on [Bootstrap](https://getbootstrap.com/) 4|
 |Uses [MySQL](https://github.com/mysql) Database (can be changed)|
-|Uses [Artisan](https://laravel.com/docs/5.7/artisan) to manage database migration, schema creations, and create/publish page controller templates|
+|Uses [Artisan](https://laravel.com/docs/5.8/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/5.7/errors#logging) with admin UI using MonoLog|
+|Robust [Laravel Logging](https://laravel.com/docs/5.8/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/5.7/mix) to compile assets|
-|Makes use of [Language Localization Files](https://laravel.com/docs/5.7/localization)|
-|Active Nav states using [Laravel Requests](https://laravel.com/docs/5.7/requests)|
+|Makes use of Laravel [Mix](https://laravel.com/docs/5.8/mix) to compile assets|
+|Makes use of [Language Localization Files](https://laravel.com/docs/5.8/localization)|
+|Active Nav states using [Laravel Requests](https://laravel.com/docs/5.8/requests)|
 |Restrict User Email Activation Attempts|
 |Capture IP to users table upon signup|
 |Uses [Laravel Debugger](https://github.com/barryvdh/laravel-debugbar) for development|
@@ -75,7 +75,7 @@ Laravel 5.7 with user authentication, registration with email confirmation, soci
 |User Password Reset via Email Token|
 |User Login with remember password|
 |User [Roles/ACL Implementation](https://github.com/jeremykenedy/laravel-roles)|
-|Makes use of [Laravel's Soft Delete Structure](https://laravel.com/docs/5.7/eloquent#soft-deleting)|
+|Makes use of [Laravel's Soft Delete Structure](https://laravel.com/docs/5.8/eloquent#soft-deleting)|
 |Soft Deleted Users Management System|
 |Permanently Delete Soft Deleted Users|
 |User Delete Account with Goodbye email|
@@ -91,8 +91,6 @@ Laravel 5.7 with user authentication, registration with email confirmation, soci
 |404 Page|
 |403 Page|
 |Configurable Email Notification via [Laravel-Exception-Notifier](https://github.com/jeremykenedy/laravel-exception-notifier)|
-|User Delete with Goodbye email|
-|User Restore Deleted Account|
 |Activity Logging using [Laravel-logger](https://github.com/jeremykenedy/laravel-logger)|
 |Optional 2-step account login verfication with [Laravel 2-Step Verification](https://github.com/jeremykenedy/laravel2step)|
 |Uses [Laravel PHP Info](https://github.com/jeremykenedy/laravel-phpinfo) package|
@@ -133,7 +131,7 @@ php artisan vendor:publish --tag=laravel2step
 #### 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/5.7/homestead)
+###### And thats it with the caveat of setting up and configuring your development environment. I recommend [Laravel Homestead](https://laravel.com/docs/5.8/homestead)
 
 ### Seeds
 ##### Seeded Roles
@@ -522,18 +520,19 @@ INSTAGRAM_REDIRECT_URI=http://laravel-authentication.local/social/handle/instagr
 ```
 
 #### Laravel Developement Packages Used References
-* https://laravel.com/docs/5.7/authentication
-* https://laravel.com/docs/5.7/authorization
-* https://laravel.com/docs/5.7/routing
-* https://laravel.com/docs/5.7/migrations
-* https://laravel.com/docs/5.7/queries
-* https://laravel.com/docs/5.7/views
-* https://laravel.com/docs/5.7/eloquent
-* https://laravel.com/docs/5.7/eloquent-relationships
-* https://laravel.com/docs/5.7/requests
-* https://laravel.com/docs/5.7/errors
+* https://laravel.com/docs/5.8/authentication
+* https://laravel.com/docs/5.8/authorization
+* https://laravel.com/docs/5.8/routing
+* https://laravel.com/docs/5.8/migrations
+* https://laravel.com/docs/5.8/queries
+* https://laravel.com/docs/5.8/views
+* https://laravel.com/docs/5.8/eloquent
+* https://laravel.com/docs/5.8/eloquent-relationships
+* https://laravel.com/docs/5.8/requests
+* https://laravel.com/docs/5.8/errors
 
 ###### Updates:
+* Update to Laravel 5.8
 * Added [Laravel Blocker Package](https://github.com/jeremykenedy/laravel-blocker)
 * Added [PHP Info Package](https://github.com/jeremykenedy/laravel-phpinfo)
 * Update to Bootstrap 4
@@ -544,16 +543,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/5.7/eloquent#soft-deleting) and Soft Deletes Management panel
+* Added [Soft Deletes](https://laravel.com/docs/5.8/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/5.7/errors#logging) with admin UI using MonoLog
-* Added Active Nav states using [Laravel Requests](https://laravel.com/docs/5.7/requests)
+* Added Robust [Laravel Logging](https://laravel.com/docs/5.8/errors#logging) with admin UI using MonoLog
+* Added Active Nav states using [Laravel Requests](https://laravel.com/docs/5.8/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)
@@ -802,6 +801,7 @@ laravel-auth
 │   │   └── sass
 │   │       ├── _avatar.scss
 │   │       ├── _badges.scss
+│   │       ├── _bootstrap-social.scss
 │   │       ├── _buttons.scss
 │   │       ├── _forms.scss
 │   │       ├── _helpers.scss

composer.json

@@ -21,7 +21,7 @@
         "jeremykenedy/laravel-roles": "^1.2",
         "jeremykenedy/laravel2step": "^1.0",
         "jeremykenedy/uuid": "^3.1",
-        "laravel/framework": "5.7.*",
+        "laravel/framework": "5.8.*",
         "laravel/socialite": "^3.0",
         "laravel/tinker": "^1.0",
         "laravelcollective/html": "^5.5",
@@ -34,11 +34,12 @@
         "socialiteproviders/youtube": "^3.0"
     },
     "require-dev": {
+        "beyondcode/laravel-dump-server": "^1.0",
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^2.0",
-        "phpunit/phpunit": "^7.0"
+        "nunomaduro/collision": "^3.0",
+        "phpunit/phpunit": "^7.5"
     },
     "autoload": {
         "classmap": [
@@ -61,20 +62,20 @@
         }
     },
     "scripts": {
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover --ansi"
+        ],
         "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"
+            "@php artisan key:generate --ansi"
         ]
     },
     "config": {
+        "optimize-autoloader": true,
         "preferred-install": "dist",
-        "sort-packages": true,
-        "optimize-autoloader": true
+        "sort-packages": true
     }
 }

package.json

@@ -3,7 +3,7 @@
     "scripts": {
         "dev": "npm run development",
         "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch": "npm run development -- --watch",
         "watch-poll": "npm run watch -- --watch-poll",
         "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
         "prod": "npm run production",
@@ -14,7 +14,7 @@
         "bootstrap": "^4.3.1",
         "cross-env": "^5.2",
         "font-awesome": "^4.7.0",
-        "jquery": "^3.3",
+        "jquery": "^3.2",
         "laravel-mix": "^4.0.14",
         "lodash": "^4.17.11",
         "popper.js": "^1.14",

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/app.js": "/js/app.js?id=7722393cb7a03c519296",
-    "/css/app.css": "/css/app.css?id=431f58dc5de6d90acbc8"
+    "/js/app.js": "/js/app.js?id=601e081117d43fe09903",
+    "/css/app.css": "/css/app.css?id=89c0c4a161c578ed730e"
 }

resources/assets/js/app.js

@@ -19,8 +19,8 @@ window.Vue = require('vue');
  * or customize the JavaScript scaffolding to fit your unique needs.
  */
 
-//Vue.component('example-component', require('./components/ExampleComponent.vue'));
-Vue.component('users-count', require('./components/UsersCount.vue'));
+//Vue.component('example-component', require('./components/ExampleComponent.vue').default);
+Vue.component('users-count', require('./components/UsersCount.vue').default);
 
 const app = new Vue({
     el: '#app'

resources/assets/sass/_bootstrap-social.scss

@@ -5,8 +5,13 @@
  * Licensed under the MIT License
  *
  * https://github.com/lipis/bootstrap-social
+ * modified for bootstrap 4
  */
 
+$youtube: #ff0000;
+$twitch: #643fa6;
+$basecamp: #5ac45e;
+
 .btn.btn-social{position:relative;padding-left:44px;text-align:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.btn.btn-social>:first-child{position:absolute;left:0;top:0;bottom:0;width:32px;line-height:34px;font-size:1.6em;text-align:center;border-right:1px solid rgba(0,0,0,0.2)}
 .btn.btn-social.btn.btn-lg{padding-left:61px}.btn.btn-social.btn.btn-lg>:first-child{line-height:45px;width:45px;font-size:1.8em}
 .btn.btn-social.btn.btn-sm{padding-left:38px}.btn.btn-social.btn.btn-sm>:first-child{line-height:28px;width:28px;font-size:1.4em}
@@ -145,3 +150,21 @@
 .btn.btn-yahoo:active,.btn.btn-yahoo.active,.open>.dropdown-toggle.btn.btn-yahoo{background-image:none}
 .btn.btn-yahoo.disabled:hover,.btn.btn-yahoo[disabled]:hover,fieldset[disabled] .btn.btn-yahoo:hover,.btn.btn-yahoo.disabled:focus,.btn.btn-yahoo[disabled]:focus,fieldset[disabled] .btn.btn-yahoo:focus,.btn.btn-yahoo.disabled.focus,.btn.btn-yahoo[disabled].focus,fieldset[disabled] .btn.btn-yahoo.focus{background-color:#720e9e;border-color:rgba(0,0,0,0.2)}
 .btn.btn-yahoo .badge{color:#720e9e;background-color:#fff}
+
+.btn.btn-youtube{color:#fff;background-color:$youtube;border-color:$youtube}
+.btn.btn-youtube:focus,
+.btn.btn-youtube.focus{color:#fff;background-color:darken($youtube, 15%);border-color:darken($youtube, 15%)}
+.btn.btn-youtube:hover{color:#fff;background-color:darken($youtube, 15%);border-color:darken($youtube, 15%)}
+
+.btn.btn-twitch{color:#fff;background-color:$twitch;border-color:$twitch}
+.btn.btn-twitch:focus,
+.btn.btn-twitch.focus{color:#fff;background-color:darken($twitch, 15%);border-color:darken($twitch, 15%)}
+.btn.btn-twitch:hover{color:#fff;background-color:darken($twitch, 15%);border-color:darken($twitch, 15%)}
+
+.btn.btn-basecamp{color:#fff;background-color:$basecamp;border-color:$basecamp}
+.btn.btn-basecamp:focus,
+.btn.btn-basecamp.focus{color:#fff;background-color:darken($basecamp, 15%);border-color:darken($basecamp, 15%)}
+.btn.btn-basecamp:hover{color:#fff;background-color:darken($basecamp, 15%);border-color:darken($basecamp, 15%)}
+
+
+

resources/assets/sass/app.scss

@@ -8,8 +8,8 @@
 @import '~bootstrap/scss/bootstrap';
 
 .navbar-laravel {
-  background-color: #fff;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
+    background-color: #fff;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
 }
 
 // Font Awesome
@@ -19,15 +19,12 @@
 @import "~dropzone/dist/basic";
 @import "~dropzone/dist/dropzone";
 
-// Bootstrap Social Media Buttons - https://github.com/lipis/bootstrap-social
-@import "bootstrap-social";
-// @import "~bt4-social/bt4-social.css";
-
 @import "mixins";
 @import "margins";
 @import "helpers";
 @import "typography";
 @import "buttons";
+@import "bootstrap-social";
 @import "badges";
 @import "panels";
 @import "wells";

resources/views/scripts/check-changed.blade.php

@@ -1,10 +1,17 @@
 <script type="text/javascript">
   $('.btn-change-pw').click(function(event) {
-    event.preventDefault();
-    $('.pw-change-container').slideToggle(100);
-    $(this).find('.fa').toggleClass('fa-times');
-    $(this).find('.fa').toggleClass('fa-lock');
-    $(this).find('span').toggleText('', 'Cancel');
+    var pwInput = $('#password');
+    var pwInputConf = $('#password_confirmation');
+    pwInput.val('').prop('disabled', true);
+    pwInputConf.val('').prop('disabled', true);
+    $('.pw-change-container').slideToggle(100, function() {
+      pwInput.prop('disabled', function () {
+         return ! pwInput.prop('disabled');
+      });
+      pwInputConf.prop('disabled', function () {
+         return ! pwInputConf.prop('disabled');
+      });
+    });
   });
   $("input").keyup(function() {
     checkChanged();
@@ -13,12 +20,12 @@
     checkChanged();
   });
   function checkChanged() {
+    var saveBtn = $(".btn-save");
     if(!$('input').val()){
-      $(".btn-save").hide();
+      saveBtn.hide();
     }
     else {
-      $(".btn-save").show();
+      saveBtn.show();
     }
   }
-
-</script>
+</script>