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/TestAppOgnjen/FrontEnd/src/app/app.module.ts b/sandbox/TestAppOgnjen/FrontEnd/src/app/app.module.ts
new file mode 100644
index 00000000..80bf0308
--- /dev/null
+++ b/sandbox/TestAppOgnjen/FrontEnd/src/app/app.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+
+import { AppRoutingModule } from './app-routing.module';
+import { AppComponent } from './app.component';
+import { ListaComponent } from './lista/lista.component';
+import { SharedService } from './shared.service';
+
+
+import {HttpClientModule} from '@angular/common/http';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+
+@NgModule({
+  declarations: [
+    AppComponent,
+    ListaComponent
+  ],
+  imports: [
+    BrowserModule,
+    AppRoutingModule,
+    HttpClientModule,
+    FormsModule,
+    ReactiveFormsModule
+  ],
+  providers: [SharedService],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }