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

# Conflicts:
#	.gitignore

4 files changed, 73 insertions, 0 deletions

diff --git a/sandbox/TestIvanLjubisavljevic/frontend/src/app/navbar/navbar.component.css b/sandbox/TestIvanLjubisavljevic/frontend/src/app/navbar/navbar.component.css
new file mode 100755
index 00000000..48a0e297
--- /dev/null
+++ b/sandbox/TestIvanLjubisavljevic/frontend/src/app/navbar/navbar.component.css
@@ -0,0 +1,17 @@
+button{
+    margin:5px;
+    padding:5px;
+    width: 150px;
+    color:  rgb(19, 0, 128);
+    font-weight: bold;
+}
+
+button:hover{
+    background-color: rgb(170, 165, 190);
+    color:black;
+}
+
+div{
+    margin: auto;
+    width: 26%;
+}
\ No newline at end of file
diff --git a/sandbox/TestIvanLjubisavljevic/frontend/src/app/navbar/navbar.component.html b/sandbox/TestIvanLjubisavljevic/frontend/src/app/navbar/navbar.component.html
new file mode 100755
index 00000000..928fc01e
--- /dev/null
+++ b/sandbox/TestIvanLjubisavljevic/frontend/src/app/navbar/navbar.component.html
@@ -0,0 +1,4 @@
+<div>
+    <button (click)="pocetna()">POČETNA</button>
+    <button (click)="dodaj()">DODAJ NOVI</button>
+</div>
\ No newline at end of file
diff --git a/sandbox/TestIvanLjubisavljevic/frontend/src/app/navbar/navbar.component.spec.ts b/sandbox/TestIvanLjubisavljevic/frontend/src/app/navbar/navbar.component.spec.ts
new file mode 100755
index 00000000..f8ccd6f4
--- /dev/null
+++ b/sandbox/TestIvanLjubisavljevic/frontend/src/app/navbar/navbar.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NavbarComponent } from './navbar.component';
+
+describe('NavbarComponent', () => {
+  let component: NavbarComponent;
+  let fixture: ComponentFixture<NavbarComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ NavbarComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NavbarComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/sandbox/TestIvanLjubisavljevic/frontend/src/app/navbar/navbar.component.ts b/sandbox/TestIvanLjubisavljevic/frontend/src/app/navbar/navbar.component.ts
new file mode 100755
index 00000000..2cdf7ae3
--- /dev/null
+++ b/sandbox/TestIvanLjubisavljevic/frontend/src/app/navbar/navbar.component.ts
@@ -0,0 +1,27 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { CookieService } from 'ngx-cookie-service';
+
+@Component({
+  selector: 'app-navbar',
+  templateUrl: './navbar.component.html',
+  styleUrls: ['./navbar.component.css']
+})
+export class NavbarComponent implements OnInit {
+
+  constructor(private router:Router, private cookie:CookieService) { }
+
+  ngOnInit(): void {
+  }
+
+  pocetna()
+  {
+    this.router.navigate(["/homepage"])
+  }
+
+  dodaj()
+  {
+    this.router.navigate(["/newLaptop"])
+  }
+
+}