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). --- .../app/_pages/add-model/add-model.component.html | 7 ++-- frontend/src/app/_pages/home/home.component.css | 0 frontend/src/app/_pages/home/home.component.html | 49 ++++++++++++++++++++++ .../src/app/_pages/home/home.component.spec.ts | 25 +++++++++++ frontend/src/app/_pages/home/home.component.ts | 26 ++++++++++++ .../app/_pages/login-page/login-page.component.ts | 4 +- 6 files changed, 106 insertions(+), 5 deletions(-) create mode 100644 frontend/src/app/_pages/home/home.component.css create mode 100644 frontend/src/app/_pages/home/home.component.html create mode 100644 frontend/src/app/_pages/home/home.component.spec.ts create mode 100644 frontend/src/app/_pages/home/home.component.ts (limited to 'frontend/src/app/_pages') diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html index bc292bb9..08e27dd7 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.html +++ b/frontend/src/app/_pages/add-model/add-model.component.html @@ -42,15 +42,16 @@
-
- + +
diff --git a/frontend/src/app/_pages/home/home.component.css b/frontend/src/app/_pages/home/home.component.css new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html new file mode 100644 index 00000000..568e89e3 --- /dev/null +++ b/frontend/src/app/_pages/home/home.component.html @@ -0,0 +1,49 @@ +
+
+

Započnite sa treniranjem!

+
+
+
+ storage +

Moji izvori podataka

+

+ Preuredite vaše izvore + podataka, ili + dodajte novi. +

+
+
+
+
+ model_training + +

Moji modeli

+

+ Pregledajte vaše modele, menjajte ih, + napravite nove modele, ili + ih obrišite. +

+
+
+
+
+ batch_prediction + +

Rezultati treniranja

+

+ Pregledajte sve vaše trenirane modele, + koristite ih da + predvidite + vrednosti za red ili skup podataka, ili ih obrišite. +

+
+
+
+

Pogledajte javne projekte!

