added nodemon, added cors middleware, removed csj requires
This commit is contained in:
		
							parent
							
								
									a90c1942e1
								
							
						
					
					
						commit
						21847e9a6d
					
				
							
								
								
									
										3860
									
								
								package-lock.json
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										3860
									
								
								package-lock.json
									
									
									
										generated
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -12,7 +12,8 @@ | |||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "chai": "^3.5.0", |     "chai": "^3.5.0", | ||||||
|     "chai-http": "^3.0.0", |     "chai-http": "^3.0.0", | ||||||
|     "mocha": "^2.5.3" |     "mocha": "^2.5.3", | ||||||
|  |     "nodemon": "^1.17.5" | ||||||
|   }, |   }, | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "body-parser": "^1.17.1", |     "body-parser": "^1.17.1", | ||||||
|  | |||||||
							
								
								
									
										23
									
								
								server.js
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								server.js
									
									
									
									
									
								
							| @ -11,10 +11,13 @@ var pg = require('pg'); | |||||||
| var server = express(); | var server = express(); | ||||||
| server.engine('handlebars', handlebars()); | server.engine('handlebars', handlebars()); | ||||||
| server.set('view engine', 'handlebars'); | server.set('view engine', 'handlebars'); | ||||||
| 
 | server.use(function(req, res, next) { | ||||||
|  |     res.header("Access-Control-Allow-Origin", "*"); | ||||||
|  |     res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); | ||||||
|  |     next(); | ||||||
|  | }); | ||||||
| 
 | 
 | ||||||
| var Postgres = new pg.Client({ | var Postgres = new pg.Client({ | ||||||
|      |  | ||||||
|     user: process.env.user, |     user: process.env.user, | ||||||
|     password: process.env.password, |     password: process.env.password, | ||||||
|     host: process.env.host, |     host: process.env.host, | ||||||
| @ -22,7 +25,7 @@ var Postgres = new pg.Client({ | |||||||
|     database: process.env.database, |     database: process.env.database, | ||||||
|     application_name: "tps_etl_api", |     application_name: "tps_etl_api", | ||||||
|     ssl: true |     ssl: true | ||||||
| }) | }); | ||||||
| 
 | 
 | ||||||
| Postgres.connect(); | Postgres.connect(); | ||||||
| 
 | 
 | ||||||
| @ -166,10 +169,9 @@ server.use("/import", upload.single('upload'), function (inReq, inRes) { | |||||||
|     console.log("should have gotten file as post body here"); |     console.log("should have gotten file as post body here"); | ||||||
|     var csv = inReq.file.buffer.toString('utf8') |     var csv = inReq.file.buffer.toString('utf8') | ||||||
|     // create a new converter object
 |     // create a new converter object
 | ||||||
|     var c2j = require('csvtojson'); |     //var jobj = csvtojson.fromString(csv).
 | ||||||
|     //var jobj = c2j.fromString(csv).
 |  | ||||||
|     //{headers: "true", delimiter: ",", output: "jsonObj", flatKeys: "true"}
 |     //{headers: "true", delimiter: ",", output: "jsonObj", flatKeys: "true"}
 | ||||||
|     c2j({ flatKeys: "true" }).fromString(csv).then( |     csvtojson({ flatKeys: "true" }).fromString(csv).then( | ||||||
|         (x) => { |         (x) => { | ||||||
|             //console.log(x);
 |             //console.log(x);
 | ||||||
|             //inRes.json(x);
 |             //inRes.json(x);
 | ||||||
| @ -199,7 +201,7 @@ server.use("/import", upload.single('upload'), function (inReq, inRes) { | |||||||
|         ); |         ); | ||||||
|         } |         } | ||||||
|         //const jsonArray = csv().fromFile(csvFilePath);
 |         //const jsonArray = csv().fromFile(csvFilePath);
 | ||||||
|         //c2j({ output: "csv" }).fromString(csv).then((jsonObj) => { console.log(jsonObj) });
 |         //csvtojson({ output: "csv" }).fromString(csv).then((jsonObj) => { console.log(jsonObj) });
 | ||||||
|         //validate the body contents before pushing to sql?
 |         //validate the body contents before pushing to sql?
 | ||||||
|     ); |     ); | ||||||
|     } |     } | ||||||
| @ -213,10 +215,9 @@ server.use("/csv_suggest", upload.single('upload'), function (inReq, inRes) { | |||||||
|     console.log("should have gotten file as post body here"); |     console.log("should have gotten file as post body here"); | ||||||
|     var csv = inReq.file.buffer.toString('utf8') |     var csv = inReq.file.buffer.toString('utf8') | ||||||
|     // create a new converter object
 |     // create a new converter object
 | ||||||
|     var c2j = require('csvtojson'); |     //var jobj = csvtojson.fromString(csv).
 | ||||||
|     //var jobj = c2j.fromString(csv).
 |  | ||||||
|     //{headers: "true", delimiter: ",", output: "jsonObj", flatKeys: "true"}
 |     //{headers: "true", delimiter: ",", output: "jsonObj", flatKeys: "true"}
 | ||||||
|     c2j({ flatKeys: "true" }).fromString(csv).then( |     csvtojson({ flatKeys: "true" }).fromString(csv).then( | ||||||
|         (x) => { |         (x) => { | ||||||
|             //console.log(x);
 |             //console.log(x);
 | ||||||
|             //inRes.json(x);
 |             //inRes.json(x);
 | ||||||
| @ -244,7 +245,7 @@ server.use("/csv_suggest", upload.single('upload'), function (inReq, inRes) { | |||||||
|             //console.log(sql);
 |             //console.log(sql);
 | ||||||
|         } |         } | ||||||
|         //const jsonArray = csv().fromFile(csvFilePath);
 |         //const jsonArray = csv().fromFile(csvFilePath);
 | ||||||
|         //c2j({ output: "csv" }).fromString(csv).then((jsonObj) => { console.log(jsonObj) });
 |         //csvtojson({ output: "csv" }).fromString(csv).then((jsonObj) => { console.log(jsonObj) });
 | ||||||
|         //validate the body contents before pushing to sql?
 |         //validate the body contents before pushing to sql?
 | ||||||
|     ); |     ); | ||||||
|     } |     } | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user