Commit Graph

161 Commits

Author SHA1 Message Date
Elias Schriefer
20c4524bba Add loading skeleton 2024-07-04 12:40:59 +02:00
0ca9579949 feat: Add error handling for dataset endpoints & return dataset that is beeing returend for the abilty to get the id 2024-07-03 15:03:14 +02:00
J-Klinke
62b0d5c028 local storage now properly implemented, (sessionstorage) 2024-07-03 12:08:59 +02:00
J-Klinke
02d2f90e85 fixed bug 2024-07-03 11:52:29 +02:00
J-Klinke
6d34b8c388 upvoting suppression by local storage now works, there is a bug however with the entries loaded o startup 2024-07-03 11:27:49 +02:00
Elias Schriefer
8810bfa53f Finish details page design 2024-07-03 00:20:36 +02:00
J-Klinke
20eda5931a started implementing local storage 2024-07-02 17:41:48 +02:00
9434de5bfc chore: Update H2 database dependency and configuration 2024-07-02 14:39:08 +02:00
d48f9da2b7 chore: Suppress null warnings in CategoryRepository 2024-07-02 10:45:11 +02:00
7554eefae4 feat: Add ability to add categories 2024-07-02 10:41:52 +02:00
J-Klinke
1174f03d42 added paging functionality 2024-07-01 15:50:57 +02:00
Elias Schriefer
d84a78d0e2 Merge branch '21-add-functionality-for-listing-query-results-in-frontend' into '22-integrate-api-and-frontend'
Resolve "add functionality for listing query results in frontend"

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!18
2024-07-01 14:41:10 +02:00
J-Klinke
662beff527 adopted revision comments 2024-07-01 14:38:31 +02:00
J-Klinke
c683a63e74 finished initial page display 2024-07-01 13:59:37 +02:00
a883d8217e Merge remote-tracking branch 'origin/11-add-api-for-getting-home-page-data' into 22-integrate-api-and-frontend 2024-07-01 12:28:51 +02:00
59c6367043 chore: Refactor DatasetController to fix typo's 2024-07-01 12:27:17 +02:00
J-Klinke
3aa87d531b started initial page display 2024-07-01 12:22:56 +02:00
93b604fe5b feat: implement ability to combine search and filters 2024-07-01 12:17:28 +02:00
J-Klinke
e5a4b1186e finished centralization of query creation.
DatasetController.java: changed mapping for simplification
index.html: Changed option text also for simplification
main.js: replaced dedicated query methods for search, sort & filter with a central one, also refactored the url parameter generation process.

Also removed resolved TODOs and added comments
2024-07-01 12:05:21 +02:00
J-Klinke
32ba4995be Merge remote-tracking branch 'origin/21-add-functionality-for-listing-query-results-in-frontend' into 21-add-functionality-for-listing-query-results-in-frontend 2024-07-01 11:12:01 +02:00
J-Klinke
fcd24c2abc proceeded implementing query improvements:
query methods are now uniform and with one central function
2024-07-01 11:11:29 +02:00
J-Klinke
907487c22c started implementing query improvements 2024-07-01 10:51:09 +02:00
J-Klinke
1dfd2f765a formatted the categories 2024-07-01 10:42:25 +02:00
J-Klinke
d9707a25df implemented fetching categories from backend 2024-07-01 10:21:43 +02:00
J-Klinke
4e645903e3 main page states (search & initial) are now working 2024-06-30 11:55:20 +02:00
J-Klinke
b7ecb4500c upvoting is now fully functional 2024-06-29 13:05:26 +02:00
b24b215bc0 chore: Set dataset date when adding to the repository 2024-06-28 17:08:04 +02:00
72a8f919c8 Merge branch '15-make-content-adding-page-functional-js' into 22-integrate-api-and-frontend 2024-06-28 16:34:40 +02:00
43646493e1 fix: Up and downvote puttons 2024-06-28 16:29:49 +02:00
8a1b9c75c6 Merge remote-tracking branch 'origin/21-add-functionality-for-listing-query-results-in-frontend' into 22-integrate-api-and-frontend 2024-06-28 15:51:26 +02:00
7498e17643 Merge branch '21-add-functionality-for-listing-query-results-in-frontend' into 22-integrate-api-and-frontend 2024-06-28 15:51:22 +02:00
J-Klinke
ebb90632eb refined main.js/vote() -> ready for receiving backend response 2024-06-28 14:24:19 +02:00
c98602520b Merge branch '11-add-api-for-getting-home-page-data' into 22-integrate-api-and-frontend 2024-06-28 13:48:09 +02:00
d6d3ca2121 fix: Update Dataset class to use java.sql.Date for date field to fix sorting after date 2024-06-28 13:40:10 +02:00
683f18cc27 chore: Refactor DatasetController to fix spaceing 2024-06-28 13:14:19 +02:00
d6a8cab85a chore: Refactor DatasetService to improve search functionality and remove unnecessary print statement 2024-06-28 13:11:43 +02:00
62a578124d chore: Refactor LoadDummyDatabase class to remove unused imports 2024-06-28 13:03:07 +02:00
5ccfe8ddb2 feat: Add Category enum for dataset classification & Add api endpoint 2024-06-28 12:47:25 +02:00
de0a027674 Merge branch '11-add-api-for-getting-home-page-data' into 22-integrate-api-and-frontend 2024-06-25 16:20:37 +02:00
ca2f67cb25 fix: closes #26 2024-06-25 16:12:31 +02:00
J-Klinke
e9e825eb42 added sorting by date
refined main.js/vote()
2024-06-25 13:30:38 +02:00
J-Klinke
7e3f191910 upvote/down vote work in frontend, but api seems to work incorrectly 2024-06-25 12:49:28 +02:00
d23e007518 feat: remove unused action in form 2024-06-25 11:35:58 +02:00
e400b7e9ce feat: Update URL construction for add page navigation
The code changes modify the `PageController` class to update the URL construction for navigating to the add page. The `getAddPage()` method now maps to the `/add` endpoint instead of the previous `add` endpoint. This change ensures that the URL matches the correct route for the add page.

