diff --git a/frontend/src/components/ProtectedRoute.js b/frontend/src/components/ProtectedRoute.js
new file mode 100644
index 0000000..9e26069
--- /dev/null
+++ b/frontend/src/components/ProtectedRoute.js
@@ -0,0 +1,30 @@
+import React, { useEffect, useState } from 'react';
+import { Navigate } from 'react-router-dom';
+import axiosClient from '../axiosClient.js';
+
+export default function ProtectedRoute({ children }) {
+ const [isAuthorized, setIsAuthorized] = useState(null);
+
+ useEffect(() => {
+ const checkAuthorization = async () => {
+ try {
+ const response = await axiosClient.get('/getCurrentUser', {
+ headers: { Authorization: `Bearer ${localStorage.getItem('authToken')}` },
+ });
+ const user = response.data.user;
+ setIsAuthorized(user.isAdmin === 1);
+ } catch (error) {
+ console.error('Błąd podczas sprawdzania uprawnień:', error);
+ setIsAuthorized(false);
+ }
+ };
+
+ checkAuthorization();
+ }, []);
+
+ if (isAuthorized === null) {
+ return
Ładowanie...
;
+ }
+
+ return isAuthorized ? children :
;
+}
diff --git a/frontend/src/components/SearchPanel.js b/frontend/src/components/SearchPanel.js
new file mode 100644
index 0000000..a8f77f4
--- /dev/null
+++ b/frontend/src/components/SearchPanel.js
@@ -0,0 +1,256 @@
+import React, { useState } from 'react';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faArrowDown } from '@fortawesome/free-solid-svg-icons';
+
+export default function SearchPanel({ kebabs, onSearch }) {
+ const [searchQuery, setSearchQuery] = useState('');
+ const [sortOrder, setSortOrder] = useState('asc');
+ const [isFilterOpen, setIsFilterOpen] = useState(false);
+ const [showOpenNow, setShowOpenNow] = useState(false);
+ const [selectedSauces, setSelectedSauces] = useState([]);
+ const [selectedMeats, setSelectedMeats] = useState([]);
+ const [selectedOrderingOptions, setSelectedOrderingOptions] = useState([]);
+
+ const allSauces = Array.from(
+ new Set(kebabs.flatMap((kebab) => kebab.sauces || []))
+ );
+
+ const allMeats = Array.from(
+ new Set(kebabs.flatMap((kebab) => kebab.meats || []))
+ );
+
+ const allOrderingOptions = Array.from(
+ new Set(kebabs.flatMap((kebab) => kebab.ordering_options || []))
+ );
+
+ const getCurrentTimeDetails = () => {
+ const now = new Date();
+ const currentHour = now.getHours();
+ const currentMinute = now.getMinutes();
+ const currentTime = currentHour + currentMinute / 60;
+ const currentDay = now.toLocaleString('en-US', { weekday: 'long' }).toLowerCase();
+ return { currentTime, currentDay };
+ };
+
+ const isOpenNow = (kebab) => {
+ const { currentTime, currentDay } = getCurrentTimeDetails();
+
+ if (!kebab.opening_hours || !kebab.opening_hours[currentDay]) {
+ return false;
+ }
+
+ const [opening, closing] = kebab.opening_hours[currentDay]
+ .split('-')
+ .map((time) => {
+ const [hour, minute] = time.split(':').map(Number);
+ return hour + minute / 60;
+ });
+
+ return currentTime >= opening && currentTime < closing;
+ };
+
+ const handleSearchChange = (e) => {
+ const query = e.target.value;
+ setSearchQuery(query);
+ applyFilters(query, selectedSauces, selectedMeats, showOpenNow, sortOrder);
+ };
+
+ const handleSortChange = (order) => {
+ setSortOrder(order);
+ applyFilters(searchQuery, selectedSauces, selectedMeats, showOpenNow, order);
+ };
+
+ const handleSauceToggle = (sauce) => {
+ const updatedSauces = selectedSauces.includes(sauce)
+ ? selectedSauces.filter((s) => s !== sauce)
+ : [...selectedSauces, sauce];
+
+ setSelectedSauces(updatedSauces);
+ applyFilters(searchQuery, updatedSauces, selectedMeats, showOpenNow, sortOrder);
+ };
+
+ const handleMeatToggle = (meat) => {
+ const updatedMeats = selectedMeats.includes(meat)
+ ? selectedMeats.filter((m) => m !== meat)
+ : [...selectedMeats, meat];
+
+ setSelectedMeats(updatedMeats);
+ applyFilters(searchQuery, selectedSauces, updatedMeats, showOpenNow, sortOrder);
+ };
+
+ const handleOrderingOptionToggle = (option) => {
+ const updatedOptions = selectedOrderingOptions.includes(option)
+ ? selectedOrderingOptions.filter((o) => o !== option)
+ : [...selectedOrderingOptions, option];
+
+ setSelectedOrderingOptions(updatedOptions);
+ applyFilters(searchQuery, selectedSauces, selectedMeats, showOpenNow, sortOrder, updatedOptions);
+ };
+
+ const toggleOpenNow = () => {
+ const updatedShowOpenNow = !showOpenNow;
+ setShowOpenNow(updatedShowOpenNow);
+ applyFilters(searchQuery, selectedSauces, selectedMeats, updatedShowOpenNow, sortOrder);
+ };
+
+ const applyFilters = (query, sauces, meats, openNow, order, orderingOptions = []) => {
+ let filteredKebabs = kebabs;
+
+ if (query) {
+ filteredKebabs = filteredKebabs.filter((kebab) =>
+ kebab.name.toLowerCase().includes(query.toLowerCase())
+ );
+ }
+
+ if (sauces.length > 0) {
+ filteredKebabs = filteredKebabs.filter((kebab) =>
+ sauces.every((sauce) => kebab.sauces?.includes(sauce))
+ );
+ }
+
+ if (meats.length > 0) {
+ filteredKebabs = filteredKebabs.filter((kebab) =>
+ meats.every((meat) => kebab.meats?.includes(meat))
+ );
+ }
+
+ if (orderingOptions.length > 0) {
+ filteredKebabs = filteredKebabs.filter((kebab) =>
+ orderingOptions.every((option) => kebab.ordering_options?.includes(option))
+ );
+ }
+
+ if (openNow) {
+ filteredKebabs = filteredKebabs.filter(isOpenNow);
+ }
+
+ filteredKebabs = filteredKebabs.sort((a, b) => {
+ if (order === 'asc') {
+ return a.name.localeCompare(b.name);
+ }
+ return b.name.localeCompare(a.name);
+ });
+
+ onSearch(filteredKebabs);
+ };
+
+ return (
+
+
+
Sortowanie po nazwie:
+
+ handleSortChange('asc')}
+ className={`flex-1 p-2 text-center rounded ${
+ sortOrder === 'asc'
+ ? 'bg-green-500 text-white'
+ : 'bg-gray-300 text-gray-700'
+ }`}
+ >
+ Rosnąco ↑
+
+ handleSortChange('desc')}
+ className={`flex-1 p-2 text-center rounded ${
+ sortOrder === 'desc'
+ ? 'bg-green-500 text-white'
+ : 'bg-gray-300 text-gray-700'
+ }`}
+ >
+ Malejąco ↓
+
+
+
+ {/* Filtrowanie */}
+
setIsFilterOpen(!isFilterOpen)}
+ >
+ Filtrowanie
+
+
+
+
+ Aktualnie otwarte
+
+
+ {/* Sosy */}
+
+
Sosy:
+
+ {allSauces.map((sauce) => (
+
+ {sauce}
+
+ ))}
+
+
+
+ {/* Mięsa */}
+
+
Mięsa:
+
+ {allMeats.map((meat) => (
+
+ {meat}
+
+ ))}
+
+
+
+ {/* Opcje zamówienia */}
+
+
Opcje zamówienia:
+
+ {allOrderingOptions.map((option) => (
+
+ {option}
+
+ ))}
+
+
+
+
+
+ );
+}
diff --git a/frontend/src/img/kebab_icon.png b/frontend/src/img/kebab_icon.png
new file mode 100644
index 0000000..c0d0290
Binary files /dev/null and b/frontend/src/img/kebab_icon.png differ
diff --git a/frontend/src/pages/AdminPanel.js b/frontend/src/pages/AdminPanel.js
index ea00602..075b1f0 100644
--- a/frontend/src/pages/AdminPanel.js
+++ b/frontend/src/pages/AdminPanel.js
@@ -169,48 +169,34 @@ export default function AdminPanel() {
const kebabId = selectedKebab?.id;
const openKebabModal = (kebab) => {
- const parsedOpeningHours =
- typeof kebab.opening_hours === "string"
- ? JSON.parse(kebab.opening_hours || "{}")
- : kebab.opening_hours || {};
-
- setSelectedKebab({
- ...kebab,
- logo: kebab.logo,
- opening_hours: parsedOpeningHours,
- ordering_options: Array.isArray(kebab.ordering_options)
- ? kebab.ordering_options
- : JSON.parse(kebab.ordering_options || "[]"),
- sauces: Array.isArray(kebab.sauces)
- ? kebab.sauces
- : JSON.parse(kebab.sauces || "[]"),
- pages: Array.isArray(kebab.pages)
- ? kebab.pages
- : JSON.parse(kebab.pages || "[]"),
- });
-
- setInitialKebab({
- ...kebab,
- opening_hours: parsedOpeningHours,
- ordering_options: Array.isArray(kebab.ordering_options)
- ? kebab.ordering_options
- : JSON.parse(kebab.ordering_options || "[]"),
- sauces: Array.isArray(kebab.sauces)
- ? kebab.sauces
- : JSON.parse(kebab.sauces || "[]"),
- pages: Array.isArray(kebab.pages)
- ? kebab.pages
- : JSON.parse(kebab.pages || "[]"),
- });
-
- setLocalSauces(Array.isArray(kebab.sauces) ? kebab.sauces : JSON.parse(kebab.sauces || "[]"));
- setLocalMeats([...kebab.meats]);
- setLocalStatus(kebab.status || "exists");
- setLocalOpeningHours(parsedOpeningHours);
- setLocalLogo(null);
- setLocalOrderingOptions(Array.isArray(kebab.ordering_options) ? [...kebab.ordering_options] : []);
- setLocalPages([...kebab.pages]);
- setIsKebabModalOpen(true);
+ setSelectedKebab({
+ ...kebab,
+ opening_hours: kebab.opening_hours || {},
+ ordering_options: Array.isArray(kebab.ordering_options)
+ ? kebab.ordering_options
+ : [],
+ sauces: Array.isArray(kebab.sauces) ? kebab.sauces : [],
+ pages: kebab.pages || {},
+ });
+
+ setInitialKebab({
+ ...kebab,
+ opening_hours: kebab.opening_hours || {},
+ ordering_options: Array.isArray(kebab.ordering_options)
+ ? kebab.ordering_options
+ : [],
+ sauces: Array.isArray(kebab.sauces) ? kebab.sauces : [],
+ pages: kebab.pages || {},
+ });
+
+ setLocalSauces(Array.isArray(kebab.sauces) ? kebab.sauces : []);
+ setLocalMeats([...kebab.meats]);
+ setLocalStatus(kebab.status || "exists");
+ setLocalOpeningHours(kebab.opening_hours || {});
+ setLocalLogo(null);
+ setLocalOrderingOptions(Array.isArray(kebab.ordering_options) ? kebab.ordering_options : []);
+ setLocalPages(kebab.pages || {});
+ setIsKebabModalOpen(true);
};
const handleLogoChange = (file) => {
@@ -848,7 +834,7 @@ export default function AdminPanel() {
setSelectedKebab({
...selectedKebab,
@@ -868,7 +854,7 @@ export default function AdminPanel() {
setSelectedKebab({
...selectedKebab,
diff --git a/frontend/src/pages/Home.js b/frontend/src/pages/Home.js
index 0b70d40..e81c555 100644
--- a/frontend/src/pages/Home.js
+++ b/frontend/src/pages/Home.js
@@ -1,27 +1,73 @@
-import '../index.css'
-import kebab_logo from '../img/kebab_logo.png'
-import { useNavigate } from 'react-router-dom'
-import Footer from '../components/Footer.js'
-import { useEffect, useState } from 'react'
-import 'react-toastify/dist/ReactToastify.css'
-import { toast, ToastContainer } from 'react-toastify'
+import '../index.css';
+import kebab_logo from '../img/kebab_logo.png';
+import { useNavigate } from 'react-router-dom';
+import Footer from '../components/Footer.js';
+import { useEffect, useState } from 'react';
+import 'react-toastify/dist/ReactToastify.css';
+import { toast, ToastContainer } from 'react-toastify';
+import axiosClient from '../axiosClient.js';
export default function Home() {
- const navigate = useNavigate()
- const [isLoggedIn, setIsLoggedIn] = useState(false)
+ const navigate = useNavigate();
+ const [isLoggedIn, setIsLoggedIn] = useState(false);
+ const [isAdmin, setIsAdmin] = useState(false);
+ const [isModalOpen, setIsModalOpen] = useState(false);
+ const [suggestion, setSuggestion] = useState('');
useEffect(() => {
- const token = localStorage.getItem('authToken')
+ const token = localStorage.getItem('authToken');
if (token) {
- setIsLoggedIn(true)
+ setIsLoggedIn(true);
+
+ axiosClient
+ .get('/getCurrentUser', {
+ headers: { Authorization: `Bearer ${token}` },
+ })
+ .then((response) => {
+ const user = response.data.user;
+ setIsAdmin(user.isAdmin === 1);
+ })
+ .catch((error) => {
+ console.error('Błąd pobierania danych użytkownika:', error);
+ });
}
- }, [])
+ }, []);
const handleLogout = () => {
- localStorage.removeItem('authToken')
- setIsLoggedIn(false)
- toast.success('Wylogowano pomyślnie!', { autoClose: 2000 })
- }
+ localStorage.removeItem('authToken');
+ setIsLoggedIn(false);
+ setIsAdmin(false);
+ toast.success('Wylogowano pomyślnie!', { autoClose: 2000 });
+ };
+
+ const handleSuggestionSubmit = async () => {
+ const token = localStorage.getItem('authToken');
+ if (!suggestion.trim()) {
+ toast.error('Proszę wpisać treść sugestii.');
+ return;
+ }
+
+ try {
+ const userResponse = await axiosClient.get('/getCurrentUser', {
+ headers: { Authorization: `Bearer ${token}` },
+ });
+
+ const user = userResponse.data.user?.name || 'Anonimowy użytkownik';
+
+ await axiosClient.post(
+ '/suggestions',
+ { user, contents: suggestion },
+ { headers: { Authorization: `Bearer ${token}` } }
+ );
+
+ toast.success('Sugestia została wysłana!');
+ setIsModalOpen(false);
+ setSuggestion('');
+ } catch (error) {
+ toast.error('Nie udało się wysłać sugestii. Spróbuj ponownie później.');
+ console.error('Błąd podczas wysyłania sugestii:', error);
+ }
+ };
return (
@@ -35,8 +81,7 @@ export default function Home() {
LEGNICA KEBAB CITY TOUR
- Legnica Kebab City Tour jest to aplikacja oraz witryna internetowa służąca pomocą w odnalezieniu lokalizacji wszystkich dostępnych, w planach oraz zamkniętych punktów gastronomicznych serwujących słynne Kebaby. Poniższe przyciski pokierują Cię dalej. Wybierz przycisk "Mapa" aby bezpośrednio odnaleźć Kebaby rozsiane po Legnicy. Możesz też utworzyć konto lub zalogować się aby dodać Twojego ulubionego Kebaba do zakładki "Ulubione", dzięki czemu łatwiej go odnajdziesz!!
-
+ Legnica Kebab City Tour jest to aplikacja oraz witryna internetowa służąca pomocą w odnalezieniu lokalizacji wszystkich dostępnych, w planach oraz zamkniętych punktów gastronomicznych serwujących słynne Kebaby. Poniższe przyciski pokierują Cię dalej. Wybierz przycisk "Mapa" aby bezpośrednio odnaleźć Kebaby rozsiane po Legnicy. Możesz też utworzyć konto lub zalogować się aby na mapie dodać Twojego ulubionego Kebaba, dzięki czemu łatwiej go odnajdziesz!! Dodatkowo po zalogowaniu pojawi się przycisk "Sugestia", nie krępuj się i zostaw nam swoją opinię!
{isLoggedIn ? (
-
- WYLOGUJ
-
+ <>
+
+ WYLOGUJ
+
+ setIsModalOpen(true)}
+ >
+ SUGESTIA
+
+ {isAdmin && (
+ navigate('/admin')}
+ >
+ ADMIN PANEL
+
+ )}
+
) : (
+
+
Dodaj swoją sugestię
+ 
+