Skip to content

Commit 6cd31a5

Browse files
author
Mező Dávid
committed
Task 4 - Observable
2 parents 10d170f + ec8856c commit 6cd31a5

File tree

10 files changed

+60
-85
lines changed

10 files changed

+60
-85
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ speed-measure-plugin.json
3232
.history/*
3333

3434
# misc
35+
/.angular/cache
3536
/.sass-cache
3637
/connect.lock
3738
/coverage

‎angular.json

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"build": {
1818
"builder": "@angular-devkit/build-angular:browser",
1919
"options": {
20-
"aot": true,
2120
"outputPath": "dist/angular-introduction3",
2221
"index": "src/index.html",
2322
"main": "src/main.ts",
@@ -30,7 +29,13 @@
3029
"styles": [
3130
"src/styles.scss"
3231
],
33-
"scripts": []
32+
"scripts": [],
33+
"vendorChunk": true,
34+
"extractLicenses": false,
35+
"buildOptimizer": false,
36+
"sourceMap": true,
37+
"optimization": false,
38+
"namedChunks": true
3439
},
3540
"configurations": {
3641
"production": {
@@ -44,7 +49,6 @@
4449
"outputHashing": "all",
4550
"sourceMap": false,
4651
"namedChunks": false,
47-
"aot": true,
4852
"extractLicenses": true,
4953
"vendorChunk": false,
5054
"buildOptimizer": true,
@@ -60,7 +64,8 @@
6064
}
6165
]
6266
}
63-
}
67+
},
68+
"defaultConfiguration": ""
6469
},
6570
"serve": {
6671
"builder": "@angular-devkit/build-angular:dev-server",
@@ -95,18 +100,6 @@
95100
"src/assets"
96101
]
97102
}
98-
},
99-
"lint": {
100-
"builder": "@angular-devkit/build-angular:tslint",
101-
"options": {
102-
"tsConfig": [
103-
"src/tsconfig.app.json",
104-
"src/tsconfig.spec.json"
105-
],
106-
"exclude": [
107-
"**/node_modules/**"
108-
]
109-
}
110103
}
111104
}
112105
},
@@ -126,15 +119,6 @@
126119
"devServerTarget": "angular-introduction3:serve:production"
127120
}
128121
}
129-
},
130-
"lint": {
131-
"builder": "@angular-devkit/build-angular:tslint",
132-
"options": {
133-
"tsConfig": "e2e/tsconfig.e2e.json",
134-
"exclude": [
135-
"**/node_modules/**"
136-
]
137-
}
138122
}
139123
}
140124
}

‎package.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,41 @@
1111
},
1212
"private": true,
1313
"dependencies": {
14-
"@angular/animations": "^11.1.2",
15-
"@angular/cdk": "^11.1.2",
16-
"@angular/common": "~11.1.2",
17-
"@angular/compiler": "~11.1.2",
18-
"@angular/core": "~11.1.2",
19-
"@angular/flex-layout": "^11.0.0-beta.33",
20-
"@angular/forms": "~11.1.2",
21-
"@angular/material": "^11.1.2",
22-
"@angular/platform-browser": "~11.1.2",
23-
"@angular/platform-browser-dynamic": "~11.1.2",
24-
"@angular/router": "~11.1.2",
25-
"core-js": "^3.8.3",
14+
"@angular/animations": "^13.2.3",
15+
"@angular/cdk": "^13.2.3",
16+
"@angular/common": "~13.2.3",
17+
"@angular/compiler": "~13.2.3",
18+
"@angular/core": "~13.2.3",
19+
"@angular/flex-layout": "^13.0.0-beta.38",
20+
"@angular/forms": "~13.2.3",
21+
"@angular/material": "^13.2.3",
22+
"@angular/platform-browser": "~13.2.3",
23+
"@angular/platform-browser-dynamic": "~13.2.3",
24+
"@angular/router": "~13.2.3",
25+
"core-js": "^2.5.4",
2626
"rxjs": "~6.6.3",
27-
"tslib": "^2.1.0",
28-
"zone.js": "~0.11.3"
27+
"tslib": "^2.0.0",
28+
"zone.js": "~0.11.4"
2929
},
3030
"devDependencies": {
31-
"@angular-devkit/build-angular": "~0.1101.4",
32-
"@angular/cli": "~11.1.4",
33-
"@angular/compiler-cli": "~11.1.2",
34-
"@angular/language-service": "~11.1.2",
35-
"@types/jasmine": "~3.6.3",
36-
"@types/jasminewd2": "~2.0.8",
37-
"@types/node": "^14.14.25",
31+
"@angular-devkit/build-angular": "~13.2.4",
32+
"@angular/cli": "~13.2.4",
33+
"@angular/compiler-cli": "~13.2.3",
34+
"@angular/language-service": "~13.2.3",
35+
"@types/jasmine": "~2.8.8",
36+
"@types/jasminewd2": "~2.0.3",
37+
"@types/node": "^12.11.1",
3838
"codelyzer": "^6.0.1",
39-
"jasmine-core": "~3.6.0",
40-
"jasmine-spec-reporter": "~6.0.0",
41-
"karma": "~6.1.0",
39+
"jasmine-core": "~3.5.0",
40+
"jasmine-spec-reporter": "~5.0.0",
41+
"karma": "~6.3.16",
4242
"karma-chrome-launcher": "~3.1.0",
43-
"karma-coverage-istanbul-reporter": "~3.0.3",
44-
"karma-jasmine": "~4.0.1",
45-
"karma-jasmine-html-reporter": "^1.5.4",
43+
"karma-coverage-istanbul-reporter": "~3.0.2",
44+
"karma-jasmine": "~4.0.0",
45+
"karma-jasmine-html-reporter": "^1.5.0",
4646
"protractor": "~7.0.0",
47-
"ts-node": "~9.1.1",
47+
"ts-node": "~7.0.0",
4848
"tslint": "~6.1.0",
49-
"typescript": "~4.1.3"
49+
"typescript": "~4.5.5"
5050
}
5151
}

‎src/app/app.module.ts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
import {BrowserModule} from '@angular/platform-browser';
2-
import {NgModule} from '@angular/core';
3-
4-
import {AppRoutingModule} from './app-routing.module';
5-
import {AppComponent} from './app.component';
6-
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
7-
import {FlexModule} from '@angular/flex-layout';
8-
import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
9-
import {AuthInterceptorService} from './core/auth-interceptor.service';
1+
import { BrowserModule } from '@angular/platform-browser';
2+
import { NgModule } from '@angular/core';
3+
import { AppRoutingModule } from './app-routing.module';
4+
import { AppComponent } from './app.component';
5+
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
6+
import { FlexModule } from '@angular/flex-layout';
7+
import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
8+
import { AuthInterceptorService } from './core/auth-interceptor.service';
109
import { LoginComponent } from './login/login.component';
1110
import { HomeComponent } from './home/home.component';
12-
import {MatFormFieldModule} from '@angular/material/form-field';
13-
import {MatIconModule} from '@angular/material/icon';
14-
import {MatInputModule} from '@angular/material/input';
15-
import {MatButtonModule} from '@angular/material/button';
11+
import { MatFormFieldModule } from '@angular/material/form-field';
12+
import { MatIconModule } from '@angular/material/icon';
13+
import { MatInputModule } from '@angular/material/input';
14+
import { MatButtonModule } from '@angular/material/button';
1615

1716
@NgModule({
1817
declarations: [

‎src/app/flight/flight.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { FlightComponent } from './flight.component';
44
import { FligthsListComponent } from './fligths-list/fligths-list.component';
5-
import {FlightRoutingModule} from './flight-routing.module';
6-
import {MatTableModule} from '@angular/material/table';
5+
import { MatTableModule } from '@angular/material/table';
6+
import { FlightRoutingModule } from './flight-routing.module';
77

88
@NgModule({
99
declarations: [FlightComponent, FligthsListComponent],

‎src/environments/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ export const environment = {
1414
* This import should be commented out in production mode because it will have a negative impact
1515
* on performance if an error is thrown.
1616
*/
17-
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
17+
// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.

