Commit Graph

225 Commits

Author SHA1 Message Date
Elias Schriefer
5168ccaf62 Rework URL construction 2024-06-21 12:17:16 +02:00
273d67e63f Merge remote-tracking branch 'origin/implement-js' into 22-integrate-api-and-frontend 2024-06-21 12:07:02 +02:00
Elias Schriefer
5fda42856d Fix filter + search urls 2024-06-21 12:06:02 +02:00
722be51529 Merge branch 'implement-js' into 22-integrate-api-and-frontend 2024-06-21 12:05:45 +02:00
Elias Schriefer
c19459ad01 Little fixes 2024-06-21 12:03:10 +02:00
8820f1d5ef chore: Update Dataset constructor to include URL parameter 2024-06-21 11:43:38 +02:00
efd3c7ddb7 fix: add url field 2024-06-21 11:34:40 +02:00
Elias Schriefer
ee5d9712f4 Implement JS + add URL field 2024-06-21 11:27:26 +02:00
056ea0885f chore: optimize imports 2024-06-21 11:12:58 +02:00
J-Klinke
85213b25da changed filter presets 2024-06-21 11:12:42 +02:00
J-Klinke
cd7bfc0370 added todos 2024-06-21 11:07:49 +02:00
J-Klinke
d444be4381 Merge remote-tracking branch 'origin/implement-js' into implement-js 2024-06-21 10:43:32 +02:00
J-Klinke
b8c23f7e24 added comments 2024-06-21 10:43:04 +02:00
Julian Klinke
aa472e9ee5 Merge branch 'main' into 'implement-js'
# Conflicts:
#   src/main/resources/templates/index.html
2024-06-20 15:59:55 +02:00
J-Klinke
11cd870fde resolved merge conflict 2024-06-20 15:59:03 +02:00
J-Klinke
180770f28e refined search
minor bugfixes in other functionalities
2024-06-20 15:54:01 +02:00
Erik Foris
800e3d955c Merge branch '19-add-ability-to-page-requests' into '11-add-api-for-getting-home-page-data'
Resolve "Add ability to page requests"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!16
2024-06-20 15:39:59 +02:00
df6143da19 Refactor DatasetController and DatasetService, improve search query and add optional criteria 2024-06-20 15:38:09 +02:00
d616d193f1 Refactor DatasetController and DatasetService, add upvote and downvote functionality and create new search query to use with request parameters 2024-06-20 15:17:23 +02:00
J-Klinke
65d9e8ea1f main.js mostly done,
started implmenting contentUtility.js
added sort options to index.html
2024-06-20 15:07:00 +02:00
J-Klinke
d5fd98a066 main.js further implemented 2024-06-18 16:38:09 +02:00
J-Klinke
cddfdf546a js skeleton implemented 2024-06-18 15:57:08 +02:00
Elias Schriefer
49f7c92178 Merge branch '18-fix-button-styling-on-add-page' into 'main'
Resolve "Fix button styling on 'add' page"

Closes #18

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!13
2024-06-18 15:41:36 +02:00
Elias Schriefer
00a1f4f12c Fix button styling for 'add' page 2024-06-18 15:40:39 +02:00
7597652f57 chore: Remove commented out code for dataset search 2024-06-18 15:24:32 +02:00
Elias Schriefer
df1598e7c5 Merge branch 'frontend-refinements' into 'main'
frontend refinements

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!12
2024-06-18 15:19:39 +02:00
e0b266ce94 pull changes into 11-add-api-for-getting-home-page-data 2024-06-18 15:17:22 +02:00
Erik Foris
15b9980772 Merge branch '17-add-swagger-for-api-dokumentation' into 'main'
Resolve "Add swagger for api Dokumentation"

