Self hosted FLOSS fitness/workout, nutrition and weight tracker
Improvements to the exercise list page
Roland Geider01efc73a3350
diff --git a/angular/src/app/exercise/exercise-detail/exercise-detail.component.html b/angular/src/app/exercise/exercise-detail/exercise-detail.component.htmlindex bd8f66b99..d45a8d90c 100644--- a/angular/src/app/exercise/exercise-detail/exercise-detail.component.html+++ b/angular/src/app/exercise/exercise-detail/exercise-detail.component.html@@ -1,6 +1,6 @@<div class="row"><div class="col-12">- <h1 i18n>{{ exercise.name }}</h1>+ <h1>{{ exercise.name }}</h1></div></div>diff --git a/angular/src/app/exercise/exercise-list/exercise-list.component.html b/angular/src/app/exercise/exercise-list/exercise-list.component.htmlindex dbb1c83b8..7f1e148bb 100644--- a/angular/src/app/exercise/exercise-list/exercise-list.component.html+++ b/angular/src/app/exercise/exercise-list/exercise-list.component.html@@ -6,7 +6,7 @@<form class="d-flex"><input type="text" class="form-control" placeholder="Search">- <button type="submit" class="btn btn-primary ml-2">Submit</button>+ <button type="submit" class="btn btn-primary">Add exercise</button></form></div></div>@@ -15,14 +15,22 @@<div class="row"><div class="col-3"><h5 i18n>Categories</h5>- <ul class="list-group">- <li *ngFor="let category of categories" class="list-group-item"> {{category.name}}</li>- </ul>+ <div class="list-group">+ <a class="list-group-item list-group-item-action active" i18n>All categories</a>+ <a *ngFor="let category of categories" class="list-group-item list-group-item-action">{{category.name}}</a>+ </div><h5 class="mt-3" i18n>Equipment</h5>- <ul class="list-group">- <li *ngFor="let equipment of equipment" class="list-group-item"> {{equipment.name}}</li>- </ul>+ <div class="list-group">+ <div *ngFor="let equipment of equipment" class="list-group-item">+ <div class="form-check">+ <input class="form-check-input" type="checkbox" id="equipment-{{equipment.id}}">+ <label class="form-check-label" for="equipment-{{equipment.id}}">+ {{equipment.name}}+ </label>+ </div>+ </div>+ </div></div><div class="col-9">diff --git a/angular/src/app/exercise/exercise-preview/exercise-preview.component.html b/angular/src/app/exercise/exercise-preview/exercise-preview.component.htmlindex 06ccb76ce..aded3e275 100644--- a/angular/src/app/exercise/exercise-preview/exercise-preview.component.html+++ b/angular/src/app/exercise/exercise-preview/exercise-preview.component.html@@ -1,12 +1,16 @@<div class="card h-100">+ <span class="position-absolute badge badge-dark" style="left: -1em; top: 1em;">+ {{exercise.category}}+ </span><a routerLink="/de/exercise/{{exercise.id}}/view/">- <img class="card-img-top"- src="https://www.edeka.de/media/01-rezeptbilder/rezeptbilder-i-p/rez-edeka-pizza-funghi-rezept-i-p-1-1.jpg"- alt="">+ <img+ class="card-img-top p-2"+ [src]="exercise.mainImage(true)!.url"+ alt=""></a>+<div class="card-body"><h5 class="card-title">{{ exercise.name }}</h5>- <p *ngFor="let equipmentEntry of exercise.equipment" class="card-text">{{equipmentEntry.name}}</p>- <!--<p class="card-text" *ngFor="let image of exercise.images">{{image.url}}</p>-->+ <p>{{ exercise.equipment.join(', ')}}</p></div></div>diff --git a/angular/src/app/exercise/models/category.model.ts b/angular/src/app/exercise/models/category.model.tsindex 4486d7632..c71e18bb3 100644--- a/angular/src/app/exercise/models/category.model.ts+++ b/angular/src/app/exercise/models/category.model.ts@@ -7,6 +7,10 @@ export class Category{public id: number,public name: string) { }++ toString() {+ return this.name;+ }}@Injectable({diff --git a/angular/src/app/exercise/models/equipment.model.ts b/angular/src/app/exercise/models/equipment.model.tsindex d75cfd711..4b9dc44b8 100644--- a/angular/src/app/exercise/models/equipment.model.ts+++ b/angular/src/app/exercise/models/equipment.model.ts@@ -1,12 +1,14 @@import {Injectable} from '@angular/core';import {Adapter} from '../../core/adapter';-import {Muscle} from './muscle.model';export class Equipment{-constructor(public id: number,public name: string) { }++ toString() {+ return this.name;+ }}@Injectable({diff --git a/angular/src/app/exercise/models/exercise.model.ts b/angular/src/app/exercise/models/exercise.model.tsindex bdddb9662..f001361c7 100644--- a/angular/src/app/exercise/models/exercise.model.ts+++ b/angular/src/app/exercise/models/exercise.model.ts@@ -59,6 +59,22 @@ export class Exercise {this.licenseAuthor = licenseAuthor;this.variations = variations;}++ /*+ * 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;+ }+ }+ if(returnPlaceholder)+ {+ return new ExerciseImage(-1, '', 'http://localhost:8000/static/images/icons/image-placeholder.svg', true);+ }+ return null;+ }}diff --git a/angular/src/locale/messages.xlf b/angular/src/locale/messages.xlfindex a3a727c74..f5d0484d4 100644--- a/angular/src/locale/messages.xlf+++ b/angular/src/locale/messages.xlf@@ -249,6 +249,83 @@<context context-type="linenumber">78,85</context></context-group></trans-unit>+ <trans-unit id="2079820911183014447" datatype="html">+ <source>Starting position</source>+ <context-group purpose="location">+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>+ <context context-type="linenumber">20</context>+ </context-group>+ </trans-unit>+ <trans-unit id="1534367694207535197" datatype="html">+ <source>Steps</source>+ <context-group purpose="location">+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>+ <context context-type="linenumber">23</context>+ </context-group>+ </trans-unit>+ <trans-unit id="3807699453257291879" datatype="html">+ <source>Comments</source>+ <context-group purpose="location">+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>+ <context context-type="linenumber">26</context>+ </context-group>+ </trans-unit>+ <trans-unit id="6683174589423846748" datatype="html">+ <source>Muscles</source>+ <context-group purpose="location">+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>+ <context context-type="linenumber">32</context>+ </context-group>+ </trans-unit>+ <trans-unit id="7781909188300244257" datatype="html">+ <source>Primary muscles</source>+ <context-group purpose="location">+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>+ <context context-type="linenumber">40</context>+ </context-group>+ </trans-unit>+ <trans-unit id="4300464616073530652" datatype="html">+ <source>Secondary muscles</source>+ <context-group purpose="location">+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>+ <context context-type="linenumber">45</context>+ </context-group>+ </trans-unit>+ <trans-unit id="8760380136442491374" datatype="html">+ <source>Variants</source>+ <context-group purpose="location">+ <context context-type="sourcefile">src/app/exercise/exercise-detail/exercise-detail.component.html</context>+ <context context-type="linenumber">66</context>+ </context-group>+ </trans-unit>+ <trans-unit id="5815398842801469550" datatype="html">+ <source>Exercises</source>+ <context-group purpose="location">+ <context context-type="sourcefile">src/app/exercise/exercise-list/exercise-list.component.html</context>+ <context context-type="linenumber">3</context>+ </context-group>+ </trans-unit>+ <trans-unit id="1902100407096396858" datatype="html">+ <source>Categories</source>+ <context-group purpose="location">+ <context context-type="sourcefile">src/app/exercise/exercise-list/exercise-list.component.html</context>+ <context context-type="linenumber">17</context>+ </context-group>+ </trans-unit>+ <trans-unit id="3393133458004181121" datatype="html">+ <source>All categories</source>+ <context-group purpose="location">+ <context context-type="sourcefile">src/app/exercise/exercise-list/exercise-list.component.html</context>+ <context context-type="linenumber">19</context>+ </context-group>+ </trans-unit>+ <trans-unit id="7595930936671323978" datatype="html">+ <source>Equipment</source>+ <context-group purpose="location">+ <context context-type="sourcefile">src/app/exercise/exercise-list/exercise-list.component.html</context>+ <context context-type="linenumber">23</context>+ </context-group>+ </trans-unit><trans-unit id="2540594807548326286" datatype="html"><source>Add entry</source><context-group purpose="location">