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

# Conflicts:
#	.gitignore

1 files changed, 28 insertions, 0 deletions

diff --git a/sandbox/testAppSonja/frontend/front/src/app/app.module.ts b/sandbox/testAppSonja/frontend/front/src/app/app.module.ts
new file mode 100644
index 00000000..3ee24751
--- /dev/null
+++ b/sandbox/testAppSonja/frontend/front/src/app/app.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { HttpClientModule } from '@angular/common/http';
+import { FormsModule } from '@angular/forms';
+
+import { AppRoutingModule } from './app-routing.module';
+import { AppComponent } from './app.component';
+import { MainPageComponent } from './main-page/main-page.component';
+import { EditPageComponent } from './edit-page/edit-page.component';
+import { AddPageComponent } from './add-page/add-page.component';
+
+@NgModule({
+  declarations: [
+    AppComponent,
+    MainPageComponent,
+    EditPageComponent,
+    AddPageComponent,
+  ],
+  imports: [
+    BrowserModule,
+    HttpClientModule,
+    AppRoutingModule,
+    FormsModule,
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }