Merge branch 'master' of https://github.com/LukasNowy/SmartShopper
This commit is contained in:
		@@ -27,6 +27,33 @@ var firebaseAdmin = admin.initializeApp({
 | 
			
		||||
  databaseURL: 'https://test-667ca.firebaseio.com'
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
function sendPush(msgtoken, title, text){
 | 
			
		||||
  var message = {
 | 
			
		||||
    data: {
 | 
			
		||||
      title: title,
 | 
			
		||||
      text: text
 | 
			
		||||
    }
 | 
			
		||||
  };
 | 
			
		||||
  
 | 
			
		||||
  firebaseAdmin.messaging().sendToDevice(msgtoken, message)
 | 
			
		||||
  .then(function(response) {
 | 
			
		||||
    // See the MessagingDevicesResponse reference documentation for
 | 
			
		||||
    // the contents of response.
 | 
			
		||||
    console.log('Successfully sent message:', response);
 | 
			
		||||
  })
 | 
			
		||||
  .catch(function(error) {
 | 
			
		||||
    console.log('Error sending message:', error);
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
//Push
 | 
			
		||||
router.get('/push/:msgtoken', function (req, res, next) {
 | 
			
		||||
    sendPush(req.params.msgtoken, "Update", "Einkaufsliste wurde geändert")
 | 
			
		||||
    res.status(200)
 | 
			
		||||
    
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// Login und Dash
 | 
			
		||||
router.get('/', function(req, res, next) {
 | 
			
		||||
@@ -35,8 +62,8 @@ router.get('/', function(req, res, next) {
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
router.get('/dash/:idtoken', function(req, res, next) {
 | 
			
		||||
    
 | 
			
		||||
  var token = req.params.idtoken;
 | 
			
		||||
  // const msgtoken = req.params.msgtoken;
 | 
			
		||||
  const token = req.params.idtoken;
 | 
			
		||||
  var uid;
 | 
			
		||||
  firebaseAdmin.auth().verifyIdToken(token)
 | 
			
		||||
    .then(function(decodedToken) {
 | 
			
		||||
@@ -48,16 +75,13 @@ router.get('/dash/:idtoken', function(req, res, next) {
 | 
			
		||||
    }).catch(function(error) {
 | 
			
		||||
      console.log(error)
 | 
			
		||||
    });
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
      
 | 
			
		||||
    res.render('dash');
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
router.get('/logout', (req, res, next) => {
 | 
			
		||||
  
 | 
			
		||||
   
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// SmartShopper
 | 
			
		||||
 | 
			
		||||
@@ -126,6 +150,7 @@ router.post("/shoppinglist", async function(req, res, next) {
 | 
			
		||||
      try {
 | 
			
		||||
        
 | 
			
		||||
        res.status(200).send(await postgres.newShoppinglist(req.body.name, req.body.description, uid, req.body.color));
 | 
			
		||||
        sendPush("enG4tJ6LyyU:APA91bEYjUEs7Sdzvu2ivgfqtpzlg42BZLlujDSRg0WLBvfZ_oD4V7cTx2o6MVr4oAdeHaK0wttPMQ85GMMOkgM7xvbHFcwXUG4MCr8JXX16S-OV2CS4ikQ286DOHPtBotbM7pqFTvIM", "Einkaufsliste " + req.body.name + " wurde erstellt!", req.body.description)
 | 
			
		||||
      }
 | 
			
		||||
    
 | 
			
		||||
      catch(err) {
 | 
			
		||||
@@ -162,6 +187,7 @@ router.get("/shoppinglist_json/:sl_id", async (req, res) => {
 | 
			
		||||
router.delete("/shoppinglist", async (req, res) => {
 | 
			
		||||
  try {
 | 
			
		||||
    res.status(200).send(await postgres.deleteShoppinglist(req.body.sl_id));
 | 
			
		||||
    sendPush("enG4tJ6LyyU:APA91bEYjUEs7Sdzvu2ivgfqtpzlg42BZLlujDSRg0WLBvfZ_oD4V7cTx2o6MVr4oAdeHaK0wttPMQ85GMMOkgM7xvbHFcwXUG4MCr8JXX16S-OV2CS4ikQ286DOHPtBotbM7pqFTvIM", "Die Einkaufsliste " + req.body.sl_id + " wurde gelöscht!", "Einkaufsliste wurde geändert")
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  catch(err) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user