From 4d8fc29ebee077feb21a7c6f5ca5dc6a3b462b55 Mon Sep 17 00:00:00 2001
From: Phuong Tran <npt004@ucsd.edu>
Date: Sun, 24 May 2015 21:44:22 -0400
Subject: [PATCH] Id added for login.html
---
home.html | 93 +++++++++++++++++++++----------------------
sass/flashier.scss | 11 -----
scripts/FeedController.js | 2 +-
scripts/FlashcardDirective.js | 1 -
scripts/LoginController.js | 3 +-
styles/flashier.css | 8 ----
styles/flashy.css | 23 ++---------
templates/addclass.html | 71 +++++++++++++++++----------------
templates/login.html | 16 +++-----
9 files changed, 94 insertions(+), 134 deletions(-)
diff --git a/home.html b/home.html
index 37531c3..b295d29 100644
--- a/home.html
+++ b/home.html
@@ -2,6 +2,7 @@
<html ng-app="flashy">
<base href="/app/">
<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<link rel="stylesheet"
href="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.css">
@@ -13,65 +14,61 @@
</head>
<header>
- <!--<a href="#" style="position:absolute;top:0;left:0;" data-activates="sidebar" class="button-collapse"><i
- class="medium mdi-navigation-menu"></i></a>
- <ul ng-show="isLoggedIn" id="sidebar" class="side-nav fixed ng-cloak">
- <li class="logo"><a href="//flashy.cards/" id="logo-container">
-
- <h1>Flashy</h1>
- </a></li>
- <li class="no-padding">
- <ul class="collapsible" data-collapsible="accordion">
- <li class="bold">
- <a class="collapsible-header black-text">Classes</a>
- </li>
- <div class="collapsible-body" style="display: block">
- <ul>
- <li ui-sref-active="active" ng-repeat="section in sections">
- <a class="class bold" ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
- </li>
- </ul>
- </div>
- </ul>
- </li>
- <li class="bold"><a ui-sref="addclass">Add Class</a></li>
- <li class="bold"><a ui-sref="study">Study</a></li>
- <li class="bold"><a ui-sref="logout">Logout</a></li>
- </ul>-->
+ <!--<a href="#" style="position:absolute;top:0;left:0;" data-activates="sidebar" class="button-collapse"><i
+ class="medium mdi-navigation-menu"></i></a>
+ <ul ng-show="isLoggedIn" id="sidebar" class="side-nav fixed ng-cloak">
+ <li class="logo"><a href="//flashy.cards/" id="logo-container">
+
+ <h1>Flashy</h1>
+ </a></li>
+ <li class="no-padding">
+ <ul class="collapsible" data-collapsible="accordion">
+ <li class="bold">
+ <a class="collapsible-header black-text">Classes</a>
+ </li>
+ <div class="collapsible-body" style="display: block">
+ <ul>
+ <li ui-sref-active="active" ng-repeat="section in sections">
+ <a class="class bold" ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
+ </li>
+ </ul>
+ </div>
+ </ul>
+ </li>
+ <li class="bold"><a ui-sref="addclass">Add Class</a></li>
+ <li class="bold"><a ui-sref="study">Study</a></li>
+ <li class="bold"><a ui-sref="logout">Logout</a></li>
+ </ul>-->
</header>
<body ng-controller="RootController">
- <!-- Menu Bar -->
- <nav ng-show="isLoggedIn">
- <div class="nav-wrapper">
- <a href="#" class="brand-logo center">Flashy</a>
- <ul id="nav-mobile" class="right hide-on-med-and-down">
-
- <ul id="dropdown1" class="dropdown-content">
-
- <li ui-sref-active="active" ng-repeat="section in sections">
- <a class="class bold" ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
- </li>
- <li class="divider"></li>
- <li><a ui-sref="addclass">Add Class</a></li>
- </ul>
+<!-- Menu Bar -->
+<nav>
+ <div class="nav-wrapper">
+ <a href="#" class="brand-logo center">Flashy</a>
+ <ul ng-show="isLoggedIn" id="nav-mobile" class="right hide-on-med-and-down">
+ <ul id="dropdown1" class="dropdown-content">
- <li><a class="dropdown-button" href="#!" data-activates="dropdown1">Classes<i class="mdi-navigation-arrow-drop-down right"></i></a></li>
- <li><a ui-sref="study">Study</a></li>
- <li><a ui-sref="logout">Logout</a></li>
+ <li ui-sref-active="active" ng-repeat="section in sections">
+ <a class="class bold" ui-sref="feed({sectionId:{{section.id}}})">{{section.short_name}}</a>
+ </li>
+ <li class="divider"></li>
+ <li><a ui-sref="addclass">Add Class</a></li>
</ul>
- </div>
- </nav>
- <div class="" ui-view></div>
+ <li><a class="dropdown-button" href="#!" data-activates="dropdown1">Classes<i
+ class="mdi-navigation-arrow-drop-down right"></i></a></li>
+ <li><a ui-sref="study">Study</a></li>
+ <li><a ui-sref="logout">Logout</a></li>
+ </ul>
+ </div>
+</nav>
- <!--<main>
- <div class="" ui-view></div>
- </main>-->
+<main ui-view></main>
</body>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
diff --git a/sass/flashier.scss b/sass/flashier.scss
index 02534cc..f018932 100644
--- a/sass/flashier.scss
+++ b/sass/flashier.scss
@@ -1,12 +1 @@
@import "materialize";
-
-header, main, footer {
- padding-left: 240px;
-}
-
-
-@media #{$medium-and-down} {
- header, main, footer {
- padding-left: 0;
- }
-}
\ No newline at end of file
diff --git a/scripts/FeedController.js b/scripts/FeedController.js
index 3f7833d..57447cd 100644
--- a/scripts/FeedController.js
+++ b/scripts/FeedController.js
@@ -1,6 +1,6 @@
angular.module('flashy.FeedController', ['ui.router']).
- controller('FeedController', ['$scope', '$stateParams', '$state', '$http', function ($scope, $stateParams, $state, $http) {
+ controller('FeedController', ['$scope', '$stateParams', '$state', '$http', function($scope, $stateParams, $state, $http) {
diff --git a/scripts/FlashcardDirective.js b/scripts/FlashcardDirective.js
index 476e694..592d55f 100644
--- a/scripts/FlashcardDirective.js
+++ b/scripts/FlashcardDirective.js
@@ -13,7 +13,6 @@ angular.module('flashy.FlashcardDirective', []).
/* Handles width of the card */
function refresh_width() {
avail = $window.innerWidth - 17;
- if (avail > 992) avail -= 240;
width = Math.floor(avail / Math.floor(avail / 250) - 12);
element.children().css({
width: width + 'px',
diff --git a/scripts/LoginController.js b/scripts/LoginController.js
index 9339306..f0a2404 100644
--- a/scripts/LoginController.js
+++ b/scripts/LoginController.js
@@ -32,10 +32,11 @@ angular.module('flashy.LoginController', ['ui.router']).
'password': password
})).
success(function(data) {
+ console.log(data);
if (angular.isDefined($scope.returnToState))
$state.go($scope.returnToState.name, $scope.returnToStateParams);
else $state.go('addclass');
- console.log(data);
+
}).
error(function(data, status, headers, config) {
console.log(data.email);
diff --git a/styles/flashier.css b/styles/flashier.css
index 58ad6b8..8aae859 100644
--- a/styles/flashier.css
+++ b/styles/flashier.css
@@ -7985,11 +7985,3 @@ button.picker__today:focus, button.picker__clear:focus, button.picker__close:foc
.picker--time .picker__box {
margin-bottom: 5em; }
}
-
-header, main, footer {
- padding-left: 240px; }
-
-@media only screen and (max-width : 992px) {
- header, main, footer {
- padding-left: 0; }
- }
diff --git a/styles/flashy.css b/styles/flashy.css
index 30f5b30..a5ddc76 100644
--- a/styles/flashy.css
+++ b/styles/flashy.css
@@ -37,25 +37,10 @@
background-color: #aaaaff;
}
-.container .row {
- margin-left: 0;
- margin-right: 0;
-}
-
-/*ul.side-nav.fixed li {
- font-size: 24px;
-}
-
-ul.side-nav.fixed li a.class {
- height: 28px;
- font-size: 20px;
- line-height: normal;
- font-weight: 600;
-}
-
-ul.side-nav.fixed li a {
- font-size: 24px;
-}*/
+/*.container .row {*/
+ /*margin-left: 0;*/
+ /*margin-right: 0;*/
+/*}*/
/* Flashcard directive css */
.card {
diff --git a/templates/addclass.html b/templates/addclass.html
index b38c73a..074551e 100644
--- a/templates/addclass.html
+++ b/templates/addclass.html
@@ -1,38 +1,41 @@
-<div>
- <div layout="column">
- <md-content layout-padding="" layout="column" style="overflow:hidden">
+<div class="container white">
+ <div class="row" style="margin-top:64px;">
+ <div class="offset-m3 col m6">
+ <h2 class="header">Add Class</h2>
+ <md-content layout-padding="" layout="column" style="overflow:hidden">
- <form ng-submit="$event.preventDefault()">
- <div layout="row">
- <md-autocomplete flex=""
- md-autofocus="true"
- md-selected-item="selectedItem"
- md-search-text="searchText"
- md-items="item in trySearch(searchText)"
- md-item-text="item.short_name"
- md-selected-item-change="selectObject(event)"
- md-autoselect="true"
- >
- <md-item-template>
- <div layout="row">
- <div>{{item.short_name}}: {{item.course_title}}
- ({{item.instructor}})
+ <form ng-submit="$event.preventDefault()">
+ <div layout="row">
+ <md-autocomplete flex=""
+ md-autofocus="true"
+ md-selected-item="selectedItem"
+ md-search-text="searchText"
+ md-items="item in trySearch(searchText)"
+ md-item-text="item.short_name"
+ md-selected-item-change="selectObject(event)"
+ md-autoselect="true"
+ >
+ <md-item-template>
+ <div layout="row">
+ <div>{{item.short_name}}: {{item.course_title}}
+ ({{item.instructor}})
+ </div>
+ <div style="margin-left:auto;text-align:right;padding-left:30px">
+ {{item.lecture_times}}
+ </div>
</div>
- <div style="margin-left:auto;text-align:right;padding-left:30px">
- {{item.lecture_times}}
- </div>
- </div>
- </md-item-template>
- <md-not-found>
- No classes match "{{searchText}}".
- </md-not-found>
- </md-autocomplete>
- <button class="btn waves-effect waves-light" type="submit" name="add" ng-click="submit()">Add
- <i class="mdi-content-add right"></i>
- </button>
- </div>
+ </md-item-template>
+ <md-not-found>
+ No classes match "{{searchText}}".
+ </md-not-found>
+ </md-autocomplete>
+ <button class="btn waves-effect waves-light" type="submit" name="add" ng-click="submit()">Add
+ <i class="mdi-content-add right"></i>
+ </button>
+ </div>
- </form>
- </md-content>
+ </form>
+ </md-content>
+ </div>
</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/login.html b/templates/login.html
index b6ff6bc..ce710ee 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,11 +1,5 @@
-<div class="row">
-
-</div>
-<div class="row">
- <div class="offset-s3 col s4">
-
- </div>
- <div class="offset-s3 col s4">
+<div class="row" style="margin-top:64px;">
+ <div class="offset-m4 col m4">
<ul class="tabs">
<li class="tab col s6"><a href="#register-tab">Sign Up</a></li>
<li class="tab col s6"><a class="active" href="#login-tab">Login</a></li>
@@ -43,7 +37,7 @@
<span style="color:#8E2323">Invalid username or password!!</span>
</div>
<div class="input-field">
- <input id="email" type="email" class="validate" ng-model="loginEmail" required/>
+ <input id="email" type="email" class="validate" ng-model="registerEmail" required/>
<label for="email">Email</label>
</div>
<div class="input-field">
@@ -52,8 +46,8 @@
</div>
</div>
<div class="card-action">
- <button class="btn waves-effect waves-light col s12" type="" name="action"
- ng-click="signUp(loginEmail, registerPassword)">Register
+ <button class="btn waves-effect waves-light col s12" type="submit" name="action"
+ ng-click="signUp(registerEmail, registerPassword)">Register
</button>
</div>
</form>
--
1.9.1