Skip to content
This repository has been archived by the owner on Feb 5, 2021. It is now read-only.

HID-2090: disable tutorial completely #222

Merged
merged 3 commits into from
Jul 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hid_app2",
"version": "2.2.9",
"version": "2.2.10",
"description": "HID Client application",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/app/common/AppController.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
8 changes: 0 additions & 8 deletions src/app/components/auth/AuthController.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -62,7 +55,6 @@

// Users registering via auth dont have metadata set until first login
onFirstLogin();
//$location.path('/start');
}

thisScope.login = function(tfaCode, trustDevice) {
Expand Down
13 changes: 0 additions & 13 deletions src/app/components/auth/AuthController.tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
appMetadata: {
hid: {
login: true,
viewedTutorial: true
}
}
};
Expand Down Expand Up @@ -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);
Expand Down
47 changes: 0 additions & 47 deletions src/app/components/start/TutorialController.js

This file was deleted.

55 changes: 0 additions & 55 deletions src/app/components/start/_tutorial.scss

This file was deleted.

92 changes: 0 additions & 92 deletions src/app/components/start/tutorial.html

This file was deleted.

9 changes: 5 additions & 4 deletions src/app/components/user/UserEditController.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 0 additions & 6 deletions src/app/hidApp.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,6 @@ var app = angular.module('hidApp', [
authenticate: true,
title: 'Getting started'
})
.when('/tutorial', {
templateUrl: 'app/components/start/tutorial.html',
controller: 'TutorialController',
authenticate: true,
title: 'Tutorial'
})
.when('/outlook', {
template: '',
controller: 'OutlookController',
Expand Down
1 change: 0 additions & 1 deletion src/assets/css/api.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
// @import '../../app/components/search/_search-form';
// @import '../../app/components/sidebar/_sidebar';
// @import '../../app/components/start/_start-form';
// @import '../../app/components/start/_tutorial';
// @import '../../app/components/tabs/_tabs';
// @import '../../app/components/user/_connections';
// @import '../../app/components/user/_keys';
Expand Down
1 change: 0 additions & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
<script src="app/components/tabs/tabset.js"></script>
<script src="app/components/start/app.start.js"></script>
<script src="app/components/start/StartController.js"></script>
<script src="app/components/start/TutorialController.js"></script>
<script src="app/components/user/app.user.js"></script>
<script src="app/components/user/User.js"></script>
<script src="app/components/user/UserCheckInService.js"></script>
Expand Down
Loading