Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Make routing work

Roland Geidera83cef8430a5
diff --git a/angular/src/app/app-routing.module.ts b/angular/src/app/app-routing.module.ts
deleted file mode 100644
index 4a9a8e0a8..000000000
--- a/angular/src/app/app-routing.module.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {NgModule} from '@angular/core';
-import {RouterModule, Routes} from '@angular/router';
-
-const routes: Routes = [];
-
-@NgModule({
- imports: [RouterModule.forRoot(routes)],
- exports: [RouterModule]
-})
-export class AppRoutingModule { }
diff --git a/angular/src/app/app.component.html b/angular/src/app/app.component.html
index 4e3111915..52e7439e6 100644
--- a/angular/src/app/app.component.html
+++ b/angular/src/app/app.component.html
@@ -1,9 +1,7 @@
<div class="container">
<div class="row">
<div class="col-12">
- <p>app root works!</p>
-
- <app-exercise-list></app-exercise-list>
+ <router-outlet></router-outlet>
</div>
</div>
</div>
diff --git a/angular/src/app/app.module.ts b/angular/src/app/app.module.ts
index 85e3c3b3e..987078402 100644
--- a/angular/src/app/app.module.ts
+++ b/angular/src/app/app.module.ts
@@ -36,10 +36,12 @@ import {WeightDetailComponent} from './weight/weight-detail/weight-detail.compon
import {WeightEditComponent} from './weight/weight-edit/weight-edit.component';
import {WeightListComponent} from './weight/weight-list/weight-list.component';
import {WeightService} from './weight/weight.service';
+import { ExercisePreviewComponent } from './exercise/exercise-preview/exercise-preview.component';
const appRoutes: Routes = [
{path: '', component: WeightListComponent},
{path: ':lang/dashboard', component: WeightChartComponent},
+ {path: ':lang/exercise/overview', component: ExerciseListComponent},
{path: ':lang/weight/overview', component: WeightListComponent},
];
@@ -54,6 +56,7 @@ const appRoutes: Routes = [
WeightDetailComponent,
WeightEditComponent,
WeightListComponent,
+ ExercisePreviewComponent,
],
imports: [
BrowserAnimationsModule,
diff --git a/angular/src/app/exercise/models/image.model.ts b/angular/src/app/exercise/models/image.model.ts
index f14c351a3..41b693b78 100644
--- a/angular/src/app/exercise/models/image.model.ts
+++ b/angular/src/app/exercise/models/image.model.ts
@@ -1,6 +1,5 @@
import {Injectable} from '@angular/core';
import {Adapter} from '../../core/adapter';
-import {Muscle} from './muscle.model';
export class ExerciseImage{