Skip to content
This repository has been archived by the owner on Oct 20, 2024. It is now read-only.

Change metar add vid #121

Merged
merged 2 commits into from
Nov 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Http/Controllers/myOnlineServeurController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}

Expand Down
28 changes: 27 additions & 1 deletion database/changelog.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}

}
8 changes: 5 additions & 3 deletions resources/views/index-base.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> @yield("title") IVATRAC</title>
<meta name="description" content="Find on this site, all metar, platform information, your friends, your flight plans save, then redownload them">
<meta name="description" content="On IVATRAC, your website for all IVAO services. METAR - BOOKINGS - VID - FRIEND - VIEW ONLINE. ">
<meta name="keywords" content="ivao, information, website, unofficial, pirep, fpl, metar, plateform, friend, metar, follows, tracker">
<meta name="author" content="Alexcaussades">
<meta name="robots" content="index, follow">
<meta name="googlebot" content="index, follow">
<meta name="google" content="notranslate">
<meta property="og:title" content="IVATRAC">
<meta property="og:description" content="Find on this site, all metar, platform information, your friends, your flight plans save, then redownload them">
<meta property="og:description" content="On IVATRAC, your website for all IVAO services. METAR - BOOKINGS - VID - FRIEND - VIEW ONLINE.">
<meta property="og:site_name" content="IVATRAC">
<meta property="og:type" content="website">
<meta property="og:locale" content="fr_FR">
Expand All @@ -32,8 +32,10 @@
<meta property="og:locale:alternate" content="en_MC">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:title" content="IVATRAC">
<meta name="twitter:description" content="Find on this site, all metar, platform information, your friends, your flight plans save, then redownload them">
<meta name="twitter:description" content="On IVATRAC, your website for all IVAO services. METAR - BOOKINGS - VID - FRIEND - VIEW ONLINE.">
<meta name="twitter:creator" content="alexcaussades">
<meta name="twitter:site" content="@ivatrac">

