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

Commit 3c1797d

Browse files
committed
Merge branch 'release/0.3.0'
2 parents 8d2f611 + eb59e81 commit 3c1797d

File tree

176 files changed

+3289
-4829
lines changed

Some content is hidden

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

176 files changed

+3289
-4829
lines changed

.eslintrc

+4-45
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
@@ -20,43 +15,7 @@
2015
"moment": true,
2116
"axios": true,
2217
"Vue": true,
23-
"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-
}]
18+
"CONFIG": true,
19+
"__VERSION": true
20+
}
6221
}

.gitconfig

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[core]
2+
ignorecase = true

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ Homestead.yaml
1616
npm-debug.log
1717
yarn-error.log
1818
.env
19+
.DS_Store

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

+1-1
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;

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"php": "^7.1.3",
99
"fideloper/proxy": "^4.0",
1010
"guzzlehttp/guzzle": "^6.3",
11-
"laravel/framework": "5.6.*",
11+
"laravel/framework": "5.7.*",
1212
"laravel/tinker": "^1.0"
1313
},
1414
"require-dev": {

0 commit comments

Comments
 (0)