diff --git a/Backend/peepal_backend/app/Http/Controllers/HozzaadasController.php b/Backend/peepal_backend/app/Http/Controllers/HozzaadasController.php index e6f979f..b1eaf90 100644 --- a/Backend/peepal_backend/app/Http/Controllers/HozzaadasController.php +++ b/Backend/peepal_backend/app/Http/Controllers/HozzaadasController.php @@ -24,11 +24,11 @@ class HozzaadasController extends Controller 'nev' => 'required|string', 'kerulet' => 'required|string', 'kozeli_megall' => 'required|string', - 'akadalym' => 'required|boolean', - 'ar' => 'required|numeric', - 'nyitva' => 'required|string', + 'akadalym' => 'nullable|boolean', + 'ar' => 'nullable|numeric', + 'nyitva' => 'nullable|string', 'utvonal' => 'required|string', - 'koordinatak' => 'nullable|string' + 'koordinatak' => 'required|string' ]); try { diff --git a/Backend/peepal_backend/app/Http/Middleware/Cors.php b/Backend/peepal_backend/app/Http/Middleware/Cors.php new file mode 100644 index 0000000..c03f63a --- /dev/null +++ b/Backend/peepal_backend/app/Http/Middleware/Cors.php @@ -0,0 +1,20 @@ +headers->set('Access-Control-Allow-Origin', '*'); + $response->headers->set('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS'); + $response->headers->set('Access-Control-Allow-Headers', 'Content-Type, Authorization, X-Requested-With'); + + return $response; + } +} diff --git a/Backend/peepal_backend/bootstrap/app.php b/Backend/peepal_backend/bootstrap/app.php index d654276..8263079 100644 --- a/Backend/peepal_backend/bootstrap/app.php +++ b/Backend/peepal_backend/bootstrap/app.php @@ -12,7 +12,15 @@ return Application::configure(basePath: dirname(__DIR__)) health: '/up', ) ->withMiddleware(function (Middleware $middleware) { - // + // Add CORS middleware for API routes + $middleware->api([ + \Illuminate\Http\Middleware\HandleCors::class, + ]); + + // Or if you want to apply CORS to all routes + $middleware->append([ + \Illuminate\Http\Middleware\HandleCors::class, + ]); }) ->withExceptions(function (Exceptions $exceptions) { // diff --git a/Backend/peepal_backend/config/cors.php b/Backend/peepal_backend/config/cors.php new file mode 100644 index 0000000..8b6d297 --- /dev/null +++ b/Backend/peepal_backend/config/cors.php @@ -0,0 +1,12 @@ + ['api/*'], + 'allowed_methods' => ['*'], + 'allowed_origins' => ['*'], // For development; restrict to your frontend URL in production + 'allowed_origins_patterns' => [], + 'allowed_headers' => ['*'], + 'exposed_headers' => [], + 'max_age' => 0, + 'supports_credentials' => false, +]; \ No newline at end of file diff --git a/Backend/peepal_backend/database/migrations/2025_04_04_065541_wc_adatok_tablaletrehozas.php b/Backend/peepal_backend/database/migrations/2025_04_04_065541_wc_adatok_tablaletrehozas.php index 7a94237..316d558 100644 --- a/Backend/peepal_backend/database/migrations/2025_04_04_065541_wc_adatok_tablaletrehozas.php +++ b/Backend/peepal_backend/database/migrations/2025_04_04_065541_wc_adatok_tablaletrehozas.php @@ -13,11 +13,11 @@ return new class extends Migration $table->string('nev', 250); $table->string('kerulet', 250); $table->string('kozeli_megall', 250); - $table->boolean('akadalym'); - $table->integer('ar'); - $table->string('nyitva', 250); - $table->double('hossz_koord')->nullable(); - $table->double('szel_koord')->nullable(); + $table->boolean('akadalym')->nullable(); + $table->integer('ar')->nullable(); + $table->string('nyitva', 250)->nullable(); + $table->double('hossz_koord'); + $table->double('szel_koord'); $table->string('utvonal', 1000); $table->timestamps(); }); diff --git a/frontend/peepal_react/package-lock.json b/frontend/peepal_react/package-lock.json index a485e0f..404cf41 100644 --- a/frontend/peepal_react/package-lock.json +++ b/frontend/peepal_react/package-lock.json @@ -18,6 +18,7 @@ "lucide-react": "^0.479.0", "react": "^19.0.0", "react-dom": "^19.0.0", + "react-icons": "^5.5.0", "react-router-dom": "^7.1.5", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" @@ -14385,6 +14386,15 @@ "integrity": "sha512-SN/U6Ytxf1QGkw/9ve5Y+NxBbZM6Ht95tuXNMKs8EJyFa/Vy/+Co3stop3KBHARfn/giv+Lj1uUnTfOJ3moFEQ==", "license": "MIT" }, + "node_modules/react-icons": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz", + "integrity": "sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==", + "license": "MIT", + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", diff --git a/frontend/peepal_react/package.json b/frontend/peepal_react/package.json index f94b54a..8dfe0ef 100644 --- a/frontend/peepal_react/package.json +++ b/frontend/peepal_react/package.json @@ -13,6 +13,7 @@ "lucide-react": "^0.479.0", "react": "^19.0.0", "react-dom": "^19.0.0", + "react-icons": "^5.5.0", "react-router-dom": "^7.1.5", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" diff --git a/frontend/peepal_react/src/WC_Komponens/Bejel_Regisz/Bejelentkezes.jsx b/frontend/peepal_react/src/WC_Komponens/Bejel_Regisz/Bejelentkezes.jsx index 991c911..fb1c90a 100644 --- a/frontend/peepal_react/src/WC_Komponens/Bejel_Regisz/Bejelentkezes.jsx +++ b/frontend/peepal_react/src/WC_Komponens/Bejel_Regisz/Bejelentkezes.jsx @@ -35,7 +35,7 @@ export default function Bejelentkezes() { return ( -
+

Bejelentkezés

diff --git a/frontend/peepal_react/src/WC_Komponens/Bejel_Regisz/Regisztracio.jsx b/frontend/peepal_react/src/WC_Komponens/Bejel_Regisz/Regisztracio.jsx index 610a906..f50f00e 100644 --- a/frontend/peepal_react/src/WC_Komponens/Bejel_Regisz/Regisztracio.jsx +++ b/frontend/peepal_react/src/WC_Komponens/Bejel_Regisz/Regisztracio.jsx @@ -1,6 +1,6 @@ export default function Regisztracio() { return ( -
+

Regisztráció

diff --git a/frontend/peepal_react/src/WC_Komponens/Budi_Blokk/Csempe.jsx b/frontend/peepal_react/src/WC_Komponens/Budi_Blokk/Csempe.jsx index baced6c..4730d4c 100644 --- a/frontend/peepal_react/src/WC_Komponens/Budi_Blokk/Csempe.jsx +++ b/frontend/peepal_react/src/WC_Komponens/Budi_Blokk/Csempe.jsx @@ -1,4 +1,5 @@ import React, { useState, useEffect } from "react"; +import { TfiWheelchair } from "react-icons/tfi"; import { mosdokFetch } from "../../apiFetch"; export default function Csempe() { @@ -44,15 +45,7 @@ export default function Csempe() {

Ár: {mosdo.ar} Ft

Nyitvatartás: {mosdo.nyitva}

- {mosdo.akadalym && ( - wheelchair - )} + {mosdo.akadalym === 1 ? : ""} { + event.preventDefault(); + const wcInfo = { + nev: nev, + kerulet: kerulet, + kozeli_megall: kozeli_megall, + akadalym: akadalym, + ar: ar, + nyitva: nyitva, + utvonal: utvonal, + koordinatak: koordinatak + } + + fetch("http://localhost:8000/api/hozzaadas", { + method: "POST", + headers: { + "Content-Type": "application/json" + }, + body: JSON.stringify(wcInfo) + }) + .then((response) => response.json()) + .then((newWC) => { + setNev(""); + setKerulet(""); + setKozeli(""); + setAkadalym(false); + setAr(""); + setNyitva(""); + setUtvonal(""); + setKoordinatak(""); + navigate("/"); + }) + .catch((error) => { + console.log(error); + }) + } + const ToolTip = ({children, text}) => { return(
@@ -11,43 +62,61 @@ export default function HozzaadForm() { ) } - + return ( -
- +
+

Adjon hozzá nyilvános mosdót, ha nem találja az oldalon

setNev(event.target.value)} placeholder="Mosdó neve" className="w-full px-4 py-2 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500" /> setKerulet(event.target.value)} placeholder="Kerület" className="w-full px-4 py-2 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500" /> setKozeli(event.target.value)} placeholder="Legközelebbi megálló" className="w-full px-4 py-2 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500" /> setAr(event.target.value)} + placeholder="Ár (HUF)" className="w-full px-4 py-2 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500" /> setNyitva(event.target.value)} placeholder="Nyitvatartás (Óra:Perc-Óra:Perc)" className="w-full px-4 py-2 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500" /> @@ -56,11 +125,27 @@ export default function HozzaadForm() { Akadálymentes:
@@ -72,6 +157,9 @@ export default function HozzaadForm() {
setUtvonal(event.target.value)} placeholder="Útvonal link" className="w-full px-4 py-2 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500" /> @@ -83,12 +171,14 @@ export default function HozzaadForm() {
setKoordinatak(event.target.value)} placeholder="Koordináták" className="w-full px-4 py-2 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500" /> diff --git a/frontend/peepal_react/src/WC_Komponens/Kereso/Legkozelebbi.jsx b/frontend/peepal_react/src/WC_Komponens/Kereso/Legkozelebbi.jsx index 7f34d3b..f845705 100644 --- a/frontend/peepal_react/src/WC_Komponens/Kereso/Legkozelebbi.jsx +++ b/frontend/peepal_react/src/WC_Komponens/Kereso/Legkozelebbi.jsx @@ -1,4 +1,5 @@ import React, { useState, useEffect } from 'react'; +import { TfiWheelchair } from "react-icons/tfi"; import { mosdokFetch } from '../../apiFetch'; // Haversine formula to calculate distance between two coordinates @@ -118,15 +119,7 @@ export default function LegkozelebbiMosdo() {
- {nearestRestroom.akadalym && ( - wheelchair - )} + {nearestRestroom.akadalym === 1 ? : ""}
); @@ -134,7 +127,7 @@ export default function LegkozelebbiMosdo() { // Default render (before location permission) return ( -
+

Helyzetmeghatározás

Engedélyezed a helyzetmeghatározást?