pushing things I forgot
This commit is contained in:
		@@ -64,7 +64,11 @@ router.route("/send-notification").post(async (req, res) => {
 | 
				
			|||||||
    res.send(false);
 | 
					    res.send(false);
 | 
				
			||||||
    return;
 | 
					    return;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  const message = req.body.message;
 | 
					
 | 
				
			||||||
 | 
					  const message = JSON.stringify({
 | 
				
			||||||
 | 
					    message: req.body.message,
 | 
				
			||||||
 | 
					    title: "Vinlotteri!"
 | 
				
			||||||
 | 
					  });
 | 
				
			||||||
  let subs = await Subscription.find();
 | 
					  let subs = await Subscription.find();
 | 
				
			||||||
  for (let i = 0; i < subs.length; i++) {
 | 
					  for (let i = 0; i < subs.length; i++) {
 | 
				
			||||||
    let subscription = subs[i]; //get subscription from your databse here.
 | 
					    let subscription = subs[i]; //get subscription from your databse here.
 | 
				
			||||||
@@ -80,10 +84,14 @@ schedule.scheduleJob(
 | 
				
			|||||||
    let subs = await Subscription.find();
 | 
					    let subs = await Subscription.find();
 | 
				
			||||||
    for (let i = 0; i < subs.length; i++) {
 | 
					    for (let i = 0; i < subs.length; i++) {
 | 
				
			||||||
      let subscription = subs[i]; //get subscription from your databse here.
 | 
					      let subscription = subs[i]; //get subscription from your databse here.
 | 
				
			||||||
      const message = "Husk vinlotteriet, det begynner om 10 minutter!";
 | 
					      const message = JSON.stringify({
 | 
				
			||||||
 | 
					        message: "Husk vinlotteriet, det begynner om 10 minutter!",
 | 
				
			||||||
 | 
					        title: "Vinlotteri!"
 | 
				
			||||||
 | 
					      });
 | 
				
			||||||
      sendNotification(subscription, message);
 | 
					      sendNotification(subscription, message);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
);
 | 
					);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
module.exports = router;
 | 
					module.exports = router;
 | 
				
			||||||
 | 
					module.exports.sendNotification = sendNotification;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,6 +6,9 @@ mongoose.connect("mongodb://localhost:27017/vinlottis", {
 | 
				
			|||||||
  useNewUrlParser: true
 | 
					  useNewUrlParser: true
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					const sub = require(path.join(__dirname + "/../api/subscriptions"));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					const Subscription = require(path.join(__dirname + "/../schemas/Subscription"));
 | 
				
			||||||
const Purchase = require(path.join(__dirname + "/../schemas/Purchase"));
 | 
					const Purchase = require(path.join(__dirname + "/../schemas/Purchase"));
 | 
				
			||||||
const Wine = require(path.join(__dirname + "/../schemas/Wine"));
 | 
					const Wine = require(path.join(__dirname + "/../schemas/Wine"));
 | 
				
			||||||
const PreLotteryWine = require(path.join(
 | 
					const PreLotteryWine = require(path.join(
 | 
				
			||||||
@@ -35,6 +38,16 @@ router.route("/log/wines").post(async (req, res) => {
 | 
				
			|||||||
    await newWonWine.save();
 | 
					    await newWonWine.save();
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  let subs = await Subscription.find();
 | 
				
			||||||
 | 
					  for (let i = 0; i < subs.length; i++) {
 | 
				
			||||||
 | 
					    let subscription = subs[i]; //get subscription from your databse here.
 | 
				
			||||||
 | 
					    const message = JSON.stringify({
 | 
				
			||||||
 | 
					      message: "Dagens vin er lagt til, se den på lottis.vin/dagens!",
 | 
				
			||||||
 | 
					      title: "Ny vin!"
 | 
				
			||||||
 | 
					    });
 | 
				
			||||||
 | 
					    sub.sendNotification(subscription, message);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  res.send(true);
 | 
					  res.send(true);
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -64,7 +64,9 @@ self.addEventListener("message", event => {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
self.addEventListener("push", function(event) {
 | 
					self.addEventListener("push", function(event) {
 | 
				
			||||||
  if (event.data) {
 | 
					  if (event.data) {
 | 
				
			||||||
    showLocalNotification("Vinlotteri!", event.data.text(), self.registration);
 | 
					    var message = JSON.parse(event.data.text());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    showLocalNotification(message.title, message.message, self.registration);
 | 
				
			||||||
  } else {
 | 
					  } else {
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -82,6 +82,10 @@ app.use("/api/", updateApi);
 | 
				
			|||||||
app.use("/api/", retrieveApi);
 | 
					app.use("/api/", retrieveApi);
 | 
				
			||||||
app.use("/subscription", subscriptionApi);
 | 
					app.use("/subscription", subscriptionApi);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					app.get("/dagens", function(req, res) {
 | 
				
			||||||
 | 
					  res.redirect("/#/dagens");
 | 
				
			||||||
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
app.use("/service-worker.js", function(req, res) {
 | 
					app.use("/service-worker.js", function(req, res) {
 | 
				
			||||||
  res.sendFile(path.join(__dirname, "public/sw/serviceWorker.js"));
 | 
					  res.sendFile(path.join(__dirname, "public/sw/serviceWorker.js"));
 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user