Commit 1865118b authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'portal-update' into 'develop' 

Merge branch 'portal-update' into remotes/origin/develop

See merge request !27
parents 478d1bca c627c76d

angular.json

+1 −3
Original line number Diff line number Diff line
@@ -161,7 +161,5 @@ 
      }

    }

  },

  "cli": {

    "analytics": false

  }

  "defaultProject": "org.etsi.osl.tmf.web"

}
 
 No newline at end of file

package-lock.json

+421 −11093

File changed.

Preview size limit exceeded, changes collapsed.

package.json

+6 −0
Original line number Diff line number Diff line
@@ -33,13 +33,17 @@ 
    "@fullcalendar/resource-timeline": "~6.1.15",

    "@fullcalendar/timegrid": "~6.1.15",

    "@iplab/ngx-file-upload": "~14.0.2",

    "@vimeo/player": "^2.29.0",

    "ang-jsoneditor": "~3.0.2",

    "angular-oauth2-oidc": "~14.0.1",

    "blockly": "git://github.com/google/blockly.git#6.20210701.0",

    "bootstrap": "~4.6.0",

    "chartjs-plugin-datalabels": "~2.2.0",

    "jsoneditor": "~9.10.0",

    "jwt-decode": "~2.2.0",

    "marked": "^15.0.8",

    "moment": "^2.30.1",

    "ng2-charts": "~3.1.2",

    "ngx-bootstrap": "~9.0.0",

    "ngx-markdown": "~14.0.1",

    "ngx-progressbar": "~9.0.0",
@@ -56,6 +60,7 @@ 
    "@types/jasmine": "~3.3.8",

    "@types/jasminewd2": "~2.0.3",

    "@types/node": "~12.11.1",

    "@types/vimeo__player": "^2.18.3",

    "codelyzer": "~6.0.2",

    "jasmine-core": "~3.5.0",

    "jasmine-spec-reporter": "~5.0.0",
@@ -64,6 +69,7 @@ 
    "karma-coverage-istanbul-reporter": "~3.0.2",

    "karma-jasmine": "~4.0.0",

    "karma-jasmine-html-reporter": "~1.5.0",

    "ng-openapi-gen": "~0.53.0",

    "ng-swagger-gen": "^2.2.0",

    "protractor": "~7.0.0",

    "ts-node": "~7.0.0",

src/app/app-routing.module.ts

+4 −2
Original line number Diff line number Diff line 
import { NgModule } from '@angular/core';

import { Routes, RouterModule } from '@angular/router';



import { LandingComponent } from './landing/landing.component';

import { MetricsComponent } from './landing/metrics/metrics.component';

import { PortalsComponent } from './landing/portals/portals.component';

import { PageNotFoundComponent } from './shared/components/page-not-found/page-not-found.component';

import { RedirectComponent } from './shared/components/redirect/redirect.component';



import { LandingComponent } from './landing/landing.component';



const routes: Routes = [
@@ -13,6 +13,8 @@ const routes: Routes = [ 


  { path: 'redirect', component: RedirectComponent},



  { path: 'metrics', component: MetricsComponent},



  { path: 'services', component: PortalsComponent},

  { path: 'services', loadChildren: () => import('./app-services.module').then(m => m.AppServicesModule)},

src/app/app.module.ts

+15 −4
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import { AppComponent } from './app.component'; 
import { NavbarComponent } from './shared/navbar/navbar.component';

import { FooterComponent } from './shared/components/footer/footer.component';

import { ContactComponent } from './shared/components/contact/contact.component';

import { MetricsComponent } from './landing/metrics/metrics.component';

import { LandingComponent } from './landing/landing.component';

import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';

import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@@ -82,7 +83,11 @@ import { jsonParsePipe } from './shared/pipes/jsonParsePipe'; 
import { SharedModule } from './shared.module';

import { RedirectComponent } from './shared/components/redirect/redirect.component';





import { NgChartsModule } from 'ng2-charts';

import { DoughnutchartComponent } from './landing/metrics/doughnutchart/doughnutchart.component';

import { StatusCardComponent } from './landing/metrics/statuscard/statuscard.component';

import { PortalCardComponent } from './landing/portalcard/portalcard.component';

import { SkeletonComponent } from './landing/metrics/skeleton.component';



registerLocaleData(enGB);

export function initializeApp(bootstrap: BootstrapService) {
@@ -99,11 +104,16 @@ export function initializeAppTheme(bootstrap: BootstrapService) { 
        NavbarComponent,

        FooterComponent,

        ContactComponent,

        MetricsComponent,

    LandingComponent,

        PortalsComponent,

        CloneGstTemplateComponent,

        PageNotFoundComponent,

        RedirectComponent

        RedirectComponent,

    DoughnutchartComponent,

    StatusCardComponent,

    PortalCardComponent,

    SkeletonComponent,

    ],

    imports: [

        BrowserModule,
@@ -120,7 +130,8 @@ export function initializeAppTheme(bootstrap: BootstrapService) { 
        MatDialogModule,

        MatCheckboxModule,

        OAuthModule.forRoot(),

        ToastrModule.forRoot({ progressBar: true, preventDuplicates: true })

        ToastrModule.forRoot({ progressBar: true, preventDuplicates: true }),

    NgChartsModule

    ],

    providers: [

        AppService,