Skip to content
Snippets Groups Projects
Commit 395f796a authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

migrated all routes to new router

parent 6a4e1729
No related branches found
No related tags found
No related merge requests found
...@@ -2,16 +2,11 @@ var createError = require("http-errors"); ...@@ -2,16 +2,11 @@ var createError = require("http-errors");
var express = require("express"); var express = require("express");
var path = require("path"); var path = require("path");
var cookieParser = require("cookie-parser"); var cookieParser = require("cookie-parser");
var browserify = require("browserify-middleware");
var logger = require("morgan"); var logger = require("morgan");
var indexRouter = require("./routes/index"); var indexRouter = require("./routes/index");
var authenticationRouter = require("./routes/authentication");
var keyRouter = require("./routes/key");
var paypalCheckoutRouter = require("./routes/checkout/paypal.js");
//var checkoutRouter = require("./routes/checkout/checkout");
var redeemRouter = require("./routes/redeem.js");
var app = express(); var app = express();
...@@ -44,36 +39,6 @@ app.use((req, res, next) => { ...@@ -44,36 +39,6 @@ app.use((req, res, next) => {
app.use(/^((\/.*)?\/keys)/, indexRouter); app.use(/^((\/.*)?\/keys)/, indexRouter);
app.use(indexRouter); app.use(indexRouter);
app.use("/", authenticationRouter);
app.use("/", indexRouter);
app.use("/key", keyRouter);
//app.use("/checkout", checkoutRouter);
app.use("/redeem", redeemRouter);
// Browserified Javascript files
app.get(
"/js/base.js",
browserify(path.join(__dirname, "resources", "js", "base.js"))
);
app.get(
"/js/funding_sources.js",
browserify(path.join(__dirname, "resources", "js", "funding_sources.js"))
);
app.get(
"/js/checkout_paypal.js",
(req, res, next) => {
res.header({ "Access-Control-Allow-Origin": "https://www.paypal.com" });
next();
},
browserify(path.join(__dirname, "resources", "js", "checkout_paypal.js"))
);
app.get("/js/enter.js", browserify(path.join(__dirname, "resources", "js", "enter.js")));
app.use("/webhooks/paypal", paypalCheckoutRouter);
app.use("/js/paypal", paypalCheckoutRouter);
// catch 404 and forward to error handler // catch 404 and forward to error handler
app.use(function (req, res, next) { app.use(function (req, res, next) {
next(createError(404)); next(createError(404));
......
...@@ -3,11 +3,16 @@ const Order = require("../app/Order.js"); ...@@ -3,11 +3,16 @@ const Order = require("../app/Order.js");
var router = express.Router({ mergeParams: true }); var router = express.Router({ mergeParams: true });
var lessMiddleware = require("less-middleware"); var lessMiddleware = require("less-middleware");
var browserify = require("browserify-middleware");
var paypalCheckoutRouter = require("../routes/checkout/paypal.js");
var path = require("path"); var path = require("path");
router.use(lessMiddleware(path.join(__dirname, "..", "public"))); router.use(lessMiddleware(path.join(__dirname, "..", "public")));
router.use(express.static(path.join(__dirname, "..", "public"))); router.use(express.static(path.join(__dirname, "..", "public")));
var authenticationRouter = require("../routes/authentication");
router.use("/", authenticationRouter);
/* GET home page. */ /* GET home page. */
router.get("/", function (req, res, next) { router.get("/", function (req, res, next) {
res.render("index", { res.render("index", {
...@@ -16,4 +21,28 @@ router.get("/", function (req, res, next) { ...@@ -16,4 +21,28 @@ router.get("/", function (req, res, next) {
}); });
}); });
var keyRouter = require("../routes/key");
router.use("/key", keyRouter);
router.use("/webhooks/paypal", paypalCheckoutRouter);
// Browserified Javascript files
router.get(
"/js/base.js",
browserify(path.join(__dirname, "..", "resources", "js", "base.js"))
);
router.get(
"/js/funding_sources.js",
browserify(path.join(__dirname, "..", "resources", "js", "funding_sources.js"))
);
router.get(
"/js/checkout_paypal.js",
(req, res, next) => {
res.header({ "Access-Control-Allow-Origin": "https://www.paypal.com" });
next();
},
browserify(path.join(__dirname, "..", "resources", "js", "checkout_paypal.js"))
);
router.get("/js/enter.js", browserify(path.join(__dirname, "..", "resources", "js", "enter.js")));
module.exports = router; module.exports = router;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment