From 83cb0c2fed711380f6fffe4fa922e4798db8fbc5 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 24 May 2022 22:15:37 +0200
Subject: Kada se obrise fajl prelazi se na tab My"FileType".

---
 backend/api/api/.config/dotnet-tools.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 backend/api/api/.config/dotnet-tools.json

(limited to 'backend/api')

diff --git a/backend/api/api/.config/dotnet-tools.json b/backend/api/api/.config/dotnet-tools.json
new file mode 100644
index 00000000..e80b80ff
--- /dev/null
+++ b/backend/api/api/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "6.0.5",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 305dac6f0e327a2582dc4f93e83794b5169d7c8f Mon Sep 17 00:00:00 2001
From: Danijel Anđelković <adanijel99@gmail.com>
Date: Wed, 25 May 2022 23:45:24 +0200
Subject: Popravio dosta bugova vezane za prebacivanje izmedju novog dataseta,
 i postojeceg dataseta, isto i za modele, u folderu. Popravio presporo
 prebacivanje sa jednog taba na drugi u folderu. Popravio pogresan tip stope
 normalizacije na backendu.

---
 .gitignore                                         |   2 +
 backend/api/api/Models/Model.cs                    |   4 +-
 backend/api/api/Services/FillAnEmptyDb.cs          |  36 ++---
 .../src/app/_elements/folder/folder.component.html |  19 ++-
 .../src/app/_elements/folder/folder.component.ts   | 160 ++++++++++++---------
 .../_elements/form-model/form-model.component.html |   2 +-
 6 files changed, 129 insertions(+), 94 deletions(-)

(limited to 'backend/api')

diff --git a/.gitignore b/.gitignore
index 247afbd9..e11b4739 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ backend/microservice/api/__pycache__/
 production/app/node_modules/
 production/app/dist/
 backend/microservice/api/temp/
+backend/microservice/Boston.csv
+backend/microservice/diamonds.csv
diff --git a/backend/api/api/Models/Model.cs b/backend/api/api/Models/Model.cs
index bbbf201e..6278cf8a 100644
--- a/backend/api/api/Models/Model.cs
+++ b/backend/api/api/Models/Model.cs
@@ -44,7 +44,7 @@ namespace api.Models
     {
         
 
-        public Layer(int layerNumber, string activationFunction, int neurons, string regularisation, float regularisationRate) 
+        public Layer(int layerNumber, string activationFunction, int neurons, string regularisation, string regularisationRate) 
         {
             this.layerNumber = layerNumber;
             this.activationFunction = activationFunction;
@@ -57,7 +57,7 @@ namespace api.Models
         public string activationFunction { get; set; }
         public int neurons { get; set; }
         public string regularisation { get; set; }
-        public float regularisationRate  { get; set; }
+        public string regularisationRate  { get; set; }
     }
 }
 
diff --git a/backend/api/api/Services/FillAnEmptyDb.cs b/backend/api/api/Services/FillAnEmptyDb.cs
index cd35dc78..c74de67d 100644
--- a/backend/api/api/Services/FillAnEmptyDb.cs
+++ b/backend/api/api/Services/FillAnEmptyDb.cs
@@ -117,10 +117,10 @@ namespace api.Services
                 model.outputNeurons = 0;
                 model.layers = new[]
                 {
-                    new Layer ( 0,"sigmoid", 3,"l1", 1f ),
-                    new Layer ( 1,"sigmoid", 3,"l1", 1f ),
-                    new Layer ( 2,"sigmoid", 3,"l1", 1f ),
-                    new Layer ( 3,"sigmoid", 3,"l1", 1f ),
+                    new Layer ( 0,"sigmoid", 3,"l1", "0" ),
+                    new Layer ( 1,"sigmoid", 3,"l1", "0" ),
+                    new Layer ( 2,"sigmoid", 3,"l1", "0" ),
+                    new Layer ( 3,"sigmoid", 3,"l1", "0" ),
                 };
                 model.outputLayerActivationFunction = "sigmoid";
                 model.metrics = new string[] { };
@@ -281,11 +281,11 @@ namespace api.Services
                 model.outputNeurons = 0;
                 model.layers = new[]
                 {
-                    new Layer ( 0,"softmax", 3,"l1", 3f ),
-                    new Layer ( 1,"softmax", 3,"l1", 3f ),
-                    new Layer ( 2,"softmax", 3,"l1", 3f ),
-                    new Layer ( 3,"softmax", 3,"l1", 3f ),
-                    new Layer ( 4,"softmax", 3,"l1", 3f )
+                    new Layer ( 0,"softmax", 3,"l1", "0" ),
+                    new Layer ( 1,"softmax", 3,"l1", "0" ),
+                    new Layer ( 2,"softmax", 3,"l1", "0" ),
+                    new Layer ( 3,"softmax", 3,"l1", "0" ),
+                    new Layer ( 4,"softmax", 3,"l1", "0" )
                 };
                 model.outputLayerActivationFunction = "softmax";
                 model.metrics = new string[] { };
@@ -435,9 +435,9 @@ namespace api.Services
                 model.outputNeurons = 0;
                 model.layers = new[]
                 {
-                    new Layer ( 0,"relu", 3,"l1", 1f ),
-                    new Layer ( 1,"relu", 3,"l1", 1f ),
-                    new Layer ( 2,"relu", 3,"l1", 1f )
+                    new Layer ( 0,"relu", 3,"l1", "0" ),
+                    new Layer ( 1,"relu", 3,"l1", "0" ),
+                    new Layer ( 2,"relu", 3,"l1", "0" )
                 };
                 model.outputLayerActivationFunction = "relu";
                 model.metrics = new string[] { };
@@ -593,10 +593,10 @@ namespace api.Services
                 model.outputNeurons = 0;
                 model.layers = new[]
                 {
-                    new Layer ( 0,"sigmoid", 3,"l1", 1f ),
-                    new Layer ( 1,"sigmoid", 3,"l1", 1f ),
-                    new Layer ( 2,"sigmoid", 3,"l1", 1f ),
-                    new Layer ( 3,"sigmoid", 3,"l1", 1f )
+                    new Layer ( 0,"sigmoid", 3,"l1", "0" ),
+                    new Layer ( 1,"sigmoid", 3,"l1", "0" ),
+                    new Layer ( 2,"sigmoid", 3,"l1", "0" ),
+                    new Layer ( 3,"sigmoid", 3,"l1", "0" )
                 };
                 model.outputLayerActivationFunction = "sigmoid";
                 model.metrics = new string[] { };
@@ -748,8 +748,8 @@ namespace api.Services
                 model.outputNeurons = 0;
                 model.layers = new[]
                 {
-                    new Layer ( 0,"relu", 3,"l1", 1f ),
-                    new Layer ( 1,"relu", 3,"l1", 1f )
+                    new Layer ( 0,"relu", 3,"l1", "0" ),
+                    new Layer ( 1,"relu", 3,"l1", "0" )
                 };
                 model.outputLayerActivationFunction = "relu";
                 model.metrics = new string[] { };
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index afb6085d..ebee92d2 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -58,8 +58,13 @@
         <!--{{fileToDisplay ? fileToDisplay.name : 'No file selected.'}} {{selectedFileIndex}} {{hoveringOverFileIndex}}-->
         <div class="folder-inside bg-blur">
             <div class="file-content" [ngClass]="{'form-hidden' : listView}">
-                <app-form-model [ngClass]="{'form-hidden': type != FolderType.Model}" [forExperiment]="forExperiment" [hideProblemType]="(forExperiment ? true : false)" [forProblemType]="(forExperiment ? forExperiment.type : ProblemType.Regression)" (editEvent)="onFileChange()"></app-form-model>
-                <app-form-dataset [ngClass]="{'form-hidden': type != FolderType.Dataset}" [forExperiment]="forExperiment" (editEvent)="onFileChange()"></app-form-dataset>
+                <!-- New File -->
+                <app-form-model #newModel [ngClass]="{'form-hidden': type != FolderType.Model || !newFileSelected}" [forExperiment]="forExperiment" [hideProblemType]="(forExperiment ? true : false)" [forProblemType]="(forExperiment ? forExperiment.type : ProblemType.Regression)"></app-form-model>
+                <app-form-dataset #newDataset [ngClass]="{'form-hidden': type != FolderType.Dataset || !newFileSelected}" [forExperiment]="forExperiment"></app-form-dataset>
+                <!-- Selected File -->
+                <app-form-model #selectedModel [ngClass]="{'form-hidden': type != FolderType.Model  || newFileSelected}" [forExperiment]="forExperiment" [hideProblemType]="(forExperiment ? true : false)" [forProblemType]="(forExperiment ? forExperiment.type : ProblemType.Regression)"
+                    (editEvent)="onFileChange()"></app-form-model>
+                <app-form-dataset #selectedDataset [ngClass]="{'form-hidden': type != FolderType.Dataset  || newFileSelected}" [forExperiment]="forExperiment" (editEvent)="onFileChange()"></app-form-dataset>
             </div>
             <div [ngClass]="{'form-hidden' : !listView}" class="list-view">
                 <div *ngFor="let file of filteredFiles; let i = index">
@@ -105,7 +110,7 @@
                     </div>
 
                 </div>
-                <div class="list-add" [ngSwitch]="type" *ngIf="privacy != Privacy.Public" >
+                <div class="list-add" [ngSwitch]="type" *ngIf="privacy != Privacy.Public">
                     <!-- {{privacy == Privacy.Public ? 'javni ' : ' '}} -->
                     <button mat-raised-button *ngSwitchCase="FolderType.Dataset" (click)="selectNewFile()">Dodaj izvor podataka</button>
                     <button mat-raised-button *ngSwitchCase="FolderType.Model" (click)="selectNewFile()">Dodaj konfiguraciju neuronske mreže</button>
@@ -152,17 +157,17 @@
     <div [ngSwitch]="newFileSelected" *ngIf="!listView">
         <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
             <div class="file-bottom-buttons-helper">
-            <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)">
+                <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)">
                 <mat-icon matTooltip="Obriši" matTooltipPosition="right">delete</mat-icon>
             </button>
-            <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(this.selectedFile,$event)" style="display: inline-block;">
+                <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(this.selectedFile,$event)" style="display: inline-block;">
                 <mat-icon matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon>
             </button>
