Kaynağa Gözat

Merge branch '192-webreport' of https://github.com/cholakov11/JPlag into 192-webreport

Dominik Fuchß 4 yıl önce
ebeveyn
işleme
96ff1cb4de
81 değiştirilmiş dosya ile 1377 ekleme ve 640 silme
  1. 25 0
      jplag/src/main/java/de/jplag/reportingV2/JsonReport.java
  2. 13 0
      jplag/src/main/java/de/jplag/reportingV2/Report.java
  3. 0 17
      jplag/src/main/java/de/jplag/reportingV2/ReportImplementation.java
  4. 0 10
      jplag/src/main/java/de/jplag/reportingV2/ReportStrategy.java
  5. 5 5
      jplag/src/main/java/de/jplag/reportingV2/ReportingTest.java
  6. 21 1
      jplag/src/main/java/de/jplag/reportingV2/jsonfactory/JsonFactory.java
  7. 3 1
      jplag/src/main/java/de/jplag/reportingV2/reportobject/ReportObjectFactory.java
  8. 8 1
      jplag/src/main/java/de/jplag/reportingV2/reportobject/model/Match.java
  9. 28 0
      report-viewer/package-lock.json
  10. 1 0
      report-viewer/package.json
  11. BIN
      report-viewer/public/favicon.ico
  12. 35 2
      report-viewer/src/App.vue
  13. 11 0
      report-viewer/src/MaintainabilityTest.md
  14. 10 1
      report-viewer/src/assets/double_arrow_black_18dp.svg
  15. 13 1
      report-viewer/src/assets/double_arrow_white_24dp.svg
  16. 1 0
      report-viewer/src/assets/keyboard_arrow_down_black_18dp.svg
  17. 1 0
      report-viewer/src/assets/keyboard_arrow_down_white_18dp.svg
  18. 1 0
      report-viewer/src/assets/keyboard_double_arrow_down_black_18dp.svg
  19. 1 0
      report-viewer/src/assets/keyboard_double_arrow_down_white_18dp.svg
  20. 12 0
      report-viewer/src/assets/keyboard_double_arrow_left_white_18dp.svg
  21. 13 0
      report-viewer/src/assets/keyboard_double_arrow_left_white_24dp.svg
  22. 1 0
      report-viewer/src/assets/keyboard_double_arrow_up_black_18dp.svg
  23. 1 0
      report-viewer/src/assets/keyboard_double_arrow_up_white_18dp.svg
  24. BIN
      report-viewer/src/assets/logo-nobg.png
  25. 110 6
      report-viewer/src/components/CodePanel.vue
  26. 0 70
      report-viewer/src/components/ComparisonListElement.vue
  27. 0 60
      report-viewer/src/components/ComparisonsLists.vue
  28. 95 0
      report-viewer/src/components/ComparisonsTable.vue
  29. 73 18
      report-viewer/src/components/DistributionDiagram.vue
  30. 33 11
      report-viewer/src/components/LineOfCode.vue
  31. 0 113
      report-viewer/src/components/MatchList.vue
  32. 97 0
      report-viewer/src/components/MatchTable.vue
  33. 9 6
      report-viewer/src/components/MetricButton.vue
  34. 53 23
      report-viewer/src/components/TextInformation.vue
  35. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-Bold.ttf
  36. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-BoldItalic.ttf
  37. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-ExtraBold.ttf
  38. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-ExtraBoldItalic.ttf
  39. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-ExtraLight.ttf
  40. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-ExtraLightItalic.ttf
  41. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-Italic.ttf
  42. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-Light.ttf
  43. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-LightItalic.ttf
  44. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-Medium.ttf
  45. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-MediumItalic.ttf
  46. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-Regular.ttf
  47. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-SemiBold.ttf
  48. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-SemiBoldItalic.ttf
  49. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-Thin.ttf
  50. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-ThinItalic.ttf
  51. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-Bold.ttf
  52. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-BoldItalic.ttf
  53. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-ExtraBold.ttf
  54. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-ExtraBoldItalic.ttf
  55. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-ExtraLight.ttf
  56. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-ExtraLightItalic.ttf
  57. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-Italic.ttf
  58. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-Light.ttf
  59. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-LightItalic.ttf
  60. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-Medium.ttf
  61. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-MediumItalic.ttf
  62. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-Regular.ttf
  63. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-SemiBold.ttf
  64. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-SemiBoldItalic.ttf
  65. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-Thin.ttf
  66. BIN
      report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-ThinItalic.ttf
  67. 89 0
      report-viewer/src/model/Comparison.ts
  68. 5 0
      report-viewer/src/model/ComparisonListElement.ts
  69. 10 0
      report-viewer/src/model/Match.ts
  70. 8 0
      report-viewer/src/model/MatchInSingleFile.ts
  71. 8 0
      report-viewer/src/model/Metric.ts
  72. 63 0
      report-viewer/src/model/Overview.ts
  73. 4 0
      report-viewer/src/model/SubmissionFile.ts
  74. 0 17
      report-viewer/src/model/TopComparison.ts
  75. 106 0
      report-viewer/src/model/factories/ComparisonFactory.ts
  76. 51 0
      report-viewer/src/model/factories/OverviewFactory.ts
  77. 4 11
      report-viewer/src/router/index.ts
  78. 82 0
      report-viewer/src/utils/Utils.ts
  79. 165 73
      report-viewer/src/views/ComparisonView.vue
  80. 0 98
      report-viewer/src/views/FileUpload.vue
  81. 108 95
      report-viewer/src/views/Overview.vue

+ 25 - 0
jplag/src/main/java/de/jplag/reportingV2/JsonReport.java

@@ -0,0 +1,25 @@
+package de.jplag.reportingV2;
+
+import de.jplag.JPlagResult;
+import de.jplag.reportingV2.jsonfactory.JsonFactory;
+import de.jplag.reportingV2.reportobject.ReportObjectFactory;
+import de.jplag.reportingV2.reportobject.model.JPlagReport;
+
+import java.util.List;
+
+//ReportImplementation -> JsonReport
+public class JsonReport implements Report {
+
+	@Override
+	public List<String> getReportStrings(JPlagResult result) {
+		JPlagReport report = ReportObjectFactory.getReportObject(result);
+		return JsonFactory.getJsonStrings(report);
+	}
+
+	@Override
+	public boolean saveReport(JPlagResult result) {
+		JPlagReport report = ReportObjectFactory.getReportObject(result);
+		return JsonFactory.saveJsonFiles(report, "./report-viewer/src/files/");
+	}
+
+}

+ 13 - 0
jplag/src/main/java/de/jplag/reportingV2/Report.java

@@ -0,0 +1,13 @@
+package de.jplag.reportingV2;
+
+import de.jplag.JPlagResult;
+import de.jplag.reportingV2.reportobject.model.JPlagReport;
+
+import java.util.List;
+
+//ReportStrategy -> Report
+public interface Report {
+
+	List<String> getReportStrings(JPlagResult result);
+	boolean saveReport(JPlagResult result);
+}

+ 0 - 17
jplag/src/main/java/de/jplag/reportingV2/ReportImplementation.java

@@ -1,17 +0,0 @@
-package de.jplag.reportingV2;
-
-import de.jplag.JPlagResult;
-import de.jplag.reportingV2.jsonfactory.JsonFactory;
-import de.jplag.reportingV2.reportobject.ReportObjectFactory;
-import de.jplag.reportingV2.reportobject.model.JPlagReport;
-
-import java.util.List;
-
-public class ReportImplementation  implements ReportStrategy{
-
-	@Override
-	public List<String> getJsonStrings(JPlagResult result) {
-		JPlagReport report = ReportObjectFactory.getReportObject(result);
-		return JsonFactory.generateJsonFiles(report);
-	}
-}

+ 0 - 10
jplag/src/main/java/de/jplag/reportingV2/ReportStrategy.java

@@ -1,10 +0,0 @@
-package de.jplag.reportingV2;
-
-import de.jplag.JPlagResult;
-
-import java.util.List;
-
-public interface ReportStrategy {
-
-	List<String> getJsonStrings(JPlagResult result);
-}

+ 5 - 5
jplag/src/main/java/de/jplag/reportingV2/ReportingTest.java

@@ -11,12 +11,12 @@ import java.util.List;
 public class ReportingTest {
 public class ReportingTest {
 
 
 	public static void main(String[] args) throws ExitException {
 	public static void main(String[] args) throws ExitException {
-		JPlagOptions options = new JPlagOptions("C:\\Uni\\PISE\\jplag-try-out\\src\\submission", LanguageOption.JAVA_1_9);
+		JPlagOptions options = new JPlagOptions("C:\\Uni\\PISE\\JPlag\\jplag\\src\\test\\resources\\de\\jplag\\samples\\PartialPlagiarism", LanguageOption.JAVA_1_9);
 		JPlag jPlag = new JPlag(options);
 		JPlag jPlag = new JPlag(options);
 		JPlagResult result = jPlag.run();
 		JPlagResult result = jPlag.run();
-		ReportStrategy reporting = new ReportImplementation();
-		List<String> jsonStrings = reporting.getJsonStrings(result);
-		System.out.println(jsonStrings.get(0));
-		System.out.println(jsonStrings.get(1));
+		Report reporting = new JsonReport();
+		if ( reporting.saveReport(result) ) {
+			System.out.println("Successfully saved report.");
+		}
 	}
 	}
 }
 }

+ 21 - 1
jplag/src/main/java/de/jplag/reportingV2/jsonfactory/JsonFactory.java

@@ -2,15 +2,18 @@ package de.jplag.reportingV2.jsonfactory;
 
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import de.jplag.JPlagResult;
 import de.jplag.reportingV2.reportobject.model.ComparisonReport;
 import de.jplag.reportingV2.reportobject.model.ComparisonReport;
 import de.jplag.reportingV2.reportobject.model.JPlagReport;
 import de.jplag.reportingV2.reportobject.model.JPlagReport;
 
 
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 public class JsonFactory {
 public class JsonFactory {
 
 
-	public static List<String> generateJsonFiles(JPlagReport jPlagReport) {
+	public static List<String> getJsonStrings(JPlagReport jPlagReport) {
 		List<String> jsonReports = new ArrayList<>();
 		List<String> jsonReports = new ArrayList<>();
 		try {
 		try {
 			ObjectMapper mapper = new ObjectMapper();
 			ObjectMapper mapper = new ObjectMapper();
@@ -23,4 +26,21 @@ public class JsonFactory {
 		}
 		}
 		return jsonReports;
 		return jsonReports;
 	}
 	}
+
+	public static boolean saveJsonFiles(JPlagReport jPlagReport, String folderPath ) {
+		String sanitizedFolderPath = folderPath;
+		if ( !folderPath.endsWith("/") ) { sanitizedFolderPath = folderPath.concat("/"); }
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			mapper.writeValue( new File( sanitizedFolderPath.concat("overview.json") ), jPlagReport.getOverviewReport() );
+			for (ComparisonReport r : jPlagReport.getComparisons()) {
+				String name = r.getFirst_submission_id().concat("-").concat(r.getSecond_submission_id()).concat(".json");
+				mapper.writeValue(new File(folderPath + name), r);
+			}
+		} catch ( IOException e) {
+			System.out.println("Failed to save json files: " + e.getMessage());
+			return false;
+		}
+		return true;
+	}
 }
 }

+ 3 - 1
jplag/src/main/java/de/jplag/reportingV2/reportobject/ReportObjectFactory.java

@@ -136,12 +136,14 @@ public class ReportObjectFactory {
 		int endFirst = usesIndex ? endFirstToken.getIndex() : endFirstToken.getLine();
 		int endFirst = usesIndex ? endFirstToken.getIndex() : endFirstToken.getLine();
 		int startSecond = usesIndex ? startSecondToken.getIndex() : startSecondToken.getLine();
 		int startSecond = usesIndex ? startSecondToken.getIndex() : startSecondToken.getLine();
 		int endSecond = usesIndex ? endSecondToken.getIndex() : endSecondToken.getLine();
 		int endSecond = usesIndex ? endSecondToken.getIndex() : endSecondToken.getLine();
+		int tokens = match.getLength();
 
 
 		return new Match(startFirstToken.file, startSecondToken.file,
 		return new Match(startFirstToken.file, startSecondToken.file,
 				startFirst,
 				startFirst,
 				endFirst,
 				endFirst,
 				startSecond,
 				startSecond,
-				endSecond
+				endSecond,
+				tokens
 		);
 		);
 	}
 	}
 	private static List<String> readFileLines(File file) {
 	private static List<String> readFileLines(File file) {

+ 8 - 1
jplag/src/main/java/de/jplag/reportingV2/reportobject/model/Match.java

@@ -8,13 +8,15 @@ public class Match {
 	private int end_in_first;
 	private int end_in_first;
 	private int start_in_second;
 	private int start_in_second;
 	private int end_in_second;
 	private int end_in_second;
+	private int tokens;
 
 
 	public Match(String first_file_name,
 	public Match(String first_file_name,
 				 String second_file_name,
 				 String second_file_name,
 				 int start_in_first,
 				 int start_in_first,
 				 int end_in_first,
 				 int end_in_first,
 				 int start_in_second,
 				 int start_in_second,
-				 int end_in_second) {
+				 int end_in_second,
+				 int tokens) {
 
 
 		this.first_file_name = first_file_name;
 		this.first_file_name = first_file_name;
 		this.second_file_name = second_file_name;
 		this.second_file_name = second_file_name;
@@ -22,6 +24,7 @@ public class Match {
 		this.end_in_first = end_in_first;
 		this.end_in_first = end_in_first;
 		this.start_in_second = start_in_second;
 		this.start_in_second = start_in_second;
 		this.end_in_second = end_in_second;
 		this.end_in_second = end_in_second;
+		this.tokens = tokens;
 	}
 	}
 
 
 	public String getFirst_file_name() {
 	public String getFirst_file_name() {
@@ -48,6 +51,8 @@ public class Match {
 		return end_in_second;
 		return end_in_second;
 	}
 	}
 
 
+	public int getTokens() { return tokens; }
+
 	public void setFirst_file_name(String first_file_name) {
 	public void setFirst_file_name(String first_file_name) {
 		this.first_file_name = first_file_name;
 		this.first_file_name = first_file_name;
 	}
 	}
@@ -71,4 +76,6 @@ public class Match {
 	public void setEnd_in_second(int end_in_second) {
 	public void setEnd_in_second(int end_in_second) {
 		this.end_in_second = end_in_second;
 		this.end_in_second = end_in_second;
 	}
 	}
+
+	public void setTokens(int tokens) { this.tokens = tokens; }
 }
 }

+ 28 - 0
report-viewer/package-lock.json

@@ -12,6 +12,7 @@
         "core-js": "^3.6.5",
         "core-js": "^3.6.5",
         "vue": "^3.0.0",
         "vue": "^3.0.0",
         "vue-chart-3": "^3.0.3",
         "vue-chart-3": "^3.0.3",
+        "vue-draggable-next": "^2.1.1",
         "vue-router": "^4.0.0-0"
         "vue-router": "^4.0.0-0"
       },
       },
       "devDependencies": {
       "devDependencies": {
@@ -14652,6 +14653,12 @@
         "node": ">=0.10.0"
         "node": ">=0.10.0"
       }
       }
     },
     },
+    "node_modules/sortablejs": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
+      "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==",
+      "peer": true
+    },
     "node_modules/source-list-map": {
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -16260,6 +16267,15 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
       "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
       "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
     },
     },
+    "node_modules/vue-draggable-next": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/vue-draggable-next/-/vue-draggable-next-2.1.1.tgz",
+      "integrity": "sha512-f5lmA7t6LMaL4viR7dU30zzvqJzaKQs0ymL0Jy9UDT9uiZ2tXF3MzPzEvpTH2UODXZJkT+SnjeV1fXHMsgXLYA==",
+      "peerDependencies": {
+        "sortablejs": "^1.14.0",
+        "vue": "^3.2.2"
+      }
+    },
     "node_modules/vue-eslint-parser": {
     "node_modules/vue-eslint-parser": {
       "version": "7.11.0",
       "version": "7.11.0",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
@@ -29122,6 +29138,12 @@
         }
         }
       }
       }
     },
     },
+    "sortablejs": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
+      "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==",
+      "peer": true
+    },
     "source-list-map": {
     "source-list-map": {
       "version": "2.0.1",
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -30422,6 +30444,12 @@
         }
         }
       }
       }
     },
     },
+    "vue-draggable-next": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/vue-draggable-next/-/vue-draggable-next-2.1.1.tgz",
+      "integrity": "sha512-f5lmA7t6LMaL4viR7dU30zzvqJzaKQs0ymL0Jy9UDT9uiZ2tXF3MzPzEvpTH2UODXZJkT+SnjeV1fXHMsgXLYA==",
+      "requires": {}
+    },
     "vue-eslint-parser": {
     "vue-eslint-parser": {
       "version": "7.11.0",
       "version": "7.11.0",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",

+ 1 - 0
report-viewer/package.json

@@ -13,6 +13,7 @@
     "core-js": "^3.6.5",
     "core-js": "^3.6.5",
     "vue": "^3.0.0",
     "vue": "^3.0.0",
     "vue-chart-3": "^3.0.3",
     "vue-chart-3": "^3.0.3",
+    "vue-draggable-next": "^2.1.1",
     "vue-router": "^4.0.0-0"
     "vue-router": "^4.0.0-0"
   },
   },
   "devDependencies": {
   "devDependencies": {

BIN
report-viewer/public/favicon.ico


+ 35 - 2
report-viewer/src/App.vue

@@ -1,14 +1,46 @@
 <template>
 <template>
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <router-view/>
   <router-view/>
 </template>
 </template>
 
 
 <style>
 <style>
+@font-face {
+  font-family: "JetBrains Mono";
+  src: url("./fonts/jetbrains-mono/JetBrainsMono-Light.ttf");
+}
+
+@font-face {
+  font-family: "JetBrains Mono";
+  src: url("./fonts/jetbrains-mono/JetBrainsMono-Bold.ttf");
+  font-weight: bold;
+}
+
+:root {
+  --primary-color: #be1523;
+  --primary-color-light: #f8534c;
+  --primary-color-dark: #860000;
+  --secondary-color: #ff9f8e;
+  --secondary-color-light: #ffd1be;
+  --secondary-color-dark: #c96f61;
+  --tertiary-color: #8eaaf2;
+  --tertiary-color-light: #c1dbff;
+  --tertiary-color-dark: #5c7bbf;
+  --quaternary-color: #f3eed9;
+  --quaternary-color-light: #ffffff;
+  --quaternary-color-dark: #c0bca8;
+  --background-color: #FFF5F2;
+  --background-color-accent: #FFFFFF;
+  --on-primary-color: #303030;
+  --on-primary-color-accent: #f3eed9;
+  --on-secondary-color: #000000;
+  --on-background-color: #303030;
+  --shadow-color: #777777;
+}
+
 #app {
 #app {
   font-family: Avenir, Helvetica, Arial, sans-serif;
   font-family: Avenir, Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
 }
 }
 
 
 html, body, #app {
 html, body, #app {
@@ -16,4 +48,5 @@ html, body, #app {
   width: 100%;
   width: 100%;
   margin: 0;
   margin: 0;
 }
 }
+
 </style>
 </style>

+ 11 - 0
report-viewer/src/MaintainabilityTest.md

@@ -0,0 +1,11 @@
+Testing Maintainability
+--
+Observing the number of affected artefacts when adding new information to the
+report to be displayed.
+Adding the number of tokens in a match, which has to be displayed in the MatchesTable in the ComparisonView.
+1. Adding int tokens to Match.java [JPlag]
+2. Edited convertMatchToReportMatch in ReportObejctFactory to get # token from de.jplag.Match
+	and save it in Match DTO [JPlag]
+3. Added tokens: number to Match.ts [report-viewer]
+4. Edited mapMatch in ComparisonFactory.ts to get # tokens from the json file [report-viewer]
+5. Edited MatchTable.vue to display the tokens number in the ComparisonView

+ 10 - 1
report-viewer/src/assets/double_arrow_black_18dp.svg

@@ -1 +1,10 @@
-<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 20 20" height="18px" viewBox="0 0 20 20" width="18px" fill="#000000"><g><rect fill="none" height="20" width="20"/></g><g><polygon points="9.21,15 12.43,15 16,10 12.43,5 9.21,5 12.79,10"/><polygon points="4.21,15 7.43,15 11,10 7.43,5 4.21,5 7.79,10"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 20 20" height="18px" viewBox="0 0 20 20" width="18px"
+     fill="#f3eed9">
+    <g>
+        <rect fill="none" height="20" width="20"/>
+    </g>
+    <g>
+        <polygon points="9.21,15 12.43,15 16,10 12.43,5 9.21,5 12.79,10"/>
+        <polygon points="4.21,15 7.43,15 11,10 7.43,5 4.21,5 7.79,10"/>
+    </g>
+</svg>

+ 13 - 1
report-viewer/src/assets/double_arrow_white_24dp.svg

@@ -1 +1,13 @@
-<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFFFFF"><g><rect fill="none" height="24" width="24"/><rect fill="none" height="24" width="24"/></g><g><g><path d="M20.08,11.42l-4.04-5.65C15.7,5.29,15.15,5,14.56,5h0c-1.49,0-2.35,1.68-1.49,2.89L16,12l-2.93,4.11 c-0.87,1.21,0,2.89,1.49,2.89h0c0.59,0,1.15-0.29,1.49-0.77l4.04-5.65C20.33,12.23,20.33,11.77,20.08,11.42z"/><path d="M13.08,11.42L9.05,5.77C8.7,5.29,8.15,5,7.56,5h0C6.07,5,5.2,6.68,6.07,7.89L9,12l-2.93,4.11C5.2,17.32,6.07,19,7.56,19h0 c0.59,0,1.15-0.29,1.49-0.77l4.04-5.65C13.33,12.23,13.33,11.77,13.08,11.42z"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px"
+     fill="#f3eed9">
+    <g>
+        <rect fill="none" height="24" width="24"/>
+        <rect fill="none" height="24" width="24"/>
+    </g>
+    <g>
+        <g>
+            <path d="M20.08,11.42l-4.04-5.65C15.7,5.29,15.15,5,14.56,5h0c-1.49,0-2.35,1.68-1.49,2.89L16,12l-2.93,4.11 c-0.87,1.21,0,2.89,1.49,2.89h0c0.59,0,1.15-0.29,1.49-0.77l4.04-5.65C20.33,12.23,20.33,11.77,20.08,11.42z"/>
+            <path d="M13.08,11.42L9.05,5.77C8.7,5.29,8.15,5,7.56,5h0C6.07,5,5.2,6.68,6.07,7.89L9,12l-2.93,4.11C5.2,17.32,6.07,19,7.56,19h0 c0.59,0,1.15-0.29,1.49-0.77l4.04-5.65C13.33,12.23,13.33,11.77,13.08,11.42z"/>
+        </g>
+    </g>
+</svg>

+ 1 - 0
report-viewer/src/assets/keyboard_arrow_down_black_18dp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="18px" viewBox="0 0 24 24" width="18px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M7.41 8.59L12 13.17l4.59-4.58L18 10l-6 6-6-6 1.41-1.41z"/></svg>

+ 1 - 0
report-viewer/src/assets/keyboard_arrow_down_white_18dp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="18px" viewBox="0 0 24 24" width="18px" fill="#FFFFFF"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M7.41 8.59L12 13.17l4.59-4.58L18 10l-6 6-6-6 1.41-1.41z"/></svg>

