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

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

1 files changed, 4 insertions, 3 deletions

diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index af8bc237..c592d57b 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -1,17 +1,18 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
+import { AuthGuardService } from './_services/auth-guard.service';
 import { LoginPageComponent } from './_pages/login-page/login-page.component';
 import { OnlyAuthorizedComponent } from './_pages/only-authorized/only-authorized.component';
 import { RegisterPageComponent } from './_pages/register-page/register-page.component';
-import { AuthGuardService } from './_services/auth-guard.service';
-import { DatasetLoadComponent } from './_elements/dataset-load/dataset-load.component';
+import { AddModelComponent } from './_pages/add-model/add-model.component';
 
 const routes: Routes = [
+  { path: '', redirectTo: '/login', pathMatch: 'full' },
   { path: 'login', component: LoginPageComponent },
   { path: 'register', component: RegisterPageComponent },
   { path: 'only-authorized', component: OnlyAuthorizedComponent, canActivate: [AuthGuardService] },
-  { path: 'proba', component: DatasetLoadComponent}
+  { path: 'add-model', component: AddModelComponent }
 ];
 
 @NgModule({