From 7c174e59b693d466875676380cab800681620fd2 Mon Sep 17 00:00:00 2001 From: pupiraresdi <34660424+pupiraresdi@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:38:03 +0300 Subject: [PATCH 01/10] Update server.js --- express/server.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/express/server.js b/express/server.js index af5f675..988aed7 100644 --- a/express/server.js +++ b/express/server.js @@ -126,6 +126,11 @@ router.post('/api', async (req, res) => { // await res.send('It works') // parse(`Hello \nworld sd`) }) + router.get('/', (req, res) => { + res.writeHead(200, { 'Content-Type': 'text/html' }); + res.write('

Hello from Express.js!

'); + res.end(); +}); app.use(express.static(__dirname + '/public')); app.use('/.netlify/functions/server', router); // path must route to lambda From ad8541ad213549625a05cda7d725fb7980b3f843 Mon Sep 17 00:00:00 2001 From: pupiraresdi <34660424+pupiraresdi@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:40:48 +0300 Subject: [PATCH 02/10] Update server.js --- express/server.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/express/server.js b/express/server.js index 988aed7..542114a 100644 --- a/express/server.js +++ b/express/server.js @@ -127,9 +127,8 @@ router.post('/api', async (req, res) => { // parse(`Hello \nworld sd`) }) router.get('/', (req, res) => { - res.writeHead(200, { 'Content-Type': 'text/html' }); - res.write('

Hello from Express.js!

'); - res.end(); + res.set({ 'Content-Type': 'text/html' }); + res.send('

Hello from Express.js!

'); }); app.use(express.static(__dirname + '/public')); app.use('/.netlify/functions/server', router); // path must route to lambda From bfde28e0cb1252ef367aee2d1c3421c422b98ee1 Mon Sep 17 00:00:00 2001 From: pupiraresdi <34660424+pupiraresdi@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:41:55 +0300 Subject: [PATCH 03/10] Update server.js --- express/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/express/server.js b/express/server.js index 542114a..dd256cb 100644 --- a/express/server.js +++ b/express/server.js @@ -128,7 +128,7 @@ router.post('/api', async (req, res) => { }) router.get('/', (req, res) => { res.set({ 'Content-Type': 'text/html' }); - res.send('

Hello from Express.js!

'); + res.sendFile('../pages/index.html'); }); app.use(express.static(__dirname + '/public')); app.use('/.netlify/functions/server', router); // path must route to lambda From 2318027a57700c3c28a7023580b463a58d751fe1 Mon Sep 17 00:00:00 2001 From: pupiraresdi <34660424+pupiraresdi@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:49:32 +0300 Subject: [PATCH 04/10] Update server.js --- express/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/express/server.js b/express/server.js index dd256cb..d6936fb 100644 --- a/express/server.js +++ b/express/server.js @@ -128,7 +128,7 @@ router.post('/api', async (req, res) => { }) router.get('/', (req, res) => { res.set({ 'Content-Type': 'text/html' }); - res.sendFile('../pages/index.html'); + res.send("test"); }); app.use(express.static(__dirname + '/public')); app.use('/.netlify/functions/server', router); // path must route to lambda From cb93669141505f4087e24276f7db396a1239cb4e Mon Sep 17 00:00:00 2001 From: pupiraresdi <34660424+pupiraresdi@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:50:50 +0300 Subject: [PATCH 05/10] Update server.js --- express/server.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/express/server.js b/express/server.js index d6936fb..4918f2a 100644 --- a/express/server.js +++ b/express/server.js @@ -126,14 +126,11 @@ router.post('/api', async (req, res) => { // await res.send('It works') // parse(`Hello \nworld sd`) }) - router.get('/', (req, res) => { - res.set({ 'Content-Type': 'text/html' }); - res.send("test"); -}); + app.use(express.static(__dirname + '/public')); app.use('/.netlify/functions/server', router); // path must route to lambda -app.use('/', (req, res) => res.sendFile(path.join(__dirname, '../index.html'))); +app.use('/', (req, res) => res.sendFile(path.join(__dirname, '../pages/index.html'))); module.exports = app; module.exports.handler = serverless(app); // app.listen(port,'192.168.0.60', () => { From a89e6d185935e70f77252578fa6a5bfac5c6ccfb Mon Sep 17 00:00:00 2001 From: pupiraresdi <34660424+pupiraresdi@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:51:54 +0300 Subject: [PATCH 06/10] Update server.js --- express/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/express/server.js b/express/server.js index 4918f2a..ab52384 100644 --- a/express/server.js +++ b/express/server.js @@ -130,7 +130,7 @@ router.post('/api', async (req, res) => { app.use(express.static(__dirname + '/public')); app.use('/.netlify/functions/server', router); // path must route to lambda -app.use('/', (req, res) => res.sendFile(path.join(__dirname, '../pages/index.html'))); +app.use('/', (req, res) => res.sendFile(path.join(__dirname, '../index.html'))); module.exports = app; module.exports.handler = serverless(app); // app.listen(port,'192.168.0.60', () => { From aeb57535036302f247fd6422d95e3d0709271904 Mon Sep 17 00:00:00 2001 From: pupiraresdi <34660424+pupiraresdi@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:52:39 +0300 Subject: [PATCH 07/10] Update index.html --- index.html | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index a8d5678..fe0c272 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,20 @@ - + + + + + + + + + +
+
+ + + +
+
+
+ + From 2e84b3095648c8ee255e37c34be3b1b003bfb15c Mon Sep 17 00:00:00 2001 From: pupiraresdi <34660424+pupiraresdi@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:54:41 +0300 Subject: [PATCH 08/10] Update server.js --- express/server.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/express/server.js b/express/server.js index ab52384..4ab6fa8 100644 --- a/express/server.js +++ b/express/server.js @@ -107,19 +107,11 @@ router.post('/api', async (req, res) => { let nume = req.body.nume if(!nume) nume = 'list'; + let bom = "\ufeff" let csvcontent = await csv.toString(); - fs.writeFile('./csv/' + nume + '.csv', "\ufeff" + csvcontent, (err) => { - if (err) - throw err; - console.log("The file was succesfully saved with UTF-8 with BOM!"); - res.download('./csv/' + nume + '.csv', nume + '.csv', function (err) { - fs.unlink('./csv/' + nume + '.csv', function () { - console.log("Deleted: " + nume); - }); - }); - - }) - + csvcontent = bom.concat(csvcontent) + res.set({'Content-Disposition': 'attachment; filename='+nume+'.csv','Content-type': 'text/csv'}); + res.send(csvcontent); // csv.toDisk('./csv/'+nume+'.csv', {append: false, bom: true}) test = []; ok = 2; From ae18009316cae0f9858072bc56d062bff61d36ac Mon Sep 17 00:00:00 2001 From: pupiraresdi <34660424+pupiraresdi@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:58:00 +0300 Subject: [PATCH 09/10] Update index.html --- public/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index c1c512d..fe0c272 100644 --- a/public/index.html +++ b/public/index.html @@ -9,7 +9,7 @@
-
+ @@ -17,4 +17,4 @@
- \ No newline at end of file + From e62e7bfa996a68afe698c302c1ca9f89545586a4 Mon Sep 17 00:00:00 2001 From: pupiraresdi <34660424+pupiraresdi@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:59:10 +0300 Subject: [PATCH 10/10] Delete index.html --- index.html | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 index.html diff --git a/index.html b/index.html deleted file mode 100644 index fe0c272..0000000 --- a/index.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - -
-
- - - -
-
-
- -