Merge branch 'redesign' into 'master'

merge

See merge request igrannonica/neuronstellar!29

4 files changed, 0 insertions, 83 deletions

diff --git a/frontend/src/app/mixed-chart/mixed-chart.component.css b/frontend/src/app/mixed-chart/mixed-chart.component.css
deleted file mode 100644
index e69de29b..00000000
--- a/frontend/src/app/mixed-chart/mixed-chart.component.css
+++ /dev/null
diff --git a/frontend/src/app/mixed-chart/mixed-chart.component.html b/frontend/src/app/mixed-chart/mixed-chart.component.html
deleted file mode 100644
index 806ea9e8..00000000
--- a/frontend/src/app/mixed-chart/mixed-chart.component.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<canvas #mixedchart width="800" height="450"></canvas>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
diff --git a/frontend/src/app/mixed-chart/mixed-chart.component.spec.ts b/frontend/src/app/mixed-chart/mixed-chart.component.spec.ts
deleted file mode 100644
index 361cd047..00000000
--- a/frontend/src/app/mixed-chart/mixed-chart.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MixedChartComponent } from './mixed-chart.component';
-
-describe('MixedChartComponent', () => {
-  let component: MixedChartComponent;
-  let fixture: ComponentFixture<MixedChartComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ MixedChartComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MixedChartComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/frontend/src/app/mixed-chart/mixed-chart.component.ts b/frontend/src/app/mixed-chart/mixed-chart.component.ts
deleted file mode 100644
index 2524ee36..00000000
--- a/frontend/src/app/mixed-chart/mixed-chart.component.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
-import {Chart} from 'node_modules/chart.js';
-
-@Component({
-  selector: 'app-mixed-chart',
-  templateUrl: './mixed-chart.component.html',
-  styleUrls: ['./mixed-chart.component.css']
-})
-export class MixedChartComponent implements AfterViewInit {
-
-  @ViewChild('mixedchart') chartRef!: ElementRef;
-  constructor() { }
-
-  ngAfterViewInit(): void {
-    const myChart = new Chart(this.chartRef.nativeElement, {
-      type: 'bar',
-      data: {
-        labels: ["1900", "1950", "1999", "2050"],
-        datasets: [{
-            label: "Europe",
-            type: "line",
-            borderColor: "#8e5ea2",
-            data: [408,547,675,734],
-            fill: false
-          }, {
-            label: "Africa",
-            type: "line",
-            borderColor: "#3e95cd",
-            data: [133,221,783,2478],
-            fill: false
-          }, {
-            label: "Europe",
-            type: "bar",
-            backgroundColor: "rgba(0,0,0,0.2)",
-            data: [408,547,675,734],
-          }, {
-            label: "Africa",
-            type: "bar",
-            backgroundColor: "rgba(0,0,0,0.2)",
-            //backgroundColorHover: "#3e95cd",
-            data: [133,221,783,2478]
-          }
-        ]
-      },
-      /*options: {
-        title: {
-          display: true,
-          text: 'Population growth (millions): Europe & Africa'
-        },
-        legend: { display: false }
-      }*/
-
-    });
-  }
-
-}