borcsokistvanmilan/PeePal
1
0
Fork 0
forked from magonysandormate/PeePal
Code Pull Requests Activity

Felesleges változók kivéve

Browse Source
This commit is contained in:
Sándor Máté Magony
2025-04-11 13:12:32 +02:00
parent 2975cd91b1
commit 3f0465fb5a
15 changed files with 187 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Backend/peepal_backend/app/Http/Controllers/WcController.php
View File

@@ -9,7 +9,8 @@ class WcController extends Controller
{
public function index()
{
return response()->json(WcAdatok::all());
$mosdok = WcAdatok::with('kerulet')->get();
return response()->json($mosdok);
}
public function show($id)

14
Backend/peepal_backend/app/Models/Keruletek.php Normal file
View File

@@ -0,0 +1,14 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class Keruletek extends Model
{
public function wcAdatok(){
return $this->hasMany(WcAdatok::class);
}
protected $table = 'keruletek';
}

18
Backend/peepal_backend/app/Models/WcAdatok.php
View File

@@ -9,7 +9,23 @@ class WcAdatok extends Model
{
use HasFactory;
public function kerulet(){
return $this->belongsTo(Keruletek::class);
}
protected $table = 'wc_adatok';
protected $fillable = ['nev', 'kerulet', 'kozeli_megall', 'akadalym', 'ar', 'nyitva', 'hossz_koord', 'szel_koord', 'utvonal'];
protected $fillable = [
'nev',
'kerulet_id',
'kozeli_megall',
'akadalym',
'ar',
'nyitva',
'hossz_koord',
'szel_koord',
'utvonal',
'felhasznalo_id'
];
}

26
Backend/peepal_backend/database/migrations/2025_03_31_083919_user_tabla_letrehozas1.php
View File

@@ -1,26 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::create("users_table", function (Blueprint $t){
$t -> id();
$t -> string("nev");
$t -> string("email");
$t -> string("felh_nev");
$t -> string('jelszo');
$t -> boolean('is_admin')->default(false);
$t -> timestamps();
});
}
public function down(): void
{
Schema::dropIfExists("users_table");
}
};

26
Backend/peepal_backend/database/migrations/2025_04_04_065541_wc_adatok_tablaletrehozas.php → Backend/peepal_backend/database/migrations/2025_04_10_091601_tabla_feltoles.php
View File

@@ -6,12 +6,30 @@ use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('keruletek', function (Blueprint $t) {
$t -> id();
$t -> string('kerulet_nev');
});
Schema::create("felhasznalok", function (Blueprint $t){
$t -> id();
$t -> string("nev");
$t -> string("email");
$t -> string("felh_nev");
$t -> string('jelszo');
$t -> boolean('is_admin')->default(false);
$t -> timestamps();
});
Schema::create('wc_adatok', function (Blueprint $table) {
$table->id();
$table->string('nev', 250);
$table->string('kerulet', 250);
$table->foreignId('kerulet_id') -> references('id') -> on('keruletek');
$table->string('kozeli_megall', 250);
$table->boolean('akadalym')->nullable();
$table->integer('ar')->nullable();
@@ -19,12 +37,16 @@ return new class extends Migration
$table->double('hossz_koord');
$table->double('szel_koord');
$table->string('utvonal', 1000);
$table->foreignId('felhasznalo_id')->references('id')->on('felhasznalok');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('wc_adatok');
//
}
};

8
Backend/peepal_backend/database/seeders/DatabaseSeeder.php
View File

@@ -14,11 +14,15 @@ class DatabaseSeeder extends Seeder
public function run(): void
{
$this -> call([
felhasznaloFeltoltes::class,
FelhasznaloFeltoltes::class,
]);
$this -> call([
wc_adatokFeltoltes::class,
KeruletekFeltoltes::class,
]);
$this -> call([
WcAdatokFeltoltes::class,
]);
}
}

