Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/polished UI frontend #13

Closed
wants to merge 19 commits into from
Closed

Feature/polished UI frontend #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6169b0d
feat: added list view and refactored ui project
CalvinMende Mar 13, 2025
bb308dd
fix: fixed cors port
CalvinMende Mar 13, 2025
f05556f
chore: updated settings, about and darkmode to align with new design
CalvinMende Mar 17, 2025
88e7588
ref: updated project structure
CalvinMende Mar 17, 2025
fe626cc
feat: added new item view, added delete icon to sidebar
CalvinMende Mar 18, 2025
30147d6
ref: refactored interface names
CalvinMende Mar 18, 2025
83d3736
feat: added add todo ui
CalvinMende Mar 19, 2025
4a49a7d
feat: added add todo list, delete todo list and edit todo list
CalvinMende Mar 19, 2025
b249224
fix: item/list version wasn't tracked and threw errors
CalvinMende Mar 19, 2025
63b866d
chore: updated text
CalvinMende Mar 19, 2025
42b2bf2
chore: updated text
CalvinMende Mar 19, 2025
c61be30
feat: add filter and sort menu
CalvinMende Mar 20, 2025
3be2780
feat: add confirmation messages
CalvinMende Mar 20, 2025
5b49e13
feat: add calendar
CalvinMende Mar 21, 2025
0e573e4
fix: put wrong number in test
CalvinMende Mar 21, 2025
f458532
Merge branch 'solution/complete' of https://github.com/CalvinMende/ja…
CalvinMende Mar 21, 2025
7d23f06
fix: updated test
CalvinMende Mar 21, 2025
e32b161
fix: added missing saveTaskList mock to failing test cases
CalvinMende Mar 24, 2025
dba8e6b
feat: added generate random task and random task list
CalvinMende Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions backend/src/main/java/org/example/app/task/logic/UcFindTaskList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.example.app.task.logic;

import java.util.List;
import java.util.Optional;

import jakarta.enterprise.context.ApplicationScoped;
Expand Down Expand Up @@ -40,6 +41,16 @@ public TaskListEto findById(Long listId) {
return taskList.map(taskListEntity -> this.taskListMapper.toEto(taskListEntity)).orElse(null);
}

/**
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like solution/logic branch to me

* @return all {@link TaskListEto} or {@code []} if not found.
*/
// @RolesAllowed(ApplicationAccessControlConfig.PERMISSION_FIND_TASK_LIST)
public List<TaskListEto> findAll() {

List<TaskListEntity> taskList = this.taskListRepository.findAll();
return taskList.stream().map(taskListEntity -> this.taskListMapper.toEto(taskListEntity)).toList();
}

