Skip to content
Snippets Groups Projects
Commit 0f177293 authored by Chris Hines's avatar Chris Hines
Browse files

restore the launcher component so that we can update the UI

parent 6b2b8eec
No related branches found
No related tags found
2 merge requests!21New css dev,!9Dev
Pipeline #7393 failed
......@@ -6,13 +6,17 @@ import { TransferComponent } from './transfer/transfer.component';
import { ShareconnectComponent } from './shareconnect/shareconnect.component';
import { JoblistComponent } from './joblist/joblist.component';
import {LoginComponent} from './login/login.component';
// import { TokenextractorComponent } from './tokenextractor/tokenextractor.component';
const routes: Routes = [
{ path: '', redirectTo: 'launch', pathMatch: 'full'},
{ path: 'launch', component: JoblistComponent},
//{ path: 'launch', component: JoblistComponent},
{ path: 'launch', component: LauncherComponent},
{ path: 'login', component: LoginComponent},
// { path: 'finishlaunch', component: LauncherComponent},
//{ path: 'cancellaunch', component: LauncherComponent},
{ path: 'sshauthz_callback', component: KeygenComponent},
......
......@@ -6,5 +6,5 @@
<router-outlet></router-outlet>
</div> -->
<app-launcher></app-launcher>
<!--<router-outlet></router-outlet>-->
<!--<app-launcher></app-launcher>-->
<router-outlet></router-outlet>
......@@ -48,6 +48,7 @@ import { ShareconnectComponent } from './shareconnect/shareconnect.component';
import { LaunchDialogComponent } from './launch-dialog/launch-dialog.component';
import { ModaldialogComponent } from './modaldialog/modaldialog.component'
import {OverlayModule} from '@angular/cdk/overlay';
import { LoginComponent } from './login/login.component';
// import { FileExplorerModule } from './file-explorer/file-explorer.module';
......@@ -71,6 +72,7 @@ import {OverlayModule} from '@angular/cdk/overlay';
ShareconnectComponent,
LaunchDialogComponent,
ModaldialogComponent,
LoginComponent,
],
imports: [
BrowserModule,
......
......@@ -75,8 +75,8 @@
</mat-accordion>
</mat-sidenav>
<!--<app-joblist [identity]="(identitySubject | async)"></app-joblist>-->
<router-outlet></router-outlet>
<app-joblist [identity]="(identitySubject | async)"></app-joblist>
<!--<router-outlet></router-outlet>-->
<div fxFlex></div>
</mat-sidenav-container>
......
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