110swag / flashy-frontend

Commit 4d8fc29ebee077feb21a7c6f5ca5dc6a3b462b55

Authored by Nam Tran 2015-05-24 18:44:22 -0700

Id added for login.html

Showing 9 changed files with 94 additions and 134 deletions Side-by-side Diff

home.html
sass/flashier.scss
scripts/FeedController.js
scripts/FlashcardDirective.js
scripts/LoginController.js
styles/flashier.css
styles/flashy.css
templates/addclass.html
templates/login.html

...	...	@@ -2,6 +2,7 @@
2	2	<html ng-app="flashy">
3	3	<base href="/app/">
4	4	<head>
	5	+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
5	6	<link rel="stylesheet"
6	7	href="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.css">
7	8
8	9
9	10
10	11
11	12
12	13
13	14
14	15
15	16
...	...	@@ -13,65 +14,61 @@
13	14	</head>
14	15	<header>
15	16
16		- <!--<a href="#" style="position:absolute;top:0;left:0;" data-activates="sidebar" class="button-collapse"><i
17		- class="medium mdi-navigation-menu"></i></a>
18		- <ul ng-show="isLoggedIn" id="sidebar" class="side-nav fixed ng-cloak">
19		- <li class="logo"><a href="//flashy.cards/" id="logo-container">
	17	+ <!--<a href="#" style="position:absolute;top:0;left:0;" data-activates="sidebar" class="button-collapse"><i
	18	+ class="medium mdi-navigation-menu"></i></a>
	19	+ <ul ng-show="isLoggedIn" id="sidebar" class="side-nav fixed ng-cloak">
	20	+ <li class="logo"><a href="//flashy.cards/" id="logo-container">
20	21
21		- <h1>Flashy</h1>
22		- </a></li>
23		- <li class="no-padding">
24		- <ul class="collapsible" data-collapsible="accordion">
25		- <li class="bold">
26		- <a class="collapsible-header black-text">Classes</a>
27		- </li>
28		- <div class="collapsible-body" style="display: block">
29		- <ul>
30		- <li ui-sref-active="active" ng-repeat="section in sections">
31		- <a class="class bold" ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
32		- </li>
33		- </ul>
34		- </div>
35		- </ul>
36		- </li>
37		- <li class="bold"><a ui-sref="addclass">Add Class</a></li>
38		- <li class="bold"><a ui-sref="study">Study</a></li>
39		- <li class="bold"><a ui-sref="logout">Logout</a></li>
40		- </ul>-->
	22	+ <h1>Flashy</h1>
	23	+ </a></li>
	24	+ <li class="no-padding">
	25	+ <ul class="collapsible" data-collapsible="accordion">
	26	+ <li class="bold">
	27	+ <a class="collapsible-header black-text">Classes</a>
	28	+ </li>
	29	+ <div class="collapsible-body" style="display: block">
	30	+ <ul>
	31	+ <li ui-sref-active="active" ng-repeat="section in sections">
	32	+ <a class="class bold" ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
	33	+ </li>
	34	+ </ul>
	35	+ </div>
	36	+ </ul>
	37	+ </li>
	38	+ <li class="bold"><a ui-sref="addclass">Add Class</a></li>
	39	+ <li class="bold"><a ui-sref="study">Study</a></li>
	40	+ <li class="bold"><a ui-sref="logout">Logout</a></li>
	41	+ </ul>-->
41	42
42	43
43	44	</header>
44	45	<body ng-controller="RootController">
45	46
46		- <!-- Menu Bar -->
47		- <nav ng-show="isLoggedIn">
48		- <div class="nav-wrapper">
49		- <a href="#" class="brand-logo center">Flashy</a>
50		- <ul id="nav-mobile" class="right hide-on-med-and-down">
	47	+<!-- Menu Bar -->
	48	+<nav>
	49	+ <div class="nav-wrapper">
	50	+ <a href="#" class="brand-logo center">Flashy</a>
	51	+ <ul ng-show="isLoggedIn" id="nav-mobile" class="right hide-on-med-and-down">
51	52
52		- <ul id="dropdown1" class="dropdown-content">
	53	+ <ul id="dropdown1" class="dropdown-content">
53	54
54		- <li ui-sref-active="active" ng-repeat="section in sections">
55		- <a class="class bold" ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
56		- </li>
57		- <li class="divider"></li>
58		- <li><a ui-sref="addclass">Add Class</a></li>
59		- </ul>
60		-
61		-
62		- <li><a class="dropdown-button" href="#!" data-activates="dropdown1">Classes<i class="mdi-navigation-arrow-drop-down right"></i></a></li>
63		- <li><a ui-sref="study">Study</a></li>
64		- <li><a ui-sref="logout">Logout</a></li>
	55	+ <li ui-sref-active="active" ng-repeat="section in sections">
	56	+ <a class="class bold" ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
	57	+ </li>
	58	+ <li class="divider"></li>
	59	+ <li><a ui-sref="addclass">Add Class</a></li>
65	60	</ul>
66		- </div>
67		- </nav>
68	61
69		- <div class="" ui-view></div>
70	62
	63	+ <li><a class="dropdown-button" href="#!" data-activates="dropdown1">Classes<i
	64	+ class="mdi-navigation-arrow-drop-down right"></i></a></li>
	65	+ <li><a ui-sref="study">Study</a></li>
	66	+ <li><a ui-sref="logout">Logout</a></li>
	67	+ </ul>
	68	+ </div>
	69	+</nav>
71	70
72		- <!--<main>
73		- <div class="" ui-view></div>
74		- </main>-->
	71	+<main ui-view></main>
75	72
76	73	</body>
77	74	<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>

1	1	@import "materialize";
2		-
3		-header, main, footer {
4		- padding-left: 240px;
5		-}
6		-
7		-
8		-@media #{$medium-and-down} {
9		- header, main, footer {
10		- padding-left: 0;
11		- }
12		-}