‎src/polyfills.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@
1818
* BROWSER POLYFILLS
1919
*/
2020

21-
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
22-
// import 'classlist.js'; // Run `npm install --save classlist.js`.
23-
24-
/**
25-
* Web Animations `@angular/platform-browser/animations`
26-
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
27-
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
28-
*/
29-
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
30-
3121
/**
3222
* By default, zone.js will patch all possible macroTask and DomEvents
3323
* user can disable parts of macroTask/DomEvents patch by setting following flags
@@ -55,7 +45,7 @@
5545
/***************************************************************************************************
5646
* Zone JS is required by default for Angular itself.
5747
*/
58-
import 'zone.js/dist/zone'; // Included with Angular CLI.
48+
import 'zone.js'; // Included with Angular CLI.
5949

6050

6151
/***************************************************************************************************

‎src/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/* You can add global styles to this file, and also import other style files */
2-
@import "~@angular/material/prebuilt-themes/indigo-pink.css";
2+
@import "@angular/material/prebuilt-themes/indigo-pink.css";

‎src/test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
22

3-
import 'zone.js/dist/zone-testing';
3+
import 'zone.js/testing';
44
import { getTestBed } from '@angular/core/testing';
55
import {
66
BrowserDynamicTestingModule,
@@ -12,7 +12,9 @@ declare const require: any;
1212
// First, initialize the Angular testing environment.
1313
getTestBed().initTestEnvironment(
1414
BrowserDynamicTestingModule,
15-
platformBrowserDynamicTesting()
15+
platformBrowserDynamicTesting(), {
16+
teardown: { destroyAfterEach: false }
17+
}
1618
);
1719
// Then we find all the tests.
1820
const context = require.context('./', true, /\.spec\.ts$/);

‎tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"declaration": false,
99
"module": "es2020",
1010
"moduleResolution": "node",
11-
"emitDecoratorMetadata": true,
1211
"experimentalDecorators": true,
1312
"importHelpers": true,
1413
"target": "es2015",

0 commit comments

Comments
 (0)