diff --git a/00-backend/src/main/java/de/htwsaar/webshop/controller/AccountController.java b/00-backend/src/main/java/de/htwsaar/webshop/controller/AccountController.java index 28d1688..4bd80c6 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/controller/AccountController.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/controller/AccountController.java @@ -106,7 +106,7 @@ public class AccountController { if(!accountService.deleteIfExists(accountId)) { return ResponseEntity.badRequest().build(); } - return ResponseEntity.ok(); + return ResponseEntity.ok(true); } @RequestMapping(path = ACCOUNT_BASE, method = RequestMethod.GET, produces = "application/json") diff --git a/00-backend/src/main/java/de/htwsaar/webshop/controller/FarmImageController.java b/00-backend/src/main/java/de/htwsaar/webshop/controller/FarmImageController.java index 4903951..05bfbdd 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/controller/FarmImageController.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/controller/FarmImageController.java @@ -97,7 +97,7 @@ public class FarmImageController { return ResponseEntity.ok().build(); } - @RequestMapping(path = FARM_IMAGE_ARTICLES, method = RequestMethod.DELETE, produces = "application/json") + @RequestMapping(path = FARM_IMAGE_ARTICLES, method = RequestMethod.GET, produces = "application/json") public ResponseEntity> getFSArticles(HttpServletRequest request) { logRequest(request); return ResponseEntity.ok(farmImageService.getArticles()); diff --git a/01-frontend/src/assets/fscomponents/out_0.webp b/01-frontend/src/assets/fscomponents/out_0.webp new file mode 100644 index 0000000..551e548 Binary files /dev/null and b/01-frontend/src/assets/fscomponents/out_0.webp differ diff --git a/01-frontend/src/assets/fscomponents/out_1_light.webp b/01-frontend/src/assets/fscomponents/out_1_light.webp new file mode 100644 index 0000000..cc19b97 Binary files /dev/null and b/01-frontend/src/assets/fscomponents/out_1_light.webp differ diff --git a/01-frontend/src/assets/fscomponents/out_2_pipe.webp b/01-frontend/src/assets/fscomponents/out_2_pipe.webp new file mode 100644 index 0000000..56e320a Binary files /dev/null and b/01-frontend/src/assets/fscomponents/out_2_pipe.webp differ diff --git a/01-frontend/src/assets/fscomponents/out_3_sensor.webp b/01-frontend/src/assets/fscomponents/out_3_sensor.webp new file mode 100644 index 0000000..353bdb0 Binary files /dev/null and b/01-frontend/src/assets/fscomponents/out_3_sensor.webp differ diff --git a/01-frontend/src/assets/fscomponents/out_4_pump.webp b/01-frontend/src/assets/fscomponents/out_4_pump.webp new file mode 100644 index 0000000..fc096ff Binary files /dev/null and b/01-frontend/src/assets/fscomponents/out_4_pump.webp differ diff --git a/01-frontend/src/assets/fscomponents/out_5_server.webp b/01-frontend/src/assets/fscomponents/out_5_server.webp new file mode 100644 index 0000000..069b2e7 Binary files /dev/null and b/01-frontend/src/assets/fscomponents/out_5_server.webp differ diff --git a/01-frontend/src/assets/fscomponents/out_6_rack.webp b/01-frontend/src/assets/fscomponents/out_6_rack.webp new file mode 100644 index 0000000..3a0a9da Binary files /dev/null and b/01-frontend/src/assets/fscomponents/out_6_rack.webp differ diff --git a/01-frontend/src/assets/fscomponents/out_7_connector.webp b/01-frontend/src/assets/fscomponents/out_7_connector.webp new file mode 100644 index 0000000..a7f56d7 Binary files /dev/null and b/01-frontend/src/assets/fscomponents/out_7_connector.webp differ diff --git a/01-frontend/src/assets/fscomponents/out_8_clips.webp b/01-frontend/src/assets/fscomponents/out_8_clips.webp new file mode 100644 index 0000000..4fba129 Binary files /dev/null and b/01-frontend/src/assets/fscomponents/out_8_clips.webp differ diff --git a/01-frontend/src/assets/fscomponents/out_9_arduino.webp b/01-frontend/src/assets/fscomponents/out_9_arduino.webp new file mode 100644 index 0000000..1ba4a9c Binary files /dev/null and b/01-frontend/src/assets/fscomponents/out_9_arduino.webp differ diff --git a/01-frontend/src/helper/query/Queries.tsx b/01-frontend/src/helper/query/Queries.tsx index c21bf2c..6f753f7 100644 --- a/01-frontend/src/helper/query/Queries.tsx +++ b/01-frontend/src/helper/query/Queries.tsx @@ -3,6 +3,7 @@ import AccountType, { AdminAccountOperation, CustomerType, SubmitLogin, User } from "../../components/Account"; import OrderType, { OrderPatch } from "../../components/Order"; import RatingSubmitType from "../../components/RatingSubmit"; +import { ItemWithFSImage } from "../../components/Item"; export const fetchItemList = async () => { const response = await fetch('http://localhost:8085/article/all'); @@ -265,3 +266,10 @@ export const updateCustomer = async (customer: CustomerType) => { } return await response.json(); } + +export const fetchFarmingStationItemList = async (): Promise => { + const response = await fetch('http://localhost:8085/farm/articles'); + if (!response.ok) + throw new Error('Failed to fetch items'); + return response.json(); +} diff --git a/01-frontend/src/pages/FSComponents.tsx b/01-frontend/src/pages/FSComponents.tsx index de324e4..79c447d 100644 --- a/01-frontend/src/pages/FSComponents.tsx +++ b/01-frontend/src/pages/FSComponents.tsx @@ -8,13 +8,7 @@ import AddShoppingCartIcon from '@mui/icons-material/AddShoppingCart'; import farmingStation from '../assets/fscomponents/fs_components_0.png'; import { ItemWithFSImage } from "../components/Item"; "../components/Item"; - -// API-Funktion, Items laden (URL anpassen!) -async function fetchFarmingStationItemList(): Promise { - const response = await fetch('/farm/articles'); - if (!response.ok) throw new Error('Failed to fetch items'); - return response.json(); -} +import { fetchFarmingStationItemList } from "../helper/query/Queries"; export default function FSComponents() { const { t } = useTranslation();