From 3c4c48c962fead67d78ca27d753dacf7fd8aaec3 Mon Sep 17 00:00:00 2001
From: Kevin Mach <kjmach@ucsd.edu>
Date: Sat, 9 May 2015 14:48:15 -0700
Subject: [PATCH] removed errors for view deck files
---
config.js | 6 ++++++
home.html | 1 +
scripts/DeckController.js | 11 +++++++++++
scripts/viewDeckController.js | 11 -----------
templates/deck.html | 21 +++++++++++++++++++++
templates/viewDeck.html | 23 -----------------------
6 files changed, 39 insertions(+), 34 deletions(-)
create mode 100644 scripts/DeckController.js
delete mode 100644 scripts/viewDeckController.js
create mode 100644 templates/deck.html
delete mode 100644 templates/viewDeck.html
diff --git a/config.js b/config.js
index b4258fd..febd910 100644
--- a/config.js
+++ b/config.js
@@ -3,6 +3,7 @@ angular.module('flashy', [
'flashy.LoginController',
'flashy.HomeController',
'flashy.FeedController',
+ 'flashy.DeckController',
'ngCookies']).
config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',
function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
@@ -37,6 +38,11 @@ angular.module('flashy', [
url: '/feed',
templateUrl: 'templates/feed.html',
controller: 'FeedController'
+ }).
+ state('deck', {
+ url: '/deck',
+ templateUrl: 'templates/deck.html',
+ controller: 'DeckController'
});
}]);
diff --git a/home.html b/home.html
index 4081688..cceddba 100644
--- a/home.html
+++ b/home.html
@@ -26,6 +26,7 @@
<script src="scripts/HomeController.js"></script>
<script src="scripts/LoginController.js"></script>
<script src="scripts/LogoutController.js"></script>
+<script src="scripts/DeckController.js"></script>
<script src="scripts/jquery-2.1.3.min.js"></script>
diff --git a/scripts/DeckController.js b/scripts/DeckController.js
new file mode 100644
index 0000000..96d5395
--- /dev/null
+++ b/scripts/DeckController.js
@@ -0,0 +1,11 @@
+var app = angular.module("flashy.DeckController", ['ui.router']);
+
+app.controller("DeckController", ['$scope', function ($scope) {
+
+ $scope.hello = function () {
+ alert("hello");
+ }
+
+
+
+}]);
diff --git a/scripts/viewDeckController.js b/scripts/viewDeckController.js
deleted file mode 100644
index a24efcf..0000000
--- a/scripts/viewDeckController.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var app = angular.module("flashy.viewDeckController.js", ['ui.router']);
-
-app.controller("viewDeckController", ['$scope', function ($scope) {
-
- $scope.hello = function () {
- alert("hello");
- }
-
-
-
-}]);
diff --git a/templates/deck.html b/templates/deck.html
new file mode 100644
index 0000000..e4d83b8
--- /dev/null
+++ b/templates/deck.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html ng-app="flashy">
+ <head>
+
+ <link rel="stylesheet" href="styles/bootstrap-3.3.4-dist/css/bootstrap.css" />
+ <link rel="stylesheet" href="flashy.css" />
+
+ </head>
+ <body ng-controller="DeckController">
+
+ <button type="button" ng-click="hello()">SUPPPP</button>
+
+ <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script>
+ <script src="/app/config.js"></script>
+ <!--<script src="controller.js"></script>-->
+
+
+ <script src="viewDeckController.js"></script>
+ </body>
+</html>
\ No newline at end of file
diff --git a/templates/viewDeck.html b/templates/viewDeck.html
deleted file mode 100644
index 3abbd80..0000000
--- a/templates/viewDeck.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html ng-app="flashy">
-<head>
-
-
- <link rel="stylesheet" href="styles/bootstrap-3.3.4-dist/css/bootstrap.css" />
- <link rel="stylesheet" href="flashy.css" />
-
-</head>
-<body ng-controller="viewDeckController">
- kjkkj;j;l
-
- <button type="button" ng-click="hello()">SUPPPP</button>
-
- <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script>
- <script src="config.js"></script>
- <script src="controller.js"></script>
-
-
- <script src="viewDeckController.js"
-</body>
-</html>
\ No newline at end of file
--
1.9.1