Skip to content

Commit 8122fa7

Browse files
authored
Merge pull request #30 from sayanaka/feature/angular10
Feature/angular10
2 parents 9c0eabf + 9b5d6ce commit 8122fa7

14 files changed

+12940
-8724
lines changed
File renamed without changes.

angular.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
"projectType": "application",
1010
"schematics": {
1111
"@schematics/angular:component": {
12-
"styleext": "less"
12+
"style": "less"
1313
}
1414
},
1515
"architect": {
1616
"build": {
1717
"builder": "@angular-devkit/build-angular:browser",
1818
"options": {
19+
"aot": true,
1920
"outputPath": "dist/ng-kyoto",
2021
"index": "src/index.html",
2122
"main": "src/main.ts",
@@ -55,6 +56,10 @@
5556
"type": "initial",
5657
"maximumWarning": "2mb",
5758
"maximumError": "5mb"
59+
},
60+
{
61+
"type": "anyComponentStyle",
62+
"maximumWarning": "6kb"
5863
}
5964
]
6065
}

e2e/tsconfig.e2e.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"module": "commonjs",

package-lock.json

Lines changed: 12853 additions & 8620 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,40 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/animations": "8.0.0",
16-
"@angular/common": "8.0.0",
17-
"@angular/compiler": "8.0.0",
18-
"@angular/core": "8.0.0",
19-
"@angular/forms": "8.0.0",
20-
"@angular/platform-browser": "8.0.0",
21-
"@angular/platform-browser-dynamic": "8.0.0",
22-
"@angular/router": "8.0.0",
15+
"@angular/animations": "10.0.3",
16+
"@angular/common": "10.0.3",
17+
"@angular/compiler": "10.0.3",
18+
"@angular/core": "10.0.3",
19+
"@angular/forms": "10.0.3",
20+
"@angular/platform-browser": "10.0.3",
21+
"@angular/platform-browser-dynamic": "10.0.3",
22+
"@angular/router": "10.0.3",
2323
"core-js": "2.5.4",
2424
"prettier": "^1.15.2",
25-
"rxjs": "6.5.2",
26-
"tslib": "^1.9.0",
27-
"zone.js": "~0.9.1"
25+
"rxjs": "6.6.0",
26+
"tslib": "^2.0.0",
27+
"zone.js": "~0.10.2"
2828
},
2929
"devDependencies": {
30-
"@angular-devkit/build-angular": "~0.800.0",
31-
"@angular/cli": "8.0.2",
32-
"@angular/compiler-cli": "8.0.0",
33-
"@angular/language-service": "8.0.0",
30+
"@angular-devkit/build-angular": "~0.1000.1",
31+
"@angular/cli": "10.0.1",
32+
"@angular/compiler-cli": "10.0.3",
33+
"@angular/language-service": "10.0.3",
3434
"@types/jasmine": "2.8.8",
3535
"@types/jasminewd2": "2.0.3",
36-
"@types/node": "8.9.4",
37-
"codelyzer": "^5.0.1",
38-
"jasmine-core": "2.99.1",
39-
"jasmine-spec-reporter": "4.2.1",
40-
"karma": "3.0.0",
41-
"karma-chrome-launcher": "2.2.0",
42-
"karma-coverage-istanbul-reporter": "2.0.1",
43-
"karma-jasmine": "1.1.2",
44-
"karma-jasmine-html-reporter": "^0.2.2",
45-
"protractor": "5.4.0",
36+
"@types/node": "^12.11.1",
37+
"codelyzer": "^5.1.2",
38+
"jasmine-core": "~3.5.0",
39+
"jasmine-spec-reporter": "~5.0.0",
40+
"karma": "~5.0.0",
41+
"karma-chrome-launcher": "~3.1.0",
42+
"karma-coverage-istanbul-reporter": "~3.0.2",
43+
"karma-jasmine": "~3.3.0",
44+
"karma-jasmine-html-reporter": "^1.5.0",
45+
"protractor": "~7.0.0",
4646
"ts-node": "7.0.0",
47-
"tslint": "5.11.0",
48-
"typescript": "3.4.5"
47+
"tslint": "~6.1.0",
48+
"typescript": "3.9.6"
4949
},
5050
"engines": {
5151
"node": ">=10.13.0"

src/app/footer.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<div class="container-fluid">
2-
<row> <bcol id="copyright" xs="12"> &copy; 2019 ng-kyoto </bcol> </row>
2+
<row> <bcol id="copyright" xs="12"> &copy; 2020 ng-kyoto </bcol> </row>
33
</div>

src/app/header.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ <h1><img src="assets/ng-kyoto-header-logo.png" alt="ng-kyoto logo" />ng-kyoto</h
1111
<bcol id="hero" xs="12">
1212
<h2>古都の空気に触れながら、<br />Angularの未来を一緒に学ばはりませんか</h2>
1313
<apply-button
14-
href="https://ng-kyoto.connpass.com/event/124745/"
15-
label="ng-kyoto Angular Meetup #10に参加する"
14+
href="https://ng-kyoto.connpass.com/event/161569/"
15+
label="ng-kyoto Angular Meetup #11に参加する"
1616
></apply-button>
1717
</bcol>
1818
</row>

src/app/mock-request.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/app/organizers.component.ts

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22
import { Component } from '@angular/core';
3-
import { HttpClient } from '@angular/common/http';
43

54
@Component({
65
selector: 'organizers',
@@ -17,49 +16,7 @@ export class OrganizersComponent {
1716
},
1817
{ id: '_likr', url: 'https://vdslab.jp/', name: '尾上 洋介' },
1918
];
20-
angularPosts: any;
21-
22-
constructor(private http: HttpClient) {
23-
this.fetchUser();
24-
}
25-
26-
fetchUser() {
27-
const mockurl = 'assets/mock-request.json';
28-
return this.http.get(mockurl).subscribe(
29-
(res) => {
30-
this.angularPosts = this.filterPost(res);
31-
},
32-
(error) => console.log(error),
33-
);
34-
}
35-
36-
/**
37-
* returns exp.
38-
* [[imai, imai, imai], [armorik83, armorik83, armorik83], [_likr]]
39-
*/
40-
filterPost(posts: any): any[] {
41-
const organizersPosts = {};
42-
posts
43-
.map((post) => {
44-
const isAngularPost = post.tags.some((tag) => tag.name.match(/ngular/));
45-
return isAngularPost ? post : void 0;
46-
})
47-
.filter((post) => post)
48-
.filter((post, idx) => idx < 20)
49-
.forEach((post) => {
50-
organizersPosts[post.user.id] = organizersPosts[post.user.id] || [];
51-
if (5 <= organizersPosts[post.user.id].length) {
52-
return;
53-
}
54-
organizersPosts[post.user.id].push(post);
55-
});
56-
57-
const result = [];
58-
Object.keys(organizersPosts).forEach((organizer) => result.push(organizersPosts[organizer]));
59-
60-
// The return type must be an Array<Array<QiitaPost>>
61-
return result;
62-
}
19+
constructor() {}
6320
}
6421

6522
export interface IOrganizer {

src/tsconfig.app.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"types": []
66
},
7-
"exclude": [
8-
"test.ts",
9-
"**/*.spec.ts"
7+
"files": [
8+
"main.ts",
9+
"polyfills.ts"
10+
],
11+
"include": [
12+
"src/**/*.d.ts"
1013
]
1114
}

0 commit comments

Comments
 (0)