Skip to content

Commit

Permalink
Add navigation link to datatable
Browse files Browse the repository at this point in the history
  • Loading branch information
bilalshaikh42 committed Oct 29, 2019
1 parent 1f4ecd9 commit 896df2a
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 38 deletions.
7 changes: 6 additions & 1 deletion CRBM-Viz/src/app/Models/nav-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const NavItems: NavItem[] = [
{
title: 'Simulations',
icon: 'explore',
children: [],
children: ['Data'],
},
{
title: 'Visualizations',
Expand Down Expand Up @@ -67,4 +67,9 @@ export const NavItems: NavItem[] = [
icon: 'settings',
link: '/settings',
},
{
title: 'Data',
icon: 'assignment',
link: '/data',
},
];
3 changes: 2 additions & 1 deletion CRBM-Viz/src/app/Pages/data/data.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
</div>
<div class="landing" *ngIf="!id">
<p>Please enter the id of a simulation run to view its data</p>
<p>For example, search for "004"</p>
</div>
<div class="table-container">
<div class="table-container" *ngIf="id">
<app-data-table
class="data-table"
[columnDefs]="columnDefs"
Expand Down
72 changes: 36 additions & 36 deletions CRBM-Viz/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
// ng Module
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';

// Angular core components/modules/tools in imports
import { BrowserModule } from "@angular/platform-browser";
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { HttpClientModule, HTTP_INTERCEPTORS } from "@angular/common/http";
import { AgGridModule } from "ag-grid-angular";
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
import { AgGridModule } from 'ag-grid-angular';
// Defined Modules in Imports

// Defined Modules in app
import { AppRoutingModule } from "./Modules/app-routing.module";
import { MaterialModule } from "./Modules/app-material.module";
import { AppRoutingModule } from './Modules/app-routing.module';
import { MaterialModule } from './Modules/app-material.module';

// Defined components
import { AppComponent } from "./app.component";
import { SearchBarComponent } from "./Layout/search-bar/search-bar.component";
import { LogoComponent } from "./Layout/logo/logo.component";
import { AboutComponent } from "./Pages/about/about.component";
import { VisualizeComponent } from "./Pages/visualize/visualize.component";
import { SimulateComponent } from "./Pages/simulate/simulate.component";
import { HomeComponent } from "./Pages/home/home.component";
import { VegaViewerComponent } from "./Components/vega-viewer/vega-viewer.component";
import { FourComponent } from "./Pages/four/four.component";
import { UnderConstructionComponent } from "./Pages/under-construction/under-construction.component";
import { NavigationComponent } from "./Layout/navigation/navigation.component";
import { LayoutModule } from "@angular/cdk/layout";
import { SidebarComponent } from "./Layout/sidebar/sidebar.component";
import { CallbackComponent } from "./Components/callback/callback.component";
import { ProfileComponent } from "./Components/profile/profile.component";
import { AlertComponent } from "./Components/alert/alert.component";
import { PastSimulationComponent } from "./Components/past-simulation/past-simulation.component";
import { NewSimulationComponent } from "./Components/new-simulation/new-simulation.component";
import { UploadComponent } from "./Pages/upload/upload.component";
import { FileTableComponent } from "./Pages/files/file-table/file-table.component";
import { FileEditComponent } from "./Pages/files/file-edit/file-edit.component";
import { AuthInterceptorService } from "./Interceptors/auth-interceptor.service";
import { FooterComponent } from "./Layout/footer/footer.component";
import { DataTableComponent } from "./Components/data-table/data-table.component";
import { DataComponent } from "./Pages/data/data.component";
import { NavIconsComponent } from "./Layout/nav-icons/nav-icons.component";
import { AccountMenuComponent } from "./Layout/account-menu/account-menu.component";
import { AppComponent } from './app.component';
import { SearchBarComponent } from './Layout/search-bar/search-bar.component';
import { LogoComponent } from './Layout/logo/logo.component';
import { AboutComponent } from './Pages/about/about.component';
import { VisualizeComponent } from './Pages/visualize/visualize.component';
import { SimulateComponent } from './Pages/simulate/simulate.component';
import { HomeComponent } from './Pages/home/home.component';
import { VegaViewerComponent } from './Components/vega-viewer/vega-viewer.component';
import { FourComponent } from './Pages/four/four.component';
import { UnderConstructionComponent } from './Pages/under-construction/under-construction.component';
import { NavigationComponent } from './Layout/navigation/navigation.component';
import { LayoutModule } from '@angular/cdk/layout';
import { SidebarComponent } from './Layout/sidebar/sidebar.component';
import { CallbackComponent } from './Components/callback/callback.component';
import { ProfileComponent } from './Components/profile/profile.component';
import { AlertComponent } from './Components/alert/alert.component';
import { PastSimulationComponent } from './Components/past-simulation/past-simulation.component';
import { NewSimulationComponent } from './Components/new-simulation/new-simulation.component';
import { UploadComponent } from './Pages/upload/upload.component';
import { FileTableComponent } from './Pages/files/file-table/file-table.component';
import { FileEditComponent } from './Pages/files/file-edit/file-edit.component';
import { AuthInterceptorService } from './Interceptors/auth-interceptor.service';
import { FooterComponent } from './Layout/footer/footer.component';
import { DataTableComponent } from './Components/data-table/data-table.component';
import { DataComponent } from './Pages/data/data.component';
import { NavIconsComponent } from './Layout/nav-icons/nav-icons.component';
import { AccountMenuComponent } from './Layout/account-menu/account-menu.component';

// Pipes defined in app
import { FilterPipe } from "./Pipes/filter.pipe";
import { FilterPipe } from './Pipes/filter.pipe';

// Services
// import { VisualizationsService } from './Services/visualizations.service';
Expand Down

0 comments on commit 896df2a

Please sign in to comment.