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 @@ + 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 @@ + + +
+ + + + + + + + + + + + + + + + + + \ 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 @@ - - - - - - - - - - - kjkkj;j;l - - - - - - - - - -