Skip to content

Commit 01d8efc

Browse files
committed
export patrons added
1 parent 1b30f96 commit 01d8efc

File tree

5 files changed

+42
-7
lines changed

5 files changed

+42
-7
lines changed

src/app/app.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { UserManagementComponent } from './user-management/user-management.compo
2424
import { AddUserComponent } from './add-user/add-user.component';
2525
import { PatronsListComponent } from './patrons-list/patrons-list.component';
2626
import { AuthErrorComponent } from './auth-error/auth-error.component';
27+
import { TrimPipe } from './pipes/trim.pipe';
2728

2829

2930
@NgModule({
@@ -33,6 +34,7 @@ import { AuthErrorComponent } from './auth-error/auth-error.component';
3334
EpisodeDetailsComponent,
3435
FilterPipe,
3536
LinkifyPipe,
37+
TrimPipe,
3638
ExportComponent,
3739
ProposeThemeComponent,
3840
LoginComponent,
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.item {
2+
font-weight: 500;
3+
}
Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
<div *ngIf="episode" class="container">
2-
<div class="mb-3">{{ episode.name }}</div>
3-
<div class="mb-2">Гости:</div>
4-
<div class="mb-2">Темы:</div>
2+
<div class="mb-3"><span class="item">{{ episode.name }}</span></div>
3+
<div class="mb-2"><span class="item">Гости:</span></div>
4+
<div class="mb-2"><span class="item">Темы:</span></div>
55
<div *ngFor="let theme of episode?.themeList">
66
<div *ngIf="theme.timecode">- {{ theme.timecode }} - {{ theme.title }}</div>
77
</div>
88
<div class="mb-2"></div>
9-
<div>Telegram: t.me/automation_remarks</div>
10-
<div>Стать патроном: www.patreon.com/automation_remarks</div>
9+
<div><span class="item">Telegram:</span> t.me/automation_remarks</div>
10+
<div><span class="item">Стать патроном:</span> www.patreon.com/automation_remarks</div>
11+
<div class="mb-2"></div>
12+
<div>
13+
<span class="item">Спасибо патронам:</span>
14+
<span>
15+
{{ getPatrons() }}
16+
</span>
17+
</div>
1118
</div>

src/app/export/export.component.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core';
22
import { EpisodeService } from '../service/episode.service';
33
import { ActivatedRoute } from '@angular/router';
44
import { Episode } from '../model/episode';
5+
import { PatronList } from '../model/patron.list';
6+
import { PatronService } from '../service/patron.service';
57

68
@Component({
79
selector: 'app-export',
@@ -11,13 +13,22 @@ import { Episode } from '../model/episode';
1113
export class ExportComponent implements OnInit {
1214

1315
episode: Episode;
14-
16+
patronList: PatronList;
17+
1518
constructor(private episodeService: EpisodeService,
16-
private route: ActivatedRoute) { }
19+
private route: ActivatedRoute,
20+
private patronService: PatronService) { }
1721

1822
ngOnInit() {
1923
const id = +this.route.snapshot.paramMap.get('id');
2024
this.episodeService.getEpisodeById(id).subscribe(data => this.episode = data);
25+
this.patronService.getPatronList().subscribe(data => {
26+
this.patronList = data;
27+
});
28+
}
29+
30+
getPatrons(): string {
31+
return this.patronList.patrons.map(it => it.fullName).join(", ")
2132
}
2233

2334
}

src/app/pipes/trim.pipe.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { Pipe, PipeTransform } from '@angular/core';
2+
3+
@Pipe({
4+
name: 'trim'
5+
})
6+
export class TrimPipe implements PipeTransform {
7+
8+
transform(value: string, args?: any): string {
9+
return value.replace(/ /g, '');
10+
}
11+
12+
}

0 commit comments

Comments
 (0)