diff --git a/express-server/db-connect/db-connect.js b/express-server/db-connect/db-connect.js index 3b42a995..4b0b1521 100644 --- a/express-server/db-connect/db-connect.js +++ b/express-server/db-connect/db-connect.js @@ -30,13 +30,21 @@ async function getmessageids(sl_id) { } - async function searchUsers(searchstring) { try { let users = await query('SELECT row_to_json("User") AS obj FROM "User";'); - return users.filter(function (obj) { - return obj.name.toUpperCase().includes(searchstring.toUpperCase()) - }); + var output = []; + + for(let item of users) { + if(item.name != null) { + if(item.name.includes(searchstring)) { + output.push(item) + } + } + } + + return output; + } catch (error) { console.error(error); } @@ -304,8 +312,6 @@ async function moveDoneItems(uid, sl_id, billcontent) { } } -moveDoneItemMan('dXMuv1J0f4O7RKn2bizGMTHUYkg1', '8l3vop0s', 'hcMssjPd', 'IkNZ76So'); - async function moveDoneItemMan(uid, sl_id, group_id, item_id) { try { let name = await query('SELECT row_to_json("Item") as obj FROM "Item" WHERE item_id = $3 AND group_id = $2 AND sl_id = $1', [sl_id, group_id, item_id]); diff --git a/express-server/public/ocrscan/ocrscan.js b/express-server/public/ocrscan/ocrscan.js index 83ae74ad..9b3ca4a4 100644 --- a/express-server/public/ocrscan/ocrscan.js +++ b/express-server/public/ocrscan/ocrscan.js @@ -42,12 +42,6 @@ $(document).ready(function () { firebase.initializeApp(config); -<<<<<<< HEAD - updateUser(); - //testSearch(); -======= - getAllShoppinglists(); ->>>>>>> 7926b569500ffc17a4af1ab820cddcb4b5c4e4d9 updateUser(); testSearch(); @@ -152,16 +146,12 @@ $(document).ready(function () { } function testSearch() { - console.log("dpne"); + $.ajax({ - type: "DELETE", - url: "/member", - data: { - sl_id: "PDADo1iJ", - uid: "VZT25Xd3rLXEmGGUcrtocbJ9QBu2" - }, + type: "GET", + url: "/users?search=Luk", success(data) { - console.log(data); + console.log("Users ", data); }, error(err) { console.error(err); @@ -169,6 +159,7 @@ $(document).ready(function () { }); } + getAllShoppinglists(); function getAllShoppinglists() { firebase.auth().onAuthStateChanged(function (user) { diff --git a/express-server/routes/index.js b/express-server/routes/index.js index 5a38a682..b1fc818a 100644 --- a/express-server/routes/index.js +++ b/express-server/routes/index.js @@ -311,7 +311,6 @@ router.post("/maninvite", async (req, res) => { res.status(400).send(err); } - }); router.delete("/member", (req, res) => {