110swag / flashy-frontend

Download as
Browse Code ยป

Commit 8bc4d0271d9ad1f6c985c0871433f34ad20db273

Authored by Melody
1 parent 83b0fbebca
Exists in master and in 1 other branch ef9f9dd363e92d55eb4d80d036193be39572172b

Toasts, brought back expand for badges

Showing 2 changed files with 48 additions and 21 deletions Side-by-side Diff

scripts/CardListController.js View file @ 8bc4d02
... ... @@ -27,13 +27,14 @@
27 27  
28 28 // locally change hidden
29 29 card.is_hidden = false;
  30 + Materialize.toast('Unhidden', 3000, 'rounded');
30 31 }).
31 32 error(function(err) {
32 33 console.log('no unhide for you');
33 34 });
34 35 };
35 36  
36   - // unhide card
  37 + // hide card
37 38 $scope.hide = function(card) {
38 39 $http.post('/api/flashcards/' + card.id + '/hide/').
39 40 success(function(data) {
... ... @@ -41,6 +42,7 @@
41 42  
42 43 // locally change hidden
43 44 card.is_hidden = true;
  45 + Materialize.toast('Hidden', 3000, 'rounded');
44 46 }).
45 47 error(function(err) {
46 48 console.log('no hide for you');
... ... @@ -55,6 +57,7 @@
55 57  
56 58 // locally change boolean for display purposes
57 59 card.is_in_deck = true;
  60 + Materialize.toast('Added to Your Deck', 3000, 'rounded');
58 61 }).
59 62 error(function(err) {
60 63 console.log('no hide for you');
... ... @@ -69,6 +72,7 @@
69 72  
70 73 // local change for display purposes
71 74 card.is_in_deck = false;
  75 + Materialize.toast('Removed from Your Deck', 3000, 'rounded');
72 76 }).
73 77 error(function(err) {
74 78 console.log('no hide for you');
... ... @@ -88,6 +92,27 @@
88 92 $(document).off('keydown');
89 93 });
90 94  
  95 +
  96 + $scope.dayofweek = function(item) {
  97 + var date = new Date(item.material_date);
  98 + switch(date.getDay()) {
  99 + case 0:
  100 + return "Su";
  101 + case 1:
  102 + return "M";
  103 + case 2:
  104 + return "T";
  105 + case 3:
  106 + return "W";
  107 + case 4:
  108 + return "R";
  109 + case 5:
  110 + return "F";
  111 + case 6:
  112 + return "Sa";
  113 + }
  114 + };
  115 +
91 116 // checkbox filter
92 117 $scope.filter = {
93 118 'week1': true,
... ... @@ -103,17 +128,17 @@
103 128 };
104 129  
105 130 $scope.filterByDate = function(item) {
106   - var date = new Date(item.material_date);
107   - return ((date >= new Date('Mar 29, 2015')) && (date <= new Date('Apr 4, 2015')) && $scope.filter['week1']) ||
108   - ((date >= new Date('Apr 4, 2015')) && (date <= new Date('Apr 11, 2015')) && $scope.filter['week2']) ||
109   - ((date >= new Date('Apr 12, 2015')) && (date <= new Date('Apr 18, 2015')) && $scope.filter['week3']) ||
110   - ((date >= new Date('Apr 19, 2015')) && (date <= new Date('Apr 25, 2015')) && $scope.filter['week4']) ||
111   - ((date >= new Date('Apr 26, 2015')) && (date <= new Date('May 2, 2015')) && $scope.filter['week5']) ||
112   - ((date >= new Date('May 3, 2015')) && (date <= new Date('May 9, 2015')) && $scope.filter['week6']) ||
113   - ((date >= new Date('May 10, 2015')) && (date <= new Date('May 16, 2015')) && $scope.filter['week7']) ||
114   - ((date >= new Date('May 17, 2015')) && (date <= new Date('May 23, 2015')) && $scope.filter['week8']) ||
115   - ((date >= new Date('May 24, 2015')) && (date <= new Date('May 30, 2015')) && $scope.filter['week9']) ||
116   - ((date >= new Date('May 31, 2015')) && (date <= new Date('Jun 6, 2015')) && $scope.filter['week10']);
  131 + var week = item.material_week_num;
  132 + return (week == 1 && $scope.filter['week1']) ||
  133 + (week == 2 && $scope.filter['week2']) ||
  134 + (week == 3 && $scope.filter['week3']) ||
  135 + (week == 4 && $scope.filter['week4']) ||
  136 + (week == 5 && $scope.filter['week5']) ||
  137 + (week == 6 && $scope.filter['week6']) ||
  138 + (week == 7 && $scope.filter['week7']) ||
  139 + (week == 8 && $scope.filter['week8']) ||
  140 + (week == 9 && $scope.filter['week9']) ||
  141 + (week == 10 && $scope.filter['week10']);
117 142 };
118 143  
119 144 }
templates/cardlist.html View file @ 8bc4d02
... ... @@ -61,16 +61,18 @@
61 61 <ul class="collection"
62 62 ng-repeat="(weeknum, week_cards) in cards | filter:searchText | filter:filterByDate | groupBy: 'material_week_num'">
63 63 <li class="collection-header"><h3>Week {{weeknum}}</h3></li>
64   - <li class="collection-item" ng-repeat="card in week_cards" ng-show="show || !card.is_hidden">
  64 + <li class="collection-item" ng-click="expand = !expand" ng-repeat="card in week_cards" ng-show="show || !card.is_hidden">
65 65 <div>{{card.text}}
66   - <a href="" ng-click="hide(card)" class="secondary-content" ng-show="!card.is_hidden"><i
67   - class="mdi-action-delete small"></i></a>
68   - <a href="" ng-click="unhide(card)" class="secondary-content" ng-show="card.is_hidden"><i
69   - class="mdi-image-remove-red-eye small"></i></a>
70   - <a href="" ng-click="pull(card)" class="secondary-content" ng-show="!card.is_in_deck"><i
71   - class="mdi-content-add-circle small"></i></a>
72   - <a href="" ng-click="unpull(card)" class="secondary-content" ng-show="card.is_in_deck"><i
73   - class="mdi-content-remove-circle small"></i></a>
  66 + <span class="badge">{{dayofweek(card)}}</span>
  67 + <p class="right-align" ng-show="expand">
  68 + <a href="" ng-click="pull(card)" ng-show="!card.is_in_deck"><i
  69 + class="mdi-content-add-circle-outline small"></i></a>
  70 + <a href="" ng-click="unpull(card)" ng-show="card.is_in_deck"><i
  71 + class="mdi-content-remove-circle-outline small"></i></a>
  72 + <a href="" ng-click="hide(card)" ng-show="!card.is_hidden"><i
  73 + class="mdi-action-delete small"></i></a>
  74 + <a href="" ng-click="unhide(card)" ng-show="card.is_hidden"><i
  75 + class="mdi-image-remove-red-eye small"></i></a>
74 76 </p>
75 77 </div>
76 78 </li>