diff --git a/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining-routing.module.ts b/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining-routing.module.ts
index 63dec4c..531cf00 100755
--- a/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining-routing.module.ts
+++ b/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining-routing.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
import {SaveprofileComponent} from '../saveprofile/saveprofile.component';
import {ConfigurationComponent} from '../configuration/configuration.component';
@@ -7,23 +7,18 @@ import {ManageprofilesComponent} from '../manageprofiles/manageprofiles.componen
import {SaveProfileGuard, UploadContentGuard} from './save-profile-guard';
const interactiveMiningRoutes: Routes = [
- {path: '', redirectTo: '/mining/manage-profiles', pathMatch: 'full'},
+ {path: 'manage-profiles', component: ManageprofilesComponent},
{
- path: '',
- // component: InteractiveMiningComponent,
- children: [
- { path: 'manage-profiles', component: ManageprofilesComponent },
- { path: 'upload-content',
- component: ContentComponent,
- canDeactivate: [UploadContentGuard]
- },
- { path: 'configure-profile',
- component: ConfigurationComponent,
- canDeactivate: [SaveProfileGuard]
- },
- { path: 'save-profile', component: SaveprofileComponent }
- ]
- }
+ path: 'upload-content',
+ component: ContentComponent,
+ canDeactivate: [UploadContentGuard]
+ },
+ {
+ path: 'configure-profile',
+ component: ConfigurationComponent,
+ canDeactivate: [SaveProfileGuard]
+ },
+ {path: 'save-profile', component: SaveprofileComponent}
];
@NgModule({
@@ -38,4 +33,5 @@ const interactiveMiningRoutes: Routes = [
SaveProfileGuard
]
})
-export class InteractiveMiningRoutingModule { }
+export class InteractiveMiningRoutingModule {
+}
diff --git a/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining.component.css b/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining.component.css
deleted file mode 100755
index e69de29..0000000
diff --git a/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining.component.html b/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining.component.html
deleted file mode 100755
index 0680b43..0000000
--- a/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining.component.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining.component.spec.ts b/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining.component.spec.ts
deleted file mode 100755
index acd77f9..0000000
--- a/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { InteractiveMiningComponent } from './interactive-mining.component';
-
-describe('InteractiveMiningComponent', () => {
- let component: InteractiveMiningComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ InteractiveMiningComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(InteractiveMiningComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should be created', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining.component.ts b/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining.component.ts
deleted file mode 100755
index 1df379b..0000000
--- a/interactive-mining-angular-frontend/src/app/interactivemining/interactive-mining.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import {ActivatedRoute, Router} from '@angular/router';
-
-@Component({
- selector: 'app-interactive-mining',
- templateUrl: './interactive-mining.component.html',
- styleUrls: ['./interactive-mining.component.css']
-})
-export class InteractiveMiningComponent implements OnInit {
-
- constructor(private route: ActivatedRoute, private router: Router) { }
-
- ngOnInit() {
- // this.router.navigate(['manage-profiles'], {relativeTo: this.route, queryParamsHandling: 'preserve' });
- }
-
-}
diff --git a/interactive-mining-angular-frontend/src/app/manageprofiles/manageprofiles.component.ts b/interactive-mining-angular-frontend/src/app/manageprofiles/manageprofiles.component.ts
index 0837413..dbddcdc 100755
--- a/interactive-mining-angular-frontend/src/app/manageprofiles/manageprofiles.component.ts
+++ b/interactive-mining-angular-frontend/src/app/manageprofiles/manageprofiles.component.ts
@@ -47,12 +47,19 @@ export class ManageprofilesComponent implements OnInit {
}
ngOnInit() {
- this.route.queryParams
- .subscribe(
- params => {
- this.communityId = params['communityId'];
+ this.route.params.subscribe(params => {
+ if (params['community']) {
+ this.communityId = params['community'];
this.initialServerHandshake(this.communityId);
- });
+ } else {
+ this.route.queryParams
+ .subscribe(
+ queryParams => {
+ this.communityId = queryParams['communityId'];
+ this.initialServerHandshake(this.communityId);
+ });
+ }
+ });
this.isCommunityManager = this.manageProfilesService.isCommunityManager === 'true';
}