Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Show the main image somewhat bigger

Roland Geider2f38366d3d21
diff --git a/angular/src/app/exercise/exercise-detail/exercise-detail.component.html b/angular/src/app/exercise/exercise-detail/exercise-detail.component.html
index f299d6e22..ab40d2686 100644
--- a/angular/src/app/exercise/exercise-detail/exercise-detail.component.html
+++ b/angular/src/app/exercise/exercise-detail/exercise-detail.component.html
@@ -57,10 +57,20 @@
</div>
<div class="col-3">
<img
- *ngFor="let image of exercise.images"
- src="{{ image.url }}"
+ src="{{ exercise.mainImage()!.url }}"
+ *ngIf="exercise.mainImage()"
class="img-fluid"
alt="...">
+ <div class="row">
+ <div class="col-6" *ngFor="let image of exercise.images">
+ <img
+ src="{{ image.url }}"
+ class="img-fluid"
+ alt="...">
+ </div>
+ </div>
+
+
</div>
</div>
diff --git a/angular/src/app/exercise/models/exercise.model.ts b/angular/src/app/exercise/models/exercise.model.ts
index c18c35269..6532d87c5 100644
--- a/angular/src/app/exercise/models/exercise.model.ts
+++ b/angular/src/app/exercise/models/exercise.model.ts
@@ -63,17 +63,17 @@ export class Exercise {
/*
* Returns the exercise's main image or, if not available, null
*/
- mainImage(returnPlaceholder=false): ExerciseImage|null {
- for (let image of this.images) {
- if (image.isMain) {
- return image;
- }
+ mainImage(returnPlaceholder = false): ExerciseImage | null {
+ const image = this.images.find(img => img.isMain);
+
+ if(image) {
+ return image;
}
- if(returnPlaceholder)
- {
+
+ if (returnPlaceholder) {
return new ExerciseImage(-1, '', 'http://localhost:8000/static/images/icons/image-placeholder.svg', true);
}
- return null;
+ return null;
}
}
@@ -96,7 +96,7 @@ export class ExerciseAdapter implements Adapter<Exercise> {
item.license,
item.license_author,
item.variations
- );
+ );
}
/**