110swag / flashy-frontend

Commit 58b21808adc73abde2177190703d7fc39ad13ccb

Authored by Rachel Lee 2015-05-17 01:36:09 -0700

Rename review to study front-end style

Showing 5 changed files with 22 additions and 22 deletions Inline Diff

config.js
scripts/ReviewController.js
scripts/StudyController.js
templates/review.html
templates/study.html

angular.module('flashy', [	1	1	angular.module('flashy', [
'flashy.LogoutController',	2	2	'flashy.LogoutController',
'flashy.LoginController',	3	3	'flashy.LoginController',
'flashy.RootController',	4	4	'flashy.RootController',
'flashy.FeedController',	5	5	'flashy.FeedController',
'flashy.DeckController',	6	6	'flashy.DeckController',
'flashy.ClassAddController',	7	7	'flashy.ClassAddController',
'flashy.RequestResetController',	8	8	'flashy.RequestResetController',
'flashy.ReviewController',	9	9	'flashy.StudyController',
'flashy.UserService',	10	10	'flashy.UserService',
'flashy.FlashcardDirective',	11	11	'flashy.FlashcardDirective',
'flashy.ResetPasswordController',	12	12	'flashy.ResetPasswordController',
'flashy.VerifyEmailController',	13	13	'flashy.VerifyEmailController',
'ngCookies']).	14	14	'ngCookies']).
config(['$stateProvider', '$urlRouterProvider', '$httpProvider',	15	15	config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$locationProvider',	16	16	'$locationProvider',
function($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {	17	17	function($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
'use strict';	18	18	'use strict';
$httpProvider.defaults.withCredentials = true;	19	19	$httpProvider.defaults.withCredentials = true;
$httpProvider.defaults.xsrfCookieName = 'csrftoken';	20	20	$httpProvider.defaults.xsrfCookieName = 'csrftoken';
$httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';	21	21	$httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
$locationProvider.html5Mode(true);	22	22	$locationProvider.html5Mode(true);
$urlRouterProvider.otherwise('/home');	23	23	$urlRouterProvider.otherwise('/home');
$stateProvider.	24	24	$stateProvider.
state('login', {	25	25	state('login', {
url: '/login',	26	26	url: '/login',
templateUrl: 'templates/login.html',	27	27	templateUrl: 'templates/login.html',
controller: 'LoginController'	28	28	controller: 'LoginController'
}).	29	29	}).
state('logout', {	30	30	state('logout', {
url: '/logout',	31	31	url: '/logout',
templateUrl: 'templates/logout.html',	32	32	templateUrl: 'templates/logout.html',
controller: 'LogoutController'	33	33	controller: 'LogoutController'
}).	34	34	}).
state('root', {	35	35	state('root', {
url: '/',	36	36	url: '/',
templateUrl: 'templates/root.html',	37	37	templateUrl: 'templates/root.html',
controller: 'RootController'	38	38	controller: 'RootController'
}).	39	39	}).
state('feed', {	40	40	state('feed', {
url: '/feed',	41	41	url: '/feed',
templateUrl: 'templates/feed.html',	42	42	templateUrl: 'templates/feed.html',
controller: 'FeedController'	43	43	controller: 'FeedController'
}).	44	44	}).
state('addclass', {	45	45	state('addclass', {
url: '/addclass',	46	46	url: '/addclass',
templateUrl: 'templates/addclass.html',	47	47	templateUrl: 'templates/addclass.html',
controller: 'ClassAddController'	48	48	controller: 'ClassAddController'
}).	49	49	}).
state('deck', {	50	50	state('deck', {
url: '/deck',	51	51	url: '/deck',
templateUrl: 'templates/deck.html',	52	52	templateUrl: 'templates/deck.html',
controller: 'DeckController'	53	53	controller: 'DeckController'
}).	54	54	}).
state('review', {	55	55	state('study', {
url: '/review',	56	56	url: '/study',
templateUrl: 'templates/review.html',	57	57	templateUrl: 'templates/study.html',
controller: 'ReviewController'	58	58	controller: 'StudyController'
}).	59	59	}).
state('flashcard', {	60	60	state('flashcard', {
url: '/flashcard',	61	61	url: '/flashcard',
templateUrl: 'templates/flashcard.html',	62	62	templateUrl: 'templates/flashcard.html',
controller: 'FlashcardController'	63	63	controller: 'FlashcardController'
}).	64	64	}).
state('requestpasswordreset', {	65	65	state('requestpasswordreset', {
url: '/requestpasswordreset',	66	66	url: '/requestpasswordreset',
templateUrl: 'templates/requestpasswordreset.html',	67	67	templateUrl: 'templates/requestpasswordreset.html',
controller: 'RequestResetController'	68	68	controller: 'RequestResetController'
}).	69	69	}).
state('resetpassword', {	70	70	state('resetpassword', {
url: '/resetpassword/{uid}/{token}',	71	71	url: '/resetpassword/{uid}/{token}',
templateUrl: 'templates/resetpassword.html',	72	72	templateUrl: 'templates/resetpassword.html',
controller: 'ResetPasswordController'	73	73	controller: 'ResetPasswordController'
}).	74	74	}).
state('verifyemail', {	75	75	state('verifyemail', {
url: '/verifyemail/{key}',	76	76	url: '/verifyemail/{key}',
templateUrl: 'templates/verifyemail.html',	77	77	templateUrl: 'templates/verifyemail.html',
controller: 'VerifyEmailController'	78	78	controller: 'VerifyEmailController'
});	79	79	});
}]);	80	80	}]);
	81	81

angular.module('flashy.ReviewController', ['ui.router']).	1	File was deleted
	2
controller('ReviewController', ['$scope', '$state',	3
function($scope, $state) {	4
console.log("hello from review controller");	5
$scope.htmlContent = 'hello there from js review ctrl';	6
}	7

File was created	1	angular.module('flashy.StudyController', ['ui.router']).
	2
	3	controller('StudyController', ['$scope', '$state',
	4	function($scope, $state) {
	5	console.log("hello from review controller");
	6	$scope.htmlContent = 'hello there from js review ctrl';
	7	}

<div class="container">	1	File was deleted
Hello<br>	2
1. Get card from server.<br>	3
2. Show card<br>	4
3. Inputs<br>	5
4. Compare answers<br>	6
5. User decides for correct/incorrect<br>	7
<flashcard ng-bind-html="htmlContent"></flashcard>	8
</div>	9

File was created	1	<div class="container">
	2	Hello<br>
	3	1. Get card from server.<br>
	4	2. Show card<br>
	5	3. Inputs<br>
	6	4. Compare answers<br>
	7	5. User decides for correct/incorrect<br>
	8	<flashcard ng-bind-html="htmlContent"></flashcard>
	9	</div>