Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.kiaisoft.com/kiaisoft.anh.tran2/kiaisoft_tuananh_nuxt into feature/homepage-header

package.json

@@ -15,11 +15,9 @@
     "@nuxtjs/auth-next": "5.0.0-1667386184.dfbbb54",
     "@nuxtjs/axios": "^5.13.6",
     "@nuxtjs/toast": "^3.3.1",
-    "@pinia/nuxt": "^0.4.6",
     "axios": "^1.0.0-alpha.1",
     "core-js": "^3.25.3",
     "nuxt": "^2.15.8",
-    "pinia": "^2.0.29",
     "vue": "^2.7.10",
     "vue-server-renderer": "^2.7.10",
     "vue-template-compiler": "^2.7.10",

pages/categories/index.vue

@@ -612,7 +612,7 @@ export default {
             }
           })
           .then((response) => {
-            self.$toast.success('User updated successfully!', {
+            self.$toast.success('Category updated successfully!', {
               duration: 3000
             })
             this.editedItem = response.data.data

pages/login.vue

@@ -111,38 +111,30 @@ export default {
     },
     async login () {
       try {
-        const resp = await fetch('http://127.0.0.1:8000/api/login', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            Accept: 'application/json'
-          },
-          body: JSON.stringify({
+        const resp = await this.$axios.post('/login',
+          {
             email: this.email,
             password: this.password,
             status: this.status
           })
-        }).then((response) => {
-          return response.json()
-        })
-        console.log(resp.status)
-        localStorage.setItem('token',  resp.data.bearer_token)
-        this.$auth.$storage.setUniversal('token',  resp.data.bearer_token)
-        this.$auth.$storage.setUniversal('userName', resp.data.name)
+        localStorage.setItem('token', resp.data.data.bearer_token)
+        this.$auth.$storage.setUniversal('token', resp.data.data.bearer_token)
+        this.$auth.$storage.setUniversal('userName', resp.data.data.name)
         this.$auth.$storage.setUniversal('loggedIn', 'true')
-        if (resp.status == 'success') {
+        if (resp.status === 200) {
           this.$toast.success('Successfully authenticated', {
-            duration: 2000
-          })
-          this.$router.push('home')
+            duration: 2000,
+          });
+          this.$router.push('home');
         }
       } catch (e) {
         this.$toast.error('Username or Password not valid', {
           duration: 2000
-        })
+        });
         this.$router.push('/login')
       }
     }
+
   }
 }
 </script>

pages/posts/index.vue

@@ -106,12 +106,11 @@
               </v-col>
               <v-col cols="12" text-align=" left">
                 <v-img
-                  v-for="(imageEdit, index) in eImages"
-                  :key="index"
+                  v-if="typeof eImages === 'string'"
                   contain
                   height="100px"
                   width="150px"
-                  :src="imageEdit"
+                  :src="eImages"
                 />
               </v-col>
             </v-row>
@@ -213,7 +212,6 @@
                             v-model="category_id"
                             :items="categories"
                             :search="search"
-                            :filter="filter"
                             item-text="name"
                             item-value="id"
                             label="Category"
@@ -630,7 +628,7 @@ export default {
         })
         .catch((error) => {
           console.log(error)
-          self.$toast.error('something went wrong while trying create!', {
+          self.$toast.error('something went wrong while trying update!', {
             duration: 3000
           })
         })
@@ -668,7 +666,7 @@ export default {
   padding-left: 90px !important;
 }
 img {
-    width: 100%;
-    height: 100%;
-    }
+  width: 100px;
+  height: 150px;
+}
 </style>

pages/products/index.vue

@@ -761,6 +761,7 @@ export default {
       this.eImages = item.images
       this.editedIndex = this.products.indexOf(item)
       console.log(item.variants)
+      console.log(typeof this.eImages)
       this.dialog3 = true
     },
     updateProduct (ID) {
@@ -784,26 +785,28 @@ export default {
         }
       }
       const currentPostIndex = this.editedIndex
-      try {
-        this.$axios
-          .post(`/products/update/${this?.eId}`,
-            fd, {
-              headers: {
-                Authorization: `Bearer ${this.$auth.$storage.getUniversal('token')}`
-              }
+      this.$axios
+        .post(`/products/update/${this?.eId}`,
+          fd, {
+            headers: {
+              Authorization: `Bearer ${this.$auth.$storage.getUniversal('token')}`
             }
-          )
-          .then((response) => {
-            self.$toast.success('Product updated successfully!', {
-              duration: 3000
-            })
-            console.log(response)
-            this.editedItem = response.data.data
-            Object.assign(this.products[currentPostIndex], this.editedItem)
+          }
+        )
+        .then((response) => {
+          self.$toast.success('Product updated successfully!', {
+            duration: 3000
           })
-      } catch (error) {
-        console.log(error)
-      }
+          console.log(response)
+          this.editedItem = response.data.data
+          Object.assign(this.products[currentPostIndex], this.editedItem)
+        })
+        .catch((error) => {
+          console.log(error)
+          self.$toast.error('something went wrong while trying update!', {
+            duration: 3000
+          })
+        })
     },
     addMore () {
       this.variants.push({