Commit d7ffbd70 by Tuukka Kivilahti

fixed all lint errors

1 parent 57efe091
Pipeline #76 failed
in 0 seconds
// Karma configuration file, see link for more information
// https://karma-runner.github.io/0.13/config/configuration-file.html
// https://karma-runner.github.io/1.0/config/configuration-file.html
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', 'angular-cli'],
frameworks: ['jasmine', '@angular/cli'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-remap-istanbul'),
require('angular-cli/plugins/karma')
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma')
],
files: [
{ pattern: './src/test.ts', watched: false }
],
preprocessors: {
'./src/test.ts': ['angular-cli']
},
mime: {
'text/x-typescript': ['ts','tsx']
client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
remapIstanbulReporter: {
reports: {
html: 'coverage',
lcovonly: './coverage/coverage.lcov'
}
coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true
},
angularCli: {
config: './angular-cli.json',
environment: 'dev'
},
reporters: config.angularCli && config.angularCli.codeCoverage
? ['progress', 'karma-remap-istanbul']
: ['progress'],
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
......
......@@ -10,8 +10,8 @@
"aot": "ng build --aot",
"test": "ng test",
"lint": "ng lint",
"test-n-build_RESTORE_WHEN_LINT_AND_TEST_FIXED": "ng lint && ng test && ng build",
"test-n-build": "ng build",
"test-n-build": "ng lint && ng build",
"test-n-build_ENABLE_WHEN_KARMA_WORKS": "ng lint && ng test && ng build",
"e2e": "ng e2e",
"version": "ng version"
},
......
<div id="top-container">
<div id="left-menu">
<left-menu></left-menu>
<moya-left-menu></moya-left-menu>
</div>
<div id="contentarea">
<div id="topbar">
<top-menu></top-menu>
<moya-top-menu></moya-top-menu>
<moya-locale></moya-locale>
</div>
<div id="content">
......
......@@ -31,7 +31,7 @@ import { FrontpageComponent } from './components/frontpage/frontpage.component';
HttpClientModule,
LoginModule,
LeftMenuModule,
AlertModule.forRoot(),
......
......@@ -2,10 +2,10 @@ import {Component, OnInit} from '@angular/core';
import {MenuGroup} from '../models/menu-group.model';
import {MENU} from '../defines/menu';
import {ActivatedRoute, Router, RouterEvent, UrlSegment} from '@angular/router';
import {TranslatePipe} from "@ngx-translate/core";
import {TranslatePipe} from '@ngx-translate/core';
@Component({
selector: 'left-menu',
selector: 'moya-left-menu',
templateUrl: './left-menu.component.html',
styleUrls: ['./left-menu.component.scss'],
providers: [TranslatePipe]
......@@ -16,23 +16,21 @@ export class LeftMenuComponent {
styleClass: string;
searchPath(path: string, menu: MenuGroup[]): boolean {
searchPath(path: string, groups: MenuGroup[]): boolean {
for (const i in menu) {
for (const n in menu[i].items) {
const item = menu[i].items[n];
for (const group of groups) {
for (const item of group.items) {
if (path.startsWith(item.path)) {
return true;
}
}
}
return false;
}
constructor(private route: Router) {
route.events.filter(e => e instanceof RouterEvent).subscribe(event => {
......@@ -59,18 +57,18 @@ export class LeftMenuComponent {
}
activateInfo() {
this.menu = MENU.INFO;
this.menu = MENU.INFO;
this.styleClass = 'infoMenu';
}
activateUser() {
this.menu = MENU.USER;
this.menu = MENU.USER;
this.styleClass = 'userMenu';
}
activateAdmin() {
this.menu = MENU.ADMIN;
this.menu = MENU.ADMIN;
this.styleClass = 'adminMenu';
}
......
......@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { LeftMenuComponent } from './left-menu.component';
import { RouterModule } from '@angular/router';
import {TranslateModule} from "@ngx-translate/core";
import {TranslateModule} from '@ngx-translate/core';
@NgModule({
imports: [
......
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'top-menu',
selector: 'moya-top-menu',
templateUrl: './top-menu.component.html',
styleUrls: ['./top-menu.component.scss']
})
......
......@@ -3,7 +3,7 @@ import {Location, LocationStrategy, HashLocationStrategy, PathLocationStrategy}
import {NavigationExtras, ActivatedRoute, Router} from '@angular/router';
@Component({
selector: 'old-moya',
selector: 'moya-old',
providers: [Location, {provide: LocationStrategy, useClass: PathLocationStrategy}],
templateUrl: './old-moya.component.html',
styleUrls: ['./old-moya.component.scss']
......
......@@ -2,7 +2,7 @@ import {Component, NgZone, OnInit} from '@angular/core';
import {Observable} from 'rxjs/Observable';
import {Vip} from '../models/vip.model';
import {ViplistService} from '../viplist.service';
import {TranslatePipe} from "@ngx-translate/core";
import {TranslatePipe} from '@ngx-translate/core';
@Component({
selector: 'moya-viplist',
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!