Skip to content

Commit

Permalink
Ran ESLint:fix and Prettier:fix
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-bizz committed Oct 11, 2023
1 parent c68b8e5 commit db16220
Show file tree
Hide file tree
Showing 306 changed files with 20,702 additions and 25,153 deletions.
56 changes: 25 additions & 31 deletions app/app.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,37 @@ import './components/navigation/navHeader.component';
import './app.scss';

angular.module('campusContactsApp').component('app', {
controller: appController,
template: template,
bindings: {
hideHeader: '<',
hideFooter: '<',
hideMenuLinks: '<',
},
controller: appController,
template,
bindings: {
hideHeader: '<',
hideFooter: '<',
hideMenuLinks: '<',
},
});

function appController(periodService, $rootScope, analyticsService) {
let deregisterEditOrganizationsEvent;
let deregisterStateChangedEvent;
let deregisterEditOrganizationsEvent;
let deregisterStateChangedEvent;

this.editOrganizations = false;
this.getPeriod = periodService.getPeriod;
this.editOrganizations = false;
this.getPeriod = periodService.getPeriod;

this.$onInit = () => {
this.year = new Date();
this.$onInit = () => {
this.year = new Date();

deregisterStateChangedEvent = $rootScope.$on(
'state:changed',
(event, { loggedIn }) => {
if (loggedIn) analyticsService.setupAuthenitcatedAnalyticData();
else analyticsService.clearAuthenticatedData();
},
);
deregisterStateChangedEvent = $rootScope.$on('state:changed', (event, { loggedIn }) => {
if (loggedIn) analyticsService.setupAuthenitcatedAnalyticData();
else analyticsService.clearAuthenticatedData();
});

deregisterEditOrganizationsEvent = $rootScope.$on(
'editOrganizations',
(event, value) => {
this.editOrganizations = value;
},
);
};
deregisterEditOrganizationsEvent = $rootScope.$on('editOrganizations', (event, value) => {
this.editOrganizations = value;
});
};

this.$onDestroy = () => {
deregisterEditOrganizationsEvent();
deregisterStateChangedEvent();
};
this.$onDestroy = () => {
deregisterEditOrganizationsEvent();
deregisterStateChangedEvent();
};
}
48 changes: 20 additions & 28 deletions app/app.html
Original file line number Diff line number Diff line change
@@ -1,34 +1,26 @@
<header ng-cloak ng-if="!$ctrl.hideHeader">
<toaster-container
toaster-options="{ 'close-button': true }"
></toaster-container>
<nav-header hide-menu-links="$ctrl.hideMenuLinks"></nav-header>
<dashboard-subnav></dashboard-subnav>
<toaster-container toaster-options="{ 'close-button': true }"></toaster-container>
<nav-header hide-menu-links="$ctrl.hideMenuLinks"></nav-header>
<dashboard-subnav></dashboard-subnav>
</header>
<section class="main-container ph1 ph3-l pt4 pb2 flex-grow-5 w-100" ng-cloak>
<ui-view></ui-view>
<ui-view></ui-view>
</section>
<footer class="tc bg-white pt4 pb4" ng-cloak ng-if="!$ctrl.hideFooter">
<section class="main-container flex-grow-5 pivot-gray-7">
<span class="copyright">
<!-- prettier-ignore -->
{{ 'nav.copyright' | t: { year: ($ctrl.year | date: 'yyyy') } }}
</span>
<span>
<a
href="https://www.cru.org/us/en/about/terms-of-use.html"
target="_blank"
class="ml3 pivot-gray-7"
>{{ 'nav.terms' | t }}</a
>
</span>
<span>
<a
href="https://www.cru.org/us/en/about/privacy.html"
target="_blank"
class="ml3 pivot-gray-7"
>{{ 'nav.privacy' | t }}</a
>
</span>
</section>
<section class="main-container flex-grow-5 pivot-gray-7">
<span class="copyright">
<!-- prettier-ignore -->
{{ 'nav.copyright' | t: { year: ($ctrl.year | date: 'yyyy') } }}
</span>
<span>
<a href="https://www.cru.org/us/en/about/terms-of-use.html" target="_blank" class="ml3 pivot-gray-7"
>{{ 'nav.terms' | t }}</a
>
</span>
<span>
<a href="https://www.cru.org/us/en/about/privacy.html" target="_blank" class="ml3 pivot-gray-7"
>{{ 'nav.privacy' | t }}</a
>
</span>
</section>
</footer>
37 changes: 18 additions & 19 deletions app/assets/javascripts/angular/all-tests.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,31 @@ import angular from 'angular';
import 'angular-mocks';

class OktaAuth {
constructor(config) {
this.token = '';
this.tokenManager = {};
}
start() {}
signOut() {}
constructor(config) {
this.token = '';
this.tokenManager = {};
}

start() {}
signOut() {}
}

window.OktaAuth = OktaAuth;

beforeEach(angular.mock.module('campusContactsApp'));

beforeEach(
angular.mock.module({
analyticsService: {
init: jasmine.createSpy('init'),
track: jasmine.createSpy('track'),
},
authenticationService: {
storeJwtToken: jasmine.createSpy('storeJwtToken'),
removeAccess: jasmine.createSpy('removeAccess'),
isTokenValid: jasmine
.createSpy('isTokenValid')
.and.returnValue(false),
},
}),
angular.mock.module({
analyticsService: {
init: jasmine.createSpy('init'),
track: jasmine.createSpy('track'),
},
authenticationService: {
storeJwtToken: jasmine.createSpy('storeJwtToken'),
removeAccess: jasmine.createSpy('removeAccess'),
isTokenValid: jasmine.createSpy('isTokenValid').and.returnValue(false),
},
}),
);

/* global require */
Expand Down
Loading

0 comments on commit db16220

Please sign in to comment.