Skip to content
Snippets Groups Projects
Commit c3f634a2 authored by Tim Flicke's avatar Tim Flicke
Browse files

Merge branch 'prio' into 'master'

Prio

See merge request fe/fe-pda-testing-tool!1
parents 68089ef2 4cee0bb3
No related branches found
No related tags found
No related merge requests found
Showing
with 1092 additions and 977 deletions
...@@ -16,7 +16,8 @@ import { DeleteProjectComponent } from './components/delete-project/delete-proje ...@@ -16,7 +16,8 @@ import { DeleteProjectComponent } from './components/delete-project/delete-proje
import { LoopsComponent } from './components/loops/loops.component'; import { LoopsComponent } from './components/loops/loops.component';
import { LoopComponent } from './components/loop/loop.component'; import { LoopComponent } from './components/loop/loop.component';
import { UpdateProjectComponent } from './components/update-project/update-project.component'; import { UpdateProjectComponent } from './components/update-project/update-project.component';
import { MigrationOverviewComponent } from './components/migration-overview/migration-overview.component'; import { MigrationOverviewComponent } from './migration-overview/migration-overview.component';
import { PrioritizationOverviewComponent } from './prioritization-overview/prioritization-overview.component';
const routes: Routes = [ const routes: Routes = [
...@@ -36,6 +37,7 @@ const routes: Routes = [ ...@@ -36,6 +37,7 @@ const routes: Routes = [
{ path: 'project/:projectId/mocks/manual', component: NewManualMockComponent }, { path: 'project/:projectId/mocks/manual', component: NewManualMockComponent },
{ path: 'project/:projectId/mocks/manual/:mockId', component: NewManualMockComponent }, { path: 'project/:projectId/mocks/manual/:mockId', component: NewManualMockComponent },
{ path: 'project/:projectId/update/migration', component: MigrationOverviewComponent }, { path: 'project/:projectId/update/migration', component: MigrationOverviewComponent },
{ path: 'project/:projectId/update/prio', component: PrioritizationOverviewComponent },
{ path: 'project/:projectId/update', component: UpdateProjectComponent }, // new Update Component { path: 'project/:projectId/update', component: UpdateProjectComponent }, // new Update Component
{ path: 'impressum', component: ImprintComponent }, { path: 'impressum', component: ImprintComponent },
{ path: 'notfound', component: NotfoundComponent }, { path: 'notfound', component: NotfoundComponent },
......
...@@ -30,7 +30,8 @@ import { DeleteProjectComponent } from './components/delete-project/delete-proje ...@@ -30,7 +30,8 @@ import { DeleteProjectComponent } from './components/delete-project/delete-proje
import { LoopsComponent } from './components/loops/loops.component'; import { LoopsComponent } from './components/loops/loops.component';
import { LoopComponent } from './components/loop/loop.component'; import { LoopComponent } from './components/loop/loop.component';
import { UpdateProjectComponent } from './components/update-project/update-project.component'; import { UpdateProjectComponent } from './components/update-project/update-project.component';
import { MigrationOverviewComponent } from './components/migration-overview/migration-overview.component'; import { MigrationOverviewComponent } from './migration-overview/migration-overview.component';
import { PrioritizationOverviewComponent } from './prioritization-overview/prioritization-overview.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -58,7 +59,8 @@ import { MigrationOverviewComponent } from './components/migration-overview/migr ...@@ -58,7 +59,8 @@ import { MigrationOverviewComponent } from './components/migration-overview/migr
LoopsComponent, LoopsComponent,
LoopComponent, LoopComponent,
UpdateProjectComponent, UpdateProjectComponent,
MigrationOverviewComponent MigrationOverviewComponent,
PrioritizationOverviewComponent
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
......
<p>prioritization-overview works!</p>
<p>TODO: Priorisierung</p>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment