Merge pull request #139 from khoa-nd/master

Merged

src/main/webapp/assets/index.tem.html

@@ -13,7 +13,7 @@
 
     <!-- Meta-Information -->
     <title>Techlooper | Career Analytics. Open Source. Awesome!</title>
-    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <link rel="shortcut icon" href="icon.ico" type="image/x-icon" />
     <meta name="description" content="Techlooper.">

src/main/webapp/assets/modules/app.js

@@ -35,7 +35,7 @@ techlooper.config(["$routeProvider", "$translateProvider", "$authProvider", "loc
             switch (rejection.status) {
               case 403:
               case 401:
-                if (localStorageService.get(jsonValue.storage.back2Me) === true) {
+                if (localStorageService.get(jsonValue.storage.back2Me) === "true") {
                   utils.sendNotification(jsonValue.notifications.loginFailed);
                 }
                 break;
@@ -49,9 +49,11 @@ techlooper.config(["$routeProvider", "$translateProvider", "$authProvider", "loc
       }
     );
 
-    localStorageServiceProvider.setPrefix('techlooper')
-      .setStorageType('cookieStorage')
-      .setNotify(true, true);
+    localStorageServiceProvider
+      .setPrefix('techlooper')
+      .setStorageType('sessionStorage')
+      .setNotify(true, true)
+      .setStorageCookie(45);;
 
     $.post("getSocialConfig", {providers: ["LINKEDIN", "FACEBOOK", "GOOGLE", "TWITTER", "GITHUB"]})
       .done(function (resp) {
@@ -65,6 +67,8 @@ techlooper.config(["$routeProvider", "$translateProvider", "$authProvider", "loc
         });
       });
 
+    $authProvider.loginRedirect = undefined;
+
     $translateProvider.useStaticFilesLoader({
       prefix: "modules/translation/messages_",
       suffix: ".json"
@@ -120,7 +124,7 @@ techlooper.run(function (shortcutFactory, connectionFactory, loadingBoxFactory,
   connectionFactory.initialize();
   loadingBoxFactory.initialize();
   cleanupFactory.initialize();
-  tourService.initialize();
+  //tourService.initialize();
   historyFactory.initialize();
   routerService.initialize();
   userService.initialize();

src/main/webapp/assets/modules/common/cleanup.fac.js

@@ -11,7 +11,7 @@ angular.module("Common").factory("cleanupFactory", function (jsonValue, utils, l
 
     cleanSession: function () {
       $rootScope.userInfo = undefined;
-      localStorageService.remove(jsonValue.storage.key);
+      localStorageService.cookie.remove(jsonValue.storage.key);
     }
   }
 

src/main/webapp/assets/modules/common/connection.fac.js

@@ -68,16 +68,17 @@ angular.module("Common").factory("connectionFactory",
     var instance = {
       verifyUserLogin: function() {
         return $$.post(jsonValue.httpUri.verifyUserLogin,
-          {key: localStorageService.get(jsonValue.storage.key)});
+          {key: localStorageService.cookie.get(jsonValue.storage.key)});
       },
 
       login: function () {
-        if (localStorageService.get(jsonValue.storage.key) === null) {
+        var key = localStorageService.cookie.get(jsonValue.storage.key);
+        if (key === null) {
           return utils.sendNotification(jsonValue.notifications.loginFailed);
         }
 
         $$.post(jsonValue.httpUri.login,
-          $.param({key: localStorageService.get(jsonValue.storage.key)}),
+          $.param({key: key}),
           {headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}})
           .then(function (data, status, headers, config) {
             utils.sendNotification(jsonValue.notifications.loginSuccess, data, status, headers, config);
@@ -93,7 +94,7 @@ angular.module("Common").factory("connectionFactory",
 
       findUserInfoByKey: function () {
         //HTTP version
-        $$.post(jsonValue.httpUri.getUserInfoByKey, {key: localStorageService.get(jsonValue.storage.key)})
+        $$.post(jsonValue.httpUri.getUserInfoByKey, {key: localStorageService.cookie.get(jsonValue.storage.key)})
           .then(function(userInfo) {
             $rootScope.userInfo = userInfo;
             utils.sendNotification(jsonValue.notifications.userInfo, userInfo);

src/main/webapp/assets/modules/common/history.fac.js

@@ -28,7 +28,7 @@ angular.module("Common").factory("historyFactory", function (jsonValue, $locatio
     },
 
     popHistory: function () {
-      historyStack.pop(); // remove current item
+      //historyStack.pop(); // remove current item
       if (historyStack.length === 0) return "/";
       return historyStack.pop();
     }

src/main/webapp/assets/modules/common/router.ser.js

@@ -6,7 +6,7 @@ angular.module("Common").factory("routerService", function (jsonValue, utils, $l
     },
 
     loginSuccess: function () {
-      if (localStorageService.get(jsonValue.storage.back2Me) === true) {
+      if (localStorageService.get(jsonValue.storage.back2Me) === "true") {
         localStorageService.remove(jsonValue.storage.back2Me);
         var path = historyFactory.popHistory();
         $location.path(path);

src/main/webapp/assets/modules/job/searchBox.ser.js

@@ -34,7 +34,7 @@ angular.module("Jobs").factory("searchBoxService", function ($location, jsonValu
     },
 
     initializeSearchTextbox: function ($scope, $textArray) {
-      $('.search-block').css('min-height', $(window).height() - 5);
+      $('.search-block').css('min-height', $(window).height());
       utils.sendNotification(jsonValue.notifications.gotData);
       scope = $scope;
       textArray = $textArray;
@@ -158,6 +158,8 @@ angular.module("Jobs").factory("searchBoxService", function ($location, jsonValu
     updateNavi: function(){
       $('.navi-container').find('li').removeClass('active');
       $('.navi-container').find('a.m-search-jobs').parent().addClass('active');
+      $('.main-navi-block').css('background','url(images/line-h1.png) #ccc right top repeat-y');
+
     }
   }
 

src/main/webapp/assets/modules/job/searchForm.con.js

@@ -16,4 +16,5 @@ angular.module('Jobs').controller('searchFormController', function (utils, $scop
   animationFactory.animatePage();
   navigationService.addSpaceforNavi();
   navigationService.reSetingPositionLangIcon();
+  navigationService.keepNaviBar();
 });

src/main/webapp/assets/modules/job/searchResult.con.js

@@ -69,4 +69,5 @@ angular.module('Jobs').controller('searchResultController',
 
     searchBoxService.changeBodyColor();
     navigationService.addSpaceforNavi();
+    navigationService.keepNaviBar();
   });

src/main/webapp/assets/modules/navigation/navigation.con.js

@@ -1,14 +1,5 @@
 angular.module("Navigation").controller("navigationController", function ($scope, utils, jsonValue, navigationService, $rootScope) {
   navigationService.initialize();
   navigationService.addSpaceforNavi();
-  //navigationService.restartTour();
-  //$scope.userInfo = $rootScope.userInfo;
-  //$scope.changeChart = function (event) {
-  //  if ($(event.currentTarget).hasClass('m-pie-chart')) {
-  //    $(event.currentTarget).attr('href', '#/bubble-chart').removeClass('m-pie-chart');
-  //  }
-  //  else {
-  //    $(event.currentTarget).attr('href', '#/pie-chart').addClass('m-pie-chart');
-  //  }
-  //}
+  navigationService.keepNaviBar();
 });

src/main/webapp/assets/modules/navigation/navigation.ser.js

@@ -77,11 +77,6 @@ angular.module("Navigation").factory("navigationService", function (utils, jsonV
       });
     },
     updateHighlight: function(){
-      if(!userService.notLoggedIn()){
-        $('.main-navi-block').css('width', '0px');
-        $('.navi-container').css({'width': '0%', 'display': 'none'});
-        $('.manager-navi').find('.fa-bars').removeClass('active');
-      }
       $('.navi-container').find('li').removeClass('active');
       switch (utils.getView()) {
         case jsonValue.views.pieChart:
@@ -94,6 +89,10 @@ angular.module("Navigation").factory("navigationService", function (utils, jsonV
           $('.navi-container').find('a.m-search-jobs').parent().addClass('active');
           $('.main-navi-block').css('background','url(images/line-h1.png) #ccc right top repeat-y');
           break;
+        case jsonValue.views.jobsSearchText:
+          $('.navi-container').find('a.m-search-jobs').parent().addClass('active');
+          $('.main-navi-block').css('background','url(images/line-h1.png) #ccc right top repeat-y');
+          break;
         case jsonValue.views.signIn:
           $('.navi-container').find('a.sign-out-sign-in').parent().addClass('active');
           break;
@@ -134,12 +133,6 @@ angular.module("Navigation").factory("navigationService", function (utils, jsonV
       $$.registerEventListeners();
       $$.naviControl();
     },
-
-    //restartTour: function () {
-    //  $('.infor-tour').on('click', function () {
-    //    tourService.restart();
-    //  });
-    //},
     addSpaceforNavi: function(){
       var page = $('.techlooper-body');
       if($('.main-navi-block').width() == 85){
@@ -161,8 +154,20 @@ angular.module("Navigation").factory("navigationService", function (utils, jsonV
       $('.navi-container').find('a.m-chart').parent().addClass('active');
       $('.navi-container').find('a.m-search-jobs').parent().removeClass('active');
       $('.main-navi-block').css('background','url(images/line-h.png) #000 right top repeat-y');
+    },
+    keepNaviBar: function(){
+      utils.registerNotification(jsonValue.notifications.userInfo, function(userInfo) {
+        $('.main-navi-block').css({
+          'width': '85px',
+          'position': 'fixed'
+        });
+        $('.navi-container').css({'width': '100%', 'display': 'block'});
+        $('.manager-navi').find('.fa-bars').addClass('active');
+        instance.addSpaceforNavi();
+      });
     }
   }
 
   return instance;
+
 });

src/main/webapp/assets/modules/navigation/navigation.tem.html

@@ -6,10 +6,10 @@
   <div class="navi-container">
     <ul>
       <li>
-        <a class="m-chart"/>
+        <a class="m-chart" title="Home page"/>
       </li>
-      <li ng-show="userInfo !== undefined"><a href="#/register" class="m-user-profile"><img ng-src="{{userInfo.profileImageUrl}}" alt=""/></a></li>
-      <li><a href="#/jobs/search" class="m-search-jobs"></a></li>
+      <li ng-show="userInfo !== undefined"><a href="#/register" class="m-user-profile" title="User Profile"><img ng-src="{{userInfo.profileImageUrl}}" alt=""/></a></li>
+      <li><a href="#/jobs/search" class="m-search-jobs" title="Search Jobs"></a></li>
       <li>
         <div class="d-languages-block">
           <translation></translation>

src/main/webapp/assets/modules/register/register.con.js

@@ -4,10 +4,11 @@ angular.module('Register').controller('registerController',
     $scope.authSource = jsonValue.authSource;
     $scope.openOathDialog = registerService.openOathDialog;
     $scope.salaryOptions = registerService.getSalaryOptions();
+
     userService.getUserInfo().then(function () {
-      registerService.updateUserInfo();
       utils.sendNotification(jsonValue.notifications.gotData);
     });
     navigationService.addSpaceforNavi();
     navigationService.reSetingPositionLangIcon();
+    navigationService.keepNaviBar();
   });

src/main/webapp/assets/modules/register/register.ser.js

@@ -33,17 +33,11 @@ angular.module('Register').factory('registerService',
             $location.path("/");
           })
           .catch(function (errors) {
-            //console.log(errors);
             utils.notify(jsonValue.messages.errorFieldsSave, 'error');
             $.each(errors, function (i, error) {
               // TODO: design error display
               $("." + error.field).css("border", "1px solid red");//error.defaultMessage
             });
-            //$.notify("Please correct the marked field(s) above.", {
-            //  className: "error",
-            //  autoHideDelay: 3000,
-            //  globalPosition: 'bottom right'
-            //});
           })
           .finally(function () {
             flag.saveUserInfo = false;
@@ -70,24 +64,12 @@ angular.module('Register').factory('registerService',
         return options
       },
 
-      updateUserInfo: function () {
-        $.each($rootScope.userInfo.profileNames, function (i, name) {
-          // TODO: high-light provider icon
-          $("a." + name.toLowerCase()).parent().addClass('active');
-          $("a." + name.toLowerCase()).unbind("click");
-        });
-      },
-
       openOathDialog: function (auth) {
         utils.sendNotification(jsonValue.notifications.loading, $(window).height());
         $auth.authenticate(auth.provider)
           .then(function (resp) {//success
             delete $window.localStorage["satellizer_token"];
             $rootScope.userInfo.profileNames.push(auth.provider.toUpperCase());
-            instance.updateUserInfo();
-            //localStorageService.set(jsonValue.storage.key, resp.data.key);
-            //$http.post("login", $.param({key: resp.data.key}), {headers:{'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}});
-            //$location.path(jsonValue.routerUris.register);
           })
           .finally(function (resp) {
             utils.sendNotification(jsonValue.notifications.loaded);

src/main/webapp/assets/modules/register/register.tem.html

@@ -30,20 +30,6 @@ <h2><span>Confirm Information</span></h2>
                  disabled="disabled" value="[email protected]">
         </div>
       </div>
-      <!--<div class="row technical-skill">-->
-      <!--<p>Choose Your Skills:</p>-->
-      <!--<ul>-->
-      <!--<li><label><input type="checkbox" class="checkbox"/>Java</label></li>-->
-      <!--<li><label><input type="checkbox" class="checkbox"/>.Net</label></li>-->
-      <!--<li><label><input type="checkbox" class="checkbox"/>PHP</label></li>-->
-      <!--<li><label><input type="checkbox" class="checkbox"/>Ruby</label></li>-->
-      <!--<li><label><input type="checkbox" class="checkbox"/>Python</label></li>-->
-      <!--<li><label><input type="checkbox" class="checkbox"/>DBA</label></li>-->
-      <!--<li><label><input type="checkbox" class="checkbox"/>BA</label></li>-->
-      <!--<li><label><input type="checkbox" class="checkbox"/>QA</label></li>-->
-      <!--<li><label><input type="checkbox" class="checkbox"/>Project Manager</label></li>-->
-      <!--</ul>-->
-      <!--</div>-->
       <div class="row your-salary">
         <p>Choose Your salary:</p>
 
@@ -60,16 +46,9 @@ <h2><span>Confirm Information</span></h2>
         <h3>Allow us to connect</h3>
         <ul>
           <li ng-repeat="auth in authSource">
-            <!--<span ng-if="item.site == 'LinkedIn'">-->
-            <!--<span class="active" ng-style="{'background-color': item.bgcolor}">-->
-            <!--<img ng-src="{{item.logo}}" alt="">-->
-            <!--</span>-->
-            <!--</span>-->
-            <!--<span ng-if="item.site != 'LinkedIn'">-->
-                <span ng-if="auth.isNotSupported === undefined">
-                  <a ng-click="openOathDialog(auth)" class="{{auth.provider}}"><img ng-src="{{auth.logo}}" alt=""></a>
-                </span>
-            <!--</span>-->
+              <span ng-if="auth.isNotSupported === undefined" class="{{userInfo !== undefined && userInfo.profileNames.indexOf(auth.provider.toUpperCase()) > -1 ? 'active' : 'inactive'  }}">
+                <a ng-click="openOathDialog(auth)" class="{{auth.provider}}"><img ng-src="{{auth.logo}}" alt=""></a>
+              </span>
           </li>
         </ul>
       </div>

src/main/webapp/assets/modules/signin/signin.ser.js

@@ -56,7 +56,7 @@ angular.module('SignIn').factory('signInService',
         $auth.authenticate(auth.provider)
           .then(function (resp) {//success
             delete $window.localStorage["satellizer_token"];
-            localStorageService.set(jsonValue.storage.key, resp.data.key);
+            localStorageService.cookie.set(jsonValue.storage.key, resp.data.key);
             connectionFactory.login();
           })
           .catch(function (resp) {

src/main/webapp/assets/modules/skill-analytics/skill-analytics.con.js

@@ -24,4 +24,5 @@ angular.module('Skill').controller('skillAnalyticsController',
     //animationFactory.animatePage();
     navigationService.addSpaceforNavi();
     navigationService.reSetingPositionLangIcon();
+    navigationService.keepNaviBar();
   });

src/main/webapp/assets/modules/translation/translation.tem.html

@@ -1,2 +1,2 @@
-<a class="m-languages langKey" ng-class="icoLanguage" ng-click="changeLanguage()"></a>
+<a class="m-languages langKey" ng-class="icoLanguage" ng-click="changeLanguage()" title="Select Languages"></a>
 <!--<div class="langKey" translate>language</div>-->

src/main/webapp/assets/sass/main.sass

@@ -278,7 +278,7 @@ a.m-languages.en:hover
       a.m-pie-chart
         background-position: 8px 8px !important
       a.m-bubble-chart
-        background-position: 8px -58px
+        background-position: 8px -56px
       a.m-search-jobs
         background-position: 8px -187px
       a.m-languages.vi
@@ -310,7 +310,7 @@ a.m-languages.en:hover
       a.m-pie-chart:hover
         background-position: -65px 8px !important
       a.m-bubble-chart:hover
-        background-position: -65px -58px
+        background-position: -65px -56px
       a.m-search-jobs:hover
         background-position: -65px -187px
       a.m-languages.vi:hover
@@ -331,7 +331,7 @@ a.m-languages.en:hover
       a.m-pie-chart
         background-position: -65px 8px !important
       a.m-bubble-chart
-        background-position: -65px -58px
+        background-position: -65px -56px
       a.m-search-jobs
         background-position: -65px -187px
       a.m-languages.vi