Skip to content
This repository was archived by the owner on Apr 1, 2021. It is now read-only.

Commit de1eb0a

Browse files
adenvtadenvt
committed
Merge branch 'feature/change-lint' into develop
2 parents 6cde32d + 2ea93bf commit de1eb0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+964
-912
lines changed

‎.eslintrc

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
22
"extends": [
3-
"standard",
4-
"plugin:vue/strongly-recommended",
5-
"plugin:unicorn/recommended"
6-
],
7-
"plugins": [
8-
"unicorn"
3+
"adenvt"
94
],
105
"env": {
116
"browser": true
@@ -21,42 +16,5 @@
2116
"axios": true,
2217
"Vue": true,
2318
"CONFIG": true
24-
},
25-
"rules": {
26-
"curly": ["error", "multi-or-nest"],
27-
"camelcase": "warn",
28-
"comma-dangle": ["error", "always-multiline"],
29-
"no-var": "error",
30-
"no-console": ["error", {
31-
"allow": ["warn", "error"]
32-
}],
33-
"prefer-const": ["error", {
34-
"destructuring": "all"
35-
}],
36-
"quote-props": ["error", "consistent-as-needed"],
37-
"prefer-template": "error",
38-
"object-curly-spacing": ["error", "always"],
39-
"linebreak-style": "off",
40-
"key-spacing": ["error", {
41-
"align": {
42-
"beforeColon": false,
43-
"afterColon": true,
44-
"on": "colon"
45-
}
46-
}],
47-
"vue/require-default-prop": "off",
48-
"vue/require-prop-types": "off",
49-
"vue/prop-name-casing": ["error", "camelCase"],
50-
"unicorn/catch-error-name": ["error", {
51-
"name": "err"
52-
}]
53-
},
54-
"overrides": [{
55-
"files": ["resources/assets/js/coreui/**/*.vue"],
56-
"rules": {
57-
"unicorn/filename-case": ["error", {
58-
"case": "pascalCase"
59-
}]
60-
}
61-
}]
19+
}
6220
}

‎.gitconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[core]
2+
ignorecase = true

‎app/Model/User.php renamed to ‎app/Models/User.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace App\Model;
3+
namespace App\Models;
44

55
use Illuminate\Notifications\Notifiable;
66
use Illuminate\Foundation\Auth\User as Authenticatable;

‎config/auth.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
| reset options for your application. You may change these defaults
1212
| as required, but they're a perfect start for most applications.
1313
|
14-
*/
14+
*/
1515

16-
'defaults' => [
17-
'guard' => 'web',
16+
'defaults' => [
17+
'guard' => 'web',
1818
'passwords' => 'users',
1919
],
2020

@@ -33,16 +33,16 @@
3333
|
3434
| Supported: "session", "token"
3535
|
36-
*/
36+
*/
3737

38-
'guards' => [
38+
'guards' => [
3939
'web' => [
40-
'driver' => 'session',
40+
'driver' => 'session',
4141
'provider' => 'users',
4242
],
4343

4444
'api' => [
45-
'driver' => 'token',
45+
'driver' => 'token',
4646
'provider' => 'users',
4747
],
4848
],
@@ -62,12 +62,12 @@
6262
|
6363
| Supported: "database", "eloquent"
6464
|
65-
*/
65+
*/
6666

6767
'providers' => [
6868
'users' => [
6969
'driver' => 'eloquent',
70-
'model' => \App\Model\User::class,
70+
'model' => \App\Models\User::class,
7171
],
7272

7373
// 'users' => [
@@ -89,13 +89,13 @@
8989
| considered valid. This security feature keeps tokens short-lived so
9090
| they have less time to be guessed. You may change this as needed.
9191
|
92-
*/
92+
*/
9393

9494
'passwords' => [
9595
'users' => [
9696
'provider' => 'users',
97-
'table' => 'password_resets',
98-
'expire' => 60,
97+
'table' => 'password_resets',
98+
'expire' => 60,
9999
],
100100
],
101101

0 commit comments

Comments
 (0)