+ 1 - 0
report-viewer/src/assets/keyboard_double_arrow_down_black_18dp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 20 20" height="18px" viewBox="0 0 20 20" width="18px" fill="#000000"><g><rect fill="none" height="20" width="20"/></g><g><g><polygon points="15,5.06 13.94,4 10,7.94 6.06,4 5,5.06 10,10.06"/><polygon points="15,11 13.94,9.94 10,13.88 6.06,9.94 5,11 10,16"/></g></g></svg>

+ 1 - 0
report-viewer/src/assets/keyboard_double_arrow_down_white_18dp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 20 20" height="18px" viewBox="0 0 20 20" width="18px" fill="#FFFFFF"><g><rect fill="none" height="20" width="20"/></g><g><g><polygon points="15,5.06 13.94,4 10,7.94 6.06,4 5,5.06 10,10.06"/><polygon points="15,11 13.94,9.94 10,13.88 6.06,9.94 5,11 10,16"/></g></g></svg>

+ 12 - 0
report-viewer/src/assets/keyboard_double_arrow_left_white_18dp.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 20 20" height="18px" viewBox="0 0 20 20" width="18px"
+     fill="#f3eed9">
+    <g>
+        <rect fill="none" height="20" width="20"/>
+    </g>
+    <g>
+        <g>
+            <path d="M15.37,14.47L15.37,14.47c0.29-0.29,0.29-0.77,0-1.06L11.96,10l3.41-3.41c0.29-0.29,0.29-0.77,0-1.06l0,0 c-0.29-0.29-0.77-0.29-1.06,0l-3.76,3.76c-0.39,0.39-0.39,1.02,0,1.41l3.76,3.76C14.6,14.76,15.07,14.76,15.37,14.47z"/>
+            <path d="M9.43,14.47L9.43,14.47c0.29-0.29,0.29-0.77,0-1.06L6.02,10l3.41-3.41c0.29-0.29,0.29-0.77,0-1.06l0,0 c-0.29-0.29-0.77-0.29-1.06,0L4.6,9.29c-0.39,0.39-0.39,1.02,0,1.41l3.76,3.76C8.66,14.76,9.13,14.76,9.43,14.47z"/>
+        </g>
+    </g>
+</svg>

+ 13 - 0
report-viewer/src/assets/keyboard_double_arrow_left_white_24dp.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px"
+     fill="#f3eed9">
+    <g>
+        <rect fill="none" height="24" width="24"/>
+        <rect fill="none" height="24" width="24"/>
+    </g>
+    <g>
+        <g>
+            <path d="M18.29,17.29L18.29,17.29c0.39-0.39,0.39-1.02,0-1.41L14.42,12l3.88-3.88c0.39-0.39,0.39-1.02,0-1.41l0,0 c-0.39-0.39-1.02-0.39-1.41,0l-4.59,4.59c-0.39,0.39-0.39,1.02,0,1.41l4.59,4.59C17.27,17.68,17.9,17.68,18.29,17.29z"/>
+            <path d="M11.7,17.29L11.7,17.29c0.39-0.39,0.39-1.02,0-1.41L7.83,12l3.88-3.88c0.39-0.39,0.39-1.02,0-1.41l0,0 c-0.39-0.39-1.02-0.39-1.41,0l-4.59,4.59c-0.39,0.39-0.39,1.02,0,1.41l4.59,4.59C10.68,17.68,11.31,17.68,11.7,17.29z"/>
+        </g>
+    </g>
+</svg>

+ 1 - 0
report-viewer/src/assets/keyboard_double_arrow_up_black_18dp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 20 20" height="18px" viewBox="0 0 20 20" width="18px" fill="#000000"><g><rect fill="none" height="20" width="20"/></g><g><g><polygon points="5,14.94 6.06,16 10,12.06 13.94,16 15,14.94 10,9.94"/><polygon points="5,9 6.06,10.06 10,6.12 13.94,10.06 15,9 10,4"/></g></g></svg>

+ 1 - 0
report-viewer/src/assets/keyboard_double_arrow_up_white_18dp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 20 20" height="18px" viewBox="0 0 20 20" width="18px" fill="#FFFFFF"><g><rect fill="none" height="20" width="20"/></g><g><g><polygon points="5,14.94 6.06,16 10,12.06 13.94,16 15,14.94 10,9.94"/><polygon points="5,9 6.06,10.06 10,6.12 13.94,10.06 15,9 10,4"/></g></g></svg>

BIN
report-viewer/src/assets/logo-nobg.png


+ 110 - 6
report-viewer/src/components/CodePanel.vue

@@ -1,38 +1,142 @@
 <template>
 <template>
-  <div class="code-container">
-    <LineOfCode v-for="(line, index) in lines" :key="line" :is-blurred="notBlurred.includes(index)" :line-number="index" :text="line"/>
+  <div class="code-panel-container">
+    <div class="file-title">
+      <p style="width: 90%">{{ title }}</p>
+      <button style="width: 10%" class="collapse-button" @click="$emit('toggleCollapse')">
+        <img v-if="collapse" src="../assets/keyboard_double_arrow_up_white_18dp.svg" alt="hide info">
+        <img v-else src="../assets/keyboard_double_arrow_down_white_18dp.svg" alt="additional info">
+      </button>
+    </div>
+    <div class="code-container" :class="{ hidden : !collapse }">
+      <LineOfCode v-for="(line, index) in lines"
+                :key="index"
+                :color="coloringArray[index]"
+                :line-number="index"
+                :text="line"
+                :id="String(panelId).concat(title).concat(index)"
+                :is-last="isLast[index]"
+                :is-first="isFirst[index]"
+                  @click="$emit('lineSelected', $event, linksArray[index].panel, linksArray[index].file, linksArray[index].line )"/>
+    </div>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
-import { defineComponent } from "vue";
+import {ref, defineComponent} from "vue";
 import LineOfCode from "./LineOfCode";
 import LineOfCode from "./LineOfCode";
 
 
 export default defineComponent({
 export default defineComponent({
   name: "CodePanel",
   name: "CodePanel",
   components: {LineOfCode},
   components: {LineOfCode},
   props: {
   props: {
+    title: {
+      type: String,
+    },
+    fileIndex: {
+      type: Number
+    },
     lines: {
     lines: {
       type: Array,
       type: Array,
       required: true
       required: true
     },
     },
-    notBlurred: {
+    matches: {
       type: Array
       type: Array
     },
     },
+    panelId: {
+      type: Number
+    },
+    collapse: {
+      type: Boolean
+    }
   },
   },
   setup(props) {
   setup(props) {
-    return {
+    const isCollapsed = ref(false)
+    const toggleIsCollapsed = () => isCollapsed.value = !isCollapsed.value
+
 
 
+    const coloringArray = ref({})
+    const linksArray = ref({})
+    const isLast = ref({})
+    const isFirst = ref({})
+    props.matches.forEach(m => {
+      for (let i = m.start; i <= m.end; i++) {
+        coloringArray.value[i] = m.color
+        linksArray.value[i] = { panel : m.linked_panel, file : m.linked_file, line : m.linked_line }
+        if(i === m.start) {
+          isFirst.value[i] = true
+        }
+        if(i === m.end) {
+          isLast.value[i] = true
+        }
+      }
+    })
+    for(let i = 0; i < props.lines.length; i++) {
+      if(!coloringArray.value[i]) {
+        coloringArray.value[i] = "#FFFFFF"
+        linksArray.value[i] = "-1"
+        isFirst.value[i] = false
+        isLast.value[i] = false
+      }
+    }
+
+    return {
+      isCollapsed,
+      coloringArray,
+      linksArray,
+      isFirst,
+      isLast,
+      toggleIsCollapsed
     }
     }
   }
   }
 })
 })
 </script>
 </script>
 
 
 <style scoped>
 <style scoped>
+.code-panel-container {
+  display: flex;
+  flex-direction: column;
+  margin-left: 1%;
+  margin-right: 1%;
+  margin-bottom: 3%;
+  border-radius: 10px;
+  box-shadow: var(--shadow-color) 2px 3px 3px;
+  background: var(--primary-color-light);
+}
+.file-title {
+  display: flex;
+}
+
+.file-title > p {
+  text-align: center;
+  color: var(--on-primary-color-accent);
+  font-weight: bold;
+  font-size: large;
+}
 .code-container {
 .code-container {
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
   align-items: flex-start;
   align-items: flex-start;
-  overflow: scroll;
+  margin: 1%;
+  padding: 1%;
+  background: var(--background-color-accent);
+  box-shadow: inset var(--shadow-color) 0 0 3px 1px;
+  overflow: auto;
+}
+
+.collapse-button {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: transparent;
+  border: none;
+}
+
+.collapse-button:hover {
+  background: var(--primary-color-dark);
+  border-radius: 10px;
+}
+
+.hidden {
+  display: none !important;
 }
 }
 </style>
 </style>

+ 0 - 70
report-viewer/src/components/ComparisonListElement.vue

