mirror of
https://github.com/uw935/vatsimfox.git
synced 2026-09-17 05:59:04 +00:00
map style changed && viewer change
This commit is contained in:
uw935
@@ -37,6 +37,7 @@ python -m venv venv
|
||||
# downloading requirements && upgrading pip
|
||||
python -m pip install --upgrade pip
|
||||
python -m pip install -r requirements.txt
|
||||
python -m flask run --host 0.0.0.0 --debug
|
||||
```
|
||||
|
||||
## Feature
|
||||
|
||||
@@ -19,7 +19,10 @@ def errorhandler_page(_):
|
||||
@app.route("/api/request")
|
||||
def request_handler():
|
||||
if request_string := request.args.get("request_string"):
|
||||
try:
|
||||
return requests.get(f"{VATSIM_API_URL}{request_string}").json()
|
||||
except requests.exceptions.JSONDecodeError:
|
||||
return jsonify({"result": "not found"})
|
||||
|
||||
return jsonify({"result": "not found"})
|
||||
|
||||
|
||||
@@ -6,3 +6,8 @@
|
||||
.fox_active, .fox_atc_active {
|
||||
background-color: #dee2e6 !important;
|
||||
}
|
||||
|
||||
#fox_map {
|
||||
width: 100%;
|
||||
height: 500px;
|
||||
}
|
||||
|
||||
+58
-59
@@ -1,85 +1,84 @@
|
||||
// Fetching user's ATC session informations from API
|
||||
let userSession = {};
|
||||
// // Fetching user's ATC session informations from API
|
||||
// let userSession = {};
|
||||
|
||||
fetch(ATC_API_URL, {}).then(response => response.json()).then(result => {
|
||||
if (result && result["result"] == "not found")
|
||||
return
|
||||
// fetch(ATC_API_URL, {}).then(response => response.json()).then(result => {
|
||||
// if (result && result["result"] == "not found")
|
||||
// return
|
||||
|
||||
for (let session of result["items"]) {
|
||||
// Separate each session by it's connection ID
|
||||
let session_id = session["connection_id"]["id"];
|
||||
userSession[session_id] = session;
|
||||
// for (let session of result["items"]) {
|
||||
// // Separate each session by it's connection ID
|
||||
// let session_id = session["connection_id"]["id"];
|
||||
// userSession[session_id] = session;
|
||||
|
||||
// Long line. Not in the whole file, but still bad
|
||||
// Open to any suggestions about fix it
|
||||
let sessionElement = "<div id='" + session_id + "' class='fox_button fox_atc mb-2 p-2 text-center text-bg-white border border-1 rounded-3'>" + session["connection_id"]["callsign"] + "</div>";
|
||||
$("#fox_atc").append(sessionElement);
|
||||
}
|
||||
// // Long line. Not in the whole file, but still bad
|
||||
// // Open to any suggestions about fix it
|
||||
// let sessionElement = "<div id='" + session_id + "' class='fox_button fox_atc mb-2 p-2 text-center text-bg-white border border-1 rounded-3'>" + session["connection_id"]["callsign"] + "</div>";
|
||||
// $("#fox_atc").append(sessionElement);
|
||||
// }
|
||||
|
||||
// Click event handler to left menu button
|
||||
$(".fox_atc").click(function() {
|
||||
if ($(this).hasClass("fox_atc_active")) return;
|
||||
// // Click event handler to left menu button
|
||||
// $(".fox_atc").click(function() {
|
||||
// if ($(this).hasClass("fox_atc_active")) return;
|
||||
|
||||
$(".fox_atc_active").removeClass("fox_atc_active");
|
||||
$(this).addClass("fox_atc_active");
|
||||
// $(".fox_atc_active").removeClass("fox_atc_active");
|
||||
// $(this).addClass("fox_atc_active");
|
||||
|
||||
showSession(userSession[$(this).attr("id")]);
|
||||
});
|
||||
// showSession(userSession[$(this).attr("id")]);
|
||||
// });
|
||||
|
||||
showSession(result["items"][0]);
|
||||
});
|
||||
// showSession(result["items"][0]);
|
||||
// });
|
||||
|
||||
// Fetching user's flightplans from VATSIM API
|
||||
let userFlightplans = {};
|
||||
// // Fetching user's flightplans from VATSIM API
|
||||
// let userFlightplans = {};
|
||||
|
||||
fetch(FLIGHTPLANS_API_URL, {}).then(response => response.json()).then(result => {
|
||||
if (result && result["result"] == "not found")
|
||||
return
|
||||
// fetch(FLIGHTPLANS_API_URL, {}).then(response => response.json()).then(result => {
|
||||
// if (result && result["result"] == "not found")
|
||||
// return
|
||||
|
||||
for (let flightplan of result) {
|
||||
// Separate each flight by it's connection ID
|
||||
// Like it was with ATC session's
|
||||
let flightplan_id = flightplan["id"]
|
||||
userFlightplans[flightplan_id] = flightplan;
|
||||
userFlightplans[flightplan_id]["not_filed"] = flightplan["connection_id"] === 0
|
||||
// for (let flightplan of result) {
|
||||
// // Separate each flight by it's connection ID
|
||||
// // Like it was with ATC session's
|
||||
// let flightplan_id = flightplan["id"]
|
||||
// userFlightplans[flightplan_id] = flightplan;
|
||||
// userFlightplans[flightplan_id]["not_filed"] = flightplan["connection_id"] === 0
|
||||
|
||||
// Long line again
|
||||
let flightplanElement = "<div id="+ flightplan_id +" class='fox_button mb-2 p-2 text-center text-bg-white border border-1 rounded-3'>" + flightplan["callsign"] + "</div>";
|
||||
$("#fox_flightplans").append(flightplanElement);
|
||||
}
|
||||
// // Long line again
|
||||
// let flightplanElement = "<div id="+ flightplan_id +" class='fox_button mb-2 p-2 text-center text-bg-white border border-1 rounded-3'>" + flightplan["callsign"] + "</div>";
|
||||
// $("#fox_flightplans").append(flightplanElement);
|
||||
// }
|
||||
|
||||
$(".fox_button").click(function() {
|
||||
if ($(this).hasClass("fox_active")) return;
|
||||
// $(".fox_button").click(function() {
|
||||
// if ($(this).hasClass("fox_active")) return;
|
||||
|
||||
$(".fox_active").removeClass("fox_active");
|
||||
$(this).addClass("fox_active");
|
||||
// $(".fox_active").removeClass("fox_active");
|
||||
// $(this).addClass("fox_active");
|
||||
|
||||
showFlight(userFlightplans[$(this).attr("id")]);
|
||||
});
|
||||
// showFlight(userFlightplans[$(this).attr("id")]);
|
||||
// });
|
||||
|
||||
showFlight(result[0]);
|
||||
});
|
||||
// showFlight(result[0]);
|
||||
// });
|
||||
|
||||
// Fetching airports information
|
||||
// Get it from localhost
|
||||
// Becase I think it would be much faster than getting it from VATSIM API
|
||||
let airports = {};
|
||||
// // Fetching airports information
|
||||
// // Get it from localhost
|
||||
// // Becase I think it would be much faster than getting it from VATSIM API
|
||||
// let airports = {};
|
||||
|
||||
$.getJSON("/static/data/airports.json", function(json) {
|
||||
airports = json;
|
||||
}
|
||||
);
|
||||
// $.getJSON("/static/data/airports.json", function(json) {
|
||||
// airports = json;
|
||||
// }
|
||||
// );
|
||||
|
||||
// Map creation
|
||||
const MAP_ELEMENT = L.map("fox_map");
|
||||
const MAP_DEFAULT_TARGET = L.latLng("47.50737", "19.04611");
|
||||
const MAP_DEFAULT_ZOOM_VIEW = 14;
|
||||
const MAP_DEFAULT_TARGET = L.latLng("0", "0");
|
||||
const MAP_DEFAULT_ZOOM_VIEW = 2;
|
||||
let line = null;
|
||||
|
||||
MAP_ELEMENT.setView(MAP_DEFAULT_TARGET, MAP_DEFAULT_ZOOM_VIEW);
|
||||
|
||||
L.tileLayer("http://{s}.tile.osm.org/{z}/{x}/{y}.png", {
|
||||
attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a> contributors',
|
||||
L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png", {
|
||||
attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a> contributors | VATSIM Fox by <a href="https://uw935.t.me/" style="text-decoration: underline; cursor: pointer;">uw935</a> (1606255)',
|
||||
subdomains: "abcd",
|
||||
maxZoom: 20,
|
||||
minZoom: 2
|
||||
|
||||
@@ -10,19 +10,30 @@
|
||||
<meta content="yes" name="apple-touch-fullscreen" />
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="#FA8232">
|
||||
<meta name="format-detection" content="telephone=no">
|
||||
<meta name="viewport" content="width = 320, initial-scale = 2.3, user-scalable = no">
|
||||
<link rel="icon" href="{{ url_for('static', filename='icon.ico') }}" type="image/x-icon">
|
||||
<title>{% block title %}{% endblock %}</title>
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
|
||||
{% block header_css %}{% endblock %}
|
||||
</head>
|
||||
<style>
|
||||
.btn-outline-primary:hover, .btn-outline-primary:active {
|
||||
color: white !important;
|
||||
background-color: var(--main-rgb) !important;
|
||||
border-color: var(--main-rgb) !important;
|
||||
}
|
||||
|
||||
.btn-outline-primary {
|
||||
border-color: var(--main-rgb);
|
||||
color: var(--main-rgb);
|
||||
}
|
||||
|
||||
:root {
|
||||
--bs-primary-rgb: 250, 130, 50
|
||||
--main-rgb: #FA8232;
|
||||
--bs-primary-rgb: 250, 130, 50;
|
||||
}
|
||||
</style>
|
||||
<body>
|
||||
{% block above_content %}{% endblock %}
|
||||
<main>
|
||||
<div class="container py-4">
|
||||
<header class="pb-3 mb-4 border-bottom">
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<p class="col-md-8 fs-4">See your detailed profile statistic</p>
|
||||
<div class="d-flex" role="search">
|
||||
<input class="fox_input form-control me-2" type="number" placeholder="100000" aria-label="CID">
|
||||
<button class="fox_submit btn btn-outline-success" type="submit">Search</button>
|
||||
<button class="fox_submit btn btn-outline-primary" type="submit">Search</button>
|
||||
</div>
|
||||
<p class="fox_message text-primary col-md-8 fs-4"></p>
|
||||
</div>
|
||||
|
||||
+48
-137
@@ -1,143 +1,54 @@
|
||||
{% extends "/include/template.html" %}
|
||||
{% block title %}User {{user_cid}} statistic — VATSIM Fox{% endblock %}
|
||||
{% block header_css %}
|
||||
<link rel="stylesheet" href="{{ url_for('static', filename='viewer.css') }}">
|
||||
<link href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css" rel="stylesheet"/>
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<div class="mb-5">
|
||||
<h2 class="text-center text-primary mb-4">{{data[0]["id"]}}</h2>
|
||||
<p class="fs-4 text-secondary">Date of registration: <span class="date_registration"></span></p>
|
||||
</div>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="author" content="uw935">
|
||||
<meta name="description" content="Check detailed stastic of VATSIM user {{data[0]['id']}}">
|
||||
<meta name="keywords" content="VATSIM FOX, vatsim id, {{data[0]['id']}}, fox, vatsim, vatsim statistic, statistic, vatsim fox, flight simulator">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta content="yes" name="apple-touch-fullscreen" />
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="#FA8232">
|
||||
<meta name="format-detection" content="telephone=no">
|
||||
<link rel="icon" href="{{ url_for('static', filename='icon.ico') }}" type="image/x-icon">
|
||||
<title>User {{data[0]["id"]}} statistic — VATSIM Fox</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="{{ url_for('static', filename='viewer.css') }}">
|
||||
<link href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css" rel="stylesheet"/>
|
||||
</head>
|
||||
<style>
|
||||
.btn-outline-primary:hover {
|
||||
color: white;
|
||||
background-color: var(--main-rgb);
|
||||
border-color: var(--main-rgb);
|
||||
}
|
||||
|
||||
<div class="mb-4 row align-items-md-stretch">
|
||||
<h3 class="mb-3">Last 50 flightplans</h3>
|
||||
<div id="fox_flightplans" class="mb-4 col-md-3"></div>
|
||||
.btn-outline-primary {
|
||||
border-color: var(--main-rgb);
|
||||
color: var(--main-rgb);
|
||||
}
|
||||
|
||||
<div class="col-md" style="height: 500px; overflow-y: scroll;">
|
||||
<div id="fox_map" class="mb-4 h-50 bg-dark rounded-3"></div>
|
||||
<div class="h-auto p-5 bg-light border rounded-3">
|
||||
<h2><span class="fp_callsign">Flight</span> — from <span class="fp_depa_city"></span> to <span class="fp_arra_city"></span></h2>
|
||||
<span>
|
||||
<b class="fp_is_filed"></b>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Aircraft type:</b>
|
||||
<span class="fp_aicraft"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Enroute time:</b>
|
||||
<span class="fp_entime"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Departure airport:</b>
|
||||
<span class="fp_depa"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Arrival airport:</b>
|
||||
<span class="fp_arra"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Alternative airport:</b>
|
||||
<span class="fp_altna"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Flight type:</b>
|
||||
<span class="fp_type"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Cruise speed:</b>
|
||||
<span class="fp_speed"></span> knots
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Flight altitude:</b>
|
||||
<span class="fp_alt"></span> feet
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Route:</b>
|
||||
<span class="fp_route"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Remarks:</b>
|
||||
<span class="fp_remarks"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Squawk:</b>
|
||||
<span class="fp_squawk"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Fligthplan filed at:</b>
|
||||
<span class="fp_filed"></span>
|
||||
</span>
|
||||
<br>
|
||||
:root {
|
||||
--main-rgb: #FA8232;
|
||||
--bs-primary-rgb: 250, 130, 50;
|
||||
}
|
||||
</style>
|
||||
<body>
|
||||
<main>
|
||||
<div class="container py-4">
|
||||
<header class="">
|
||||
<a href="/" class="d-flex align-items-center text-dark text-decoration-none">
|
||||
<span class="fs-4">🦊 VATSIM <span class="text-primary">Fox</span></span>
|
||||
</a>
|
||||
</header>
|
||||
</div>
|
||||
</main>
|
||||
<div id="fox_map">
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-4 row align-items-md-stretch">
|
||||
<h3 class="mb-3">Last 100 ATC shifts</h3>
|
||||
<div id="fox_atc" class="mb-4 col-md-3"></div>
|
||||
|
||||
<div class="col-md" style="height: 321px;">
|
||||
<div class="h-auto p-5 bg-light border rounded-3">
|
||||
<h2 class="atc_callsign">UUEE_DEL</h2>
|
||||
<span>
|
||||
<b>Start time:</b>
|
||||
<span class="atc_start_time"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>End time:</b>
|
||||
<span class="atc_end_time"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Aircraft tracked:</b>
|
||||
<span class="atc_trackedair"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Aircraft seen:</b>
|
||||
<span class="atc_seenair"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Squawk assigned:</b>
|
||||
<span class="atc_squawks"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Aircraft's transferred:</b>
|
||||
<span class="atc_transfers"></span>
|
||||
</span>
|
||||
<br>
|
||||
<span>
|
||||
<b>Aircraft's received:</b>
|
||||
<span class="atc_received"></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block javascript_code %}
|
||||
<script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"></script>
|
||||
<script type="text/javascript">
|
||||
const USER_CID = '{{data[0]["id"]}}';
|
||||
const FLIGHTPLANS_API_URL = "/api/request?request_string=members/" + USER_CID + "/flightplans";
|
||||
const ATC_API_URL = "/api/request?request_string=members/" + USER_CID + "/atc";
|
||||
|
||||
$(".date_registration").text("{{data[0]['reg_date']}}".replace("T", " "));
|
||||
</script>
|
||||
<script type="text/javascript" src="{{ url_for('static', filename='viewer.js') }}"></script>
|
||||
{% endblock %}
|
||||
<script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
|
||||
<script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"></script>
|
||||
<script type="text/javascript" src="{{ url_for('static', filename='viewer.js') }}"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user