diff --git a/Rev1/node/index.js b/Rev1/node/index.js index b8a2676..2a4cccf 100644 --- a/Rev1/node/index.js +++ b/Rev1/node/index.js @@ -1,10 +1,9 @@ const express = require("express"); const path = require("path"); -const routes = require("./views/routes"); const fileUpload = require("express-fileupload"); -const fs = require("fs"); +const routes = require("./views/routes"); -const port = 3000; +const PORT = 3000; // Init App const app = express(); @@ -17,67 +16,19 @@ app.use("/js", express.static(__dirname + "public/js ")); app.use("/img", express.static(__dirname + "public/img ")); app.get("/", function (req, res) { - res.render("index", routes); -}); -app.get("/flasher", function (req, res) { - res.render("flasher", routes); -}); -app.get("/p_generator", function (req, res) { - res.render("p_generator", routes); -}); -app.get("/pcb_panel_bom", function (req, res) { - res.render("pcb_panel_bom", routes); -}); -app.get("/invoice_sign", function (req, res) { - let lastFiles = []; - const dir = fs.opendirSync("./uploads/converted/"); - let entity; - while ((entity = dir.readSync()) !== null) { - if (entity.isFile()) { - lastFiles.push({ type: "f", name: entity.name }); - } else if (entity.isDirectory()) { - lastFiles.push({ type: "d", name: entity.name }); - } - } - console.log(lastFiles); - res.render("invoice_sign", { routes, lastFiles }); + res.render("index"); }); -//Post the upload file -// For handling the upload request -app.post("/invoice_sign", function (req, res) { - // When a file has been uploaded - if (req.files && Object.keys(req.files).length !== 0) { - // Uploaded path - const uploadedFile = req.files.uploadFile; - - // Logging uploading file - console.log(uploadedFile); - - // Upload path - const uploadPath = __dirname + "/uploads/" + uploadedFile.name; - - // To save the file using mv() function - uploadedFile.mv(uploadPath, function (err) { - if (err) { - console.log(err); - res.send("Failed !!"); - } else res.send("Successfully Uploaded !!"); - }); - } else res.send("No file uploaded !!"); -}); - -// To handle the download file request -app.get("/invoice_sign/download", function (req, res) { - // The res.download() talking file path to be downloaded - res.download(__dirname + "/uploads/fax.odg", function (err) { - if (err) { - console.log(err); - } - }); -}); +const flasherRoute = require("./routes/flasher"); +const invoiceRoute = require("./routes/invoice_sign"); +const pGeneratorRoute = require("./routes/p_generator"); +const pcbPanelRoute = require("./routes/pcb_panel_bom"); +app.use("/flasher", flasherRoute); +app.use("/invoice_sign", invoiceRoute); +app.use("/p_generator", pGeneratorRoute); +app.use("/pcb_panel_bom", pcbPanelRoute); // Start Server -app.listen(port, function () { - console.log(`Server started on port ${port}...`); +app.listen(PORT, function () { + console.log(`Server started on port ${PORT}...`); }); diff --git a/Rev1/node/routes/flasher.js b/Rev1/node/routes/flasher.js new file mode 100644 index 0000000..f31cb0c --- /dev/null +++ b/Rev1/node/routes/flasher.js @@ -0,0 +1,8 @@ +const express = require("express"); +const router = express.Router(); + +router.get("/", function (req, res) { + res.render("flasher"); +}); + +module.exports = router; diff --git a/Rev1/node/routes/invoice_sign.js b/Rev1/node/routes/invoice_sign.js new file mode 100644 index 0000000..fab79aa --- /dev/null +++ b/Rev1/node/routes/invoice_sign.js @@ -0,0 +1,52 @@ +const express = require("express"); +const router = express.Router(); +const fs = require("fs"); + +router.get("/", function (req, res) { + let lastFiles = []; + const dir = fs.opendirSync("./uploads/converted/"); + let entity; + while ((entity = dir.readSync()) !== null) { + if (entity.isFile()) { + lastFiles.push({ type: "f", name: entity.name }); + } else if (entity.isDirectory()) { + lastFiles.push({ type: "d", name: entity.name }); + } + } + console.log(lastFiles); + res.render("invoice_sign", { lastFiles }); +}); +//Post the upload file +// For handling the upload request +router.post("/", function (req, res) { + // When a file has been uploaded + if (req.files && Object.keys(req.files).length !== 0) { + // Uploaded path + const uploadedFile = req.files.uploadFile; + + // Logging uploading file + console.log(uploadedFile); + + // Upload path + const uploadPath = __dirname + "/../uploads/" + uploadedFile.name; + + // To save the file using mv() function + uploadedFile.mv(uploadPath, function (err) { + if (err) { + console.log(err); + res.send("Failed !!"); + } else res.send("Successfully Uploaded !!"); + }); + } else res.send("No file uploaded !!"); +}); + +// To handle the download file request +router.get("/download", function (req, res) { + // The res.download() talking file path to be downloaded + res.download(__dirname + "/uploads/fax.odg", function (err) { + if (err) { + console.log(err); + } + }); +}); +module.exports = router; diff --git a/Rev1/node/routes/p_generator.js b/Rev1/node/routes/p_generator.js new file mode 100644 index 0000000..ce82472 --- /dev/null +++ b/Rev1/node/routes/p_generator.js @@ -0,0 +1,8 @@ +const express = require("express"); +const router = express.Router(); + +router.get("/", function (req, res) { + res.render("p_generator"); +}); + +module.exports = router; diff --git a/Rev1/node/routes/pcb_panel_bom.js b/Rev1/node/routes/pcb_panel_bom.js new file mode 100644 index 0000000..cc7d63d --- /dev/null +++ b/Rev1/node/routes/pcb_panel_bom.js @@ -0,0 +1,8 @@ +const express = require("express"); +const router = express.Router(); + +router.get("/", function (req, res) { + res.render("pcb_panel_bom"); +}); + +module.exports = router; diff --git a/Rev1/node/uploads/PickAndPlace_PCB_STM32 PLC_panel_2021-11-18.csv b/Rev1/node/uploads/PickAndPlace_PCB_STM32 PLC_panel_2021-11-18.csv new file mode 100644 index 0000000..56b1887 Binary files /dev/null and b/Rev1/node/uploads/PickAndPlace_PCB_STM32 PLC_panel_2021-11-18.csv differ diff --git a/Rev1/node/uploads/Tekin abiden b/Rev1/node/uploads/Tekin abiden new file mode 100644 index 0000000..5651606 --- /dev/null +++ b/Rev1/node/uploads/Tekin abiden @@ -0,0 +1,13 @@ +demsay +matek +qual + +280 TL ordino +en az 350 TL gümrük +400 TL MNG +350 DHL + +ithalat ID +Ziraatten alınacak + + diff --git a/Rev1/node/views/layout.pug b/Rev1/node/views/layout.pug index b466b4c..7625039 100644 --- a/Rev1/node/views/layout.pug +++ b/Rev1/node/views/layout.pug @@ -1,6 +1,6 @@ html head - title My Site - #{title} + title Anka-Anvil - #{title} block scripts script(src='/jquery.js') body