110swag / flashy-frontend

Commit 3c4c48c962fead67d78ca27d753dacf7fd8aaec3

Authored by Kevin Mach 2015-05-09 14:48:15 -0700

removed errors for view deck files

Showing 6 changed files with 39 additions and 34 deletions Inline Diff

config.js
home.html
scripts/DeckController.js
scripts/viewDeckController.js
templates/deck.html
templates/viewDeck.html

angular.module('flashy', [	1	1	angular.module('flashy', [
'flashy.LogoutController',	2	2	'flashy.LogoutController',
'flashy.LoginController',	3	3	'flashy.LoginController',
'flashy.HomeController',	4	4	'flashy.HomeController',
'flashy.FeedController',	5	5	'flashy.FeedController',
		6	'flashy.DeckController',
'ngCookies']).	6	7	'ngCookies']).
config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',	7	8	config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',
function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {	8	9	function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
"use strict";	9	10	"use strict";
$httpProvider.defaults.withCredentials = true;	10	11	$httpProvider.defaults.withCredentials = true;
$httpProvider.defaults.xsrfCookieName = 'csrftoken';	11	12	$httpProvider.defaults.xsrfCookieName = 'csrftoken';
$httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';	12	13	$httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
$locationProvider.html5Mode(true);	13	14	$locationProvider.html5Mode(true);
$urlRouterProvider.otherwise('/home');	14	15	$urlRouterProvider.otherwise('/home');
$stateProvider.	15	16	$stateProvider.
state('home', {	16	17	state('home', {
url: '/home',	17	18	url: '/home',
templateUrl: 'home.html',	18	19	templateUrl: 'home.html',
controller: 'HomeController'	19	20	controller: 'HomeController'
}).	20	21	}).
state('login', {	21	22	state('login', {
url: '/login',	22	23	url: '/login',
templateUrl: 'templates/login_form.html',	23	24	templateUrl: 'templates/login_form.html',
controller: 'LoginController'	24	25	controller: 'LoginController'
}).	25	26	}).
state('logout', {	26	27	state('logout', {
url: '/logout',	27	28	url: '/logout',
templateUrl: 'templates/logout.html',	28	29	templateUrl: 'templates/logout.html',
controller: 'LogoutController'	29	30	controller: 'LogoutController'
}).	30	31	}).
state('dashboard', {	31	32	state('dashboard', {
url: '/dashboard',	32	33	url: '/dashboard',
templateUrl: 'templates/dashboard.html',	33	34	templateUrl: 'templates/dashboard.html',
controller: 'DashboardController'	34	35	controller: 'DashboardController'
}).	35	36	}).
state('feed', {	36	37	state('feed', {
url: '/feed',	37	38	url: '/feed',
templateUrl: 'templates/feed.html',	38	39	templateUrl: 'templates/feed.html',
controller: 'FeedController'	39	40	controller: 'FeedController'
		41	}).
		42	state('deck', {
		43	url: '/deck',
		44	templateUrl: 'templates/deck.html',
		45	controller: 'DeckController'
});	40	46	});
	41	47

File was created	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");

var app = angular.module("flashy.viewDeckController.js", ['ui.router']);	1	File was deleted
	2
app.controller("viewDeckController", ['$scope', function ($scope) {	3
	4
$scope.hello = function () {	5
alert("hello");	6

File was created	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>

<!DOCTYPE html>	1	File was deleted
<html ng-app="flashy">	2
<head>	3
	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="viewDeckController">	10
kjkkj;j;l	11
	12
<button type="button" ng-click="hello()">SUPPPP</button>	13
	14
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>	15
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script>	16

<!DOCTYPE html>	1	1	<!DOCTYPE html>
<html ng-app="flashy">	2	2	<html ng-app="flashy">
<base href="/app/">	3	3	<base href="/app/">
<head>	4	4	<head>
<link rel="stylesheet" href="styles/bootstrap-3.3.4-dist/css/bootstrap.css"/>	5	5	<link rel="stylesheet" href="styles/bootstrap-3.3.4-dist/css/bootstrap.css"/>
<link rel="stylesheet" href="flashy.css"/>	6	6	<link rel="stylesheet" href="flashy.css"/>
</head>	7	7	</head>
	8	8
<body ng-controller="HomeController">	9	9	<body ng-controller="HomeController">
	10	10
<!-- MENU BAR -->	11	11	<!-- MENU BAR -->
<nav class="navbar navbar-default">	12	12	<nav class="navbar navbar-default">
<div class="container-fluid">	13	13	<div class="container-fluid">
<a class="navbar-brand" ui-sref="dashboard">Flashy</a>	14	14	<a class="navbar-brand" ui-sref="dashboard">Flashy</a>
<a class="navbar-brand navbar-right" ui-sref="logout">Logout</a>	15	15	<a class="navbar-brand navbar-right" ui-sref="logout">Logout</a>
</div>	16	16	</div>
</nav>	17	17	</nav>
<div class="container" ui-view></div>	18	18	<div class="container" ui-view></div>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>	19	19	<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>	20	20	<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script>	21	21	<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script>
	22	22
<script src="config.js"></script>	23	23	<script src="config.js"></script>
	24	24
<script src="scripts/FeedController.js"></script>	25	25	<script src="scripts/FeedController.js"></script>
<script src="scripts/HomeController.js"></script>	26	26	<script src="scripts/HomeController.js"></script>
<script src="scripts/LoginController.js"></script>	27	27	<script src="scripts/LoginController.js"></script>
<script src="scripts/LogoutController.js"></script>	28	28	<script src="scripts/LogoutController.js"></script>
		29	<script src="scripts/DeckController.js"></script>