1	1	angular.module('flashy.FeedController', ['ui.router']).
2	2
3		- controller('FeedController', ['$scope', '$stateParams', '$state', '$http', function ($scope, $stateParams, $state, $http) {
	3	+ controller('FeedController', ['$scope', '$stateParams', '$state', '$http', function($scope, $stateParams, $state, $http) {
4	4
5	5
6	6

...	...	@@ -13,7 +13,6 @@
13	13	/* Handles width of the card */
14	14	function refresh_width() {
15	15	avail = $window.innerWidth - 17;
16		- if (avail > 992) avail -= 240;
17	16	width = Math.floor(avail / Math.floor(avail / 250) - 12);
18	17	element.children().css({
19	18	width: width + 'px',

...	...	@@ -32,10 +32,11 @@
32	32	'password': password
33	33	})).
34	34	success(function(data) {
	35	+ console.log(data);
35	36	if (angular.isDefined($scope.returnToState))
36	37	$state.go($scope.returnToState.name, $scope.returnToStateParams);
37	38	else $state.go('addclass');
38		- console.log(data);
	39	+
39	40	}).
40	41	error(function(data, status, headers, config) {
41	42	console.log(data.email);

...	...	@@ -7985,12 +7985,4 @@
7985	7985	.picker--time .picker__box {
7986	7986	margin-bottom: 5em; }
7987	7987	}
7988		-
7989		-header, main, footer {
7990		- padding-left: 240px; }
7991		-
7992		-@media only screen and (max-width : 992px) {
7993		- header, main, footer {
7994		- padding-left: 0; }
7995		- }

...	...	@@ -37,25 +37,10 @@
37	37	background-color: #aaaaff;
38	38	}
39	39
40		-.container .row {
41		- margin-left: 0;
42		- margin-right: 0;
43		-}
44		-
45		-/*ul.side-nav.fixed li {
46		- font-size: 24px;
47		-}
48		-
49		-ul.side-nav.fixed li a.class {
50		- height: 28px;
51		- font-size: 20px;
52		- line-height: normal;
53		- font-weight: 600;
54		-}
55		-
56		-ul.side-nav.fixed li a {
57		- font-size: 24px;
58		-}*/
	40	+/.container .row {/
	41	+ /margin-left: 0;/
	42	+ /margin-right: 0;/
	43	+/}/
59	44
60	45	/* Flashcard directive css */
61	46	.card {

1		-<div>
2		- <div layout="column">
3		- <md-content layout-padding="" layout="column" style="overflow:hidden">
	1	+<div class="container white">
	2	+ <div class="row" style="margin-top:64px;">
	3	+ <div class="offset-m3 col m6">
	4	+ <h2 class="header">Add Class</h2>
	5	+ <md-content layout-padding="" layout="column" style="overflow:hidden">
4	6
5		- <form ng-submit="$event.preventDefault()">
6		- <div layout="row">
7		- <md-autocomplete flex=""
8		- md-autofocus="true"
9		- md-selected-item="selectedItem"
10		- md-search-text="searchText"
11		- md-items="item in trySearch(searchText)"
12		- md-item-text="item.short_name"
13		- md-selected-item-change="selectObject(event)"
14		- md-autoselect="true"
15		- >
16		- <md-item-template>
17		- <div layout="row">
18		- <div>{{item.short_name}}: {{item.course_title}}
19		- ({{item.instructor}})
	7	+ <form ng-submit="$event.preventDefault()">
	8	+ <div layout="row">
	9	+ <md-autocomplete flex=""
	10	+ md-autofocus="true"
	11	+ md-selected-item="selectedItem"
	12	+ md-search-text="searchText"
	13	+ md-items="item in trySearch(searchText)"
	14	+ md-item-text="item.short_name"
	15	+ md-selected-item-change="selectObject(event)"
	16	+ md-autoselect="true"
	17	+ >
	18	+ <md-item-template>
	19	+ <div layout="row">
	20	+ <div>{{item.short_name}}: {{item.course_title}}
	21	+ ({{item.instructor}})
	22	+ </div>
	23	+ <div style="margin-left:auto;text-align:right;padding-left:30px">
	24	+ {{item.lecture_times}}
	25	+ </div>
20	26	</div>
21		- <div style="margin-left:auto;text-align:right;padding-left:30px">
22		- {{item.lecture_times}}
23		- </div>
24		- </div>
25		- </md-item-template>
26		- <md-not-found>
27		- No classes match "{{searchText}}".
28		- </md-not-found>
29		- </md-autocomplete>
30		- <button class="btn waves-effect waves-light" type="submit" name="add" ng-click="submit()">Add
31		- <i class="mdi-content-add right"></i>
32		- </button>
33		- </div>
	27	+ </md-item-template>
	28	+ <md-not-found>
	29	+ No classes match "{{searchText}}".
	30	+ </md-not-found>
	31	+ </md-autocomplete>
	32	+ <button class="btn waves-effect waves-light" type="submit" name="add" ng-click="submit()">Add
	33	+ <i class="mdi-content-add right"></i>
	34	+ </button>
	35	+ </div>
34	36
35		- </form>
36		- </md-content>
	37	+ </form>
	38	+ </md-content>
	39	+ </div>
37	40	</div>
38	41	</div>

1		-<div class="row">
2		-
3		-</div>
4		-<div class="row">
5		- <div class="offset-s3 col s4">
6		-
7		- </div>
8		- <div class="offset-s3 col s4">
	1	+<div class="row" style="margin-top:64px;">
	2	+ <div class="offset-m4 col m4">
9	3	<ul class="tabs">
10	4	<li class="tab col s6"><a href="#register-tab">Sign Up</a></li>
11	5	<li class="tab col s6"><a class="active" href="#login-tab">Login</a></li>
...	...	@@ -43,7 +37,7 @@
43	37	<span style="color:#8E2323">Invalid username or password!!</span>
44	38	</div>
45	39	<div class="input-field">
46		- <input id="email" type="email" class="validate" ng-model="loginEmail" required/>
	40	+ <input id="email" type="email" class="validate" ng-model="registerEmail" required/>
47	41	<label for="email">Email</label>
48	42	</div>
49	43	<div class="input-field">
...	...	@@ -52,8 +46,8 @@
52	46	</div>
53	47	</div>
54	48	<div class="card-action">
55		- <button class="btn waves-effect waves-light col s12" type="" name="action"
56		- ng-click="signUp(loginEmail, registerPassword)">Register
	49	+ <button class="btn waves-effect waves-light col s12" type="submit" name="action"
	50	+ ng-click="signUp(registerEmail, registerPassword)">Register
57	51	</button>
58	52	</div>
59	53	</form>