Merge branch 'master' of https://github.com/zackkhan/UVA

zackkhan · Mar 25, 2018 · e55355f · e55355f
2 parents 647ad43 + 6df46fd
commit e55355f
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 7,499 deletions.
diff --git a/central-server/index.js b/central-server/index.js
@@ -3,6 +3,7 @@ var app = express()
 var bodyParser = require('body-parser')
 var request = require('request')
 var gun_list = {}
+var path = require('path')
 var g_api_key = "AIzaSyAlCfacCR71MjuL3VPirz-dMnU0QktlV7E"
 
 function event_object(id, long, lat){
@@ -15,6 +16,7 @@ function event_object(id, long, lat){
 
 app.use(bodyParser.json())
 app.use(bodyParser.urlencoded({ extended: false }))
+app.use(express.static(__dirname + '/public'));
 
 var http = require('http').Server(app)
 
@@ -23,8 +25,7 @@ function toggleGun(id, status) {
 }
 
 app.get('/', function(req, res) {
-    res.render('home',{});
-    console.log("home");
+    res.sendFile(path.join(__dirname + '/public/index.html'));
 });
 
 app.post('/shot', function(req, res){

diff --git a/central-server/public/index.html b/central-server/public/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+      <link rel="stylesheet" href="styles.css">
+  </head>
+<body>
+
+<h1>My First Heading</h1>
+<p>My first paragraph.</p>
+
+</body>
+</html>
diff --git a/central-server/public/styles.css b/central-server/public/styles.css
@@ -0,0 +1,3 @@
+p {
+  color: red;
+}
diff --git a/client/.gitignore b/client/.gitignore
diff --git a/client/package.json b/client/package.json
diff --git a/client/public/favicon.ico b/client/public/favicon.ico
diff --git a/client/public/index.html b/client/public/index.html
diff --git a/client/public/manifest.json b/client/public/manifest.json
diff --git a/client/src/App.css b/client/src/App.css
diff --git a/client/src/App.js b/client/src/App.js
diff --git a/client/src/App.test.js b/client/src/App.test.js
diff --git a/client/src/index.css b/client/src/index.css
diff --git a/client/src/index.js b/client/src/index.js
diff --git a/client/src/logo.svg b/client/src/logo.svg
diff --git a/client/src/registerServiceWorker.js b/client/src/registerServiceWorker.js