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

# Conflicts:
#	frontend/src/app/_pages/add-model/add-model.component.html

1 files changed, 49 insertions, 0 deletions

diff --git a/frontend/src/app/_elements/navbar/navbar.component.html b/frontend/src/app/_elements/navbar/navbar.component.html
new file mode 100644
index 00000000..b9c450af
--- /dev/null
+++ b/frontend/src/app/_elements/navbar/navbar.component.html
@@ -0,0 +1,49 @@
+<header class="sticky-top p-3 bg-dark text-white">
+    <div class="container">
+        <div class="d-flex flex-wrap align-items-center justify-content-center justify-content-lg-start">
+            <a routerLink="" class="d-flex align-items-center mb-2 mb-lg-0 text-white text-decoration-none">
+                <img src="../../../assets/svg/logo_no_text.svg" class="bi me-2" width="64" height="40">
+            </a>
+
+            <ul class="nav col-12 col-lg-auto me-lg-auto mb-2 justify-content-center mb-md-0">
+                <li><a routerLink="" class="nav-link px-2"
+                        [class]="(currentUrl === '') ? 'text-secondary' : 'text-white'">Početna</a></li>
+                <li><a routerLink="add-model" class="nav-link px-2"
+                        [class]="(currentUrl === '/add-model') ? 'text-secondary' : 'text-white'">Dodaj model</a></li>
+                <li><a routerLink="my-predictors" class="nav-link px-2"
+                        [class]="(currentUrl === '/my-predictors') ? 'text-secondary' : 'text-white'">Predvidi</a></li>
+            </ul>
+
+            <div *ngIf="shared.loggedIn" class="dropdown text-end">
+                <a href="#" class="d-block link-light text-decoration-none dropdown-toggle" id="dropdownUser1"
+                    data-bs-toggle="dropdown" aria-expanded="false">
+                    <img src="https://github.com/mdo.png" alt="mdo" width="32" height="32" class="rounded-circle">
+                </a>
+                <ul class="dropdown-menu text-small" aria-labelledby="dropdownUser1"
+                    style="position: absolute; inset: 0px 0px auto auto; margin: 0px; transform: translate(0px, 34px);"
+                    data-popper-placement="bottom-end">
+                    <li><a class="dropdown-item" routerLink="add-model">Nov model...</a></li>
+                    <li><a class="dropdown-item" routerLink="settings">Podešavanja</a></li>
+                    <li><a class="dropdown-item" routerLink="profile">Moj profil</a></li>
+                    <li>
+                        <hr class="dropdown-divider">
+                    </li>
+                    <li><a class="dropdown-item" routerLink="" (click)="logOut()">Odjavi se</a></li>
+                </ul>
+            </div>
+            <div *ngIf="!shared.loggedIn" class="dropdown text-end">
+                <button type="button" mat-raised-button color="primary" class="mx-2" data-bs-toggle="modal"
+                    data-bs-target="#modalForLogin">
+                    Prijavi se
+                </button>
+                <button type="button" mat-raised-button color="primary" data-bs-toggle="modal"
+                    data-bs-target="#modalForRegister">
+                    Registruj se
+                </button>
+            </div>
+        </div>
+    </div>
+</header>
+
+<app-login-modal></app-login-modal>
+<app-register-modal></app-register-modal>
\ No newline at end of file