Skip to content

Commit 089dec5

Browse files
committed
update to laravel 5.8, fix vue .default, and sm icons
1 parent d38f7b4 commit 089dec5

File tree

10 files changed

+110292
-61
lines changed

10 files changed

+110292
-61
lines changed

README.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Laravel-Auth
2-
#### 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.
2+
#### 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.
33
[![Build Status](https://travis-ci.org/jeremykenedy/laravel-auth.svg?branch=master)](https://travis-ci.org/jeremykenedy/laravel-auth)
44
[![StyleCI](https://styleci.io/repos/44714043/shield?branch=master)](https://styleci.io/repos/44714043)
55
[![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 @@
4242
- [Laravel Auth License](#laravel-auth-license)
4343

4444
### About
45-
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.
45+
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.
4646

4747
### Features
48-
#### A [Laravel](https://laravel.com/) 5.7.x with minimal [Bootstrap](https://getbootstrap.com) 4.0.x project.
48+
#### A [Laravel](https://laravel.com/) 5.8.x with minimal [Bootstrap](https://getbootstrap.com) 4.0.x project.
4949

5050
| Laravel-Auth Features |
5151
| :------------ |
52-
|Built on [Laravel](https://laravel.com/) 5.7|
52+
|Built on [Laravel](https://laravel.com/) 5.8|
5353
|Built on [Bootstrap](https://getbootstrap.com/) 4|
5454
|Uses [MySQL](https://github.com/mysql) Database (can be changed)|
55-
|Uses [Artisan](https://laravel.com/docs/5.7/artisan) to manage database migration, schema creations, and create/publish page controller templates|
55+
|Uses [Artisan](https://laravel.com/docs/5.8/artisan) to manage database migration, schema creations, and create/publish page controller templates|
5656
|Dependencies are managed with [COMPOSER](https://getcomposer.org/)|
5757
|Laravel Scaffolding **User** and **Administrator Authentication**.|
5858
|User [Socialite Logins](https://github.com/laravel/socialite) ready to go - See API list used below|
5959
|[Google Maps API v3](https://developers.google.com/maps/documentation/javascript/) for User Location lookup and Geocoding|
6060
|CRUD (Create, Read, Update, Delete) Themes Management|
6161
|CRUD (Create, Read, Update, Delete) User Management|
62-
|Robust [Laravel Logging](https://laravel.com/docs/5.7/errors#logging) with admin UI using MonoLog|
62+
|Robust [Laravel Logging](https://laravel.com/docs/5.8/errors#logging) with admin UI using MonoLog|
6363
|Google [reCaptcha Protection with Google API](https://developers.google.com/recaptcha/)|
6464
|User Registration with email verification|
65-
|Makes use of Laravel [Mix](https://laravel.com/docs/5.7/mix) to compile assets|
66-
|Makes use of [Language Localization Files](https://laravel.com/docs/5.7/localization)|
67-
|Active Nav states using [Laravel Requests](https://laravel.com/docs/5.7/requests)|
65+
|Makes use of Laravel [Mix](https://laravel.com/docs/5.8/mix) to compile assets|
66+
|Makes use of [Language Localization Files](https://laravel.com/docs/5.8/localization)|
67+
|Active Nav states using [Laravel Requests](https://laravel.com/docs/5.8/requests)|
6868
|Restrict User Email Activation Attempts|
6969
|Capture IP to users table upon signup|
7070
|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
7575
|User Password Reset via Email Token|
7676
|User Login with remember password|
7777
|User [Roles/ACL Implementation](https://github.com/jeremykenedy/laravel-roles)|
78-
|Makes use of [Laravel's Soft Delete Structure](https://laravel.com/docs/5.7/eloquent#soft-deleting)|
78+
|Makes use of [Laravel's Soft Delete Structure](https://laravel.com/docs/5.8/eloquent#soft-deleting)|
7979
|Soft Deleted Users Management System|
8080
|Permanently Delete Soft Deleted Users|
8181
|User Delete Account with Goodbye email|
@@ -91,8 +91,6 @@ Laravel 5.7 with user authentication, registration with email confirmation, soci
9191
|404 Page|
9292
|403 Page|
9393
|Configurable Email Notification via [Laravel-Exception-Notifier](https://github.com/jeremykenedy/laravel-exception-notifier)|
94-
|User Delete with Goodbye email|
95-
|User Restore Deleted Account|
9694
|Activity Logging using [Laravel-logger](https://github.com/jeremykenedy/laravel-logger)|
9795
|Optional 2-step account login verfication with [Laravel 2-Step Verification](https://github.com/jeremykenedy/laravel2step)|
9896
|Uses [Laravel PHP Info](https://github.com/jeremykenedy/laravel-phpinfo) package|
@@ -133,7 +131,7 @@ php artisan vendor:publish --tag=laravel2step
133131
#### Optionally Build Cache
134132
1. From the projects root folder run `php artisan config:cache`
135133

136-
###### 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)
134+
###### 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)
137135

138136
### Seeds
139137
##### Seeded Roles
@@ -522,18 +520,19 @@ INSTAGRAM_REDIRECT_URI=http://laravel-authentication.local/social/handle/instagr
522520
```
523521

524522
#### Laravel Developement Packages Used References
525-
* https://laravel.com/docs/5.7/authentication
526-
* https://laravel.com/docs/5.7/authorization
527-
* https://laravel.com/docs/5.7/routing
528-
* https://laravel.com/docs/5.7/migrations
529-
* https://laravel.com/docs/5.7/queries
530-
* https://laravel.com/docs/5.7/views
531-
* https://laravel.com/docs/5.7/eloquent
532-
* https://laravel.com/docs/5.7/eloquent-relationships
533-
* https://laravel.com/docs/5.7/requests
534-
* https://laravel.com/docs/5.7/errors
523+
* https://laravel.com/docs/5.8/authentication
524+
* https://laravel.com/docs/5.8/authorization
525+
* https://laravel.com/docs/5.8/routing
526+
* https://laravel.com/docs/5.8/migrations
527+
* https://laravel.com/docs/5.8/queries
528+
* https://laravel.com/docs/5.8/views
529+
* https://laravel.com/docs/5.8/eloquent
530+
* https://laravel.com/docs/5.8/eloquent-relationships
531+
* https://laravel.com/docs/5.8/requests
532+
* https://laravel.com/docs/5.8/errors
535533

536534
###### Updates:
535+
* Update to Laravel 5.8
537536
* Added [Laravel Blocker Package](https://github.com/jeremykenedy/laravel-blocker)
538537
* Added [PHP Info Package](https://github.com/jeremykenedy/laravel-phpinfo)
539538
* Update to Bootstrap 4
@@ -544,16 +543,16 @@ INSTAGRAM_REDIRECT_URI=http://laravel-authentication.local/social/handle/instagr
544543
* Update to Laravel 5.5
545544
* Added User Delete with Goodbye email
546545
* Added User Restore Deleted Account from email with secure token
547-
* Added [Soft Deletes](https://laravel.com/docs/5.7/eloquent#soft-deleting) and Soft Deletes Management panel
546+
* Added [Soft Deletes](https://laravel.com/docs/5.8/eloquent#soft-deleting) and Soft Deletes Management panel
548547
* Added User Account Settings to Profile Edit
549548
* Added User Change Password to Profile Edit
550549
* Added User Delete Account to Profile Edit
551550
* Added [Password Strength Meter](https://github.com/elboletaire/password-strength-meter)
552551
* Added [hideShowPassword](https://github.com/cloudfour/hideShowPassword)
553552
* Added Admin Routing Details
554553
* Admin PHP Information
555-
* Added Robust [Laravel Logging](https://laravel.com/docs/5.7/errors#logging) with admin UI using MonoLog
556-
* Added Active Nav states using [Laravel Requests](https://laravel.com/docs/5.7/requests)
554+
* Added Robust [Laravel Logging](https://laravel.com/docs/5.8/errors#logging) with admin UI using MonoLog
555+
* Added Active Nav states using [Laravel Requests](https://laravel.com/docs/5.8/requests)
557556
* Added [Laravel Debugger](https://github.com/barryvdh/laravel-debugbar) with Service Provider to manage status in `.env` file.
558557
* Updated Capture IP not found IP address
559558
* Added User Avatar Image AJAX Upload with [Dropzone.js](http://www.dropzonejs.com/#configuration)
@@ -802,6 +801,7 @@ laravel-auth
802801
│   │   └── sass
803802
│   │   ├── _avatar.scss
804803
│   │   ├── _badges.scss
804+
│   │   ├── _bootstrap-social.scss
805805
│   │   ├── _buttons.scss
806806
│   │   ├── _forms.scss
807807
│   │   ├── _helpers.scss

composer.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"jeremykenedy/laravel-roles": "^1.2",
2222
"jeremykenedy/laravel2step": "^1.0",
2323
"jeremykenedy/uuid": "^3.1",
24-
"laravel/framework": "5.7.*",
24+
"laravel/framework": "5.8.*",
2525
"laravel/socialite": "^3.0",
2626
"laravel/tinker": "^1.0",
2727
"laravelcollective/html": "^5.5",
@@ -34,11 +34,12 @@
3434
"socialiteproviders/youtube": "^3.0"
3535
},
3636
"require-dev": {
37+
"beyondcode/laravel-dump-server": "^1.0",
3738
"filp/whoops": "^2.0",
3839
"fzaninotto/faker": "^1.4",
3940
"mockery/mockery": "^1.0",
40-
"nunomaduro/collision": "^2.0",
41-
"phpunit/phpunit": "^7.0"
41+
"nunomaduro/collision": "^3.0",
42+
"phpunit/phpunit": "^7.5"
4243
},
4344
"autoload": {
4445
"classmap": [
@@ -61,20 +62,20 @@
6162
}
6263
},
6364
"scripts": {
65+
"post-autoload-dump": [
66+
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
67+
"@php artisan package:discover --ansi"
68+
],
6469
"post-root-package-install": [
6570
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
6671
],
6772
"post-create-project-cmd": [
68-
"@php artisan key:generate"
69-
],
70-
"post-autoload-dump": [
71-
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
72-
"@php artisan package:discover"
73+
"@php artisan key:generate --ansi"
7374
]
7475
},
7576
"config": {
77+
"optimize-autoloader": true,
7678
"preferred-install": "dist",
77-
"sort-packages": true,
78-
"optimize-autoloader": true
79+
"sort-packages": true
7980
}
8081
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"scripts": {
44
"dev": "npm run development",
55
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
6-
"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",
6+
"watch": "npm run development -- --watch",
77
"watch-poll": "npm run watch -- --watch-poll",
88
"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",
99
"prod": "npm run production",
@@ -14,7 +14,7 @@
1414
"bootstrap": "^4.3.1",
1515
"cross-env": "^5.2",
1616
"font-awesome": "^4.7.0",
17-
"jquery": "^3.3",
17+
"jquery": "^3.2",
1818
"laravel-mix": "^4.0.14",
1919
"lodash": "^4.17.11",
2020
"popper.js": "^1.14",

public/css/app.css

Lines changed: 17679 additions & 3 deletions
Large diffs are not rendered by default.

public/js/app.js

Lines changed: 92528 additions & 1 deletion
Large diffs are not rendered by default.

public/mix-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"/js/app.js": "/js/app.js?id=7722393cb7a03c519296",
3-
"/css/app.css": "/css/app.css?id=431f58dc5de6d90acbc8"
2+
"/js/app.js": "/js/app.js?id=601e081117d43fe09903",
3+
"/css/app.css": "/css/app.css?id=89c0c4a161c578ed730e"
44
}

resources/assets/js/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ window.Vue = require('vue');
1919
* or customize the JavaScript scaffolding to fit your unique needs.
2020
*/
2121

22-
//Vue.component('example-component', require('./components/ExampleComponent.vue'));
23-
Vue.component('users-count', require('./components/UsersCount.vue'));
22+
//Vue.component('example-component', require('./components/ExampleComponent.vue').default);
23+
Vue.component('users-count', require('./components/UsersCount.vue').default);
2424

2525
const app = new Vue({
2626
el: '#app'

resources/assets/sass/_bootstrap-social.scss

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@
55
* Licensed under the MIT License
66
*
77
* https://github.com/lipis/bootstrap-social
8+
* modified for bootstrap 4
89
*/
910

11+
$youtube: #ff0000;
12+
$twitch: #643fa6;
13+
$basecamp: #5ac45e;
14+
1015
.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)}
1116
.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}
1217
.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 @@
145150
.btn.btn-yahoo:active,.btn.btn-yahoo.active,.open>.dropdown-toggle.btn.btn-yahoo{background-image:none}
146151
.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)}
147152
.btn.btn-yahoo .badge{color:#720e9e;background-color:#fff}
153+
154+
.btn.btn-youtube{color:#fff;background-color:$youtube;border-color:$youtube}
155+
.btn.btn-youtube:focus,
156+
.btn.btn-youtube.focus{color:#fff;background-color:darken($youtube, 15%);border-color:darken($youtube, 15%)}
157+
.btn.btn-youtube:hover{color:#fff;background-color:darken($youtube, 15%);border-color:darken($youtube, 15%)}
158+
159+
.btn.btn-twitch{color:#fff;background-color:$twitch;border-color:$twitch}
160+
.btn.btn-twitch:focus,
161+
.btn.btn-twitch.focus{color:#fff;background-color:darken($twitch, 15%);border-color:darken($twitch, 15%)}
162+
.btn.btn-twitch:hover{color:#fff;background-color:darken($twitch, 15%);border-color:darken($twitch, 15%)}
163+
164+
.btn.btn-basecamp{color:#fff;background-color:$basecamp;border-color:$basecamp}
165+
.btn.btn-basecamp:focus,
166+
.btn.btn-basecamp.focus{color:#fff;background-color:darken($basecamp, 15%);border-color:darken($basecamp, 15%)}
167+
.btn.btn-basecamp:hover{color:#fff;background-color:darken($basecamp, 15%);border-color:darken($basecamp, 15%)}
168+
169+
170+

resources/assets/sass/app.scss

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
@import '~bootstrap/scss/bootstrap';
99

1010
.navbar-laravel {
11-
background-color: #fff;
12-
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
11+
background-color: #fff;
12+
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
1313
}
1414

1515
// Font Awesome
@@ -19,15 +19,12 @@
1919
@import "~dropzone/dist/basic";
2020
@import "~dropzone/dist/dropzone";
2121

22-
// Bootstrap Social Media Buttons - https://github.com/lipis/bootstrap-social
23-
@import "bootstrap-social";
24-
// @import "~bt4-social/bt4-social.css";
25-
2622
@import "mixins";
2723
@import "margins";
2824
@import "helpers";
2925
@import "typography";
3026
@import "buttons";
27+
@import "bootstrap-social";
3128
@import "badges";
3229
@import "panels";
3330
@import "wells";
Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
<script type="text/javascript">
22
$('.btn-change-pw').click(function(event) {
3-
event.preventDefault();
4-
$('.pw-change-container').slideToggle(100);
5-
$(this).find('.fa').toggleClass('fa-times');
6-
$(this).find('.fa').toggleClass('fa-lock');
7-
$(this).find('span').toggleText('', 'Cancel');
3+
var pwInput = $('#password');
4+
var pwInputConf = $('#password_confirmation');
5+
pwInput.val('').prop('disabled', true);
6+
pwInputConf.val('').prop('disabled', true);
7+
$('.pw-change-container').slideToggle(100, function() {
8+
pwInput.prop('disabled', function () {
9+
return ! pwInput.prop('disabled');
10+
});
11+
pwInputConf.prop('disabled', function () {
12+
return ! pwInputConf.prop('disabled');
13+
});
14+
});
815
});
916
$("input").keyup(function() {
1017
checkChanged();
@@ -13,12 +20,12 @@
1320
checkChanged();
1421
});
1522
function checkChanged() {
23+
var saveBtn = $(".btn-save");
1624
if(!$('input').val()){
17-
$(".btn-save").hide();
25+
saveBtn.hide();
1826
}
1927
else {
20-
$(".btn-save").show();
28+
saveBtn.show();
2129
}
2230
}
23-
24-
</script>
31+
</script>

0 commit comments

Comments
 (0)