Merge pull request #227 from UN-OCHA/dev

Production 2020-07-29

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hid_app2",
-  "version": "2.2.9",
+  "version": "2.2.11",
   "description": "HID Client application",
   "main": "index.js",
   "scripts": {
@@ -52,7 +52,7 @@
     "karma-coverage": "^2.0.1",
     "karma-jasmine": "^2.0.1",
     "karma-ng-html2js-preprocessor": "^1.0.0",
-    "lodash": ">=4.17.15",
+    "lodash": ">=4.17.19",
     "minimatch": ">=3.0.2",
     "minimist": ">=1.2.5",
     "mkdirp": "^1.0.4",

src/app/common/AppController.js

@@ -79,7 +79,7 @@
     };
 
     function hideHeaderFooter () {
-      return ($location.path() === '/start' || $location.path() === '/tutorial' || $location.path() === '/kiosk') ? true : false;
+      return ($location.path() === '/start' || $location.path() === '/kiosk') ? true : false;
     }
 
     thisScope.hideHeaderFooter = hideHeaderFooter();

src/app/components/auth/AuthController.js

@@ -38,13 +38,6 @@
         // New user first login (login is set to false in registration)
         if (!thisScope.currentUser.appMetadata.hid.login) {
           onFirstLogin();
-          //$location.path('/start');
-          return;
-        }
-
-        //HIDv1 user first login (login is already set to true)
-        if (thisScope.currentUser.appMetadata.hid.login && !thisScope.currentUser.appMetadata.hid.viewedTutorial) {
-          $location.path('/tutorial');
           return;
         }
 
@@ -62,7 +55,6 @@
 
       // Users registering via auth dont have metadata set until first login
       onFirstLogin();
-      //$location.path('/start');
     }
 
     thisScope.login = function(tfaCode, trustDevice) {

src/app/components/auth/AuthController.tests.js

@@ -29,7 +29,6 @@
       appMetadata: {
         hid: {
           login: true,
-          viewedTutorial: true
         }
       }
     };
@@ -157,18 +156,6 @@
           });
         });
 
-        describe('A HID v1 user on their first login', function () {
-          beforeEach(function () {
-            setUpController(hidV1FirstLoginUser);
-            scope.login();
-            scope.$digest();
-          });
-
-          it('should go to the tutorial', function () {
-            expect($location.path).toHaveBeenCalledWith('/tutorial');
-          });
-        });
-
         describe('A user who registered using auth on their first login', function () {
           beforeEach(function () {
             setUpController(authUser);

src/app/components/auth/_login.scss

@@ -3,10 +3,6 @@
 	max-width: 200px;
 }
 
-.login__video {
-	display: none;
-}
-
 .t-login-btn {
 	max-width: 50%;
 	margin-left: 1em;
@@ -35,8 +31,4 @@
 		margin-bottom: $base-unit*10;
 	}
 
-	.login__video {
-		display: block;
-		padding-top: $base-unit*3;
-	}
 }

src/app/components/auth/login.html

@@ -5,7 +5,7 @@
 </div>
 
 <div class="row" class="login">
-  <div class="col-sm-8 offset-sm-2 col-md-6 offset-md-3 col-lg-6 offset-lg-0">
+  <div class="col-sm-8 offset-sm-2 col-md-6 offset-md-3 col-lg-6">
     <div class="page-header page-header--login">
       <h1 class="page-header__heading login__heading" translate>Log in to Humanitarian ID.</h1>
     </div>
@@ -29,12 +29,4 @@ <h1 class="page-header__heading login__heading" translate>Log in to Humanitarian
       <p><a href="/password_reset" translate>Forgot/Reset password</a></p>
     </form>
   </div>
-  <div class="col-lg-6 login__video">
-    <video-player
-      ar="35xf6ljcWnE"
-      en="60dKwkaq_Sw"
-      es="78Rav6I8F80"
-      fr="niGYi77tJQM"
-    ></video-player>
-  </div>
 </div>

src/app/components/user/UserEditController.js

@@ -569,11 +569,12 @@
         updateCurrentUser();
         saveUser('login');
       }
-      if (thisScope.currentStep === lastStep) {
-        $location.path('/tutorial');
-        return;
-      }
+
       thisScope.currentStep = thisScope.currentStep + 1;
+
+      if (thisScope.currentStep === 5) {
+        $location.path('/landing');
+      }
     }
 
     thisScope.changePermission = function (key) {

src/app/components/user/UsersController.js

@@ -642,7 +642,7 @@
         User.syncGSS(body)
           .then(function (resp) {
             var msg = gettextCatalog.getString('A synchronized Google Sheet was created. Find it at: ');
-            msg += '<a href="https://docs.google.com/spreadsheets/d/' + resp.data.spreadsheet + '/edit" target="_blank">' + 'https://docs.google.com/spreadsheets/d/' + resp.data.spreadsheet + '/edit' + '</a>';
+            msg += '<a href="https://docs.google.com/spreadsheets/d/' + resp.data.spreadsheet + '/edit" target="_blank" rel="noopener">' + 'https://docs.google.com/spreadsheets/d/' + resp.data.spreadsheet + '/edit' + '</a>';
             alertService.pageAlert('success', msg);
           })
           .catch(function (err) {

src/app/components/user/users-export.html

@@ -6,13 +6,12 @@
 	<script type="text/ng-template" id="exportEmailsModal.html">
 		<div class="modal-header">
 			<h3 class="modal-title" id="modal-title" translate>Copy Email Addresses</h3>
-			<p><span translate>Please email responsibly. Follow our</span> <a href="http://about.humanitarian.id/code-of-conduct" target="_blank" translate>Code of conduct</a></p>
+			<p><span translate>Please email responsibly. Follow our</span> <a href="http://about.humanitarian.id/code-of-conduct" target="_blank" rel="noopener" translate>Code of conduct</a></p>
 			<button type="button" class="btn-transparent modal-close" ng-click="closeExportEmailslModal()">
 				<icon name="cancel" text="Close"></icon>
 			</button>
 		</div>
 		<div class="modal-body" id="modal-body">
-
 			<textarea rows="15" cols="100">{{emailsText}}</textarea>
 		</div>
 	</script>