@@ -1,70 +0,0 @@
-<template>
-  <div class="wrapper-list-element">
-    <p class="index">{{ index }}</p>
-      <p class="submission-id">{{ submission1 }}</p>
-      <img src="@/assets/double_arrow_black_18dp.svg" alt=">>"/>
-      <p class="submission-id">{{ submission2 }}</p>
-    <p class="match-percentage">{{ formattedMatchPercentage }}%</p>
-  </div>
-</template>
-
-<script>
-import {defineComponent, ref } from "vue";
-
-export default defineComponent({
-  name: "ComparisonListElement",
-  props: {
-    index: {
-      type: Number,
-      required: true
-    },
-    submission1: {
-      type: String,
-      required: true
-    },
-    submission2: {
-      type: String,
-      required: true
-    },
-    matchPercentage: {
-      type: Number,
-      required: true
-    }
-  },
-  setup(props) {
-    let formattedMatchPercentage = props.matchPercentage.toFixed(2)
-    return {
-      formattedMatchPercentage
-    }
-  }
-})
-</script>
-
-<style scoped>
-.wrapper-list-element {
-  background: white;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 3%;
-  box-shadow: #777777 0 3px 3px;
-  border-radius: 40px;
-}
-
-.wrapper-list-element > * {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-img {
-  flex-shrink: 2;
-}
-
-p {
-  font-weight: bold;
-  font-size: small;
-  text-align: center;
-  text-anchor: middle;
-}
-</style>

+ 0 - 60
report-viewer/src/components/ComparisonsLists.vue

@@ -1,60 +0,0 @@
-<template>
-  <div class="wrapper">
-    <ul id="list">
-      <li v-for="(comparison, index) in comparisons" :key="comparison.first_submission
-      + comparison.second_submission
-      + comparison.match_percentage">
-        <ComparisonListElement :index="index + 1"
-                               :submission1="comparison.first_submission"
-                               :submission2="comparison.second_submission"
-                               :match-percentage="comparison.match_percentage"/>
-      </li>
-    </ul>
-  </div>
-</template>
-
-<script>
-import { defineComponent, ref, watch} from "vue";
-import ComparisonListElement from "./ComparisonListElement";
-
-export default defineComponent({
-  name: "ComparisonsLists",
-  components: {ComparisonListElement},
-  props: {
-    comparisons: {
-      required: true
-    }
-  },
-  setup(props) {
-
-    watch( () => props.comparisons, (val, oldVal) => {
-      console.log("New val is: " + JSON.stringify(val))
-    })
-
-    return {
-
-    }
-  }
-})
-</script>
-
-<style scoped>
-.wrapper {
-  display: flex;
-  background: whitesmoke;
-  border-radius: 10px;
-  align-items: center;
-  box-shadow: #777777 2px 3px 3px;
-  height: 300px;
-}
-
-ul {
-  width: 100%;
-  height: 100%;
-  list-style-type: none;
-  padding: 2% 1% 0;
-  columns: 3;
-  -webkit-columns: 3;
-  -moz-columns: 3;
-}
-</style>

+ 95 - 0
report-viewer/src/components/ComparisonsTable.vue

@@ -0,0 +1,95 @@
+<template>
+<table>
+  <tr class="head-row">
+    <th>No.</th>
+    <th>Submission 1</th>
+    <th></th>
+    <th>Submission 2</th>
+    <th>Match %</th>
+  </tr>
+  <tr v-for="(comparison, index) in topComparisons"
+      :key="comparison.firstSubmissionId
+            + comparison.secondSubmissionId
+            + comparison.matchPercentage"
+      :class="{ 'even-row' : index % 2 === 0, 'odd-row' : index % 2 !== 0 }"
+      @click="navigateToComparisonView(comparison.firstSubmissionId, comparison.secondSubmissionId)">
+    <td>{{ index + 1 }}.</td>
+    <td>{{ comparison.firstSubmissionId }}</td>
+    <td><img src="@/assets/double_arrow_black_18dp.svg" alt=">>"/></td>
+    <td>{{ comparison.secondSubmissionId }}</td>
+    <td>{{ formattedMatchPercentage(comparison.matchPercentage) }}</td>
+  </tr>
+</table>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import router from "@/router";
+
+export default defineComponent({
+  name: "ComparisonsTable",
+  props: {
+   topComparisons : {
+     type: Array,
+     required: true
+   }
+  },
+  setup() {
+    let formattedMatchPercentage = ( number ) => number.toFixed(2)
+
+    const navigateToComparisonView = (id1, id2) => {
+      router.push({
+        name: "ComparisonView",
+        params: { id1 : id1, id2 : id2 }
+      })
+    }
+    return {
+      formattedMatchPercentage,
+      navigateToComparisonView
+    }
+  }
+})
+</script>
+
+<style scoped>
+table {
+  border-collapse: collapse;
+  font-size: larger;
+  text-align: center;
+  color: var(--on-primary-color-accent);
+}
+
+th {
+  margin: 0;
+  padding-top: 2%;
+  padding-bottom: 2%;
+  color: var(--on-primary-color);
+}
+
+td {
+  padding-top: 3%;
+  padding-bottom: 3%;
+}
+
+.head-row {
+  background: var(--primary-color-light);
+}
+
+.even-row {
+  background: var(--secondary-color);
+}
+
+.even-row:hover {
+  background: var(--primary-color-dark);
+  cursor: pointer;
+}
+
+.odd-row {
+  background: var(--primary-color-light);
+}
+
+.odd-row:hover {
+  background: var(--primary-color-dark);
+  cursor: pointer;
+}
+</style>

+ 73 - 18
report-viewer/src/components/DistributionDiagram.vue

@@ -22,32 +22,39 @@ export default defineComponent({
     }
     }
   },
   },
   setup(props) {
   setup(props) {
+    let maxVal = ref(Math.max(...props.distribution));
     let chartData = ref( {
     let chartData = ref( {
         labels: ['0-10%', '11-20%', '21-30%', '31-40%', '41-50%', '51-60%', '61-70%', '71-80%', '81-90%', '91-100%'],
         labels: ['0-10%', '11-20%', '21-30%', '31-40%', '41-50%', '51-60%', '61-70%', '71-80%', '81-90%', '91-100%'],
         datasets: [{
         datasets: [{
           label: 'Count',
           label: 'Count',
           data: props.distribution,
           data: props.distribution,
-          backgroundColor: '#BA1616'
+          backgroundColor: 'rgba(149, 168, 241, 0.5)',
+          borderWidth: 2,
+          borderColor: 'rgba(149, 168, 241, 1)',
+          tickColor: '#860000'
         }]
         }]
     })
     })
 
 
-    watch( () => props.distribution, (val, oldVal) => {
-      chartData.value = {
-        labels: ['0-10%', '11-20%', '21-30%', '31-40%', '41-50%', '51-60%', '61-70%', '71-80%', '81-90%', '91-100%'],
-        datasets: [{
-          label: 'Count',
-          data: val,
-          backgroundColor: '#BA1616'
-        }]
-      }
-    })
-
-    const options = {
+    const options = ref({
       responsive: true,
       responsive: true,
       maintainAspectRatio: false,
       maintainAspectRatio: false,
+      indexAxis: 'y',
+      scales: {
+        x: {
+          suggestedMax: maxVal.value + 5,
+          ticks: {
+            color: '#860000',
+          }
+        },
+        y: {
+          ticks: {
+            color: '#860000',
+          }
+        }
+      },
       plugins : {
       plugins : {
         datalabels: {
         datalabels: {
-          color: '#000000',
+          color: '#860000',
           font: {
           font: {
             weight: 'bold'
             weight: 'bold'
           },
           },
@@ -59,7 +66,54 @@ export default defineComponent({
           display: false,
           display: false,
         }
         }
       }
       }
-    }
+    })
+
+    watch( () => props.distribution, (val) => {
+      chartData.value = {
+        labels: ['0-10%', '11-20%', '21-30%', '31-40%', '41-50%', '51-60%', '61-70%', '71-80%', '81-90%', '91-100%'],
+        datasets: [{
+          label: 'Count',
+          data: val,
+          backgroundColor: 'rgba(149, 168, 241, 0.5)',
+          borderWidth: 2,
+          borderColor: 'rgba(149, 168, 241, 1)',
+        }]
+      }
+
+      maxVal.value = Math.max(...val)
+      options.value = {
+        responsive: true,
+        maintainAspectRatio: false,
+        indexAxis: 'y',
+        scales: {
+          x: {
+            suggestedMax: maxVal.value + 5,
+            ticks: {
+              color: '#860000',
+            }
+          },
+          y: {
+            ticks: {
+              color: '#860000',
+            }
+          }
+        },
+        plugins: {
+          datalabels: {
+            color: '#be1523',
+            font: {
+              weight: 'bold'
+            },
+            anchor: 'end',
+            align: 'end',
+            clamp: true
+          },
+          legend: {
+            display: false,
+          }
+        }
+      }
+    })
 
 
     return {
     return {
       chartData,
       chartData,
@@ -72,15 +126,16 @@ export default defineComponent({
 
 
 <style scoped>
 <style scoped>
 .wrapper {
 .wrapper {
-  background: white;
+  background: var(--background-color-accent);
   border-radius: 10px;
   border-radius: 10px;
   box-shadow: #777777 2px 3px 3px;
   box-shadow: #777777 2px 3px 3px;
   display: flex;
   display: flex;
-  padding: 2%;
+  height: 100%;
+
 }
 }
 
 
 .chart {
 .chart {
-  max-height: 200px;
   width: 100%;
   width: 100%;
+
 }
 }
 </style>
 </style>

+ 33 - 11
report-viewer/src/components/LineOfCode.vue

@@ -1,5 +1,7 @@
 <template>
 <template>
-<pre id="line" v-bind:class="{ blurred : isBlurred }">{{ lineNumber }} {{ text }}</pre>
+  <div class="line-wrap" :style="{background : color}" :class="{'first-line' : isFirst, 'last-line' : isLast}">
+    <pre :id="text" v-bind:class="{ 'match-line' : color !== '#ECECEC' }">{{ lineNumber }} {{ text }}</pre>
+  </div>
 </template>
 </template>
 
 
 <script>
 <script>
@@ -16,16 +18,24 @@ export default defineComponent({
       type: Number,
       type: Number,
       required: true
       required: true
     },
     },
-    isBlurred: {
+    color: {
+      required:true
+    },
+    startOfMatch: {
+      type: Number
+    },
+    fileIndex: {
+      type: Number,
+    },
+    isFirst: {
       type: Boolean,
       type: Boolean,
-      required: true
     },
     },
-  },
-  setup(props) {
-    console.log(props.lineNumber + " " + props.text)
-    return {
-
+    isLast: {
+      type: Boolean,
     }
     }
+  },
+  setup() {
+    return {}
   }
   }
 })
 })
 </script>
 </script>
@@ -34,10 +44,22 @@ export default defineComponent({
 pre {
 pre {
   margin: 0;
   margin: 0;
   padding: 0;
   padding: 0;
+  float: left;
+  font-family: "JetBrains Mono",serif;
+  font-size: x-small;
+}
+
+.first-line {
+  margin-top: 2%;
+}
+.last-line {
+  margin-bottom: 2%;
+  box-shadow: #777777 0 3px 3px;
+}
+.match-line {
 }
 }
-.blurred {
-  filter: blur(2px);
-  -webkit-filter: blur(2px);
+.line-wrap {
+  width: 200%;
 }
 }
 
 
 </style>
 </style>

+ 0 - 113
report-viewer/src/components/MatchList.vue

@@ -1,113 +0,0 @@
-<template>
-<div class="wrapper">
-  <select v-model="selected" @change="this.$emit('selectionChanged', $event, selected)">
-    <option v-for="option in Object.keys(matches)" :value="option" :key="option">
-      {{ option }}
-    </option>
-  </select>
-  <table>
-    <tr>
-      <th>
-        <p>{{ submission1 }}</p>
-        <p>{{ selectedSplit[0] }}</p>
-      </th>
-      <th>
-        <p>{{ submission2 }}</p>
-        <p>{{ selectedSplit[1] }}</p>
-      </th>
-      <th>Tokens</th>
-    </tr>
-    <tr v-for="(match, index) in matches[selected]" :key="match.start_in_first + match.end_in_first"
-        @click="this.$emit('matchSelected', $event, index)">
-      <td>{{ match.start_in_first }} - {{ match.end_in_first }}</td>
-      <td>{{ match.start_in_second }} - {{ match.end_in_second }}</td>
-      <td>TODO</td>
-    </tr>
-  </table>
-</div>
-</template>
-
-<script>
-import { defineComponent, ref, watchEffect } from "vue";
-
-export default defineComponent({
-  name: "MatchList",
-  props: {
-    matches: {
-      type: Array,
-      required: true
-    },
-    submission1: {
-      type: String,
-      required: true
-    },
-    submission2: {
-      type: String,
-      required: true
-    }
-  },
-  setup(props) {
-    let selected = ref(Object.keys(props.matches)[0]);
-    let selectedSplit = ref(selected.value.split(" - "))
-
-    watchEffect(() => {
-      selectedSplit.value = selected.value.split(" - ")
-    })
-
-    return {
-      selected,
-      selectedSplit,
-    }
-  }
-})
-</script>
-
-<style scoped>
-.wrapper {
-  background: #ECECEC;
-  border-radius: 10px;
-  padding: 5%;
-  display: flex;
-  flex-direction: column;
-  overflow-x: hidden;
-  overflow-y: scroll;
-  -ms-overflow-style: none;
-}
-
-.wrapper::-webkit-scrollbar {
-  display: none;
-}
-
-select {
-  margin-bottom: 5%;
-  background: #ECECEC;
-  border: none;
-  border-bottom: solid rgba(119, 119, 119, 0.20);
-}
-
-table {
-  border-collapse: collapse;
-}
-
-th {
-  font-size: small;
-}
-
-th > p {
-  margin: 0
-}
-
-tr {
-  border-bottom: solid rgba(119, 119, 119, 0.20);
-}
-
-td {
-  padding: 2% 0;
-}
-
-tr:hover {
-  background: #FF5353;
-  color: white;
-}
-
-</style>

+ 97 - 0
report-viewer/src/components/MatchTable.vue

@@ -0,0 +1,97 @@
+<template>
+<div class="match-table-container">
+  <table>
+    <tr>
+      <th>{{ id1 }}</th>
+      <th>{{ id2 }}</th>
+    </tr>
+    <tr>
+      <th>File 1</th>
+      <th>File 2</th>
+      <th>Tokens</th>
+    </tr>
+    <tr v-for="( match, index ) in matches" :key="String(index).concat(match.startInFirst).concat(match.startInSecond)"
+        @click="$emit('matchSelected', $event, match)"
+        :style="{ background : match.color }">
+      <td>
+        <div class="td-content">
+          <p>{{ match.firstFile }}</p>
+          <p>({{ match.startInFirst }} - {{ match.endInFirst }})</p>
+        </div>
+      </td>
+      <td>
+        <div class="td-content">
+          <p>{{ match.secondFile }}</p>
+          <p>({{ match.startInSecond }} - {{ match.endInSecond }})</p>
+        </div>
+      </td>
+      <td>{{ match.tokens }}</td>
+    </tr>
+  </table>
+</div>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "MatchTable",
+  props: {
+    matches : {
+      type: Array
+    },
+    id1: {
+      type: String
+    },
+    id2: {
+      type: String
+    }
+  },
+  setup(props) {
+    console.log(props.matches)
+    return {}
+  }
+})
+</script>
+
+<style scoped>
+.match-table-container {
+  width: 100%;
+  margin-top: 2%;
+  padding: 1%;
+  background: var(--quaternary-color);
+  border-radius: 10px;
+  overflow: auto;
+}
+
+.td-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  flex-wrap: nowrap;
+  padding: 5%;
+}
+
+.td-content > p {
+  margin: 0;
+}
+
+table {
+  border-collapse: collapse;
+  width: 100%;
+}
+
+th {
+  color: var(--on-primary-color);
+  text-align: center;
+
+}
+
+td {
+  font-size: small;
+  text-align: center;
+  padding: 2%;
+  border-bottom: solid var(--quaternary-color);
+  border-top: solid var(--quaternary-color);
+}
+</style>

+ 9 - 6
report-viewer/src/components/MetricButton.vue

@@ -31,9 +31,7 @@ export default defineComponent({
     },
     },
   },
   },
   setup() {
   setup() {
-
-    return {
-    }
+    return {}
   }
   }
 })
 })
 </script>
 </script>
