From 84db0f96b1d29a81a5b57a08158aabd65bcd89c4 Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Tue, 8 Aug 2017 14:54:25 -0600 Subject: [PATCH] controllers created --- index.html | 3 ++- js/app.js | 23 ++++++++++++++++------- js/controllers/EmailController.js | 4 ++-- js/controllers/HomeController.js | 5 +++-- js/controllers/boltController.js | 4 ++-- js/controllers/contactController.js | 4 ++-- js/controllers/contactDetailController.js | 4 ++-- js/controllers/dnsController.js | 4 ++-- js/controllers/filesController.js | 4 ++-- js/controllers/loginController.js | 3 --- js/controllers/musicController.js | 4 ++-- js/controllers/signInController.js | 17 +++++++++++++++++ js/controllers/websiteController.js | 4 ++-- js/services/auth.js | 11 +++++++++++ js/services/contacts.js | 4 ++-- templates/partials/header.html | 2 +- templates/partials/menu.html | 20 ++++++++++---------- templates/partials/notifications.html | 2 +- templates/{login.html => sign-in.html} | 7 +------ 19 files changed, 80 insertions(+), 49 deletions(-) delete mode 100644 js/controllers/loginController.js create mode 100644 js/controllers/signInController.js create mode 100644 js/services/auth.js rename templates/{login.html => sign-in.html} (67%) diff --git a/index.html b/index.html index a8c7dcf..956cc5f 100644 --- a/index.html +++ b/index.html @@ -30,8 +30,9 @@ + - + diff --git a/js/app.js b/js/app.js index 9772d27..6a5ef46 100644 --- a/js/app.js +++ b/js/app.js @@ -3,13 +3,15 @@ var app = angular.module('launchpad', ['ui.router']); app.config(function($stateProvider, $urlRouterProvider){ - $urlRouterProvider.otherwise('/login'); + $urlRouterProvider.otherwise('/sign-in'); $stateProvider .state('app',{ url: '/', views: { 'header': { - templateUrl: '/templates/partials/header.html' + templateUrl: '/templates/partials/header.html', + controller: 'HomeController', + controllerAs: 'vm' }, 'menu': { templateUrl: '/templates/partials/menu.html' @@ -27,16 +29,23 @@ app.config(function($stateProvider, $urlRouterProvider){ views: { 'content@': { templateUrl: 'templates/home.html', - controller: 'HomeController' + controller: 'HomeController', + controllerAs: 'vm' } } }) - .state('app.login', { - url: 'login', + .state('app.sign-in', { + url: 'sign-in', views: { 'content@': { - templateUrl: 'templates/login.html', - controller: 'LoginController' + templateUrl: 'templates/sign-in.html', + controller: 'SignInController', + controllerAs: 'vm' + } + }, + resolve: { + loginStatus: function(authService) { + return authService.getUser(); } } }) diff --git a/js/controllers/EmailController.js b/js/controllers/EmailController.js index 3e256c5..4cbeb8a 100644 --- a/js/controllers/EmailController.js +++ b/js/controllers/EmailController.js @@ -1,3 +1,3 @@ -app.controller('EmailController', function($scope) { +app.controller('EmailController', [function($scope) { -}); +}]); diff --git a/js/controllers/HomeController.js b/js/controllers/HomeController.js index e10a6de..a68fb34 100644 --- a/js/controllers/HomeController.js +++ b/js/controllers/HomeController.js @@ -1,3 +1,4 @@ -app.controller('HomeController', function($scope) { +app.controller('HomeController', ['$scope', function ($scope) { + var vm = this; -}); +}]); diff --git a/js/controllers/boltController.js b/js/controllers/boltController.js index b2a240a..74f121f 100644 --- a/js/controllers/boltController.js +++ b/js/controllers/boltController.js @@ -1,3 +1,3 @@ -app.controller('BoltController', function($scope) { +app.controller('BoltController', [function($scope) { -}); +}]); diff --git a/js/controllers/contactController.js b/js/controllers/contactController.js index e8735da..36a604e 100644 --- a/js/controllers/contactController.js +++ b/js/controllers/contactController.js @@ -1,3 +1,3 @@ -app.controller('ContactController', function($scope, ContactsService) { +app.controller('ContactController', ['$scope', function($scope) { $scope.contacts = ContactsService.list(); -}); +}]); diff --git a/js/controllers/contactDetailController.js b/js/controllers/contactDetailController.js index 9407bae..c3a9b5e 100644 --- a/js/controllers/contactDetailController.js +++ b/js/controllers/contactDetailController.js @@ -1,3 +1,3 @@ -app.controller('ContactDetailController', function($scope, $stateParams, ContactsService) { +app.controller('ContactDetailController', ['$scope', '$stateParams', 'ContactsService', function($scope, $stateParams, ContactsService) { $scope.selected = ContactsService.find($stateParams.id); -}); +}]); diff --git a/js/controllers/dnsController.js b/js/controllers/dnsController.js index 77164e0..cc76e1f 100644 --- a/js/controllers/dnsController.js +++ b/js/controllers/dnsController.js @@ -1,3 +1,3 @@ -app.controller('DnsController', function($scope) { +app.controller('DnsController', [function($scope) { -}); +}]); diff --git a/js/controllers/filesController.js b/js/controllers/filesController.js index fd2d6fb..aeca5d1 100644 --- a/js/controllers/filesController.js +++ b/js/controllers/filesController.js @@ -1,3 +1,3 @@ -app.controller('FilesController', function($scope) { +app.controller('FilesController', [function($scope) { -}); +}]); diff --git a/js/controllers/loginController.js b/js/controllers/loginController.js deleted file mode 100644 index a93e9ce..0000000 --- a/js/controllers/loginController.js +++ /dev/null @@ -1,3 +0,0 @@ -app.controller('LoginController', function($scope) { - -}); diff --git a/js/controllers/musicController.js b/js/controllers/musicController.js index cc10ec9..dba9f55 100644 --- a/js/controllers/musicController.js +++ b/js/controllers/musicController.js @@ -1,3 +1,3 @@ -app.controller('MusicController', function($scope) { +app.controller('MusicController', [function($scope) { -}); +}]); diff --git a/js/controllers/signInController.js b/js/controllers/signInController.js new file mode 100644 index 0000000..99a42a2 --- /dev/null +++ b/js/controllers/signInController.js @@ -0,0 +1,17 @@ +app.controller('SignInController', ['$scope', 'loginStatus', '$location', function ($scope, loginStatus, $location) { + var vm = this; + vm.userProfile = {}; + // vm.message = loginStatus; + + vm.sign_in = function() { + vm.userProfile.email = vm.userAuthEmail; + vm.userProfile.password = vm.userAuthPassword; + if (vm.userProfile.email === loginStatus.email && vm.userProfile.password === loginStatus.password) { + console.log('yes!'); + $location.path('/home'); + } else { + alert("wrong") + } + }; + +}]); diff --git a/js/controllers/websiteController.js b/js/controllers/websiteController.js index aaf2c95..8d1c086 100644 --- a/js/controllers/websiteController.js +++ b/js/controllers/websiteController.js @@ -1,3 +1,3 @@ -app.controller('WebsiteController', function($scope) { +app.controller('WebsiteController', [function($scope) { -}); +}]); diff --git a/js/services/auth.js b/js/services/auth.js new file mode 100644 index 0000000..d8bae70 --- /dev/null +++ b/js/services/auth.js @@ -0,0 +1,11 @@ +app.factory('authService', function($q){ + return { + getUser: function(){ + var user = { + email: 'jane@doe.com', + password: 'password' + } + return $q.when(user); + } + }; +}); diff --git a/js/services/contacts.js b/js/services/contacts.js index 5b74d47..59bc5b0 100644 --- a/js/services/contacts.js +++ b/js/services/contacts.js @@ -1,4 +1,4 @@ -app.factory('ContactsService',function(){ +app.factory('ContactsService', [function(){ var contacts = [ { id: 1, @@ -30,4 +30,4 @@ app.factory('ContactsService',function(){ }) } } -}); +}]); diff --git a/templates/partials/header.html b/templates/partials/header.html index 5960114..fdf08c6 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -19,7 +19,7 @@