Index: my-react-app/src/App.js =================================================================== --- my-react-app/src/App.js (revision 75f50866bac587cbe5cf2dfb97353279f16a8c82) +++ my-react-app/src/App.js (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -2,5 +2,5 @@ import Customers from './components/Customers'; import Layout from "./components/Layout"; -import React, {useEffect, useState} from 'react'; +import React, {useContext, useEffect, useState} from 'react'; import CustomerFormContainer from "./components/CustomerFormContainer"; import CustomerDetails from "./components/CustomerDetails"; @@ -12,4 +12,5 @@ import ReservationEdit from "./components/ReservationEdit"; import axios from "axios"; +import { CuisineContext } from './components/CuisineContext'; const App = () => { @@ -45,4 +46,6 @@ const [timeSlots, setTimeSlots] = useState([]); + const cuisineTypes = useContext(CuisineContext); + useEffect(() => { if (date) { @@ -82,5 +85,4 @@ }, [date]); - const handleDateChange = (e) => { setDate(e.target.value); @@ -102,22 +104,25 @@ e.preventDefault(); const [year, month, day] = date.split("-"); - let formattedDateTime; - const [selectedHours, selectedMinutes] = selectedTime.split(":"); - // Check if selectedHours and selectedMinutes are valid numbers - if (!isNaN(selectedHours) && !isNaN(selectedMinutes)) { - const dateTime = new Date(Date.UTC(year, month - 1, day, selectedHours, selectedMinutes)); - formattedDateTime = dateTime.toISOString().slice(0, 16).replace('T', ' '); + + if (selectedTime) { + const [selectedHours, selectedMinutes] = selectedTime.split(":"); + // Check if selectedHours and selectedMinutes are valid numbers + if (!isNaN(selectedHours) && !isNaN(selectedMinutes)) { + const dateTime = new Date(Date.UTC(year, month - 1, day, selectedHours, selectedMinutes)); + formattedDateTime = dateTime.toISOString().slice(0, 16).replace('T', ' '); + } } else { - // Default values if selectedTime is not valid + // Find the first available time slot after the current time const now = new Date(); - let defaultTime; - if (now.getHours() >= 9 && now.getHours() <= 23) { - defaultTime = now; - } else { - defaultTime = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 9, 0); // Set to 09:00 if current time is before 09:00 - } - const dateTime = new Date(Date.UTC(year, month - 1, day, defaultTime.getHours(), defaultTime.getMinutes())); - formattedDateTime = dateTime.toISOString().slice(0, 16).replace('T', ' '); + const currentTime = now.getHours() * 60 + now.getMinutes(); // Current time in minutes + const nextSlot = timeSlots.find(slot => { + const [hours, minutes] = slot.split(":"); + const slotTime = parseInt(hours) * 60 + parseInt(minutes); // Time of the slot in minutes + return slotTime > currentTime; + }); + + // If no slot is found after the current time, use the first slot of the day + formattedDateTime = nextSlot ? `${date} ${nextSlot}` : `${date} ${timeSlots[0]}`; } @@ -128,6 +133,6 @@ }; - console.log("pecatam data pod mene") - console.log(data) + console.log("Data to be submitted:"); + console.log(data); try { @@ -141,4 +146,15 @@ }; + const handleSearchByCuisine = async (cuisine) => { + const cuisineName = cuisine.replace('Searching by cuisine: ', ''); + try { + const response = await axios.post(`http://localhost:8080/api/search/shortcut/${cuisineName}`, cuisineName); + // Handle the response as needed + console.log(response.data); // Log the response data, for example + } catch (error) { + console.error('Error searching by cuisine:', error); + // Handle errors, such as displaying an error message to the user + } + }; @@ -154,6 +170,5 @@ return (
-

Home

-

Welcome to My Awesome App!

+

Rezerviraj masa

@@ -189,4 +204,21 @@
+ +
+

Search by cuisine type

+
    + {cuisineTypes.map((cuisine, index) => ( +
  • + +
    • + ))} +
+
+
+ +
Index: my-react-app/src/components/CuisineContext.js =================================================================== --- my-react-app/src/components/CuisineContext.js (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) +++ my-react-app/src/components/CuisineContext.js (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -0,0 +1,26 @@ +import React, { createContext, useState, useEffect } from 'react'; +import axios from 'axios'; + +export const CuisineContext = createContext(); + +export const CuisineProvider = ({ children }) => { + const [cuisineTypes, setCuisineTypes] = useState([]); + + useEffect(() => { + const fetchCuisineTypes = async () => { + try { + const response = await axios.get('http://localhost:8080/api/cuisineTypes'); + setCuisineTypes(response.data); + } catch (error) { + console.error('Error fetching cuisine types:', error); + } + }; + fetchCuisineTypes(); + }, []); + + return ( + + {children} + + ); +}; Index: my-react-app/src/components/Customers.js =================================================================== --- my-react-app/src/components/Customers.js (revision 75f50866bac587cbe5cf2dfb97353279f16a8c82) +++ my-react-app/src/components/Customers.js (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -35,8 +35,7 @@ await axios.delete(`http://localhost:8080/api/customers/delete/${customerId}`); setCustomers(customers.filter(customer => customer.customerID !== customerId)); - alert('Reservation canceled successfully'); + window.location.reload(); } catch (error) { console.error("Error + " + error); - alert("An error occurred while deleting"); } } Index: my-react-app/src/components/RestaurantCard.js =================================================================== --- my-react-app/src/components/RestaurantCard.js (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) +++ my-react-app/src/components/RestaurantCard.js (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -0,0 +1,22 @@ +import React from 'react'; +import StarRating from './StarRating'; + +const RestaurantCard = ({ restaurant, onDetailClick }) => { + return ( +
+
+
+
+ {restaurant.name} +
+

{restaurant.cuisineType}

+

{restaurant.operatingHours}

+

Ul. {restaurant.address}

+
+ +
+
+ ); +}; + +export default RestaurantCard; Index: my-react-app/src/components/RestaurantContext.js =================================================================== --- my-react-app/src/components/RestaurantContext.js (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) +++ my-react-app/src/components/RestaurantContext.js (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -0,0 +1,27 @@ +import React, { createContext, useState, useEffect } from 'react'; +import axios from 'axios'; + +export const RestaurantContext = createContext(); + +export const RestaurantProvider = ({ children }) => { + const [restaurants, setRestaurants] = useState([]); + + useEffect(() => { + const fetchRestaurants = async () => { + try { + const response = await axios.get('http://localhost:8080/api/restaurants'); + setRestaurants(response.data); + } catch (error) { + console.error('Error fetching restaurants:', error); + } + }; + + fetchRestaurants(); + }, []); + + return ( + + {children} + + ); +}; Index: my-react-app/src/components/Restaurants.js =================================================================== --- my-react-app/src/components/Restaurants.js (revision 75f50866bac587cbe5cf2dfb97353279f16a8c82) +++ my-react-app/src/components/Restaurants.js (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -1,24 +1,16 @@ -import React, { useState, useEffect } from 'react'; -import axios from 'axios'; +import React, {useState, useEffect, useContext} from 'react'; import 'bootstrap/dist/css/bootstrap.min.css'; import StarRating from './StarRating'; import { useNavigate } from 'react-router-dom'; +import {RestaurantContext} from "./RestaurantContext"; const Restaurants = () => { const [restaurants, setRestaurants] = useState([]); const navigate = useNavigate(); + const restaurantContext = useContext(RestaurantContext); useEffect(() => { - const fetchRestaurants = async () => { - try { - const response = await axios.get('http://localhost:8080/api/restaurants'); - setRestaurants(response.data); - } catch (error) { - console.error('Error fetching restaurants:', error); - } - }; - - fetchRestaurants(); - }, []); + setRestaurants(restaurantContext.restaurants); + }, [restaurantContext]); const handleDetailClick = (restaurantId) => { @@ -98,5 +90,7 @@ - + Index: my-react-app/src/index.js =================================================================== --- my-react-app/src/index.js (revision 75f50866bac587cbe5cf2dfb97353279f16a8c82) +++ my-react-app/src/index.js (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -3,9 +3,15 @@ import './index.css'; import App from './App'; +import { CuisineProvider } from './components/CuisineContext'; +import {RestaurantProvider} from "./components/RestaurantContext"; const root = ReactDOM.createRoot(document.getElementById('root')); root.render( - - - + + + + + + + ); Index: src/main/java/com/example/rezevirajmasa/demo/model/Reservation.java =================================================================== --- src/main/java/com/example/rezevirajmasa/demo/model/Reservation.java (revision 75f50866bac587cbe5cf2dfb97353279f16a8c82) +++ src/main/java/com/example/rezevirajmasa/demo/model/Reservation.java (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -48,5 +48,5 @@ // private BigDecimal totalAmount;//rezervacija so depozit ako e - @Column(name = "Pa`ymentStatus", length = 20, nullable = false, columnDefinition = "VARCHAR default 'Unpaid'") + @Column(name = "PaymentStatus", length = 20, nullable = false, columnDefinition = "VARCHAR default 'Unpaid'") private String paymentStatus; Index: src/main/java/com/example/rezevirajmasa/demo/repository/RestaurantRepository.java =================================================================== --- src/main/java/com/example/rezevirajmasa/demo/repository/RestaurantRepository.java (revision 75f50866bac587cbe5cf2dfb97353279f16a8c82) +++ src/main/java/com/example/rezevirajmasa/demo/repository/RestaurantRepository.java (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -4,4 +4,5 @@ import com.example.rezevirajmasa.demo.model.TableEntity; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import java.util.List; @@ -9,4 +10,7 @@ public interface RestaurantRepository extends JpaRepository { List findAllByNameLike(String search); - List findAllByCuisineTypeLike(String search); + List findAllByCuisineTypeContaining(String search); + @Query("SELECT DISTINCT r.cuisineType FROM Restaurant r") + List findAllCuisineTypes(); + List findAllByCuisineType(String cuisine); } Index: src/main/java/com/example/rezevirajmasa/demo/repository/TableRepository.java =================================================================== --- src/main/java/com/example/rezevirajmasa/demo/repository/TableRepository.java (revision 75f50866bac587cbe5cf2dfb97353279f16a8c82) +++ src/main/java/com/example/rezevirajmasa/demo/repository/TableRepository.java (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -14,4 +14,4 @@ // @Query("SELECT t FROM TableEntity t JOIN FETCH t.restaurant WHERE t.id = :id") // TableEntity findTableEntityByIdWithRestaurant(@Param("id") Long id); - List findAllByTimeSlotsContainingAndCapacity(LocalDateTime timeSlot, Integer partySize); + List findAllByTimeSlotsContainingAndCapacityGreaterThanEqual(LocalDateTime timeSlot, Integer partySize); } Index: src/main/java/com/example/rezevirajmasa/demo/service/RestaurantService.java =================================================================== --- src/main/java/com/example/rezevirajmasa/demo/service/RestaurantService.java (revision 75f50866bac587cbe5cf2dfb97353279f16a8c82) +++ src/main/java/com/example/rezevirajmasa/demo/service/RestaurantService.java (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -22,3 +22,5 @@ public List findRestaurantsByDateTimeAndPartySize(LocalDateTime dateTime, int partySize, String search); public List findRestaurantsBySearchParams(LocalDateTime dateTime, int partySize, String search); + public List findALlCuisineTypes(); + List findRestaurantsByCuisineType(String param); } Index: src/main/java/com/example/rezevirajmasa/demo/service/impl/RestaurantServiceImpl.java =================================================================== --- src/main/java/com/example/rezevirajmasa/demo/service/impl/RestaurantServiceImpl.java (revision 75f50866bac587cbe5cf2dfb97353279f16a8c82) +++ src/main/java/com/example/rezevirajmasa/demo/service/impl/RestaurantServiceImpl.java (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -168,19 +168,27 @@ @Override public List findRestaurantsBySearchParams(LocalDateTime dateTime, int partySize, String search) { - if (!search.isEmpty()) { - List restaurantList = null; - if (!restaurantRepository.findAllByNameLike(search).isEmpty()) { - restaurantList = restaurantRepository.findAllByNameLike(search); - } else { - restaurantList = restaurantRepository.findAllByCuisineTypeLike(search); + if (search == null || search.isEmpty()) { + List tableEntities = tableRepository.findAllByTimeSlotsContainingAndCapacityGreaterThanEqual(dateTime, partySize); + return tableEntities.stream() + .map(TableEntity::getRestaurant) + .distinct() + .collect(Collectors.toList()); + } else { + List restaurantList = restaurantRepository.findAllByNameLike(search); + if (restaurantList.isEmpty()) { + restaurantList = restaurantRepository.findAllByCuisineTypeContaining(search); } return restaurantList; - } else { - List tableEntities = tableRepository.findAllByTimeSlotsContainingAndCapacity(dateTime, partySize); - return tableEntities.stream() - .map(TableEntity::getRestaurant) - .distinct() // To avoid duplicates in case one restaurant has multiple tables - .collect(Collectors.toList()); } } + + @Override + public List findALlCuisineTypes() { + return restaurantRepository.findAllCuisineTypes(); + } + + @Override + public List findRestaurantsByCuisineType(String param) { + return restaurantRepository.findAllByCuisineType(param); + } } Index: src/main/java/com/example/rezevirajmasa/demo/web/rest/testController.java =================================================================== --- src/main/java/com/example/rezevirajmasa/demo/web/rest/testController.java (revision 75f50866bac587cbe5cf2dfb97353279f16a8c82) +++ src/main/java/com/example/rezevirajmasa/demo/web/rest/testController.java (revision cfc16a3143db2a719a3031cf0cf4bdb718b66d4f) @@ -17,4 +17,5 @@ import java.util.List; import java.util.Map; +import java.util.Optional; @CrossOrigin(origins = "http://localhost:3000/") @@ -52,9 +53,10 @@ @PostMapping("/api/search") public ResponseEntity> searchRestaurants(@RequestBody Map requestData) { - String dateTime = (String) requestData.get("dateTime"); - Integer partySize = (Integer) requestData.get("partySize"); - String search = (String) requestData.get("search"); + Optional dateTimeOptional = Optional.ofNullable((String) requestData.get("dateTime")); + int partySize = Integer.parseInt(requestData.get("partySize").toString()); + Optional searchOptional = Optional.ofNullable((String) requestData.get("search")); - // Now proceed with parsing dateTime and performing the search based on the received parameters + String dateTime = dateTimeOptional.orElse(null); + String search = searchOptional.orElse(null); LocalDateTime parsedDateTime = null; @@ -67,4 +69,21 @@ return new ResponseEntity>(filteredRestaurants, HttpStatus.OK); + } + + @PostMapping("/api/search/shortcut/{param}") + public ResponseEntity> searchByCuisineTypeShortcut(@PathVariable String param) { + List filteredRestaurants; + if(param != null && !param.isEmpty()) { + filteredRestaurants = restaurantService.findRestaurantsByCuisineType(param); + } else { + filteredRestaurants = restaurantService.listall(); + } + return new ResponseEntity>(filteredRestaurants, HttpStatus.OK); + } + + @GetMapping("/api/cuisineTypes") + public ResponseEntity> getAllCuisineTypes() { + List cuisineTypes = restaurantService.findALlCuisineTypes(); + return new ResponseEntity<>(cuisineTypes, HttpStatus.OK); }