@@ -46,7 +44,7 @@ export default defineComponent({
   border-radius: 5px;
   border-radius: 5px;
   box-shadow: #777777 2px 3px 3px;
   box-shadow: #777777 2px 3px 3px;
   padding: 5%;
   padding: 5%;
-  width: 7vw;
+  margin-right: 5%;
 }
 }
 
 
 
 
@@ -60,6 +58,11 @@ export default defineComponent({
   justify-content: space-between;
   justify-content: space-between;
 }
 }
 
 
+.wrapper:hover {
+  background: var(--tertiary-color-dark);
+  color: white;
+}
+
 .metric {
 .metric {
   margin-bottom: 2%;
   margin-bottom: 2%;
 }
 }
@@ -76,8 +79,8 @@ export default defineComponent({
 }
 }
 
 
 .selected {
 .selected {
-  background: #FF5353;
-  box-shadow: #777777 0 0 0;
+  background: var(--tertiary-color);
+  box-shadow: var(--shadow-color) 2px 3px 3px;
 }
 }
 
 
 .selected p {
 .selected p {

+ 53 - 23
report-viewer/src/components/TextInformation.vue

@@ -1,15 +1,19 @@
 <template>
 <template>
   <div class="wrapper">
   <div class="wrapper">
-    <div class="label">
+      <div class="text-container">
       <p class="label-text">{{ label }}</p>
       <p class="label-text">{{ label }}</p>
-      <div class="additional-info" v-if="hasAdditionalInfo">
-        <p class="additional-label">{{ additionalInfoLabel }}</p>
-        <img alt="icon" src="@/assets/double_arrow_white_18dp.svg">
+      <p class="value-text" :title="value">{{ value }}</p>
       </div>
       </div>
-    </div>
-    <p class="value-text">{{ value }}</p>
-    <hr>
+      <button class="collapse-button" :class="{ hidden : !hasAdditionalInfo }" @click="toggleIsCollapsed">
+        <img v-if="isCollapsed" src="../assets/keyboard_double_arrow_up_white_18dp.svg" alt="hide info">
+        <img v-else src="../assets/keyboard_double_arrow_down_white_18dp.svg" alt="additional info">
+      </button>
   </div>
   </div>
+  <div class="additional-info" :class="{ hidden : !isCollapsed }">
+    <p class="additional-info-title">{{ additionalInfoTitle }}</p>
+    <p v-for="info in additionalInfo" :key="info">{{ info }}</p>
+  </div>
+  <hr>
 </template>
 </template>
 
 
 <script>
 <script>
@@ -29,13 +33,17 @@ export default defineComponent({
       type: Boolean,
       type: Boolean,
       required: true
       required: true
     },
     },
-    additionalInfoLabel : String,
+    additionalInfoTitle: String,
     additionalInfo : [String]
     additionalInfo : [String]
   },
   },
   setup() {
   setup() {
+    const isCollapsed = ref(false)
 
 
-    return {
+    const toggleIsCollapsed = () => isCollapsed.value = !isCollapsed.value
 
 
+    return {
+      isCollapsed,
+      toggleIsCollapsed
     }
     }
   }
   }
 
 