/**
* @param listId the {@link TaskListEntity#getId() primary key} of the {@link TaskListEntity} to find.
* @return the {@link TaskListCto} for the given {@link TaskListEto#getId() primary key} or {@code null} if not found.
Expand Down
4 changes: 2 additions & 2 deletions backend/src/main/java/org/example/app/task/logic/UcSaveTaskItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ public class UcSaveTaskItem {
* @return the {@link TaskItemEntity#getId() primary key} of the saved {@link TaskItemEntity}.
*/
// @RolesAllowed(ApplicationAccessControlConfig.PERMISSION_SAVE_TASK_ITEM)
public Long save(TaskItemEto item) {
public TaskItemEntity save(TaskItemEto item) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Returning an Entity from a use case is not good practice. We'll have a talk about this in the training


TaskItemEntity entity = this.taskItemMapper.toEntity(item);
entity = this.taskItemRepository.save(entity);
return entity.getId();
return entity;
}

}
4 changes: 2 additions & 2 deletions backend/src/main/java/org/example/app/task/logic/UcSaveTaskList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public class UcSaveTaskList {
* @return the {@link TaskListEntity#getId() primary key} of the saved {@link TaskListEntity}.
*/
// @RolesAllowed(ApplicationAccessControlConfig.PERMISSION_SAVE_TASK_LIST)
public Long save(TaskListEto list) {
public TaskListEntity save(TaskListEto list) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Returning an Entity from a use case is not good practice. We'll have a talk about this in the training


TaskListEntity entity = this.taskListMapper.toEntity(list);
entity = this.taskListRepository.save(entity);
return entity.getId();
return entity;
}

}
45 changes: 31 additions & 14 deletions backend/src/main/java/org/example/app/task/service/TaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import org.example.app.task.common.TaskItemEto;
import org.example.app.task.common.TaskListCto;
import org.example.app.task.common.TaskListEto;
import org.example.app.task.dataaccess.TaskItemEntity;
import org.example.app.task.dataaccess.TaskListEntity;
import org.example.app.task.logic.UcAddRandomActivityTaskItem;
import org.example.app.task.logic.UcDeleteTaskItem;
import org.example.app.task.logic.UcDeleteTaskList;
Expand All @@ -31,7 +33,9 @@
import org.example.app.task.logic.UcSaveTaskList;

import java.net.URI;
import java.util.List;
import java.util.Map;
import java.util.Objects;

/**
* Rest service for {@link org.example.app.task.common.TaskList}.
Expand Down Expand Up @@ -74,11 +78,11 @@ public class TaskService {
@APIResponse(responseCode = "500", description = "Server unavailable or a server-side error occurred")
public Response saveTask(@Valid TaskListEto taskList) {

Long taskListId = this.ucSaveTaskList.save(taskList);
if (taskList.getId() == null || taskList.getId() != taskListId) {
return Response.created(URI.create("/task/list/" + taskListId)).build();
TaskListEntity savedTaskList = this.ucSaveTaskList.save(taskList);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Returning an Entity from a service is not good practice. We'll have a talk about this in the training

if (taskList.getId() == null || !Objects.equals(taskList.getId(), savedTaskList.getId())) {
return Response.created(URI.create("/task/list/" + savedTaskList.getId())).entity(savedTaskList.getId()).build();
}
return Response.ok().build();
return Response.ok(savedTaskList.getVersion()).build();
}

/**
Expand All @@ -102,6 +106,19 @@ public TaskListEto findTaskList(
return task;
}

/**
* @return all {@link TaskListEto}.
*/
@GET
@Path("/lists")
@Produces(MediaType.APPLICATION_JSON)
@Operation(summary = "Fetch task lists", description = "Fetch all task list")
@APIResponse(responseCode = "200", description = "Task lists", content = @Content(mediaType = MediaType.APPLICATION_JSON, schema = @Schema(implementation = TaskListEto[].class)))
@APIResponse(responseCode = "500", description = "Server unavailable or a server-side error occurred")
public List<TaskListEto> findTaskLists() {
return this.ucFindTaskList.findAll();
}

/**
* @param id the {@link TaskListEto#getId() primary key} of the requested {@link TaskListEto}.
* @return the {@link TaskListEto} for the given {@code id}.
Expand Down Expand Up @@ -167,10 +184,10 @@ public Response addMultipleRandomActivities(@NotBlank @Schema(required = true, e
TaskListEto taskList = new TaskListEto();
taskList.setTitle(listTitle);

Long taskListId = this.ucSaveTaskList.save(taskList);
this.ucAddRandomActivityTask.addMultipleRandom(taskListId, listTitle);
TaskListEntity taskListEntity = this.ucSaveTaskList.save(taskList);
this.ucAddRandomActivityTask.addMultipleRandom(taskListEntity.getId(), listTitle);

return Response.created(URI.create("/task/list/" + taskListId)).build();
return Response.created(URI.create("/task/list/" + taskListEntity.getId())).build();
}

@POST
Expand All @@ -197,10 +214,10 @@ public Response addExtractedIngredients(@Schema(required = true, example = """
TaskListEto taskList = new TaskListEto();
taskList.setTitle(listTitle);

Long taskListId = this.ucSaveTaskList.save(taskList);
this.ucAddRandomActivityTask.addExtractedIngredients(taskListId, recipe);
TaskListEntity taskListEntity = this.ucSaveTaskList.save(taskList);
this.ucAddRandomActivityTask.addExtractedIngredients(taskListEntity.getId(), recipe);

return Response.created(URI.create("/task/list/" + taskListId)).build();
return Response.created(URI.create("/task/list/" + taskListEntity.getId())).build();
}

/**
Expand All @@ -217,11 +234,11 @@ public Response addExtractedIngredients(@Schema(required = true, example = """
@APIResponse(responseCode = "500", description = "Server unavailable or a server-side error occurred")
public Response saveTaskItem(@Valid TaskItemEto item) {

Long taskItemId = this.ucSaveTaskItem.save(item);
if (item.getId() == null || item.getId() != taskItemId) {
return Response.created(URI.create("/task/item/" + taskItemId)).entity(taskItemId).build();
TaskItemEntity savedTaskItem = this.ucSaveTaskItem.save(item);
if (item.getId() == null || !Objects.equals(item.getId(), savedTaskItem.getId())) {
return Response.created(URI.create("/task/item/" + savedTaskItem.getId())).entity(savedTaskItem.getId()).build();
}
return Response.ok(taskItemId).build();
return Response.ok(savedTaskItem.getVersion()).build();
}

/**
Expand Down
3 changes: 2 additions & 1 deletion backend/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ quarkus.flyway.create-schemas=true
quarkus.flyway.migrate-at-start=true

quarkus.http.cors=true
quarkus.http.cors.origins=http://localhost:3000,http://localhost:8080
quarkus.http.cors.origins=http://localhost:5173,http://localhost:8080
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this change at the training? Why not stick to 3000?

quarkus.http.cors.headers=accept, authorization, content-type, x-requested-with
quarkus.http.cors.methods=GET, POST, OPTIONS, DELETE

%dev.quarkus.devservices.enabled=true
%dev.quarkus.hibernate-orm.log.sql=true
%dev.quarkus.hibernate-orm.validate-in-dev-mode=true
%dev.quarkus.flyway.schemas=quarkus
%dev.quarkus.http.access-log.enabled=true
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should go to the main branch and we need to cherry pick it on all solution branches. Same goes for the whole frontend code


%test.quarkus.rest-client.logging.scope=request-response
%dev.quarkus.rest-client.logging.scope=request-response
Expand Down
20 changes: 18 additions & 2 deletions backend/src/test/java/org/example/app/task/service/TaskServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import org.assertj.core.api.BDDAssertions;
import org.example.app.task.common.TaskItemEto;
import org.example.app.task.common.TaskListCto;
import org.example.app.task.dataaccess.TaskItemEntity;
import org.example.app.task.dataaccess.TaskListEntity;
import org.example.app.task.logic.UcAddRandomActivityTaskItem;
import org.example.app.task.logic.UcDeleteTaskItem;
import org.example.app.task.logic.UcDeleteTaskList;
Expand Down Expand Up @@ -68,8 +70,10 @@ class Post {

@Test
void shouldCallSaveUseCaseAndReturn204WhenCreatingTaskList() {
TaskListEntity taskListEntity = new TaskListEntity();
taskListEntity.setId(123L);

given(TaskServiceTest.this.saveTaskList.save(Mockito.any())).willReturn(123L);
given(TaskServiceTest.this.saveTaskList.save(Mockito.any())).willReturn(taskListEntity);

given().when().body("{ \"title\": \"Shopping List\" }").contentType(ContentType.JSON).post("/task/list").then()
.statusCode(201);
Expand Down Expand Up @@ -179,6 +183,11 @@ class MultipleRandomActivities {
class Post {
@Test
void shouldCallRandomActivitiesUseCaseAndReturn201() {
TaskListEntity taskListEntity = new TaskListEntity();
taskListEntity.setId(123L);
taskListEntity.setTitle("Shopping list");

given(TaskServiceTest.this.saveTaskList.save(Mockito.any())).willReturn(taskListEntity);

given().when().body("Shopping list").contentType(ContentType.TEXT).post("/task/list/multiple-random-activities").then().statusCode(201);
then(TaskServiceTest.this.addRandomActivityTaskItem).should().addMultipleRandom(anyLong(), anyString());
Expand All @@ -202,6 +211,11 @@ class IngredientList {
class Post {
@Test
void shouldCallRandomActivitiesUseCaseAndReturn201() {
TaskListEntity taskListEntity = new TaskListEntity();
taskListEntity.setId(123L);
taskListEntity.setTitle("Shopping list");

given(TaskServiceTest.this.saveTaskList.save(Mockito.any())).willReturn(taskListEntity);

given().when().body("{\"listTitle\": \"Shopping list\", \"recipe\": \"Take flour, sugar and chocolate and mix everything.\"}")
.contentType(ContentType.JSON).post("/task/list/ingredient-list").then().statusCode(201);
Expand Down Expand Up @@ -234,8 +248,10 @@ class Post {

@Test
void shouldCallSaveUseCaseAndReturn201WhenCreatingTaskItem() {
TaskItemEntity taskItemEntity = new TaskItemEntity();
taskItemEntity.setId(42L);

given(TaskServiceTest.this.saveTaskItem.save(Mockito.any())).willReturn(42L);
given(TaskServiceTest.this.saveTaskItem.save(Mockito.any())).willReturn(taskItemEntity);

given().when().body("{ \"title\": \"Buy Milk\", \"taskListId\": 123 }").contentType(ContentType.JSON)
.post("/task/item").then().statusCode(201).body(is("42"));
Expand Down
19 changes: 19 additions & 0 deletions frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="favicon.ico" />
<link rel="shortcut icon" href="favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#242E68" />
<meta name="description" content="A Powerful To-Do App" />
<link rel="apple-touch-icon" href="logo.png" />
<link rel="manifest" href="manifest.json" />
<title>My Todos</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<script type="module" src="/src/index.tsx"></script>
</body>
</html>
21 changes: 12 additions & 9 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,27 @@
"@material-ui/core": "^4.11.2",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.57",
"@tailwindcss/vite": "^4.0.14",
"@types/react-big-calendar": "^1.16.1",
"darkreader": "^4.9.26",
"http-proxy-middleware": "^2.0.6",
"lucide-react": "^0.479.0",
"moment": "^2.30.1",
"react": "^17.0.1",
"react-beautiful-dnd": "^13.0.0",
"react-big-calendar": "^1.18.0",
"react-dom": "^17.0.1",
"react-flip-move": "^3.0.4",
"react-scripts": "^5.0.1",
"tailwindcss": "^4.0.14",
"typescript": "^4.1.3",
"uuid": "^7.0.3",
"wouter": "^2.7.0"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"eject": "react-scripts eject"
"start": "vite",
"build": "vite build",
"serve": "vite preview"
},
"eslintConfig": {
"extends": "react-app"
Expand All @@ -39,13 +45,10 @@
},
"devDependencies": {
"@types/material-ui": "^0.21.8",
"@types/node": "^14.14.16",
"@types/react": "^17.0.1",
"@types/react-beautiful-dnd": "^13.0.0",
"@types/react-dom": "^17.0.1"
},
"resolutions": {
"@types/react": "17.0.1",
"@types/react-dom": "17.0.1"
"@types/react-dom": "^17.0.1",
"@vitejs/plugin-react": "^4.3.4",
"vite": "^6.2.1"
}
}
41 changes: 0 additions & 41 deletions frontend/public/index.html
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions frontend/setupProxy.js
View file
Open in desktop

This file was deleted.

Loading