-        </div>
+            </div>
             <!-- <button class="btn-clear file-button">
                 <mat-icon>zoom_out_map</mat-icon>
             </button> -->
         </div>
     </div>
-    
+
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 93ef9043..de1dfae9 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -23,8 +23,10 @@ import isEqual from 'lodash.isequal';
 })
 export class FolderComponent implements AfterViewInit {
 
-  @ViewChild(FormDatasetComponent) formDataset!: FormDatasetComponent;
-  @ViewChild(FormModelComponent) formModel!: FormModelComponent;
+  @ViewChild('selectedDataset') formDataset!: FormDatasetComponent;
+  @ViewChild('selectedModel') formModel!: FormModelComponent;
+  @ViewChild('newDataset') formNewDataset!: FormDatasetComponent;
+  @ViewChild('newModel') formNewModel!: FormModelComponent;
 
   @Input() folderName: string = 'Moji podaci';
   @Input() files!: FolderFile[]
@@ -41,8 +43,6 @@ export class FolderComponent implements AfterViewInit {
   selectedFile?: FolderFile;
   hoveringOverFileIndex: number = -1;
 
-  fileToDisplay?: FolderFile;
-
   @Output() selectedFileChanged: EventEmitter<FolderFile> = new EventEmitter();
   @Output() fileFromRoute: EventEmitter<FolderFile> = new EventEmitter();
   @Output() okPressed: EventEmitter<string> = new EventEmitter();
@@ -68,59 +68,70 @@ export class FolderComponent implements AfterViewInit {
   }
 
   displayFile() {
-    if (this.type == FolderType.Dataset) {
-      this.formDataset.dataset = <Dataset>this.fileToDisplay;
-      this.formDataset.existingFlag = false;
-    }
-    else if (this.type == FolderType.Model)
-      this.formModel.newModel = <Model>this.fileToDisplay;
-  }
-
-  hoverOverFile(i: number) {
-    /*this.hoveringOverFileIndex = i;
-    if (i != -1) {
-      this.fileToDisplay = this.files[i];
+    if (this.newFileSelected) {
+      if (this.type == FolderType.Dataset) {
+        this.formNewDataset.dataset = <Dataset>this.newFile;
+        this.formNewDataset.existingFlag = false;
+      }
+      else if (this.type == FolderType.Model)
+        this.formNewModel.newModel = <Model>this.newFile;
     } else {
-      if (this.newFileSelected) {
-        this.fileToDisplay = this.newFile;
-      } else {
-        this.fileToDisplay = this.files[this.selectedFileIndex];
+      if (this.type == FolderType.Dataset) {
+        this.formDataset.dataset = <Dataset>this.selectedFile;
+        this.formDataset.existingFlag = false;
       }
+      else if (this.type == FolderType.Model)
+        this.formModel.newModel = <Model>this.selectedFile;
     }
-    this.displayFile();*/
   }
 
   selectNewFile() {
     if (!this.newFile) {
       this.createNewFile();
     }
-    this.fileToDisplay = this.newFile;
     this.newFileSelected = true;
     this.listView = false;
     this.displayFile();
+
+    this.selectedTab = TabType.NewFile;
+
     if (this.type == FolderType.Dataset) {
-      this.formDataset.clear();
+      this.formNewDataset.clear();
     }
   }
 
   selectFile(file?: FolderFile) {
     this.formDataset.resetPagging();
     this.selectedFile = file;
-    Object.assign(this.lastFileData, this.selectedFile);
-    this.fileToDisplay = file;
+    this.updateLastFileData(file);
     if (this.type == FolderType.Experiment && file) {
       this.router.navigate(['/experiment/' + file._id]);
     }
     this.newFileSelected = false;
     this.listView = false;
     this.selectedFileChanged.emit(this.selectedFile);
-    this.selectTab(TabType.File);
     this.displayFile();
 
+    this.selectedTab = TabType.File;
+
     if (this.type == FolderType.Dataset)
       this.formDataset.loadExisting();
   }
 
+  updateLastFileData(file: FolderFile | undefined) {
+    if (!file) return;
+
+    Object.assign(this.lastFileData, file);
+    if (this.type == FolderType.Model) {
+      const lastModel = (<Model>this.lastFileData)
+      lastModel.layers = [];
+      (<Model>file).layers.forEach(layer => {
+        const clone = Object.assign({}, layer);
+        lastModel.layers.push(clone);
+      })
+    }
+  }
+
   goToExperimentPageWithPredictor(file: FolderFile, predictor: Predictor) {
     this.router.navigate(['/experiment/p/' + predictor._id]);
   }
@@ -172,7 +183,7 @@ export class FolderComponent implements AfterViewInit {
     if (!this._initialized) {
       this.files = this.folders[this.startingTab];
       this.filteredFiles = [];
-      this.selectTab(this.startingTab);
+      setTimeout(() => this.selectTab(this.startingTab));
       this._initialized = true;
     }
   }
@@ -238,7 +249,7 @@ export class FolderComponent implements AfterViewInit {
     this.loadingAction = true;
     switch (this.type) {
       case FolderType.Dataset:
-        this.formDataset!.uploadDataset((dataset: Dataset) => {
+        this.formNewDataset!.uploadDataset((dataset: Dataset) => {
           this.newFile = undefined;
           this.loadingAction = false;
           this.okPressed.emit();
@@ -250,7 +261,7 @@ export class FolderComponent implements AfterViewInit {
           });
         break;
       case FolderType.Model:
-        this.formModel.newModel.type = this.formModel.forProblemType;
+        this.formNewModel.newModel.type = this.formModel.forProblemType;
         this.modelsService.addModel(this.formModel.newModel).subscribe(model => {
           this.newFile = undefined;
           this.loadingAction = false;
@@ -300,10 +311,29 @@ export class FolderComponent implements AfterViewInit {
 
   onFileChange() {
     setTimeout(() => {
-      this.selectedFileHasChanges = !((this.selectedTab == TabType.NewFile) || isEqual(this.selectedFile, this.lastFileData));
+      this.selectedFileHasChanges = !((this.selectedTab == TabType.NewFile) || this.checkFileDataEqualToLastFileData());
     });
   }
 
+  checkFileDataEqualToLastFileData() {
+    if (this.type == FolderType.Model) {
+      let layersEqual = true;
+      const oldModel = (<Model>this.lastFileData);
+      const selectedModel = (<Model>this.selectedFile)
+      const oldLayers = oldModel.layers;
+      oldModel.layers = selectedModel.layers;
+      const objEqual = isEqual(this.selectedFile, oldModel);
+      oldLayers.forEach((layer, index) => {
+        if (!isEqual(layer, selectedModel.layers[index])) {
+          layersEqual = false;
+        }
+      });
+      return objEqual && layersEqual;
+    } else {
+      return isEqual(this.selectedFile, this.lastFileData);
+    }
+  }
+
   updateFile() {
     const file = this.selectedFile;
     this.loadingAction = true;
@@ -324,7 +354,7 @@ export class FolderComponent implements AfterViewInit {
   fileUpdatedSuccess() {
     this.loadingAction = false;
     this.selectedFileHasChanges = false;
-    Object.assign(this.lastFileData, this.selectedFile);
+    this.updateLastFileData(this.selectedFile);
     this.refreshFiles();
     this.selectedFileChanged.emit(this.selectedFile);
   }
@@ -336,16 +366,16 @@ export class FolderComponent implements AfterViewInit {
       case FolderType.Dataset:
         const dataset = <Dataset>file;
         Shared.openYesNoDialog("Obriši izvor podataka", "Eksperimenti i trenirani modeli nad ovim izvorom podataka će takođe biti obrisani, da li ste sigurni da želite da obrišete izvor: " + dataset.name + "?", () => {
-          if(this.selectedTab==TabType.MyDatasets){
-          this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
-          this.files.splice(this.files.indexOf(file), 1);
+          if (this.selectedTab == TabType.MyDatasets) {
+            this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
+            this.files.splice(this.files.indexOf(file), 1);
           }
           this.loadingAction = true;
           this.datasetsService.deleteDataset(dataset).subscribe((response) => {
             this.loadingAction = false;
-            if(this.selectedTab==TabType.File){
+            if (this.selectedTab == TabType.File) {
               this.refreshDatasets(null);
-              this.selectedFile=undefined!;
+              this.selectedFile = undefined!;
               setTimeout(() => {
                 this.selectTab(TabType.MyDatasets);
               });
@@ -357,16 +387,16 @@ export class FolderComponent implements AfterViewInit {
       case FolderType.Model:
         const model = <Model>file;
         Shared.openYesNoDialog("Obriši konfiguraciju neuronske mreže", "Trenirani modeli za ovu konfiguraciju će takođe biti obrisani, da li ste sigurni da želite da obrišete konfiguraciju: " + model.name + "?", () => {
-          if(this.selectedTab==TabType.MyModels){
-          this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
-          this.files.splice(this.files.indexOf(file), 1);
+          if (this.selectedTab == TabType.MyModels) {
+            this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
+            this.files.splice(this.files.indexOf(file), 1);
           }
           this.loadingAction = true;
           this.modelsService.deleteModel(<Model>file).subscribe((response) => {
             this.loadingAction = false;
-            if(this.selectedTab==TabType.File){
+            if (this.selectedTab == TabType.File) {
               this.refreshModels(null);
-              this.selectedFile=undefined!;
+              this.selectedFile = undefined!;
               setTimeout(() => {
                 this.selectTab(TabType.MyModels);
               });
@@ -389,20 +419,20 @@ export class FolderComponent implements AfterViewInit {
         } else {
           const experiment = <Experiment>file;
           Shared.openYesNoDialog("Obriši eksperiment", "Trenirani modeli za ovaj eksperiment će takođe biti obrisani, da li ste sigurni da želite da obrišete eksperiment: " + experiment.name + "?", () => {
-            if(this.selectedTab==TabType.MyExperiments){
-            this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
-            this.files.splice(this.files.indexOf(file), 1);
+            if (this.selectedTab == TabType.MyExperiments) {
+              this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
+              this.files.splice(this.files.indexOf(file), 1);
             }
             this.loadingAction = true;
             this.experimentsService.deleteExperiment(experiment).subscribe((response) => {
-            this.loadingAction = false;
-            if(this.selectedTab==TabType.File){
-              this.refreshExperiments();
-              this.selectedFile=undefined!;
-              setTimeout(() => {
-                this.selectTab(TabType.MyExperiments);
-              });
-            }
+              this.loadingAction = false;
+              if (this.selectedTab == TabType.File) {
+                this.refreshExperiments();
+                this.selectedFile = undefined!;
+                setTimeout(() => {
+                  this.selectTab(TabType.MyExperiments);
+                });
+              }
             });
           });
         }
@@ -489,21 +519,19 @@ export class FolderComponent implements AfterViewInit {
   hoverTab: TabType = TabType.None;
 
   selectTab(tab: TabType) {
-    setTimeout(() => {
-      if (tab == TabType.NewFile) {
-        this.selectNewFile();
-        this.selectedFile=undefined!;
-      }
-
-      this.listView = this.getListView(tab);
-      this.type = this.getFolderType(tab);
-      this.privacy = this.getPrivacy(tab);
-      this.selectedTab = tab;
-      this.files = this.folders[tab];
+    if (tab == TabType.NewFile) {
+      this.selectNewFile();
+    } else if (tab == TabType.File) {
+      this.selectFile(this.selectedFile);
+    }
+    this.listView = this.getListView(tab);
+    this.type = this.getFolderType(tab);
+    this.privacy = this.getPrivacy(tab);
+    this.selectedTab = tab;
+    this.files = this.folders[tab];
 
-      if (tab !== TabType.File && tab !== TabType.NewFile)
-        this.searchTermsChanged();
-    });
+    if (tab !== TabType.File && tab !== TabType.NewFile)
+      this.searchTermsChanged();
   }
 
   getListView(tab: TabType) {
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 1133eb52..9051a2d4 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.html
+++ b/frontend/src/app/_elements/form-model/form-model.component.html
@@ -229,7 +229,7 @@
 
                 <mat-form-field appearance="fill" class="mat-fix">
                     <mat-label>Stopa regularizacije</mat-label>
-                    <mat-select [(ngModel)]="newModel.layers[i].regularisationRate">
+                    <mat-select [(ngModel)]="newModel.layers[i].regularisationRate" (selectionChange)="editEvent.emit();">
                         <mat-option *ngFor="let option of Object.keys(RegularisationRate); let optionName of Object.values(RegularisationRate)" [value]="option">
                             {{ optionName }}
                         </mat-option>
-- 
cgit v1.2.3


From 60782001174dc7f6f8f5670bff5aaca54667b734 Mon Sep 17 00:00:00 2001
From: Danijel Anđelković <adanijel99@gmail.com>
Date: Sat, 4 Jun 2022 01:17:55 +0200
Subject: Dodao poredjenje modela/prediktora nad eksperimentom. Popravio bug sa
 dodavanjem novog prediktora.

---
 backend/api/api/Controllers/PredictorController.cs | 22 ++++---
 backend/microservice/api/controller.py             |  5 +-
 .../_charts/line-chart/line-chart.component.css    |  2 +-
 .../_charts/line-chart/line-chart.component.html   | 15 ++---
 .../_charts/line-chart/line-chart.component.ts     | 23 +++++--
 .../app/_pages/experiment/experiment.component.css | 30 +++++++++
 .../_pages/experiment/experiment.component.html    | 19 ++++--
 .../app/_pages/experiment/experiment.component.ts  | 71 ++++++++++++++++++++--
 8 files changed, 154 insertions(+), 33 deletions(-)

(limited to 'backend/api')

diff --git a/backend/api/api/Controllers/PredictorController.cs b/backend/api/api/Controllers/PredictorController.cs
index 6ff7746a..56095553 100644
--- a/backend/api/api/Controllers/PredictorController.cs
+++ b/backend/api/api/Controllers/PredictorController.cs
@@ -21,7 +21,7 @@ namespace api.Controllers
         private readonly IHubContext<ChatHub> _ichat;
         private readonly IModelService _modelService;
 
-        public PredictorController(IPredictorService predictorService, IConfiguration configuration, IJwtToken Token, IMlConnectionService mlConnectionService, IExperimentService experimentService,IUserService userService, IHubContext<ChatHub> ichat,IModelService modelService)
+        public PredictorController(IPredictorService predictorService, IConfiguration configuration, IJwtToken Token, IMlConnectionService mlConnectionService, IExperimentService experimentService, IUserService userService, IHubContext<ChatHub> ichat, IModelService modelService)
         {
             _predictorService = predictorService;
             jwtToken = Token;
@@ -78,7 +78,7 @@ namespace api.Controllers
         //public ActionResult<List<Predictor>> Search(string name)
         //{
         //    string username = getUsername();
-            
+
         //    if (username == null)
         //        return BadRequest();
 
@@ -138,7 +138,7 @@ namespace api.Controllers
 
             List<Predictor> lista = _predictorService.SortPredictors(userId, ascdsc, latest);
 
-            if(latest == 0)
+            if (latest == 0)
                 return lista;
             else
             {
@@ -155,19 +155,23 @@ namespace api.Controllers
         [HttpPost("add")]
         public async Task<ActionResult<Predictor>> Post([FromBody] Predictor predictor)
         {
-            var user=_userService.GetUserById(predictor.uploaderId);
+            var user = _userService.GetUserById(predictor.uploaderId);
             predictor.dateCreated = DateTime.Now.ToUniversalTime();
             var model = _modelService.GetOneModel(predictor.modelId);
-            if (model == null || user==null)
+            if (model == null || user == null)
                 return BadRequest("Model not found or user doesnt exist");
-            Predictor p=_predictorService.Exists(predictor.modelId, predictor.experimentId);
-            if (p == null)
+            Predictor p = _predictorService.Exists(predictor.modelId, predictor.experimentId);
+
+            if (p == null) {
                 _predictorService.Create(predictor);
-            else
+            }
+            else {
+                predictor._id = p._id;
                 _predictorService.Update(p._id, predictor);
+            }
             if (ChatHub.CheckUser(user._id))
                 foreach(var connection in ChatHub.getAllConnectionsOfUser(user._id))
-                    await _ichat.Clients.Client(connection).SendAsync("NotifyPredictor", predictor._id,model.name);
+                    await _ichat.Clients.Client(connection).SendAsync("NotifyPredictor", predictor._id, model._id);
             return CreatedAtAction(nameof(Get), new { id = predictor._id }, predictor);
             
         }
diff --git a/backend/microservice/api/controller.py b/backend/microservice/api/controller.py
index c82634a2..bc8c17a0 100644
--- a/backend/microservice/api/controller.py
+++ b/backend/microservice/api/controller.py
@@ -1,3 +1,4 @@
+from asyncio.windows_events import NULL
 from cmath import log
 from dataclasses import dataclass
 from distutils.command.upload import upload
@@ -112,12 +113,12 @@ def train():
         "metricsMse":histMetrics[6],
         "metricsValMse":histMetrics[7]
     }
-    #print(predictor)
+    print(predictor)
     
     url = config.api_url + "/Predictor/add"
     r = requests.post(url, json=predictor).text
     
-    #print(r)
+    print(r)
     return r
 
 @app.route('/predict', methods = ['POST'])
diff --git a/frontend/src/app/_elements/_charts/line-chart/line-chart.component.css b/frontend/src/app/_elements/_charts/line-chart/line-chart.component.css
index 9694119d..862a86e1 100644
--- a/frontend/src/app/_elements/_charts/line-chart/line-chart.component.css
+++ b/frontend/src/app/_elements/_charts/line-chart/line-chart.component.css
@@ -4,7 +4,7 @@
 }
 
 .bottom {
-    height: 10%;
+    height: 30px;
 }
 
 canvas {
diff --git a/frontend/src/app/_elements/_charts/line-chart/line-chart.component.html b/frontend/src/app/_elements/_charts/line-chart/line-chart.component.html
index a81f9dc4..cc1c0121 100644
--- a/frontend/src/app/_elements/_charts/line-chart/line-chart.component.html
+++ b/frontend/src/app/_elements/_charts/line-chart/line-chart.component.html
@@ -1,28 +1,29 @@
-<div #wrapper class="position-relative" style="width:100%;height:95%;">
+<div #wrapper class="position-relative" style="width:100%;height:95%; border: 1px solid var(--ns-accent); background-color: var(--ns-bg-dark-100); border-radius: 15px;">
     <div class="d-flex flex-column align-items-stretch" [ngClass]="{'hide':experiment.type != ProblemType.Regression}" style="width: 100%; height: 90%;">
         <div class="canvas-container">
-            <canvas id="myChartmae" #canvas>   
+            <canvas #myChartmae>   
             </canvas>
         </div>
         <div class="canvas-container">
-            <canvas id="myChartmse" #canvas>   
+            <canvas #myChartmse>   
             </canvas>
         </div>
     </div>
     <div class="ns-row" [ngClass]="{'hide':experiment.type == ProblemType.Regression}">
         <div class="ns-col">
-            <canvas id="myChartloss" #canvas>   
+            <canvas #myChartloss>   
             </canvas>
         </div>
         <div class="ns-col">
-            <canvas id="myChartacc" #canvas>   
+            <canvas #myChartacc>
             </canvas>
         </div>
     </div>
 
 
-    <div class="bottom d-flex flex-row align-items-center">
-        <button *ngIf="predictor" class="btn-clear dl-button d-flex flex-row" (click)="downloadFile();" style="display: inline-block;" matTooltip="Preuzmi H5" matTooltipPosition="above">
+    <div class="bottom d-flex flex-row" style="justify-content: space-between; align-items: center;">
+        <h3 class="mt-5 mx-2"><span *ngIf="modelName.length > 0 && predictor">Model treniran za konfiguraciju: {{modelName}}</span><span *ngIf="modelName.length > 0 && !predictor">Model se trenira za konfiguraciju: {{modelName}}</span></h3>
+        <button *ngIf="predictor" class="mt-5 mx-2 btn-clear dl-button d-flex flex-row" (click)="downloadFile();" style="display: inline-block;" matTooltip="Preuzmi H5" matTooltipPosition="above">
             <mat-icon>download</mat-icon> <div>H5</div>
         </button>
     </div>
diff --git a/frontend/src/app/_elements/_charts/line-chart/line-chart.component.ts b/frontend/src/app/_elements/_charts/line-chart/line-chart.component.ts
index ceff02bd..b2eec377 100644
--- a/frontend/src/app/_elements/_charts/line-chart/line-chart.component.ts
+++ b/frontend/src/app/_elements/_charts/line-chart/line-chart.component.ts
@@ -26,8 +26,12 @@ export class LineChartComponent implements AfterViewInit {
 
   @ViewChild('wrapper')
   wrapper!: ElementRef;
-  @ViewChildren('canvas')
-  canvas!: QueryList<ElementRef>;
+
+  @ViewChild('myChartacc') myChartacc!: ElementRef;
+  @ViewChild('myChartloss') myChartloss!: ElementRef;
+  @ViewChild('myChartmse') myChartmse!: ElementRef;
+  @ViewChild('myChartmae') myChartmae!: ElementRef;
+
   @Input() experiment!: Experiment;
   @Input() predictor?: Predictor;
 
@@ -149,7 +153,7 @@ export class LineChartComponent implements AfterViewInit {
 
     window.addEventListener('resize', () => { this.resize() });
     this.resize();
-    this.myChartAcc = new Chart("myChartacc",
+    this.myChartAcc = new Chart(this.myChartacc.nativeElement,
       {
         type: 'line',
         data: {
@@ -222,7 +226,7 @@ export class LineChartComponent implements AfterViewInit {
 
     );
     if (this.experiment.type == ProblemType.BinaryClassification || this.experiment.type == ProblemType.MultiClassification) { }
-    this.myChartLoss = new Chart("myChartloss",
+    this.myChartLoss = new Chart(this.myChartloss.nativeElement,
       {
         type: 'line',
         data: {
@@ -294,7 +298,7 @@ export class LineChartComponent implements AfterViewInit {
       },
 
     );
-    this.myChartMse = new Chart("myChartmse",
+    this.myChartMse = new Chart(this.myChartmse.nativeElement,
       {
         type: 'line',
         data: {
@@ -366,7 +370,7 @@ export class LineChartComponent implements AfterViewInit {
       },
 
     );
-    this.myChartMae = new Chart("myChartmae",
+    this.myChartMae = new Chart(this.myChartmae.nativeElement,
       {
         type: 'line',
         data: {
@@ -440,5 +444,12 @@ export class LineChartComponent implements AfterViewInit {
     );
 
   }
+
+  modelName: string = '';
+
+  setName(name: string) {
+    this.modelName = name;
+    this.predictor = undefined;
+  }
 }
 
diff --git a/frontend/src/app/_pages/experiment/experiment.component.css b/frontend/src/app/_pages/experiment/experiment.component.css
index 59e004e9..37edd3c2 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.css
+++ b/frontend/src/app/_pages/experiment/experiment.component.css
@@ -74,4 +74,34 @@ mat-stepper {
 
 .text-overflow-experiment-name {
     overflow-wrap: break-word;
+}
+
+#compareButton {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+}
+
+.side-by-side {
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    height: 100%;
+}
+
+
+/* one item */
+
+.side-by-side>*:first-child:nth-last-child(1) {
+    /* -or- li:only-child { */
+    width: 100%;
+}
+
+
+/* two items */
+
+.side-by-side>*:first-child:nth-last-child(2),
+.side-by-side>*:first-child:nth-last-child(2)~li {
+    width: 50%;
+    margin: 5px;
 }
\ No newline at end of file
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html
index 2e5a269c..a0ed26ef 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.html
+++ b/frontend/src/app/_pages/experiment/experiment.component.html
@@ -25,10 +25,10 @@
                     <ng-template matStepLabel>
                         <span class="label addedElement text-overflow" *ngIf="experiment._id!=''">Predvideti:{{experiment.outputColumn}}</span>
                         <span *ngIf="!this.step1" class="align-middle"><mat-icon>lock</mat-icon></span>
-                        <span class="label text-overflow" *ngIf="experiment._id==''">Odabir kolona </span>
+                        <span class="label text-overflow" *ngIf="experiment._id==''">Priprema podataka </span>
                     </ng-template>
                     <ng-template matStepContent>
-                        <p class="text-left text-overflow">Pripremite podatke i izaberite izlazne kolone</p>
+                        <p class="text-left text-overflow">Pripremite podatke i odaberite ulazne i izlaznu kolonu</p>
                     </ng-template>
                 </mat-step>
                 <mat-step [completed]="this.step3">
@@ -62,12 +62,23 @@
         </div>
         <div #steps id="step_3" class="step-content" *ngIf="step2">
             <div class="step-content-inside">
-                <app-folder #folderModel [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyModels]" (okPressed)="goToPage(3); trainModel();" (selectedFileChanged)="setModel($event)"></app-folder>
+                <div id="compareButton">
+                    <button mat-raised-button color="accent" *ngIf="!comparing" (click)="toggleCompare()"><mat-icon>compare</mat-icon> Dodaj konfiguraciju za upoređivanje</button>
+                    <button mat-raised-button *ngIf="comparing" (click)="toggleCompare()"><mat-icon>not_interested</mat-icon> Prekini upoređivanje</button>
+                </div>
+                <div class="side-by-side">
+                    <app-folder #folderModel [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyModels]" (okPressed)="goToPage(3); trainModel();" (selectedFileChanged)="setModel($event);"></app-folder>
+                    <app-folder #folderModelCompare [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.MyModels" [tabsToShow]="[TabType.MyModels]" (okPressed)="goToPage(3); trainModelCmp();" (selectedFileChanged)="setModelCmp($event);" style="width: 50%;"
+                        *ngIf="comparing"></app-folder>
+                </div>
             </div>
         </div>
         <div #steps id="step_4" class="step-content" *ngIf="step3">
             <div class="step-content-inside">
-                <app-line-chart [experiment]="experiment" [predictor]="predictor!"></app-line-chart>
+                <div class="side-by-side">
+                    <app-line-chart #linechart [experiment]="experiment" [predictor]="predictor!"></app-line-chart>
+                    <app-line-chart #linechartCompare [experiment]="experiment" style="width: 50%;" *ngIf="comparing"></app-line-chart>
+                </div>
             </div>
         </div>
         <!--
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts
index 4ceb9a03..5822eedf 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.ts
+++ b/frontend/src/app/_pages/experiment/experiment.component.ts
@@ -37,13 +37,27 @@ export class ExperimentComponent implements AfterViewInit {
   @ViewChild("folderDataset") folderDataset!: FolderComponent;
   @ViewChild(ColumnTableComponent) columnTable!: ColumnTableComponent;
   @ViewChild("folderModel") folderModel!: FolderComponent;
-  @ViewChild(LineChartComponent) linechartComponent!: LineChartComponent;
+  @ViewChild("folderModelCompare") folderModelCmp!: FolderComponent;
+  @ViewChild("linechart") linechartComponent!: LineChartComponent;
+  @ViewChild("linechartCompare") linechartComponentCmp!: LineChartComponent;
 
   step1: boolean = false;
   step2: boolean = false;
   step3: boolean = false;
   step4: boolean = false;
 
+  comparing: boolean = false;
+
+  toggleCompare() {
+    this.comparing = !this.comparing;
+    setTimeout(() => {
+      if (this.folderModel.formModel)
+        this.folderModel.formModel.graph.resize();
+      if (this.folderModel.formNewModel)
+        this.folderModel.formNewModel.graph.resize();
+    });
+  }
+
   constructor(private experimentsService: ExperimentsService, private modelsService: ModelsService, private datasetsService: DatasetsService, private predictorsService: PredictorsService, private signalRService: SignalRService, private route: ActivatedRoute) {
     this.experiment = new Experiment("exp1");
   }
@@ -65,6 +79,15 @@ export class ExperimentComponent implements AfterViewInit {
     }
   }
 
+  trainModelCmp() {
+    if (!this.modelToTrainCmp) {
+      Shared.openDialog('Greška', 'Morate odabrati konfiguraciju neuronske mreže');
+    } else {
+      this.modelsService.trainModel(this.modelToTrainCmp._id, this.experiment._id).subscribe(() => { console.log("pocelo treniranje") });
+      this.step4 = true;
+    }
+  }
+
   stepHeight = this.calcStepHeight();
 
   calcStepHeight() {
@@ -87,16 +110,48 @@ export class ExperimentComponent implements AfterViewInit {
 
     if (this.signalRService.hubConnection) {
       this.signalRService.hubConnection.on("NotifyEpoch", (mName: string, mId: string, stat: string, totalEpochs: number, currentEpoch: number) => {
-        if (currentEpoch == 0) {
-          this.history = [];
-        }
+
         if (this.modelToTrain?._id == mId) {
+          if (currentEpoch == 0) {
+            this.linechartComponent.setName(mName);
+            this.history = [];
+          }
+
           stat = stat.replace(/'/g, '"');
           this.history.push(JSON.parse(stat));
+
           this.linechartComponent.updateAll(this.history, this.modelToTrain.epochs);
         }
+
+        if (this.modelToTrainCmp?._id == mId) {
+          if (currentEpoch == 0) {
+            this.linechartComponentCmp.setName(mName);
+            this.historyCmp = [];
+          }
+
+          stat = stat.replace(/'/g, '"');
+
+          this.historyCmp.push(JSON.parse(stat));
+          this.linechartComponentCmp.updateAll(this.historyCmp, this.modelToTrainCmp.epochs);
+        }
       });
 
+      this.signalRService.hubConnection.on("NotifyPredictor", (pId: string, mId: string) => {
+        console.log("Predictor trained: ", pId, "for model:", mId);
+
+        if (this.modelToTrain && mId == this.modelToTrain._id) {
+          this.predictorsService.getPredictor(pId).subscribe((predictor) => {
+            this.linechartComponent.predictor = predictor;
+          });
+        }
+
+        if (this.modelToTrainCmp && mId == this.modelToTrainCmp._id) {
+          this.predictorsService.getPredictor(pId).subscribe((predictor) => {
+            this.linechartComponentCmp.predictor = predictor;
+          });
+        }
+      })
+
     }
 
     this.route.queryParams.subscribe(params => {
@@ -142,6 +197,7 @@ export class ExperimentComponent implements AfterViewInit {
   }
 
   history: any[] = [];
+  historyCmp: any[] = [];
 
   updatePageIfScrolled() {
     if (this.scrolling) return;
@@ -227,10 +283,17 @@ export class ExperimentComponent implements AfterViewInit {
   }
 
   modelToTrain?: Model;
+  modelToTrainCmp?: Model;
 
   setModel(model: FolderFile) {
     const m = <Model>model;
     this.modelToTrain = m;
     this.step3 = true;
   }
+
+  setModelCmp(model: FolderFile) {
+    const m = <Model>model;
+    this.modelToTrainCmp = m;
+    this.step3 = true;
+  }
 }
-- 
cgit v1.2.3


From 09a33e72501affb6d07507e396151f02d16daf9a Mon Sep 17 00:00:00 2001
From: Danijel Anđelković <adanijel99@gmail.com>
Date: Mon, 6 Jun 2022 02:45:47 +0200
Subject: Dodao deljenje datasetova i modela, dialog za podesavanje opcija za
 deljenje (isPublic accessibleByLink), sa mogucnoscu kopiranja linka za
 deljenje. Dodao stranice za prikaz javnih datasetova / modela.

---
 backend/api/api/Controllers/DatasetController.cs   |  32 ++++++++++
 backend/api/api/Controllers/ModelController.cs     |  32 ++++++++++
 backend/api/api/Interfaces/IDatasetService.cs      |   3 +
 backend/api/api/Interfaces/IModelService.cs        |   3 +
 backend/api/api/Services/DatasetService.cs         |  20 +++++-
 backend/api/api/Services/ModelService.cs           |  16 +++++
 docs/SpecifikacijaDizajnaSoftvera.docx             | Bin 0 -> 5793452 bytes
 .../_charts/line-chart/line-chart.component.css    |   3 +-
 .../_charts/line-chart/line-chart.component.html   |  10 ++-
 .../src/app/_elements/folder/folder.component.html |  10 ++-
 .../src/app/_elements/folder/folder.component.ts   |  36 ++++++++++-
 .../form-dataset/form-dataset.component.html       |   8 +--
 .../form-dataset/form-dataset.component.ts         |   1 +
 .../_elements/form-model/form-model.component.ts   |   2 +
 .../share-dialog/share-dialog.component.css        |   0
 .../share-dialog/share-dialog.component.html       |  14 +++++
 .../share-dialog/share-dialog.component.spec.ts    |  25 ++++++++
 .../_modals/share-dialog/share-dialog.component.ts |  70 +++++++++++++++++++++
 .../_pages/page-dataset/page-dataset.component.css |   0
 .../page-dataset/page-dataset.component.html       |   4 ++
 .../page-dataset/page-dataset.component.spec.ts    |  25 ++++++++
 .../_pages/page-dataset/page-dataset.component.ts  |  45 +++++++++++++
 .../app/_pages/page-model/page-model.component.css |   0
 .../_pages/page-model/page-model.component.html    |   4 ++
 .../_pages/page-model/page-model.component.spec.ts |  25 ++++++++
 .../app/_pages/page-model/page-model.component.ts  |  41 ++++++++++++
 frontend/src/app/_services/datasets.service.ts     |   8 +++
 frontend/src/app/_services/models.service.ts       |   8 +++
 frontend/src/app/app-routing.module.ts             |   4 ++
 frontend/src/app/app.module.ts                     |   8 ++-
 frontend/src/styles/layout.css                     |  12 +++-
 31 files changed, 449 insertions(+), 20 deletions(-)
 create mode 100644 docs/SpecifikacijaDizajnaSoftvera.docx
 create mode 100644 frontend/src/app/_modals/share-dialog/share-dialog.component.css
 create mode 100644 frontend/src/app/_modals/share-dialog/share-dialog.component.html
 create mode 100644 frontend/src/app/_modals/share-dialog/share-dialog.component.spec.ts
 create mode 100644 frontend/src/app/_modals/share-dialog/share-dialog.component.ts
 create mode 100644 frontend/src/app/_pages/page-dataset/page-dataset.component.css
 create mode 100644 frontend/src/app/_pages/page-dataset/page-dataset.component.html
 create mode 100644 frontend/src/app/_pages/page-dataset/page-dataset.component.spec.ts
 create mode 100644 frontend/src/app/_pages/page-dataset/page-dataset.component.ts
 create mode 100644 frontend/src/app/_pages/page-model/page-model.component.css
 create mode 100644 frontend/src/app/_pages/page-model/page-model.component.html
 create mode 100644 frontend/src/app/_pages/page-model/page-model.component.spec.ts
 create mode 100644 frontend/src/app/_pages/page-model/page-model.component.ts

(limited to 'backend/api')

diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs
index c93ac9db..9a3c3d86 100644
--- a/backend/api/api/Controllers/DatasetController.cs
+++ b/backend/api/api/Controllers/DatasetController.cs
@@ -282,5 +282,37 @@ namespace api.Controllers
             return Ok($"Dataset with ID = {id} deleted");
 
         }
+
+        [HttpPut("UpdateAccessibleByLink/{datasetId}")]
+        [Authorize(Roles = "User")]
+        public ActionResult UpdateAccessibleByLink(string datasetId, [FromBody] bool accessibleByLink)
+        {
+            string uploaderId = getUserId();
+
+            Dataset dataset = _datasetService.GetOneDataset(datasetId);
+
+            if (uploaderId != dataset.uploaderId)
+                return Unauthorized();
+
+            _datasetService.UpdateAccessibleByLink(datasetId, accessibleByLink);
+
+            return Ok(dataset.accessibleByLink);
+        }
+
+        [HttpPut("UpdateIsPublic/{datasetId}")]
+        [Authorize(Roles = "User")]
+        public ActionResult UpdateIsPublic(string datasetId, [FromBody] bool isPublic)
+        {
+            string uploaderId = getUserId();
+
+            Dataset dataset = _datasetService.GetOneDataset(datasetId);
+
+            if (uploaderId != dataset.uploaderId)
+                return Unauthorized();
+
+            _datasetService.UpdateIsPublic(datasetId, isPublic);
+
+            return Ok(dataset.isPublic);
+        }
     }
 }
\ No newline at end of file
diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs
index c574de28..c7dfe89c 100644
--- a/backend/api/api/Controllers/ModelController.cs
+++ b/backend/api/api/Controllers/ModelController.cs
@@ -312,6 +312,38 @@ namespace api.Controllers
 
         }
 
+        [HttpPut("UpdateAccessibleByLink/{modelId}")]
+        [Authorize(Roles = "User")]
+        public ActionResult UpdateAccessibleByLink(string modelId, [FromBody] bool accessibleByLink)
+        {
+            string uploaderId = getUserId();
+
+            Model model = _modelService.GetOneModel(modelId);
+
+            if (uploaderId != model.uploaderId)
+                return Unauthorized();
+
+            _modelService.UpdateAccessibleByLink(modelId, accessibleByLink);
+
+            return Ok(model.accessibleByLink);
+        }
+
+        [HttpPut("UpdateIsPublic/{modelId}")]
+        [Authorize(Roles = "User")]
+        public ActionResult UpdateIsPublic(string modelId, [FromBody] bool isPublic)
+        {
+            string uploaderId = getUserId();
+
+            Model model = _modelService.GetOneModel(modelId);
+
+            if (uploaderId != model.uploaderId)
+                return Unauthorized();
+
+            _modelService.UpdateIsPublic(modelId, isPublic);
+
+            return Ok(model.isPublic);
+        }
+
     }
 
     public class TrainModelObject
diff --git a/backend/api/api/Interfaces/IDatasetService.cs b/backend/api/api/Interfaces/IDatasetService.cs
index 2f7d0010..5a91c82b 100644
--- a/backend/api/api/Interfaces/IDatasetService.cs
+++ b/backend/api/api/Interfaces/IDatasetService.cs
@@ -19,5 +19,8 @@ namespace api.Services
         public void Update(Dataset dataset);
         string GetDatasetId(string fileId);
         //bool CheckDb();
+
+        public void UpdateAccessibleByLink(string datasetId, bool accessibleByLink);
+        public void UpdateIsPublic(string datasetId, bool isPublic);
     }
 }
diff --git a/backend/api/api/Interfaces/IModelService.cs b/backend/api/api/Interfaces/IModelService.cs
index 41cd279c..949c7278 100644
--- a/backend/api/api/Interfaces/IModelService.cs
+++ b/backend/api/api/Interfaces/IModelService.cs
@@ -19,6 +19,9 @@ namespace api.Services
         void Delete(string userId, string name);
         bool CheckHyperparameters(int inputNeurons, int hiddenLayerNeurons, int hiddenLayers, int outputNeurons);
         bool CheckDb();
+
+        public void UpdateAccessibleByLink(string modelId, bool accessibleByLink);
+        public void UpdateIsPublic(string modelId, bool isPublic);
     }
 }
 
diff --git a/backend/api/api/Services/DatasetService.cs b/backend/api/api/Services/DatasetService.cs
index 0b84721e..cd27f275 100644
--- a/backend/api/api/Services/DatasetService.cs
+++ b/backend/api/api/Services/DatasetService.cs
@@ -75,7 +75,7 @@ namespace api.Services
 
         public Dataset GetOneDataset(string userId, string id)
         {
-            return _dataset.Find(dataset => dataset.uploaderId == userId && dataset._id == id && dataset.isPreProcess).FirstOrDefault();
+            return _dataset.Find(dataset => (dataset.uploaderId == userId || dataset.isPublic || dataset.accessibleByLink) && dataset._id == id && dataset.isPreProcess).FirstOrDefault();
         }
         public Dataset GetOneDatasetN(string userId, string name)
         {
@@ -104,6 +104,22 @@ namespace api.Services
 
             return dataset._id;
         }
-        
+
+        public void UpdateAccessibleByLink(string datasetId, bool accessibleByLink)
+        {
+            Dataset dataset = _dataset.Find(dataset => dataset._id == datasetId).FirstOrDefault();
+            dataset.accessibleByLink = accessibleByLink;
+
+            _dataset.ReplaceOne(dataset => dataset._id == datasetId, dataset);
+        }
+
+        public void UpdateIsPublic(string datasetId, bool isPublic)
+        {
+            Dataset dataset = _dataset.Find(dataset => dataset._id == datasetId).FirstOrDefault();
+            dataset.isPublic = isPublic;
+
+            _dataset.ReplaceOne(dataset => dataset._id == datasetId, dataset);
+        }
+
     }
 }
diff --git a/backend/api/api/Services/ModelService.cs b/backend/api/api/Services/ModelService.cs
index 71db6340..1c690ca7 100644
--- a/backend/api/api/Services/ModelService.cs
+++ b/backend/api/api/Services/ModelService.cs
@@ -106,5 +106,21 @@ namespace api.Services
                 return true;
 
         }
+
+        public void UpdateAccessibleByLink(string modelId, bool accessibleByLink)
+        {
+            Model model = _model.Find(model => model._id == modelId).FirstOrDefault();
+            model.accessibleByLink = accessibleByLink;
+
+            _model.ReplaceOne(model => model._id == modelId, model);
+        }
+
+        public void UpdateIsPublic(string modelId, bool isPublic)
+        {
+            Model model = _model.Find(model => model._id == modelId).FirstOrDefault();
+            model.isPublic = isPublic;
+
+            _model.ReplaceOne(model => model._id == modelId, model);
+        }
     }
 }
diff --git a/docs/SpecifikacijaDizajnaSoftvera.docx b/docs/SpecifikacijaDizajnaSoftvera.docx
new file mode 100644
index 00000000..dfc5345b
Binary files /dev/null and b/docs/SpecifikacijaDizajnaSoftvera.docx differ
diff --git a/frontend/src/app/_elements/_charts/line-chart/line-chart.component.css b/frontend/src/app/_elements/_charts/line-chart/line-chart.component.css
index 862a86e1..60b341d0 100644
--- a/frontend/src/app/_elements/_charts/line-chart/line-chart.component.css
+++ b/frontend/src/app/_elements/_charts/line-chart/line-chart.component.css
@@ -22,7 +22,8 @@ canvas {
 }
 
 .hide {
-    display: none;
+    display: none !important;
+    background-color: red;
 }
 
 .dl-button {
diff --git a/frontend/src/app/_elements/_charts/line-chart/line-chart.component.html b/frontend/src/app/_elements/_charts/line-chart/line-chart.component.html
index cc1c0121..505dd50b 100644
--- a/frontend/src/app/_elements/_charts/line-chart/line-chart.component.html
+++ b/frontend/src/app/_elements/_charts/line-chart/line-chart.component.html
@@ -1,5 +1,5 @@
 <div #wrapper class="position-relative" style="width:100%;height:95%; border: 1px solid var(--ns-accent); background-color: var(--ns-bg-dark-100); border-radius: 15px;">
-    <div class="d-flex flex-column align-items-stretch" [ngClass]="{'hide':experiment.type != ProblemType.Regression}" style="width: 100%; height: 90%;">
+    <div class="d-flex flex-column align-items-stretch" [ngClass]="{'hide':experiment.type !== ProblemType.Regression}" style="width: 100%; height: 90%;">
         <div class="canvas-container">
             <canvas #myChartmae>   
             </canvas>
@@ -9,18 +9,16 @@
             </canvas>
         </div>
     </div>
-    <div class="ns-row" [ngClass]="{'hide':experiment.type == ProblemType.Regression}">
-        <div class="ns-col">
+    <div class="d-flex flex-column align-items-stretch" [ngClass]="{'hide':experiment.type === ProblemType.Regression}" style="width: 100%; height: 90%;">
+        <div class="canvas-container">
             <canvas #myChartloss>   
             </canvas>
         </div>
-        <div class="ns-col">
+        <div class="canvas-container">
             <canvas #myChartacc>
             </canvas>
         </div>
     </div>
-
-
     <div class="bottom d-flex flex-row" style="justify-content: space-between; align-items: center;">
         <h3 class="mt-5 mx-2"><span *ngIf="modelName.length > 0 && predictor">Model treniran za konfiguraciju: {{modelName}}</span><span *ngIf="modelName.length > 0 && !predictor">Model se trenira za konfiguraciju: {{modelName}}</span></h3>
         <button *ngIf="predictor" class="mt-5 mx-2 btn-clear dl-button d-flex flex-row" (click)="downloadFile();" style="display: inline-block;" matTooltip="Preuzmi H5" matTooltipPosition="above">
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index 5d5e7822..e77e05a3 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -76,6 +76,9 @@
                             {{file.lastUpdated | date}}
                         </div>
                         <div class="mx-2 hover-show" *ngIf="selectedTab !== TabType.PublicDatasets && selectedTab !== TabType.PublicModels">
+                            <button *ngIf="selectedTab==TabType.MyDatasets || selectedTab==TabType.MyModels" class="btn-clear file-button" (click)="shareFile(file,$event)" style="display: inline-block;" matTooltip="Podeli" matTooltipPosition="above">
+                                <mat-icon>share</mat-icon>
+                            </button>
                             <button *ngIf="selectedTab==TabType.MyDatasets" class="btn-clear file-button" (click)="downloadFile(file,$event)" style="display: inline-block;" matTooltip="Preuzmi" matTooltipPosition="above">
                                 <mat-icon>download</mat-icon>
                             </button>
@@ -122,12 +125,15 @@
     <div [ngSwitch]="newFileSelected" *ngIf="!listView">
         <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
             <div class="file-bottom-buttons-helper">
-                <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)" matTooltip="Obriši" matTooltipPosition="above">
+                <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(selectedFile, $event)" matTooltip="Obriši" matTooltipPosition="above">
                     <mat-icon>delete</mat-icon>
                 </button>
-                <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(this.selectedFile,$event)" style="display: inline-block;" matTooltip="Preuzmi" matTooltipPosition="above">
+                <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(selectedFile,$event)" style="display: inline-block;" matTooltip="Preuzmi" matTooltipPosition="above">
                     <mat-icon>download</mat-icon>
                 </button>
+                <button *ngIf="this.selectedFile && selectedTab == TabType.File" class="btn-clear file-button" (click)="shareFile(selectedFile,$event)" style="display: inline-block;" matTooltip="Podeli" matTooltipPosition="above">
+                    <mat-icon>share</mat-icon>
+                </button>
             </div>
             <!-- <button class="btn-clear file-button">
                 <mat-icon>zoom_out_map</mat-icon>
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 60f6857c..418b5a7f 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -15,6 +15,8 @@ import { ActivatedRoute, Router } from '@angular/router';
 import Predictor from 'src/app/_data/Predictor';
 import FileSaver from 'file-saver';
 import isEqual from 'lodash.isequal';
+import { ShareDialogComponent } from 'src/app/_modals/share-dialog/share-dialog.component';
+import { MatDialog } from '@angular/material/dialog';
 
 @Component({
   selector: 'app-folder',
@@ -50,7 +52,7 @@ export class FolderComponent implements AfterViewInit {
 
   searchTerm: string = '';
 
-  constructor(private datasetsService: DatasetsService, private experimentsService: ExperimentsService, private modelsService: ModelsService, private predictorsService: PredictorsService, private signalRService: SignalRService, private router: Router, private route: ActivatedRoute) {
+  constructor(private datasetsService: DatasetsService, private experimentsService: ExperimentsService, private modelsService: ModelsService, private predictorsService: PredictorsService, private signalRService: SignalRService, private router: Router, private route: ActivatedRoute, public dialog: MatDialog) {
     this.tabsToShow.forEach(tab => this.folders[tab] = []);
   }
 
@@ -104,6 +106,18 @@ export class FolderComponent implements AfterViewInit {
   }
 
   selectFile(file?: FolderFile) {
+    if (this.privacy == Privacy.Public) {
+      if (file) {
+        if (this.type == FolderType.Dataset) {
+          this.router.navigate(['dataset', file?._id]);
+        } else if (this.type == FolderType.Model) {
+          this.router.navigate(['model', file?._id]);
+        }
+      }
+
+    }
+
+
     this.formDataset.resetPagging();
     this.selectedFile = file;
     this.updateLastFileData(file);
@@ -154,6 +168,22 @@ export class FolderComponent implements AfterViewInit {
     this.okPressed.emit();
   }
 
+  fileToShare: FolderFile | undefined = undefined;
+
+  shareFile(file: FolderFile, event: Event) {
+    event.stopPropagation();
+
+    this.fileToShare = file;
+
+    const dialogRef = this.dialog.open(ShareDialogComponent, {
+      width: '550px',
+      data: { file: this.fileToShare, fileType: this.type }
+    });
+    dialogRef.afterClosed().subscribe(experiment => {
+      this.refreshFiles();
+    });
+  }
+
   _initialized: boolean = false;
 
   refreshFiles(selectedDatasetId: string | null = null, selectedModelId: string | null = null) {
@@ -547,9 +577,9 @@ export class FolderComponent implements AfterViewInit {
   selectTab(tab: TabType) {
     if (tab == TabType.NewFile) {
       this.selectNewFile();
-    } else if (tab == TabType.File) {
+    } /*else if (tab == TabType.File) {
       this.selectFile(this.selectedFile);
-    }
+    }*/
     this.listView = this.getListView(tab);
     this.type = this.getFolderType(tab);
     this.privacy = this.getPrivacy(tab);
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 2a956128..b518f15c 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html
@@ -2,7 +2,7 @@
     <div class="topBar">
         <div class="kolona mb-3">
             <div class="fileButton">
-                <button type="button" mat-raised-button (click)="fileInput.click()" [disabled]="dataset._id != ''" >
+                <button type="button" mat-raised-button (click)="fileInput.click()" [disabled]="dataset._id != '' || disableAll">
                     <span *ngIf="!firstInput && dataset._id == '' ">Dodaj izvor podataka</span>
                     <span *ngIf="firstInput && dataset._id == '' ">{{filename}}</span>
                     <span *ngIf="dataset._id != '' ">Fajl je odabran</span>
@@ -14,7 +14,7 @@
             <div role="group">
                 <mat-form-field class="example-full-width" appearance="fill">
                     <mat-label>Naziv</mat-label>
-                    <input type="text" matInput value="{{dataset?.name}}" [(ngModel)]="dataset.name" (input)="editEvent.emit()">
+                    <input type="text" matInput value="{{dataset?.name}}" [(ngModel)]="dataset.name" (input)="editEvent.emit()" [readonly]="disableAll">
 
 
                     <mat-error *ngIf="nameFormControl.hasError('required')">
@@ -26,7 +26,7 @@
         <div class="kolona">
             <mat-form-field appearance="fill">
                 <mat-label>Delimiter</mat-label>
-                <mat-select id="delimiterOptions" [(ngModel)]="dataset.delimiter" (selectionChange)="update(); editEvent.emit();" value=",">
+                <mat-select id="delimiterOptions" [(ngModel)]="dataset.delimiter" (selectionChange)="update(); editEvent.emit();" value="," [disabled]="disableAll">
                     <mat-option *ngFor="let option of delimiterOptions" [value]="option">
                         {{ option }}
                     </mat-option>
@@ -42,7 +42,7 @@
             <i class="material-icons-outlined icon-display" [ngClass]="{'hidden': tableData.hasInput}">file_upload</i>
 
 
-            <input class="file" id="file-upload" [disabled]="dataset._id != ''" (change)="changeListener($event)" (valueChange)="dataset.isPreProcess = false; editEvent.emit()" #fileInput type="file" accept=".csv">
+            <input class="file" id="file-upload" [disabled]="dataset._id != '' || disableAll" (change)="changeListener($event)" (valueChange)="dataset.isPreProcess = false; editEvent.emit()" #fileInput type="file" accept=".csv">
 
             <div class="datatable">
                 <div [ngClass]="{'hidden': (!existingFlag)}" class="text-center">
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 3df76aa5..3eb6fe39 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
@@ -13,6 +13,7 @@ import { FormControl, Validators } from '@angular/forms';
   styleUrls: ['./form-dataset.component.css']
 })
 export class FormDatasetComponent {
+  @Input() disableAll: boolean = false;
 
   @ViewChild(DatatableComponent) datatable!: DatatableComponent;
 
diff --git a/frontend/src/app/_elements/form-model/form-model.component.ts b/frontend/src/app/_elements/form-model/form-model.component.ts
index 7c84d2ba..f72ce6de 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.ts
+++ b/frontend/src/app/_elements/form-model/form-model.component.ts
@@ -12,6 +12,8 @@ import { MatSliderChange } from '@angular/material/slider';
   styleUrls: ['./form-model.component.css']
 })
 export class FormModelComponent implements AfterViewInit {
+  @Input() disableAll: boolean = false;
+
   @ViewChild(GraphComponent) graph!: GraphComponent;
   @Input() forExperiment!: Experiment;
   @Output() selectedModelChangeEvent = new EventEmitter<Model>();
diff --git a/frontend/src/app/_modals/share-dialog/share-dialog.component.css b/frontend/src/app/_modals/share-dialog/share-dialog.component.css
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/_modals/share-dialog/share-dialog.component.html b/frontend/src/app/_modals/share-dialog/share-dialog.component.html
new file mode 100644
index 00000000..32584197
--- /dev/null
+++ b/frontend/src/app/_modals/share-dialog/share-dialog.component.html
@@ -0,0 +1,14 @@
+<h1 mat-dialog-title class="text-center">Podeli {{data.fileType == 0 ? 'izvor podataka' : 'konfiguraciju neuronske mreže'}}</h1>
+<div mat-dialog-content class="mt-5 mb-3 mx-1">
+    <form>
+        <mat-checkbox class="m-2" [(ngModel)]="data.file.isPublic" [ngModelOptions]="{standalone: true}" (change)="publicChanged()">Svi mogu da vide </mat-checkbox>
+        <mat-checkbox class="m-2" [(ngModel)]="data.file.accessibleByLink" [ngModelOptions]="{standalone: true}" (change)="linkChanged()">Osobe sa linkom mogu da vide</mat-checkbox>
+        <div class="input-group my-3">
+            <input type="text" [value]="link" class="form-control" placeholder="" aria-label="Copy link button addon" aria-describedby="button-copy">
+            <button class="btn btn-outline-primary" type="button" id="button-copy" (click)="copy()" [disabled]="!data.file.accessibleByLink"><div class="mt-1"><mat-icon *ngIf="data.file.accessibleByLink">link</mat-icon><mat-icon *ngIf="!data.file.accessibleByLink">link_off</mat-icon></div></button>
+        </div>
+    </form>
+</div>
+<div mat-dialog-actions class="justify-content-center">
+    <button mat-stroked-button (click)="close()">Gotovo</button>
+</div>
\ No newline at end of file
diff --git a/frontend/src/app/_modals/share-dialog/share-dialog.component.spec.ts b/frontend/src/app/_modals/share-dialog/share-dialog.component.spec.ts
new file mode 100644
index 00000000..51bd4c9a
--- /dev/null
+++ b/frontend/src/app/_modals/share-dialog/share-dialog.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ShareDialogComponent } from './share-dialog.component';
+
+describe('ShareDialogComponent', () => {
+  let component: ShareDialogComponent;
+  let fixture: ComponentFixture<ShareDialogComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ShareDialogComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ShareDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/_modals/share-dialog/share-dialog.component.ts b/frontend/src/app/_modals/share-dialog/share-dialog.component.ts
new file mode 100644
index 00000000..2331cd8b
--- /dev/null
+++ b/frontend/src/app/_modals/share-dialog/share-dialog.component.ts
@@ -0,0 +1,70 @@
+import { Component, Inject, Input, OnInit } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import Dataset from 'src/app/_data/Dataset';
+import { FolderType } from 'src/app/_data/FolderFile';
+import Model from 'src/app/_data/Model';
+import { DatasetsService } from 'src/app/_services/datasets.service';
+import { ModelsService } from 'src/app/_services/models.service';
+
+interface DialogData {
+  file: (Dataset | Model);
+  fileType: FolderType;
+}
+
+@Component({
+  selector: 'app-share-dialog',
+  templateUrl: './share-dialog.component.html',
+  styleUrls: ['./share-dialog.component.css']
+})
+export class ShareDialogComponent implements OnInit {
+  constructor(public dialogRef: MatDialogRef<ShareDialogComponent>, @Inject(MAT_DIALOG_DATA) public data: DialogData, private modelsService: ModelsService, private datasetsService: DatasetsService) {
+
+  }
+
+  link: string = '';
+
+  ngOnInit(): void {
+    let link = window.location.origin;
+    if (this.data.fileType == FolderType.Dataset) {
+      link += '/dataset/';
+    } else if (this.data.fileType == FolderType.Model) {
+      link += '/model/';
+    }
+    link += this.data.file._id;
+    this.link = link;
+  }
+
+  close() {
+    this.dialogRef.close();
+  }
+
+  copy() {
+    navigator.clipboard.writeText(this.link);
+  }
+
+  publicChanged() {
+    if (this.data.fileType == FolderType.Dataset) {
+      this.datasetsService.updateDatasetIsPublic(this.data.file._id, this.data.file.isPublic).subscribe(() => {
+      });
+    } else if (this.data.fileType == FolderType.Model) {
+      this.modelsService.updateModelIsPublic(this.data.file._id, this.data.file.isPublic).subscribe(() => {
+      });
+    }
+
+    if (this.data.file.isPublic) {
+      this.data.file.accessibleByLink = true;
+    }
+  }
+
+  linkChanged() {
+    if (this.data.fileType == FolderType.Dataset) {
+      this.datasetsService.updateDatasetAccessibleByLink(this.data.file._id, this.data.file.accessibleByLink).subscribe(() => {
+      });
+    } else if (this.data.fileType == FolderType.Model) {
+      this.modelsService.updateModelAccessibleByLink(this.data.file._id, this.data.file.accessibleByLink).subscribe(() => {
+      });
+    }
+  }
+
+  FolderType = FolderType;
+}
diff --git a/frontend/src/app/_pages/page-dataset/page-dataset.component.css b/frontend/src/app/_pages/page-dataset/page-dataset.component.css
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/_pages/page-dataset/page-dataset.component.html b/frontend/src/app/_pages/page-dataset/page-dataset.component.html
new file mode 100644
index 00000000..2357a656
--- /dev/null
+++ b/frontend/src/app/_pages/page-dataset/page-dataset.component.html
@@ -0,0 +1,4 @@
+<div class="force-centered" style="color: var(--offwhite);">
+    <app-form-dataset [disableAll]="true"></app-form-dataset>
+    <button mat-raised-button class="m-3 p-2" (click)="import()">Uvezi</button>
+</div>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/page-dataset/page-dataset.component.spec.ts b/frontend/src/app/_pages/page-dataset/page-dataset.component.spec.ts
new file mode 100644
index 00000000..2c961cd5
--- /dev/null
+++ b/frontend/src/app/_pages/page-dataset/page-dataset.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PageDatasetComponent } from './page-dataset.component';
+
+describe('PageDatasetComponent', () => {
+  let component: PageDatasetComponent;
+  let fixture: ComponentFixture<PageDatasetComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ PageDatasetComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PageDatasetComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/_pages/page-dataset/page-dataset.component.ts b/frontend/src/app/_pages/page-dataset/page-dataset.component.ts
new file mode 100644
index 00000000..b6d0c2a4
--- /dev/null
+++ b/frontend/src/app/_pages/page-dataset/page-dataset.component.ts
@@ -0,0 +1,45 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import Shared from 'src/app/Shared';
+import Dataset from 'src/app/_data/Dataset';
+import { FormDatasetComponent } from 'src/app/_elements/form-dataset/form-dataset.component';
+import { DatasetsService } from 'src/app/_services/datasets.service';
+
+@Component({
+  selector: 'app-page-dataset',
+  templateUrl: './page-dataset.component.html',
+  styleUrls: ['./page-dataset.component.css']
+})
+export class PageDatasetComponent implements OnInit {
+
+  @ViewChild(FormDatasetComponent) formDataset!: FormDatasetComponent;
+
+  constructor(private route: ActivatedRoute, private router: Router, private datasetsService: DatasetsService) { }
+
+  ngOnInit(): void {
+    this.route.queryParams.subscribe(params => {
+      let id = this.route.snapshot.paramMap.get("id");
+      if (id) {
+        this.datasetsService.getDatasetById(id).subscribe((dataset) => {
+          this.formDataset.dataset = dataset;
+          this.formDataset.loadExisting();
+        });
+      } else {
+        this.router.navigate(['']);
+      }
+    });
+  }
+
+  import() {
+    this.formDataset.dataset._id = "";
+    this.formDataset.dataset.isPreProcess = true;
+    this.formDataset.dataset.isPublic = false;
+    this.datasetsService.stealDataset(this.formDataset.dataset).subscribe((response) => {
+      Shared.openDialog("Obaveštenje", "Uspešno ste dodali javni izvor podataka u vašu kolekciju.");
+    }, (error: any) => {
+      if (error.error == "Dataset with this name already exists") {
+        Shared.openDialog("Obaveštenje", "Izvor podataka sa ovim imenom postoji u vašoj kolekciji.");
+      }
+    });
+  }
+}
diff --git a/frontend/src/app/_pages/page-model/page-model.component.css b/frontend/src/app/_pages/page-model/page-model.component.css
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/_pages/page-model/page-model.component.html b/frontend/src/app/_pages/page-model/page-model.component.html
new file mode 100644
index 00000000..e494542f
--- /dev/null
+++ b/frontend/src/app/_pages/page-model/page-model.component.html
@@ -0,0 +1,4 @@
+<div class="force-centered" style="color: var(--offwhite);">
+    <app-form-model [disableAll]="true"></app-form-model>
+    <button mat-raised-button class="m-3 p-2" (click)="import()">Uvezi</button>
+</div>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/page-model/page-model.component.spec.ts b/frontend/src/app/_pages/page-model/page-model.component.spec.ts
new file mode 100644
index 00000000..e235de5c
--- /dev/null
+++ b/frontend/src/app/_pages/page-model/page-model.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PageModelComponent } from './page-model.component';
+
+describe('PageModelComponent', () => {
+  let component: PageModelComponent;
+  let fixture: ComponentFixture<PageModelComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ PageModelComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PageModelComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/_pages/page-model/page-model.component.ts b/frontend/src/app/_pages/page-model/page-model.component.ts
new file mode 100644
index 00000000..f988ef0d
--- /dev/null
+++ b/frontend/src/app/_pages/page-model/page-model.component.ts
@@ -0,0 +1,41 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import Shared from 'src/app/Shared';
+import Model from 'src/app/_data/Model';
+import { FormModelComponent } from 'src/app/_elements/form-model/form-model.component';
+import { ModelsService } from 'src/app/_services/models.service';
+
+@Component({
+  selector: 'app-page-model',
+  templateUrl: './page-model.component.html',
+  styleUrls: ['./page-model.component.css']
+})
+export class PageModelComponent implements OnInit {
+
+  @ViewChild(FormModelComponent) formModel!: FormModelComponent;
+
+  constructor(private route: ActivatedRoute, private router: Router, private modelsService: ModelsService) { }
+
+  ngOnInit(): void {
+    this.route.queryParams.subscribe(params => {
+      let id = this.route.snapshot.paramMap.get("id");
+      if (id) {
+        this.modelsService.getModelById(id).subscribe((model) => {
+          this.formModel.newModel = model;
+        });
+      } else {
+        this.router.navigate(['']);
+      }
+    });
+  }
+
+  import() {
+    this.formModel.newModel._id = "";
+    this.formModel.newModel.isPublic = false;
+    this.modelsService.stealModel(this.formModel.newModel).subscribe((response) => {
+      Shared.openDialog("Obaveštenje", "Uspešno ste dodali javnu konfiguraciju neuronske mreže u vašu kolekciju.");
+    }, (error: any) => {
+      Shared.openDialog("Obaveštenje", "Konfiguracija neuronske mreže sa ovim imenom postoji u vašoj kolekciji.");
+    });
+  }
+}
diff --git a/frontend/src/app/_services/datasets.service.ts b/frontend/src/app/_services/datasets.service.ts
index 42fa5e55..11838b1d 100644
--- a/frontend/src/app/_services/datasets.service.ts
+++ b/frontend/src/app/_services/datasets.service.ts
@@ -70,4 +70,12 @@ export class DatasetsService {
   downloadFile(id: string): Observable<Blob> {
     return this.http.get(`${Configuration.settings.apiURL}/file/Download?id=` + id, { headers: this.authService.authHeader(), responseType: 'blob' });
   }
+
+  updateDatasetAccessibleByLink(id: string, acessibleByLink: boolean) {
+    return this.http.put(`${Configuration.settings.apiURL}/dataset/updateAccessibleByLink/` + id, acessibleByLink, { headers: this.authService.authHeader(), responseType: 'text' });
+  }
+
+  updateDatasetIsPublic(id: string, isPublic: boolean) {
+    return this.http.put(`${Configuration.settings.apiURL}/dataset/updateIsPublic/` + id, isPublic, { headers: this.authService.authHeader(), responseType: 'text' });
+  }
 }
diff --git a/frontend/src/app/_services/models.service.ts b/frontend/src/app/_services/models.service.ts
index 016fa9bc..398c7813 100644
--- a/frontend/src/app/_services/models.service.ts
+++ b/frontend/src/app/_services/models.service.ts
@@ -51,4 +51,12 @@ export class ModelsService {
     return this.http.get<Model>(`${Configuration.settings.apiURL}/model/byid/${modelId}`, { headers: this.authService.authHeader() });
   }
 
+  updateModelAccessibleByLink(id: string, acessibleByLink: boolean) {
+    return this.http.put(`${Configuration.settings.apiURL}/model/updateAccessibleByLink/` + id, acessibleByLink, { headers: this.authService.authHeader(), responseType: 'text' });
+  }
+
+  updateModelIsPublic(id: string, isPublic: boolean) {
+    return this.http.put(`${Configuration.settings.apiURL}/model/updateIsPublic/` + id, isPublic, { headers: this.authService.authHeader(), responseType: 'text' });
+  }
+
 }
diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index 507089a8..fa53d5f0 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -9,6 +9,8 @@ import { ExperimentComponent } from './_pages/experiment/experiment.component';
 import { ArchiveComponent } from './_pages/archive/archive.component';
 import { ColumnTableComponent } from './_elements/column-table/column-table.component';
 import { TestComponent } from './_pages/test/test.component';
+import { PageDatasetComponent } from './_pages/page-dataset/page-dataset.component';
+import { PageModelComponent } from './_pages/page-model/page-model.component';
 
 const routes: Routes = [
   { path: '', component: HomeComponent, data: { title: 'Početna strana' } },
@@ -19,6 +21,8 @@ const routes: Routes = [
   { path: 'profile', component: ProfileComponent, canActivate: [AuthGuardService], data: { title: 'Profil' } },
   { path: 'playground', component: PlaygroundComponent, data: { title: 'Zabava' } },
   { path: 'test', component: TestComponent, data: { title: 'Test' } },
+  { path: 'dataset/:id', component: PageDatasetComponent, data: { title: 'Izvor podataka' } },
+  { path: 'model/:id', component: PageModelComponent, data: { title: 'Konfiguracija neuronske mreže' } },
   { path: '**', redirectTo: '' }
 ];
 
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index e2823761..21b09318 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -54,6 +54,9 @@ import { HeatmapComponent } from './_elements/_charts/heatmap/heatmap.component'
 import { HeatMapAllModule } from '@syncfusion/ej2-angular-heatmap';
 import { MetricViewComponent } from './_elements/metric-view/metric-view.component';
 import { SpinnerComponent } from './_elements/spinner/spinner.component';
+import { PageDatasetComponent } from './_pages/page-dataset/page-dataset.component';
+import { PageModelComponent } from './_pages/page-model/page-model.component';
+import { ShareDialogComponent } from './_modals/share-dialog/share-dialog.component';
 
 export function initializeApp(appConfig: Configuration) {
   return () => appConfig.load();
@@ -95,7 +98,10 @@ export function initializeApp(appConfig: Configuration) {
     LineChartComponent,
     SaveExperimentDialogComponent,
     SpinnerComponent,
-    UpdateExperimentDialogComponent
+    UpdateExperimentDialogComponent,
+    PageDatasetComponent,
+    PageModelComponent,
+    ShareDialogComponent
   ],
   imports: [
     BrowserModule,
diff --git a/frontend/src/styles/layout.css b/frontend/src/styles/layout.css
index 07c0bf34..790d2ca7 100644
--- a/frontend/src/styles/layout.css
+++ b/frontend/src/styles/layout.css
@@ -66,4 +66,14 @@ body {
     .break-2 {
         display: none;
     }
-}*/
\ No newline at end of file
+}*/
+
+.force-centered {
+    width: 80%;
+    height: 80%;
+    margin: auto;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 2a9823c8f24fca0db3782131dc2f5cfbc452d3d4 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Mon, 6 Jun 2022 03:02:27 +0200
Subject: Ispravka kada korisnik pristupa datasetu preko linka.

---
 backend/api/api/Services/FileService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backend/api')

diff --git a/backend/api/api/Services/FileService.cs b/backend/api/api/Services/FileService.cs
index 6ef74ca1..e5b7945f 100644
--- a/backend/api/api/Services/FileService.cs
+++ b/backend/api/api/Services/FileService.cs
@@ -28,7 +28,7 @@ namespace api.Services
         public string GetFilePath(string id, string uploaderId)
         {
             FileModel file;
-            if (_dataset.Find(x=>x.fileId==id && x.isPublic==true).FirstOrDefault()!=null)
+            if (_dataset.Find(x=>x.fileId==id && (x.isPublic==true ||x.accessibleByLink==true)).FirstOrDefault()!=null)
                 file = _file.Find(x => x._id == id).FirstOrDefault();
             else
                 file = _file.Find(x => x._id == id && x.uploaderId == uploaderId).FirstOrDefault();
-- 
cgit v1.2.3


From f9c588722082c151fe641c3b113f5dfe67e7e9ac Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Mon, 6 Jun 2022 04:49:28 +0200
Subject: Popravljen accesiblebylink kod modela.

---
 backend/api/api/Services/ModelService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backend/api')

diff --git a/backend/api/api/Services/ModelService.cs b/backend/api/api/Services/ModelService.cs
index 1c690ca7..07581fc9 100644
--- a/backend/api/api/Services/ModelService.cs
+++ b/backend/api/api/Services/ModelService.cs
@@ -67,7 +67,7 @@ namespace api.Services
 
         public Model GetOneModelById(string userId, string id)
         {
-            return _model.Find(model => model.uploaderId == userId && model._id == id).FirstOrDefault();
+            return _model.Find(model => (model.uploaderId == userId || model.isPublic || model.accessibleByLink) && model._id == id).FirstOrDefault();
         }
 
         public Model GetOneModel(string id)
-- 
cgit v1.2.3