Skip to content

Commit 1adc2e0

Browse files
authored
Merge pull request #41 from webreinvent/hotfix/v0.0.10
hotfix -> master | v0.0.10
2 parents bbeb64f + 6f7d0fe commit 1adc2e0

File tree

8 files changed

+42
-52
lines changed

8 files changed

+42
-52
lines changed

Resources/assets/build/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Resources/assets/build/app.js.LICENSE.txt

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,14 @@
44
* @license MIT
55
*/
66

7-
/*!
8-
* tiptap-commands v1.17.0
9-
* (c) 2021 überdosis GbR (limited liability)
10-
* @license MIT
11-
*/
12-
137
/*!
148
* tiptap-extensions v1.35.1
159
* (c) 2021 überdosis GbR (limited liability)
1610
* @license MIT
1711
*/
1812

1913
/*!
20-
* tiptap-utils v1.13.0
21-
* (c) 2021 überdosis GbR (limited liability)
22-
* @license MIT
23-
*/
24-
25-
/*!
26-
* FilePond 4.30.3
14+
* FilePond 4.30.4
2715
* Licensed under MIT, https://opensource.org/licenses/MIT/
2816
* Please visit https://pqina.nl/filepond/ for details.
2917
*/
@@ -35,13 +23,13 @@
3523
*/
3624

3725
/*!
38-
* FilePondPluginFileValidateSize 2.2.5
26+
* FilePondPluginFileValidateSize 2.2.8
3927
* Licensed under MIT, https://opensource.org/licenses/MIT/
4028
* Please visit https://pqina.nl/filepond/ for details.
4129
*/
4230

4331
/*!
44-
* FilePondPluginFileValidateType 1.2.6
32+
* FilePondPluginFileValidateType 1.2.8
4533
* Licensed under MIT, https://opensource.org/licenses/MIT/
4634
* Please visit https://pqina.nl/filepond/ for details.
4735
*/
@@ -58,12 +46,6 @@
5846
* Please visit https://pqina.nl/filepond/ for details.
5947
*/
6048

61-
/*!
62-
* FilePondPluginImagePreview 4.6.10
63-
* Licensed under MIT, https://opensource.org/licenses/MIT/
64-
* Please visit https://pqina.nl/filepond/ for details.
65-
*/
66-
6749
/*!
6850
* Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com
6951
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
@@ -79,24 +61,24 @@
7961
*/
8062

8163
/*!
82-
* Sizzle CSS Selector Engine v2.3.6
64+
* Sizzle CSS Selector Engine v2.3.9
8365
* https://sizzlejs.com/
8466
*
8567
* Copyright JS Foundation and other contributors
8668
* Released under the MIT license
8769
* https://js.foundation/
8870
*
89-
* Date: 2021-02-16
71+
* Date: 2022-12-19
9072
*/
9173

9274
/*!
93-
* Vue.js v2.6.14
94-
* (c) 2014-2021 Evan You
75+
* Vue.js v2.7.14
76+
* (c) 2014-2022 Evan You
9577
* Released under the MIT License.
9678
*/
9779

9880
/*!
99-
* jQuery JavaScript Library v3.6.0
81+
* jQuery JavaScript Library v3.6.3
10082
* https://jquery.com/
10183
*
10284
* Includes Sizzle.js
@@ -106,7 +88,7 @@
10688
* Released under the MIT license
10789
* https://jquery.org/license
10890
*
109-
* Date: 2021-03-02T17:08Z
91+
* Date: 2022-12-20T21:28Z
11092
*/
11193

11294
/*!
@@ -161,6 +143,8 @@
161143
* @license MIT
162144
*/
163145

