Migrate angular

parent e13a507f
Pipeline #27572 failed with stages
in 6 minutes and 36 seconds
......@@ -57,32 +57,33 @@
"@angular/router": "^8.0.2",
"@angular/service-worker": "^8.0.2",
"@auth0/angular-jwt": "2.1.0",
"@fortawesome/angular-fontawesome": "^0.3.0",
"@fortawesome/fontawesome-svg-core": "^1.2.17",
"@fortawesome/free-solid-svg-icons": "^5.8.1",
"@ng-bootstrap/ng-bootstrap": "^4.1.1",
"@fortawesome/angular-fontawesome": "^0.4.0",
"@fortawesome/fontawesome-svg-core": "^1.2.19",
"@fortawesome/free-solid-svg-icons": "^5.9.0",
"@ng-bootstrap/ng-bootstrap": "^4.2.1",
"@ng-bootstrap/schematics": "^2.0.0-alpha.1",
"@nguniversal/express-engine": "^7.1.1",
"@nguniversal/module-map-ngfactory-loader": "^7.1.1",
"@ngx-translate/core": "^11.0.1",
"@ngx-translate/http-loader": "~4.0.0",
"@techiediaries/ngx-qrcode": "0.0.5",
"@webcomponents/custom-elements": "^1.2.2",
"angulartics2": "^7.4.1",
"@webcomponents/custom-elements": "^1.2.4",
"angular-svg-icon": "^7.2.1",
"angulartics2": "^7.5.2",
"bootstrap": "^4.3.1",
"classlist.js": "^1.1.20150312",
"cors": "^2.8.5",
"highlight.js": "^9.15.6",
"highlight.js": "^9.15.8",
"intro.js": "^2.9.3",
"marked": "git+https://github.com/trayhem/marked.git",
"messageformat": "^2.1.0",
"ngx-infinite-scroll": "^7.1.0",
"ngx-toastr": "^9.2.0",
"ngx-translate-messageformat-compiler": "^4.4.0",
"ngx-infinite-scroll": "^7.2.0",
"ngx-qrcode2": "0.0.9",
"ngx-toastr": "^10.0.4",
"ngx-translate-messageformat-compiler": "^4.5.0",
"rxjs": "^6.5.2",
"ts-loader": "^5.3.3",
"zone.js": "~0.9.1",
"angular-svg-icon": "^7.2.0"
"ts-loader": "^6.0.4",
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.800.0",
......@@ -98,7 +99,7 @@
"chrome-launcher": "^0.10.5",
"chrome-remote-interface": "^0.27.1",
"codelyzer": "^5.0.1",
"angular-http-server": "^1.8.1",
"angular-http-server": "^1.9.0",
"imagemin": "^6.1.0",
"imagemin-pngquant": "^6.0.1",
"jasmine-core": "~3.3.0",
......@@ -114,12 +115,12 @@
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"protractor": "^5.4.2",
"puppeteer": "^1.15.0",
"puppeteer": "^1.18.0",
"purify-css": "~1.2.5",
"sharp": "^0.21.3",
"ts-node": "~7.0.1",
"tslib": "^1.9.3",
"tslint": "~5.12.1",
"sharp": "^0.22.1",
"ts-node": "~8.3.0",
"tslib": "^1.10.0",
"tslint": "~5.18.0",
"typescript": "~3.4.5",
"webpack-cli": "^3.1.2",
"webpack-node-externals": "^1.7.2"
......
......@@ -58,7 +58,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
private readonly _indexedDbAvailable: boolean = this.indexedDbSupported();
private _subscriptions: Array<Subscription> = [];
@ViewChild('connectionIndicatorPopover') private connectionIndicatorPopover: NgbPopover;
@ViewChild('connectionIndicatorPopover', { static: true }) private connectionIndicatorPopover: NgbPopover;
constructor(
@Inject(PLATFORM_ID) private platformId: Object,
......
......@@ -23,7 +23,7 @@ export class QuestiontextComponent implements OnInit, OnDestroy {
public readonly ENVIRONMENT_TYPE = LIVE_PREVIEW_ENVIRONMENT;
private _questionIndex: number;
@ViewChild('questionText') private textarea: ElementRef;
@ViewChild('questionText', { static: true }) private textarea: ElementRef;
// noinspection JSMismatchedCollectionQueryUpdate
private readonly _subscriptions: Array<Subscription> = [];
......
......@@ -50,29 +50,29 @@ export const appRoutes: Routes = [
{
path: 'admin',
canLoad: [StaticLoginService],
loadChildren: () => import('app/admin/admin.module').then(m => m.AdminModule),
loadChildren: () => import('./admin/admin.module').then(m => m.AdminModule),
}, {
path: 'info',
loadChildren: () => import('app/root/info/info.module').then(m => m.InfoModule),
loadChildren: () => import('./root/info/info.module').then(m => m.InfoModule),
}, {
path: 'i18n-manager',
canLoad: [StaticLoginService],
loadChildren: () => import('app/i18n-manager/i18n-manager.module').then(m => m.I18nManagerModule),
loadChildren: () => import('./i18n-manager/i18n-manager.module').then(m => m.I18nManagerModule),
}, {
path: 'quiz/manager',
loadChildren: () => import('app/quiz/quiz-manager/quiz-manager.module').then(m => m.QuizManagerModule),
loadChildren: () => import('./quiz/quiz-manager/quiz-manager.module').then(m => m.QuizManagerModule),
}, {
path: 'quiz/flow',
loadChildren: () => import('app/quiz/quiz-flow/quiz-flow.module').then(m => m.QuizFlowModule),
loadChildren: () => import('./quiz/quiz-flow/quiz-flow.module').then(m => m.QuizFlowModule),
data: {
preload: true,
},
}, {
path: 'quiz',
loadChildren: () => import('app/quiz/quiz.module').then(m => m.QuizModule),
loadChildren: () => import('./quiz/quiz.module').then(m => m.QuizModule),
}, {
path: 'nicks',
loadChildren: () => import('app/root/nickname-chooser/nickname-chooser.module').then(m => m.NicknameChooserModule),
loadChildren: () => import('./root/nickname-chooser/nickname-chooser.module').then(m => m.NicknameChooserModule),
data: {
preload: true,
},
......
......@@ -19,7 +19,7 @@ export class InfoComponent implements OnInit, OnDestroy, AfterViewInit {
public readonly infoButtons: Array<{ id: string, i18nRef: string }> = [];
private _routerSubscription: Subscription;
@ViewChild('buttonHeader') private buttonHeader: ElementRef;
@ViewChild('buttonHeader', { static: true }) private buttonHeader: ElementRef;
constructor(
private footerBarService: FooterBarService,
......
import { Injectable } from '@angular/core';
import { CanLoad, Router } from '@angular/router';
import { Route } from '@angular/router/src/config';
import { UrlSegment } from '@angular/router/src/url_tree';
import { CanLoad, Route, Router, UrlSegment } from '@angular/router';
import { UserRole } from '../../../lib/enums/UserRole';
import { UserService } from '../user/user.service';
......
......@@ -66,7 +66,7 @@ $step: 5;
$i: $step;
@while $i < 100 {
&.section-#{$i} {
.section-#{$i} {
flex: 0 0 #{$i}#{"%"};
@include media-breakpoint-up(md) {
......
@mixin keyframeBuilder($map) {
@each $index, $colorMap in $map {
"#{$index}%" {
background-color: map-get($colorMap, "bg");
color: map-get($colorMap, "fg");
}
#{$index}% {
background-color: map-get($colorMap, "bg");
color: map-get($colorMap, "fg");
}
}
}
......
......@@ -2,20 +2,10 @@
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"removeComments": true,
"baseUrl": "",
"types": []
},
"files": [
"main.ts",
"polyfills.ts"
],
"include": [
"../node_modules/arsnova-click-v2-types/dist/**/*.ts",
"**/*.ts"
],
"exclude": [
"test.ts",
"src/test.ts",
"**/*.spec.ts"
]
}
{
"compileOnSave": false,
"compilerOptions": {
"incremental": true,
"baseUrl": "./",
"downlevelIteration": true,
"importHelpers": true,
"module": "esnext",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"resolveJsonModule": true,
"target": "es2015",
"module": "esnext",
"typeRoots": [
"node_modules/@types"
],
"importHelpers": true,
"lib": [
"esnext",
"es2018",
"dom"
],
"paths": {
"jobs": [
"dist/jobs"
],
"core-js/es7/reflect": [
"./node_modules/core-js/proposals/reflect-metadata"
],
"core-js/es6/*": [
"./node_modules/core-js/es/*"
]
}
"resolveJsonModule": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true
}
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment