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

# Conflicts:
#	.gitignore

1 files changed, 15 insertions, 0 deletions

diff --git a/sandbox/test-projekat-danijel/frontend/src/app/app-routing.module.ts b/sandbox/test-projekat-danijel/frontend/src/app/app-routing.module.ts
new file mode 100644
index 00000000..0c8301af
--- /dev/null
+++ b/sandbox/test-projekat-danijel/frontend/src/app/app-routing.module.ts
@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { PageOneComponent } from './page-one/page-one.component';
+import { PageTwoComponent } from './page-two/page-two.component';
+
+const routes: Routes = [
+  { path: '', component: PageOneComponent },
+  { path: 'boje', component: PageTwoComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes)],
+  exports: [RouterModule]
+})
+export class AppRoutingModule { }