Closes #17

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!9
2024-06-18 15:14:56 +02:00
J-Klinke
3e131c49ae minor changes 2024-06-18 15:09:40 +02:00
c0de764f15 Refactor DatasetController and DatasetService, improve search query and add optional criteria
This commit refactors the `DatasetController` and `DatasetService` classes. It updates the request mappings in the `DatasetController` class to `/api/v1/datasets` and adds new methods for upvoting and downvoting datasets. In the `DatasetService` class, it adds the `upvoteDataset` and `downvoteDataset` methods to handle dataset upvoting and downvoting. Additionally, it improves the search query in the `getDatasetsByDateAfter` method by adding optional criteria for title, description, author, abstract, type, and minimum rating. This refactoring enhances code organization, functionality, and search capabilities.
2024-06-18 15:09:07 +02:00
Julian Klinke
2f96de274b Merge branch 'frontend-searchbar' into 'main'
finished implementation of frontend features

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!11
2024-06-18 14:06:45 +02:00
Julian Klinke
968bb733a5 Merge branch 'frontend-addbutton' into 'frontend-searchbar'
finished basic implementation of frontend features toolbar/searchbar & addbutton

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!10
2024-06-18 14:05:37 +02:00
35fcd0513b chore: Refactor DatasetController and DatasetService, add upvote and downvote functionality and create new search quirey to use with request parameters 2024-06-18 13:35:15 +02:00
96a7aa4a51 chore: Update pom.xml with swagger dependencie 2024-06-18 12:33:20 +02:00
4a09da87d3 chore: Refactor DatasetController and DatasetService
This commit refactors the `DatasetController` and `DatasetService` classes. It updates the request mappings in the `DatasetController` class to `/api/v1/datasets` and adds new methods for upvoting and downvoting datasets. In the `DatasetService` class, it adds the `upvoteDataset` and `downvoteDataset` methods to handle dataset upvoting and downvoting. This refactoring improves code organization and functionality.
2024-06-18 12:30:55 +02:00
J-Klinke
d5889341e6 proper add button implementation 2024-06-18 11:43:14 +02:00
Erik Foris
2e62a036f2 Merge branch 'add-content-page' into 'main'
Add content adding page

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!5
2024-06-18 08:33:26 +02:00
Elias Schriefer
f8378140c8 Merge branch 'main' into add-content-page 2024-06-17 23:31:39 +02:00
Elias Schriefer
a7b479074a Add content adding page 2024-06-17 22:43:59 +02:00
10e339f32b feature: add minimal API 2024-06-17 18:13:25 +02:00
Erik Foris
b901b018d6 Merge branch '12-add-dummy-data' into 'main'
Resolve "Add dummy data"

Closes #12

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!8
2024-06-17 16:04:26 +02:00
165397e86b chore: Add LoadDummyDatabase class for initializing dummy data 2024-06-17 16:01:36 +02:00
J-Klinke
1fe7a2ca29 changed css path to be correct 2024-06-17 15:49:50 +02:00
J-Klinke
b721973d05 implemented sort-by,
implemented divider,
fixed class/id in css
2024-06-17 15:42:20 +02:00
Elias Schriefer
711e58ca66 Merge branch '10-add-model-for-content' into 'main'
Resolve "Add model for content"

Closes #10

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!4
2024-06-17 15:39:18 +02:00
909a9021fe chore: Rename variable in Dataset class for consistency
The variable `Categories` in the `Dataset` class has been renamed to `categories` to follow the naming convention. This change improves code readability and consistency.
2024-06-17 15:32:05 +02:00
bad9855dce feat: Update dataRepository findByAuthor method name
The `findByAutor` method in the `dataRepository` interface has been renamed to `findByAuthor` to align with the naming convention. This change improves code readability and consistency.
2024-06-17 15:22:12 +02:00
b607b4a109 chore: Refactor dataset class and dataRepository interface
- Rename dataset.java to Dataset.java
- Update references to Dataset class
2024-06-17 15:17:37 +02:00
J-Klinke
5a682e1800 basic implementation of add button 2024-06-17 15:11:16 +02:00
09f685eef8 chore: Rename type.java to Type.java and update references, add default constructor to dataset 2024-06-17 15:10:43 +02:00