Merge pull request #3 from santiPachi/master

se imprime con el formato correcto
santiPachi · Mar 11, 2019 · fef29c7 · fef29c7
2 parents 14ae927 + 3484bee
commit fef29c7
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 20 deletions.
diff --git a/app/node/app.js b/app/node/app.js
@@ -61,7 +61,7 @@ app.get("/users/:id", (req,res) => {
 app.post("/adduser", (req, res) => {
 
 
-    var subcription = JSON.stringify(req.body);
+    var subcription = JSON.stringify(req.body.subscription);
     console.log("subs"+subcription);
     if(subcription){
         pool.query('INSERT INTO usuario (usu_subs) VALUES(?)', [subcription], (err, rows, fields) => {
@@ -78,6 +78,12 @@ app.post("/adduser", (req, res) => {
     }
 })
 
+app.get("/api/subscriptions", (req,res) => {
+      const queryString = "SELECT usu_subs FROM usuario"
+      pool.query(queryString, (err, rows, fields) => {
+          res.json(rows)
+      })
+  })
 
 app.listen(PORT, () => {
   console.log(`server running on port ${PORT}`)

diff --git a/app/scripts/main.js b/app/scripts/main.js
@@ -223,25 +223,43 @@ function getUsuairio() {
 
 function insertSubcription(subscription){
     var str = JSON.stringify(subscription);
-    var data = JSON.parse(str);
-    $.ajax({
-      url: "http://localhost:5000/adduser/",
-      type: "POST",
-      data: data,
-      dataType: "json",
-      success: function (result) {
-          switch (result) {
-              case true:
-                  processResponse(result);
-                  break;
-              default:
-                  resultDiv.html(result);
-          }
-      },
-      error: function (xhr, ajaxOptions, thrownError) {
-      alert(xhr.status);
-      alert(thrownError);
-      }
+    var subscriptionObject = JSON.parse(str);
+  //   $.ajax({
+  //     url: "http://localhost:5000/adduser/",
+  //     type: "POST",
+  //     data: data,
+  //     dataType: "json",
+  //     success: function (result) {
+  //         switch (result) {
+  //             case true:
+  //                 processResponse(result);
+  //                 break;
+  //             default:
+  //                 resultDiv.html(result);
+  //         }
+  //     },
+  //     error: function (xhr, ajaxOptions, thrownError) {
+  //     alert(xhr.status);
+  //     alert(thrownError);
+  //     }
+  // });
+  fetch('http://localhost:5000/adduser/', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify({
+      subscription: subscriptionObject
+
+    })
+  })
+  .then((response) => {
+    if (response.status !== 200) {
+      return response.text()
+      .then((responseText) => {
+        throw new Error(responseText);
+      });
+    }
   });
 }