diff --git a/backend/src/main/java/bg/kidsground/domain/AgeGroup.java b/backend/src/main/java/bg/kidsground/domain/AgeGroup.java index e150cde..95fc5ab 100644 --- a/backend/src/main/java/bg/kidsground/domain/AgeGroup.java +++ b/backend/src/main/java/bg/kidsground/domain/AgeGroup.java @@ -4,10 +4,10 @@ public enum AgeGroup { - ZERO_TO_THREE("zero_to_three"), - THREE_TO_SIX("three_to_six"), - THREE_TO_TWELVE("three_to_twelve"), - SIX_TO_TWELVE("six_to_twelve"); + ZERO_TO_THREE("ZERO_TO_THREE"), + THREE_TO_SIX("THREE_TO_SIX"), + THREE_TO_TWELVE("THREE_TO_TWELVE"), + SIX_TO_TWELVE("SIX_TO_TWELVE"); public final String value; diff --git a/backend/src/test/java/bg/kidsground/service/PlaygroundServiceTest.java b/backend/src/test/java/bg/kidsground/service/PlaygroundServiceTest.java index e0933f8..3d689e2 100644 --- a/backend/src/test/java/bg/kidsground/service/PlaygroundServiceTest.java +++ b/backend/src/test/java/bg/kidsground/service/PlaygroundServiceTest.java @@ -125,6 +125,7 @@ public void testGetById_NotFound() { public void testFindAllApproved() { // Given Playground playground = new Playground(); + playground.setAgeGroups(List.of(AgeGroup.SIX_TO_TWELVE)); playground.setCreatedByUser(user); playground.setNew(false); when(playgroundRepository.findByIsNewFalse()).thenReturn(Collections.singletonList(playground)); @@ -134,6 +135,7 @@ public void testFindAllApproved() { // Then assertEquals(1, result.size()); + assertEquals(result.get(0).getAgeGroups(), List.of(AgeGroup.SIX_TO_TWELVE)); verify(playgroundRepository, times(1)).findByIsNewFalse(); } diff --git a/frontend/public/SIX_TO_TWELVE.png b/frontend/public/SIX_TO_TWELVE.png new file mode 100644 index 0000000..dde4aa9 Binary files /dev/null and b/frontend/public/SIX_TO_TWELVE.png differ diff --git a/frontend/public/THREE_TO_SIX.png b/frontend/public/THREE_TO_SIX.png new file mode 100644 index 0000000..38d54b7 Binary files /dev/null and b/frontend/public/THREE_TO_SIX.png differ diff --git a/frontend/public/THREE_TO_TWELVE.png b/frontend/public/THREE_TO_TWELVE.png new file mode 100644 index 0000000..338908f Binary files /dev/null and b/frontend/public/THREE_TO_TWELVE.png differ diff --git a/frontend/public/ZERO_TO_THREE.png b/frontend/public/ZERO_TO_THREE.png new file mode 100644 index 0000000..cb8d82e Binary files /dev/null and b/frontend/public/ZERO_TO_THREE.png differ diff --git a/frontend/src/Components/Common/InfoCard.jsx b/frontend/src/Components/Common/InfoCard.jsx index 3dbeea9..6e348fc 100644 --- a/frontend/src/Components/Common/InfoCard.jsx +++ b/frontend/src/Components/Common/InfoCard.jsx @@ -27,10 +27,10 @@ export const InfoCard = (props) => { const hasFenceResults = props.hasFence ? "Оградена" : "Неоградена" const ageGroups = Object.freeze({ - zero_to_three: "0 и 3", - three_to_six: "3 и 6", - three_to_twelve: "3 и 12", - six_to_twelve: "6 и 12" + ZERO_TO_THREE: "0 и 3", + THREE_TO_SIX: "3 и 6", + THREE_TO_TWELVE: "3 и 12", + SIX_TO_TWELVE: "6 и 12" }) const shades = Object.freeze({ diff --git a/frontend/src/Components/Pages/EditPage.jsx b/frontend/src/Components/Pages/EditPage.jsx index 08f8616..9f7d01e 100644 --- a/frontend/src/Components/Pages/EditPage.jsx +++ b/frontend/src/Components/Pages/EditPage.jsx @@ -337,23 +337,23 @@ export const EditPage = () => {

- - + +

- - + +

- - + +

- - + +

diff --git a/frontend/src/Components/Pages/PlaygroundFormPage.jsx b/frontend/src/Components/Pages/PlaygroundFormPage.jsx index 49691a4..2b0b6ee 100644 --- a/frontend/src/Components/Pages/PlaygroundFormPage.jsx +++ b/frontend/src/Components/Pages/PlaygroundFormPage.jsx @@ -314,23 +314,23 @@ export const PlaygroundFormPage = () => {

- - + +

- - + +

- - + +

- - + +

diff --git a/frontend/src/Components/Pages/ProfilePage.jsx b/frontend/src/Components/Pages/ProfilePage.jsx index b61e2b0..d3bb024 100644 --- a/frontend/src/Components/Pages/ProfilePage.jsx +++ b/frontend/src/Components/Pages/ProfilePage.jsx @@ -12,10 +12,10 @@ export const ProfilePage = () => { const navigate = useNavigate(); const ageGroups = Object.freeze({ - zero_to_three: "от 0 до 3", - three_to_six: "от 3 до 6", - three_to_twelve: "от 3 до 12", - six_to_twelve: "от 6 до 12" + ZERO_TO_THREE: "0 и 3", + THREE_TO_SIX: "3 и 6", + THREE_TO_TWELVE: "3 и 12", + SIX_TO_TWELVE: "6 и 12" }) const shades = Object.freeze({ diff --git a/frontend/src/static/SIX_TO_TWELVE.png b/frontend/src/static/SIX_TO_TWELVE.png new file mode 100644 index 0000000..dde4aa9 Binary files /dev/null and b/frontend/src/static/SIX_TO_TWELVE.png differ diff --git a/frontend/src/static/THREE_TO_SIX.png b/frontend/src/static/THREE_TO_SIX.png new file mode 100644 index 0000000..38d54b7 Binary files /dev/null and b/frontend/src/static/THREE_TO_SIX.png differ diff --git a/frontend/src/static/THREE_TO_TWELVE.png b/frontend/src/static/THREE_TO_TWELVE.png new file mode 100644 index 0000000..338908f Binary files /dev/null and b/frontend/src/static/THREE_TO_TWELVE.png differ diff --git a/frontend/src/static/ZERO_TO_THREE.png b/frontend/src/static/ZERO_TO_THREE.png new file mode 100644 index 0000000..cb8d82e Binary files /dev/null and b/frontend/src/static/ZERO_TO_THREE.png differ