Correct routing for other modules, renamed settings to groups

theresa-cy-ngo · Mar 20, 2016 · c6e5956 · c6e5956
1 parent 7ebf36e
commit c6e5956
Show file tree

Hide file tree

Showing 15 changed files with 214 additions and 4 deletions.
diff --git a/app/analysis/analysis.html b/app/analysis/analysis.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en" ng-controller="analysisController">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <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>
+    <script src="bower_components/angular/angular.js"></script>
+</head>
+<body>
+    <h1 style="text-align: center;">Analysis</h1>
+
+
+</body>
+</html>
diff --git a/app/analysis/analysis.js b/app/analysis/analysis.js
@@ -0,0 +1,25 @@
+angular.module("myApp.analysis", ["ngRoute", "LocalStorageModule"])
+
+.config(["$routeProvider", function($routeProvider) {
+    $routeProvider.when("/analysis", {
+        templateUrl: "analysis/analysis.html",
+        controller: "analysisController"
+    });
+}])
+
+.controller("analysisController", function($scope, $location, localStorageService) {
+    var usernameFromStorage,
+        storageKey = "user";
+
+    function getItem(key) {
+        return localStorageService.get(key);
+    };
+
+    if(!getItem(storageKey)){
+        //User has not logged in yet so redirect to login
+        $location.url("/login");
+    }
+
+
+
+});
diff --git a/app/app.js b/app/app.js
@@ -4,6 +4,10 @@ angular.module("myApp", [
     "LocalStorageModule",
     "myApp.login",
     "myApp.register",
+    "myApp.display",
+    "myApp.groups",
+    "myApp.analysis",
+    "myApp.search",
     "myApp.home"
 ]).
 config(["$routeProvider", function($routeProvider) {

diff --git a/app/display/display.html b/app/display/display.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en" ng-controller="displayController">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <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>
+    <script src="bower_components/angular/angular.js"></script>
+</head>
+<body>
+    <h1 style="text-align: center;">Display</h1>
+
+
+</body>
+</html>
diff --git a/app/display/display.js b/app/display/display.js
@@ -0,0 +1,25 @@
+angular.module("myApp.display", ["ngRoute", "LocalStorageModule"])
+
+.config(["$routeProvider", function($routeProvider) {
+    $routeProvider.when("/display", {
+        templateUrl: "display/display.html",
+        controller: "displayController"
+    });
+}])
+
+.controller("displayController", function($scope, $location, localStorageService) {
+    var usernameFromStorage,
+        storageKey = "user";
+
+    function getItem(key) {
+        return localStorageService.get(key);
+    };
+
+    if(!getItem(storageKey)){
+        //User has not logged in yet so redirect to login
+        $location.url("/login");
+    }
+
+
+
+});
diff --git a/app/groups/groups.html b/app/groups/groups.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en" ng-controller="groupsController">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <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>
+    <script src="bower_components/angular/angular.js"></script>
+</head>
+<body>
+    <h1 style="text-align: center;">Groups</h1>
+
+
+</body>
+</html>
diff --git a/app/groups/groups.js b/app/groups/groups.js
@@ -0,0 +1,25 @@
+angular.module("myApp.groups", ["ngRoute", "LocalStorageModule"])
+
+.config(["$routeProvider", function($routeProvider) {
+    $routeProvider.when("/groups", {
+        templateUrl: "groups/groups.html",
+        controller: "groupsController"
+    });
+}])
+
+.controller("groupsController", function($scope, $location, localStorageService) {
+    var usernameFromStorage,
+        storageKey = "user";
+
+    function getItem(key) {
+        return localStorageService.get(key);
+    };
+
+    if(!getItem(storageKey)){
+        //User has not logged in yet so redirect to login
+        $location.url("/login");
+    }
+
+
+
+});
diff --git a/app/settings/settings.html → app/groups/groupsHandler.js b/app/settings/settings.html → app/groups/groupsHandler.js
diff --git a/app/homepage/home.html b/app/homepage/home.html
@@ -18,10 +18,10 @@
     <h1 style="text-align: center;">Homepage</h1>
     <div class="buttonContainer" style="text-align: center;bottom: 50%;left: 35%;position: absolute;">
       <button type="button" class="btn btn-primary">Upload</button>
-      <button type="button" class="btn btn-primary">Display</button>
-      <button type="button" class="btn btn-primary">Settings</button>
-      <button type="button" class="btn btn-primary">Search</button>
-      <button type="button" class="btn btn-primary">Data Analysis</button>
+      <button type="button" class="btn btn-primary" ng-click="display()">Display</button>
+      <button type="button" class="btn btn-primary" ng-click="groups()">Groups</button>
+      <button type="button" class="btn btn-primary" ng-click="search()">Search</button>
+      <button type="button" class="btn btn-primary" ng-click="analysis()">Data Analysis</button>
     </div>
 
 </body>

diff --git a/app/homepage/home.js b/app/homepage/home.js
@@ -20,6 +20,18 @@ angular.module("myApp.home", ["ngRoute", "LocalStorageModule"])
         $location.url("/login");
     }
 
+    $scope.groups = function() {
+    	$location.url("/groups");
+    };
+    $scope.display = function() {
+    	$location.url("/display");
+    };
+    $scope.search = function() {
+    	$location.url("/search");
+    };
+    $scope.analysis = function() {
+    	$location.url("/analysis");
+    };
 
 
 });
diff --git a/app/index.html b/app/index.html
@@ -24,5 +24,13 @@
   <script src="homepage/home.js"></script>
   <script src="register/register.js"></script>
   <script src="register/registerHandler.js"></script>
+  <script src="display/display.js"></script>
+  <script src="display/displayHandler.js"></script>
+  <script src="search/search.js"></script>
+  <script src="search/searchHandler.js"></script>
+  <script src="groups/groups.js"></script>
+  <script src="groups/groupsHandler.js"></script>
+  <script src="analysis/analysis.js"></script>
+  <script src="analysis/analysisHandler.js"></script>
 </body>
 </html>
diff --git a/app/search/search.html b/app/search/search.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en" ng-controller="searchController">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <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>
+    <script src="bower_components/angular/angular.js"></script>
+</head>
+<body>
+    <h1 style="text-align: center;">Search</h1>
+
+
+</body>
+</html>
diff --git a/app/search/search.js b/app/search/search.js
@@ -0,0 +1,23 @@
+angular.module("myApp.search", ["ngRoute", "LocalStorageModule"])
+
+.config(["$routeProvider", function($routeProvider) {
+    $routeProvider.when("/search", {
+        templateUrl: "search/search.html",
+        controller: "searchController"
+    });
+}])
+
+.controller("searchController", function($scope, $location, localStorageService) {
+    var usernameFromStorage,
+        storageKey = "user";
+
+    function getItem(key) {
+        return localStorageService.get(key);
+    };
+
+    if(!getItem(storageKey)){
+        //User has not logged in yet so redirect to login
+        $location.url("/login");
+    }
+
+});
diff --git a/app/settings/settings.js b/app/settings/settings.js
diff --git a/app/settings/settingsHandler.js b/app/settings/settingsHandler.js