Merge pull request #8 from ucfcs/BackEnd

Back end

Author: RandyT97

.gitignore

@@ -12,4 +12,8 @@
 /duct-drone-app/.vscode
 /duct-drone-app/.eslintcache
 /duct-drone-app/package-lock.json
-/Documents/*
+/Documents/*
+/duct-drone-app/.vs/
+duct-drone-app/src/.vs/
+/.vs/
+/duct-drone-app/build/

duct-drone-app/package.json

@@ -7,6 +7,7 @@
     "start": "webpack-dev-server --mode development --open",
     "build": "webpack --mode production"
   },
+  "proxy": "http://localhost:5000",
   "author": "",
   "license": "ISC",
   "devDependencies": {
@@ -22,6 +23,10 @@
     "webpack-dev-server": "^3.2.1"
   },
   "dependencies": {
+    "express": "^4.16.4",
+    "mongodb": "^3.2.2",
+    "mongoose": "^5.4.22",
+    "path": "^0.12.7",
     "prop-types": "^15.7.2",
     "react": "^16.8.5",
     "react-bootstrap": "^1.0.0-beta.6",

duct-drone-app/server/database.js

@@ -0,0 +1,30 @@
+let EntryModel = require('./models/entrymodel');
+let FloorModel = require('./models/floormodel');
+var mongoose = require('mongoose');
+
+const server = '127.0.0.1:27017';      //DB SERVER
+const database = 'test';    //DB NAME
+
+//Set up mongoose connection
+// var mongoose = require('mongoose');
+// var mongoDB = 'insert_your_database_url_here';
+// mongoose.connect(mongoDB, { useNewUrlParser: true });
+// var db = mongoose.connection;
+// db.on('error', console.error.bind(console, 'MongoDB connection error:')); 
+
+class Database {
+    constructor() {
+        this._connect();
+    }
+    _connect() {
+        mongoose.connect(`mongodb://${server}/${database}`)
+            .then(() => {
+                console.log('DB Success');
+            })
+            .catch(err => {
+                console.error('DB ERROR');
+            });
+    }
+}
+
+module.exports = new Database();

duct-drone-app/server/index.js

@@ -0,0 +1,54 @@
+let Entry = require('./models/entrymodel');
+let Floor= require('./models/floormodel');
+var express = require('express');
+const path = require('path');
+var app = express();
+const server = '127.0.0.1:27017';      //DB SERVER
+const database = 'test';    //DB NAME
+
+
+ //respond with "hello world" when a GET request is made to the homepage
+app.use(express.static(path.join(__dirname, '../build')));
+
+const port = process.env.PORT || 5000;
+
+// console.log that your server is up and running
+app.listen(port, () => console.log(`Listening on port ${port}`));
+
+// create a GET route
+app.get('/express_backend', (req, res) => {
+  res.send({ express: 'YOUR EXPRESS BACKEND IS CONNECTED TO REACT' });
+});
+
+var mongoose = require('mongoose');
+var mongoDB = `mongodb://${server}/${database}`;
+mongoose.connect(mongoDB, { useNewUrlParser: true });
+var db = mongoose.connection;
+db.on('error', console.error.bind(console, 'MongoDB connection error:'));
+
+
+var testdata = new Entry({
+	coordinate:[{ x:32, y:32, z:23}],
+	time: new Date(),
+	temperature: 32.3,
+	air_velocity: 35.2,
+});
+testdata.save(function (err) {
+  if (err) return handleError(err);
+  console.log("SAVED");
+});
+app.get("/adddata", (req, res) => {
+	var testdata = new Entry({
+	coordinate:[{ x:32, y:32, z:23}],
+	time: new Date(),
+	temperature: 32.3,
+	air_velocity: 35.2,
+	});
+	testdata.save()
+		.then(item => {
+			res.send("Saved to db");
+		})
+		.catch(err => {
+			res.status(400).send("unable to save to db");
+		});
+});

duct-drone-app/server/models/entrymodel.js

@@ -0,0 +1,11 @@
+var mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+
+const entrySchema = new Schema({
+    coordinate: [{ x: Number, y: Number, z: Number }],
+    time: Date,
+    temperature: Schema.Types.Decimal128,
+    air_velocity: Schema.Types.Decimal128
+});
+
+module.exports = mongoose.model('Entry', entrySchema);

duct-drone-app/server/models/floormodel.js

@@ -0,0 +1,11 @@
+var mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+
+const floorSchema = new Schema({
+    name: String,
+    map_link: String,
+    date: Date,
+    sensorData: [{ type: Schema.Types.ObjectId, ref: 'Entry' }]
+});
+
+module.exports = mongoose.model('Floor', floorSchema);

duct-drone-app/src/App.js

@@ -9,6 +9,8 @@ import Col from 'react-bootstrap/Col';
 import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
 import { Navbar, Nav, NavItem, NavDropdown, MenuItem } from 'react-bootstrap';
 import './App.css';
+
+
 class App extends Component {
 	render() {
 		const InApp = () => 

duct-drone-app/src/Login.js

@@ -23,7 +23,7 @@ class Login extends Component {
 		  <Button variant="primary" type="submit">
 		    Submit
 		  </Button>
-		  <Link to="/app/">Login</Link>
+		  <Link to="/app/">proceed to next page</Link>
 		</Form>
 		)
 	}

duct-drone-app/webpack.config.js

@@ -1,13 +1,16 @@
-
+var path = require('path');
 const HtmlWebPackPlugin = require("html-webpack-plugin");
-
+var BUILD_DIR = path.resolve(__dirname, './build');
 const htmlPlugin = new HtmlWebPackPlugin({
   template: "./src/index.html",
   filename: "./index.html"
 });
 
 module.exports = {
-  // entry: "./src/app.js",
+  output: {
+    filename: 'bundle.js',
+    path: BUILD_DIR
+  },
   module: {
     rules: [
       {