aboutsummaryrefslogtreecommitdiff
path: root/frontend/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/src/app')
-rw-r--r--frontend/src/app/Shared.ts7
-rw-r--r--frontend/src/app/_elements/navbar/navbar.component.html16
-rw-r--r--frontend/src/app/_elements/navbar/navbar.component.ts7
-rw-r--r--frontend/src/app/_pages/home/home.component.html76
-rw-r--r--frontend/src/app/_pages/home/home.component.ts3
-rw-r--r--frontend/src/app/_pages/login-page/login-page.component.html6
6 files changed, 70 insertions, 45 deletions
diff --git a/frontend/src/app/Shared.ts b/frontend/src/app/Shared.ts
new file mode 100644
index 00000000..126dc846
--- /dev/null
+++ b/frontend/src/app/Shared.ts
@@ -0,0 +1,7 @@
+class Shared {
+ constructor(
+ public loggedIn: boolean
+ ) { }
+}
+
+export default new Shared(false); \ No newline at end of file
diff --git a/frontend/src/app/_elements/navbar/navbar.component.html b/frontend/src/app/_elements/navbar/navbar.component.html
index 60a80e35..426332bd 100644
--- a/frontend/src/app/_elements/navbar/navbar.component.html
+++ b/frontend/src/app/_elements/navbar/navbar.component.html
@@ -16,7 +16,7 @@
[class]="(currentUrl === '/predict') ? 'text-secondary' : 'text-white'">Predvidi</a></li>
</ul>
- <div class="dropdown text-end">
+ <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">
@@ -33,6 +33,18 @@
<li><a class="dropdown-item" href="#">Odjavi se</a></li>
</ul>
</div>
+ <div *ngIf="!shared.loggedIn" class="dropdown text-end">
+ <button type="button" class="btn btn-primary mx-2" data-bs-toggle="modal"
+ data-bs-target="#modalForLogin">
+ Prijavi se
+ </button>
+ <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#modalForRegister">
+ Registruj se
+ </button>
+ </div>
</div>
</div>
-</header> \ No newline at end of file
+</header>
+
+<app-login-modal></app-login-modal>
+<app-register-modal></app-register-modal> \ No newline at end of file
diff --git a/frontend/src/app/_elements/navbar/navbar.component.ts b/frontend/src/app/_elements/navbar/navbar.component.ts
index 21a0e9ae..154a0d7d 100644
--- a/frontend/src/app/_elements/navbar/navbar.component.ts
+++ b/frontend/src/app/_elements/navbar/navbar.component.ts
@@ -1,5 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common';
+import { AuthService } from '../../_services/auth.service';
+import shared from 'src/app/Shared';
@Component({
selector: 'app-navbar',
@@ -9,12 +11,15 @@ import { Location } from '@angular/common';
export class NavbarComponent implements OnInit {
currentUrl: string;
+ shared = shared;
- constructor(public location: Location) {
+ constructor(public location: Location, private auth: AuthService) {
this.currentUrl = this.location.path();
this.location.onUrlChange(() => {
this.currentUrl = this.location.path();
})
+
+ this.shared.loggedIn = auth.isAuthenticated();
}
ngOnInit(): void {
diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html
index 568e89e3..6713cd59 100644
--- a/frontend/src/app/_pages/home/home.component.html
+++ b/frontend/src/app/_pages/home/home.component.html
@@ -1,46 +1,48 @@
<div>
<div class="d-flex flex-column align-items-center">
- <h2 class="my-4">Započnite sa treniranjem!</h2>
- <div id="cards" class="d-flex flex-row justify-content-center align-items-start">
- <div class="card" style="width: 18rem;">
- <div class="card-body">
- <mat-icon width="48px" height="48px"
- style="font-size: 48px; margin-left: 50%; transform: translateX(-100%);">storage</mat-icon>
- <h3 class="card-title my-2">Moji izvori podataka</h3>
- <p class="card-text">
- <a class="stretched-link" routerLink="my-datasets">Preuredite</a> vaše izvore
- podataka, ili
- dodajte novi.
- </p>
+ <div *ngIf="shared.loggedIn">
+ <h2 class="my-4">Započnite sa treniranjem!</h2>
+ <div id="cards" class="d-flex flex-row justify-content-center align-items-start">
+ <div class="card" style="width: 18rem;">
+ <div class="card-body">
+ <mat-icon width="48px" height="48px"
+ style="font-size: 48px; margin-left: 50%; transform: translateX(-100%);">storage</mat-icon>
+ <h3 class="card-title my-2">Moji izvori podataka</h3>
+ <p class="card-text">
+ <a class="stretched-link" routerLink="my-datasets">Preuredite</a> vaše izvore
+ podataka, ili
+ dodajte novi.
+ </p>
+ </div>
</div>
- </div>
- <div class="card mx-3" style="width: 18rem;">
- <div class="card-body">
- <mat-icon width="48px" height="48px"
- style="font-size: 48px; margin-left: 50%; transform: translateX(-100%);">model_training
- </mat-icon>
- <h3 class="card-title my-2">Moji modeli</h3>
- <p class="card-text">
- <a class="stretched-link" routerLink="my-models">Pregledajte</a> vaše modele, menjajte ih,
- napravite nove modele, ili
- ih obrišite.
- </p>
+ <div class="card mx-3" style="width: 18rem;">
+ <div class="card-body">
+ <mat-icon width="48px" height="48px"
+ style="font-size: 48px; margin-left: 50%; transform: translateX(-100%);">model_training
+ </mat-icon>
+ <h3 class="card-title my-2">Moji modeli</h3>
+ <p class="card-text">
+ <a class="stretched-link" routerLink="my-models">Pregledajte</a> vaše modele, menjajte ih,
+ napravite nove modele, ili
+ ih obrišite.
+ </p>
+ </div>
</div>
- </div>
- <div class="card" style="width: 18rem;">
- <div class="card-body">
- <mat-icon width="48px" height="48px"
- style="font-size: 48px; margin-left: 50%; transform: translateX(-100%);">batch_prediction
- </mat-icon>
- <h3 class="card-title my-2">Rezultati treniranja</h3>
- <p class="card-text">
- <a class="stretched-link" routerLink="my-predictors">Pregledajte</a> sve vaše trenirane modele,
- koristite ih da
- predvidite
- vrednosti za red ili skup podataka, ili ih obrišite.
- </p>
+ <div class="card" style="width: 18rem;">
+ <div class="card-body">
+ <mat-icon width="48px" height="48px"
+ style="font-size: 48px; margin-left: 50%; transform: translateX(-100%);">batch_prediction
+ </mat-icon>
+ <h3 class="card-title my-2">Rezultati treniranja</h3>
+ <p class="card-text">
+ <a class="stretched-link" routerLink="my-predictors">Pregledajte</a> sve vaše trenirane
+ modele,
+ koristite ih da predvidite vrednosti za red ili skup podataka, ili ih obrišite.
+ </p>
+ </div>
</div>
</div>
+
</div>
<h2 class="my-4">Pogledajte javne projekte!</h2>
<app-carousel [items]="publicDatasets">
diff --git a/frontend/src/app/_pages/home/home.component.ts b/frontend/src/app/_pages/home/home.component.ts
index 0c61ef86..eb9adf27 100644
--- a/frontend/src/app/_pages/home/home.component.ts
+++ b/frontend/src/app/_pages/home/home.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import Dataset from 'src/app/_data/Dataset';
import Predictor from 'src/app/_data/Predictor';
import { ItemDatasetComponent } from 'src/app/_elements/item-dataset/item-dataset.component';
+import shared from 'src/app/Shared';
@Component({
selector: 'app-home',
@@ -12,6 +13,8 @@ export class HomeComponent implements OnInit {
publicDatasets: Dataset[];
+ shared = shared;
+
constructor() {
this.publicDatasets = [
new Dataset('Dataset1', 'Lorem ipsum dolor sir amet', ['kolona1', 'kolona2', 'kolona3']),
diff --git a/frontend/src/app/_pages/login-page/login-page.component.html b/frontend/src/app/_pages/login-page/login-page.component.html
index 3a4244fc..766268d9 100644
--- a/frontend/src/app/_pages/login-page/login-page.component.html
+++ b/frontend/src/app/_pages/login-page/login-page.component.html
@@ -6,8 +6,4 @@
<!-- Button trigger modal, OVO JE U STVARI DUGME U NAVBARU -->
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#modalForRegister">
Otvori register modal
-</button>
-
-
-<app-login-modal></app-login-modal>
-<app-register-modal></app-register-modal>
+</button> \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-24 20:34:58 +0000