Skip to content

Commit 44decda

Browse files
committed
Merge tag 'v2.0.3' into develop
# Conflicts: # package.json # src/store/settings/store.js
2 parents 7eedd84 + 9ab9419 commit 44decda

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ Vue.use(FileManager, {
7373
}
7474
```
7575

76+
In development mode you can change base url for application - add this param in your laravel .env file
77+
78+
```
79+
MIX_LFM_BASE_URL=http://my-url.loc/file-manager/
80+
```
81+
7682
Now vue component is registered and you can use it in your app
7783
```
7884
<file-manager></file-manager>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "laravel-file-manager",
3-
"version": "2.0.2",
3+
"version": "2.0.3",
44
"description": "File manager for Laravel",
55
"keywords": [
66
"laravel",

src/store/settings/mutations.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ export default {
3535
*/
3636
initBaseUrl(state) {
3737
if (!state.baseUrl) {
38-
if (process.env.NODE_ENV === 'development') {
38+
if (process.env.NODE_ENV === 'development' && process.env.VUE_APP_AXIOS_BASE_URL) {
39+
// vue .env
3940
state.baseUrl = process.env.VUE_APP_AXIOS_BASE_URL;
41+
} else if (process.env.NODE_ENV === 'development' && process.env.MIX_LFM_BASE_URL) {
42+
// laravel .env
43+
state.baseUrl = process.env.MIX_LFM_BASE_URL;
4044
} else {
4145
let baseUrl = `${window.location.protocol}//${window.location.hostname}`;
4246

src/store/settings/store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default {
1111
state() {
1212
return {
1313
// App version
14-
version: '2.0.2',
14+
version: '2.0.3',
1515

1616
// this headers will be merged with default headers
1717
headers: {},

0 commit comments

Comments
 (0)