Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign

# Conflicts:
#	frontend/src/app/app-routing.module.ts
#	frontend/src/app/app.module.ts

1 files changed, 5 insertions, 1 deletions

diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 70e78394..c46381d5 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -45,6 +45,8 @@ import { FormDatasetComponent } from './_elements/form-dataset/form-dataset.comp
 import { FormModelComponent } from './_elements/form-model/form-model.component';
 import { ColumnTableComponent } from './_elements/column-table/column-table.component';
 import { FolderComponent } from './_elements/folder/folder.component';
+import { TestComponent } from './_pages/test/test.component';
+import { DoughnutChartComponent } from './_elements/_charts/doughnut-chart/doughnut-chart.component';
 
 export function initializeApp(appConfig: Configuration) {
   return () => appConfig.load();
@@ -78,7 +80,9 @@ export function initializeApp(appConfig: Configuration) {
     BoxPlotComponent,
     FolderComponent,
     EncodingDialogComponent,
-    MissingvaluesDialogComponent
+    MissingvaluesDialogComponent,
+    TestComponent,
+    DoughnutChartComponent,
   ],
   imports: [
     BrowserModule,