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

# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json

1 files changed, 15 insertions, 3 deletions

diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index b1c6c96a..9ccd7ddb 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -1,16 +1,28 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-
+import { FormsModule } from '@angular/forms';
 import { AppRoutingModule } from './app-routing.module';
+import { HttpClientModule } from '@angular/common/http';
+
 import { AppComponent } from './app.component';
+import { LoginPageComponent } from './_pages/login-page/login-page.component';
+import { RegisterPageComponent } from './_pages/register-page/register-page.component';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { OnlyAuthorizedComponent } from './_pages/only-authorized/only-authorized.component';
 
 @NgModule({
   declarations: [
-    AppComponent
+    AppComponent,
+    LoginPageComponent,
+    RegisterPageComponent,
+    OnlyAuthorizedComponent
   ],
   imports: [
     BrowserModule,
-    AppRoutingModule
+    AppRoutingModule,
+    FormsModule,
+    HttpClientModule,
+    NgbModule
   ],
   providers: [],
   bootstrap: [AppComponent]