Resolved the comments on the PR

elimuinformatics · Jun 20, 2024 · 781f007 · 781f007
1 parent 78db534
commit 781f007
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 80 deletions.
diff --git a/apps/documentation/src/app/app.module.ts b/apps/documentation/src/app/app.module.ts
@@ -15,7 +15,6 @@ import { RouterModule } from '@angular/router';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import {
   FhirChartLegendModule,
@@ -35,7 +34,6 @@ import { HttpClientModule } from '@angular/common/http';
   declarations: [AppComponent],
   imports: [
     BrowserModule,
-    AppRoutingModule,
     BrowserAnimationsModule,
     NgDocRootComponent,
     NgDocNavbarComponent,

diff --git a/.../documentation/src/app/pages/components/chart-layout/demo/chart-layout-demo.component.css b/.../documentation/src/app/pages/components/chart-layout/demo/chart-layout-demo.component.css
@@ -1,9 +1,11 @@
+/* NgDocStyleSnippetStart(CSS) */
 .example-main-content {
   height: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
 }
+/* NgDocStyleSnippetEnd(CSS) */
 
 .full-page-demo {
   position: fixed;

diff --git a/...documentation/src/app/pages/components/chart-layout/demo/chart-layout-demo.component.html b/...documentation/src/app/pages/components/chart-layout/demo/chart-layout-demo.component.html
@@ -1,7 +1,7 @@
-<!-- NgDocHTMLSnippetStart(HTML) -->
 <div class="full-page-demo">
+  <!-- NgDocHTMLSnippetStart(HTML) -->
   <fhir-chart-layout [toolbar]="['loading', 'patients', 'browser', 'options']">
     <div class="example-main-content">Main content</div>
   </fhir-chart-layout>
+  <!-- NgDocHTMLSnippetEnd(HTML) -->
 </div>
-<!-- NgDocHTMLSnippetEnd(HTML) -->
diff --git a/apps/documentation/src/app/pages/components/chart-layout/demo/chart-layout-demo.component.ts b/apps/documentation/src/app/pages/components/chart-layout/demo/chart-layout-demo.component.ts
@@ -6,15 +6,13 @@ import {
   DataLayerManagerService,
   FhirChartLayoutModule,
 } from '@elimuinformatics/ngx-charts-on-fhir';
-import { AppRoutingModule } from 'apps/documentation/src/app/app-routing.module';
 
 @Component({
   selector: 'example-chart-layout-demo',
   templateUrl: './chart-layout-demo.component.html',
   styleUrls: ['./chart-layout-demo.component.css'],
   standalone: true,
-  imports: [CommonModule, FhirChartLayoutModule, AppRoutingModule, MatIconModule, MatButtonModule],
-  providers: [DataLayerManagerService],
+  imports: [CommonModule, FhirChartLayoutModule, MatIconModule, MatButtonModule],
 })
 export class ChartLayoutDemoComponent implements OnInit {
   constructor(private layerManager: DataLayerManagerService) {}

diff --git a/...ntation/src/app/pages/components/chart-legend/demos/legend/chart-legend-demo.component.ts b/...ntation/src/app/pages/components/chart-legend/demos/legend/chart-legend-demo.component.ts
@@ -11,7 +11,7 @@ import {
   templateUrl: './chart-legend-demo.component.html',
   standalone: true,
   imports: [CommonModule, FhirChartLegendModule],
-  providers: [DataLayerManagerService, FhirChartTagsService],
+  providers: [FhirChartTagsService],
 })
 export class ChartLegendDemoComponent implements OnInit {
   constructor(private layerManager: DataLayerManagerService) {}

diff --git a/...c/app/pages/components/chart-legend/demos/tags-legend/chart-tags-legend-demo.component.ts b/...c/app/pages/components/chart-legend/demos/tags-legend/chart-tags-legend-demo.component.ts
@@ -11,7 +11,7 @@ import {
   templateUrl: './chart-tags-legend-demo.component.html',
   standalone: true,
   imports: [CommonModule, FhirChartLegendModule],
-  providers: [DataLayerManagerService, FhirChartTagsService],
+  providers: [FhirChartTagsService],
 })
 export class ChartTagsLegendDemoComponent implements OnInit {
   constructor(private layerManager: DataLayerManagerService) {}

diff --git a/...documentation/src/app/pages/components/chart-summary/demo/chart-summary-demo.component.ts b/...documentation/src/app/pages/components/chart-summary/demo/chart-summary-demo.component.ts
@@ -2,7 +2,6 @@ import { CommonModule } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import {
   DataLayerManagerService,
-  FhirChartConfigurationService,
   FhirChartModule,
   FhirChartSummaryModule,
 } from '@elimuinformatics/ngx-charts-on-fhir';
@@ -13,7 +12,6 @@ import {
   styleUrls: ['./chart-summary-demo.css'],
   standalone: true,
   imports: [CommonModule, FhirChartModule, FhirChartSummaryModule],
-  providers: [DataLayerManagerService, FhirChartConfigurationService],
 })
 export class ChartSummaryDemoComponent implements OnInit {
   constructor(private layerManager: DataLayerManagerService) {}

diff --git a/apps/documentation/src/app/pages/components/chart/demos/chart/chart-demo.component.ts b/apps/documentation/src/app/pages/components/chart/demos/chart/chart-demo.component.ts
@@ -2,7 +2,6 @@ import { CommonModule } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import {
   DataLayerManagerService,
-  FhirChartConfigurationService,
   FhirChartLegendModule,
   FhirChartModule,
 } from '@elimuinformatics/ngx-charts-on-fhir';
@@ -12,7 +11,6 @@ import {
   templateUrl: './chart-demo.component.html',
   standalone: true,
   imports: [CommonModule, FhirChartModule, FhirChartLegendModule],
-  providers: [DataLayerManagerService, FhirChartConfigurationService],
 })
 export class ChartDemoComponent implements OnInit {
   constructor(private layerManager: DataLayerManagerService) {}

diff --git a/.../src/app/pages/components/chart/demos/floating-content/floating-content-demo.component.ts b/.../src/app/pages/components/chart/demos/floating-content/floating-content-demo.component.ts
@@ -2,7 +2,6 @@ import { CommonModule } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import {
   DataLayerManagerService,
-  FhirChartConfigurationService,
   FhirChartLegendModule,
   FhirChartModule,
 } from '@elimuinformatics/ngx-charts-on-fhir';
@@ -12,7 +11,6 @@ import {
   templateUrl: './floating-content-demo.component.html',
   standalone: true,
   imports: [CommonModule, FhirChartModule, FhirChartLegendModule],
-  providers: [DataLayerManagerService, FhirChartConfigurationService],
 })
 export class FloatingContentDemoComponent implements OnInit {
   constructor(private layerManager: DataLayerManagerService) {}

diff --git a/...ion/src/app/pages/components/data-layer-browser/demo/data-layer-browser-demo.component.ts b/...ion/src/app/pages/components/data-layer-browser/demo/data-layer-browser-demo.component.ts
@@ -10,7 +10,6 @@ import {
   templateUrl: './data-layer-browser-demo.component.html',
   standalone: true,
   imports: [CommonModule, DataLayerBrowserModule],
-  providers: [DataLayerManagerService],
 })
 export class DataLayerBrowserDemoComponent implements OnInit {
   constructor(private layerManager: DataLayerManagerService) {}

diff --git a/...mentation/src/app/pages/components/data-layer-list/demo/data-layer-list-demo.component.ts b/...mentation/src/app/pages/components/data-layer-list/demo/data-layer-list-demo.component.ts
@@ -7,7 +7,6 @@ import { DataLayerListModule, DataLayerManagerService } from '@elimuinformatics/
   templateUrl: './data-layer-list-demo.component.html',
   standalone: true,
   imports: [CommonModule, DataLayerListModule],
-  providers: [DataLayerManagerService],
 })
 export class DataLayerListDemoComponent implements OnInit {
   constructor(private layerManager: DataLayerManagerService) {}

diff --git a/...n/src/app/pages/components/data-layer-selector/demo/data-layer-selector-demo.component.ts b/...n/src/app/pages/components/data-layer-selector/demo/data-layer-selector-demo.component.ts
@@ -4,7 +4,6 @@ import {
   DataLayerManagerService,
   DataLayerSelectorModule,
   DataLayerViews,
-  FhirChartConfigurationService,
   FhirChartModule,
 } from '@elimuinformatics/ngx-charts-on-fhir';
 
@@ -13,7 +12,6 @@ import {
   templateUrl: './data-layer-selector-demo.component.html',
   standalone: true,
   imports: [CommonModule, DataLayerSelectorModule, FhirChartModule],
-  providers: [DataLayerManagerService, FhirChartConfigurationService],
 })
 export class DataLayerSelectorDemoComponent implements OnInit {
   views: DataLayerViews = {

diff --git a/...mentation/src/app/pages/components/patient-browser/demo/patient-browser-demo.component.ts b/...mentation/src/app/pages/components/patient-browser/demo/patient-browser-demo.component.ts
@@ -10,7 +10,6 @@ import {
   templateUrl: './patient-browser-demo.component.html',
   standalone: true,
   imports: [CommonModule, PatientBrowserModule],
-  providers: [DataLayerManagerService],
 })
 export class PatientBrowserDemoComponent implements OnInit {
   constructor(private layerManager: DataLayerManagerService) {}

diff --git a/...app/pages/components/summary-range-selector/demo/summary-range-selector-demo.component.ts b/...app/pages/components/summary-range-selector/demo/summary-range-selector-demo.component.ts
@@ -2,7 +2,6 @@ import { CommonModule } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import {
   DataLayerManagerService,
-  FhirChartConfigurationService,
   FhirChartModule,
   FhirChartSummaryModule,
   SummaryRangeSelectorModule,
@@ -14,7 +13,6 @@ import {
   standalone: true,
   styleUrls: ['./summary-range-selector-demo.css'],
   imports: [CommonModule, FhirChartModule, FhirChartSummaryModule, SummaryRangeSelectorModule],
-  providers: [DataLayerManagerService, FhirChartConfigurationService],
 })
 export class SummaryRangeSelectorDemoComponent implements OnInit {
   constructor(private layerManager: DataLayerManagerService) {}

diff --git a/...p/pages/components/timeline-range-selector/demo/timeline-range-selector-demo.component.ts b/...p/pages/components/timeline-range-selector/demo/timeline-range-selector-demo.component.ts
@@ -2,7 +2,6 @@ import { CommonModule } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import {
   DataLayerManagerService,
-  FhirChartConfigurationService,
   FhirChartModule,
   TimelineRangeSelectorModule,
 } from '@elimuinformatics/ngx-charts-on-fhir';
@@ -12,7 +11,6 @@ import {
   templateUrl: './timeline-range-selector-demo.component.html',
   standalone: true,
   imports: [CommonModule, FhirChartModule, TimelineRangeSelectorModule],
-  providers: [DataLayerManagerService, FhirChartConfigurationService],
 })
 export class TimelineRangeSelectorDemoComponent implements OnInit {
   constructor(private layerManager: DataLayerManagerService) {}

diff --git a/apps/documentation/src/styles.scss b/apps/documentation/src/styles.scss
@@ -1,57 +1,2 @@
-/* You can add global styles to this file, and also import other style files */
-@use "@angular/material" as mat;
-@use "./libs/ngx-charts-on-fhir/src/lib/data-layer-toolbar/_data-layer-toolbar-theme.scss" as toolbar;
-@use "./libs/ngx-charts-on-fhir/src/lib/fhir-chart-layout/_fhir-chart-layout-theme.scss" as layout;
-
-:root {
-  --ng-doc-app-max-width: auto;
-}
-
 $material-icons-font-path: "material-icons/iconfont/";
-@import "material-icons";
-@import "@fontsource/roboto/300.css";
-@import "@fontsource/roboto/400.css";
-@import "@fontsource/roboto/500.css";
-
-@include mat.core();
-
-// Define a theme.
-$primary: mat.define-palette(mat.$indigo-palette);
-$accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
-
-$theme: mat.define-light-theme(
-  (
-    color: (
-      primary: $primary,
-      accent: $accent,
-    ),
-    typography: mat.define-typography-config(),
-    density: -1,
-  )
-);
-@include mat.typography-hierarchy($theme);
-
-// Apply theme to all @angular/material components
-@include mat.all-component-themes($theme);
-
-// Apply theme to ngx-charts-on-fhir components
-@include toolbar.theme($theme);
-@include layout.theme($theme);
-
-// Adjust density for some components
-@include mat.table-density("minimum");
-@include mat.button-toggle-density(0);
-
-html,
-body {
-  height: 100%;
-}
-
-body {
-  margin: 0;
-  font-family: Roboto, "Helvetica Neue", sans-serif;
-}
-
-* {
-  box-sizing: border-box;
-}
+@import "libs/ngx-charts-on-fhir/src/default.scss";