Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add first version of exercise detail view
Roland Geider45ff5a4df5ff
diff --git a/angular/src/app/app.module.ts b/angular/src/app/app.module.tsindex 987078402..e75bf4067 100644--- a/angular/src/app/app.module.ts+++ b/angular/src/app/app.module.ts@@ -41,7 +41,13 @@ import { ExercisePreviewComponent } from './exercise/exercise-preview/exercise-pconst appRoutes: Routes = [{path: '', component: WeightListComponent},{path: ':lang/dashboard', component: WeightChartComponent},++ // Exercises{path: ':lang/exercise/overview', component: ExerciseListComponent},+ {path: ':lang/exercise/:id/view', component: ExerciseDetailComponent},+ {path: ':lang/exercise/:id/view/:slug', component: ExerciseDetailComponent},++ // Weight{path: ':lang/weight/overview', component: WeightListComponent},];diff --git a/angular/src/app/exercise/exercise-detail/exercise-detail.component.html b/angular/src/app/exercise/exercise-detail/exercise-detail.component.htmlindex 3f896ebe6..1a74a2e37 100644--- a/angular/src/app/exercise/exercise-detail/exercise-detail.component.html+++ b/angular/src/app/exercise/exercise-detail/exercise-detail.component.html@@ -1 +1,66 @@-detail view+<div class="row">+ <div class="col-12">+ <h1 i18n>{{ exercise.name }}</h1>+ </div>+</div>++<div class="row">+ <div class="col-6">+ <span class="badge bg-success">{{ exercise.category.name }}</span>++ </div>+ <div class="col-6">+ edit link+ </div>+</div>+++<div class="row">+ <div class="col-9">+ <h5 i18n>Starting position</h5>+ <p>...</p>++ <h5 i18n>Steps</h5>+ <p [innerHTML]="exercise.description"></p>++ <h5 i18n>Comments</h5>+ <ul>+ <li *ngFor="let comment of exercise.comments">{{ comment.comment }}</li>+ </ul>+++ <h5 class="mt-3" i18n>Muscles</h5>+ <div class="row">+ <div class="col-5">+ <img class="img-fluid"+ src="https://www.edeka.de/media/01-rezeptbilder/rezeptbilder-i-p/rez-edeka-pizza-funghi-rezept-i-p-1-1.jpg"+ alt="">+ </div>+ <div class="col-7">+ <p>Primary muscles</p>+ <ul>+ <li *ngFor="let muscle of exercise.muscles">{{ muscle.name }}</li>+ </ul>++ <p>Secondary muscles</p>+ <ul>+ <li *ngFor="let muscle of exercise.musclesSecondary">{{ muscle.name }}</li>+ </ul>+ </div>+ </div>++++ </div>+ <div class="col-3">+ <img+ *ngFor="let image of exercise.images"+ src="{{ image.url }}"+ class="img-fluid"+ alt="...">+ </div>+</div>++<hr>++<h5 i18n>Variants</h5>diff --git a/angular/src/app/exercise/exercise-detail/exercise-detail.component.ts b/angular/src/app/exercise/exercise-detail/exercise-detail.component.tsindex 613744634..b3554b7e0 100644--- a/angular/src/app/exercise/exercise-detail/exercise-detail.component.ts+++ b/angular/src/app/exercise/exercise-detail/exercise-detail.component.ts@@ -1,4 +1,6 @@-import {Component, Input} from '@angular/core';+import {Component, OnInit} from '@angular/core';+import {ActivatedRoute, Params} from '@angular/router';+import {ExerciseService} from '../exercise.service';import {Exercise} from '../models/exercises/exercise.model';@Component({@@ -6,10 +8,26 @@ import {Exercise} from '../models/exercises/exercise.model';templateUrl: './exercise-detail.component.html',styleUrls: ['./exercise-detail.component.css']})-export class ExerciseDetailComponent {+export class ExerciseDetailComponent implements OnInit{- @Input() exercise!: Exercise;+ id?: number;+ exercise!: Exercise;- constructor() {+ constructor(private exerciseService: ExerciseService,+ private route: ActivatedRoute) {+ }++ async ngOnInit(): Promise<void> {++ this.route.params+ .subscribe(+ (params: Params) => {+ this.id = params.id;+ }+ );++ if(this.id != null) {+ this.exercise = await this.exerciseService.loadExerciseById(this.id);+ }}}diff --git a/angular/src/app/exercise/exercise-preview/exercise-preview.component.html b/angular/src/app/exercise/exercise-preview/exercise-preview.component.htmlindex a008921ed..06ccb76ce 100644--- a/angular/src/app/exercise/exercise-preview/exercise-preview.component.html+++ b/angular/src/app/exercise/exercise-preview/exercise-preview.component.html@@ -1,7 +1,8 @@<div class="card h-100">- <a href="/de/exercise/{{exercise.id}}/view/">+ <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">+ src="https://www.edeka.de/media/01-rezeptbilder/rezeptbilder-i-p/rez-edeka-pizza-funghi-rezept-i-p-1-1.jpg"+ alt=""></a><div class="card-body"><h5 class="card-title">{{ exercise.name }}</h5>diff --git a/angular/src/app/exercise/exercise.service.ts b/angular/src/app/exercise/exercise.service.tsindex 6fbe08131..8ec6d7f40 100644--- a/angular/src/app/exercise/exercise.service.ts+++ b/angular/src/app/exercise/exercise.service.ts@@ -3,6 +3,7 @@ import {Injectable} from '@angular/core';import {environment} from '../../environments/environment';import {WgerApiResponse} from '../core/wger-response.model';import {Category, CategoryAdapter} from './models/exercises/category.model';+import {CommentAdapter} from './models/exercises/comment.model';import {Equipment, EquipmentAdapter} from './models/exercises/equipment.model';import {Exercise, ExerciseAdapter} from './models/exercises/exercise.model';import {ExerciseImageAdapter} from './models/exercises/image.model';@@ -30,6 +31,7 @@ export class ExerciseService {private muscleAdapter: MuscleAdapter,private equipmentAdapter: EquipmentAdapter,private exerciseImageAdapter: ExerciseImageAdapter,+ private commentAdapter: CommentAdapter,) {this.loadBaseData();}@@ -57,14 +59,7 @@ export class ExerciseService {});}-- async loadExercises(): Promise<Exercise[]> {- const data = await this.http.get<any>(this.exerciseInfoUrl, {params: {limit: 50}}).toPromise();-- this.exercises = [];-- for (const exerciseData of data.results) {-+ loadExerciseFromData(exerciseData: any): Exercise {// Exercise itselfconst exercise = this.exerciseAdapter.fromJson(exerciseData);@@ -73,27 +68,49 @@ export class ExerciseService {// Musclesfor (const muscleData of exerciseData.muscles) {- exercise.muscles.push(this.muscleAdapter.fromJson(muscleData));- //exercise.addMuscle(this.muscleAdapter.fromJson(muscleData));- }- for (const muscleData of exerciseData.muscles_secondary) {- exercise.musclesSecondary.push(this.muscleAdapter.fromJson(muscleData));- //exercise.addMuscleSecondary(this.muscleAdapter.fromJson(muscleData));- }+ exercise.muscles.push(this.muscleAdapter.fromJson(muscleData));+ //exercise.addMuscle(this.muscleAdapter.fromJson(muscleData));+ }+ for (const muscleData of exerciseData.muscles_secondary) {+ exercise.musclesSecondary.push(this.muscleAdapter.fromJson(muscleData));+ //exercise.addMuscleSecondary(this.muscleAdapter.fromJson(muscleData));+ }- // Equipment- for (const equipmentData of exerciseData.equipment) {- exercise.equipment.push(this.equipmentAdapter.fromJson(equipmentData));- //exercise.addEquipment(this.equipmentAdapter.fromJson(equipmentData));- }+ // Equipment+ for (const equipmentData of exerciseData.equipment) {+ exercise.equipment.push(this.equipmentAdapter.fromJson(equipmentData));+ //exercise.addEquipment(this.equipmentAdapter.fromJson(equipmentData));+ }- // Images- for (const imageData of exerciseData.images) {- exercise.images.push(this.exerciseImageAdapter.fromJson(imageData));- }+ // Images+ for (const imageData of exerciseData.images) {+ exercise.images.push(this.exerciseImageAdapter.fromJson(imageData));+ }++ // Comments+ for (const commentData of exerciseData.comments) {+ exercise.comments.push(this.commentAdapter.fromJson(commentData));+ }++ return exercise;+}+++ /*+ * Loads an exercise from the server by it's ID+ */+ async loadExerciseById(id: number): Promise<Exercise> {+ const data = await this.http.get<any>(this.exerciseInfoUrl + '/' + id).toPromise();+ return this.loadExerciseFromData(data);+ }++ async loadExercises(): Promise<Exercise[]> {+ const data = await this.http.get<any>(this.exerciseInfoUrl, {params: {limit: 50}}).toPromise();- // console.log(exercise);- this.exercises.push(exercise);+ this.exercises = [];++ for (const exerciseData of data.results) {+ this.exercises.push(this.loadExerciseFromData(exerciseData));}return this.exercises;diff --git a/angular/src/app/exercise/models/exercises/comment.model.ts b/angular/src/app/exercise/models/exercises/comment.model.tsnew file mode 100644index 000000000..5b9b707f2--- /dev/null+++ b/angular/src/app/exercise/models/exercises/comment.model.ts@@ -0,0 +1,47 @@+/*+ * This file is part of wger Workout Manager <https://github.com/wger-project>.+ * Copyright (C) 2020, 2021 wger Team+ *+ * wger Workout Manager is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as published by+ * the Free Software Foundation, either version 3 of the License, or+ * (at your option) any later version.+ *+ * wger Workout Manager is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */++import {Injectable} from '@angular/core';+import {Adapter} from '../../../core/adapter';++export class Comment {++ constructor(+ public id: number,+ public comment: string+ ) { }+}++@Injectable({+ providedIn: 'root',+})+export class CommentAdapter implements Adapter<Comment> {+ fromJson(item: any): Comment {+ return new Comment(+ item.id,+ item.comment+ );+ }++ toJson(item: Comment): any {+ return {+ id: item.id,+ name: item.comment,+ };+ }+}diff --git a/angular/src/app/exercise/models/exercises/exercise.model.ts b/angular/src/app/exercise/models/exercises/exercise.model.tsindex 76f479d06..f0389109d 100644--- a/angular/src/app/exercise/models/exercises/exercise.model.ts+++ b/angular/src/app/exercise/models/exercises/exercise.model.ts@@ -19,6 +19,7 @@import {Injectable} from '@angular/core';import {Adapter} from '../../../core/adapter';import {Category} from './category.model';+import {Comment} from './comment.model';import {Equipment} from './equipment.model';import {ExerciseImage} from './image.model';import {Muscle} from './muscle.model';@@ -33,6 +34,7 @@ export class Exercise {equipment: Equipment[] = [];equipmentIds: number[] = [];images: ExerciseImage[] = [];+ comments: Comment[] = [];license: number;licenseAuthor: string;variations: number[];diff --git a/angular/src/app/weight/weight-list/weight-list.component.spec.ts b/angular/src/app/weight/weight-list/weight-list.component.spec.tsindex bb8728982..7d0c14f1e 100644--- a/angular/src/app/weight/weight-list/weight-list.component.spec.ts+++ b/angular/src/app/weight/weight-list/weight-list.component.spec.ts@@ -1,8 +1,8 @@import {HttpClientTestingModule} from '@angular/common/http/testing';-import { ComponentFixture, TestBed } from '@angular/core/testing';+import {ComponentFixture, TestBed} from '@angular/core/testing';import {WeightService} from '../weight.service';-import { WeightListComponent } from './weight-list.component';+import {WeightListComponent} from './weight-list.component';describe('ExerciseListComponent', () => {let component: WeightListComponent;@@ -10,11 +10,11 @@ describe('ExerciseListComponent', () => {beforeEach(async () => {await TestBed.configureTestingModule({- declarations: [ WeightListComponent ],+ declarations: [WeightListComponent],providers: [WeightService],imports: [HttpClientTestingModule]})- .compileComponents();+ .compileComponents();});beforeEach(() => {