Skip to content

Commit

Permalink
Merge pull request #22 from grammerjam/standard-card
Browse files Browse the repository at this point in the history
Standard card
  • Loading branch information
AlexVCS authored Sep 24, 2024
2 parents 56158a4 + ad34075 commit 4885616
Show file tree
Hide file tree
Showing 15 changed files with 279 additions and 63 deletions.
141 changes: 115 additions & 26 deletions base-client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions base-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.0.0",
"scripts": {
"ng": "ng",
"dev": "concurrently 'ng serve --host 0.0.0.0 --port 4200' 'npx json-server --watch src/data.json'",
"start": "ng serve --host 0.0.0.0 --port 4200",
"build": "ng build",
"watch": "ng build --watch --configuration development",
Expand All @@ -22,6 +23,7 @@
"@angular/platform-browser": "^18.0.0",
"@angular/platform-browser-dynamic": "^18.0.0",
"@angular/router": "^18.0.0",
"concurrently": "^9.0.0",
"json-server": "^1.0.0-beta.2",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion base-client/src/app/app.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

main {
display: grid;
height: 100dvh;
min-height: 100dvh;
grid-template-rows: auto auto 1fr;
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
<ul>
<li>{{selectionData.title}}</li>
<li>{{selectionData.category}}</li>
<li>{{selectionData.isBookmarked}}</li>
<li>{{selectionData.isTrending}}</li>
<li>{{selectionData.rating}}</li>
<li>{{selectionData.year}}</li>
</ul>
<article class="regular-card">
<img class="regular-thumbnail" [src]="selectionData.thumbnail.regular.small" [srcset]="" [alt]="selectionData.title">
<app-bookmark [isBookmarked]="selectionData.isBookmarked" />
<div class="regular-card-data-container">
<div class="regular-card-data">
<span class="op-75">{{selectionData.year}}</span>
<span class="op-50"></span>
<img class="regular-category-icon"
[src]="selectionData.category === 'Movie' ? './assets/icon-category-movie.svg' : './assets/icon-category-tv.svg'"
[alt]="selectionData.category">
<span class="op-75">{{selectionData.category}}</span>
<span class="op-50"></span>
<span class="op-75">{{selectionData.rating}}</span>
</div>
<h3>{{selectionData.title}}</h3>
</div>
</article>
Loading

0 comments on commit 4885616

Please sign in to comment.