Skip to content

Commit bc36068

Browse files
committed
Merge branch 'release/v2.0.0'
2 parents d61caea + 4057c84 commit bc36068

File tree

113 files changed

+12816
-15776
lines changed

Some content is hidden

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

113 files changed

+12816
-15776
lines changed

.babelrc

Lines changed: 0 additions & 12 deletions
This file was deleted.

.browserslistrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
> 1%
2+
last 2 versions
3+
not ie <= 8

.editorconfig

Lines changed: 0 additions & 9 deletions
This file was deleted.

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
VUE_APP_AXIOS_BASE_URL=

.eslintignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
/build/
2-
/config/
31
/dist/
42
/*.js

.eslintrc.js

Lines changed: 28 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,35 @@
1-
// https://eslint.org/docs/user-guide/configuring
2-
31
module.exports = {
42
root: true,
5-
parserOptions: {
6-
parser: 'babel-eslint'
7-
},
83
env: {
9-
browser: true,
4+
node: true,
105
},
11-
// https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
12-
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
13-
extends: ['plugin:vue/essential', 'airbnb-base'],
14-
// required to lint *.vue files
15-
plugins: [
16-
'vue'
6+
extends: [
7+
'plugin:vue/essential',
8+
'@vue/airbnb',
179
],
18-
// check if imports actually resolve
19-
settings: {
20-
'import/resolver': {
21-
webpack: {
22-
config: 'build/webpack.base.conf.js'
10+
rules: {
11+
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
12+
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
13+
'no-param-reassign': [
14+
"error",
15+
{
16+
"props": true,
17+
"ignorePropertyModificationsFor": [
18+
"state",
19+
"acc",
20+
"e",
21+
"ctx",
22+
"req",
23+
"request",
24+
"res",
25+
"response",
26+
"$scope"
27+
]
2328
}
24-
}
29+
],
30+
'max-len': 'off',
2531
},
26-
// add your custom rules here
27-
rules: {
28-
// don't require .vue extension when importing
29-
'import/extensions': ['error', 'always', {
30-
js: 'never',
31-
vue: 'never'
32-
}],
33-
// disallow reassignment of function parameters
34-
// disallow parameter object manipulation except for specific exclusions
35-
'no-param-reassign': ['error', {
36-
props: true,
37-
ignorePropertyModificationsFor: [
38-
'state', // for vuex state
39-
'acc', // for reduce accumulators
40-
'e' // for e.returnvalue
41-
]
42-
}],
43-
// allow optionalDependencies
44-
'import/no-extraneous-dependencies': ['error', {
45-
optionalDependencies: ['test/unit/index.js']
46-
}],
47-
// allow debugger during development
48-
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
49-
}
50-
}
32+
parserOptions: {
33+
parser: 'babel-eslint',
34+
},
35+
};

.gitignore

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1-
.DS_Store
2-
node_modules/
1+
/node_modules/
32
/dist/
4-
npm-debug.log*
5-
yarn-debug.log*
6-
yarn-error.log*
73

84
# Editor directories and files
9-
.idea
10-
.vscode
11-
*.suo
12-
*.ntvs*
13-
*.njsproj
14-
*.sln
5+
/.idea/
6+
/.env.local

.npmignore

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,2 @@
1-
#dirs
2-
build/
3-
config/
4-
dist/
5-
6-
#linters
7-
.eslintrc*
8-
.eslintignore
9-
10-
.postcssrc.js
11-
12-
#babel
13-
.babelrc
14-
15-
#editor settings
16-
.idea
17-
.editorconfig
1+
/.idea/
2+
/tests/

.postcssrc.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

README.md

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
77
![Laravel File Manager](https://raw.github.com/alexusmai/vue-laravel-file-manager/master/src/assets/laravel-file-manager.gif?raw=true)
88

9+
# v 2.0.0
10+
11+
* Audio player (mp3, ogg, wav, aac), Video player (webm, mp4) - ([Plyr](https://github.com/sampotts/plyr))
12+
* Code editor - ([Code Mirror](https://github.com/codemirror/codemirror))
13+
* Image cropper - ([Cropper.js](https://github.com/fengyuanchen/cropperjs))
14+
* Zip / Unzip - only for local disks
15+
16+
917
## Installation
1018

1119
### NPM
@@ -41,6 +49,30 @@ Vue.use(FileManager, {store});
4149

4250
`The application store module will be registered under the name 'fm'`
4351

52+
You can overwrite some default settings
53+
54+
```
55+
Vue.use(FileManager, {
56+
store, // required
57+
58+
// not required params
59+
headers: {'Authorization': 'Bearer ...'}, // add header
60+
// OR
61+
headers: {'X-CSRF-TOKEN': 'token'}, // overwrite default header Axios
62+
baseUrl: 'http://my_url:80/file-manager/', // overwrite base url Axios
63+
windowsConfig: 2,
64+
lang: 'de', // set language
65+
translation: { // add new translation
66+
name: de,
67+
content: {
68+
about: 'Über',
69+
back: 'Zurück',
70+
... see lang file structure
71+
},
72+
},
73+
}
74+
```
75+
4476
Now vue component is registered and you can use it in your app
4577
```
4678
<file-manager></file-manager>
@@ -55,4 +87,4 @@ Don't forget add a csrf token to head block in your Laravel view and add bootstr
5587
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css">
5688
```
5789

58-
Warning! Package use axios (Promise) - use babel-polyfill for ie11
90+
Warning! Package use axios (Promise) - use babel-polyfill for ie11

babel.config.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module.exports = {
2+
presets: [
3+
[ '@vue/app', {
4+
useBuiltIns: 'entry'
5+
}]
6+
],
7+
};

build/build.js

Lines changed: 0 additions & 41 deletions
This file was deleted.

build/check-versions.js

Lines changed: 0 additions & 54 deletions
This file was deleted.

build/package.js

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)