110swag / flashy-frontend

Download as
Browse Code »

Commit a1dbaa3590eb52851972547dd63257cf669589bc

Authored by Rachel Lee
1 parent 8e5fad9456
Exists in master and in 1 other branch ef9f9dd363e92d55eb4d80d036193be39572172b

Deck WIP, flashcard directive now has pull card from feed but doesn't check it's already pulled

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

gjslint.conf View file @ a1dbaa3
1   ---max_line_length=140
  1 +--max_line_length=80
scripts/FeedController.js View file @ a1dbaa3
... ... @@ -19,15 +19,13 @@
19 19 console.log('go to deck');
20 20 };
21 21  
  22 + /*
22 23 $scope.pullCard = function(card) {
23   - /*
24   - $http.post('/api/flashcards/' + card + '/pull',
25   - {}
26   - */
27   - var index = $scope.cards.indexOf(card);
  24 + $http.post('/api/flashcards/' + card.id + '/pull/', card);
28 25  
29   - console.log($scope.cards[index]);
  26 + console.log("Pulling card w/ id: " + card.id);
30 27 };
  28 + */
31 29  
32 30 $scope.pushCard = function () {
33 31 console.log('make! card content:' + $scope.text);
scripts/FlashcardDirective.js View file @ a1dbaa3
1 1 angular.module('flashy.FlashcardDirective', []).
2 2  
3   -directive('flashcard', function() {
  3 +directive('flashcard', ['$http', function($http) {
4 4 return {
5 5 templateUrl: '/app/templates/flashcard.html',
6 6 restrict: 'E',
7 7 scope: {
8 8 flashcard: '=flashcardObj' // flashcard-obj in html
9 9 },
10   - link: function(scope) {
  10 + link: function(scope, $scope) {
11 11 console.log("HELLO FROM FLASHCARD DIRECTIVE");
12 12 console.log(scope.flashcard);
13 13  
  14 + scope.pullCard = function(flashcard) {
  15 + $http.post('/api/flashcards/' + flashcard.id + '/pull/', flashcard);
  16 + console.log("pulled flashcard #" + flashcard.id);
  17 + }
  18 +
  19 +
14 20 // Put flashcard-specific functions here.
15 21 // This will probably include add/hide/modals/etc.
16 22 }
17 23 };
18   -});
  24 +}]);
templates/deck.html View file @ a1dbaa3
1   -
2   -<!--<i class="small mdi-content-sort" ng-click="filter()">Filter</i>-->
  1 +<!--<i class="small mdi-content-sort" ng-click="filter()">Filter</i>-->
  2 +<div class="row">
  3 + <div ng-repeat="card in cards">
  4 + <flashcard flashcard-obj="card"/>
  5 +
  6 + <!--
  7 + <div class="col s6">
  8 + <div class="card">
  9 + <div class="card-content">
  10 + <p>{{card.content}}</p>
  11 + </div>
3 12  
4   -
5   -<div>
6   -
7   - <div class="row">
8   - <div ng-repeat="card in cards">
9   - <div class="col s6">
10   - <div class="card">
11   - <div class="card-content">
12   - <p>{{card.content}}</p>
13   - </div>
14   -
15   - <div class="card-action">
16   -
17   - <i class="small mdi-action-delete" ng-click="removeCard(card)"></i>
18   -
19   - <a class="modal-trigger" href="#editModal"><i class="small mdi-editor-border-color modal-trigger" ng-click="editCard(card)"></i></a>
20   -
21   - <!-- Modal Structure -->
22   - <div id="editModal" class="modal modal-fixed-footer">
23   - <div class="modal-content">
24   - <div class="row">
25   - <form class="col s12">
26   - <div class="row">
27   - <div class="input-field col s6">
28   - <i class="mdi-editor-mode-edit prefix"></i>
29   - <textarea id="icon_prefix2" class="materialize-textarea" ng-model="$parent.editableContent">{{card.content}}</textarea>
30   - <label for="icon_prefix2"></label>
31   - </div>
  13 + <div class="card-action">
  14 + <i class="small mdi-action-delete" ng-click="removeCard(card)"></i>
  15 + <a class="modal-trigger" href="#editModal"><i class="small mdi-editor-border-color modal-trigger" ng-click="editCard(card)"></i></a>
  16 + <!-- Modal Structure -->
  17 + <div id="editModal" class="modal modal-fixed-footer">
  18 + <div class="modal-content">
  19 + <div class="row">
  20 + <form class="col s12">
  21 + <div class="row">
  22 + <div class="input-field col s6">
  23 + <i class="mdi-editor-mode-edit prefix"></i>
  24 + <textarea id="icon_prefix2" class="materialize-textarea" ng-model="$parent.editableContent">{{card.content}}</textarea>
  25 + <label for="icon_prefix2"></label>
32 26 </div>
33   - </form>
34   - </div>
35   -
  27 + </div>
  28 + </form>
36 29 </div>
37   -
38   -
39   - <div class="modal-footer">
40   - <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Done</a>
41   - </div>
42 30 </div>
43   -
44   -
  31 + <div class="modal-footer">
  32 + <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Done</a>
  33 + </div>
45 34 </div>
46   -
47 35 </div>
48   -
49 36 </div>
50   -
51   -
52 37 </div>
  38 + -->
53 39 </div>
54 40 </div>
templates/flashcard.html View file @ a1dbaa3
... ... @@ -4,7 +4,7 @@
4 4 </div>
5 5 <div class="card-overlay">
6 6 <a href="#">
7   - <div class="top-box">
  7 + <div class="top-box" ng-click="pullCard(flashcard)">
8 8 <div class="center-me"><i class="mdi-content-add-circle-outline medium"></i></div>
9 9 </div>
10 10 </a>