Self hosted FLOSS fitness/workout, nutrition and weight tracker
Start working on the exercise overview page
Roland Geider2c9f34ea738f
diff --git a/angular/src/app/exercise/exercise-detail/exercise-detail.component.html b/angular/src/app/exercise/exercise-detail/exercise-detail.component.htmlindex 272bbf1a2..bde46123b 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,8 @@--<li class="list-group-item">- <b>{{ exercise.name }}</b> {{ exercise.category.name }}-</li>--+<div class="card h-100">+ <img src="https://www.edeka.de/media/01-rezeptbilder/rezeptbilder-i-p/rez-edeka-pizza-funghi-rezept-i-p-1-1.jpg" class="card-img-top">+ <div class="card-body">+ <h5 class="card-title">{{ exercise.name }}</h5>+ <p class="card-text" *ngFor="let equipmentEntry of exercise.equipment">{{equipmentEntry.name}}</p>+ <!--<p class="card-text" *ngFor="let image of exercise.images">{{image.url}}</p>-->+ </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 4dd44bc2a..c286752e2 100644--- a/angular/src/app/exercise/exercise-list/exercise-list.component.html+++ b/angular/src/app/exercise/exercise-list/exercise-list.component.html@@ -1,7 +1,51 @@-<p>exercise-list works!</p>+<div class="row">+ <div class="col-3">+ <h1 i18n>Exercises</h1>+ </div>+ <div class="col-9">++ <form class="d-flex">+ <input type="text" class="form-control" placeholder="Search">+ <button type="submit" class="btn btn-primary ml-2">Submit</button>+ </form>+ </div>+</div>+++<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>++ <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>+ <div class="col-9">+ <div class="row row-cols-3 row-cols-md-3">+ <div *ngFor="let exercise of exercises | slice: (page-1) * pageSize : page * pageSize" class="col mt-4">+ <app-exercise-detail [exercise]="exercise"></app-exercise-detail>+ </div>+ </div>++ <div class="row ">+ <div class="col-12">+ <ngb-pagination+ [(page)]="page"+ [boundaryLinks]="true"+ [collectionSize]="exercises.length"+ [ellipses]="true"+ [maxSize]="maxPageShown"+ [pageSize]="pageSize"+ class="d-flex justify-content-center mt-2"></ngb-pagination>+ </div>+ </div>+ </div>++</div>+-<ul *ngFor="let exercise of exercises"- class="list-group">- <app-exercise-detail [exercise]="exercise"></app-exercise-detail>- <app-exercise-edit [exercise]="exercise"></app-exercise-edit>-</ul>diff --git a/angular/src/app/exercise/exercise-list/exercise-list.component.ts b/angular/src/app/exercise/exercise-list/exercise-list.component.tsindex 224cf00dd..307b2b514 100644--- a/angular/src/app/exercise/exercise-list/exercise-list.component.ts+++ b/angular/src/app/exercise/exercise-list/exercise-list.component.ts@@ -1,5 +1,7 @@import { Component, OnInit } from '@angular/core';import {ExerciseService} from '../exercise.service';+import {Category} from '../models/exercises/category.model';+import {Equipment} from '../models/exercises/equipment.model';import {Exercise} from '../models/exercises/exercise.model';@Component({@@ -9,11 +11,31 @@ import {Exercise} from '../models/exercises/exercise.model';})export class ExerciseListComponent implements OnInit {exercises: Exercise[] = [];+ categories: Category[] = [];+ equipment: Equipment[] = [];++ /**+ Starting page for the pagination+ */+ page = 1;++ /**+ * number of elements per page. In order to "fill" the pages, this should+ * to be a multiple of 3, since there are 3 exercises per row.+ */+ pageSize = 12;++ /**+ * Number of pages shown before the ellipsis+ */+ maxPageShown = 7;constructor(private exerciseService: ExerciseService) { }ngOnInit(): void {this.getExercises();+ this.categories = this.exerciseService.categories;+ this.equipment = this.exerciseService.equipment;}async getExercises(): Promise<void> {diff --git a/angular/src/app/exercise/exercise.service.ts b/angular/src/app/exercise/exercise.service.tsindex ebfc14d41..6fbe08131 100644--- a/angular/src/app/exercise/exercise.service.ts+++ b/angular/src/app/exercise/exercise.service.ts@@ -59,15 +59,12 @@ export class ExerciseService {async loadExercises(): Promise<Exercise[]> {- const data = await this.http.get<any>(this.exerciseInfoUrl, {params: {limit: 10}}).toPromise();+ const data = await this.http.get<any>(this.exerciseInfoUrl, {params: {limit: 50}}).toPromise();- //console.log(data.results);+ this.exercises = [];for (const exerciseData of data.results) {-- //console.log(exerciseData);-// Exercise itselfconst exercise = this.exerciseAdapter.fromJson(exerciseData);