Recent commits:
- Integrate add content page into backend
- Add base URL to URL construction
- Rework URL construction

Recent repository commits:
- Integrate add content page into backend
- Merge branch 'main' into 15-make-content-adding-page-functional-js
- Merge branch '11-add-api-for-getting-home-page-data' into 'main'
- Merge branch '22-integrate-api-and-frontend' into '11-add-api-for-getting-home-page-data'
- Merge branch '11-add-api-for-getting-home-page-data' into '22-integrate-api-and-frontend'
- feature: add ability to vote on datasets
- Merge remote-tracking branch 'origin/implement-js' into 22-integrate-api-and-frontend
- Add base URL to URL construction
- Merge remote-tracking branch 'origin/implement-js' into 22-integrate-api-and-frontend
- Rework URL construction
2024-06-25 11:33:36 +02:00
ac95228be8 Merge branch '11-add-api-for-getting-home-page-data' into 22-integrate-api-and-frontend 2024-06-25 10:23:49 +02:00
Elias Schriefer
a340d59ca2 Fix voting event listeners in search 2024-06-25 09:59:39 +02:00
J-Klinke
e47edf3cf2 improved searchBar functionality:
on page reload, it now displays the query fitting to the entered string
2024-06-25 09:44:01 +02:00
6b588cba8c Refactor DatasetController and DatasetService, update upvote and downvote endpoints
This commit refactors the `DatasetController` and `DatasetService` classes to update the endpoints for upvoting and downvoting datasets. The `@PostMapping` annotations are replaced with `@PutMapping` annotations to better align with RESTful conventions. This change improves the clarity and consistency of the API endpoints.
2024-06-25 09:19:24 +02:00
J-Klinke
eb2d6189a8 some code formatting,
searchbar is now empty on reload
2024-06-25 09:14:12 +02:00
Elias Schriefer
4c8437be92 Integrate add content page into backend
The page can be found under `/add`.
2024-06-24 17:40:07 +02:00
Elias Schriefer
1864e49264 Merge branch 'main' into 15-make-content-adding-page-functional-js 2024-06-24 17:07:38 +02:00
J-Klinke
d96da1b1e7 search nw displays the search results.
other section are being hidden in the case of a search and vice versa.
a 'nothing found' div was implemented
2024-06-24 17:03:47 +02:00
Erik Foris
9898c5e4b2 Merge branch '11-add-api-for-getting-home-page-data' into '22-integrate-api-and-frontend'
feature: add ability to vote on datasets

See merge request padas/24ss-5430-web-and-data-eng/gruppe-3/datadash!20
2024-06-22 13:50:31 +02:00
5df6a65f1b feature: add ability to vote on datasets 2024-06-22 13:34:44 +02:00
ab92c7973f Merge remote-tracking branch 'origin/implement-js' into 22-integrate-api-and-frontend 2024-06-21 12:21:36 +02:00
Elias Schriefer
8dcd311b98 Add base URL to URL construction 2024-06-21 12:21:17 +02:00
71389f1da6 Merge remote-tracking branch 'origin/implement-js' into 22-integrate-api-and-frontend 2024-06-21 12:17:44 +02:00
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
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
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
e0b266ce94 pull changes into 11-add-api-for-getting-home-page-data 2024-06-18 15:17:22 +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
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
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
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
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
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
J-Klinke
b3f5c43a94 Merge remote-tracking branch 'origin/frontend-searchbar' into frontend-searchbar 2024-06-14 16:53:59 +02:00
J-Klinke
148035ed0d improved toolbar,
implemented filter
2024-06-14 16:51:55 +02:00