146+
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
147+
164148
/** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
165149

166150
/**!
@@ -182,4 +166,4 @@
182166

183167
//! moment.js locale configuration
184168

185-
//! version : 0.5.34
169+
//! version : 0.5.40

Vue/app.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
window.Vue = require('vue');
1+
import Vue from 'vue'
2+
3+
window.Vue = Vue;
24

35
window.$ = require('jquery');
46
window.JQuery = require('jquery');

Vue/layouts/Backend.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66
<AsideMenu/>
77
</div>
88

9-
<div class="column is-12">
9+
<div class="column ml-5 mr-5">
1010
<router-view></router-view>
1111
</div>
1212
</div>
13-
14-
15-
1613
</template>
1714

Vue/pages/contents/CreateJs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export default {
153153
let new_item = {
154154
parent_id: null,
155155
vh_cms_content_type_id: null,
156-
vh_theme_id: this.page.assets.default_theme.id,
156+
vh_theme_id: this.page.assets.default_theme ? this.page.assets.default_theme.id : null,
157157
vh_theme_template_id: this.page.assets.default_template?this.page.assets.default_template.id:null,
158158
name: null,
159159
slug: null,

Vue/store/modules/contents.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,10 @@ export default {
117117
}
118118

119119

120-
state.new_item.vh_theme_id = assets.default_theme.id;
121-
state.new_item.vh_theme_template_id = assets.default_template.id;
120+
121+
122+
state.new_item.vh_theme_id = assets.default_theme ? assets.default_theme.id : null;
123+
state.new_item.vh_theme_template_id = assets.default_template ? assets.default_template.id : null;
122124

123125
payload = {
124126
key: 'new_item',

package.json

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,32 @@
22
"private": true,
33
"scripts": {
44
"dev": "npm run development",
5-
"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",
7-
"watch-poll": "npm run watch -- --watch-poll",
5+
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
6+
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
7+
"watch-poll": "npm run watch",
88
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --hot --progress --watch-poll --config=node_modules/laravel-mix/setup/webpack.config.js",
99
"prod": "npm run production",
10-
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
10+
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --config=node_modules/laravel-mix/setup/webpack.config.js",
1111
"build:stats": "ng build --stats-json"
1212
},
1313
"devDependencies": {
14+
"sass": "^1.30.0",
15+
"node-sass": "^7.0.0",
16+
"semver": "^7.3.5",
1417
"babel-eslint": "^10.0.1",
15-
"cross-env": "^7.0",
18+
"cross-env": "^7.0.3",
19+
"crypto-browserify": "^3.12.0",
20+
"crypto-js": "^4.1.1",
1621
"fs": "0.0.1-security",
17-
"fs-extra": "^8.1.0",
18-
"laravel-mix": "^5.0.9",
19-
"lodash": "^4.17.19",
20-
"node-sass": "^4.14.1",
21-
"raw-loader": "^4.0.0",
22+
"fs-extra": "^10.0.0",
23+
"laravel-mix": "^6.0.39",
24+
"lodash": "^4.17.21",
25+
"postcss": "^8.4.4",
26+
"raw-loader": "^4.0.2",
2227
"resolve-url-loader": "^4.0.0",
23-
"sass-loader": "^7.3.1",
24-
"vue-loader": "^14.2.4",
25-
"vue-template-compiler": "^2.6.10",
28+
"sass-loader": "^12.3.0",
29+
"vue-loader": "^15.9.8",
30+
"vue-template-compiler": "^2.6.14",
2631
"webpack-visualizer-plugin": "^0.1.11"
2732
},
2833
"dependencies": {

webpack.mix.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if (mix.inProduction()) {
2626
output_folder = "./";
2727

2828
mix.setPublicPath(publish_folder);
29-
mix.js(source_vue_folder+"/app.js", output_folder+'/build/app.js');
29+
mix.js(source_vue_folder+"/app.js", output_folder+'/build/app.js').vue();
3030

3131
} else {
3232

@@ -35,7 +35,7 @@ if (mix.inProduction()) {
3535

3636
mix.setPublicPath(publish_folder);
3737

38-
mix.js(source_vue_folder+"/app.js", output_folder+'/build/app.js');
38+
mix.js(source_vue_folder+"/app.js", output_folder+'/build/app.js').vue();
3939

4040
}
4141

0 commit comments

Comments
 (0)