@@ -59,38 +67,60 @@ hr {
 
 
 .wrapper {
 .wrapper {
   display: flex;
   display: flex;
-  flex-direction: column;
-  align-items: stretch;
+  background: var(--primary-color-light);
+  justify-content: space-between;
+  border-radius: 10px;
 }
 }
 
 
-.label {
+.text-container {
   display: flex;
   display: flex;
-  justify-content: space-between;
+  flex-direction: column;
+  overflow: hidden;
 }
 }
 
 
 .label-text {
 .label-text {
-  font-weight: lighter;
+  color: var(--on-primary-color);
   text-align: left;
   text-align: left;
-  color: #ECECEC;
 }
 }
 
 
 .value-text {
 .value-text {
   font-weight: bold;
   font-weight: bold;
   text-align: left;
   text-align: left;
-  color: white;
+  color: var(--on-primary-color-accent);
 }
 }
 
 
-.additional-info {
+.collapse-button {
   display: flex;
   display: flex;
-  justify-content: flex-end;
+  justify-content: center;
+  align-items: center;
+  background: transparent;
+  border: none;
 }
 }
 
 
-.additional-label {
-  font-weight: lighter;
+.collapse-button:hover {
+  background: var(--primary-color-dark);
+  border-radius: 10px;
+}
+
+.additional-info {
+  display: flex;
+  flex-direction: column;
+  align-items: start;
+  background: var(--quaternary-color);
+  padding: 2%;
+  margin: 3% 0;
+  box-shadow: inset var(--shadow-color) 0 0 3px;
+  border-radius: 10px;
+  font-family: "JetBrains Mono",serif;
   font-size: smaller;
   font-size: smaller;
-  white-space: nowrap;
-  color: #ECECEC;
-  margin: 4% 0 0 0;
+}
+
+.additional-info-title {
+  margin-bottom: 1%;
+}
+
+.hidden {
+  display: none !important;
 }
 }
 
 
 </style>
 </style>

BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-Bold.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-BoldItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-ExtraBold.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-ExtraBoldItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-ExtraLight.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-ExtraLightItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-Italic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-Light.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-LightItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-Medium.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-MediumItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-Regular.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-SemiBold.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-SemiBoldItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-Thin.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMono-ThinItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-Bold.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-BoldItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-ExtraBold.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-ExtraBoldItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-ExtraLight.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-ExtraLightItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-Italic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-Light.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-LightItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-Medium.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-MediumItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-Regular.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-SemiBold.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-SemiBoldItalic.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-Thin.ttf


BIN
report-viewer/src/fonts/jetbrains-mono/JetBrainsMonoNL-ThinItalic.ttf


+ 89 - 0
report-viewer/src/model/Comparison.ts

@@ -0,0 +1,89 @@
+import {Match} from "./Match";
+import {SubmissionFile} from "./SubmissionFile"
+import {MatchInSingleFile} from "./MatchInSingleFile";
+
+export class Comparison {
+    private readonly _firstSubmissionId: string
+    private readonly _secondSubmissionId: string
+    private readonly _match_percentage: number
+    private _filesOfFirstSubmission: Record<string, SubmissionFile>
+    private _filesOfSecondSubmission: Record<string, SubmissionFile>
+    private _colors: Array<string>
+    private _allMatches: Array<Match>
+    private _matchesInFirstSubmission: Record<string, Array<MatchInSingleFile>>
+    private _matchesInSecondSubmissions: Record<string, Array<MatchInSingleFile>>
+
+
+    constructor(firstSubmissionId: string, secondSubmissionId: string, match_percentage: number) {
+        this._firstSubmissionId = firstSubmissionId;
+        this._secondSubmissionId = secondSubmissionId;
+        this._match_percentage = match_percentage;
+        this._filesOfFirstSubmission = {}
+        this._filesOfSecondSubmission = {}
+        this._colors = []
+        this._allMatches = []
+        this._matchesInFirstSubmission = {}
+        this._matchesInSecondSubmissions = {}
+    }
+
+
+    get firstSubmissionId(): string {
+        return this._firstSubmissionId;
+    }
+
+    get secondSubmissionId(): string {
+        return this._secondSubmissionId;
+    }
+
+    get match_percentage(): number {
+        return this._match_percentage;
+    }
+
+    get filesOfFirstSubmission(): Record<string, SubmissionFile> {
+        return this._filesOfFirstSubmission;
+    }
+
+    set filesOfFirstSubmission(value: Record<string, SubmissionFile>) {
+        this._filesOfFirstSubmission = value;
+    }
+
+    get filesOfSecondSubmission(): Record<string, SubmissionFile> {
+        return this._filesOfSecondSubmission;
+    }
+
+    set filesOfSecondSubmission(value: Record<string, SubmissionFile>) {
+        this._filesOfSecondSubmission = value;
+    }
+
+    get colors(): Array<string> {
+        return this._colors;
+    }
+
+    set colors(value: Array<string>) {
+        this._colors = value;
+    }
+
+    get allMatches(): Array<Match> {
+        return this._allMatches;
+    }
+
+    set allMatches(value: Array<Match>) {
+        this._allMatches = value;
+    }
+
+    get matchesInFirstSubmission(): Record<string, Array<MatchInSingleFile>> {
+        return this._matchesInFirstSubmission;
+    }
+
+    set matchesInFirstSubmission(value: Record<string, Array<MatchInSingleFile>>) {
+        this._matchesInFirstSubmission = value;
+    }
+
+    get matchesInSecondSubmissions(): Record<string, Array<MatchInSingleFile>> {
+        return this._matchesInSecondSubmissions;
+    }
+
+    set matchesInSecondSubmissions(value: Record<string, Array<MatchInSingleFile>>) {
+        this._matchesInSecondSubmissions = value;
+    }
+}

+ 5 - 0
report-viewer/src/model/ComparisonListElement.ts

@@ -0,0 +1,5 @@
+export type ComparisonListElement = {
+    firstSubmissionId: string,
+    secondSubmissionId: string,
+    matchPercentage: number
+}

+ 10 - 0
report-viewer/src/model/Match.ts

@@ -0,0 +1,10 @@
+export type Match = {
+    firstFile: string,
+    secondFile: string,
+    startInFirst: number,
+    endInFirst: number,
+    startInSecond: number,
+    endInSecond: number,
+    tokens: number,
+    color: string
+}

+ 8 - 0
report-viewer/src/model/MatchInSingleFile.ts

@@ -0,0 +1,8 @@
+export type MatchInSingleFile = {
+    start: number,
+    end: number,
+    linked_panel: number,
+    linked_file: string,
+    linked_line: number,
+    color: string
+}

+ 8 - 0
report-viewer/src/model/Metric.ts

@@ -0,0 +1,8 @@
+import {ComparisonListElement} from "./ComparisonListElement";
+
+export type Metric = {
+    metricName : string,
+    metricThreshold : number,
+    distribution : Array<number>,
+    comparisons : Array<ComparisonListElement>
+}

+ 63 - 0
report-viewer/src/model/Overview.ts

@@ -0,0 +1,63 @@
+import {Metric} from "./Metric";
+
+export class Overview {
+    private readonly _submissionFolderPath: string
+    private readonly _baseCodeFolderPath: string
+    private readonly _language: string
+    private readonly _fileExtensions: Array<string>
+    private readonly _matchSensitivity: number
+    private readonly _submissionIds: Array<string>
+    private readonly _dateOfExecution: string
+    private readonly _durationOfExecution: number
+    private readonly _metrics: Array<Metric>
+
+
+    constructor(submissionFolderPath: string, baseCodeFolderPath: string, language: string, fileExtensions: Array<string>,matchSensitivity: number, submissionIds: Array<string>, dateOfExecution: string, durationOfExecution: number, metrics: Array<Metric>) {
+        this._submissionFolderPath = submissionFolderPath;
+        this._baseCodeFolderPath = baseCodeFolderPath;
+        this._language = language;
+        this._fileExtensions = fileExtensions
+        this._matchSensitivity = matchSensitivity;
+        this._submissionIds = submissionIds;
+        this._dateOfExecution = dateOfExecution;
+        this._durationOfExecution = durationOfExecution;
+        this._metrics = metrics;
+    }
+
+
+    get submissionFolderPath(): string {
+        return this._submissionFolderPath;
+    }
+
+    get baseCodeFolderPath(): string {
+        return this._baseCodeFolderPath;
+    }
+
+    get language(): string {
+        return this._language;
+    }
+
+    get fileExtensions(): Array<string> {
+        return this._fileExtensions
+    }
+
+    get matchSensitivity(): number {
+        return this._matchSensitivity;
+    }
+
+    get submissionIds(): Array<string> {
+        return this._submissionIds;
+    }
+
+    get dateOfExecution(): string {
+        return this._dateOfExecution;
+    }
+
+    get durationOfExecution(): number {
+        return this._durationOfExecution;
+    }
+
+    get metrics(): Array<Metric> {
+        return this._metrics;
+    }
+}

+ 4 - 0
report-viewer/src/model/SubmissionFile.ts

@@ -0,0 +1,4 @@
+export type SubmissionFile = {
+    lines: Array<string>;
+    collapsed: boolean;
+}

+ 0 - 17
report-viewer/src/model/TopComparison.ts

@@ -1,17 +0,0 @@
-class TopComparison {
-    comparisonName: string;
-    submission1: string;
-    submission2: string
-    matchPercentage: string;
-
-    constructor(comparisonName: string, matchPercentage: number) {
-        this.comparisonName = comparisonName
-        const split: string[]  = comparisonName.split("-")
-        this.submission1 = split[0]
-        this.submission2 = split[1]
-        this.matchPercentage = matchPercentage.toFixed(2)
-    }
-
-}
-
-export default TopComparison;

+ 106 - 0
report-viewer/src/model/factories/ComparisonFactory.ts

@@ -0,0 +1,106 @@
+import {Comparison} from "../Comparison";
+import {Match} from "../Match";
+import {SubmissionFile} from "../SubmissionFile";
+import {MatchInSingleFile} from "../MatchInSingleFile";
+
+export class ComparisonFactory {
+
+    static getComparison(json: Record<string, unknown>): Comparison {
+        const filesOfFirst = this.convertToFilesByName(json.files_of_first_submission as Array<Record<string, unknown>>)
+        const filesOfSecond = this.convertToFilesByName(json.files_of_second_submission as Array<Record<string, unknown>>)
+
+        const matches = json.matches as Array<Record<string, unknown>>
+        const colors = this.generateColorsForMatches(matches.length)
+        const coloredMatches = matches.map( (match, index) => this.mapMatch(match, colors[index]) )
+
+        const matchesInFirst = this.groupMatchesByFileName(coloredMatches, 1)
+        const matchesInSecond = this.groupMatchesByFileName(coloredMatches, 2)
+
+        const comparison = new Comparison(
+            json.first_submission_id as string,
+            json.second_submission_id as string,
+            json.match_percentage as number
+        )
+        comparison.filesOfFirstSubmission = filesOfFirst
+        comparison.filesOfSecondSubmission = filesOfSecond
+        comparison.colors = colors
+        comparison.allMatches = coloredMatches
+        comparison.matchesInFirstSubmission = matchesInFirst
+        comparison.matchesInSecondSubmissions = matchesInSecond
+
+        return comparison
+    }
+
+    private static convertToFilesByName(files: Array<Record<string, unknown>>): Record<string, SubmissionFile> {
+        return files.reduce( (acc: Record<string, SubmissionFile>, val: Record<string, unknown>) => {
+            if(!acc[val.file_name as string]) {
+                acc[val.file_name as string] = {
+                    lines : [],
+                    collapsed: false
+                }
+            }
+            acc[val.file_name as string] = {
+                lines: val.lines as Array<string>,
+                collapsed: false
+            }
+            return acc;
+        }, {})
+    }
+
+    private static groupMatchesByFileName(matches: Array<Match>, index: number): Record<string, Array<MatchInSingleFile>> {
+        return matches.reduce( (acc: Record<string, Array<MatchInSingleFile>>, val: Match ) => {
+            const name = index === 1 ? val.firstFile as string : val.secondFile as string
+            if(!acc[name]) {
+                acc[name] = []
+            }
+            if( index === 1 ) {
+                const newVal: MatchInSingleFile = {
+                    start : val.startInFirst as number,
+                    end: val.endInFirst as number,
+                    linked_panel: 2,
+                    linked_file: val.secondFile as string,
+                    linked_line: val.startInSecond as number,
+                    color: val.color as string
+                }
+                acc[name].push(newVal)
+            } else {
+                const newVal: MatchInSingleFile = {
+                    start : val.startInSecond as number,
+                    end: val.endInSecond as number,
+                    linked_panel: 1,
+                    linked_file: val.firstFile as string,
+                    linked_line: val.startInFirst as number,
+                    color: val.color as string
+                }
+                acc[name].push(newVal)
+            }
+            return acc;
+        }, {})
+    }
+
+    private static generateColorsForMatches( num : number ): Array<string> {
+        const colors = []
+        const hueDelta = Math.trunc(360 / (num) )
+
+        for( let i = 0; i < num; i++ ) {
+            const hue = i * hueDelta
+
+            colors.push(`hsla(${hue}, 80%, 50%, 0.5)`)
+        }
+        return colors
+    }
+
+    private static mapMatch(match: Record<string, unknown>, color: string): Match {
+        return {
+            firstFile: match.first_file_name as string,
+            secondFile: match.second_file_name as string,
+            startInFirst: match.start_in_first as number,
+            endInFirst: match.end_in_first as number,
+            startInSecond: match.start_in_second as number,
+            endInSecond: match.end_in_second as number,
+            tokens: match.tokens as number,
+            color: color
+        };
+    }
+
+}

+ 51 - 0
report-viewer/src/model/factories/OverviewFactory.ts

@@ -0,0 +1,51 @@
+import {Overview} from "../Overview";
+import {Metric} from "../Metric";
+import {ComparisonListElement} from "../ComparisonListElement";
+
+export class OverviewFactory {
+
+    static getOverview(json: Record<string, unknown>): Overview {
+        const submissionFolder = json.submission_folder_path as string
+        const baseCodeFolder = ""
+        const language = json.language as string
+        const fileExtensions = json.file_extensions as Array<string>
+        const matchSensitivity = json.match_sensitivity as number
+        const submissions = json.submission_ids as Array<string>
+        const dateOfExecution = json.date_of_execution as string
+        const duration = json.execution_time as number as number
+        const metrics = [] as Array<Metric>
+        (json.metrics as Array<unknown>).forEach( (m) => {
+            const metric = m as Record<string, unknown>
+            const comparisons = [] as Array<ComparisonListElement>
+
+            (metric.topComparisons as Array<Record<string, unknown>>).forEach( c => {
+                const comparison: ComparisonListElement = {
+                    firstSubmissionId : c.first_submission as string,
+                    secondSubmissionId : c.second_submission as string,
+                    matchPercentage : c.match_percentage as number
+                }
+                comparisons.push(comparison)
+            })
+
+            const newMetric : Metric = {
+                metricName : metric.name as string,
+                metricThreshold : metric.threshold as number,
+                distribution : metric.distribution as Array<number>,
+                comparisons : comparisons
+            }
+            metrics.push(newMetric)
+        })
+
+        return new Overview(
+            submissionFolder,
+            baseCodeFolder,
+            language,
+            fileExtensions,
+            matchSensitivity,
+            submissions,
+            dateOfExecution,
+            duration,
+            metrics
+        )
+    }
+}

+ 4 - 11
report-viewer/src/router/index.ts

@@ -1,30 +1,23 @@
-import { createRouter, createWebHashHistory, RouteRecordRaw } from "vue-router";
+import {createRouter, createWebHistory, RouteRecordRaw} from "vue-router";
 import Overview from "@/views/Overview.vue";
 import Overview from "@/views/Overview.vue";
-import FileUpload from "@/views/FileUpload.vue"
 import ComparisonView from "@/views/ComparisonView.vue"
 import ComparisonView from "@/views/ComparisonView.vue"
 
 
 const routes: Array<RouteRecordRaw> = [
 const routes: Array<RouteRecordRaw> = [
   {
   {
     path: "/",
     path: "/",
-    name: "FileUpload",
-    component: FileUpload
-  },
-  {
-    path: "/overview",
     name: "Overview",
     name: "Overview",
     component: Overview,
     component: Overview,
-    props: route => ({ jsonString : route.params.str })
   },
   },
   {
   {
-    path: "/c",
+    path: "/comparison/:id1/:id2",
     name: "ComparisonView",
     name: "ComparisonView",
     component: ComparisonView,
     component: ComparisonView,
-    props: route => ({ jsonString : route.params.str})
+    props: true
   },
   },
 ];
 ];
 
 
 const router = createRouter({
 const router = createRouter({
-  history: createWebHashHistory(),
+  history: createWebHistory(),
   routes,
   routes,
 });
 });
 
 

+ 82 - 0
report-viewer/src/utils/Utils.ts

@@ -0,0 +1,82 @@
+export function convertToFilesByName(files: Array<Record<string, unknown>>): Record<string, unknown> {
+    return files.reduce( (acc: Record<string, unknown>, val: Record<string, unknown>) => {
+        if(!acc[val.file_name as string]) {
+            acc[val.file_name as string] = {}
+        }
+        acc[val.file_name as string] = {
+            lines: val.lines,
+            collapsed: false
+        }
+        return acc;
+    }, {})
+}
+
+export function groupMatchesByFileName(matches: Array<Record<string, unknown>>, index: number): Record<string, unknown> {
+    return matches.reduce( ( acc: Record<string, Array<unknown> >, val: Record<string, unknown> ) => {
+        const name = index === 1 ? val.first_file_name as string : val.second_file_name as string
+        if(!acc[name]) {
+            acc[name] = []
+        }
+        if( index === 1 ) {
+            const newVal = {
+                start : val.start_in_first,
+                end: val.end_in_first,
+                linked_panel: 2,
+                linked_file: val.second_file_name,
+                linked_line: val.start_in_second,
+                color: val.color
+            }
+            acc[name].push(newVal)
+        } else {
+            const newVal = {
+                start : val.start_in_second,
+                end: val.end_in_second,
+                linked_panel: 1,
+                linked_file: val.first_file_name,
+                linked_line: val.start_in_first,
+                color: val.color
+            }
+            acc[name].push(newVal)
+        }
+        return acc;
+    }, {})
+}
+
+export function generateLineCodeLink(index: number, fileName: string, line: number): string {
+    return String(index).concat(fileName).concat(String(line))
+}
+
+export function generateColoringArray(array: Array<Record<string, unknown>>, fileToConsider: number): Array<Record<string, unknown>> {
+    switch (fileToConsider) {
+        case 1:
+            return array.map( m => {
+                //Add connection to second panel via m.start_in_second
+                return { start: m.start_in_first, end: m.end_in_first, link: m.start_in_second, color: m.color}
+            })
+        case 2:
+            return array.map( m => {
+                return { start: m.start_in_second, end: m.end_in_second, link: m.start_in_first, color: m.color}
+            })
+        default:
+            return []
+    }
+}
+
+export function generateColor(): string {
+    let color = "#";
+    for (let i = 0; i < 3; i++)
+        color += ("0" + Math.floor(((1 + Math.random()) * Math.pow(16, 2)) / 2).toString(16)).slice(-2);
+    return color;
+}
+
+export function generateColorsForMatches( num : number ): Array<unknown> {
+    const colors = []
+    const hueDelta = Math.trunc(360 / (num) )
+
+    for( let i = 0; i < num; i++ ) {
+        const hue = i * hueDelta
+
+        colors.push(`hsla(${hue}, 80%, 50%, 0.5)`)
+    }
+    return colors
+}

+ 165 - 73
report-viewer/src/views/ComparisonView.vue

@@ -1,115 +1,207 @@
 <template>
 <template>
-<div class="container">
-  <div id="leftPanel">
-    <img id="logo" src="@/assets/logo.png" alt="JPlag">
-    <TextInformation :has-additional-info="false" value="Match Report" label=""/>
-    <TextInformation label="First Submission:" value="324567" :has-additional-info="false"/>
-    <TextInformation label="Second Submission:" value="789223" :has-additional-info="false"/>
-    <TextInformation label="Match percentage:" value="75.34%" :has-additional-info="false"/>
-    <MatchList :submission1="json.first_submission_id"
-               :submission2="json.second_submission_id"
-               :matches="groupedMatches"
-                @selection-changed="selectFiles"
-                @match-selected="selectMatch"/>
+  <div class="container">
+    <button id="show-button" :class="{hidden : !hideLeftPanel}" @click="togglePanel" title="Show sidebar">
+      <img src="@/assets/double_arrow_white_24dp.svg" alt="show">
+    </button>
+    <div id="sidebar" :class="{ hidden : hideLeftPanel }">
+      <div class="title-section">
+        <h1>JPlag Comparison</h1>
+        <button id="hide-button" @click="togglePanel" title="Hide sidebar">
+          <img src="@/assets/keyboard_double_arrow_left_white_24dp.svg" alt="hide"></button>
+      </div>
+      <TextInformation label="Submission 1" :value="id1" :has-additional-info="false"/>
+      <TextInformation label="Submission 2" :value="id2" :has-additional-info="false"/>
+      <TextInformation label="Match %" :value="comparison.match_percentage" :has-additional-info="false"/>
+      <MatchTable :matches="comparison.allMatches" :id1="id1" :id2="id2" @match-selected="showMatch" />
+    </div>
+    <div class="files-container" id="files1">
+      <h1>Files of {{ id1 }}</h1>
+      <VueDraggableNext>
+      <CodePanel v-for="(file, index) in Object.keys(filesOfFirst)"
+                 :lines="filesOfFirst[file].lines"
+                 :title="file"
+                 :file-index="index"
+                 :matches="!comparison.matchesInFirstSubmission[file] ? [] : comparison.matchesInFirstSubmission[file]"
+                 :key="file.concat(index)"
+                 :collapse="filesOfFirst[file].collapsed"
+                 @toggle-collapse="toggleCollapseFirst(file)"
+                 @line-selected="showMatchInSecond"
+                 :panel-id="1"
+      />
+      </VueDraggableNext>
+    </div>
+    <div class="files-container" id="files2">
+      <h1>Files of {{ id2 }}</h1>
+      <VueDraggableNext>
+        <CodePanel v-for="(file, index) in Object.keys(filesOfSecond)"
+                   :lines="filesOfSecond[file].lines"
+                   :title="file"
+                   :file-index="index"
+                   :matches="!comparison.matchesInSecondSubmissions[file] ? [] : comparison.matchesInSecondSubmissions[file]"
+                   :key="file.concat(index)"
+                   :collapse="filesOfSecond[file].collapsed"
+                   @toggle-collapse="toggleCollapseSecond(file)"
+                   @line-selected="showMatchInFirst"
+                   :panel-id="2"
+                   />
+      </VueDraggableNext>
+    </div>
   </div>
   </div>
-  <div id="rightPanel">
-    <CodePanel :lines="filesOfFirst[selectedFileOfFirst]" :not-blurred="[]"/>
-    <CodePanel :lines="filesOfSecond[selectedFileOfSecond]" :not-blurred="[]"/>
-  </div>
-</div>
 </template>
 </template>
 
 
 <script>
 <script>
 import { defineComponent, ref } from "vue";
 import { defineComponent, ref } from "vue";
-import TextInformation from "@/components/TextInformation";
-import MatchList from "@/components/MatchList";
+import {generateLineCodeLink} from "@/utils/Utils";
+import { VueDraggableNext } from 'vue-draggable-next'
 import CodePanel from "@/components/CodePanel";
 import CodePanel from "@/components/CodePanel";
+import TextInformation from "@/components/TextInformation";
+import MatchTable from "@/components/MatchTable";
+import {ComparisonFactory} from "@/model/factories/ComparisonFactory";
 
 
 export default defineComponent({
 export default defineComponent({
   name: "ComparisonView",
   name: "ComparisonView",
-  components: {CodePanel, MatchList, TextInformation},
+  components: {MatchTable, TextInformation, VueDraggableNext, CodePanel},
   props: {
   props: {
-    jsonString: {
-      type: String
+    id1: {
+      type: String,
+    },
+    id2: {
+      type: String,
     }
     }
   },
   },
   setup(props) {
   setup(props) {
-    const selectedFileOfFirst = ref([])
-    const selectedFileOfSecond = ref([])
-    const json = JSON.parse(props.jsonString)
-    const filesOfFirst = json.files_of_first_submission.reduce( (acc, val) => {
-      if(!acc[val.file_name]) {
-        acc[val.file_name] = []
-      }
-      acc[val.file_name] = val.lines
-      return acc
-    }, {})
-    const filesOfSecond = json.files_of_second_submission.reduce( (acc, val) => {
-      if(!acc[val.file_name]) {
-        acc[val.file_name] = []
-      }
-      acc[val.file_name] = val.lines
-      return acc
-    }, {})
-
-    const groupedMatches = json.matches.reduce( (acc, val) => {
-      let name = val.first_file_name + " - " + val.second_file_name
-      if(!acc[name]) {
-        acc[name] = []
-      }
-      acc[name].push(val)
-      return acc;
-    }, {})
-
-
-    const selectFiles = (e , s) => {
-      let split = s.split(" - ")
-      selectedFileOfFirst.value = split[0]
-      selectedFileOfSecond.value = split[1]
+    const fileName = props.id1.concat("-").concat(props.id2)
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const json = require(`../files/${fileName}.json`)
+    const comparison = ComparisonFactory.getComparison(json)
+
+    const filesOfFirst = ref(comparison.filesOfFirstSubmission)
+    const filesOfSecond = ref(comparison.filesOfSecondSubmission)
+
+    const toggleCollapseFirst = (title) => { filesOfFirst.value[title].collapsed = !filesOfFirst.value[title].collapsed }
+    const toggleCollapseSecond = (title) => { filesOfSecond.value[title].collapsed = !filesOfSecond.value[title].collapsed }
+
+    const showMatchInFirst = ( e, panel, file, line ) => {
+      if( !filesOfFirst.value[file].collapsed ) { toggleCollapseFirst(file) }
+      document.getElementById(generateLineCodeLink(panel, file, line)).scrollIntoView()
     }
     }
 
 
-    const selectMatch = (e, i) => {
-      console.log(e, i)
+    const showMatchInSecond = ( e, panel, file, line ) => {
+      if( !filesOfSecond.value[file].collapsed ) { toggleCollapseSecond(file) }
+      document.getElementById(generateLineCodeLink(panel, file, line)).scrollIntoView()
+    }
+
+    const showMatch = ( e, match ) => {
+      showMatchInFirst(e, 1, match.firstFile, match.startInFirst)
+      showMatchInSecond(e, 2, match.secondFile, match.startInSecond)
+    }
+
+
+    const hideLeftPanel = ref(true)
+    const togglePanel = () => {
+      hideLeftPanel.value = !hideLeftPanel.value
     }
     }
+
     return {
     return {
-      json, groupedMatches, filesOfFirst, filesOfSecond, selectedFileOfFirst, selectedFileOfSecond,
-      selectFiles,
-      selectMatch,
+      comparison,
+      filesOfFirst,
+      filesOfSecond,
+      hideLeftPanel,
+
+      toggleCollapseFirst,
+      toggleCollapseSecond,
+      showMatchInFirst,
+      showMatchInSecond,
+      showMatch,
+      togglePanel
     }
     }
   }
   }
 })
 })
 </script>
 </script>
 
 
 <style scoped>
 <style scoped>
+h1 {
+  color: var(--on-primary-color);
+  text-align: center;
+}
+
 .container {
 .container {
   display: flex;
   display: flex;
   align-items: stretch;
   align-items: stretch;
+  flex-wrap: nowrap;
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
-  margin: 0;
+  background: var(--background-color);
 }
 }
 
 
-#leftPanel {
-  width: 20%;
-  background: #FF5353;
+.files-container {
   display: flex;
   display: flex;
+  flex-wrap: nowrap;
   flex-direction: column;
   flex-direction: column;
-  align-items: stretch;
-  padding: 1%;
+  padding-top: 1%;
+  width: 100%;
+  overflow: auto;
+}
+
+.title-section {
+  display: flex;
+  justify-content: space-between;
+}
+.title-section > h1 {
+  text-align: left !important;
 }
 }
 
 
-#rightPanel {
-  width: 80%;
-  background: #ECECEC;
+.hidden {
+  display: none !important;
+}
+
+#sidebar {
   display: flex;
   display: flex;
+  flex-direction: column;
   flex-wrap: nowrap;
   flex-wrap: nowrap;
-  justify-content: stretch;
+  width: 60%;
+  background: var(--primary-color-light);
   padding: 1%;
   padding: 1%;
+  border-top-right-radius: 10px;
+  border-bottom-right-radius: 10px;
 }
 }
 
 
-#logo {
-  width: 60%;
-  height: 20%;
-  margin-bottom: 5%;
+#hide-button {
+  display: flex;
+  flex-direction: column;
+  background: transparent;
+  border-radius: 10px;
+  height: max-content;
+  border: none;
+}
+
+#hide-button:hover {
+  cursor: pointer;
+  background: var(--primary-color-dark);
+}
+
+#show-button {
+  position: absolute;
+  z-index: 1000;
+  left: 0;
+  background: var(--secondary-color);
+  border: none;
+  border-top-right-radius: 10px;
+  border-bottom-right-radius: 10px;
+  height: 100%;
+  width: 1%;
+}
+
+#show-button img {
+  display: none;
+}
+
+#show-button:hover {
+  cursor: pointer;
+  width: 3%;
+}
+
+#show-button:hover img {
+  display: block;
 }
 }
 </style>
 </style>

+ 0 - 98
report-viewer/src/views/FileUpload.vue

