From ce4a4542ec563ff1fe0706a149563dbe3d0ec4d3 Mon Sep 17 00:00:00 2001 From: rnlee0054 Date: Sat, 9 May 2015 15:45:27 -0700 Subject: [PATCH] Changes to random stuff --- flashy.css | 4 +- scripts/DeckController.js | 4 -- scripts/LoginController.js | 46 +++++++++++----------- templates/deck.html | 26 ++++++------ templates/login_form.html | 98 ++++++++++++++++++++++------------------------ 5 files changed, 85 insertions(+), 93 deletions(-) diff --git a/flashy.css b/flashy.css index a5b6b32..2a8c0ca 100644 --- a/flashy.css +++ b/flashy.css @@ -4,7 +4,6 @@ #loginform { max-width: 400px; - margin: 30px auto; } #sidebar{ @@ -13,7 +12,6 @@ left:0px; } - .container{ width: 500px; -} \ No newline at end of file +} diff --git a/scripts/DeckController.js b/scripts/DeckController.js index 96d5395..312ddde 100644 --- a/scripts/DeckController.js +++ b/scripts/DeckController.js @@ -1,11 +1,7 @@ var app = angular.module("flashy.DeckController", ['ui.router']); app.controller("DeckController", ['$scope', function ($scope) { - $scope.hello = function () { alert("hello"); } - - - }]); diff --git a/scripts/LoginController.js b/scripts/LoginController.js index f9399d2..cb4de79 100644 --- a/scripts/LoginController.js +++ b/scripts/LoginController.js @@ -1,23 +1,25 @@ angular.module('flashy.LoginController', ['ui.router']). - controller('LoginController', ['$scope', '$state', '$http', - function($scope, $state, $http) { - 'use strict'; - $scope.login = function(email, password) { - $http.post('/api/login', JSON.stringify({ - 'email': email, - 'password': password - })).success(function(data) { - $state.go('feed'); - console.log(data); - }); - }; - $scope.register = function(email, password) { - $http.post('/api/users/me', JSON.stringify({ - 'email': email, - 'password': password - })).success(function(data) { - $state.go('feed'); - console.log(data); - }); - }; - }]); + +controller('LoginController', ['$scope', '$state', '$http', + function($scope, $state, $http) { + 'use strict'; + $scope.login = function(email, password) { + $http.post('/api/login', JSON.stringify({ + 'email': email, + 'password': password + })).success(function(data) { + $state.go('feed'); + console.log(data); + }); + }; + $scope.register = function(email, password) { + $http.post('/api/users/me', JSON.stringify({ + 'email': email, + 'password': password + })).success(function(data) { + $state.go('feed'); + console.log(data); + }); + }; + } +]); diff --git a/templates/deck.html b/templates/deck.html index e4d83b8..16743d5 100644 --- a/templates/deck.html +++ b/templates/deck.html @@ -1,21 +1,21 @@  - + - - + + - - + + - + - - - - + + + + - - - \ No newline at end of file + + + diff --git a/templates/login_form.html b/templates/login_form.html index 2962781..e88bc04 100644 --- a/templates/login_form.html +++ b/templates/login_form.html @@ -1,56 +1,52 @@
-

Please Log In

-
-

The System shall enlighten you.

- SWAG -
- -
- -
- -
- -
- - - - -
- - -
- -
- -
- - -
- -
- - -
+
+

FLASHY

+
+

The System shall enlighten you.

+ SWAG +
+
- -
-
-
- -
-
- -
- -
-
-
-
+
+ +
+ +
+ + +
+ +
+
+
+ +
+ +
+ +
+ +
+
+ + +
+
+
+ +
+
+ +
+ +
+
+
+
@@ -64,4 +60,4 @@ --> -
\ No newline at end of file + -- 1.9.1