From 5d9b17d69acc8dfbe30859610c6ba2fa5d9d963f Mon Sep 17 00:00:00 2001 From: Sonja Galovic Date: Mon, 14 Mar 2022 19:03:36 +0100 Subject: Sredjeni modali za login i register. Dodat folder images u src/assets. --- frontend/src/assets/images/logo.png | Bin 0 -> 13315 bytes frontend/src/assets/images/logo_crop.png | Bin 0 -> 11447 bytes frontend/src/assets/images/logo_dark.png | Bin 0 -> 15736 bytes frontend/src/assets/images/logo_dark_crop.png | Bin 0 -> 10987 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 frontend/src/assets/images/logo.png create mode 100644 frontend/src/assets/images/logo_crop.png create mode 100644 frontend/src/assets/images/logo_dark.png create mode 100644 frontend/src/assets/images/logo_dark_crop.png (limited to 'frontend/src/assets') diff --git a/frontend/src/assets/images/logo.png b/frontend/src/assets/images/logo.png new file mode 100644 index 00000000..2e15550a Binary files /dev/null and b/frontend/src/assets/images/logo.png differ diff --git a/frontend/src/assets/images/logo_crop.png b/frontend/src/assets/images/logo_crop.png new file mode 100644 index 00000000..1775a465 Binary files /dev/null and b/frontend/src/assets/images/logo_crop.png differ diff --git a/frontend/src/assets/images/logo_dark.png b/frontend/src/assets/images/logo_dark.png new file mode 100644 index 00000000..95c06d8f Binary files /dev/null and b/frontend/src/assets/images/logo_dark.png differ diff --git a/frontend/src/assets/images/logo_dark_crop.png b/frontend/src/assets/images/logo_dark_crop.png new file mode 100644 index 00000000..d66f13e2 Binary files /dev/null and b/frontend/src/assets/images/logo_dark_crop.png differ -- 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/assets') 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 From ca592566e80a7a83fff85e0b5a11bcca06f7e017 Mon Sep 17 00:00:00 2001 From: Sonja Galovic Date: Tue, 15 Mar 2022 21:27:46 +0100 Subject: Uredjena stranica add-model i komponenta dataset-load. --- .../dataset-load/dataset-load.component.css | 6 + .../dataset-load/dataset-load.component.html | 57 +++- .../dataset-load/dataset-load.component.ts | 43 +++ .../app/_pages/add-model/add-model.component.css | 17 ++ .../app/_pages/add-model/add-model.component.html | 322 +++++++++------------ .../src/assets/images/add_model_background.jpg | Bin 0 -> 56906 bytes frontend/src/assets/images/logo_crop.png | Bin 11447 -> 0 bytes frontend/src/assets/images/logo_dark_crop.png | Bin 10987 -> 0 bytes 8 files changed, 250 insertions(+), 195 deletions(-) create mode 100644 frontend/src/assets/images/add_model_background.jpg delete mode 100644 frontend/src/assets/images/logo_crop.png delete mode 100644 frontend/src/assets/images/logo_dark_crop.png (limited to 'frontend/src/assets') diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.css b/frontend/src/app/_elements/dataset-load/dataset-load.component.css index e69de29b..05819702 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.css +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.css @@ -0,0 +1,6 @@ +#divInputs { + margin-left: 20px; +} +#divOutputs { + margin-left: 20px; +} \ No newline at end of file diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.html b/frontend/src/app/_elements/dataset-load/dataset-load.component.html index c89add43..16830e11 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.html +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.html @@ -1,19 +1,21 @@
- + - - - -      -   - -

+ + +      + +      - - - + + + +
@@ -26,7 +28,7 @@
{{item}}
- +
@@ -39,4 +41,35 @@ {{rowsNumber}} x {{colsNumber}} +
+
+
+

Izaberite ulazne kolone:

+
+
+
+ +   + +
+
+
+
+

Izaberite izlaznu kolonu:

