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/_pages/home/home.component.ts | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 frontend/src/app/_pages/home/home.component.ts (limited to 'frontend/src/app/_pages/home/home.component.ts') 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 { + } + +} -- 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/home/home.component.ts') 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 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/home/home.component.ts') 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