install Bootstrap and jQuery

theresa-cy-ngo · Mar 6, 2016 · 9db7ce5 · 9db7ce5
1 parent 2a6c828
commit 9db7ce5
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -18,7 +18,10 @@
   "homepage": "https://github.com/jwoo12/CMPUT391_W16#readme",
   "dependencies": {
     "angular": "^1.5.0",
+    "body-parser": "^1.15.0",
+    "bootstrap": "^3.3.6",
     "express": "^4.13.4",
+    "jquery": "^2.2.1",
     "oracledb": "^1.7.1"
   }
 }
diff --git a/public/index.html b/public/index.html
@@ -3,8 +3,15 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Hello World</title>
+    <title>Cmput391</title>
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
 
+    <!-- jQuery library -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
+
+    <!-- Latest compiled JavaScript -->
+    <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 
 </head>
 <body>

diff --git a/server.js b/server.js
@@ -4,7 +4,10 @@ var express = require('express'),
     app = express(),
     http = require('http'),
     oracledb = require('oracledb'),
-    dbConfig = require('./dbconfig.js');
+    dbConfig = require('./dbconfig.js'),
+    bodyParser = require("body-parser");
+
+app.use(bodyParser.json());
 
 //Set port number.
 app.set('port', 8080);
@@ -25,26 +28,26 @@ http.createServer(app).listen(app.get('port') ,app.get('ip'), function () {
 
 
 //Get Oracle connection (test function)
-oracledb.getConnection(dbConfig, function(err, connection) {
-    if (err) {
-      console.error(err.message);
-      return;
-    }
-    connection.execute(
-      "SELECT * " +
-      "FROM COURSE ",
-      function(err, result)
-      {
-        if (err) {
-          console.error(err.message);
-          doRelease(connection);
-          return;
-        }
-        console.log(result.metaData);
-        console.log(result.rows);
-        doRelease(connection);
-      });
-  });
+// oracledb.getConnection(dbConfig, function(err, connection) {
+//     if (err) {
+//       console.error(err.message);
+//       return;
+//     }
+//     connection.execute(
+//       "SELECT * " +
+//       "FROM COURSE ",
+//       function(err, result)
+//       {
+//         if (err) {
+//           console.error(err.message);
+//           doRelease(connection);
+//           return;
+//         }
+//         console.log(result.metaData);
+//         console.log(result.rows);
+//         doRelease(connection);
+//       });
+//   });
 
 //Disconnect from Oracle
 function doRelease(connection)