<!-- Google Tag Manager -->
<script>
(function(w, d, s, l, i) {
Expand Down
6 changes: 3 additions & 3 deletions resources/views/index-maint.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> @yield("title") IVATRAC</title>
<meta name="description" content="Find on this site, all metar, platform information, your friends, your flight plans save, then redownload them">
<meta name="description" content="On IVATRAC, your website for all IVAO services. METAR - BOOKINGS - VID - FRIEND - VIEW ONLINE.">
<meta name="keywords" content="ivao, information, website, unofficial, pirep, fpl, metar, plateform, friend, metar, follows, tracker">
<meta name="author" content="Alexcaussades">
<meta name="robots" content="index, follow">
<meta name="googlebot" content="index, follow">
<meta name="google" content="notranslate">
<meta property="og:title" content="Alexcaussades - IVATRAC">
<meta property="og:description" content="Find on this site, all metar, platform information, your friends, your flight plans save, then redownload them">
<meta property="og:description" content="On IVATRAC, your website for all IVAO services. METAR - BOOKINGS - VID - FRIEND - VIEW ONLINE.">
<meta property="og:site_name" content="Alexcaussades - IVATRAC">
<meta property="og:type" content="website">
<meta property="og:locale" content="en_EN">
Expand All @@ -31,7 +31,7 @@
<meta property="og:locale:alternate" content="en_MC">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:title" content="Alexcaussades - IVATRAC">
<meta name="twitter:description" content="Find on this site, all metar, platform information, your friends, your flight plans save, then redownload them">
<meta name="twitter:description" content="On IVATRAC, your website for all IVAO services. METAR - BOOKINGS - VID - FRIEND - VIEW ONLINE.">
<meta name="twitter:creator" content="alexcaussades">

<!-- CSS only -->
Expand Down
29 changes: 29 additions & 0 deletions resources/views/metar-base.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,35 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> @yield("title") | IVATRAC</title>
<meta name="description" content="On IVATRAC, your website for all IVAO services. METAR - BOOKINGS - VID - FRIEND - VIEW ONLINE. ">
<meta name="keywords" content="ivao, information, website, unofficial, pirep, fpl, metar, plateform, friend, metar, follows, tracker">
<meta name="author" content="Alexcaussades">
<meta name="robots" content="index, follow">
<meta name="googlebot" content="index, follow">
<meta name="google" content="notranslate">
<meta property="og:title" content="IVATRAC">
<meta property="og:description" content="On IVATRAC, your website for all IVAO services. METAR - BOOKINGS - VID - FRIEND - VIEW ONLINE.">
<meta property="og:site_name" content="IVATRAC">
<meta property="og:type" content="website">
<meta property="og:locale" content="fr_FR">
<meta property="og:locale:alternate" content="en_US">
<meta property="og:locale:alternate" content="fr_FR">
<meta property="og:locale:alternate" content="en_GB">
<meta property="og:locale:alternate" content="fr_BE">
<meta property="og:locale:alternate" content="en_BE">
<meta property="og:locale:alternate" content="fr_LU">
<meta property="og:locale:alternate" content="en_LU">
<meta property="og:locale:alternate" content="fr_CH">
<meta property="og:locale:alternate" content="en_CH">
<meta property="og:locale:alternate" content="fr_CA">
<meta property="og:locale:alternate" content="en_CA">
<meta property="og:locale:alternate" content="fr_MC">
<meta property="og:locale:alternate" content="en_MC">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:title" content="IVATRAC">
<meta name="twitter:description" content="On IVATRAC, your website for all IVAO services. METAR - BOOKINGS - VID - FRIEND - VIEW ONLINE.">
<meta name="twitter:creator" content="alexcaussades">
<meta name="twitter:site" content="@ivatrac">
<!-- CSS only -->
@if (ENV('APP_ENV') == 'local')
<link rel="stylesheet" href="{{ asset("asset/css/bootstrap.min.css") }} " type="text/css">
Expand Down
97 changes: 61 additions & 36 deletions resources/views/metar/icao.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,58 +98,83 @@
{{$taf["taf"] ?? "No TAF"}}
</div>
</div>
<hr class="mt-2">
<h3><span class="material-symbols-outlined">map</span> CHART</h3>
<div class="d-flex justify-content-center">
</div>

<hr class="mt-2">

<div class="row">
<div class="col-4">
<h4 class="text-center">Bookings</h4>
<hr>
<table class="table table-striped table-inverse table-responsive">
<thead class="thead-inverse">
<tr>
<th>Start Time</th>
<th>End Time</th>
<th>Position</th>
<th>VID</th>
</tr>
</thead>
<tbody>
@foreach($bookings as $booking)
<tr>
<td scope="row">{{$booking["Start_time"]}}</td>
<td>{{$booking["End_time"]}}</td>
<td>{{$booking["airport"]}}</td>
<td>{{$booking["user"]["vid"]}}</td>
</tr>
@endforeach
</table>
</div>
<hr class="mt-2">
<h3><span class="material-symbols-outlined">cell_tower</span> IVAO</h3>
<div class="row">
<div class="col-md-4">
@if ($atc["atc_open"]!= null)
@foreach ($atc["atc_open"] as $openatc)
<li class="mt-2"><button class="btn btn-success btn-sm">{{ $openatc["composePosition"] }} - {{ $openatc["frequency"] }} Mhz</button></li>
@endforeach
@endif
<div class="col-8">
<h3 class="text-center"> <span class="material-symbols-outlined text-center">cell_tower</span> IVAO</h3>
<hr>
<div class="row">
<div class="col-8 text-center">
@if ($atc["atc_open"]!= null)
@foreach ($atc["atc_open"] as $openatc)
<li class="mt-2"><button class="btn btn-success btn-sm">{{ $openatc["composePosition"] }} - {{ $openatc["frequency"] }} Mhz</button></li>
@endforeach
@endif
</div>
</div>
<div class="col-md-4">
<div class="card text-white bg-dark mb-3">
<div class="card-header text-center text-warning">
<h4><span class="material-symbols-outlined">flight_takeoff</span> Departure</h4>
</div>
<div class="card-body text-center">
<a href="{{ Route("ivao.plateforme", ["icao" => $metar["station"], false] ) }}"> <button type="submit" class="btn btn-primary align-content-center justify-center no-link">
<h1><strong>{{$pilot["outbound"]}}</strong></h1>
</button></a>
</div>
</div>
<hr class="mt-2">
<div class="col-md-2"></div>
<div class="col-md-4">
<div class="card text-white bg-dark mb-3">
<div class="card-header text-center text-warning">
<h4><span class="material-symbols-outlined">flight_takeoff</span> Departure</h4>
</div>
<div class="card-body text-center">
<a href="{{ Route("ivao.plateforme", ["icao" => $metar["station"], false] ) }}"> <button type="submit" class="btn btn-primary align-content-center justify-center no-link">
<h1><strong>{{$pilot["outbound"]}}</strong></h1>
</button></a>
</div>
</div>
<div class="col-md-4">
<div class="card text-white bg-dark mb-3">
<div class="card-header text-center text-warning">
<h4><span class="material-symbols-outlined">flight_land</span> Arrival</h4>
</div>
<div class="card-body text-center">
<a href="{{ Route("ivao.plateforme", ["icao" => $metar["station"], false] ) }}"> <button type="submit" class="btn btn-primary align-content-center justify-center no-link">
<h1><strong>{{$pilot["inbound"]}}</strong></h1>
</button></a>
</div>
</div>
<div class="col-md-4">
<div class="card text-white bg-dark mb-3">
<div class="card-header text-center text-warning">
<h4><span class="material-symbols-outlined">flight_land</span> Arrival</h4>
</div>
<div class="card-body text-center">
<a href="{{ Route("ivao.plateforme", ["icao" => $metar["station"], false] ) }}"> <button type="submit" class="btn btn-primary align-content-center justify-center no-link">
<h1><strong>{{$pilot["inbound"]}}</strong></h1>
</button></a>
</div>
</div>
</div>
<div class="col-md-2"></div>
</div>
</div>
</div>
</div>

@if (ENV('APP_ENV') == 'local')
<script src="{{ asset("asset/js/update_friend.js") }}"></script>
@else
<script src="{{ asset("public/asset/js/update_friend.js") }}"></script>
@endif

@endsection

@endsection
15 changes: 7 additions & 8 deletions resources/views/metar/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,18 @@
<div class="container">

<div class="row">
<div class="col-12">
<h1>Metar and TAF</h1>
<div class="alert alert-warning" role="alert">
<strong>The information provided by the website is not to be used for flights ! </strong>
</div>
<div class="col-12 mt-2">
<h1>Search on IVAO</h1>

</div>
<div class="container">
<div class="row">
<div class="col-12">
<div class="col-12 mt-2">

<form action="{{ route("metars.icao") }}" method="get">
<div class="form-group">
<label for=""><span class="d-flex align-items-center"><span class="material-symbols-outlined">search</span> Your Search</span></label>
<input type="text" class="form-control" name="icao" placeholder="ICAO / LFBL">
<input type="text" class="form-control" name="icao" placeholder="ICAO / LFBL | VID / 191514">
<button type="submit" class="btn btn-success mt-2"><span class="d-flex align-items-center"><span class="material-symbols-outlined">arrow_forward_ios</span>Search</span></button>
</div>
</div>
Expand All @@ -33,7 +31,8 @@
</div>
</div>
<hr>
<div class="col-6">
<h3 class="mt-2">Weather map </h3>
<div class="col-6 mt-2">
<div class="card text-white bg-dark" style="max-width: 520px;">
@if (ENV('APP_ENV') == 'local')
<img class="card-img-top" src="{{ asset("asset/img/webiste/temsi.png") }}" alt="">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/myoline/atc.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<th>State</th>
<th>Route</th>
<th>FlightRules</th>
<th>TO</th>
<th>IN</th>
</tr>
</thead>
<tbody>
Expand All @@ -144,7 +144,7 @@
<td class="text-white">{{ $PilotData["lastTrack"]["state"] ?? NULL }}</td>
<td class="text-white">{{ $PilotData["flightPlan"]["route"] ?? NULL }}</td>
<td class="text-white">{{ $PilotData["flightPlan"]["flightRules"] ?? NULL }}</td>
<td class="text-white">{{ $PilotData["flightPlan"]["arrivalId"] ?? NULL }}</td>
<td class="text-white">{{ $PilotData["flightPlan"]["departureId"] ?? NULL }}</td>
</tr>

@endforeach
Expand Down
32 changes: 32 additions & 0 deletions resources/views/myoline/no_online.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
@extends("metar-base")

@section("title", "No Online")


@include("navbar")

@section('content')



<div>
<div class="container">
<h1 class="mt-10 text-center"> The user is currently offline! </h1>

<h4 class="mt-2"> New Search </h4>
<form action="{{ route("metars.icao") }}" method="get">
<div class="form-group">
<label for=""><span class="d-flex align-items-center"><span class="material-symbols-outlined">search</span> Your Search</span></label>
<input type="text" class="form-control" name="icao" placeholder="ICAO / LFBL | VID / 191514">
<button type="submit" class="btn btn-success mt-2"><span class="d-flex align-items-center"><span class="material-symbols-outlined">arrow_forward_ios</span>Search</span></button>
</div>
</form>
</div>
</div>


@if (ENV('APP_ENV') == 'local')
<script src="{{ asset("asset/js/update_friend.js") }}"></script>
@else
<script src="{{ asset("public/asset/js/update_friend.js") }}"></script>
@endif
4 changes: 2 additions & 2 deletions resources/views/navbar-metar.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<a class="nav-link active" aria-current="page" href={{ Route("home") }}>Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ Route("metars.index") }}">Metar</a>
<a class="nav-link" href="{{ Route("metars.index") }}">Metar / VID</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ Route("pirep.index") }}">FPL</a>
Expand Down Expand Up @@ -46,7 +46,7 @@
</ul>

