Pārlūkot izejas kodu

Update packages.
Update app.js for use with vhost router.

Lee Morgan 4 gadi atpakaļ
vecāks
revīzija
9015c39b7d
4 mainītis faili ar 848 papildinājumiem un 53 dzēšanām
  1. 5 18
      app.js
  2. 838 34
      package-lock.json
  3. 2 1
      package.json
  4. 3 0
      routes.js

+ 5 - 18
app.js

@@ -1,8 +1,6 @@
 const express = require("express");
 const compression = require("compression");
 const mongoose = require("mongoose");
-const https = require("https");
-const fs = require("fs");
 const bodyParser = require("body-parser");
 const fileUpload = require("express-fileupload");
 
@@ -15,21 +13,7 @@ let mongooseOptions = {
     useCreateIndex: true
 };
 
-let httpsServer = {};
 if(process.env.NODE_ENV === "production"){
-    httpsServer = https.createServer({
-        key: fs.readFileSync("/etc/letsencrypt/live/leemorgan.io/privkey.pem", "utf8"),
-        cert: fs.readFileSync("/etc/letsencrypt/live/leemorgan.io/fullchain.pem", "utf8")
-    }, app);
-
-    app.use((req, res, next)=>{
-        if(req.secure === true){
-            next();
-        }else{
-            res.redirect(`https://${req.headers.host}${req.url}`);
-        }
-    });
-
     mongooseOptions.auth = {authSource: "admin"};
     mongooseOptions.user = "website";
     mongooseOptions.pass = process.env.MONGODB_PASS;
@@ -43,5 +27,8 @@ app.use(bodyParser.urlencoded({extended: false}))
 app.use(fileUpload({limits: { fileSize: 1024 * 1024}}));
 require("./routes.js")(app);
 
-if(process.env.NODE_ENV === "production") httpsServer.listen(process.env.HTTPS_PORT);
-app.listen(process.env.PORT);
+if(process.env.NODE_ENV === "production"){
+    module.exports = app;
+}else{
+    app.listen(process.env.PORT);
+}

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 838 - 34
package-lock.json


+ 2 - 1
package.json

@@ -14,6 +14,7 @@
     "compression": "^1.7.4",
     "express": "^4.17.1",
     "express-fileupload": "^1.2.1",
-    "mongoose": "^5.12.3"
+    "mongoose": "^5.12.3",
+    "nodemon": "^2.0.16"
   }
 }

+ 3 - 0
routes.js

@@ -96,6 +96,9 @@ module.exports = function(app){
     app.post("/currency", currency.create);
     app.get("/currency/data", currency.getData);
 
+    //UKRAINE
+    app.get("/ukraine", (req, res)=>res.sendFile(`${views}/ukraine/ukraine.html`));
+
     //CONTENT
     app.get("/thumbNails/*", (req, res)=>{res.sendFile(`${__dirname}${req.url}`)});
     app.get("/documents/*", (req, res)=>{res.download(`${__dirname}${req.url}`)});

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels