Commit 8e8058a82f83e4b4d31a49a03b6cf50e41282c7d

Authored by Rachel Lee
1 parent 80d1e57aa5

Working on flashcard directive

Showing 6 changed files with 66 additions and 1 deletions Side-by-side Diff

... ... @@ -6,7 +6,9 @@
6 6 'flashy.DeckController',
7 7 'flashy.ClassAddController',
8 8 'flashy.RequestResetController',
  9 + 'flashy.ReviewController',
9 10 'flashy.UserService',
  11 + 'flashy.FlashcardDirective',
10 12 'ngCookies']).
11 13 config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
12 14 '$locationProvider',
... ... @@ -47,6 +49,16 @@
47 49 url: '/deck',
48 50 templateUrl: 'templates/deck.html',
49 51 controller: 'DeckController'
  52 + }).
  53 + state('review', {
  54 + url: '/review',
  55 + templateUrl: 'templates/review.html',
  56 + controller: 'ReviewController'
  57 + }).
  58 + state('flashcard', {
  59 + url: '/flashcard',
  60 + templateUrl: 'templates/flashcard.html',
  61 + controller: 'FlashcardController'
50 62 }).
51 63 state('requestpasswordreset', {
52 64 url: '/requestpasswordreset',
... ... @@ -22,6 +22,7 @@
22 22  
23 23 <script src="config.js"></script>
24 24  
  25 +<!-- Controllers -->
25 26 <script src="scripts/FeedController.js"></script>
26 27 <script src="scripts/RootController.js"></script>
27 28 <script src="scripts/LoginController.js"></script>
28 29  
... ... @@ -29,7 +30,15 @@
29 30 <script src="scripts/DeckController.js"></script>
30 31 <script src="scripts/RequestResetController.js"></script>
31 32 <script src="scripts/ClassAddController.js"></script>
  33 +<script src="scripts/ReviewController.js"></script>
  34 +
  35 +<!-- Services -->
32 36 <script src="scripts/UserService.js"></script>
  37 +
  38 +<!-- Directives -->
  39 +<script src="scripts/FlashcardDirective.js"></script>
  40 +
  41 +<!-- Other -->
33 42 <script src="//ghiden.github.io/angucomplete-alt/js/libs/angucomplete-alt.js"></script>
34 43 <!--<script src="scripts/bootstrap.js"></script>-->
35 44  
scripts/FlashcardDirective.js View file @ 8e8058a
  1 +angular.module('flashy.FlashcardDirective', []).
  2 +
  3 +directive('flashcard', function() {
  4 + return {
  5 + templateUrl: '/app/templates/flashcard.html',
  6 + restrict: 'E',
  7 + link: function() {
  8 + console.log("HELLO FROM FLASHCARD DIRECTIVE");
  9 + }
  10 + };
  11 +});
scripts/ReviewController.js View file @ 8e8058a
  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 + }
  7 +]);
templates/flashcard.html View file @ 8e8058a
  1 +<div class="row">
  2 + <div class="col s12 m6">
  3 + <div class="card">
  4 + <div class="card-image">
  5 + <img src="images/sample-1.jpg">
  6 + <span class="card-title">Card Title</span>
  7 + </div>
  8 + <div class="card-content">
  9 + <p>{{htmlContent}}</p>
  10 + </div>
  11 + <div class="card-action">
  12 + <a href="#">This is a link</a>
  13 + <a href='#'>This is a link</a>
  14 + </div>
  15 + </div>
  16 + </div>
  17 +</div>
templates/review.html View file @ 8e8058a
  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>Hello</flashcard>
  9 +</div>