Skip to content

Commit

Permalink
Fixed #115: Snapshots overview
Browse files Browse the repository at this point in the history
  • Loading branch information
Domingo Rivera committed Dec 12, 2018
1 parent ed97cc9 commit ff14513
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 10 deletions.
2 changes: 0 additions & 2 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ import { ExtraOptions, RouterModule, Routes } from '@angular/router';
import { NgModule } from '@angular/core';

import { InstanceComponent } from './pages/instance/instance.component';
import { OverviewComponent } from './pages/overview/overview.component';

const routes: Routes = [
{ path: 'pages', loadChildren: 'app/pages/pages.module#PagesModule' },
{ path: 'pages/instance/:id', component: InstanceComponent},
{ path: 'pages/overview', component: OverviewComponent},
{ path: '', redirectTo: 'pages', pathMatch: 'full' },
{ path: '**', redirectTo: 'pages' },
];
Expand Down
2 changes: 0 additions & 2 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { ThemeModule } from './@theme/theme.module';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';

import { InstanceModule } from './pages/instance/instance.module';
import { OverviewModule } from './pages/overview/overview.module';

@NgModule({
declarations: [
Expand All @@ -30,7 +29,6 @@ import { OverviewModule } from './pages/overview/overview.module';
HttpModule,
AppRoutingModule,
InstanceModule,
OverviewModule,

NgbModule.forRoot(),
ThemeModule.forRoot(),
Expand Down
7 changes: 3 additions & 4 deletions src/app/pages/overview/overview.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<h2>Platform Status Overview</h2>
<cern-overview>
<iframe align="left" id="test1" src="https://dbod-mon.web.cern.ch/d-solo/ganH0E6zz/h?orgId=1&panelId=12&from=1527237048529&to=1527237948530" width="500" height="600" frameborder="0"></iframe>
</cern-overview>
<div>
<iframe align="left" src="https://dbod-mon.web.cern.ch/d/04EniZ2ik/snapshots?refresh=30s&orgId=1" width="500" height="600" frameborder="0"></iframe>
</div>
24 changes: 24 additions & 0 deletions src/app/pages/overview/overview.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@media (min-width: 1881px){
div,iframe{
width: 100%;
height: 1000px;
}
}
@media (min-width: 1441px) and (max-width: 1880px){
div,iframe{
width: 100%;
height: 840px;
}
}
@media (min-width: 1025px) and (max-width: 1440px){
div,iframe{
width: 100%;
height: 650px;
}
}
@media (min-width: 769px) and (max-width: 1024px){
div,iframe{
width: 100%;
height: 500px;
}
}
2 changes: 1 addition & 1 deletion src/app/pages/overview/overview.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';

@Component({
selector: 'cern-overview',
selector: 'overview',
templateUrl: './overview.component.html',
styleUrls: ['./overview.component.scss']
})
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/pages.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class PagesComponent {
home: true,
},
{
title: 'Overview',
title: 'Backup and Recovery monitoring',
icon: 'nb-grid-a',
link: '/pages/overview',
home: false,
Expand Down

0 comments on commit ff14513

Please sign in to comment.