From 54c942ddfc0a2d78857202c9d3d9933fdeea9a65 Mon Sep 17 00:00:00 2001
From: Andrew Buss <abuss@ucsd.edu>
Date: Tue, 19 May 2015 19:58:06 -0700
Subject: [PATCH] recovered cardlist view, committing before I lose!
---
config.js | 7 +++++++
home.html | 3 +++
scripts/CardListController.js | 22 ++++++++++++++++++++++
templates/cardlist.html | 20 ++++++++++++++++++++
templates/deck.html | 2 +-
templates/flashcard.html | 4 ++--
6 files changed, 55 insertions(+), 3 deletions(-)
create mode 100644 scripts/CardListController.js
create mode 100644 templates/cardlist.html
diff --git a/config.js b/config.js
index 76ed1f7..5765022 100644
--- a/config.js
+++ b/config.js
@@ -11,6 +11,7 @@ angular.module('flashy', [
'flashy.FlashcardDirective',
'flashy.ResetPasswordController',
'flashy.VerifyEmailController',
+ 'flashy.CardListController',
'ngCookies']).
config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$locationProvider',
@@ -53,6 +54,12 @@ angular.module('flashy', [
templateUrl: 'templates/feed.html',
controller: 'FeedController'
}).
+ state('cardlist', {
+ resolve: auth_resolve,
+ url: '/cards/{sectionId}',
+ templateUrl: 'templates/cardlist.html',
+ controller: 'CardListController'
+ }).
state('addclass', {
resolve: auth_resolve,
url: '/addclass',
diff --git a/home.html b/home.html
index b87ba4c..a100d69 100644
--- a/home.html
+++ b/home.html
@@ -58,6 +58,8 @@
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-animate.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-aria.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-filter/0.5.4/angular-filter.js"></script>
+
<script src="config.js"></script>
@@ -71,6 +73,7 @@
<script src="scripts/ClassAddController.js"></script>
<script src="scripts/StudyController.js"></script>
<script src="scripts/ResetPasswordController.js"></script>
+<script src="scripts/CardListController.js"></script>
<script src="scripts/VerifyEmailController.js"></script>
<!--<script src="scripts/SidebarController.js"></script>-->
diff --git a/scripts/CardListController.js b/scripts/CardListController.js
new file mode 100644
index 0000000..b51f901
--- /dev/null
+++ b/scripts/CardListController.js
@@ -0,0 +1,22 @@
+angular.module('flashy.CardListController', ['ui.router']).
+ controller('CardListController', ['$scope', '$state', '$http', '$stateParams',
+ function ($scope, $state, $http, $stateParams) {
+ // cards array
+ sectionId = $stateParams.sectionId;
+ $scope.cards = [];
+
+ $http.get('/api/sections/' + sectionId + '/flashcards/').
+ success(function (data) {
+ console.log(data);
+ $scope.cards = data;
+ }).
+ error(function (err) {
+ console.log('pulling feed failed');
+ });
+ $scope.viewFeed = function () {
+ $state.go('feed', {sectionId: sectionId});
+ console.log('go to feed');
+ };
+
+
+ }]);
diff --git a/templates/cardlist.html b/templates/cardlist.html
new file mode 100644
index 0000000..8b03b97
--- /dev/null
+++ b/templates/cardlist.html
@@ -0,0 +1,20 @@
+<div class="row">
+ <a class="btn" ng-click="viewFeed()" style="margin-top: 15px">View Feed</a>
+</div>
+
+<!--<i class="small mdi-content-sort" ng-click="filter()">Filter</i>-->
+<div class="row">
+ <table>
+ <thead>
+ <tr>
+ <th data-field="id">Name</th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr ng-repeat="card in cards">
+ <td>{{card.text}}</td>
+ </tr>
+ </tbody>
+ </table>
+</div>
diff --git a/templates/deck.html b/templates/deck.html
index 5559e5b..891c0ca 100644
--- a/templates/deck.html
+++ b/templates/deck.html
@@ -37,4 +37,4 @@
</div>
</div>
</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/flashcard.html b/templates/flashcard.html
index 1bc8fe0..ab016fc 100644
--- a/templates/flashcard.html
+++ b/templates/flashcard.html
@@ -1,11 +1,11 @@
<div class="card flashy smallify" ng-init="startShrink = false"
- ng-class="{'shrinky': startShrink}">
+ ng-class="{'shrinky': startShrink}">
<div class="card-content">
<p>{{flashcard.text}}</p>
</div>
<div class="card-overlay">
<div class="top-box no-user-select"
- ng-click="pullCard(flashcard)">
+ ng-click="pullCard(flashcard)">
<div class="center-me"><i class="mdi-content-add-circle-outline medium"></i></div>
</div>
--
1.9.1