Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Work on exercise models

Roland Geider9986d8076b16
diff --git a/angular/README.md b/angular/README.md
index 0ba260e4d..c25a3d429 100644
--- a/angular/README.md
+++ b/angular/README.md
@@ -8,7 +8,22 @@ This folder contains the angular components used in the wger application.
Note that installing angular is only needed during development of angular code,
the compiled javascript is in `core/static/angular`.
+Compile angular code, in wger root folder:
```bash
+yarn build:angular
+```
+
+or in this folder:
+
+```
ng build --configuration production --output-path ../wger/core/static/angular --watch --output-hashing none
```
+
+## Updating angular
+
+Update angular to a new version with
+
+```bash
+ng update @angular/core @angular/cli
+```
diff --git a/angular/src/app/app.component.html b/angular/src/app/app.component.html
index 0436533cf..4e3111915 100644
--- a/angular/src/app/app.component.html
+++ b/angular/src/app/app.component.html
@@ -3,7 +3,7 @@
<div class="col-12">
<p>app root works!</p>
- <app-exercise></app-exercise>
+ <app-exercise-list></app-exercise-list>
</div>
</div>
</div>
diff --git a/angular/src/app/app.module.ts b/angular/src/app/app.module.ts
index 963a6f159..2af864193 100644
--- a/angular/src/app/app.module.ts
+++ b/angular/src/app/app.module.ts
@@ -3,12 +3,14 @@ import {NgModule} from '@angular/core';
import {BrowserModule} from '@angular/platform-browser';
import {AppComponent} from './app.component';
-import {ExerciseComponent} from './exercise/exercise.component';
+import {ExerciseDetailComponent} from './exercise/exercise-detail/exercise-detail.component';
+import { ExerciseListComponent } from './exercise/exercise-list/exercise-list.component';
@NgModule({
declarations: [
AppComponent,
- ExerciseComponent
+ ExerciseDetailComponent,
+ ExerciseListComponent
],
imports: [
BrowserModule,
diff --git a/angular/src/app/core/adapter.ts b/angular/src/app/core/adapter.ts
new file mode 100644
index 000000000..dc31e756f
--- /dev/null
+++ b/angular/src/app/core/adapter.ts
@@ -0,0 +1,5 @@
+export interface Adapter<T> {
+ fromJson(item: any): T;
+
+ toJson(item: T): any;
+}
diff --git a/angular/src/app/exercise/exercise.component.css b/angular/src/app/exercise/exercise-detail/exercise-detail.component.css
similarity index 100%
rename from angular/src/app/exercise/exercise.component.css
rename to angular/src/app/exercise/exercise-detail/exercise-detail.component.css
diff --git a/angular/src/app/exercise/exercise-detail/exercise-detail.component.html b/angular/src/app/exercise/exercise-detail/exercise-detail.component.html
new file mode 100644
index 000000000..272bbf1a2
--- /dev/null
+++ b/angular/src/app/exercise/exercise-detail/exercise-detail.component.html
@@ -0,0 +1,6 @@
+
+<li class="list-group-item">
+ <b>{{ exercise.name }}</b> {{ exercise.category.name }}
+</li>
+
+
diff --git a/angular/src/app/exercise/exercise.component.spec.ts b/angular/src/app/exercise/exercise-detail/exercise-detail.component.spec.ts
similarity index 58%
rename from angular/src/app/exercise/exercise.component.spec.ts
rename to angular/src/app/exercise/exercise-detail/exercise-detail.component.spec.ts
index 2da8773a1..59713656a 100644
--- a/angular/src/app/exercise/exercise.component.spec.ts
+++ b/angular/src/app/exercise/exercise-detail/exercise-detail.component.spec.ts
@@ -1,20 +1,20 @@
import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {ExerciseComponent} from './exercise.component';
+import {ExerciseDetailComponent} from './exercise-detail.component';
describe('ExerciseComponent', () => {
- let component: ExerciseComponent;
- let fixture: ComponentFixture<ExerciseComponent>;
+ let component: ExerciseDetailComponent;
+ let fixture: ComponentFixture<ExerciseDetailComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [ ExerciseComponent ]
+ declarations: [ ExerciseDetailComponent ]
})
.compileComponents();
});
beforeEach(() => {
- fixture = TestBed.createComponent(ExerciseComponent);
+ fixture = TestBed.createComponent(ExerciseDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/angular/src/app/exercise/exercise-detail/exercise-detail.component.ts b/angular/src/app/exercise/exercise-detail/exercise-detail.component.ts
new file mode 100644
index 000000000..57a4ef139
--- /dev/null
+++ b/angular/src/app/exercise/exercise-detail/exercise-detail.component.ts
@@ -0,0 +1,20 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {Exercise} from '../models/exercise.model';
+
+@Component({
+ selector: 'app-exercise-detail',
+ templateUrl: './exercise-detail.component.html',
+ styleUrls: ['./exercise-detail.component.css']
+})
+export class ExerciseDetailComponent implements OnInit {
+
+ @Input() exercise!: Exercise;
+
+ constructor() {
+ }
+
+ ngOnInit(): void {
+ }
+
+
+}
diff --git a/angular/src/app/exercise/exercise-list/exercise-list.component.css b/angular/src/app/exercise/exercise-list/exercise-list.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/angular/src/app/exercise/exercise-list/exercise-list.component.html b/angular/src/app/exercise/exercise-list/exercise-list.component.html
new file mode 100644
index 000000000..31eef29dc
--- /dev/null
+++ b/angular/src/app/exercise/exercise-list/exercise-list.component.html
@@ -0,0 +1,6 @@
+<p>exercise-list works!</p>
+
+<ul *ngFor="let exercise of exercises"
+ class="list-group">
+ <app-exercise-detail [exercise]="exercise"></app-exercise-detail>
+</ul>
diff --git a/angular/src/app/exercise/exercise-list/exercise-list.component.spec.ts b/angular/src/app/exercise/exercise-list/exercise-list.component.spec.ts
new file mode 100644
index 000000000..179a494a3
--- /dev/null
+++ b/angular/src/app/exercise/exercise-list/exercise-list.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ExerciseListComponent } from './exercise-list.component';
+
+describe('ExerciseListComponent', () => {
+ let component: ExerciseListComponent;
+ let fixture: ComponentFixture<ExerciseListComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [ ExerciseListComponent ]
+ })
+ .compileComponents();
+ });
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ExerciseListComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/angular/src/app/exercise/exercise-list/exercise-list.component.ts b/angular/src/app/exercise/exercise-list/exercise-list.component.ts
new file mode 100644
index 000000000..b82e082e6
--- /dev/null
+++ b/angular/src/app/exercise/exercise-list/exercise-list.component.ts
@@ -0,0 +1,29 @@
+import { Component, OnInit } from '@angular/core';
+import {ExerciseService} from '../exercise.service';
+import {Exercise} from '../models/exercise.model';
+
+@Component({
+ selector: 'app-exercise-list',
+ templateUrl: './exercise-list.component.html',
+ styleUrls: ['./exercise-list.component.css']
+})
+export class ExerciseListComponent implements OnInit {
+ exercises: Exercise[] = [];
+
+ constructor(private exerciseService: ExerciseService) { }
+
+ ngOnInit(): void {
+ this.getExercises();
+ }
+
+ async getExercises(): Promise<void> {
+
+ this.exercises = await this.exerciseService.loadExercises();
+ }
+
+ async loadExercise(id: number): Promise<void> {
+
+ const tmp = await this.exerciseService.getExercise(id);
+ console.log(tmp);
+ }
+}
diff --git a/angular/src/app/exercise/exercise.component.html b/angular/src/app/exercise/exercise.component.html
deleted file mode 100644
index 1afc4d127..000000000
--- a/angular/src/app/exercise/exercise.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<p>exercise works!</p>
-
-<ul *ngFor="let exercise of exercises"
-class="list-group">
- <li class="list-group-item">{{ exercise.name }}</li>
-</ul>
diff --git a/angular/src/app/exercise/exercise.component.ts b/angular/src/app/exercise/exercise.component.ts
deleted file mode 100644
index f469c0c9f..000000000
--- a/angular/src/app/exercise/exercise.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import {Component, OnInit} from '@angular/core';
-import {ExerciseService} from './exercise.service';
-import {Exercise} from './models/exercise.model';
-
-@Component({
- selector: 'app-exercise',
- templateUrl: './exercise.component.html',
- styleUrls: ['./exercise.component.css']
-})
-export class ExerciseComponent implements OnInit {
-
- exercises: Exercise[] = [];
-
- constructor(private exerciseService: ExerciseService) {
-
- }
-
- ngOnInit(): void {
- this.getExercises();
- }
-
- getExercises(): void {
-
- this.exerciseService.getExercises().subscribe({
- next: value => {
- this.exercises = value.results;
- // console.log(value.results);
- }
- });
- }
-
-}
diff --git a/angular/src/app/exercise/exercise.service.ts b/angular/src/app/exercise/exercise.service.ts
index f109de7a4..d85fbcc01 100644
--- a/angular/src/app/exercise/exercise.service.ts
+++ b/angular/src/app/exercise/exercise.service.ts
@@ -1,21 +1,110 @@
import {HttpClient} from '@angular/common/http';
import {Injectable} from '@angular/core';
-import {Observable} from 'rxjs';
import {environment} from '../../environments/environment';
import {WgerApiResponse} from '../core/wger-response.model';
-import {Exercise} from './models/exercise.model';
+import {Category, CategoryAdapter} from './models/category.model';
+import {Equipment, EquipmentAdapter} from './models/equipment.model';
+import {Exercise, ExerciseAdapter} from './models/exercise.model';
+import {ExerciseImageAdapter} from './models/image.model';
+import {Muscle, MuscleAdapter} from './models/muscle.model';
@Injectable({
providedIn: 'root',
})
export class ExerciseService {
- url = environment.apiUrl + 'exercise';
+ exerciseUrl = environment.apiUrl + 'exercise';
+ exerciseInfoUrl = environment.apiUrl + 'exerciseinfo';
+ categoryUrl = environment.apiUrl + 'exercisecategory';
+ muscleUrl = environment.apiUrl + 'muscle';
+ equipmentUrl = environment.apiUrl + 'equipment';
- constructor(private http: HttpClient) {
+ exercises: Exercise[] = [];
+ categories: Category[] = [];
+ muscles: Muscle[] = [];
+ equipment: Equipment[] = [];
+
+ constructor(private http: HttpClient,
+ private exerciseAdapter: ExerciseAdapter,
+ private categoryAdapter: CategoryAdapter,
+ private muscleAdapter: MuscleAdapter,
+ private equipmentAdapter: EquipmentAdapter,
+ private exerciseImageAdapter: ExerciseImageAdapter,
+ ) { }
+
+ loadBaseData(): void {
+ // Load all categories
+ this.http.get<WgerApiResponse<Category>>(this.categoryUrl).subscribe(data => {
+ for (const categoryData of data.results) {
+ this.categories.push(this.categoryAdapter.fromJson(categoryData));
+ }
+ });
+
+ // Load all muscles
+ this.http.get<WgerApiResponse<Muscle>>(this.muscleUrl).subscribe(data => {
+ for (const muscleData of data.results) {
+ this.muscles.push(this.muscleAdapter.fromJson(muscleData));
+ }
+ });
+
+ // Load all equipment
+ this.http.get<WgerApiResponse<Equipment>>(this.equipmentUrl).subscribe(data => {
+ for (const equipmentData of data.results) {
+ this.equipment.push(this.equipmentAdapter.fromJson(equipmentData));
+ }
+ });
+ }
+
+
+ async loadExercises(): Promise<Exercise[]> {
+ const data = await this.http.get<any>(this.exerciseInfoUrl, {params: {limit: 50}}).toPromise();
+
+ for (const exerciseData of data.results) {
+ // Exercise itself
+ const exercise = this.exerciseAdapter.fromJson(exerciseData);
+
+ // Category
+ exercise.category = this.categoryAdapter.fromJson(exerciseData.category);
+
+ // Muscles
+ for (const muscleData of exerciseData.muscles) {
+ exercise.muscles.push(this.muscleAdapter.fromJson(muscleData));
+ }
+ for (const muscleData of exerciseData.muscles_secondary) {
+ exercise.musclesSecondary.push(this.muscleAdapter.fromJson(muscleData));
+ }
+
+ // Equipment
+ for (const equipmentData of exerciseData.equipment) {
+ exercise.equipment.push(this.equipmentAdapter.fromJson(equipmentData));
+ }
+
+ // Images
+ for (const imageData of exerciseData.images) {
+ exercise.images.push(this.exerciseImageAdapter.fromJson(imageData));
+ }
+
+
+ console.log(exercise);
+ this.exercises.push(exercise);
+ }
+
+ return this.exercises;
+ }
+
+ getExercise(id: number): Exercise {
+ return this.exercises.find(value => value.id === id)!;
+ }
+
+ getCategoryById(id: number): Category {
+ return this.categories.find(value => value.id === id)!;
+ }
+
+ getMuscleById(id: number): Muscle {
+ return this.muscles.find(value => value.id === id)!;
}
- getExercises(): Observable<WgerApiResponse<Exercise>> {
- return this.http.get<WgerApiResponse<Exercise>>(this.url);
+ getEquipmentById(id: number): Equipment {
+ return this.equipment.find(value => value.id === id)!;
}
}
diff --git a/angular/src/app/exercise/models/category.model.ts b/angular/src/app/exercise/models/category.model.ts
index 90df2703d..3d0a20270 100644
--- a/angular/src/app/exercise/models/category.model.ts
+++ b/angular/src/app/exercise/models/category.model.ts
@@ -1,4 +1,31 @@
-export interface Category{
+import {Injectable} from '@angular/core';
+import {Adapter} from '../../core/adapter';
+
+export class Category{
id: number;
name: string;
+
+ constructor(id: number, name: string) {
+ this.id = id;
+ this.name = name;
+ }
+}
+
+@Injectable({
+ providedIn: 'root',
+})
+export class CategoryAdapter implements Adapter<Category> {
+ fromJson(item: any): Category {
+ return new Category(
+ item.id,
+ item.name
+ );
+ }
+
+ toJson(item: Category): any {
+ return {
+ id: item.id,
+ name: item.name,
+ };
+ }
}
diff --git a/angular/src/app/exercise/models/equipment.model.ts b/angular/src/app/exercise/models/equipment.model.ts
index d9363d563..6bf45e24d 100644
--- a/angular/src/app/exercise/models/equipment.model.ts
+++ b/angular/src/app/exercise/models/equipment.model.ts
@@ -1,4 +1,32 @@
-export interface Equipment{
+import {Injectable} from '@angular/core';
+import {Adapter} from '../../core/adapter';
+import {Muscle} from './muscle.model';
+
+export class Equipment{
id: number;
name: string;
+
+ constructor(id: number, name: string) {
+ this.id = id;
+ this.name = name;
+ }
+}
+
+@Injectable({
+ providedIn: 'root',
+})
+export class EquipmentAdapter implements Adapter<Equipment> {
+ fromJson(item: any): Equipment {
+ return new Equipment(
+ item.id,
+ item.name,
+ );
+ }
+
+ toJson(item: Equipment): any {
+ return {
+ id: item.id,
+ name: item.name,
+ };
+ }
}
diff --git a/angular/src/app/exercise/models/exercise.model.ts b/angular/src/app/exercise/models/exercise.model.ts
index 484ca3e49..b6a69a018 100644
--- a/angular/src/app/exercise/models/exercise.model.ts
+++ b/angular/src/app/exercise/models/exercise.model.ts
@@ -1,29 +1,92 @@
+import {Injectable} from '@angular/core';
+import {Adapter} from '../../core/adapter';
import {Category} from './category.model';
import {Equipment} from './equipment.model';
import {ExerciseImage} from './image.model';
import {Muscle} from './muscle.model';
-export interface Exercise {
+export class Exercise {
id: number;
uuid: string;
name: string;
+ date: Date;
description: string;
- category: number;
- muscles: number[];
- muscles_secondary: number[];
- equipment: number[];
+ category!: Category;
+ categoryId: number;
+ muscles: Muscle[] = [];
+ musclesIds: number[] = [];
+ musclesSecondary: Muscle[] = [];
+ musclesSecondaryIds: number[] = [];
+ equipment: Equipment[] = [];
+ equipmentIds: number[] = [];
+ images: ExerciseImage[] = [];
license: number;
- license_author: string;
+ licenseAuthor: string;
variations: number[];
+
+ constructor(id: number,
+ uuid: string,
+ name: string,
+ date: Date,
+ description: string,
+ category: number,
+ muscles: number[],
+ musclesSecondary: number[],
+ equipment: number[],
+ license: number,
+ licenseAuthor: string,
+ variations: number[]) {
+ this.id = id;
+ this.uuid = uuid;
+ this.name = name;
+ this.date = date;
+ this.description = description;
+ this.categoryId = category;
+ this.musclesIds = muscles;
+ this.musclesSecondaryIds = musclesSecondary;
+ this.equipmentIds = equipment;
+ this.license = license;
+ this.licenseAuthor = licenseAuthor;
+ this.variations = variations;
+ }
}
-export interface ExerciseInfo {
- id: number;
- name: string;
- description: string;
- category: Category[];
- muscles: Muscle[];
- muscles_secondary: Muscle[];
- equipment: Equipment[];
- images: ExerciseImage[];
+@Injectable({
+ providedIn: 'root',
+})
+export class ExerciseAdapter implements Adapter<Exercise> {
+ fromJson(item: any): Exercise {
+ return new Exercise(
+ item.id,
+ item.uuid,
+ item.name,
+ new Date(item.creation_date),
+ item.description,
+ item.category,
+ item.muscles,
+ item.muscles_secondary,
+ item.equipment,
+ item.license,
+ item.license_author,
+ item.variations
+ );
+ }
+
+ /**
+ * Don't return all properties, since not all items can be updated (they would
+ * be ignored by the server, but it's better to not send too much anyway)
+ */
+ toJson(item: Exercise): any {
+
+ return {
+ id: item.id,
+ name: item.name,
+ description: item.description,
+ category: item.categoryId,
+ muscles: item.musclesIds,
+ muscles_secondary: item.musclesSecondaryIds,
+ equipment: item.equipmentIds
+ };
+ }
}
+
diff --git a/angular/src/app/exercise/models/image.model.ts b/angular/src/app/exercise/models/image.model.ts
index ee54d5827..9f7f8da47 100644
--- a/angular/src/app/exercise/models/image.model.ts
+++ b/angular/src/app/exercise/models/image.model.ts
@@ -1,5 +1,40 @@
-export interface ExerciseImage{
+import {Injectable} from '@angular/core';
+import {Adapter} from '../../core/adapter';
+import {Muscle} from './muscle.model';
+
+export class ExerciseImage{
id: number;
- image_url: string;
- is_main: boolean;
+ uuid: string;
+ url: string;
+ isMain: boolean;
+
+ constructor(id: number, uuid: string, url: string, isMain: boolean) {
+ this.id = id;
+ this.uuid = uuid;
+ this.url = url;
+ this.isMain = isMain;
+ }
+}
+
+@Injectable({
+ providedIn: 'root',
+})
+export class ExerciseImageAdapter implements Adapter<ExerciseImage> {
+ fromJson(item: any): ExerciseImage {
+ return new ExerciseImage(
+ item.id,
+ item.uuid,
+ item.image,
+ item.is_main
+ );
+ }
+
+ // TODO: when uploading an image we have to send the file
+ toJson(item: ExerciseImage): any {
+ return {
+ id: item.id,
+ image: item.url,
+ is_front: item.isMain
+ };
+ }
}
diff --git a/angular/src/app/exercise/models/muscle.model.ts b/angular/src/app/exercise/models/muscle.model.ts
index 627edac0d..82d59933d 100644
--- a/angular/src/app/exercise/models/muscle.model.ts
+++ b/angular/src/app/exercise/models/muscle.model.ts
@@ -1,5 +1,36 @@
-export interface Muscle {
+import {Injectable} from '@angular/core';
+import {Adapter} from '../../core/adapter';
+
+export class Muscle {
id: number;
name: string;
- is_front: boolean;
+ isFront: boolean;
+
+ constructor(id: number, name: string, isFront: boolean) {
+ this.id = id;
+ this.name = name;
+ this.isFront = isFront;
+ }
+
+}
+
+@Injectable({
+ providedIn: 'root',
+})
+export class MuscleAdapter implements Adapter<Muscle> {
+ fromJson(item: any): Muscle {
+ return new Muscle(
+ item.id,
+ item.name,
+ item.is_front
+ );
+ }
+
+ toJson(item: Muscle): any {
+ return {
+ id: item.id,
+ name: item.name,
+ is_front: item.isFront
+ };
+ }
}
diff --git a/angular/src/environments/environment.ts b/angular/src/environments/environment.ts
index e06b4914a..53ec6e1f9 100644
--- a/angular/src/environments/environment.ts
+++ b/angular/src/environments/environment.ts
@@ -1,10 +1,9 @@
import {Environment} from './environment.interface';
-/*
+/**
* During development it is often easier to develop only in an angular context
* while during production, it is not necessary to set a host
*/
-
export const environment: Environment = {
production: false,
name: 'dev',
diff --git a/package.json b/package.json
index 51cfb634e..dbd9e467c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wger",
- "version": "2.0.dev1",
+ "version": "2.1.0-dev1",
"description": "Self hosted FLOSS fitness/workout and weight tracker",
"directories": {
"doc": "docs"
@@ -30,7 +30,8 @@
"masonry-layout": "^4.2.2"
},
"scripts": {
- "build:css:sass": "sass wger/core/static/scss/main.scss:wger/core/static/yarn/bootstrap-compiled.css"
+ "build:css:sass": "sass wger/core/static/scss/main.scss:wger/core/static/yarn/bootstrap-compiled.css",
+ "build:angular": "cd angular && ng build --configuration production --output-path ../wger/core/static/angular --output-hashing none"
},
"engines": {
"yarn": ">= 1.0.0"