+
+
+
+ +   + +
+
+
+
+
+ \ No newline at end of file diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts index cde3e8b1..c772dc35 100644 --- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts +++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts @@ -20,6 +20,9 @@ export class DatasetLoadComponent { rowsNumber: number = 0; colsNumber: number = 0; + checkedInputCols: Array = []; + checkedOutputCol: string = ''; + constructor(private ngxCsvParser: NgxCsvParser) { } @@ -51,4 +54,44 @@ export class DatasetLoadComponent { console.log('Error', error); }); } + + getCheckedInputCols() : Array { + this.checkedInputCols = new Array(); + let checkboxes = document.getElementsByName("cbs"); + + for (let i = 0; i < checkboxes.length; i++) { + let thatCb = checkboxes[i]; + if (thatCb.checked) + this.checkedInputCols.push(thatCb.value); + } + //console.log(this.checkedInputCols); + return this.checkedInputCols; + } + getCheckedOutputCol() : string { + this.checkedOutputCol = ''; + let radiobuttons = document.getElementsByName("rbs"); + + for (let i = 0; i < radiobuttons.length; i++) { + let thatRb = radiobuttons[i]; + if (thatRb.checked) { + this.checkedOutputCol = thatRb.value; + break; + } + } + //console.log(this.checkedOutputCol); + return this.checkedOutputCol; + } + validationInputsOutput() { + if (this.checkedInputCols.length == 0) { + alert("Molimo Vas da izaberete ulaznu kolonu/kolone za mrežu.") + return; + } + for (let i = 0; i < this.checkedInputCols.length; i++) { + if (this.checkedInputCols[i] == this.checkedOutputCol) { + let colName = this.checkedOutputCol; + alert("Izabrali ste istu kolonu (" + colName + ") kao ulaznu i izlaznu iz mreže. Korigujte izbor."); + return; + } + } + } } diff --git a/frontend/src/app/_pages/add-model/add-model.component.css b/frontend/src/app/_pages/add-model/add-model.component.css index e69de29b..004b9cac 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.css +++ b/frontend/src/app/_pages/add-model/add-model.component.css @@ -0,0 +1,17 @@ +#header { + background-color: #003459; + padding-top: 25px; + padding-bottom: 20px; +} +#header h1 { + font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; + text-align: center; + color: white; +} + +#wrapper { + background-image: url('/assets/images/add_model_background.jpg'); +} +#container { + border-radius: 8px; +} \ No newline at end of file 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..e141b228 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.html +++ b/frontend/src/app/_pages/add-model/add-model.component.html @@ -1,189 +1,145 @@ -
- -

Nov model:

-
- -
- -
- -
- -
-
- -
- -
- -
-
- - - -
- - -
- -
-
- - -
-
- -
-
- -

Parametri treniranja

- -
- -
- -
-
- -
- -
- -
-
- -
- -
- +
+
+    + +
+
+
+ +
+ +
+
+
+ +
+

Izvor podataka:

+ +
+ +

Parametri treniranja:

+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
- -
- -
- +

+
+
+ +
-
-
-
- -
- -
\ No newline at end of file + diff --git a/frontend/src/assets/images/add_model_background.jpg b/frontend/src/assets/images/add_model_background.jpg new file mode 100644 index 00000000..d86f0566 Binary files /dev/null and b/frontend/src/assets/images/add_model_background.jpg differ diff --git a/frontend/src/assets/images/logo_crop.png b/frontend/src/assets/images/logo_crop.png deleted file mode 100644 index 1775a465..00000000 Binary files a/frontend/src/assets/images/logo_crop.png and /dev/null differ diff --git a/frontend/src/assets/images/logo_dark_crop.png b/frontend/src/assets/images/logo_dark_crop.png deleted file mode 100644 index d66f13e2..00000000 Binary files a/frontend/src/assets/images/logo_dark_crop.png and /dev/null differ -- cgit v1.2.3
{{col}}