This commit is contained in:
parent
5db9b577fb
commit
d4198d1753
|
@ -8,7 +8,6 @@ import { ProjectsComponent } from './projects/projects.component';
|
|||
import { DatasetsComponent } from './datasets/dataset.component';
|
||||
import { DmpComponent } from './dmps/dmp.component';
|
||||
import { AppComponent } from './app.component';
|
||||
import { UserWorkspaceComponent } from './user-workspace/user-workspace.component';
|
||||
import { MainSignInComponent } from './login/main-sign-in/main-sign-in.component';
|
||||
import { DmpDetailedComponent } from './viewers/dmp-detailed/dmp-detailed.component';
|
||||
import { ProjectDetailedComponent } from './viewers/project-detailed/project-detailed.component';
|
||||
|
@ -23,7 +22,6 @@ const appRoutes: Routes = [
|
|||
{ path: 'project', component: ProjectDetailedComponent},
|
||||
{ path: 'dmps', component: DmpComponent},
|
||||
{ path: 'dmp', component: DmpDetailedComponent },
|
||||
{ path: 'workspace', component: UserWorkspaceComponent},
|
||||
{ path: 'welcome', component: HomepageComponent},
|
||||
{ path: '', redirectTo: '/login', pathMatch: 'full' },
|
||||
{ path: '**', component: PageNotFoundComponent },
|
||||
|
|
|
@ -65,7 +65,6 @@ import { NgDatepickerModule } from 'ng2-datepicker';
|
|||
|
||||
import { StatusToString } from './pipes/various/status-to-string';
|
||||
import { SidebarModule } from 'ng-sidebar';
|
||||
import { UserWorkspaceComponent } from './user-workspace/user-workspace.component';
|
||||
import { AutocompleteRemoteComponent } from './form/fields/autocomplete-remote/autocomplete-remote.component';
|
||||
|
||||
import { Ng4LoadingSpinnerModule } from 'ng4-loading-spinner';
|
||||
|
@ -92,7 +91,6 @@ import { ProjectDetailedComponent } from './viewers/project-detailed/project-det
|
|||
ProjectsComponent,
|
||||
DmpComponent,
|
||||
DatasetsComponent,
|
||||
UserWorkspaceComponent,
|
||||
ConfirmationComponent,
|
||||
AutocompleteRemoteComponent,
|
||||
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
<ul class="nav nav-tabs">
|
||||
<li class="active">
|
||||
<a href="#my-dmps" data-toggle="tab">My DMPs</a>
|
||||
|
||||
</li>
|
||||
<li>
|
||||
<a href="#all-projects" data-toggle="tab">Projects</a>
|
||||
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
|
||||
<div class="tab-content clearfix">
|
||||
<div class="tab-pane active" id="my-dmps">
|
||||
<dmps></dmps>
|
||||
</div>
|
||||
<div class="tab-pane" id="all-projects">
|
||||
<projects></projects>
|
||||
</div>
|
||||
</div>
|
|
@ -1,25 +0,0 @@
|
|||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { UserWorkspaceComponent } from './user-workspace.component';
|
||||
|
||||
describe('UserWorkspaceComponent', () => {
|
||||
let component: UserWorkspaceComponent;
|
||||
let fixture: ComponentFixture<UserWorkspaceComponent>;
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ UserWorkspaceComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(UserWorkspaceComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should be created', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
|
@ -1,23 +0,0 @@
|
|||
import { Component, OnInit } from '@angular/core';
|
||||
|
||||
import { DmpComponent } from '../dmps/dmp.component';
|
||||
import { ProjectsComponent } from '../projects/projects.component';
|
||||
import { TokenService, TokenProvider } from '../services/login/token.service';
|
||||
import {Router} from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'user-workspace',
|
||||
templateUrl: './user-workspace.component.html',
|
||||
styleUrls: ['./user-workspace.component.css']
|
||||
})
|
||||
export class UserWorkspaceComponent implements OnInit {
|
||||
|
||||
constructor(public tokenService: TokenService, private router : Router) {
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue