From 6ae3a73a7e745e3667588af7ede1658d258cca56 Mon Sep 17 00:00:00 2001
From: Erik Foris <erikfor@outlook.de>
Date: Fri, 5 Jul 2024 12:19:47 +0200
Subject: [PATCH 1/2] refactor: Add licence field to Dataset constructor

---
 .../de/uni_passau/fim/PADAS/group3/DataDash/model/Dataset.java | 3 ++-
 .../fim/PADAS/group3/DataDash/model/LoadDummyDatabase.java     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Dataset.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Dataset.java
index 7f78848..7877d53 100644
--- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Dataset.java
+++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Dataset.java
@@ -50,7 +50,7 @@ public class Dataset {
     @ManyToOne
     private Category categorie;
 
-    public Dataset(String title, String abst, String description, String author, URL url, Category categories, Type type) {
+    public Dataset(String title, String abst, String description, String author, URL url, Category categories, Type type, String licence) {
 
         this.raiting = 0;
         this.votes = 0;
@@ -63,6 +63,7 @@ public class Dataset {
         setCategorie(categories);        
         setType(type);
         setUrl(url);
+        setLicence(licence);
     }
 
     public Dataset() {
diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/LoadDummyDatabase.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/LoadDummyDatabase.java
index ba3dd32..6600bdb 100644
--- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/LoadDummyDatabase.java
+++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/LoadDummyDatabase.java
@@ -25,7 +25,7 @@ public class LoadDummyDatabase {
             Category category = new Category("Category" + i);
             log.info("Preloading" + categoryRepository.save(category));
 
-            Dataset dataset = new Dataset("Title" + i, "Abst" + i, "Description" + i, "Author" + i,null, category, Type.API);
+            Dataset dataset = new Dataset("Title" + i, "Abst" + i, "Description" + i, "Author" + i,null, category, Type.API, "MIT");
             for (int j = 0; j < new Random().nextInt(50); j++) {
                 dataset.upvote();
             }

From 68595e22a73cfafae9387b37dc63323e3eb820a1 Mon Sep 17 00:00:00 2001
From: Erik Foris <erikfor@outlook.de>
Date: Fri, 5 Jul 2024 12:34:26 +0200
Subject: [PATCH 2/2] refactor: move static sites into static, Remove unused
 PageController and update main.js for page navigation

---
 .../group3/DataDash/controler/PageController.java    | 12 ------------
 src/main/resources/{templates => static}/add.html    |  0
 src/main/resources/{templates => static}/index.html  |  0
 src/main/resources/static/main.js                    |  3 +--
 4 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/controler/PageController.java
 rename src/main/resources/{templates => static}/add.html (100%)
 rename src/main/resources/{templates => static}/index.html (100%)

diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/controler/PageController.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/controler/PageController.java
deleted file mode 100644
index f1a0f6f..0000000
--- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/controler/PageController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.uni_passau.fim.PADAS.group3.DataDash.controler;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class PageController {
-    @GetMapping("/add")
-    public String getAddPage() {
-        return "add";
-    }    
-}
diff --git a/src/main/resources/templates/add.html b/src/main/resources/static/add.html
similarity index 100%
rename from src/main/resources/templates/add.html
rename to src/main/resources/static/add.html
diff --git a/src/main/resources/templates/index.html b/src/main/resources/static/index.html
similarity index 100%
rename from src/main/resources/templates/index.html
rename to src/main/resources/static/index.html
diff --git a/src/main/resources/static/main.js b/src/main/resources/static/main.js
index 65c62d6..5ddbced 100644
--- a/src/main/resources/static/main.js
+++ b/src/main/resources/static/main.js
@@ -81,8 +81,7 @@ for (const downvoteButton of downvoteButtons) {
 
 // functions of the main page
 function navigateToAdd() {
-    //TODO: url to add page not yet implemented, add here
-    window.location.href = "/add";
+    window.location.href = "/add.html";
 }
 
 function filter(filterString) {