@@ -1,98 +0,0 @@
-<template>
-<div class="container" @dragover.prevent @drop.prevent>
-  <img src="@/assets/logo.png" alt="JPlag"/>
-  <h1>JPlag Report Viewer</h1>
-  <h2>Select an overview or comparison file to display.</h2>
-  <div class="drop-container" @drop="uploadFile">
-    <p> Drop a .json file here</p>
-  </div>
-  <label for="browse">Or browse for a .json file</label>
-  <input type="file" id="browse" name="browse">
-</div>
-</template>
-
-<script>
-import { defineComponent } from "vue";
-import router from "@/router";
-
-export default defineComponent({
-  name: "FileUpload",
-  setup() {
-
-    const navigateToOverview = (file) => {
-      router.push({
-          name: "Overview",
-          params: {str: file},
-      }
-      )
-    }
-
-    const navigateToComparisonView = (file) => {
-      router.push({
-        name: "ComparisonView",
-        params: {str: file}
-      })
-    }
-
-    const uploadFile = (e) => {
-      let dropped = e.dataTransfer.files
-      if (!dropped) return
-      let files = [...dropped]
-      if (files.length > 1 || files.length === 0) return
-      let read = new FileReader()
-      read.onload = (e) => {
-        if(files[0].name.includes("comparison")) {
-          navigateToComparisonView(e.target.result)
-        } else {
-          navigateToOverview(e.target.result)
-        }
-      }
-      read.readAsText(files[0])
-    }
-    return {
-      uploadFile
-    }
-  }
-})
-</script>
-
-<style scoped>
-.container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
-  background: linear-gradient(to right, #FF5353,#ECECEC, #ECECEC);
-}
-
-.drop-container {
-  background: lightgrey;
-  border: dashed dodgerblue;
-  align-items: center;
-  justify-content: space-around;
-  border-radius: 10px;
-  padding: 2%;
-}
-
-.drop-container > p {
-  color: dodgerblue;
-  text-align: center;
-}
-
-input {
-  display: none;
-}
-
-label {
-  font-weight: bold;
-  font-size: larger;
-  background: #ECECEC;
-  border-radius: 10px;
-  box-shadow: #777777 2px 3px 3px;
-  padding: 2%;
-  margin-top: 1%;
-}
-
-</style>

+ 108 - 95
report-viewer/src/views/Overview.vue

@@ -1,81 +1,86 @@
 <template>
 <template>
   <div class="container">
   <div class="container">
-    <div id="leftPanel">
-      <img id="logo" src="@/assets/logo.png" alt="JPlag">
-      <TextInformation label="Directory path: " :value="json.submission_folder_path" :has-additional-info="false"/>
-      <TextInformation label="Base code path: " :value="json.base_code_folder_path" :has-additional-info="false"/>
-      <TextInformation label="Language: " :value="json.language" :has-additional-info="true" additional-info-label="see extensions"/>
-      <TextInformation label="Submissions: " :value="json.submission_ids.length" :has-additional-info="true" additional-info-label="see ids"/>
-      <TextInformation label="Failed to parse: " value="No info yet" :has-additional-info="true" additional-info-label="see ids"/>
-      <TextInformation label="Date of execution: " :value="json.date_of_execution" :has-additional-info="false"/>
-      <TextInformation label="Duration (in ms): " :value="json.execution_time" :has-additional-info="false"/>
-    </div>
-    <div id="rightPanel">
-      <div id="metricsButtons" class="section">
-        <p class="section-title">Metrics: </p>
-        <ul class="metrics-list" v-for="(metric, i) in json.metrics" :key="metric.name">
-          <li><MetricButton :id="metric.name"
-                            :metric-threshold="metric.threshold"
-                            :metric-name="metric.name"
-                            :is-selected="selectedMetric[i]"
-                            @click="selectMetric(i)"/></li>
-        </ul>
+    <div class="column-container" style="width: 30%">
+      <h1>JPlag Report</h1>
+      <p class="section-title">Main Info:</p>
+      <div id="basicInfo">
+        <TextInformation label="Directory path" :value="overview.submissionFolderPath" :has-additional-info="false"/>
+        <TextInformation label="Language" :value="overview.language" :has-additional-info="true" :additional-info="overview.fileExtensions" additional-info-title="File extensions:"/>
+        <TextInformation :has-additional-info="false" :value="overview.matchSensitivity" label="Match Sensitivity"/>
+        <TextInformation label="Submissions" :value="overview.submissionIds.length" :has-additional-info="true" :additional-info="overview.submissionIds" additional-info-title="Submission IDs:"/>
+        <TextInformation label="Date of execution" :value="overview.dateOfExecution" :has-additional-info="false"/>
+        <TextInformation label="Duration (in ms)" :value="overview.durationOfExecution" :has-additional-info="false"/>
       </div>
       </div>
-      <div id="distribution" class="section">
-        <p class="section-title ">Distribution:</p>
-        <DistributionDiagram :distribution="distributions[selectedMetricIndex]"/>
+      <div id="logo-section">
+        <img id="logo" src="@/assets/logo-nobg.png" alt="JPlag">
       </div>
       </div>
-      <div id="topComparisonsList" class="section">
-        <p class="section-title">Top comparisons:</p>
-        <p class="section-subtitle">(Top 25)</p>
-        <ComparisonsLists :comparisons="topComps[selectedMetricIndex]"/>
+    </div>
+
+      <div class="column-container" style="width: 35%">
+        <div id="metrics">
+          <p class="section-title">Metric:</p>
+          <div id="metrics-list">
+            <MetricButton v-for="(metric, i) in overview.metrics" :key="metric.metricName"
+                          :id="metric.metricName"
+                          :metric-threshold="metric.metricThreshold"
+                          :metric-name="metric.metricName"
+                          :is-selected="selectedMetric[i]"
+                          @click="selectMetric(i)"/>
+          </div>
+        </div>
+        <p class="section-title">Distribution:</p>
+        <DistributionDiagram class="full-width" :distribution="distributions[selectedMetricIndex]"/>
       </div>
       </div>
+    <div class="column-container" style="width: 35%">
+        <p class="section-title">Top Comparisons:</p>
+        <p class="section-subtitle">(Top n comparisons)</p>
+        <div id="comparisonsList">
+          <ComparisonsTable :top-comparisons="topComps[selectedMetricIndex]"/>
+        </div>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
-import {defineComponent, ref, watchEffect} from "vue";
-import TextInformation from "@/components/TextInformation";
-import MetricButton from "@/components/MetricButton";
+import {defineComponent, ref} from "vue";
+import TextInformation from "../components/TextInformation";
 import DistributionDiagram from "@/components/DistributionDiagram";
 import DistributionDiagram from "@/components/DistributionDiagram";
-import ComparisonsLists from "@/components/ComparisonsLists";
+import MetricButton from "@/components/MetricButton";
+import Overview from "../files/overview.json"
+import ComparisonsTable from "@/components/ComparisonsTable";
+import {OverviewFactory} from "@/model/factories/OverviewFactory";
 
 
 export default defineComponent({
 export default defineComponent({
   name: "Overview",
   name: "Overview",
-  components: {ComparisonsLists, DistributionDiagram, MetricButton, TextInformation},
-  props: {
-    jsonString: {
-      type: String,
+  components: {ComparisonsTable, DistributionDiagram, MetricButton, TextInformation },
+  setup() {
+    const overview = OverviewFactory.getOverview(Overview)
 
 
-    }
-  },
-  setup(props) {
-    const json = JSON.parse(props.jsonString)
-    let selectedMetric = ref(json.metrics.map( () => false ))
-    let distributions = ref(json.metrics.map( (m) =>  m.distribution ))
-    let topComps = ref(json.metrics.map((m) => m.topComparisons))
-    console.log(JSON.stringify(topComps.value))
+    //Metrics
+    let selectedMetric = ref(overview.metrics.map( () => false ))
     let selectedMetricIndex = ref(0)
     let selectedMetricIndex = ref(0)
     selectedMetric.value[0] = true;
     selectedMetric.value[0] = true;
-
+    
     const selectMetric = (metric) => {
     const selectMetric = (metric) => {
       selectedMetric.value = selectedMetric.value.map( () => { return false })
       selectedMetric.value = selectedMetric.value.map( () => { return false })
       selectedMetric.value[metric] = true
       selectedMetric.value[metric] = true
       selectedMetricIndex.value = metric
       selectedMetricIndex.value = metric
     }
     }
 
 
-    watchEffect( () => {
-      console.log("Overview - selected dist " + JSON.stringify(distributions.value[selectedMetricIndex.value]))
-      console.log("Overview - selected topComp " + JSON.stringify(topComps.value[selectedMetricIndex.value]))
-    })
+    //Distribution
+    let distributions = ref(overview.metrics.map( (m) =>  m.distribution ))
+    console.log(overview.metrics[0])
+
+    //Top Comparisons
+    let topComps = ref(overview.metrics.map((m) => m.comparisons ))
 
 
     return {
     return {
-      json,
-      selectedMetric,
+      overview,
       selectedMetricIndex,
       selectedMetricIndex,
+      selectedMetric,
       distributions,
       distributions,
       topComps,
       topComps,
+
       selectMetric
       selectMetric
     }
     }
   }
   }
@@ -83,11 +88,18 @@ export default defineComponent({
 </script>
 </script>
 
 
 <style scoped>
 <style scoped>
-.section {
-  display: flex;
-  flex-direction: column;
-  margin: 0;
-  padding: 0;
+h1 {
+  text-align: left;
+  margin-top: 2%;
+  color: var(--on-background-color);
+}
+
+hr {
+  border: 0;
+  height: 2px;
+  background: linear-gradient(to right, #ea4848, transparent, transparent);
+  width: 100%;
+  box-shadow: #ea4864 0 1px;
 }
 }
 
 
 .container {
 .container {
@@ -96,14 +108,27 @@ export default defineComponent({
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
   margin: 0;
   margin: 0;
+  overflow: auto;
+  background: var(--background-color);
+}
+
+.column-container {
+  display: flex;
+  flex-direction: column;
+  padding: 1%;
+}
+
+.full-width {
+  width: 100%;
 }
 }
 
 
 .section-title {
 .section-title {
   font-size: x-large;
   font-size: x-large;
   font-weight: bold;
   font-weight: bold;
   text-align: start;
   text-align: start;
-  margin-top: 3%;
-  margin-bottom: 1%;
+  margin: 0;
+  padding: 0;
+  color: var(--on-background-color);
 }
 }
 
 
 .section-subtitle {
 .section-subtitle {
@@ -113,60 +138,48 @@ export default defineComponent({
 }
 }
 
 
 
 
-.metrics-list {
-  list-style: none;
-  display: flex;
-  padding: 0 1% 0 0;
-  margin-bottom: 0;
-
-}
-
-#leftPanel {
-  width: 30%;
-  background: #FF5353;
+#basicInfo {
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
   align-items: stretch;
   align-items: stretch;
-  padding: 1%;
+  padding: 3%;
+  margin-top: 1%;
+  background: var(--primary-color-light);
+  border-radius: 10px;
+  box-shadow: var(--shadow-color) 2px 3px 3px;
 }
 }
 
 
-#rightPanel {
-  width: 70%;
-  background: #ECECEC;
+#metrics {
   display: flex;
   display: flex;
-  flex-direction: column;
-  flex-wrap: nowrap;
-  padding: 1%;
-}
-
-#metricsButtons {
-  flex-direction: row;
-  flex-shrink: 3;
-  align-items: flex-start;
+  justify-content: start;
+  margin-bottom: 1%;
 }
 }
 
 
-#metricsButtons > * {
-  margin-right: 1%;
+#metrics-list {
+  display: flex;
+  margin-left: 2%;
 }
 }
 
 
-#distribution {
-  flex-shrink: 2;
-  align-items: stretch;
+#comparisonsList {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  padding: 2%;
+  background: var(--primary-color-light);
+  border-radius: 10px;
+  box-shadow: var(--shadow-color) 2px 3px 3px;
 }
 }
 
 
-#topComparisonsList {
-  min-height: 0;
-  align-items: stretch;
+#logo-section {
+  justify-content: center;
+  align-items: center;
+  padding: 5%;
+  display: flex;
 }
 }
 
 
-
 #logo {
 #logo {
-  width: 40%;
-  height: 20%;
-  margin-bottom: 5%;
+  flex-shrink: 2;
 }
 }
 
 
 
 
-
-
 </style>
 </style>