diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user index dbebe52..c77621e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user @@ -7,7 +7,7 @@ - index.html + login.html SpecificPage True False diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AuthenticationController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AuthenticationController.js index 9ba64e7..b72e681 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AuthenticationController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AuthenticationController.js @@ -1,14 +1,23 @@ -'use strict'; +/// +/// +'use strict'; -AIA.controller("AuthenticationController",["$scope", "$log", "$location", "$timeout", "AuthenticationService", - function ($scope, $log, $location, $timeout, AuthenticationService) { +AIA.controller("AuthenticationController", ["$scope", "$log", "$location", '$window', "$timeout", "AuthenticationService", + function ($scope, $log, $location, $window, $timeout, AuthenticationService) { $scope.IsAuthenticated = false; $scope.login = function () { - alert('called controller'); + + + // alert('called controller'); $scope.IsAuthenticated = AuthenticationService.authenticateUser('superadmin', 'education'); + if ($scope.IsAuthenticated) { + $window.location.href = "/AIA/index.html"; + } + else { + + } } - - }] -); + }] +); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index a51ca6f..93b37de 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -41,7 +41,10 @@ AIA.constant('DA', [ ]); -AIA.config(function ($routeProvider, pages) { +AIA.config(function ($routeProvider, pages, $locationProvider) { + + $locationProvider.html5Mode(true); + for (var i = 0; i < pages.length; i++) { if (pages[i].pageSlug != null) { $routeProvider.when('/' + pages[i].pageSlug, diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js index 473ebeb..e08371a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js @@ -1,13 +1,8 @@ -AIA.factory('AuthenticationService',function() { - return { - authenticateUser:function(userName,Password) { - alert('called service'); - return true; - } - }; -}); - - - - - +AIA.factory('AuthenticationService', function () { + return { + authenticateUser: function (userName, Password) { + //alert('called service'); + return true; + } + }; +}); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html index a2cbc2a..58b044a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html @@ -1,4 +1,5 @@ -
+ +
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index f253431..c14dd51 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -1,7 +1,7 @@  - + diff --git a/400-SOURCECODE/AIAHTML5.Web/login.html b/400-SOURCECODE/AIAHTML5.Web/login.html index 1dcf558..258f50d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/login.html +++ b/400-SOURCECODE/AIAHTML5.Web/login.html @@ -1,7 +1,7 @@  - +