+ + +
+
\ No newline at end of file diff --git a/frontend/src/app/_pages/home/home.component.spec.ts b/frontend/src/app/_pages/home/home.component.spec.ts new file mode 100644 index 00000000..2c5a1726 --- /dev/null +++ b/frontend/src/app/_pages/home/home.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeComponent } from './home.component'; + +describe('HomeComponent', () => { + let component: HomeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ HomeComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(HomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/_pages/home/home.component.ts b/frontend/src/app/_pages/home/home.component.ts new file mode 100644 index 00000000..0c61ef86 --- /dev/null +++ b/frontend/src/app/_pages/home/home.component.ts @@ -0,0 +1,26 @@ +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'; + +@Component({ + selector: 'app-home', + templateUrl: './home.component.html', + styleUrls: ['./home.component.css'] +}) +export class HomeComponent implements OnInit { + + publicDatasets: Dataset[]; + + constructor() { + this.publicDatasets = [ + new Dataset('Dataset1', 'Lorem ipsum dolor sir amet', ['kolona1', 'kolona2', 'kolona3']), + new Dataset('Drugi Dataset', 'Lorem ipsum dolor sir amet', ['jabuka', 'kruska', 'jagoda']), + new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5']), + ] + } + + ngOnInit(): void { + } + +} diff --git a/frontend/src/app/_pages/login-page/login-page.component.ts b/frontend/src/app/_pages/login-page/login-page.component.ts index e5366283..26d2547e 100644 --- a/frontend/src/app/_pages/login-page/login-page.component.ts +++ b/frontend/src/app/_pages/login-page/login-page.component.ts @@ -13,9 +13,9 @@ declare var window: any; selector: 'app-login-page', templateUrl: './login-page.component.html', styleUrls: ['./login-page.component.css'], - + }) -export class LoginPageComponent{ +export class LoginPageComponent { modalRef?: MDBModalRef; -- cgit v1.2.3 From 2e62393227d6d7b1c52e82cc8b7c3174206f7687 Mon Sep 17 00:00:00 2001 From: Danijel Andjelkovic Date: Mon, 14 Mar 2022 23:37:29 +0100 Subject: Dodao login i register modale u navbar, promenio neke stranice kada je korisnik ulogovan. --- frontend/src/app/Shared.ts | 7 ++ .../src/app/_elements/navbar/navbar.component.html | 16 ++++- .../src/app/_elements/navbar/navbar.component.ts | 7 +- frontend/src/app/_pages/home/home.component.html | 76 +++++++++++----------- frontend/src/app/_pages/home/home.component.ts | 3 + .../_pages/login-page/login-page.component.html | 6 +- 6 files changed, 70 insertions(+), 45 deletions(-) create mode 100644 frontend/src/app/Shared.ts (limited to 'frontend/src/app/_pages') 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 -
+
  • Odjavi se
    • +
    + + +
    - \ No newline at end of file + + + + \ 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 @@
    -

    Započnite sa treniranjem!

    -
    -
    -
    - storage -

    Moji izvori podataka

    -

    - Preuredite vaše izvore - podataka, ili - dodajte novi. -

    +
    +

    Započnite sa treniranjem!

    +
    +
    +
    + storage +

    Moji izvori podataka

    +

    + Preuredite vaše izvore + podataka, ili + dodajte novi. +

    +
    -
    -
    -
    - model_training - -

    Moji modeli

    -

    - Pregledajte vaše modele, menjajte ih, - napravite nove modele, ili - ih obrišite. -

    +
    +
    + model_training + +

    Moji modeli

    +

    + Pregledajte vaše modele, menjajte ih, + napravite nove modele, ili + ih obrišite. +

    +
    -
    -
    -
    - batch_prediction - -

    Rezultati treniranja

    -

    - Pregledajte sve vaše trenirane modele, - koristite ih da - predvidite - vrednosti za red ili skup podataka, ili ih obrišite. -

    +
    +
    + batch_prediction + +

    Rezultati treniranja

    +

    + Pregledajte sve vaše trenirane + modele, + koristite ih da predvidite vrednosti za red ili skup podataka, ili ih obrišite. +

    +
    +

    Pogledajte javne projekte!

    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 @@ - - - - + \ No newline at end of file -- cgit v1.2.3 From dd5834672ba1cc54362425462bfebd31959f693a Mon Sep 17 00:00:00 2001 From: Danijel Andjelkovic Date: Tue, 15 Mar 2022 16:32:35 +0100 Subject: Dodate stranice za sve linkove. --- .../src/app/_elements/navbar/navbar.component.html | 12 +++++------ .../browse-datasets/browse-datasets.component.css | 0 .../browse-datasets/browse-datasets.component.html | 1 + .../browse-datasets.component.spec.ts | 25 ++++++++++++++++++++++ .../browse-datasets/browse-datasets.component.ts | 15 +++++++++++++ .../browse-predictors.component.css | 0 .../browse-predictors.component.html | 1 + .../browse-predictors.component.spec.ts | 25 ++++++++++++++++++++++ .../browse-predictors.component.ts | 15 +++++++++++++ frontend/src/app/_pages/home/home.component.html | 8 +++---- .../app/_pages/login-page/login-page.component.css | 0 .../_pages/login-page/login-page.component.html | 9 -------- .../_pages/login-page/login-page.component.spec.ts | 25 ---------------------- .../app/_pages/login-page/login-page.component.ts | 15 ------------- .../_pages/my-datasets/my-datasets.component.css | 0 .../_pages/my-datasets/my-datasets.component.html | 1 + .../my-datasets/my-datasets.component.spec.ts | 25 ++++++++++++++++++++++ .../_pages/my-datasets/my-datasets.component.ts | 15 +++++++++++++ .../app/_pages/my-models/my-models.component.css | 0 .../app/_pages/my-models/my-models.component.html | 1 + .../_pages/my-models/my-models.component.spec.ts | 25 ++++++++++++++++++++++ .../app/_pages/my-models/my-models.component.ts | 15 +++++++++++++ .../my-predictors/my-predictors.component.css | 0 .../my-predictors/my-predictors.component.html | 1 + .../my-predictors/my-predictors.component.spec.ts | 25 ++++++++++++++++++++++ .../my-predictors/my-predictors.component.ts | 15 +++++++++++++ .../only-authorized/only-authorized.component.css | 0 .../only-authorized/only-authorized.component.html | 1 - .../only-authorized.component.spec.ts | 25 ---------------------- .../only-authorized/only-authorized.component.ts | 15 ------------- .../src/app/_pages/predict/predict.component.css | 0 .../src/app/_pages/predict/predict.component.html | 1 + .../app/_pages/predict/predict.component.spec.ts | 25 ++++++++++++++++++++++ .../src/app/_pages/predict/predict.component.ts | 15 +++++++++++++ .../src/app/_pages/profile/profile.component.css | 0 .../src/app/_pages/profile/profile.component.html | 1 + .../app/_pages/profile/profile.component.spec.ts | 25 ++++++++++++++++++++++ .../src/app/_pages/profile/profile.component.ts | 15 +++++++++++++ .../register-page/register-page.component.css | 0 .../register-page/register-page.component.html | 0 .../register-page/register-page.component.spec.ts | 25 ---------------------- .../register-page/register-page.component.ts | 14 ------------ .../src/app/_pages/settings/settings.component.css | 0 .../app/_pages/settings/settings.component.html | 1 + .../app/_pages/settings/settings.component.spec.ts | 25 ++++++++++++++++++++++ .../src/app/_pages/settings/settings.component.ts | 15 +++++++++++++ frontend/src/app/_services/auth.service.ts | 8 ++++--- frontend/src/app/app-routing.module.ts | 24 ++++++++++++--------- frontend/src/app/app.module.ts | 22 ++++++++++++++----- 49 files changed, 374 insertions(+), 157 deletions(-) create mode 100644 frontend/src/app/_pages/browse-datasets/browse-datasets.component.css create mode 100644 frontend/src/app/_pages/browse-datasets/browse-datasets.component.html create mode 100644 frontend/src/app/_pages/browse-datasets/browse-datasets.component.spec.ts create mode 100644 frontend/src/app/_pages/browse-datasets/browse-datasets.component.ts create mode 100644 frontend/src/app/_pages/browse-predictors/browse-predictors.component.css create mode 100644 frontend/src/app/_pages/browse-predictors/browse-predictors.component.html create mode 100644 frontend/src/app/_pages/browse-predictors/browse-predictors.component.spec.ts create mode 100644 frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts delete mode 100644 frontend/src/app/_pages/login-page/login-page.component.css delete mode 100644 frontend/src/app/_pages/login-page/login-page.component.html delete mode 100644 frontend/src/app/_pages/login-page/login-page.component.spec.ts delete mode 100644 frontend/src/app/_pages/login-page/login-page.component.ts create mode 100644 frontend/src/app/_pages/my-datasets/my-datasets.component.css create mode 100644 frontend/src/app/_pages/my-datasets/my-datasets.component.html create mode 100644 frontend/src/app/_pages/my-datasets/my-datasets.component.spec.ts create mode 100644 frontend/src/app/_pages/my-datasets/my-datasets.component.ts create mode 100644 frontend/src/app/_pages/my-models/my-models.component.css create mode 100644 frontend/src/app/_pages/my-models/my-models.component.html create mode 100644 frontend/src/app/_pages/my-models/my-models.component.spec.ts create mode 100644 frontend/src/app/_pages/my-models/my-models.component.ts create mode 100644 frontend/src/app/_pages/my-predictors/my-predictors.component.css create mode 100644 frontend/src/app/_pages/my-predictors/my-predictors.component.html create mode 100644 frontend/src/app/_pages/my-predictors/my-predictors.component.spec.ts create mode 100644 frontend/src/app/_pages/my-predictors/my-predictors.component.ts delete mode 100644 frontend/src/app/_pages/only-authorized/only-authorized.component.css delete mode 100644 frontend/src/app/_pages/only-authorized/only-authorized.component.html delete mode 100644 frontend/src/app/_pages/only-authorized/only-authorized.component.spec.ts delete mode 100644 frontend/src/app/_pages/only-authorized/only-authorized.component.ts create mode 100644 frontend/src/app/_pages/predict/predict.component.css create mode 100644 frontend/src/app/_pages/predict/predict.component.html create mode 100644 frontend/src/app/_pages/predict/predict.component.spec.ts create mode 100644 frontend/src/app/_pages/predict/predict.component.ts create mode 100644 frontend/src/app/_pages/profile/profile.component.css create mode 100644 frontend/src/app/_pages/profile/profile.component.html create mode 100644 frontend/src/app/_pages/profile/profile.component.spec.ts create mode 100644 frontend/src/app/_pages/profile/profile.component.ts delete mode 100644 frontend/src/app/_pages/register-page/register-page.component.css delete mode 100644 frontend/src/app/_pages/register-page/register-page.component.html delete mode 100644 frontend/src/app/_pages/register-page/register-page.component.spec.ts delete mode 100644 frontend/src/app/_pages/register-page/register-page.component.ts create mode 100644 frontend/src/app/_pages/settings/settings.component.css create mode 100644 frontend/src/app/_pages/settings/settings.component.html create mode 100644 frontend/src/app/_pages/settings/settings.component.spec.ts create mode 100644 frontend/src/app/_pages/settings/settings.component.ts (limited to 'frontend/src/app/_pages') diff --git a/frontend/src/app/_elements/navbar/navbar.component.html b/frontend/src/app/_elements/navbar/navbar.component.html index cea41e5a..116694b4 100644 --- a/frontend/src/app/_elements/navbar/navbar.component.html +++ b/frontend/src/app/_elements/navbar/navbar.component.html @@ -12,8 +12,8 @@ [class]="(currentUrl === '') ? 'text-secondary' : 'text-white'">Početna
  • Dodaj model
    • -
  • Predvidi
    • +
  • Predvidi
    • @@ -24,13 +24,13 @@
    diff --git a/frontend/src/app/_pages/browse-datasets/browse-datasets.component.css b/frontend/src/app/_pages/browse-datasets/browse-datasets.component.css new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/_pages/browse-datasets/browse-datasets.component.html b/frontend/src/app/_pages/browse-datasets/browse-datasets.component.html new file mode 100644 index 00000000..fa38a1bc --- /dev/null +++ b/frontend/src/app/_pages/browse-datasets/browse-datasets.component.html @@ -0,0 +1 @@ +

    browse-datasets works!

    diff --git a/frontend/src/app/_pages/browse-datasets/browse-datasets.component.spec.ts b/frontend/src/app/_pages/browse-datasets/browse-datasets.component.spec.ts new file mode 100644 index 00000000..fda74dbe --- /dev/null +++ b/frontend/src/app/_pages/browse-datasets/browse-datasets.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { BrowseDatasetsComponent } from './browse-datasets.component'; + +describe('BrowseDatasetsComponent', () => { + let component: BrowseDatasetsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ BrowseDatasetsComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(BrowseDatasetsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/_pages/browse-datasets/browse-datasets.component.ts b/frontend/src/app/_pages/browse-datasets/browse-datasets.component.ts new file mode 100644 index 00000000..dba6c25e --- /dev/null +++ b/frontend/src/app/_pages/browse-datasets/browse-datasets.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-browse-datasets', + templateUrl: './browse-datasets.component.html', + styleUrls: ['./browse-datasets.component.css'] +}) +export class BrowseDatasetsComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.css b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.css new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html new file mode 100644 index 00000000..01c4af82 --- /dev/null +++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html @@ -0,0 +1 @@ +

    browse-predictors works!

    diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.spec.ts b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.spec.ts new file mode 100644 index 00000000..6d13fedf --- /dev/null +++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { BrowsePredictorsComponent } from './browse-predictors.component'; + +describe('BrowsePredictorsComponent', () => { + let component: BrowsePredictorsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ BrowsePredictorsComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(BrowsePredictorsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts new file mode 100644 index 00000000..b4fb2a9d --- /dev/null +++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-browse-predictors', + templateUrl: './browse-predictors.component.html', + styleUrls: ['./browse-predictors.component.css'] +}) +export class BrowsePredictorsComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html index 6713cd59..7731054c 100644 --- a/frontend/src/app/_pages/home/home.component.html +++ b/frontend/src/app/_pages/home/home.component.html @@ -1,9 +1,9 @@
    -
    +

    Započnite sa treniranjem!

    -
    +
    storage @@ -15,7 +15,7 @@

    -
    +
    model_training @@ -28,7 +28,7 @@

    -
    +
    batch_prediction diff --git a/frontend/src/app/_pages/login-page/login-page.component.css b/frontend/src/app/_pages/login-page/login-page.component.css deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/app/_pages/login-page/login-page.component.html b/frontend/src/app/_pages/login-page/login-page.component.html deleted file mode 100644 index 766268d9..00000000 --- a/frontend/src/app/_pages/login-page/login-page.component.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/app/_pages/login-page/login-page.component.spec.ts b/frontend/src/app/_pages/login-page/login-page.component.spec.ts deleted file mode 100644 index 9da3aca8..00000000 --- a/frontend/src/app/_pages/login-page/login-page.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LoginPageComponent } from './login-page.component'; - -describe('LoginPageComponent', () => { - let component: LoginPageComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ LoginPageComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(LoginPageComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/frontend/src/app/_pages/login-page/login-page.component.ts b/frontend/src/app/_pages/login-page/login-page.component.ts deleted file mode 100644 index 58cd75a0..00000000 --- a/frontend/src/app/_pages/login-page/login-page.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component } from '@angular/core'; - - - -declare var window: any; - -@Component({ - selector: 'app-login-page', - templateUrl: './login-page.component.html', - styleUrls: ['./login-page.component.css'], - -}) -export class LoginPageComponent { - -} diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.css b/frontend/src/app/_pages/my-datasets/my-datasets.component.css new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.html b/frontend/src/app/_pages/my-datasets/my-datasets.component.html new file mode 100644 index 00000000..4b3095be --- /dev/null +++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.html @@ -0,0 +1 @@ +

    my-datasets works!

    diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.spec.ts b/frontend/src/app/_pages/my-datasets/my-datasets.component.spec.ts new file mode 100644 index 00000000..fc1fc3f3 --- /dev/null +++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MyDatasetsComponent } from './my-datasets.component'; + +describe('MyDatasetsComponent', () => { + let component: MyDatasetsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ MyDatasetsComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(MyDatasetsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts new file mode 100644 index 00000000..af5eab97 --- /dev/null +++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-my-datasets', + templateUrl: './my-datasets.component.html', + styleUrls: ['./my-datasets.component.css'] +}) +export class MyDatasetsComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/src/app/_pages/my-models/my-models.component.css b/frontend/src/app/_pages/my-models/my-models.component.css new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/_pages/my-models/my-models.component.html b/frontend/src/app/_pages/my-models/my-models.component.html new file mode 100644 index 00000000..2fea257d --- /dev/null +++ b/frontend/src/app/_pages/my-models/my-models.component.html @@ -0,0 +1 @@ +

    my-models works!

    diff --git a/frontend/src/app/_pages/my-models/my-models.component.spec.ts b/frontend/src/app/_pages/my-models/my-models.component.spec.ts new file mode 100644 index 00000000..e431d04c --- /dev/null +++ b/frontend/src/app/_pages/my-models/my-models.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MyModelsComponent } from './my-models.component'; + +describe('MyModelsComponent', () => { + let component: MyModelsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ MyModelsComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(MyModelsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/_pages/my-models/my-models.component.ts b/frontend/src/app/_pages/my-models/my-models.component.ts new file mode 100644 index 00000000..e9bc52de --- /dev/null +++ b/frontend/src/app/_pages/my-models/my-models.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-my-models', + templateUrl: './my-models.component.html', + styleUrls: ['./my-models.component.css'] +}) +export class MyModelsComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/src/app/_pages/my-predictors/my-predictors.component.css b/frontend/src/app/_pages/my-predictors/my-predictors.component.css new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/_pages/my-predictors/my-predictors.component.html b/frontend/src/app/_pages/my-predictors/my-predictors.component.html new file mode 100644 index 00000000..32d085af --- /dev/null +++ b/frontend/src/app/_pages/my-predictors/my-predictors.component.html @@ -0,0 +1 @@ +

    my-predictors works!

    diff --git a/frontend/src/app/_pages/my-predictors/my-predictors.component.spec.ts b/frontend/src/app/_pages/my-predictors/my-predictors.component.spec.ts new file mode 100644 index 00000000..37dddf6d --- /dev/null +++ b/frontend/src/app/_pages/my-predictors/my-predictors.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MyPredictorsComponent } from './my-predictors.component'; + +describe('MyPredictorsComponent', () => { + let component: MyPredictorsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ MyPredictorsComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(MyPredictorsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/_pages/my-predictors/my-predictors.component.ts b/frontend/src/app/_pages/my-predictors/my-predictors.component.ts new file mode 100644 index 00000000..b0d6e9dd --- /dev/null +++ b/frontend/src/app/_pages/my-predictors/my-predictors.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-my-predictors', + templateUrl: './my-predictors.component.html', + styleUrls: ['./my-predictors.component.css'] +}) +export class MyPredictorsComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/src/app/_pages/only-authorized/only-authorized.component.css b/frontend/src/app/_pages/only-authorized/only-authorized.component.css deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/app/_pages/only-authorized/only-authorized.component.html b/frontend/src/app/_pages/only-authorized/only-authorized.component.html deleted file mode 100644 index 27bbcf09..00000000 --- a/frontend/src/app/_pages/only-authorized/only-authorized.component.html +++ /dev/null @@ -1 +0,0 @@ -

    only-authorized works!

    diff --git a/frontend/src/app/_pages/only-authorized/only-authorized.component.spec.ts b/frontend/src/app/_pages/only-authorized/only-authorized.component.spec.ts deleted file mode 100644 index 82a01f63..00000000 --- a/frontend/src/app/_pages/only-authorized/only-authorized.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { OnlyAuthorizedComponent } from './only-authorized.component'; - -describe('OnlyAuthorizedComponent', () => { - let component: OnlyAuthorizedComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ OnlyAuthorizedComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(OnlyAuthorizedComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/frontend/src/app/_pages/only-authorized/only-authorized.component.ts b/frontend/src/app/_pages/only-authorized/only-authorized.component.ts deleted file mode 100644 index be88365f..00000000 --- a/frontend/src/app/_pages/only-authorized/only-authorized.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-only-authorized', - templateUrl: './only-authorized.component.html', - styleUrls: ['./only-authorized.component.css'] -}) -export class OnlyAuthorizedComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/frontend/src/app/_pages/predict/predict.component.css b/frontend/src/app/_pages/predict/predict.component.css new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/_pages/predict/predict.component.html b/frontend/src/app/_pages/predict/predict.component.html new file mode 100644 index 00000000..74a83b71 --- /dev/null +++ b/frontend/src/app/_pages/predict/predict.component.html @@ -0,0 +1 @@ +

    predict works!

    diff --git a/frontend/src/app/_pages/predict/predict.component.spec.ts b/frontend/src/app/_pages/predict/predict.component.spec.ts new file mode 100644 index 00000000..65871ecc --- /dev/null +++ b/frontend/src/app/_pages/predict/predict.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PredictComponent } from './predict.component'; + +describe('PredictComponent', () => { + let component: PredictComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ PredictComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(PredictComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/_pages/predict/predict.component.ts b/frontend/src/app/_pages/predict/predict.component.ts new file mode 100644 index 00000000..0e313c65 --- /dev/null +++ b/frontend/src/app/_pages/predict/predict.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-predict', + templateUrl: './predict.component.html', + styleUrls: ['./predict.component.css'] +}) +export class PredictComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/src/app/_pages/profile/profile.component.css b/frontend/src/app/_pages/profile/profile.component.css new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/_pages/profile/profile.component.html b/frontend/src/app/_pages/profile/profile.component.html new file mode 100644 index 00000000..9df0576d --- /dev/null +++ b/frontend/src/app/_pages/profile/profile.component.html @@ -0,0 +1 @@ +

    profile works!

    diff --git a/frontend/src/app/_pages/profile/profile.component.spec.ts b/frontend/src/app/_pages/profile/profile.component.spec.ts new file mode 100644 index 00000000..e88012e7 --- /dev/null +++ b/frontend/src/app/_pages/profile/profile.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ProfileComponent } from './profile.component'; + +describe('ProfileComponent', () => { + let component: ProfileComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ProfileComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ProfileComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/_pages/profile/profile.component.ts b/frontend/src/app/_pages/profile/profile.component.ts new file mode 100644 index 00000000..93040f3e --- /dev/null +++ b/frontend/src/app/_pages/profile/profile.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-profile', + templateUrl: './profile.component.html', + styleUrls: ['./profile.component.css'] +}) +export class ProfileComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/src/app/_pages/register-page/register-page.component.css b/frontend/src/app/_pages/register-page/register-page.component.css deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/app/_pages/register-page/register-page.component.html b/frontend/src/app/_pages/register-page/register-page.component.html deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/app/_pages/register-page/register-page.component.spec.ts b/frontend/src/app/_pages/register-page/register-page.component.spec.ts deleted file mode 100644 index 347fe9f4..00000000 --- a/frontend/src/app/_pages/register-page/register-page.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { RegisterPageComponent } from './register-page.component'; - -describe('RegisterPageComponent', () => { - let component: RegisterPageComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ RegisterPageComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(RegisterPageComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/frontend/src/app/_pages/register-page/register-page.component.ts b/frontend/src/app/_pages/register-page/register-page.component.ts deleted file mode 100644 index 3add63a4..00000000 --- a/frontend/src/app/_pages/register-page/register-page.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; -import { AuthService } from 'src/app/_services/auth.service'; - -@Component({ - selector: 'app-register-page', - templateUrl: './register-page.component.html', - styleUrls: ['./register-page.component.css'] -}) -export class RegisterPageComponent implements OnInit { - - ngOnInit(): void { - } -} diff --git a/frontend/src/app/_pages/settings/settings.component.css b/frontend/src/app/_pages/settings/settings.component.css new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/_pages/settings/settings.component.html b/frontend/src/app/_pages/settings/settings.component.html new file mode 100644 index 00000000..4ab2a415 --- /dev/null +++ b/frontend/src/app/_pages/settings/settings.component.html @@ -0,0 +1 @@ +

    settings works!

    diff --git a/frontend/src/app/_pages/settings/settings.component.spec.ts b/frontend/src/app/_pages/settings/settings.component.spec.ts new file mode 100644 index 00000000..a3a508b0 --- /dev/null +++ b/frontend/src/app/_pages/settings/settings.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SettingsComponent } from './settings.component'; + +describe('SettingsComponent', () => { + let component: SettingsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ SettingsComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(SettingsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/_pages/settings/settings.component.ts b/frontend/src/app/_pages/settings/settings.component.ts new file mode 100644 index 00000000..19862fb0 --- /dev/null +++ b/frontend/src/app/_pages/settings/settings.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-settings', + templateUrl: './settings.component.html', + styleUrls: ['./settings.component.css'] +}) +export class SettingsComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts index e6611880..afc1567b 100644 --- a/frontend/src/app/_services/auth.service.ts +++ b/frontend/src/app/_services/auth.service.ts @@ -41,7 +41,6 @@ export class AuthService { if (!exp) { exp = new Date(); } - console.log(exp, exp?.getTime()); this.refresher = setTimeout(() => { console.log('refreshing token!'); this.http.post(`${API_SETTINGS.apiURL}/auth/renewJwt`, {}, { headers: this.authHeader(), responseType: 'text' }).subscribe((response) => { @@ -51,8 +50,11 @@ export class AuthService { } authenticate(token: string) { - const user = jwtHelper.decodeToken(token); - this.cookie.set('token', token, user.exp); + let exp = jwtHelper.getTokenExpirationDate(token); + if (!exp) { + exp = new Date(); + } + this.cookie.set('token', token, exp); this.updateUser(); } diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index 9ce08a8f..a42257df 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -2,22 +2,26 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { AuthGuardService } from './_services/auth-guard.service'; -import { LoginPageComponent } from './_pages/login-page/login-page.component'; -import { OnlyAuthorizedComponent } from './_pages/only-authorized/only-authorized.component'; -import { RegisterPageComponent } from './_pages/register-page/register-page.component'; import { AddModelComponent } from './_pages/add-model/add-model.component'; -import { LoginModalComponent } from './_modals/login-modal/login-modal.component'; import { HomeComponent } from './_pages/home/home.component'; -import { RegisterModalComponent } from './_modals/register-modal/register-modal.component'; +import { MyDatasetsComponent } from './_pages/my-datasets/my-datasets.component'; +import { MyModelsComponent } from './_pages/my-models/my-models.component'; +import { MyPredictorsComponent } from './_pages/my-predictors/my-predictors.component'; +import { BrowsePredictorsComponent } from './_pages/browse-predictors/browse-predictors.component'; +import { BrowseDatasetsComponent } from './_pages/browse-datasets/browse-datasets.component'; +import { SettingsComponent } from './_pages/settings/settings.component'; +import { ProfileComponent } from './_pages/profile/profile.component'; const routes: Routes = [ { path: '', component: HomeComponent }, - { path: 'login', component: LoginPageComponent }, - { path: 'register', component: RegisterPageComponent }, - { path: 'only-authorized', component: OnlyAuthorizedComponent, canActivate: [AuthGuardService] }, { path: 'add-model', component: AddModelComponent }, - { path: 'login-modal-test', component: LoginModalComponent }, - { path: 'register-modal-test', component: RegisterModalComponent } + { path: 'my-datasets', component: MyDatasetsComponent, canActivate: [AuthGuardService] }, + { path: 'my-models', component: MyModelsComponent, canActivate: [AuthGuardService] }, + { path: 'my-predictors', component: MyPredictorsComponent, canActivate: [AuthGuardService] }, + { path: 'settings', component: SettingsComponent, canActivate: [AuthGuardService] }, + { path: 'profile', component: ProfileComponent, canActivate: [AuthGuardService] }, + { path: 'browse-datasets', component: BrowseDatasetsComponent }, + { path: 'browse-predictors', component: BrowsePredictorsComponent } ]; @NgModule({ diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index c0f6130e..5aa405fb 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -7,9 +7,7 @@ import { MatSliderModule } from '@angular/material/slider'; import { MatIconModule } from '@angular/material/icon'; import { AppComponent } from './app.component'; -import { RegisterPageComponent } from './_pages/register-page/register-page.component'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { OnlyAuthorizedComponent } from './_pages/only-authorized/only-authorized.component'; import { DatasetLoadComponent } from './_elements/dataset-load/dataset-load.component'; import { AddModelComponent } from './_pages/add-model/add-model.component'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -23,12 +21,18 @@ import { NavbarComponent } from './_elements/navbar/navbar.component'; import { ItemPredictorComponent } from './_elements/item-predictor/item-predictor.component'; import { ItemDatasetComponent } from './_elements/item-dataset/item-dataset.component'; import { CarouselComponent } from './_elements/carousel/carousel.component'; +import { SettingsComponent } from './_pages/settings/settings.component'; +import { ProfileComponent } from './_pages/profile/profile.component'; +import { MyPredictorsComponent } from './_pages/my-predictors/my-predictors.component'; +import { MyDatasetsComponent } from './_pages/my-datasets/my-datasets.component'; +import { MyModelsComponent } from './_pages/my-models/my-models.component'; +import { BrowseDatasetsComponent } from './_pages/browse-datasets/browse-datasets.component'; +import { BrowsePredictorsComponent } from './_pages/browse-predictors/browse-predictors.component'; +import { PredictComponent } from './_pages/predict/predict.component'; @NgModule({ declarations: [ AppComponent, - RegisterPageComponent, - OnlyAuthorizedComponent, DatasetLoadComponent, AddModelComponent, LoginModalComponent, @@ -37,7 +41,15 @@ import { CarouselComponent } from './_elements/carousel/carousel.component'; NavbarComponent, ItemPredictorComponent, ItemDatasetComponent, - CarouselComponent + CarouselComponent, + SettingsComponent, + ProfileComponent, + MyPredictorsComponent, + MyDatasetsComponent, + MyModelsComponent, + BrowseDatasetsComponent, + BrowsePredictorsComponent, + PredictComponent ], imports: [ BrowserModule, -- cgit v1.2.3 From 9d8640ec5a716c3e7b5bd036739d857250047f0b Mon Sep 17 00:00:00 2001 From: Danijel Andjelkovic Date: Tue, 15 Mar 2022 18:50:10 +0100 Subject: Dodao logo, promenio vecinu dugmica u mat-button stil. --- frontend/src/app/_data/Predictor.ts | 7 +- .../app/_elements/carousel/carousel.component.html | 22 +-- .../item-dataset/item-dataset.component.html | 2 +- .../item-predictor/item-predictor.component.html | 25 +++- .../item-predictor/item-predictor.component.ts | 5 +- .../src/app/_elements/navbar/navbar.component.html | 11 +- frontend/src/app/_pages/home/home.component.html | 90 +++++------ frontend/src/app/_pages/home/home.component.ts | 18 ++- frontend/src/app/app-routing.module.ts | 4 +- frontend/src/assets/svg/logo.svg | 165 +++++++++++++++++++++ frontend/src/assets/svg/logo_no_text.svg | 107 +++++++++++++ 11 files changed, 388 insertions(+), 68 deletions(-) create mode 100644 frontend/src/assets/svg/logo.svg create mode 100644 frontend/src/assets/svg/logo_no_text.svg (limited to 'frontend/src/app/_pages') diff --git a/frontend/src/app/_data/Predictor.ts b/frontend/src/app/_data/Predictor.ts index 77d9498b..05b993f1 100644 --- a/frontend/src/app/_data/Predictor.ts +++ b/frontend/src/app/_data/Predictor.ts @@ -1,8 +1,9 @@ -export default class Dataset { +export default class Predictor { constructor( - public name: string = 'Novi izvor podataka', + public name: string = 'Novi prediktor', public description: string = '', - public columns: string[] = [], + public inputs: string[] = [], + public output: string = '', public isPublic: boolean = false, public accessibleByLink: boolean = false, public dateCreated: Date = new Date() diff --git a/frontend/src/app/_elements/carousel/carousel.component.html b/frontend/src/app/_elements/carousel/carousel.component.html index ea522626..755899a7 100644 --- a/frontend/src/app/_elements/carousel/carousel.component.html +++ b/frontend/src/app/_elements/carousel/carousel.component.html @@ -1,12 +1,14 @@ -
    -
    - - - - - - - - +
    +
    +
    + + + + + + + + +
    \ No newline at end of file diff --git a/frontend/src/app/_elements/item-dataset/item-dataset.component.html b/frontend/src/app/_elements/item-dataset/item-dataset.component.html index c1dc2609..cf39a125 100644 --- a/frontend/src/app/_elements/item-dataset/item-dataset.component.html +++ b/frontend/src/app/_elements/item-dataset/item-dataset.component.html @@ -1,4 +1,4 @@ -
    +
    {{dataset.name}}
    diff --git a/frontend/src/app/_elements/item-predictor/item-predictor.component.html b/frontend/src/app/_elements/item-predictor/item-predictor.component.html index cbd53fc2..92d747e2 100644 --- a/frontend/src/app/_elements/item-predictor/item-predictor.component.html +++ b/frontend/src/app/_elements/item-predictor/item-predictor.component.html @@ -1 +1,24 @@ -

    item-predictor works!

    +
    +
    + {{predictor.name}} +
    +
    +

    + {{predictor.description}} +

    +
    + + + + +
    {{column}}
    + arrow_downward +

    + {{predictor.output}} +

    +
    +
    +
    + Iskoristi +
    +
    \ No newline at end of file diff --git a/frontend/src/app/_elements/item-predictor/item-predictor.component.ts b/frontend/src/app/_elements/item-predictor/item-predictor.component.ts index fe65ccfd..cc782f45 100644 --- a/frontend/src/app/_elements/item-predictor/item-predictor.component.ts +++ b/frontend/src/app/_elements/item-predictor/item-predictor.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; +import Predictor from 'src/app/_data/Predictor'; @Component({ selector: 'app-item-predictor', @@ -7,6 +8,8 @@ import { Component, OnInit } from '@angular/core'; }) export class ItemPredictorComponent implements OnInit { + @Input() predictor: Predictor = new Predictor(); + constructor() { } ngOnInit(): void { diff --git a/frontend/src/app/_elements/navbar/navbar.component.html b/frontend/src/app/_elements/navbar/navbar.component.html index 116694b4..b9c450af 100644 --- a/frontend/src/app/_elements/navbar/navbar.component.html +++ b/frontend/src/app/_elements/navbar/navbar.component.html @@ -1,10 +1,8 @@
    - - - - + +
      @@ -34,11 +32,12 @@
    - -
    diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html index 7731054c..374cb324 100644 --- a/frontend/src/app/_pages/home/home.component.html +++ b/frontend/src/app/_pages/home/home.component.html @@ -1,51 +1,53 @@ -
    -
    -
    -

    Započnite sa treniranjem!

    -
    -
    -
    - storage -

    Moji izvori podataka

    -

    - Preuredite vaše izvore - podataka, ili - dodajte novi. -

    -
    +
    + +
    +

    Započnite sa treniranjem!

    +
    +
    +
    + storage +

    Moji izvori podataka

    +

    + Preuredite vaše izvore + podataka, ili + dodajte novi. +

    -
    -
    - model_training - -

    Moji modeli

    -

    - Pregledajte vaše modele, menjajte ih, - napravite nove modele, ili - ih obrišite. -

    -
    +
    +
    +
    + model_training + +

    Moji modeli

    +

    + Pregledajte vaše modele, menjajte ih, + napravite nove modele, ili + ih obrišite. +

    -
    -
    - batch_prediction - -

    Rezultati treniranja

    -

    - Pregledajte sve vaše trenirane - modele, - koristite ih da predvidite vrednosti za red ili skup podataka, ili ih obrišite. -

    -
    +
    +
    +
    + batch_prediction + +

    Rezultati treniranja

    +

    + Pregledajte sve vaše trenirane + modele, + koristite ih da predvidite vrednosti za red ili skup podataka, ili ih obrišite. +

    -
    -

    Pogledajte javne projekte!

    - - +
    +

    Pogledajte javne izvore podataka!

    + + +

    Iskoristite već trenirane modele!

    + +
    \ No newline at end of file diff --git a/frontend/src/app/_pages/home/home.component.ts b/frontend/src/app/_pages/home/home.component.ts index eb9adf27..7e4471e8 100644 --- a/frontend/src/app/_pages/home/home.component.ts +++ b/frontend/src/app/_pages/home/home.component.ts @@ -12,14 +12,30 @@ import shared from 'src/app/Shared'; export class HomeComponent implements OnInit { publicDatasets: Dataset[]; + publicPredictors: Predictor[]; shared = shared; constructor() { this.publicDatasets = [ - new Dataset('Dataset1', 'Lorem ipsum dolor sir amet', ['kolona1', 'kolona2', 'kolona3']), + new Dataset('Titanik', 'Titanik', ['Kolona1', 'Kolona2', 'Ime', 'OsobaJePreživela']), new Dataset('Drugi Dataset', 'Lorem ipsum dolor sir amet', ['jabuka', 'kruska', 'jagoda']), new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5']), + new Dataset('Drugi Dataset', 'Lorem ipsum dolor sir amet', ['jabuka', 'kruska', 'jagoda']), + new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5']), + new Dataset('Drugi Dataset', 'Lorem ipsum dolor sir amet', ['jabuka', 'kruska', 'jagoda']), + new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5']), + new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5']) + ] + this.publicPredictors = [ + new Predictor('Preživeli', 'Za uneto ime osobe, predvidja da li je ta osoba preživela ili ne.', ['Ime'], 'OsobaJePreživela'), + new Predictor('Drugi model', 'Lorem ipsum dolor sir amet', ['kruska'], 'jagoda'), + new Predictor('Treći model', 'Kratak opis modela', ['c1', 'c2', 'c3'], 'c5'), + new Predictor('Drugi model', 'Lorem ipsum dolor sir amet', ['kruska'], 'jagoda'), + new Predictor('Treći model', 'Kratak opis modela', ['c1', 'c2', 'c3'], 'c5'), + new Predictor('Drugi model', 'Lorem ipsum dolor sir amet', ['kruska'], 'jagoda'), + new Predictor('Treći model', 'Kratak opis modela', ['c1', 'c2', 'c3'], 'c5'), + new Predictor('Treći model', 'Kratak opis modela', ['c1', 'c2', 'c3'], 'c5') ] } diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index a42257df..ee43b522 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -11,6 +11,7 @@ import { BrowsePredictorsComponent } from './_pages/browse-predictors/browse-pre import { BrowseDatasetsComponent } from './_pages/browse-datasets/browse-datasets.component'; import { SettingsComponent } from './_pages/settings/settings.component'; import { ProfileComponent } from './_pages/profile/profile.component'; +import { PredictComponent } from './_pages/predict/predict.component'; const routes: Routes = [ { path: '', component: HomeComponent }, @@ -21,7 +22,8 @@ const routes: Routes = [ { path: 'settings', component: SettingsComponent, canActivate: [AuthGuardService] }, { path: 'profile', component: ProfileComponent, canActivate: [AuthGuardService] }, { path: 'browse-datasets', component: BrowseDatasetsComponent }, - { path: 'browse-predictors', component: BrowsePredictorsComponent } + { path: 'browse-predictors', component: BrowsePredictorsComponent }, + { path: 'predict', component: PredictComponent } ]; @NgModule({ diff --git a/frontend/src/assets/svg/logo.svg b/frontend/src/assets/svg/logo.svg new file mode 100644 index 00000000..cd79cd55 --- /dev/null +++ b/frontend/src/assets/svg/logo.svg @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/assets/svg/logo_no_text.svg b/frontend/src/assets/svg/logo_no_text.svg new file mode 100644 index 00000000..102b3781 --- /dev/null +++ b/frontend/src/assets/svg/logo_no_text.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3