login and dynamic modules

Nikita Kulshreshtha
1 parent 7be3ebe4
Showing 12 changed files with 42 additions and 201 deletions
400-SOURCECODE/AIAHTML5.API/Models/Users.cs
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/LoginController.js
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
400-SOURCECODE/AIAHTML5.Web/index.html
400-SOURCECODE/AIAHTML5.Web/login.html
@@ -23,23 +23,28 @@ namespace AIAHTML5.API.Models
                 var client = new MongoClient();
                 var db = client.GetDatabase(Settings.Default.database);
  
-                var collection = db.GetCollection<BsonDocument>("Users");
+                var collection = db.GetCollection<dynamic>("Users");
  
                 // var builder = Builders<BsonDocument>.Filter;
                 BsonDocument filter = new BsonDocument();
                 filter.Add("loginId", credentials["username"].ToString());
                 filter.Add("password", credentials["password"].ToString());
  
-                dynamic userDetails = collection.Find(filter).SingleOrDefault();
-                logger.Debug("userDetails= " + userDetails.ElementCount);
-                if (userDetails.ElementCount > 0)
-                {
+
+                FilterDefinition<dynamic>[] filterCondition = { Builders<dynamic>.Filter.Eq("loginId", credentials["username"].ToString()),
+                                                            Builders<dynamic>.Filter.Eq("password", credentials["password"].ToString())};
+
+                dynamic userDetails = collection.Find(Builders<dynamic>.Filter.And(filterCondition)).SingleOrDefault();
+                   
+                //logger.Debug("userDetails= " + userDetails.ElementCount);
+                //if (userDetails.ElementCount > 0)
+                //{
                     return userDetails;
-                }
-                else
-                {
-                    return AIAConstants.USER_NOT_FOUND;
-                }
+                //}
+                //else
+                //{
+                //    return AIAConstants.USER_NOT_FOUND;
+                //}
             }
             catch(Exception e)
             {
@@ -50,7 +50,6 @@
     <Content Include="app\controllers\DAController.js" />
     <Content Include="app\controllers\HomeController.js" />
     <Content Include="app\controllers\LabExercController.js" />
-    <Content Include="app\controllers\LoginController.js" />
     <Content Include="app\main\AIA.js" />
     <Content Include="app\main\Link.js" />
     <Content Include="app\services\AuthenticationService.js" />
@@ -43228,7 +43227,6 @@
     <Content Include="libs\video_4_12_11\img\video-js.png" />
     <Content Include="libs\video_4_12_11\video_4_12_11.js" />
     <Content Include="libs\worker.js" />
-    <Content Include="login.html" />
     <Content Include="app\widget\MainView.html" />
     <Content Include="extract-wp.js" />
     <Content Include="search-wp.js" />
@@ -20,6 +20,10 @@ function ($scope, $rootScope, pages, log,Modules,$http,$compile) {
     //load json data
     $scope.loadCurriculumBuiderData = function () {
  
+
+        //get current path
+        var currentURL = $location.path();
+
         $http({ method: 'GET', url: 'content/data/json/cb/cb_list_content.json' }).success(function (data) {
  
             $scope.listCurriculumBuilder = data;
@@ -170,7 +170,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         if ($('#MainImage') != null) {
             $('#MainImage').remove();
         }
-        $rootScope.currentActiveModuleTitle = Modules[0].Name;
+      //  $rootScope.currentActiveModuleTitle = Modules[0].Name;
         $("#bodyViewList").empty();
         //for default load
         if ($event == null || $event == undefined) {
@@ -363,6 +363,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     //load json data for body view
     $scope.loadDissectibleAnatomyData = function () {
  
+        //get current path
+        var currentURL = $location.path();
+        var selectedModuleName = '';
+            angular.forEach( $rootScope.userModules, function (value, key) {
+             //   alert(value.slug + 'and currentURL=  ' + currentURL + 'NAD value.name= ' + value.name);
+                if (value.slug === currentURL.replace('/','')) {
+                    selectedModuleName = value.name;
+                  //  alert('moduleName= '+moduleName)
+                }
+                $rootScope.currentActiveModuleTitle = selectedModuleName;
+            }) 
+           
+
         $rootScope.ClearIframe();
  
         //load common data
@@ -72,9 +72,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService,Authentica
         $rootScope.shapestyleborderStyles = "solid";
  
         $rootScope.initializeAIA = function () {
+
             $rootScope.isLoading = false;
             $rootScope.isVisibleLogin = true;
-            $rootScope.isVisibleIndex = false;
  
         }
  
@@ -86,11 +86,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService,Authentica
         $rootScope.userModules ;
  
         $rootScope.AuthenticateUser = function (userInfo) {
+
             AuthenticationService.authenticateUser(userInfo)
              .then(
  
              function (result) {
-
  
                  $rootScope.userData = result;
                  $rootScope.userModules = result.modules;
@@ -19,7 +19,8 @@ function ($scope, $rootScope, log, pages, $routeParams) {
         // code that will be executed ... 
         // every time this view is loaded
  
-        for (var i = 0; i < $scope.links.length; i++) {
+
+             for (var i = 0; i < $scope.links.length; i++) {
             if ($scope.links[i].modname == $routeParams.modname) {
                 $rootScope.currentActiveModuleTitle = $scope.links[i].title;
                 $scope.objdata = $scope.links[i].objurl;
-'use strict';
-
-AIA.controller("LoginController", ["$scope", "$rootScope", "$location", "$window", "AuthenticationService",
-function ($scope, $rootScope,$location, $window, AuthenticationService) {
-
-    $scope.userInfo = {
-        username: null,
-        password: null
-    };
-
-    $scope.AuthenticateUser = function (userInfo) {
-        AuthenticationService.authenticateUser(userInfo)
-         .then(
-
-         function (result) {
-
-             if (result.length > 0) {
-                 angular.forEach(result, function (value, key) {
-
-                     if (value.Name == "modules") {
-                         $scope.modules = value.Value;
-                         var moduleList = []
-                         angular.forEach($scope.modules, function (value, key) {
-
-
-                             moduleList.push(
-
-                                  {
-
-                                      "ModuleName": value[0].Value,
-                                      "ModuleSlug": value[1].Value
-
-                                  }
-
-                                   );
-                         });
-                                 localStorage.setItem("modules", moduleList);
-
-                         $scope.name = "HELLO";
-                         //   $location.url('/index.html')
-                         $window.location.assign('/index.html');
-
-                     }
-
-                 
-                     
-                    // if ((value._id == 1) 
-                         })
-             }
-             //alert('user authentication = ' + result)
-         },
-         function (error) {
-             // handle errors here
-             console.log(' $rootScope.BodyLayerData= ' + error.statusText);
-         });
-        //.success(function (data) {
-
-        //    alert('user authentication= '+data)
-
-        // })
-        // .error(function () {
-        //     alert('issue in authentocation')
-        // })
-    }
-
-
-    $scope.showModules = function () {
-        $scope.modules = localStorage.getItem("modules");
-
-    }
-}
-])
 \ No newline at end of file
@@ -13,14 +13,7 @@ AIA.constant(&#39;pages&#39;, [
         pageUrl: 'index.html',
         pageController: 'HomeController'
     },
-    {
-       // id:0,
-        name: 'Login',
-        pageSlug: 'login',
-        pageUrl: 'login.html',
-        pageController: 'AuthenticationController'
-    },
-    {  // id:1,
+     {  // id:1,
         name: 'Dissectible Anatomy Views List',
         pageSlug: 'da-view-list',
         pageUrl: 'app/views/da/da-body-view-list.html',
@@ -49,7 +42,7 @@ AIA.constant(&#39;pages&#39;, [
         },
     {  // id:5,
         name: '3D Anatomy',
-        pageSlug: '3dAnatomy',
+        pageSlug: '3d-anatomy-list',
         pageUrl: 'app/views/3dA/3dA-view.html',
         pageController: '3dAController'
  
@@ -3,7 +3,7 @@
         authenticateUser: function (userInfo) {
             var deferred = $q.defer();
  
-            $http.post('http://localhost:95/API/api/Authenticate', JSON.stringify(userInfo), {
+            $http.post('/API/api/Authenticate', JSON.stringify(userInfo), {
                 headers: {
                     'Content-Type': 'application/json'
                 }
-<div class="bodyWrap row container-fluid" ng-controller="LoginController">
+<div class="bodyWrap row container-fluid" >
     <div class="col-sm-12 col-md-12 pageHeading">
         <!--<button type="button" class="btn btn-success pull-left toggleBar btn-sm" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </button>-->
         <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar" style="padding-left: 15px; "> <i class="fa fa-bars"></i> </div>
@@ -46,8 +46,7 @@
     </div>
  
 </div>
-
-<script src="../controllers/LoginController.js"></script>
+<script src="../controllers/HomeController.js"></script>
 <script src="app/services/AuthenticationService.js"></script>
  
  
@@ -1233,7 +1233,6 @@
     <script src="app/controllers/AODController.js"></script>
     <script src="app/controllers/HomeController.js"></script>
     <script src="app/controllers/LinkController.js"></script>
-    <script src="app/controllers/LoginController.js"></script>
     <script src="app/services/AuthenticationService.js"></script>
  
     <script src="app/services/DataService.js"></script>
-<!DOCTYPE html>
-<html lang="en" ng-app="AIA">
-<head>
-    <base href="/" />
-
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-    <title>A.D.A.M. Interactive Anatomy</title>
-    <link href="themes/default/css/bootstrap/3.3.6/bootstrap.css" rel="stylesheet" />
-
-    <link href="themes/default/css/bootstrap/3.3.6/main.css" rel="stylesheet" />
-
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,800,700,600,400italic">
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
-
-</head>
-<body ng-controller="LoginController">
-    <div class="container-fluid loginBg">
-        <div class="row">
-            <div class="col-xs-12 text-center">
-                <a href="index.html" class="loginLogo"><img src="img/logo-large.png" class="img-responsive" alt=""></a>
-                <div class="headerBand row">
-                    <div class="col-xs-12">
-                        <h1>A.D.A.M. Interactive Anatomy</h1>
-                        <p>The most compresive online interactive anatomy learning resource</p>
-                    </div>
-                </div>
-            </div>
-            <!--LOGIN PANEL-->
-            <div class="col-xs-12 loginPanel">
-                <div class="loginBox clearfix">
-                    <div class="col-xs-12">
-                        <!--<strong>Login</strong>-->
-                        <form>
-                            <div class="form-group">
-                                <!--<label for="">User ID</label>-->
-                                <!--input type="email" class="form-control" placeholder="User ID">
-                                <span class="help-block text-right small"><a href="#" class="color-white">Forgot User ID?</a></span>-->
-
-
-                                <div class="input-group">
-                                    <span class="input-group-addon"><i class="fa fa-user"></i></span>
-                                    <input type="text" class="form-control" placeholder="Username" ng-model="userInfo.username">
-                                </div>
-                                <span class="help-block text-right small"><a href="#" class="color-white">Forgot User ID?</a></span>
-
-
-                            </div>
-                            <div class="form-group">
-                                <!--<label for="">Password</label>-->
-                                <!--<input type="password" class="form-control" placeholder="Password">
-                                <span class="help-block text-right small "><a href="#" class="color-white">Forgot Password?</a></span>-->
-                                <div class="input-group">
-                                    <span class="input-group-addon"><i class="fa fa-key"></i></span>
-                                    <input type="password" class="form-control" placeholder="Password" ng-model="userInfo.password">
-                                </div>
-                                <span class="help-block text-right small "><a href="#" class="color-white">Forgot Password?</a></span>
-                            </div>
-                            <div class="form-group">
-                                <button class="btn btn-primary pull-right" ng-click="AuthenticateUser(userInfo)">Log In</button>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-                <div class="loginExBtn">
-                    <a href="#" class="btn btn-primary">Subscribe Now</a>
-                    <a href="#" class="btn btn-primary pull-right">Learn More</a>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Footer -->
-    <footer class="dark">
-        <div class="container-fluid text-center">Copyright &copy; 2016 Ebix Inc. All rights reserved.</div>
-    </footer>
-
-
-    <script src="libs/jquery/2.1.3/jquery.min.js"></script>
-    <script src="libs/jquery/1.11.4/jquery-ui.js"></script>
-    <script src="libs/jquery/jquery_plugin/jquery.mCustomScrollbar.concat.min.js"></script>
-    <script src="themes/default/scripts/bootstrap/3.3.5/bootstrap.js"></script>
-
-
-    <script src="libs/angular/1.4.9/angular.min.js"></script>
-
-
-    <script src="libs/angular/1.4.9/angular-route.min.js"></script>
-    <script src="libs/angular/1.4.9/angular-sanitize.min.js"></script>
-    <script src="libs/angular/1.4.9/ngStorage.js"></script>
-    <script src="content/js/custom/custom.js"></script>
-
-    <script src="app/main/AIA.js"></script>
-    <script src="content/scripts/js/custom/custom.js"></script>
-    <script src="app/services/AuthenticationService.js"></script>
-    <script src="app/controllers/LoginController.js"></script>
-</body>
-</html>
 \ No newline at end of file