* update v4 -> v7 done

This commit is contained in:
Danyi Dávid 2018-11-11 13:50:37 +01:00
parent 3a86fe09ab
commit 1eccb8de8c
19 changed files with 7312 additions and 7714 deletions

View File

@ -1,61 +0,0 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "frontend"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": [
"assets",
"favicon.ico"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"../semantic/dist/semantic.css",
"styles.css"
],
"scripts": [
"../node_modules/jquery/dist/jquery.js",
"../semantic/dist/semantic.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json"
},
{
"project": "src/tsconfig.spec.json"
},
{
"project": "e2e/tsconfig.e2e.json"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {}
}
}

136
angular.json Normal file
View File

@ -0,0 +1,136 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"frontend": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"assets": [
"src/assets",
"src/favicon.ico"
],
"styles": [
"node_modules/semantic-ui-css/semantic.css",
"src/styles.css"
],
"scripts": [
"node_modules/jquery/dist/jquery.js",
"node_modules/semantic-ui-css/semantic.js",
]
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "frontend:build"
},
"configurations": {
"production": {
"browserTarget": "frontend:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "frontend:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"scripts": [
"node_modules/jquery/dist/jquery.js",
"semantic/dist/semantic.js"
],
"styles": [
"semantic/dist/semantic.css",
"src/styles.css"
],
"assets": [
"src/assets",
"src/favicon.ico"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": []
}
}
}
},
"frontend-e2e": {
"root": "e2e",
"sourceRoot": "e2e",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "frontend:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude": []
}
}
}
}
},
"defaultProject": "frontend",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "css"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
}

View File

@ -4,24 +4,22 @@
module.exports = function (config) { module.exports = function (config) {
config.set({ config.set({
basePath: '', basePath: '',
frameworks: ['jasmine', '@angular/cli'], frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [ plugins: [
require('karma-jasmine'), require('karma-jasmine'),
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'), require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'), require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma') require('@angular-devkit/build-angular/plugins/karma')
], ],
client:{ client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser clearContext: false // leave Jasmine Spec Runner output visible in browser
}, },
coverageIstanbulReporter: { coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ], dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true fixWebpackSourcePaths: true
}, },
angularCli: {
environment: 'dev'
},
reporters: ['progress', 'kjhtml'], reporters: ['progress', 'kjhtml'],
port: 9876, port: 9876,
colors: true, colors: true,

14495
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -12,42 +12,43 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^4.2.4", "@angular/animations": "~7.0.3",
"@angular/common": "^4.2.4", "@angular/common": "~7.0.3",
"@angular/compiler": "^4.2.4", "@angular/compiler": "~7.0.3",
"@angular/core": "^4.2.4", "@angular/core": "~7.0.3",
"@angular/forms": "^4.2.4", "@angular/forms": "~7.0.3",
"@angular/http": "^4.2.4", "@angular/http": "~7.0.3",
"@angular/platform-browser": "^4.2.4", "@angular/platform-browser": "~7.0.3",
"@angular/platform-browser-dynamic": "^4.2.4", "@angular/platform-browser-dynamic": "~7.0.3",
"@angular/router": "^4.2.4", "@angular/router": "~7.0.3",
"@auth0/angular-jwt": "^1.0.0-beta.9", "@auth0/angular-jwt": "^2.0.0",
"@types/jquery": "^3.2.12", "@types/jquery": "^3.3.22",
"core-js": "^2.4.1", "core-js": "^2.5.4",
"jquery": "^3.2.1", "jquery": "^3.3.1",
"rxjs": "^5.4.2", "rxjs": "~6.3.3",
"semantic-ui": "^2.2.13", "zone.js": "~0.8.26",
"zone.js": "^0.8.14" "rxjs-compat": "^6.0.0-rc.0"
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "1.4.1", "@angular-devkit/build-angular": "~0.10.0",
"@angular/compiler-cli": "^4.2.4", "@angular/cli": "~7.0.5",
"@angular/language-service": "^4.2.4", "@angular/compiler-cli": "~7.0.3",
"@types/jasmine": "~2.5.53", "@angular/language-service": "~7.0.3",
"@types/jasminewd2": "~2.0.2", "@types/node": "~8.9.4",
"@types/node": "~6.0.60", "@types/jasmine": "~2.8.8",
"codelyzer": "~3.1.1", "@types/jasminewd2": "~2.0.3",
"jasmine-core": "~2.6.2", "codelyzer": "~4.5.0",
"jasmine-spec-reporter": "~4.1.0", "jasmine-core": "~2.99.1",
"karma": "~1.7.0", "jasmine-spec-reporter": "~4.2.1",
"karma-chrome-launcher": "~2.1.1", "karma": "~3.0.0",
"karma-cli": "~1.0.1", "karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^1.2.1", "karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.0", "karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2", "karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.1.2", "protractor": "~5.4.0",
"ts-node": "~3.2.0", "semantic-ui-css": "^2.4.1",
"tslint": "~5.3.2", "ts-node": "~7.0.0",
"typescript": "~2.3.3" "tslint": "~5.11.0",
"typescript": "~3.1.6"
} }
} }

