From 32b3331d87ba6f2244c6e1e0c4aacd957c0b1c85 Mon Sep 17 00:00:00 2001
From: Melody <Melody@Nupi-Talamoo.local>
Date: Fri, 15 May 2015 03:00:35 -0700
Subject: [PATCH] Fixed fancy buttons, hidden flashcard maker
---
config.js | 1 -
scripts/FeedController.js | 16 ++++++++++++++++
templates/feed.html | 46 +++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/config.js b/config.js
index f047a6d..5b0c188 100644
--- a/config.js
+++ b/config.js
@@ -6,7 +6,6 @@ angular.module('flashy', [
'flashy.DeckController',
'flashy.ClassAddController',
'flashy.RequestResetController',
- 'flashy.StudyController',
'flashy.UserService',
'ngCookies']).
config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
diff --git a/scripts/FeedController.js b/scripts/FeedController.js
index 67b8d0d..812efd4 100644
--- a/scripts/FeedController.js
+++ b/scripts/FeedController.js
@@ -15,6 +15,22 @@ angular.module('flashy.FeedController', ['ui.router']).
console.log('go to deck');
};
+ $scope.pullCard = function() {
+ console.log('card clicked');
+ };
+
+ $scope.pushCard = function() {
+ var inBox = document.getElementById('newCard');
+ var inLabel = document.getElementById('newCardSign');
+ if (inBox.style.visibility == "hidden") {
+ inBox.style.visibility = "visible";
+ inLabel.style.visibility = "visible";
+ } else {
+ inBox.style.visibility = "hidden";
+ inLabel.style.visibility = "hidden";
+ }
+ };
+
$scope.flashcard = "hi i am a flashcard";
}]);
diff --git a/templates/feed.html b/templates/feed.html
index be2d24a..e6d177f 100644
--- a/templates/feed.html
+++ b/templates/feed.html
@@ -1,17 +1,52 @@
- <div class="row" align="right">
- <a class="waves-effect waves-light btn" ng-click="viewDeck()" style="top: 25px">View Deck</a>
+ <div class="col s9">
+ <div class="row">
+ <a class="waves-effect waves-light btn" ng-click="viewDeck()" style="top: 15px">View Deck</a>
</div>
- <div class="col s15 m5">
- <div class="card-panel">
+ <!--random dummy cards-->
+ <div class="row">
+ <div class="col s1 m2 l4">
+ <div class="card-panel" ng-click="pullCard()">
<span>{{ flashcard }}</span>
</div>
</div>
- <div class="fixed-action-btn" style="bottom: 45px; right: 24px;">
+ <div class="col s1 m2 l4">
+ <div class="card" ng-click="pullCard()">
+ <div class="card-content">
+ <span class="card-title activator grey-text text-darken-4">{{ flashcard }} <i class="mdi-navigation-more-vert right"></i></span>
+ </div>
+ <div class="card-reveal">
+ <span class="card-title grey-text text-darken-4">{{ flashcard }}<i class="mdi-navigation-close right"></i></span>
+ <p>Herro der. I see you have found me.</p>
+ </div>
+ </div>
+ </div>
+
+ <div class="col s1 m2 l4">
+ <div class="card-panel" ng-click="pullCard()">
+ <span>{{ flashcard }}</span>
+ </div>
+ </div>
+
+ <!--New flashcard (still working on placement)-->
+ <div class="row">
+ <form class="col s12">
+ <div class="row">
+ <div class="input-field col s12">
+ <textarea class="materialize-textarea" id="newCard" style="visibility: hidden"></textarea>
+ <label id="newCardSign" for="newCard" style="visibility: hidden">New Flashcard</label>
+ </div>
+ </div>
+ </form>
+ </div>
+
+ <!--Lil plus button in corner-->
+ <div class="fixed-action-btn" ng-click="pushCard()" style="bottom: 45px; right: 24px;">
<a class="btn-floating btn-large purple">
<i class="large mdi-content-add"></i>
</a>
+ <!--Maybe this will come in handy later? Floating bubbles on mouseover-->
<ul>
<li><a class="btn-floating red"><i class="large mdi-editor-insert-chart"></i></a></li>
<li><a class="btn-floating yellow darken-1"><i class="large mdi-editor-format-quote"></i></a></li>
@@ -19,3 +54,4 @@
<li><a class="btn-floating blue"><i class="large mdi-editor-attach-file"></i></a></li>
</ul>
</div>
+</div>
--
1.9.1