Commit Graph

231 Commits

Author SHA1 Message Date
Elias Schriefer
3b252fb2cb Fix typos and break less stuff 2024-07-08 16:50:06 +02:00
Elias Schriefer
d13edead44 Revert "Fix typos and break stuff"
This reverts commit 5fa28f80c4.
2024-07-08 16:40:07 +02:00
Elias Schriefer
5fa28f80c4 Fix typos and break stuff 2024-07-08 16:37:13 +02:00
Elias Schriefer
b305a76c58 Merge branch '34-revisit-design' into '22-integrate-api-and-frontend'
Resolve "Revisit design" and merge into 22-integrate-api-and-frontend

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!56
2024-07-08 12:13:25 +02:00
J-Klinke
284b1bd479 fixed toolbar bug where on reload the 'nothing found' page was shown although there were results 2024-07-08 11:42:34 +02:00
Elias Schriefer
3fcb100199 Add common button styling 2024-07-08 01:25:07 +02:00
Elias Schriefer
1888b91afe Fix add page design 2024-07-07 19:47:56 +02:00
Elias Schriefer
ae20623aa3 Merge branch '22-integrate-api-and-frontend' into 34-revisit-design 2024-07-07 19:44:27 +02:00
Elias Schriefer
0f255a22bf Fix scoping of dataset in details.js 2024-07-07 19:41:54 +02:00
Erik Foris
5390dc8400 Merge branch '46-add-missing-fields-to-the-add-page' into '22-integrate-api-and-frontend'
Resolve "Add missing fields to the add page"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!45
2024-07-07 18:17:46 +02:00
Elias Schriefer
f9542aeba3 Merge branch '22-integrate-api-and-frontend' into 46-add-missing-fields-to-the-add-page 2024-07-06 22:13:47 +02:00
Erik Foris
7e6973a5ce Merge branch '50-optimize-dependecies-and-versions' into '22-integrate-api-and-frontend'
Resolve "optimize dependecies and versions"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!54
2024-07-06 22:11:47 +02:00
fd0a62ea51 chore: Remove unused Thymeleaf dependency in pom.xml 2024-07-06 22:11:12 +02:00
Elias Schriefer
4b00b6010a Add missing fields to add page 2024-07-06 22:10:13 +02:00
Erik Foris
69b6697f62 Merge branch '53-respond-with-the-new-category-json-when-creating-a-new-category' into '22-integrate-api-and-frontend'
Resolve "Respond with the new category JSON when creating a new category"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!53
2024-07-06 21:59:48 +02:00
146eb0e8f5 chore: Refactor CategoryController and CategoryService to return created category 2024-07-06 21:59:22 +02:00
Erik Foris
cf1babf069 Merge branch '52-adjust-visibiltiy-of-methods' into '22-integrate-api-and-frontend'
Resolve "adjust visibiltiy of methods"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!51
2024-07-06 21:14:27 +02:00
ba6257059d Refactor DatasetService and CategoryService for better code organization and encapsulation 2024-07-06 21:11:27 +02:00
J-Klinke
46c2aa9150 design revisited 2024-07-06 20:50:58 +02:00
Erik Foris
1adf56b08e Merge branch '51-fix-borken-test' into '22-integrate-api-and-frontend'
Resolve "fix: borken test"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!50
2024-07-06 20:49:12 +02:00
e84ecd18bd feat: Remove invalid stars validation in DatasetControllerTests becaurse giving 0 stars sould be an option 2024-07-06 20:47:12 +02:00
Erik Foris
6dbe795456 Merge branch '50-optimize-dependecies-and-versions' into '22-integrate-api-and-frontend'
Resolve "optimize dependecies and versions"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!49
2024-07-06 20:42:47 +02:00
b2aabecce1 chore: Update Spring Boot version to 3.3.1 in pom.xml & remove unused dependency 2024-07-06 20:41:31 +02:00
Erik Foris
deaf200837 Merge branch '45-finalize-details-page' into '22-integrate-api-and-frontend'
Resolve "finalize details page"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!46
2024-07-06 20:20:07 +02:00
c0a57951af Merge branch '22-integrate-api-and-frontend' into 45-finalize-details-page 2024-07-06 20:18:59 +02:00
J-Klinke
9a6260d1bd bugfix: pagination works again 2024-07-06 20:04:39 +02:00
e8de33cdcb chore: Remove unused imports and fix data.sql conflicts 2024-07-06 19:54:59 +02:00
54977ce95b chore: generate moor data 2024-07-06 19:52:54 +02:00
J-Klinke
448bc30f03 found & fixed minor bug: sorting by stars now works 2024-07-06 19:40:35 +02:00
J-Klinke
a05800873c Merge remote-tracking branch 'origin/45-finalize-details-page' into 45-finalize-details-page 2024-07-06 19:28:36 +02:00
J-Klinke
f1cb3c1af0 minor styling changes 2024-07-06 19:28:12 +02:00
b87fafe360 link to exmple site 2024-07-06 18:41:03 +02:00
20f3909249 Merge remote-tracking branch 'origin/22-integrate-api-and-frontend' into 45-finalize-details-page 2024-07-06 18:35:40 +02:00
J-Klinke
c0ad1ca848 rating is implemented, updates the stars and prohibits voting more than once 2024-07-06 18:28:07 +02:00
69afb590d4 chore: Remove unused imports in DatasetController, DatasetService, and dataRepository 2024-07-06 18:26:54 +02:00
Erik Foris
61dbf0dde7 Merge branch '39-add-tests' into '22-integrate-api-and-frontend'
Resolve "Add tests"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!38
2024-07-06 18:24:26 +02:00
Erik Foris
54b7a916ed Merge branch '22-integrate-api-and-frontend' into '39-add-tests'
# Conflicts:
#   src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetController.java
2024-07-06 18:23:09 +02:00
J-Klinke
442c532e85 Merge remote-tracking branch 'origin/45-finalize-details-page' into 45-finalize-details-page 2024-07-06 18:06:38 +02:00
Erik Foris
9f9c6550a4 Merge branch '48-make-rating-of-0-possible' into '45-finalize-details-page'
Resolve "make rating of 0 possible"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!48
2024-07-06 18:04:02 +02:00
1effb09cdb feat: Update dataset voting logic to allow for zero stars 2024-07-06 18:03:27 +02:00
Erik Foris
1ddf7dbd10 Merge branch '47-remove-unused-methods-in-backend' into '22-integrate-api-and-frontend'
Resolve "remove unused methods in backend"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!47
2024-07-06 17:58:54 +02:00
603517d187 feat: Remove unused methods in dataRepository and CategoryRepository 2024-07-06 17:57:52 +02:00
7e08a507e4 feat: Add CategoryRepositoryTests and DataRepositoryTests
The code changes include adding new test classes CategoryRepositoryTests and DataRepositoryTests. These test classes are used to test the functionality of the CategoryRepository and DataRepository classes respectively. The CategoryRepositoryTests class contains tests for the findById, findByName, and findAll methods of the CategoryRepository class. The DataRepositoryTests class contains tests for the findByOptionalCriteria and getDatasetById methods of the DataRepository class.
2024-07-06 17:54:48 +02:00
J-Klinke
cff7e8166e implemented delete & back button 2024-07-06 17:11:11 +02:00
Elias Schriefer
9215148eff Merge branch '22-integrate-api-and-frontend' into 46-add-missing-fields-to-the-add-page 2024-07-06 16:23:35 +02:00
Julian Klinke
474da3091e Merge branch '7-add-page-to-view-dataset-api' into '22-integrate-api-and-frontend'
Resolve "Add page to view dataset/API"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!21
2024-07-06 14:54:29 +02:00
Elias Schriefer
75f8f886c0 Merge branch '22-integrate-api-and-frontend' into 7-add-page-to-view-dataset-api 2024-07-06 14:49:52 +02:00
Elias Schriefer
3f857f023e Merge branch '43-store-entry-authorship' into '22-integrate-api-and-frontend'
Resolve "Store entry authorship"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!42
2024-07-06 14:46:41 +02:00
J-Klinke
8b5ac69e3c changed key name
added cancelbtn eventlistener
2024-07-06 14:44:10 +02:00
Elias Schriefer
467951d0ce Use more native html elements 2024-07-06 14:35:30 +02:00