From f5a1a83e0466c9ebbd03f961be44c63a69ee0b8a Mon Sep 17 00:00:00 2001 From: alexcaussades Date: Sat, 4 Nov 2023 11:08:34 +0100 Subject: [PATCH] Change metar add vid (#121) * Feacture * testing --- .../Controllers/myOnlineServeurController.php | 2 +- database/changelog.json | 28 +++++- resources/views/index-base.blade.php | 8 +- resources/views/index-maint.blade.php | 6 +- resources/views/metar-base.blade.php | 29 ++++++ resources/views/metar/icao.blade.php | 97 ++++++++++++------- resources/views/metar/index.blade.php | 15 ++- resources/views/myoline/atc.blade.php | 4 +- resources/views/myoline/no_online.blade.php | 32 ++++++ resources/views/navbar-metar.blade.php | 4 +- resources/views/navbar.blade.php | 2 +- resources/views/welcome.blade.php | 6 +- routes/web.php | 11 ++- 13 files changed, 182 insertions(+), 62 deletions(-) create mode 100644 resources/views/myoline/no_online.blade.php diff --git a/app/Http/Controllers/myOnlineServeurController.php b/app/Http/Controllers/myOnlineServeurController.php index 799ac63..ac79209 100644 --- a/app/Http/Controllers/myOnlineServeurController.php +++ b/app/Http/Controllers/myOnlineServeurController.php @@ -231,7 +231,7 @@ public function getVerrifOnlineServeur() return view("myoline.pilot", ["pilot" => $p, "atc" => $atc, "chart" => $chart, "metar" => $metar]); } else { - return redirect()->route("home"); + return view("myoline.no_online"); } } diff --git a/database/changelog.json b/database/changelog.json index 0521c49..a6c8327 100644 --- a/database/changelog.json +++ b/database/changelog.json @@ -177,6 +177,32 @@ "description": "Modification API IVAO" } ] + }, + "7": + { + "id": 8, + "name": "2023 / 33", + "date": "2023-11-02", + "version": "26.2.4", + "option":[ + { + "id": 0, + "type": "Change", + "btn": "warning", + "description": "Modification wellcome page" + }, + { + "id": 1, + "type": "Change", + "btn": "warning", + "description": "Modification search page (add search by VID)" + }, + { + "id": 2, + "type": "Feacture", + "btn": "success", + "description": "Add Page users offline" + } + ] } - } diff --git a/resources/views/index-base.blade.php b/resources/views/index-base.blade.php index 0ac0685..4f161d0 100644 --- a/resources/views/index-base.blade.php +++ b/resources/views/index-base.blade.php @@ -6,14 +6,14 @@ @yield("title") IVATRAC - + - + @@ -32,8 +32,10 @@ - + + + @@ -151,5 +177,4 @@ @endif -@endsection - +@endsection \ No newline at end of file diff --git a/resources/views/metar/index.blade.php b/resources/views/metar/index.blade.php index b0be1c2..28e53d3 100644 --- a/resources/views/metar/index.blade.php +++ b/resources/views/metar/index.blade.php @@ -11,20 +11,18 @@
-
-

Metar and TAF

- +
+

Search on IVAO

+
-
+
- +
@@ -33,7 +31,8 @@
-
+

Weather map

+
@if (ENV('APP_ENV') == 'local') diff --git a/resources/views/myoline/atc.blade.php b/resources/views/myoline/atc.blade.php index 908a8ce..3005116 100644 --- a/resources/views/myoline/atc.blade.php +++ b/resources/views/myoline/atc.blade.php @@ -133,7 +133,7 @@ State Route FlightRules - TO + IN @@ -144,7 +144,7 @@ {{ $PilotData["lastTrack"]["state"] ?? NULL }} {{ $PilotData["flightPlan"]["route"] ?? NULL }} {{ $PilotData["flightPlan"]["flightRules"] ?? NULL }} - {{ $PilotData["flightPlan"]["arrivalId"] ?? NULL }} + {{ $PilotData["flightPlan"]["departureId"] ?? NULL }} @endforeach diff --git a/resources/views/myoline/no_online.blade.php b/resources/views/myoline/no_online.blade.php new file mode 100644 index 0000000..744b9d2 --- /dev/null +++ b/resources/views/myoline/no_online.blade.php @@ -0,0 +1,32 @@ +@extends("metar-base") + +@section("title", "No Online") + + +@include("navbar") + +@section('content') + + + +
+
+

The user is currently offline!

+ +

New Search

+ +
+ + + +
+ +
+
+ + +@if (ENV('APP_ENV') == 'local') + +@else + +@endif \ No newline at end of file diff --git a/resources/views/navbar-metar.blade.php b/resources/views/navbar-metar.blade.php index ee9b7c7..12b31a6 100644 --- a/resources/views/navbar-metar.blade.php +++ b/resources/views/navbar-metar.blade.php @@ -10,7 +10,7 @@ Home
  • - Metar + Metar / VID
  • FPL @@ -46,7 +46,7 @@
    • diff --git a/resources/views/navbar.blade.php b/resources/views/navbar.blade.php index f7aa1d8..21a056f 100644 --- a/resources/views/navbar.blade.php +++ b/resources/views/navbar.blade.php @@ -11,7 +11,7 @@ Home
  • - Metar + Metar / VID
  • FPL diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 7e49476..428ea90 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -22,9 +22,9 @@
    -

    Metar

    -

    air Search the metar at the plateform

    -

    Search Metar

    +

    Request

    +

    air Search for metars or users

    +

    Search IVAO

    diff --git a/routes/web.php b/routes/web.php index 78abc53..3bec35f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -300,6 +300,12 @@ $request->merge([ "icao" => $request->icao ]); + + $regex_for_vid = "/^[0-9]{1,6}$/"; + if (preg_match($regex_for_vid, $request->icao)) { + return redirect()->route("vid", ["vid" => $request->icao]); + } + $request->validate([ "icao" => "required|size:4" ]); @@ -307,15 +313,16 @@ $metarController = new metarController(); $wazzup = new whazzupController(); $metar = $metarController->metar($icao); + $bookings = $wazzup->get_bookings_for_event($icao); $taf = $metarController->taf($icao); $ATC = $wazzup->ckeck_online_atc($icao); $pilot = $wazzup->get_traffics_count($icao); if ($metar == NULL || $taf == NULL || $ATC == NULL || $pilot == NULL) { - return view("metar.reload", ["icao" => $icao]); + return view("vid", ["icao" => $icao]); } - return view("metar.icao", ["metar" => $metar, "taf" => $taf, "atc" => $ATC, "pilot" => $pilot]); + return view("metar.icao", ["metar" => $metar, "taf" => $taf, "atc" => $ATC, "pilot" => $pilot, "bookings" => $bookings, "icao" => $icao]); })->name("metars.icao"); Route::get("/{icao}", function () {