110swag / flashy-frontend

Commit 32b3331d87ba6f2244c6e1e0c4aacd957c0b1c85

Authored by Melody 2015-05-15 03:00:35 -0700

Fixed fancy buttons, hidden flashcard maker

Showing 3 changed files with 57 additions and 6 deletions Inline Diff

config.js
scripts/FeedController.js
templates/feed.html

angular.module('flashy', [	1	1	angular.module('flashy', [
'flashy.LogoutController',	2	2	'flashy.LogoutController',
'flashy.LoginController',	3	3	'flashy.LoginController',
'flashy.RootController',	4	4	'flashy.RootController',
'flashy.FeedController',	5	5	'flashy.FeedController',
'flashy.DeckController',	6	6	'flashy.DeckController',
'flashy.ClassAddController',	7	7	'flashy.ClassAddController',
'flashy.RequestResetController',	8	8	'flashy.RequestResetController',
'flashy.StudyController',	9
'flashy.UserService',	10	9	'flashy.UserService',
'ngCookies']).	11	10	'ngCookies']).
config(['$stateProvider', '$urlRouterProvider', '$httpProvider',	12	11	config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$locationProvider',	13	12	'$locationProvider',
function($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {	14	13	function($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
'use strict';	15	14	'use strict';
$httpProvider.defaults.withCredentials = true;	16	15	$httpProvider.defaults.withCredentials = true;
$httpProvider.defaults.xsrfCookieName = 'csrftoken';	17	16	$httpProvider.defaults.xsrfCookieName = 'csrftoken';
$httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';	18	17	$httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
$locationProvider.html5Mode(true);	19	18	$locationProvider.html5Mode(true);
$urlRouterProvider.otherwise('/home');	20	19	$urlRouterProvider.otherwise('/home');
$stateProvider.	21	20	$stateProvider.
state('login', {	22	21	state('login', {
url: '/login',	23	22	url: '/login',
templateUrl: 'templates/login.html',	24	23	templateUrl: 'templates/login.html',
controller: 'LoginController'	25	24	controller: 'LoginController'
}).	26	25	}).
state('logout', {	27	26	state('logout', {
url: '/logout',	28	27	url: '/logout',
templateUrl: 'templates/logout.html',	29	28	templateUrl: 'templates/logout.html',
controller: 'LogoutController'	30	29	controller: 'LogoutController'
}).	31	30	}).
state('root', {	32	31	state('root', {
url: '/',	33	32	url: '/',
templateUrl: 'templates/root.html',	34	33	templateUrl: 'templates/root.html',
controller: 'RootController'	35	34	controller: 'RootController'
}).	36	35	}).
state('feed', {	37	36	state('feed', {
url: '/feed',	38	37	url: '/feed',
templateUrl: 'templates/feed.html',	39	38	templateUrl: 'templates/feed.html',
controller: 'FeedController'	40	39	controller: 'FeedController'
}).	41	40	}).
state('addclass', {	42	41	state('addclass', {
url: '/addclass',	43	42	url: '/addclass',
templateUrl: 'templates/addclass.html',	44	43	templateUrl: 'templates/addclass.html',
controller: 'ClassAddController'	45	44	controller: 'ClassAddController'
}).	46	45	}).
state('deck', {	47	46	state('deck', {
url: '/deck',	48	47	url: '/deck',
templateUrl: 'templates/deck.html',	49	48	templateUrl: 'templates/deck.html',
controller: 'DeckController'	50	49	controller: 'DeckController'
}).	51	50	}).
state('requestpasswordreset', {	52	51	state('requestpasswordreset', {
url: '/requestpasswordreset',	53	52	url: '/requestpasswordreset',
templateUrl: 'templates/requestpasswordreset.html',	54	53	templateUrl: 'templates/requestpasswordreset.html',
controller: 'RequestResetController'	55	54	controller: 'RequestResetController'
});	56	55	});
	57	56

angular.module('flashy.FeedController', ['ui.router']).	1	1	angular.module('flashy.FeedController', ['ui.router']).
	2	2
controller('FeedController', ['$scope', '$state', function($scope, $state) {	3	3	controller('FeedController', ['$scope', '$state', function($scope, $state) {
console.log('Hello from feed');	4	4	console.log('Hello from feed');
	5	5
$scope.createCard = function() {	6	6	$scope.createCard = function() {
	7	7
$(document).ready(function() {	8	8	$(document).ready(function() {
$('#createCardModal').modal('show');	9	9	$('#createCardModal').modal('show');
});	10	10	});
};	11	11	};
	12	12
$scope.viewDeck = function() {	13	13	$scope.viewDeck = function() {
$state.go('deck');	14	14	$state.go('deck');
console.log('go to deck');	15	15	console.log('go to deck');
};	16	16	};
	17	17
		18	$scope.pullCard = function() {
		19	console.log('card clicked');
		20	};
		21
		22	$scope.pushCard = function() {
		23	var inBox = document.getElementById('newCard');
		24	var inLabel = document.getElementById('newCardSign');
		25	if (inBox.style.visibility == "hidden") {
		26	inBox.style.visibility = "visible";
		27	inLabel.style.visibility = "visible";
		28	} else {
		29	inBox.style.visibility = "hidden";
		30	inLabel.style.visibility = "hidden";

<div class="row" align="right">	1	1	<div class="col s9">
<a class="waves-effect waves-light btn" ng-click="viewDeck()" style="top: 25px">View Deck</a>	2	2	<div class="row">
		3	<a class="waves-effect waves-light btn" ng-click="viewDeck()" style="top: 15px">View Deck</a>
</div>	3	4	</div>
	4	5
<div class="col s15 m5">	5	6	<!--random dummy cards-->
<div class="card-panel">	6	7	<div class="row">
		8	<div class="col s1 m2 l4">
		9	<div class="card-panel" ng-click="pullCard()">
<span>{{ flashcard }}</span>	7	10	<span>{{ flashcard }}</span>
</div>	8	11	</div>
</div>	9	12	</div>
	10	13
<div class="fixed-action-btn" style="bottom: 45px; right: 24px;">	11	14	<div class="col s1 m2 l4">
		15	<div class="card" ng-click="pullCard()">
		16	<div class="card-content">
		17	<span class="card-title activator grey-text text-darken-4">{{ flashcard }} <i class="mdi-navigation-more-vert right"></i></span>
		18	</div>
		19	<div class="card-reveal">
		20	<span class="card-title grey-text text-darken-4">{{ flashcard }}<i class="mdi-navigation-close right"></i></span>
		21	<p>Herro der. I see you have found me.</p>
		22	</div>
		23	</div>
		24	</div>
		25
		26	<div class="col s1 m2 l4">
		27	<div class="card-panel" ng-click="pullCard()">
		28	<span>{{ flashcard }}</span>
		29	</div>
		30	</div>
		31
		32	<!--New flashcard (still working on placement)-->
		33	<div class="row">
		34	<form class="col s12">
		35	<div class="row">
		36	<div class="input-field col s12">
		37	<textarea class="materialize-textarea" id="newCard" style="visibility: hidden"></textarea>
		38	<label id="newCardSign" for="newCard" style="visibility: hidden">New Flashcard</label>
		39	</div>
		40	</div>
		41	</form>
		42	</div>
		43
		44	<!--Lil plus button in corner-->
		45	<div class="fixed-action-btn" ng-click="pushCard()" style="bottom: 45px; right: 24px;">
<a class="btn-floating btn-large purple">	12	46	<a class="btn-floating btn-large purple">
<i class="large mdi-content-add"></i>	13	47	<i class="large mdi-content-add"></i>
</a>	14	48	</a>
		49	<!--Maybe this will come in handy later? Floating bubbles on mouseover-->
<ul>	15	50	<ul>
<li><a class="btn-floating red"><i class="large mdi-editor-insert-chart"></i></a></li>	16	51	<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>	17	52	<li><a class="btn-floating yellow darken-1"><i class="large mdi-editor-format-quote"></i></a></li>
<li><a class="btn-floating green"><i class="large mdi-editor-publish"></i></a></li>	18	53	<li><a class="btn-floating green"><i class="large mdi-editor-publish"></i></a></li>
<li><a class="btn-floating blue"><i class="large mdi-editor-attach-file"></i></a></li>	19	54	<li><a class="btn-floating blue"><i class="large mdi-editor-attach-file"></i></a></li>
</ul>	20	55	</ul>
</div>	21	56	</div>
		57	</div>
	22	58