From 9c420b35c90f452b140f8ce608f8133d3821f452 Mon Sep 17 00:00:00 2001
From: rnlee0054 <rnl002@ucsd.edu>
Date: Thu, 7 May 2015 10:45:48 -0700
Subject: [PATCH] Separating all current controllers, moved into scripts/

---
 controller.js               | 68 ---------------------------------------------
 scripts/FeedController.js   | 11 ++++++++
 scripts/HomeController.js   | 11 ++++++++
 scripts/LoginController.js  | 41 +++++++++++++++++++++++++++
 scripts/LogoutController.js | 13 +++++++++
 5 files changed, 76 insertions(+), 68 deletions(-)
 delete mode 100644 controller.js
 create mode 100644 scripts/FeedController.js
 create mode 100644 scripts/HomeController.js
 create mode 100644 scripts/LoginController.js
 create mode 100644 scripts/LogoutController.js

diff --git a/controller.js b/controller.js
deleted file mode 100644
index f6a2519..0000000
--- a/controller.js
+++ /dev/null
@@ -1,68 +0,0 @@
-var app = angular.module('flashy.controller', ['ui.router']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',
-    function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
-        $httpProvider.defaults.withCredentials = true;
-        $httpProvider.defaults.xsrfCookieName = 'csrftoken';
-        $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
-    }]);
-
-
-app.controller('LoginController', ['$scope', '$state', '$http', function ($scope, $state, $http) {
-    $.ajaxPrefilter(function (options, originalOptions, jqXHR) {
-        options.crossDomain = {
-            crossDomain: true
-        };
-        options.xhrFields = {
-            withCredentials: true
-        };
-    });
-
-    $scope.signUp = function (email, password) {
-        $http.post('https://flashy.cards/api/users/me', JSON.stringify({
-            "email": email,
-            "password": password
-        })).success(function (data) {
-            $state.go('dashboard');
-            console.log(data);
-        });
-
-    };
-
-    $scope.login = function (email, password) {
-        $http.post('https://flashy.cards/api/login', JSON.stringify({
-            "email": email,
-            "password": password
-        })).success(function (data) {
-            $state.go('dashboard');
-            console.log(data);
-        });
-    };
-
-
-}]);
-
-
-app.controller("HomeController", ['$scope', '$state', function ($scope, $state) {
-    $state.go('login');
-}]);
-
-app.controller("FeedController", ['$scope', '$state', function ($scope, $state) {
-    console.log("Hello from feed");
-}]);
-
-app.controller("LogoutController", ['$scope', '$state', '$http', function ($scope, $state, $http) {
-    $http.post('https://flashy.cards/api/logout').success(function () {
-        $state.go('home');
-    });
-}]);
-
-
-app.controller("DashboardController", function () {
-    // This gets really annoying every time I refresh the page :(
-    //alert("HEYYYYYY");
-
-
-});
-
-
-
-
diff --git a/scripts/FeedController.js b/scripts/FeedController.js
new file mode 100644
index 0000000..7b9f660
--- /dev/null
+++ b/scripts/FeedController.js
@@ -0,0 +1,11 @@
+angular.module('flashy.controllers', ['ui.router']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',
+    function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
+        $httpProvider.defaults.withCredentials = true;
+        $httpProvider.defaults.xsrfCookieName = 'csrftoken';
+        $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
+    }
+]).
+
+controller("FeedController", ['$scope', '$state', function ($scope, $state) {
+    console.log("Hello from feed");
+}]);
diff --git a/scripts/HomeController.js b/scripts/HomeController.js
new file mode 100644
index 0000000..93472f1
--- /dev/null
+++ b/scripts/HomeController.js
@@ -0,0 +1,11 @@
+angular.module('flashy.controllers', ['ui.router']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',
+    function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
+        $httpProvider.defaults.withCredentials = true;
+        $httpProvider.defaults.xsrfCookieName = 'csrftoken';
+        $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
+    }
+]).
+
+controller("HomeController", ['$scope', '$state', function ($scope, $state) {
+    $state.go('login');
+}]);
diff --git a/scripts/LoginController.js b/scripts/LoginController.js
new file mode 100644
index 0000000..1ba96c6
--- /dev/null
+++ b/scripts/LoginController.js
@@ -0,0 +1,41 @@
+angular.module('flashy.controllers', ['ui.router']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',
+    function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
+        $httpProvider.defaults.withCredentials = true;
+        $httpProvider.defaults.xsrfCookieName = 'csrftoken';
+        $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
+    }
+]).
+
+controller('LoginController', ['$scope', '$state', '$http', function ($scope, $state, $http) {
+    $.ajaxPrefilter(function (options, originalOptions, jqXHR) {
+        options.crossDomain = {
+            crossDomain: true
+        };
+        options.xhrFields = {
+            withCredentials: true
+        };
+    });
+
+    $scope.signUp = function (email, password) {
+        $http.post('https://flashy.cards/api/users/me', JSON.stringify({
+            "email": email,
+            "password": password
+        })).success(function (data) {
+            $state.go('dashboard');
+            console.log(data);
+        });
+
+    };
+
+    $scope.login = function (email, password) {
+        $http.post('https://flashy.cards/api/login', JSON.stringify({
+            "email": email,
+            "password": password
+        })).success(function (data) {
+            $state.go('dashboard');
+            console.log(data);
+        });
+    };
+
+
+}]);
diff --git a/scripts/LogoutController.js b/scripts/LogoutController.js
new file mode 100644
index 0000000..8aee3c0
--- /dev/null
+++ b/scripts/LogoutController.js
@@ -0,0 +1,13 @@
+angular.module('flashy.controllers', ['ui.router']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',
+    function ($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
+        $httpProvider.defaults.withCredentials = true;
+        $httpProvider.defaults.xsrfCookieName = 'csrftoken';
+        $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
+    }
+]).
+
+controller("LogoutController", ['$scope', '$state', '$http', function ($s
+        $http.post('https://flashy.cards/api/logout').success(function () { 
+        $state.go('home'); 
+    }); 
+}]);
-- 
1.9.1