Skip to content

Commit 4347377

Browse files
committed
Merge branch 'develop' into 'master'
Develop See merge request youtube-public/blog!23
2 parents 88c3cdb + c3af898 commit 4347377

File tree

7 files changed

+15
-33
lines changed

7 files changed

+15
-33
lines changed

README.md

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -39,36 +39,13 @@ Example of file:
3939
`npm run cypress:report`
4040

4141

42-
# Youtube Video Links
43-
### Video 1, set up Blog Project (API)
44-
https://www.youtube.com/watch?v=5pFKw5iLL4s&feature=youtu.be
45-
46-
### Video 2, Basic User Crud API
47-
https://www.youtube.com/watch?v=Z6kw_aJHJLU
48-
49-
### Video 3, JWT Authentication and password hashing
50-
https://www.youtube.com/watch?v=bbDDSylRM04
51-
52-
### Video 4, JwtGuard, RolesGuard, custom @hasRoles() annotation, and protecting one endpoint
53-
https://www.youtube.com/watch?v=Wzn1rzqPq_s
54-
55-
### Video 5, Simple Pagination for getting all users
56-
https://www.youtube.com/watch?v=dDQaNnmcR_0
57-
58-
### Video 6: Angular: Set Up Frontend and verify Connection to NestJs BE
59-
https://www.youtube.com/watch?v=YKPegsIAWhY
60-
61-
### Video 7: Angular: Reactive Forms for Login + Register Component Part 1/2
62-
https://www.youtube.com/watch?v=eg4vmsKe9h4
63-
64-
### Video 8: Angular: CustomValidators with Reactive Forms Login + Register Part 2/2
65-
https://www.youtube.com/watch?v=BUMWCx-mmKU
66-
67-
### Video 9: Angular Material: DataTable & Server Side Pagination
68-
https://www.youtube.com/watch?v=SoMQJmMUCpw
69-
70-
### Video 10: NestJS: Real Time Search - Filter By username and Paginate results
71-
https://www.youtube.com/watch?v=KX8Mynyu9cY
42+
# Youtube Playlist Links
43+
Blog Project only NestJS Videos
44+
https://www.youtube.com/playlist?list=PLVfq1luIZbSnytbsm2i8Ocf_hyUHTsqbZ
45+
46+
47+
Blog Project only Angular Videos
48+
https://www.youtube.com/playlist?list=PLVfq1luIZbSmAWiXmsjUsvdYRu7RdxzaM
7249

73-
### Video 11: Angular Material: Real Time Server Side User Search with Pagination
74-
https://www.youtube.com/watch?v=5SOIGT9mhAY
50+
Blog Project All Videos
51+
https://www.youtube.com/playlist?list=PLVfq1luIZbSmJIuw_EZVP9mFiMED5fGIn
6.93 KB
Loading
68.6 KB
Loading
6.93 KB
Loading
68.6 KB
Loading

frontend/src/app/components/blog-entry/view-blog-entry/view-blog-entry.component.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
<mat-card-header>
44
<div style="display: flex; flex-direction: row;">
55
<div>
6-
<img src="{{origin}}/api/blog-entries/image/{{blogEntry.headerImage}}" class="header-image">
6+
<img *ngIf="blogEntry.headerImage !== null; else placeholderImage"
7+
src="{{origin}}/api/blog-entries/image/{{blogEntry.headerImage}}" class="header-image">
8+
<ng-template #placeholderImage>
9+
<img class="header-image" src="../../../assets/placeholders/placeholder-blog-entry.png">
10+
</ng-template>
711
</div>
812
<div style="margin-left: 20px;">
913
<h1>{{blogEntry.title}}</h1>

frontend/src/app/components/user/users/users.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ <h1 style="text-align: center;">All Users</h1>
3737
<mat-cell *matCellDef="let row">{{row.role}}</mat-cell>
3838
</ng-container>
3939
</mat-table>
40+
4041
<mat-paginator
4142
[length]="dataSource.meta.totalItems"
4243
[pageSize]="dataSource.meta.itemsPerPage"

0 commit comments

Comments
 (0)