<form class="d-flex" role="search" action="{{ route("metars.icao") }}" method="get">
<input class="form-control me-2" type="search" name="icao" placeholder="New Request ICAO " aria-label="Search">
<input class="form-control me-2" type="search" name="icao" placeholder="Request ICAO or VID " aria-label="Search">
<button class="btn btn-outline-success" type="submit">Search</button>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/navbar.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<a class="nav-link active" aria-current="page" href={{ Route("home") }}>Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ Route("metars.index") }}">Metar</a>
<a class="nav-link" href="{{ Route("metars.index") }}">Metar / VID</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ Route("pirep.index") }}">FPL</a>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/welcome.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<div class="col-6">
<div class="card text-white bg-dark">
<div class="card-body bg-dark border-dark text-white text-opacity-75">
<h4 class="card-title text-center text-info">Metar</h4>
<p class="card-text d-flex align-items-center"><span class="material-symbols-outlined ms-2">air</span> <span class="ms-2"> Search the metar at the plateform </span></p>
<p class="card-footer text-center"><a href="{{ Route("metars.index")}}" class="btn btn-success">Search Metar</a></p>
<h4 class="card-title text-center text-info">Request</h4>
<p class="card-text d-flex align-items-center"><span class="material-symbols-outlined ms-2">air</span> <span class="ms-2"> Search for metars or users </span></p>
<p class="card-footer text-center"><a href="{{ Route("metars.index")}}" class="btn btn-success">Search IVAO</a></p>
</div>
</div>
</div>
Expand Down
Loading
Loading