110swag / flashy-frontend

Download as
Browse Code »

Commit 3c4c48c962fead67d78ca27d753dacf7fd8aaec3

Authored by Kevin Mach
1 parent 07e4730db5
Exists in master and in 1 other branch ef9f9dd363e92d55eb4d80d036193be39572172b

removed errors for view deck files

Showing 6 changed files with 39 additions and 34 deletions Side-by-side Diff

config.js View file @ 3c4c48c
... ... @@ -3,6 +3,7 @@
3 3 'flashy.LoginController',
4 4 'flashy.HomeController',
5 5 'flashy.FeedController',
  6 + 'flashy.DeckController',
6 7 'ngCookies']).
7 8 config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',
8 9 function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
... ... @@ -37,6 +38,11 @@
37 38 url: '/feed',
38 39 templateUrl: 'templates/feed.html',
39 40 controller: 'FeedController'
  41 + }).
  42 + state('deck', {
  43 + url: '/deck',
  44 + templateUrl: 'templates/deck.html',
  45 + controller: 'DeckController'
40 46 });
41 47  
42 48 }]);
home.html View file @ 3c4c48c
... ... @@ -26,6 +26,7 @@
26 26 <script src="scripts/HomeController.js"></script>
27 27 <script src="scripts/LoginController.js"></script>
28 28 <script src="scripts/LogoutController.js"></script>
  29 +<script src="scripts/DeckController.js"></script>
29 30  
30 31  
31 32 <script src="scripts/jquery-2.1.3.min.js"></script>
scripts/DeckController.js View file @ 3c4c48c
  1 +var app = angular.module("flashy.DeckController", ['ui.router']);
  2 +
  3 +app.controller("DeckController", ['$scope', function ($scope) {
  4 +
  5 + $scope.hello = function () {
  6 + alert("hello");
  7 + }
  8 +
  9 +
  10 +
  11 +}]);
scripts/viewDeckController.js View file @ 3c4c48c
1   -var app = angular.module("flashy.viewDeckController.js", ['ui.router']);
2   -
3   -app.controller("viewDeckController", ['$scope', function ($scope) {
4   -
5   - $scope.hello = function () {
6   - alert("hello");
7   - }
8   -
9   -
10   -
11   -}]);
templates/deck.html View file @ 3c4c48c
  1 +<!DOCTYPE html>
  2 +<html ng-app="flashy">
  3 + <head>
  4 +
  5 + <link rel="stylesheet" href="styles/bootstrap-3.3.4-dist/css/bootstrap.css" />
  6 + <link rel="stylesheet" href="flashy.css" />
  7 +
  8 + </head>
  9 + <body ng-controller="DeckController">
  10 +
  11 + <button type="button" ng-click="hello()">SUPPPP</button>
  12 +
  13 + <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
  14 + <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script>
  15 + <script src="/app/config.js"></script>
  16 + <!--<script src="controller.js"></script>-->
  17 +
  18 +
  19 + <script src="viewDeckController.js"></script>
  20 + </body>
  21 +</html>
templates/viewDeck.html View file @ 3c4c48c
1   -<!DOCTYPE html>
2   -<html ng-app="flashy">
3   -<head>
4   -
5   -
6   - <link rel="stylesheet" href="styles/bootstrap-3.3.4-dist/css/bootstrap.css" />
7   - <link rel="stylesheet" href="flashy.css" />
8   -
9   -</head>
10   -<body ng-controller="viewDeckController">
11   - kjkkj;j;l
12   -
13   - <button type="button" ng-click="hello()">SUPPPP</button>
14   -
15   - <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
16   - <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script>
17   - <script src="config.js"></script>
18   - <script src="controller.js"></script>
19   -
20   -
21   - <script src="viewDeckController.js"
22   -</body>
23   -</html>