View File

@ -1,22 +0,0 @@
{
"base": "semantic/",
"paths": {
"source": {
"config": "src/theme.config",
"definitions": "src/definitions/",
"site": "src/site/",
"themes": "src/themes/"
},
"output": {
"packaged": "dist/",
"uncompressed": "dist/components/",
"compressed": "dist/components/",
"themes": "dist/themes/"
},
"clean": "dist/"
},
"permission": false,
"autoInstall": true,
"rtl": false,
"version": "2.2.13"
}

View File

@ -8,7 +8,7 @@ import { SimpleFault } from "./shared/simple-fault";
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router"; import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router";
@Injectable() @Injectable()
export class FaultManagerService implements Resolve<Array<Fault>> { export class FaultManagerService implements Resolve<false|Array<Fault>> {
private apiEndpoint = environment.apiUrl + '/api/fault'; private apiEndpoint = environment.apiUrl + '/api/fault';
private apiEndpointReject = environment.apiUrl + '/api/fault-reject'; private apiEndpointReject = environment.apiUrl + '/api/fault-reject';
@ -26,7 +26,7 @@ export class FaultManagerService implements Resolve<Array<Fault>> {
* @param {RouterStateSnapshot} state * @param {RouterStateSnapshot} state
* @returns {Promise<Array<Fault>>} * @returns {Promise<Array<Fault>>}
*/ */
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<Array<Fault>> { resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<false|Array<Fault>> {
return this.list().toPromise(); return this.list().toPromise();
} }

View File

@ -7,13 +7,13 @@ import { Fault } from "./shared/fault";
import { environment } from "../../environments/environment"; import { environment } from "../../environments/environment";
@Injectable() @Injectable()
export class FaultResolverService implements Resolve<Fault> { export class FaultResolverService implements Resolve<false|Fault> {
private apiEndpoint = environment.apiUrl + '/api/fault'; private apiEndpoint = environment.apiUrl + '/api/fault';
constructor(private httpClient: HttpClient) { constructor(private httpClient: HttpClient) {
} }
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<Fault> { resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<false|Fault> {
return this.getFault(route.params['id']).toPromise().then(result => result ? result : false); return this.getFault(route.params['id']).toPromise().then(result => result ? result : false);
} }

View File

@ -8,14 +8,14 @@ import { environment } from "../../../environments/environment";
import { ErrorCategory } from "../shared"; import { ErrorCategory } from "../shared";
@Injectable() @Injectable()
export class ErrorCategoryService implements Resolve<Array<ErrorCategory>> { export class ErrorCategoryService implements Resolve<false|Array<ErrorCategory>> {
private url = environment.apiUrl + '/api/error-category'; private url = environment.apiUrl + '/api/error-category';
constructor(private httpService: HttpClient) { constructor(private httpService: HttpClient) {
} }
public resolve(route: ActivatedRouteSnapshot): Promise<Array<ErrorCategory>> { public resolve(route: ActivatedRouteSnapshot): Promise<false|Array<ErrorCategory>> {
return this.getList().toPromise().then(result => result ? result : false); return this.getList().toPromise().then(result => result ? result : false);
} }

View File

@ -8,14 +8,14 @@ import { environment } from "../../../environments/environment";
import { ErrorOrigin } from "../shared/error-origin"; import { ErrorOrigin } from "../shared/error-origin";
@Injectable() @Injectable()
export class ErrorOriginService implements Resolve<Array<ErrorOrigin>> { export class ErrorOriginService implements Resolve<false|Array<ErrorOrigin>> {
private url = environment.apiUrl + '/api/error-origin'; private url = environment.apiUrl + '/api/error-origin';
constructor(private httpService: HttpClient) { constructor(private httpService: HttpClient) {
} }
public resolve(route: ActivatedRouteSnapshot): Promise<Array<ErrorOrigin>> { public resolve(route: ActivatedRouteSnapshot): Promise<false|Array<ErrorOrigin>> {
return this.getList().toPromise().then(result => result ? result : false); return this.getList().toPromise().then(result => result ? result : false);
} }

View File

@ -8,14 +8,14 @@ import { environment } from "../../../environments/environment";
import { FacilityLocation } from "../shared"; import { FacilityLocation } from "../shared";
@Injectable() @Injectable()
export class FacilityLocationService implements Resolve<Array<FacilityLocation>> { export class FacilityLocationService implements Resolve<false|Array<FacilityLocation>> {
private url = environment.apiUrl + '/api/facility-location'; private url = environment.apiUrl + '/api/facility-location';
constructor(private httpService: HttpClient) { constructor(private httpService: HttpClient) {
} }
public resolve(route: ActivatedRouteSnapshot): Promise<Array<FacilityLocation>> { public resolve(route: ActivatedRouteSnapshot): Promise<false|Array<FacilityLocation>> {
return this.getList().toPromise().then(result => result ? result : false); return this.getList().toPromise().then(result => result ? result : false);
} }

View File

@ -8,14 +8,14 @@ import { environment } from "../../../environments/environment";
import { SolutionTimeInterval } from "../shared/solution-time-interval"; import { SolutionTimeInterval } from "../shared/solution-time-interval";
@Injectable() @Injectable()
export class SolutionTimeIntervalService implements Resolve<Array<SolutionTimeInterval>> { export class SolutionTimeIntervalService implements Resolve<false|Array<SolutionTimeInterval>> {
private url = environment.apiUrl + '/api/solution-time-interval'; private url = environment.apiUrl + '/api/solution-time-interval';
constructor(private httpService: HttpClient) { constructor(private httpService: HttpClient) {
} }
public resolve(route: ActivatedRouteSnapshot): Promise<Array<SolutionTimeInterval>> { public resolve(route: ActivatedRouteSnapshot): Promise<false|Array<SolutionTimeInterval>> {
return this.getList().toPromise().then(result => result ? result : false); return this.getList().toPromise().then(result => result ? result : false);
} }

View File

@ -8,14 +8,14 @@ import { User } from "./shared/user";
import { AuthService } from "../auth/auth.service"; import { AuthService } from "../auth/auth.service";
@Injectable() @Injectable()
export class ProfileResolverService implements Resolve<User> { export class ProfileResolverService implements Resolve<false|User> {
private apiEndpoint = environment.apiUrl + '/api/user'; private apiEndpoint = environment.apiUrl + '/api/user';
constructor(private httpClient: HttpClient, constructor(private httpClient: HttpClient,
private authService: AuthService) { private authService: AuthService) {
} }
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<User> { resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<false|User> {
return this.getProfile().toPromise().then(result => result ? result : false); return this.getProfile().toPromise().then(result => result ? result : false);
} }

View File

@ -8,7 +8,7 @@ import { User } from "./shared/user";
import { AuthService } from "../auth/auth.service"; import { AuthService } from "../auth/auth.service";
@Injectable() @Injectable()
export class UserService implements Resolve<Array<User>> { export class UserService implements Resolve<false|Array<User>> {
private apiEndpoint = environment.apiUrl + '/api/user'; private apiEndpoint = environment.apiUrl + '/api/user';
private apiEndpointPassword = environment.apiUrl + '/api/user/password'; private apiEndpointPassword = environment.apiUrl + '/api/user/password';
@ -16,7 +16,7 @@ export class UserService implements Resolve<Array<User>> {
private authService: AuthService) { private authService: AuthService) {
} }
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<Array<User>> { resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<false|Array<User>> {
return this.getUsers().toPromise().then(result => result ? result : false); return this.getUsers().toPromise().then(result => result ? result : false);
} }

View File

@ -1,4 +1,4 @@
export const environment = { export const environment = {
production: true, production: true,
apiUrl: 'https://api.beik.lxuz.hu', apiUrl: 'https://api.gulbaba.lxuz.hu',
}; };

View File

@ -39,7 +39,6 @@
/** Evergreen browsers require these. **/ /** Evergreen browsers require these. **/
import 'core-js/es6/reflect'; import 'core-js/es6/reflect';
import 'core-js/es7/reflect';
/** /**

View File

@ -11,7 +11,8 @@
] ]
}, },
"files": [ "files": [
"test.ts" "test.ts",
"polyfills.ts"
], ],
"include": [ "include": [
"**/*.spec.ts", "**/*.spec.ts",

View File

@ -14,6 +14,8 @@
"lib": [ "lib": [
"es2017", "es2017",
"dom" "dom"
] ],
"module": "es2015",
"baseUrl": "./"
} }
} }

View File

@ -14,8 +14,7 @@
"eofline": true, "eofline": true,
"forin": true, "forin": true,
"import-blacklist": [ "import-blacklist": [
true, true
"rxjs"
], ],
"import-spacing": true, "import-spacing": true,
"indent": [ "indent": [