diff --git a/public/hot b/public/hot new file mode 100644 index 000000000..934e3bbce --- /dev/null +++ b/public/hot @@ -0,0 +1 @@ +hot reloading \ No newline at end of file diff --git a/resources/assets/js/config/helper.js b/resources/assets/js/config/helper.js index 31b3181d1..d2ae42875 100644 --- a/resources/assets/js/config/helper.js +++ b/resources/assets/js/config/helper.js @@ -2,7 +2,7 @@ export function stack_error(response) { if (typeof response.data == 'string') { toastr.error(response.status + ' ' + response.statusText) } else { - let data = response.data + let data = response.data.errors let content = ''; Object.keys(data).map(function(key, index) { diff --git a/resources/assets/js/views/dashboard/article/Form.vue b/resources/assets/js/views/dashboard/article/Form.vue index bb8f601ad..cfe40d830 100644 --- a/resources/assets/js/views/dashboard/article/Form.vue +++ b/resources/assets/js/views/dashboard/article/Form.vue @@ -328,4 +328,4 @@ export default { } } } - \ No newline at end of file + diff --git a/resources/assets/js/views/dashboard/discussion/Discussion.vue b/resources/assets/js/views/dashboard/discussion/Discussion.vue index 03f358d54..806a5d010 100644 --- a/resources/assets/js/views/dashboard/discussion/Discussion.vue +++ b/resources/assets/js/views/dashboard/discussion/Discussion.vue @@ -56,7 +56,9 @@ export default { }, methods: { username(value) { - return value.name + if (value) { + return value.data.name + } }, tableActions(action, data) { if (action == 'edit-item') { diff --git a/resources/assets/js/views/dashboard/user/Form.vue b/resources/assets/js/views/dashboard/user/Form.vue index 3d614a959..422a8afa9 100644 --- a/resources/assets/js/views/dashboard/user/Form.vue +++ b/resources/assets/js/views/dashboard/user/Form.vue @@ -2,7 +2,7 @@
- +
diff --git a/webpack.mix.js b/webpack.mix.js index 6d9410190..35526b1ec 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -13,10 +13,10 @@ const path = require('path'); */ mix.webpackConfig({ - output: { - publicPath: "/", - chunkFilename: 'js/[name].[chunkhash].js' - }, + // output: { + // publicPath: "/", + // chunkFilename: 'js/[name].[chunkhash].js' + // }, resolve: { alias: { 'components': 'assets/js/components', @@ -37,5 +37,4 @@ mix.webpackConfig({ mix.js('resources/assets/js/app.js', 'public/js') .sass('resources/assets/sass/app.scss', 'public/css') .js('resources/assets/js/home.js', 'public/js') - .sass('resources/assets/sass/home.scss', 'public/css') - .version(); + .sass('resources/assets/sass/home.scss', 'public/css');