From 32d776709f2b5df14dbcfd3f610306a899959851 Mon Sep 17 00:00:00 2001 From: Danijel Anđelković Date: Tue, 19 Apr 2022 21:44:08 +0200 Subject: Dodao event kada se korisnik uloguje tako da komponente koje treba da osveze vrednost mogu da osveze svoje vrednosti tako sto se prijave na taj event. --- .../src/app/_elements/navbar/navbar.component.html | 34 +++++++++------------- 1 file changed, 13 insertions(+), 21 deletions(-) (limited to 'frontend/src/app/_elements/navbar') diff --git a/frontend/src/app/_elements/navbar/navbar.component.html b/frontend/src/app/_elements/navbar/navbar.component.html index 7d0c4cd8..1988b834 100644 --- a/frontend/src/app/_elements/navbar/navbar.component.html +++ b/frontend/src/app/_elements/navbar/navbar.component.html @@ -6,31 +6,25 @@
- -
- -
-- cgit v1.2.3 From decbc2dc6b583dcf11cccf77f057cc7ec7b52adc Mon Sep 17 00:00:00 2001 From: Danijel Anđelković Date: Wed, 20 Apr 2022 01:28:53 +0200 Subject: Uklonio mogucnost da korisnik izabere da izbrise izlaznu kolonu, umesto opcije pise izbrisi kolonu sada samo pise (izlazna kolona). Ispravio neke bug-ove. --- .gitignore | 3 ++ .../src/app/_elements/navbar/navbar.component.ts | 8 +++- frontend/src/app/_services/signal-r.service.ts | 5 +++ .../src/app/experiment/experiment.component.html | 16 ++++--- frontend/src/app/training/training.component.html | 50 ++++++++++++---------- 5 files changed, 53 insertions(+), 29 deletions(-) (limited to 'frontend/src/app/_elements/navbar') diff --git a/.gitignore b/.gitignore index 247afbd9..bdd28b3f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ backend/microservice/api/__pycache__/ production/app/node_modules/ production/app/dist/ backend/microservice/api/temp/ +backend/microservice/Boston.csv +backend/microservice/diamonds.csv +backend/microservice/IMDB-Movie-Data.csv diff --git a/frontend/src/app/_elements/navbar/navbar.component.ts b/frontend/src/app/_elements/navbar/navbar.component.ts index 368508ed..d5d1744f 100644 --- a/frontend/src/app/_elements/navbar/navbar.component.ts +++ b/frontend/src/app/_elements/navbar/navbar.component.ts @@ -4,6 +4,7 @@ import { AuthService } from '../../_services/auth.service'; import shared from 'src/app/Shared'; import { UserInfoService } from 'src/app/_services/user-info.service'; import { MatDialog } from '@angular/material/dialog'; +import { SignalRService } from 'src/app/_services/signal-r.service'; @Component({ selector: 'app-navbar', @@ -15,11 +16,15 @@ export class NavbarComponent implements OnInit { currentUrl: string; shared = shared; - constructor(public location: Location, private auth: AuthService, private userInfoService: UserInfoService, private matDialog: MatDialog) { + constructor(public location: Location, private auth: AuthService, private userInfoService: UserInfoService, private matDialog: MatDialog, private signalRService: SignalRService) { shared.dialog = matDialog; this.currentUrl = this.location.path(); this.location.onUrlChange(() => { this.currentUrl = this.location.path(); + }); + + this.auth.loggedInEvent.subscribe(_ => { + this.signalRService.startConnection(); }) } @@ -34,5 +39,6 @@ export class NavbarComponent implements OnInit { logOut() { this.auth.logOut(); + this.signalRService.stopConnection(); } } diff --git a/frontend/src/app/_services/signal-r.service.ts b/frontend/src/app/_services/signal-r.service.ts index 109fc9e5..6a2e61e9 100644 --- a/frontend/src/app/_services/signal-r.service.ts +++ b/frontend/src/app/_services/signal-r.service.ts @@ -24,5 +24,10 @@ export class SignalRService { .then(() => {}) .catch(err => {}) } + + public stopConnection = () => { + this.hubConnection?.stop(); + } + constructor(private cookie: CookieService) { } } diff --git a/frontend/src/app/experiment/experiment.component.html b/frontend/src/app/experiment/experiment.component.html index 4675236c..569d1bfc 100644 --- a/frontend/src/app/experiment/experiment.component.html +++ b/frontend/src/app/experiment/experiment.component.html @@ -12,7 +12,7 @@ Dodaj eksperiment -