Optimize form error alert

jcc · Jan 7, 2018 · 6314fc2 · j574144 · Jan 10, 2018 · jcc
1 parent c2065c0
commit 6314fc2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/public/hot b/public/hot
@@ -0,0 +1 @@
+hot reloading
diff --git 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
@@ -328,4 +328,4 @@ export default {
         }
     }
 }
-</style>
+</style>
diff --git 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
@@ -2,7 +2,7 @@
     <div class="row">
         <form class="form col-md-4 col-md-offset-4" role="form" @submit.prevent="onSubmit">
             <div class="form-group text-center">
-                <img :src="user.avatar ? user.avatar : 'https://pigjian.com/uploads/default_avatar.png'" id="avatar" class="img-circle" width="100" :alt="user.name">
+                <img :src="user.avatar ? user.avatar : '/images/default.png'" id="avatar" class="img-circle" width="100" :alt="user.name">
             </div>
             <div class="form-group">
                 <label for="name">{{ $t('form.name') }}</label>

diff --git 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');
-Original file line number
+Diff line change
@@ Expand Up / @@ -328,4 +328,4 @@ export default { @@
             }
         }
     }
-    </style>
+    </style>