110swag / flashy-frontend

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

Showing 5 changed files with 22 additions and 22 deletions Side-by-side Diff

...	...	@@ -6,7 +6,7 @@
6	6	'flashy.DeckController',
7	7	'flashy.ClassAddController',
8	8	'flashy.RequestResetController',
9		- 'flashy.ReviewController',
	9	+ 'flashy.StudyController',
10	10	'flashy.UserService',
11	11	'flashy.FlashcardDirective',
12	12	'flashy.ResetPasswordController',
...	...	@@ -52,10 +52,10 @@
52	52	templateUrl: 'templates/deck.html',
53	53	controller: 'DeckController'
54	54	}).
55		- state('review', {
56		- url: '/review',
57		- templateUrl: 'templates/review.html',
58		- controller: 'ReviewController'
	55	+ state('study', {
	56	+ url: '/study',
	57	+ templateUrl: 'templates/study.html',
	58	+ controller: 'StudyController'
59	59	}).
60	60	state('flashcard', {
61	61	url: '/flashcard',

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

	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	+ }
	8	+]);

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>

	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>