Merge pull request #18 from philippebeck/dev

Release 0.12.1

api/controller/UserCtrl.js

@@ -83,8 +83,28 @@ exports.setMessage = (fields, res) => {
 
 //! ****************************** PUBLIC ******************************
 
-exports.checkUser = () => {
-
+/**
+ * CHECK USERS
+ * @param {object} req 
+ * @param {object} res 
+ */
+exports.checkUsers = (req, res) => {
+  UserModel
+    .find()
+    .then((users) => {
+        let usersChecked = [];
+        for (let i = 0; i < users.length; i++) {
+
+          usersChecked.push({
+            _id: users[i]._id,
+            name: users[i].name,
+            email: users[i].email
+          });
+        }
+        res.status(200).json(usersChecked);
+      }
+    )
+    .catch((error) => res.status(400).json({ error }));
 }
 
 /**

api/model/OrderModel.js

@@ -13,6 +13,10 @@ const OrderModel = mongoose.Schema(
       type: Number,
       required: true
     },
+    payment: {
+      type: String,
+      required: true
+    },
     user: { 
       type: String, 
       required: true

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vesan",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "CMS with Vue-Elt, Servidio, Animadio & NemJS",
   "keywords": [
     "cms",

src/App.vue

@@ -214,7 +214,8 @@ export default {
 
   methods: {
     logout() {
-      localStorage.clear();
+      localStorage.removeItem("userId");
+      localStorage.removeItem("userToken");
       this.$router.go();
     }
   },

src/components/managers/ListComments.vue

@@ -111,7 +111,7 @@ import constants from "/constants";
 
 export default {
   name: "ListComments",
-  props: ["comments", "article", "articles", "users"],
+  props: ["comments", "articles", "users"],
 
   methods: {
     /**

src/components/managers/ListReviews.vue

@@ -127,7 +127,7 @@ import constants from "/constants";
 
 export default {
   name: "ListReviews",
-  props: ["reviews", "product", "products", "users"],
+  props: ["reviews", "products", "users"],
 
   methods: {
     /**

src/views/ArticleView.vue

@@ -88,7 +88,7 @@ export default {
       .then(res => { this.comments = res })
       .catch(err => { console.log(err) });
 
-    this.$serve.getData("/api/users")
+    this.$serve.getData("/api/users/check")
       .then(res => { this.users = res })
       .catch(err => { console.log(err) });
 

src/views/ProductView.vue

@@ -124,7 +124,7 @@ export default {
       .then(res => { this.reviews = res })
       .catch(err => { console.log(err) });
 
-    this.$serve.getData("/api/users")
+    this.$serve.getData("/api/users/check")
       .then(res => { this.users = res })
       .catch(err => { console.log(err) });
 
@@ -252,6 +252,8 @@ export default {
       localStorage.setItem("basket", JSON.stringify(this.basket));
 
       alert(`${this.order.quantity} "${this.product.name}" (${this.order.option}) has been added to the Basket !`);
+
+      this.$router.push("/shop");
     }
   }
 }