From 6aeb963fa64af9dc0ddf2f9aeaf1903a7db26afc Mon Sep 17 00:00:00 2001 From: Danijel Andjelkovic Date: Sun, 13 Mar 2022 20:57:27 +0100 Subject: Dodata naslovna strana i navigacioni meni, kao i neke dodatne komponente i modeli podataka (lista elemenata, element-dataset, element-prediktor). --- frontend/src/app/_data/Dataset.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 frontend/src/app/_data/Dataset.ts (limited to 'frontend/src/app/_data/Dataset.ts') diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts new file mode 100644 index 00000000..b4e46315 --- /dev/null +++ b/frontend/src/app/_data/Dataset.ts @@ -0,0 +1,10 @@ +export default class Dataset { + constructor( + public name: string = 'Novi izvor podataka', + public description: string = '', + public header: string[] = [], + public fileId?: number, + public extension: string = '.csv', + public dateCreated: Date = new Date() + ) { } +} \ No newline at end of file -- cgit v1.2.3 From a9287af015228a73b5053acdef421d9d63ba766b Mon Sep 17 00:00:00 2001 From: Danijel Andjelkovic Date: Tue, 15 Mar 2022 16:06:09 +0100 Subject: Dodao automatsko osvezavanja JWT tokena, automatsko ucitavanje ulogovanog korisnika. Prosirio modele Dataset, Model, Predictor tako da se moze definisati da li su javna ili da li bilo ko sa linkom moze da ih vidi, dodao lastUpdated datum. Login dugme u navbar-u radi funkcionalno. Login/logout ne moraju da osveze stranicu vise. --- frontend/src/app/_data/Dataset.ts | 5 +- frontend/src/app/_data/Model.ts | 3 +- frontend/src/app/_data/Predictor.ts | 5 +- .../src/app/_elements/navbar/navbar.component.html | 2 +- .../src/app/_elements/navbar/navbar.component.ts | 6 +- .../_modals/login-modal/login-modal.component.ts | 3 +- .../register-modal/register-modal.component.html | 142 ++++++++++++--------- .../register-modal/register-modal.component.ts | 6 +- frontend/src/app/_services/auth.service.ts | 46 +++++++ 9 files changed, 144 insertions(+), 74 deletions(-) (limited to 'frontend/src/app/_data/Dataset.ts') diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts index b4e46315..aaee50eb 100644 --- a/frontend/src/app/_data/Dataset.ts +++ b/frontend/src/app/_data/Dataset.ts @@ -5,6 +5,9 @@ export default class Dataset { public header: string[] = [], public fileId?: number, public extension: string = '.csv', - public dateCreated: Date = new Date() + public isPublic: boolean = false, + public accessibleByLink: boolean = false, + public dateCreated: Date = new Date(), + public lastUpdated: Date = new Date() ) { } } \ No newline at end of file diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts index 162d5d78..1a120ca7 100644 --- a/frontend/src/app/_data/Model.ts +++ b/frontend/src/app/_data/Model.ts @@ -3,9 +3,10 @@ export default class Model { public name: string = 'Novi model', public description: string = '', public dateCreated: Date = new Date(), + public lastUpdated: Date = new Date(), public datasetId?: number, - //Test set settings + // Test set settings public inputColumns: number[] = [0], public columnToPredict: number = 1, public randomOrder: boolean = true, diff --git a/frontend/src/app/_data/Predictor.ts b/frontend/src/app/_data/Predictor.ts index 379526ec..77d9498b 100644 --- a/frontend/src/app/_data/Predictor.ts +++ b/frontend/src/app/_data/Predictor.ts @@ -2,8 +2,9 @@ export default class Dataset { constructor( public name: string = 'Novi izvor podataka', public description: string = '', - public inputs: string[] = [], - public output: string = '', + public columns: string[] = [], + public isPublic: boolean = false, + public accessibleByLink: boolean = false, public dateCreated: Date = new Date() ) { } } \ 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 426332bd..cea41e5a 100644 --- a/frontend/src/app/_elements/navbar/navbar.component.html +++ b/frontend/src/app/_elements/navbar/navbar.component.html @@ -30,7 +30,7 @@
    • -
  • Odjavi se
    • +
  • Odjavi se
    • diff --git a/frontend/src/app/_elements/navbar/navbar.component.ts b/frontend/src/app/_elements/navbar/navbar.component.ts index 154a0d7d..c16e3e9d 100644 --- a/frontend/src/app/_elements/navbar/navbar.component.ts +++ b/frontend/src/app/_elements/navbar/navbar.component.ts @@ -18,11 +18,13 @@ export class NavbarComponent implements OnInit { this.location.onUrlChange(() => { this.currentUrl = this.location.path(); }) - - this.shared.loggedIn = auth.isAuthenticated(); } ngOnInit(): void { + this.auth.updateUser(); } + logOut() { + this.auth.logOut(); + } } diff --git a/frontend/src/app/_modals/login-modal/login-modal.component.ts b/frontend/src/app/_modals/login-modal/login-modal.component.ts index 22bd9a28..87686f10 100644 --- a/frontend/src/app/_modals/login-modal/login-modal.component.ts +++ b/frontend/src/app/_modals/login-modal/login-modal.component.ts @@ -27,9 +27,8 @@ export class LoginModalComponent implements OnInit { doLogin() { this.authService.login(this.username, this.password).subscribe((response) => { //ako nisu ok podaci, ne ide hide nego mora opet da ukucava!!!!podesi console.log(response); - this.cookie.set('token', response); + this.authService.authenticate(response); (document.getElementById('closeButton')).click(); - this.router.navigate(['add-model']); }, error => { console.warn(error); //NETACNI PODACI }); diff --git a/frontend/src/app/_modals/register-modal/register-modal.component.html b/frontend/src/app/_modals/register-modal/register-modal.component.html index 7ed2bbac..7098c040 100644 --- a/frontend/src/app/_modals/register-modal/register-modal.component.html +++ b/frontend/src/app/_modals/register-modal/register-modal.component.html @@ -1,70 +1,88 @@ -