Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

# Conflicts:
#	frontend/src/app/app.module.ts

3 files changed, 22 insertions, 7 deletions

diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.css b/frontend/src/app/_pages/my-datasets/my-datasets.component.css
index e69de29b..57889937 100644
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.css
+++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.css
@@ -0,0 +1,8 @@
+#header {
+    background-color: #003459;
+    padding-top: 20px;
+    padding-bottom: 15px;
+    text-align: center;
+    color: white;
+    border-radius: 5px;
+}
\ No newline at end of file
diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.html b/frontend/src/app/_pages/my-datasets/my-datasets.component.html
index d996bf31..0c83dc85 100644
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.html
+++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.html
@@ -1,5 +1,8 @@
+<div id="header">
+    <h1>Moji setovi podataka</h1>
+</div>
 <div id="wrapper">
-    <div id="container" class="container p-5" style="background-color: white; min-height: 100%;">
+    <div id="container" class="container p-5" style="background-color: rgba(255, 255, 255, 0.8); min-height: 100%;">
         <div class="row mt-3 mb-2 d-flex justify-content-center">
         
         <div class="col-sm-6" style="margin-bottom: 10px;">
@@ -12,9 +15,10 @@
                     <div class="panel-footer row"><!-- panel-footer -->
                         <div class="col-xs-6 text-center">
                             <div>
-                            <button type="button" class="btn btn-default btn-lg" mat-raised-button color="primary" (click)="deleteThisDataset(dataset)">Obriši
-                                <span class="glyphicon glyphicon-chevron-right"></span>
-                            </button>
+                                <div>
+                                    <button (click)="deleteThisDataset(dataset)" mat-raised-button color="warn" style="min-width: 10rem;float: right" ><mat-icon>delete</mat-icon></button>
+                                </div>
+                            
                             </div>
                         </div>
                     </div><!-- end panel-footer -->
@@ -24,6 +28,7 @@
         <h2>Nema rezultata</h2>
         </div>
         </div>
+        
     
     </div>
     
diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
index 1551a3c8..19a6832b 100644
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
+++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
@@ -5,6 +5,7 @@ import Dataset from 'src/app/_data/Dataset';
 import { JwtHelperService } from '@auth0/angular-jwt';
 import { CookieService } from 'ngx-cookie-service';
 import shared from 'src/app/Shared';
+import { share } from 'rxjs';
 
 @Component({
   selector: 'app-my-datasets',
@@ -41,17 +42,17 @@ export class MyDatasetsComponent implements OnInit {
 */
 
 deleteThisDataset(dataset: Dataset): void{
-  console.log("OK");
+  shared.openYesNoDialog('Brisanje seta podataka','Da li ste sigurni da želite da obrišete ovaj set podataka?',() => {  
   this.datasetsS.deleteDataset(dataset).subscribe((response) => {
     console.log("OBRISANO JE", response);
     //na kraju uspesnog
     this.getAllMyDatasets();
   }, (error) =>{
       if (error.error == "Dataset with name = {name} deleted") {
-        alert("Greška pri brisanju dataseta!");
+        shared.openDialog("Greška","Greška pri brisanju dataseta!");
       }
     });
-
+  });
 }
 
   getAllMyDatasets(): void{
@@ -61,5 +62,6 @@ deleteThisDataset(dataset: Dataset): void{
       console.log(this.myDatasets);
     });
   }
+  
 
 }