From 0907f23080e16af1813e9e445f26a44ed1dc7a5b Mon Sep 17 00:00:00 2001 From: Ivan Ljubisavljevic Date: Wed, 27 Apr 2022 20:53:22 +0200 Subject: Izmenjen izgled upload csv-a #116 --- frontend/src/app/_elements/folder/folder.component.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'frontend/src/app/_elements/folder') diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css index ce9b9fad..c90278d2 100644 --- a/frontend/src/app/_elements/folder/folder.component.css +++ b/frontend/src/app/_elements/folder/folder.component.css @@ -158,7 +158,7 @@ .file-content { width: 100%; - height: 100%; + height: 93%; position: relative; } -- cgit v1.2.3 From b687d25e0d94992aca66d7e322643cda705db7c1 Mon Sep 17 00:00:00 2001 From: Ivan Ljubisavljevic Date: Thu, 28 Apr 2022 01:11:34 +0200 Subject: Sredjen upload csv-a #116 --- .../_elements/datatable/datatable.component.html | 14 +++----- .../src/app/_elements/folder/folder.component.css | 2 +- .../form-dataset/form-dataset.component.css | 40 ++++++++++++++++++---- .../form-dataset/form-dataset.component.html | 23 +++++++++---- .../form-dataset/form-dataset.component.ts | 8 ++++- frontend/src/styles/helper.css | 7 +--- 6 files changed, 62 insertions(+), 32 deletions(-) (limited to 'frontend/src/app/_elements/folder') diff --git a/frontend/src/app/_elements/datatable/datatable.component.html b/frontend/src/app/_elements/datatable/datatable.component.html index fe359db0..17a187ef 100644 --- a/frontend/src/app/_elements/datatable/datatable.component.html +++ b/frontend/src/app/_elements/datatable/datatable.component.html @@ -1,4 +1,4 @@ -
+
@@ -22,15 +22,9 @@ - - - -
-
+ {{tableData.numRows - 11}} redova...
-
- - - +
+
+
+ {{tableData.numRows - 11}} redova...
diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css index c90278d2..458e6b4f 100644 --- a/frontend/src/app/_elements/folder/folder.component.css +++ b/frontend/src/app/_elements/folder/folder.component.css @@ -158,7 +158,7 @@ .file-content { width: 100%; - height: 93%; + height: 92%; position: relative; } diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.css b/frontend/src/app/_elements/form-dataset/form-dataset.component.css index 66be7f7d..56eb3cef 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.css +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.css @@ -4,21 +4,47 @@ position: relative; } - .file-container{ + border: 4px solid transparent; + position: relative; margin-left: 3%; - margin-top: 3%; - margin-bottom: -50%; + margin-top: 3rem; width: 94%; - height: 500px; + min-height: 500px; +} +.fileButton{ + position: absolute; + margin-top: -3rem; + display: flex; + flex-direction: row; + align-items: center; +} +.fileButton label{ + margin-left: 10px; +} +.dottedClass +{ border: 4px dotted white; border-radius: 25px; } -.file-container .file { - opacity: 0; - padding: 5rem; + +.hidden{ + visibility: hidden; +} + +.file { + position: absolute; width: 100%; height: 100%; + opacity: 0; +} + +.file input{ + + border-radius: 4px; + margin-top: -15px; + width: 100%; + height: 100%; } .icon-display { diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html index afe1aeed..e0c7f288 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html @@ -1,11 +1,20 @@
-
-
- +
+ + file_upload + +
+ + +
+ + + + +
+
- file_upload -
@@ -33,8 +42,8 @@
- - +
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts index 9bdd7e14..254f5fe4 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Output, ViewChild } from '@angular/core'; +import { Component, ElementRef, EventEmitter, Output, ViewChild } from '@angular/core'; import Dataset from 'src/app/_data/Dataset'; import { DatasetsService } from 'src/app/_services/datasets.service'; import { ModelsService } from 'src/app/_services/models.service'; @@ -29,9 +29,14 @@ export class FormDatasetComponent { tableData: TableData = new TableData(); + @ViewChild('fileInput') fileInput! : ElementRef + + filename: String; + constructor(private modelsService: ModelsService, private datasetsService: DatasetsService, private csv: CsvParseService) { this.dataset = new Dataset(); this.dataset.delimiter = ','; + this.filename = ""; } //@ViewChild('fileImportInput', { static: false }) fileImportInput: any; cemu je ovo sluzilo? @@ -45,6 +50,7 @@ export class FormDatasetComponent { else this.tableData.hasInput = true; + this.filename = this.files[0].name; this.tableData.loaded = false; this.update(); } diff --git a/frontend/src/styles/helper.css b/frontend/src/styles/helper.css index ef875069..76cb6204 100644 --- a/frontend/src/styles/helper.css +++ b/frontend/src/styles/helper.css @@ -29,14 +29,9 @@ .footer-center { position: relative; height: 1rem; + text-align: center; } -.footer-center>* { - position: fixed; - bottom: 15px; - left: 50%; - transform: translateX(-50%); -} .row-height { white-space: nowrap; -- cgit v1.2.3 From 6eb541aa0cf268c41bf8638b73bf764d717be80b Mon Sep 17 00:00:00 2001 From: Danijel Anđelković Date: Thu, 28 Apr 2022 01:22:42 +0200 Subject: Ispravio BUG sa stilom search bar-a u folderu. Smanjio visinu slojeva u form-model. Ispravio material temu. --- .../src/app/_elements/folder/folder.component.css | 4 ++ .../_elements/form-model/form-model.component.html | 11 ++++-- frontend/src/custom-theme.scss | 46 +++++++++++----------- frontend/src/styles/layout.css | 9 +++++ 4 files changed, 43 insertions(+), 27 deletions(-) (limited to 'frontend/src/app/_elements/folder') diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css index 458e6b4f..1ce4e6a3 100644 --- a/frontend/src/app/_elements/folder/folder.component.css +++ b/frontend/src/app/_elements/folder/folder.component.css @@ -64,6 +64,10 @@ background-color: var(--ns-primary); } +#search ::ng-deep .mat-form-field-wrapper { + margin-top: -2.1rem; +} + #searchbar { height: 2.5rem; background-color: var(--ns-bg-dark-100); diff --git a/frontend/src/app/_elements/form-model/form-model.component.html b/frontend/src/app/_elements/form-model/form-model.component.html index 2a8d79a8..33ec85de 100644 --- a/frontend/src/app/_elements/form-model/form-model.component.html +++ b/frontend/src/app/_elements/form-model/form-model.component.html @@ -156,12 +156,15 @@
-
- #{{i+1}} -
+ - Aktivaciona funkcija + Aktivacija + {{ optionName }} diff --git a/frontend/src/custom-theme.scss b/frontend/src/custom-theme.scss index 8f716240..e8626080 100644 --- a/frontend/src/custom-theme.scss +++ b/frontend/src/custom-theme.scss @@ -1,7 +1,7 @@ /** * Generated theme by Material Theme Generator * https://materialtheme.arcsine.dev -* Fork at: https://materialtheme.arcsine.dev/?c=YHBhbGV0dGU$YHByaW1hcnk$YF48IzAwNjNhYiIsIj9lcjwjYjNkMGU2IiwiO2VyPCMwMDQ3OTF$LCIlPmBePCMwMGE4ZTgiLCI~ZXI8I2IzZTVmOCIsIjtlcjwjMDA4ZGRlfiwid2Fybj5gXjwjZjliN2I3IiwiP2VyPCNmZGU5ZTkiLCI7ZXI8I2Y2OWY5Zn4sIj9UZXh0PCMwMDQxNjUiLCI~PTwjZGZkN2Q3IiwiO1RleHQ8I2RmZDdkNyIsIjs9PCMwMDQxNjV$LCJmb250cz5bYEA8KC00fixgQDwoLTN$LGBAPCgtMn4sYEA8KC0xfixgQDxoZWFkbGluZX4sYEA8dGl0bGV$LGBAPHN1YiktMn4sYEA8c3ViKS0xfixgQDxib2R5LTJ$LGBAPGJvZHktMX4sYEA8YnV0dG9ufixgQDxjYXB0aW9ufixgQDxpbnB1dCIsInNpemU$bnVsbH1dLCJpY29uczxGaWxsZWQiLCI~bmVzcz5mYWxzZSwidmVyc2lvbj4xM30= +* Fork at: https://materialtheme.arcsine.dev/?c=YHBhbGV0dGU$YHByaW1hcnk$YF48IzAwYThlOCIsIj9lcjwjYjNlNWY4IiwiO2VyPCMwMDhkZGV$LCIlPmBePCMwMDYzYWIiLCI~ZXI8I2IzZDBlNiIsIjtlcjwjMDA0Nzkxfiwid2Fybj5gXjwjZjliN2I3IiwiP2VyPCNmZGU5ZTkiLCI7ZXI8I2Y2OWY5Zn4sIj9UZXh0PCNkZmQ3ZDciLCI~PTwjMDAzNDU5IiwiO1RleHQ8I2RmZDdkNyIsIjs9PCMwMDM0NTl$LCJmb250cz5bYEA8KC00fixgQDwoLTN$LGBAPCgtMn4sYEA8KC0xfixgQDxoZWFkbGluZX4sYEA8dGl0bGV$LGBAPHN1YiktMn4sYEA8c3ViKS0xfixgQDxib2R5LTJ$LGBAPGJvZHktMX4sYEA8YnV0dG9ufixgQDxjYXB0aW9ufixgQDxpbnB1dCIsInNpemU$bnVsbH1dLCJpY29uczxGaWxsZWQiLCI~bmVzcz5mYWxzZSwidmVyc2lvbj4xM30= */ @use '@angular/material' as mat; @@ -25,7 +25,7 @@ caption: mat.define-typography-level(12px, 20px, 400, 'Roboto', 0.0333em), input: mat.define-typography-level(inherit, 1.125, 400, 'Roboto', 1.5px)); // Foreground Elements // Light Theme Text -$dark-text: #004165; +$dark-text: #dfd7d7; $dark-primary-text: rgba($dark-text, 0.87); $dark-accent-text: rgba($dark-primary-text, @@ -83,7 +83,7 @@ slider-off-active: rgba($light-text, 0.3), ); // Background config // Light bg -$light-background : #dfd7d7; +$light-background : #003459; $light-bg-darker-5 : darken($light-background, 5%); $light-bg-darker-10 : darken($light-background, @@ -94,11 +94,11 @@ $light-bg-darker-30 : darken($light-background, 30%); $light-bg-lighter-5 : lighten($light-background, 5%); -$dark-bg-tooltip : lighten(#004165, +$dark-bg-tooltip : lighten(#003459, 20%); -$dark-bg-alpha-4 : rgba(#004165, +$dark-bg-alpha-4 : rgba(#003459, 0.04); -$dark-bg-alpha-12 : rgba(#004165, +$dark-bg-alpha-12 : rgba(#003459, 0.12); $mat-light-theme-background: ( background : $light-background, status-bar : $light-bg-darker-20, @@ -117,7 +117,7 @@ unselected-chip : $light-bg-darker-10, disabled-list-option : $light-bg-darker-10, ); // Dark bg -$dark-background : #004165; +$dark-background : #003459; $dark-bg-lighter-5 : lighten($dark-background, 5%); $dark-bg-lighter-10 : lighten($dark-background, @@ -126,9 +126,9 @@ $dark-bg-lighter-20 : lighten($dark-background, 20%); $dark-bg-lighter-30 : lighten($dark-background, 30%); -$light-bg-alpha-4 : rgba(#dfd7d7, +$light-bg-alpha-4 : rgba(#003459, 0.04); -$light-bg-alpha-12 : rgba(#dfd7d7, +$light-bg-alpha-12 : rgba(#003459, 0.12); // Background palette for dark themes. $mat-dark-theme-background: ( background : $dark-background, @@ -151,36 +151,36 @@ disabled-list-option : $dark-bg-lighter-10, @include mat.core($fontConfig); // Theme Config body { - --primary-color: #0063ab; - --primary-lighter-color: #b3d0e6; - --primary-darker-color: #004791; + --primary-color: #00a8e8; + --primary-lighter-color: #b3e5f8; + --primary-darker-color: #008dde; --text-primary-color: #{$light-primary-text}; --text-primary-lighter-color: #{$dark-primary-text}; --text-primary-darker-color: #{$light-primary-text}; } -$mat-primary: ( main: #0063ab, -lighter: #b3d0e6, -darker: #004791, -200: #0063ab, // For slide toggle, +$mat-primary: ( main: #00a8e8, +lighter: #b3e5f8, +darker: #008dde, +200: #00a8e8, // For slide toggle, contrast: ( main: $light-primary-text, lighter: $dark-primary-text, darker: $light-primary-text, )); $theme-primary: mat.define-palette($mat-primary, main, lighter, darker); body { - --accent-color: #00a8e8; - --accent-lighter-color: #b3e5f8; - --accent-darker-color: #008dde; + --accent-color: #0063ab; + --accent-lighter-color: #b3d0e6; + --accent-darker-color: #004791; --text-accent-color: #{$light-primary-text}; --text-accent-lighter-color: #{$dark-primary-text}; --text-accent-darker-color: #{$light-primary-text}; } -$mat-accent: ( main: #00a8e8, -lighter: #b3e5f8, -darker: #008dde, -200: #00a8e8, // For slide toggle, +$mat-accent: ( main: #0063ab, +lighter: #b3d0e6, +darker: #004791, +200: #0063ab, // For slide toggle, contrast: ( main: $light-primary-text, lighter: $dark-primary-text, darker: $light-primary-text, )); $theme-accent: mat.define-palette($mat-accent, main, diff --git a/frontend/src/styles/layout.css b/frontend/src/styles/layout.css index 9dd146b2..676bec32 100644 --- a/frontend/src/styles/layout.css +++ b/frontend/src/styles/layout.css @@ -49,4 +49,13 @@ body { .break-2 { display: none; } +} + +.center-center { + text-align: center; + margin-right: 10px; + padding-right: 10px; + padding-bottom: 15px; + font-size: 20px; + font-weight: 600; } \ No newline at end of file -- cgit v1.2.3