35
Backend/peepal_backend/database/seeders/KeruletekFeltoltes.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
namespace Database\Seeders;
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;
class KeruletekFeltoltes extends Seeder
{
public function run(): void
{
function arabicToRoman($number) {
$map = array('M' => 1000, 'CM' => 900, 'D' => 500, 'CD' => 400, 'C' => 100, 'XC' => 90, 'L' => 50, 'XL' => 40, 'X' => 10, 'IX' => 9, 'V' => 5, 'IV' => 4, 'I' => 1);
$returnValue = '';
while ($number > 0) {
foreach ($map as $roman => $int) {
if($number >= $int) {
$number -= $int;
$returnValue .= $roman;
break;
}
}
}
return $returnValue;
}
for ($i = 1; $i <= 23 ; $i++) {
DB::table('keruletek') -> insert([
'kerulet_nev' => arabicToRoman($i) . '. kerület'
]);
}
}
}

71
Backend/peepal_backend/database/seeders/wc_adatokFeltoltes.php → Backend/peepal_backend/database/seeders/WcAdatokFeltoltes.php
View File

@@ -6,14 +6,14 @@ use Illuminate\Database\Console\Seeds\WithoutModelEvents;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;
class wc_adatokFeltoltes extends Seeder
class WcAdatokFeltoltes extends Seeder
{
public function run(): void
{
$wcAdatok = [
[
'nev' => 'Déli Pályaudvar Nyilvános Mosdó',
'kerulet' => 'I. kerület',
'kerulet_id' => 1,
'kozeli_megall' => 'Déli Pályaudvar (M2-es metró, 2-es villamos, 4-es villamos, 18-as villamos, 59-es villamos, 61-es villamos)',
'akadalym' => true,
'ar' => 250,
@@ -21,10 +21,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.50025507357977,
'szel_koord' => 19.025074759382747,
'utvonal' => 'https://maps.app.goo.gl/X3TSMUwhTV4fALyd6',
'felhasznalo_id' => 1
],
[
'nev' => 'Nyugati Pályaudvar Nyilvános Mosdó',
'kerulet' => 'VI. kerület',
'kerulet_id' => 6,
'kozeli_megall' => 'Nyugati Pályaudvar (M3-as metró, 4-es villamos, 6-os villamos)',
'akadalym' => true,
'ar' => 200,
@@ -32,10 +33,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.510861527052484,
'szel_koord' => 19.057794223722723,
'utvonal' => 'https://maps.app.goo.gl/z73zXwGX6HxkPNQu8',
'felhasznalo_id' => 1
],
[
'nev' => 'Keleti Pályaudvar Nyilvános Mosdó',
'kerulet' => 'VIII. kerület',
'kerulet_id' => 8,
'kozeli_megall' => 'Keleti Pályaudvar (M2-es metró, M4-es metró, 7-es busz, 30-as busz, 78-as busz)',
'akadalym' => true,
'ar' => 300,
@@ -43,10 +45,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.499972,
'szel_koord' => 19.082667,
'utvonal' => 'https://maps.app.goo.gl/YBY2qVcbxZ9ebc7t8',
'felhasznalo_id' => 1
],
[
'nev' => 'Margitszigeti Nyilvános Mosdó',
'kerulet' => 'XIII. kerület',
'kerulet_id' => 13,
'kozeli_megall' => 'Margitsziget (26-os busz)',
'akadalym' => true,
'ar' => 150,
@@ -54,10 +57,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.518553,
'szel_koord' => 19.044224,
'utvonal' => 'https://maps.app.goo.gl/V8azExcDm1weqrBU6',
'felhasznalo_id' => 1
],
[
'nev' => 'Városligeti Nyilvános Mosdó',
'kerulet' => 'XIV. kerület',
'kerulet_id' => 14,
'kozeli_megall' => 'Városliget (70-es troli, 75-ös troli, 79-es troli)',
'akadalym' => true,
'ar' => 200,
@@ -65,10 +69,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.51098933275473,
'szel_koord' => 19.086019177929227,
'utvonal' => 'https://maps.app.goo.gl/yMVYSfZqQ9U7ZHLTA',
'felhasznalo_id' => 1
],
[
'nev' => 'Széll Kálmán téri Nyilvános Mosdó',
'kerulet' => 'II. kerület',
'kerulet_id' => 2,
'kozeli_megall' => 'Széll Kálmán tér (M2-es metró, 4-es villamos, 6-os villamos, 17-es villamos, 56-os villamos, 59-es villamos, 61-es villamos)',
'akadalym' => true,
'ar' => 250,
@@ -76,10 +81,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.50740741462604,
'szel_koord' => 19.024610790375228,
'utvonal' => 'https://maps.app.goo.gl/Mjip13V5G4BN8rPj6',
'felhasznalo_id' => 1
],
[
'nev' => 'Blaha Lujza téri Nyilvános Mosdó',
'kerulet' => 'VIII. kerület',
'kerulet_id' => 8,
'kozeli_megall' => 'Blaha Lujza tér (M2-es metró, 4-es villamos, 6-os villamos)',
'akadalym' => true,
'ar' => 200,
@@ -87,10 +93,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.496403892547505,
'szel_koord' => 19.068833611658484,
'utvonal' => 'https://maps.app.goo.gl/GuoNNjJjXcRW3914A',
'felhasznalo_id' => 1
],
[
'nev' => 'Astoria Nyilvános Mosdó',
'kerulet' => 'V. kerület',
'kerulet_id' => 5,
'kozeli_megall' => 'Astoria (M2-es metró, 7-es busz, 8E busz, 112-es busz)',
'akadalym' => true,
'ar' => 250,
@@ -98,10 +105,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.494151232460275,
'szel_koord' => 19.05985662145968,
'utvonal' => 'https://maps.app.goo.gl/TW2ZwH7YiMpMMzSb7',
'felhasznalo_id' => 1
],
[
'nev' => 'Kálvin téri Nyilvános Mosdó',
'kerulet' => 'IX. kerület',
'kerulet_id' => 9,
'kozeli_megall' => 'Kálvin tér (M3-as metró, M4-es metró, 47-es villamos, 48-as villamos, 49-es villamos)',
'akadalym' => true,
'ar' => 200,
@@ -109,10 +117,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.48960659445002,
'szel_koord' => 19.061634424103033,
'utvonal' => 'https://maps.app.goo.gl/TXY9EZdqfG2tXMru6',
'felhasznalo_id' => 1
],
[
'nev' => 'Fővám téri Nyilvános Mosdó',
'kerulet' => 'IX. kerület',
'kerulet_id' => 9,
'kozeli_megall' => 'Fővám tér (M4-es metró, 47-es villamos, 48-as villamos, 49-es villamos)',
'akadalym' => true,
'ar' => 250,
@@ -120,10 +129,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.4861911566426,
'szel_koord' => 19.059586662994935,
'utvonal' => 'https://maps.app.goo.gl/WH3fCiWs8vnckFRz6',
'felhasznalo_id' => 1
],
[
'nev' => 'Deák Ferenc téri Nyilvános Mosdó',
'kerulet' => 'V. kerület',
'kerulet_id' => 5,
'kozeli_megall' => 'Deák Ferenc tér (M1-es metró, M2-es metró, M3-as metró, 47-es villamos, 48-as villamos, 49-es villamos)',
'akadalym' => true,
'ar' => 200,
@@ -131,10 +141,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.498069146347675,
'szel_koord' => 19.053907077736074,
'utvonal' => 'https://maps.app.goo.gl/aGpFrnKszDEFeYdt7',
'felhasznalo_id' => 1
],
[
'nev' => 'Ferenciek tere Nyilvános Mosdó',
'kerulet' => 'V. kerület',
'kerulet_id' => 5,
'kozeli_megall' => 'Ferenciek tere (M3-as metró, 7-es busz, 8E busz, 112-es busz)',
'akadalym' => true,
'ar' => 250,
@@ -142,10 +153,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.4931164079512,
'szel_koord' => 19.055890504323266,
'utvonal' => 'https://maps.app.goo.gl/6PfPvTVxSipzBhuZ7',
'felhasznalo_id' => 1
],
[
'nev' => 'Kossuth Lajos téri Nyilvános Mosdó',
'kerulet' => 'V. kerület',
'kerulet_id' => 5,
'kozeli_megall' => 'Kossuth Lajos tér (M2-es metró, 2-es villamos)',
'akadalym' => true,
'ar' => 200,
@@ -153,10 +165,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.505472668809034,
'szel_koord' => 19.046749164211178,
'utvonal' => 'https://maps.app.goo.gl/EKAQR7uj5LVsZy4x5',
'felhasznalo_id' => 1
],
[
'nev' => 'Batthyány téri Nyilvános Mosdó',
'kerulet' => 'I. kerület',
'kerulet_id' => 5,
'kozeli_megall' => 'Batthyány tér (M2-es metró, 19-es villamos, 41-es villamos)',
'akadalym' => true,
'ar' => 250,
@@ -164,10 +177,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.50660730946977,
'szel_koord' => 19.039155411436823,
'utvonal' => 'https://maps.app.goo.gl/t8hinEkANUqhMWRw5',
'felhasznalo_id' => 1
],
[
'nev' => 'Móricz Zsigmond körtéri Nyilvános Mosdó',
'kerulet' => 'XI. kerület',
'kerulet_id' => 9,
'kozeli_megall' => 'Móricz Zsigmond körtér (M4-es metró, 6-os villamos, 7-es busz, 19-es villamos, 41-es villamos, 47-es villamos, 49-es villamos)',
'akadalym' => true,
'ar' => 200,
@@ -175,10 +189,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.477323272765794,
'szel_koord' => 19.047051394186987,
'utvonal' => 'https://maps.app.goo.gl/fd7wdgKJ9s5nC7pVA',
'felhasznalo_id' => 1
],
[
'nev' => 'Oktogon Nyilvános Mosdó',
'kerulet' => 'VI. kerület',
'kerulet_id' => 6,
'kozeli_megall' => 'Oktogon (M1-es metró, 4-es villamos, 6-os villamos)',
'akadalym' => true,
'ar' => 200,
@@ -186,10 +201,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.505250575621616,
'szel_koord' => 19.061415791523817,
'utvonal' => 'https://maps.app.goo.gl/HeNeMXcNwu2ZPzKH8',
'felhasznalo_id' => 1
],
[
'nev' => 'Hősök tere Nyilvános Mosdó',
'kerulet' => 'XIV. kerület',
'kerulet_id' => 14,
'kozeli_megall' => 'Hősök tere (M1-es metró, 75-ös troli, 79-es troli)',
'akadalym' => true,
'ar' => 250,
@@ -197,10 +213,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.51373662991904,
'szel_koord' => 19.080080605229554,
'utvonal' => 'https://maps.app.goo.gl/LbgvLsMUJSdDE7Sq9',
'felhasznalo_id' => 1
],
[
'nev' => 'Népliget Nyilvános Mosdó',
'kerulet' => 'X. kerület',
'kerulet_id' => 10,
'kozeli_megall' => 'Népliget (M3-as metró, 1-es villamos)',
'akadalym' => true,
'ar' => 200,
@@ -208,10 +225,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.47544930399268,
'szel_koord' => 19.09925596186508,
'utvonal' => 'https://maps.app.goo.gl/Qsq5sFJRfqKmB5Er7',
'felhasznalo_id' => 1
],
[
'nev' => 'Kelenföldi Pályaudvar Nyilvános Mosdó',
'kerulet' => 'XI. kerület',
'kerulet_id' => 11,
'kozeli_megall' => 'Kelenföldi Pályaudvar (M4-es metró, 19-es villamos, 49-es villamos)',
'akadalym' => true,
'ar' => 250,
@@ -219,10 +237,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.463951751942105,
'szel_koord' => 19.023199196825974,
'utvonal' => 'https://maps.app.goo.gl/ofKLMzZePzkQDRv97',
'felhasznalo_id' => 1
],
[
'nev' => 'Újpest-Központ Nyilvános Mosdó',
'kerulet' => 'IV. kerület',
'kerulet_id' => 4,
'kozeli_megall' => 'Újpest-Központ (M3-as metró, 12-es villamos, 14-es villamos)',
'akadalym' => true,
'ar' => 200,
@@ -230,10 +249,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.56152337335255,
'szel_koord' => 19.09003531432967,
'utvonal' => 'https://maps.app.goo.gl/j3hEnc35djGJR3tx6',
'felhasznalo_id' => 1
],
[
'nev' => 'Puskás Ferenc Stadion Nyilvános Mosdó',
'kerulet' => 'XIV. kerület',
'kerulet_id' => 14,
'kozeli_megall' => 'Puskás Ferenc Stadion (M2-es metró, 1-es villamos)',
'akadalym' => true,
'ar' => 250,
@@ -241,10 +261,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.50357893256982,
'szel_koord' => 19.10278532843446,
'utvonal' => 'https://maps.app.goo.gl/obJbWh81c7TSnwXC7',
'felhasznalo_id' => 1
],
[
'nev' => 'Köki Terminál Nyilvános Mosdó',
'kerulet' => 'XIX. kerület',
'kerulet_id' => 19,
'kozeli_megall' => 'Köki Terminál (M3-as metró, 200E busz)',
'akadalym' => true,
'ar' => 200,
@@ -252,10 +273,11 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.46277428339623,
'szel_koord' => 19.14711616498906,
'utvonal' => 'https://maps.app.goo.gl/EJvn53JsSUwQNuRo6',
'felhasznalo_id' => 1
],
[
'nev' => 'Bikás park Nyilvános Mosdó',
'kerulet' => 'XI. kerület',
'kerulet_id' => 11,
'kozeli_megall' => 'Bikás park (M4-es metró, 7E busz, 103-as busz)',
'akadalym' => true,
'ar' => 200,
@@ -263,6 +285,7 @@ class wc_adatokFeltoltes extends Seeder
'hossz_koord' => 47.46569504698277,
'szel_koord' => 19.029679418269968,
'utvonal' => 'https://maps.app.goo.gl/WVxmBkv5cVp3z2ZG9',
'felhasznalo_id' => 1
],
];

4
Backend/peepal_backend/database/seeders/felhasznaloFeltoltes.php
View File

@@ -7,14 +7,14 @@ use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
class felhasznaloFeltoltes extends Seeder
class FelhasznaloFeltoltes extends Seeder
{
/**
* Run the database seeds.
*/
public function run(): void
{
DB::table('users_table')->insert([
DB::table('felhasznalok')->insert([
'nev' => 'Magony Sándor',
'email' => 'magonys2006@gmail.com',
'felh_nev' => 'peepal_admin',

35
frontend/peepal_react/src/WC_Komponens/Bejel_Regisz/Bejelentkezes.jsx
View File

@@ -1,39 +1,4 @@
import React, { useState, useEffect } from 'react';
export default function Bejelentkezes() {
const [users, setUsers] = useState([]);
const fetchUsers = async () => {
try {
const response = await fetch('/users', {
method: 'GET',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
// Include the CSRF token for Laravel if your API is protected
'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]')?.getAttribute('content'),
},
credentials: 'include', // Includes cookies in the request
});
console.log(response)
if (!response.ok) {
throw new Error(`HTTP error! Status: ${response.status}`);
}
const data = await response.json();
setUsers(data);
console.log(users)
} catch (err) {
console.log(err)
}
};
useEffect(() => {
fetchUsers();
}, []);
return (
<div className="flex justify-center items-center min-h-screen bg-yellow-100">
<form className="bg-white p-6 rounded-lg shadow-lg w-80 space-y-4">

2
frontend/peepal_react/src/WC_Komponens/Budi_Blokk/Csempe.jsx
View File

@@ -40,7 +40,7 @@ export default function Csempe() {
<div key={index} className="bg-white shadow-lg rounded-xl p-6 border border-gray-200 relative">
<h1 className="text-xl font-semibold text-gray-800 mb-3">{mosdo.nev}</h1>
<div className="text-gray-600 space-y-1">
<p><span className="font-medium text-gray-800">Kerület:</span> {mosdo.kerulet}</p>
<p><span className="font-medium text-gray-800">Kerület:</span> {mosdo.kerulet?.kerulet_nev}</p>
<p><span className="font-medium text-gray-800">Legközelebbi megálló:</span> {mosdo.kozeli_megall}</p>
<p><span className="font-medium text-gray-800">Ár:</span> {mosdo.ar} Ft</p>
<p><span className="font-medium text-gray-800">Nyitvatartás:</span> {mosdo.nyitva}</p>

4
frontend/peepal_react/src/WC_Komponens/Hozzadas/HozzaadForm.jsx
View File

@@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react";
import React, {useState} from "react";
import { useNavigate } from "react-router-dom";
export default function HozzaadForm() {
@@ -26,7 +26,7 @@ export default function HozzaadForm() {
koordinatak: koordinatak
}
fetch("http://localhost:8000/api/hozzaadas", {
fetch("http://192.168.0.78:8000/api/hozzaadas", {
method: "POST",
headers: {
"Content-Type": "application/json"

1
frontend/peepal_react/src/WC_Komponens/Hozzadas/HozzaadGomb.jsx
View File

@@ -1,6 +1,5 @@
import { Plus } from "lucide-react";
import { Link } from "react-router-dom";
import HozzaadForm from "./HozzaadForm";
export default function HozzaadGomb() {
return (

85
frontend/peepal_react/src/WC_Komponens/Kereso/Legkozelebbi.jsx
View File

@@ -1,18 +1,12 @@
import React, { useState, useEffect } from 'react';
import React, { useState } from 'react';
import { TfiWheelchair } from "react-icons/tfi";
import { mosdokFetch } from '../../apiFetch';
// Haversine formula to calculate distance between two coordinates
// Egyszerű koordináta-alapú távolság (nincs konverzió km-re)
const calculateDistance = (lat1, lon1, lat2, lon2) => {
const R = 6371; // Earth's radius in kilometers
const dLat = (lat2 - lat1) * Math.PI / 180;
const dLon = (lon2 - lon1) * Math.PI / 180;
const a =
Math.sin(dLat/2) * Math.sin(dLat/2) +
Math.cos(lat1 * Math.PI / 180) * Math.cos(lat2 * Math.PI / 180) *
Math.sin(dLon/2) * Math.sin(dLon/2);
const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
return R * c; // Distance in kilometers
const dx = lat1 - lat2;
const dy = lon1 - lon2;
return dx * dx + dy * dy; // távolság négyzete (nem baj, hogy nincs gyök alatt)
};
export default function LegkozelebbiMosdo() {
@@ -24,33 +18,27 @@ export default function LegkozelebbiMosdo() {
const findNearestRestroom = async (latitude, longitude) => {
setLoading(true);
try {
// Fetch restrooms from the API
const mosdok = await mosdokFetch();
// Find the nearest restroom
let nearest = null;
let minDistance = Infinity;
mosdok.forEach(mosdo => {
// Use hossz_koord and szel_koord instead of latitude/longitude
if (mosdo.hossz_koord && mosdo.szel_koord) {
const distance = calculateDistance(
latitude,
longitude,
mosdo.szel_koord,
latitude,
longitude,
mosdo.szel_koord,
mosdo.hossz_koord
);
if (distance < minDistance) {
minDistance = distance;
nearest = mosdo;
}
}
});
if (nearest) {
// Add the calculated distance to the nearest restroom object
nearest.distanceKm = minDistance.toFixed(2);
setNearestRestroom(nearest);
} else {
setError("Nem találtunk elérhető mosdót a közelben.");
@@ -70,6 +58,7 @@ export default function LegkozelebbiMosdo() {
(position) => {
const { latitude, longitude } = position.coords;
setUserLocation({ latitude, longitude });
console.log(userLocation);
findNearestRestroom(latitude, longitude);
},
(error) => {
@@ -82,7 +71,6 @@ export default function LegkozelebbiMosdo() {
}
};
// Render loading state
if (loading) {
return (
<div className="flex justify-center items-center h-32">
@@ -91,48 +79,47 @@ export default function LegkozelebbiMosdo() {
);
}
// Render error state
if (error) {
return <div className="text-center text-red-600 p-4">{error}</div>;
}
// Render nearest restroom details
if (nearestRestroom) {
return (
<div className="fixed inset-0 flex justify-center items-center">
<div className="bg-white shadow-lg rounded-xl p-6 border border-gray-200 relative">
<h1 className="text-xl font-semibold text-gray-800 mb-3">Legközelebbi mosdó</h1>
<div className="text-gray-600 space-y-2">
<h2 className="font-medium text-gray-800">{nearestRestroom.nev}</h2>
<p><span className="font-medium text-gray-800">Kerület:</span> {nearestRestroom.kerulet}</p>
<p><span className="font-medium text-gray-800">Legközelebbi megálló:</span> {nearestRestroom.kozeli_megall}</p>
<p><span className="font-medium text-gray-800">Ár:</span> {nearestRestroom.ar} Ft</p>
<p><span className="font-medium text-gray-800">Nyitvatartás:</span> {nearestRestroom.nyitva}</p>
<a
href={nearestRestroom.utvonal}
target="_blank"
rel="noopener noreferrer"
className="font-bold mt-4 inline-block bg-yellow-500 text-white py-2 px-4 rounded-lg shadow-md hover:bg-yellow-600 transition"
>
Útvonalterv
</a>
<div className="bg-white shadow-lg rounded-xl p-6 border border-gray-200 relative">
<h1 className="text-xl font-semibold text-gray-800 mb-3">Legközelebbi mosdó</h1>
<div className="text-gray-600 space-y-2">
<h2 className="font-medium text-gray-800">{nearestRestroom.nev}</h2>
<p><span className="font-medium text-gray-800">Kerület:</span> {nearestRestroom.kerulet?.kerulet_nev ?? 'Ismeretlen'}</p>
<p><span className="font-medium text-gray-800">Legközelebbi megálló:</span> {nearestRestroom.kozeli_megall}</p>
<p><span className="font-medium text-gray-800">Ár:</span> {nearestRestroom.ar} Ft</p>
<p><span className="font-medium text-gray-800">Nyitvatartás:</span> {nearestRestroom.nyitva}</p>
<a
href={nearestRestroom.utvonal}
target="_blank"
rel="noopener noreferrer"
className="font-bold mt-4 inline-block bg-yellow-500 text-white py-2 px-4 rounded-lg shadow-md hover:bg-yellow-600 transition"
>
Útvonalterv
</a>
</div>
{nearestRestroom.akadalym === 1 ? (
<TfiWheelchair className="absolute bottom-10 right-10 w-8 h-8" />
) : null}
</div>
{nearestRestroom.akadalym === 1 ? <TfiWheelchair className="absolute bottom-10 right-10 w-8 h-8"/> : ""}
</div>
</div>
);
}
// Default render (before location permission)
return (
<div className="flex flex-col items-center justify-center h-screen bg-yellow-100">
<div className="bg-white p-6 rounded-lg shadow-lg w-80 space-y-4 text-center">
<h2 className="text-xl font-bold">Helyzetmeghatározás</h2>
<p className="text-gray-700">Engedélyezed a helyzetmeghatározást?</p>
<div className="flex justify-center space-x-4">
<button
<button
onClick={handleLocationPermission}
className="px-5 py-2 bg-green-600 text-white font-bold text-lg rounded-lg shadow-md hover:bg-green-700 transition"
>
@@ -145,4 +132,4 @@ export default function LegkozelebbiMosdo() {
</div>
</div>
);
}
}

2
frontend/peepal_react/src/apiFetch.js
View File

@@ -1,6 +1,6 @@
export async function mosdokFetch() {
try {
const response = await fetch('http://127.0.0.1:8000/api/mosdok');
const response = await fetch('http://192.168.0.78:8000/api/mosdok');
if (!response.ok) {
throw new Error(`Hiba: ${response.status}`);
}