Skip to content

Commit e268519

Browse files
SergeyPirogovSergeyPirogov
authored
Merge pull request #13 from apanashchenko/master
Add them unlink button and italic font for post timestamp
2 parents c6730a9 + 4a80ecc commit e268519

File tree

5 files changed

+70
-40
lines changed

5 files changed

+70
-40
lines changed

‎src/app/episode-details/episode-details.component.css‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,17 @@
22
margin-left: 15px;
33
width: 100px;
44
float:right;
5-
}
5+
}
6+
7+
.them-name {
8+
cursor: pointer;
9+
width: 100%;
10+
display: flex;
11+
padding: 10px;
12+
vertical-align: center;
13+
}
14+
15+
.them-name:hover {
16+
box-shadow: 0 0 5px rgba(0,0,0,0.5);
17+
border-radius: 10px;
18+
}

‎src/app/episode-details/episode-details.component.html‎

Lines changed: 46 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<div *ngIf="episode">
22
<div *ngIf="currentUser.isAdmin" class="row">
3-
<div class="col mb-2">
4-
<button type="button" class="btn btn-block btn-outline-info" (click)="linkThemes(episode)">Link themes</button>
5-
</div>
3+
<div class="col mb-2">
4+
<button type="button" class="btn btn-block btn-outline-info" (click)="linkThemes(episode)">Link themes</button>
65
</div>
6+
</div>
77
<div class="row">
8-
<div class="col">
9-
Current: {{ now | date:'hh:mm:ss EEEE dd LLL' }}
10-
</div>
8+
<div class="col">
9+
Current: {{ now | date:'hh:mm:ss EEEE dd LLL' }}
10+
</div>
1111
</div>
12-
<div class="row mb-2">
13-
<div class="col">
14-
Started: {{ episode.startTime | date:'hh:mm:ss EEEE dd LLL'}}
15-
</div>
12+
<div class="row mb-2">
13+
<div class="col">
14+
Started: {{ episode.startTime | date:'hh:mm:ss EEEE dd LLL'}}
15+
</div>
1616
</div>
1717
<div class="row mb-2">
1818
<div class="col-4">
@@ -28,38 +28,47 @@ <h2>{{episode.name}}</h2>
2828
</div>
2929
<div *ngIf="currentUser.isAdmin" class="row mb-3">
3030
<div class="col-6">
31-
<button type="button" class="btn btn-warning btn-block" [disabled]='episode.started' (click)="startEpisode(episode)">Start episode</button>
31+
<button type="button" class="btn btn-warning btn-block" [disabled]='episode.started'
32+
(click)="startEpisode(episode)">Start episode
33+
</button>
3234
</div>
3335
<div class="col-6">
34-
<button type="button" class="btn btn-danger btn-block" [disabled]='!episode.started' (click)="stopEpisode(episode)">Stop episode</button>
35-
</div>
36+
<button type="button" class="btn btn-danger btn-block" [disabled]='!episode.started'
37+
(click)="stopEpisode(episode)">Stop episode
38+
</button>
39+
</div>
3640
</div>
3741
<div class="row">
38-
<div class="col">
39-
<div class="table-responsive">
40-
<table class="table table-hover">
41-
<caption>Theme list</caption>
42-
<thead class="thead-light">
43-
<tr>
44-
<th>Timecode</th>
45-
<th class="hidden">Title</th>
46-
<th></th>
47-
</tr>
48-
</thead>
49-
<tbody>
50-
<tr *ngFor="let theme of episode?.themeList" [class.table-success]="theme.passed">
51-
<td>{{ theme.timecode }}</td>
52-
<td [innerHTML]="theme.title | linkify"></td>
53-
<td><button class="btn btn-dark item" [disabled]="!episode.started" (click)="track(episode, theme)">Track</button></td>
54-
</tr>
55-
</tbody>
56-
</table>
57-
</div>
42+
<div class="col">
43+
<div class="table-responsive">
44+
<table class="table">
45+
<caption>Theme list</caption>
46+
<thead class="thead-light">
47+
<tr>
48+
<th>Timecode</th>
49+
<th class="hidden">Title</th>
50+
<th></th>
51+
</tr>
52+
</thead>
53+
<tbody>
54+
<tr *ngFor="let theme of episode?.themeList" [class.table-success]="theme.passed">
55+
<td>{{ theme.timecode }}</td>
56+
<td [innerHTML]="theme.title | linkify"></td>
57+
<td>
58+
<button type="button" class="btn btn-warning item" (click)="unlinkThemes(episode.id, theme.id)">Unlink</button>
59+
<button type="button" class="btn btn-dark item" [disabled]="!episode.started" (click)="track(episode, theme)">Track</button>
60+
</td>
61+
</tr>
62+
</tbody>
63+
</table>
5864
</div>
65+
</div>
5966
</div>
6067
<div *ngIf="currentUser.isAdmin" class="row mb-5">
61-
<div class="col-12 mb-5">
62-
<button type="button" class="btn btn-info btn-sm btn-block" *ngIf='isFinished(episode)' (click)="export(episode)">Export this episode</button>
63-
</div>
68+
<div class="col-12 mb-5">
69+
<button type="button" class="btn btn-info btn-sm btn-block" *ngIf='isFinished(episode)' (click)="export(episode)">
70+
Export this episode
71+
</button>
72+
</div>
6473
</div>
65-
</div>
74+
</div>

‎src/app/episode-details/episode-details.component.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,8 @@ export class EpisodeDetailsComponent implements OnInit {
9393
});
9494
}
9595

96+
unlinkThemes(id: number, themeId: number) {
97+
this.episodeService.unlinkThemesToEpisode(id, themeId).subscribe(data => { this.getEpisodeDetails()});
98+
}
99+
96100
}

‎src/app/post-details/post-details.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h6>Гости:</h6>
2424
<h6>Темы:</h6>
2525
<div class="col-12 mb-3 mx-3">
2626
<ul *ngFor="let theme of episode?.themeList" class="list-group">
27-
<li *ngIf="theme.timecode">{{theme.title}} - {{theme.timecode}}</li>
27+
<li *ngIf="theme.timecode">{{theme.title}} - <em>{{theme.timecode}}</em></li>
2828
</ul>
2929
</div>
3030

@@ -68,4 +68,4 @@ <h6> Стать патроном: <a href="http://patreon.com/automation_remarks
6868
<app-sidenav></app-sidenav>
6969
</div>
7070
</div>
71-
</div>
71+
</div>

‎src/app/service/episode.service.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ export class EpisodeService {
5757
return this.apiClient.post(`${this.baseUrl}/${episode.id}`, selectedThemeIds)
5858
}
5959

60+
unlinkThemesToEpisode(id: number, themeId: number): Observable<any> {
61+
return this.apiClient.post(`${this.baseUrl}/${id}/theme/${themeId}/unlink`, {})
62+
}
63+
6064
removeEpisode(id: Number): Observable<any> {
6165
return this.apiClient.delete(`${this.baseUrl}/${id}/remove`)
6266
}

0 commit comments

Comments
 (0)