conflicts from master resolved && map display finnaly fixed

New borders

README.md

@@ -1,7 +1,7 @@
 <br>
 <p align="center">
     <img align="center" src="media/cover.png">
-    <h3 align="center">VATSIM Fox</h3>
+    <h3 align="center">VATSIM Fox — v1.2</h3>
     <p align="center">Website to find out your detailed VATSIM stastic</p>
 </p>
 <br>
@@ -14,7 +14,7 @@ Project based on [Virtual Air Traffic Simulation Network (VATSIM) API](https://v
 Written in Python 3.8.18 + JS (JQuery framework) + Boostrap
 
 ## Startup
-For run application on your own machine, you must install docker. Then just one command in the "src" folder with the project source code:
+To run application on your own machine, you must install docker. Then just one command in the "src" folder with the project source code:
 
 ```bash
 docker compose up
@@ -37,6 +37,8 @@ python -m venv venv
 # downloading requirements && upgrading pip
 python -m pip install --upgrade pip
 python -m pip install -r requirements.txt
+# starting application
+python -m flask run --host 0.0.0.0 --debug
 ```
 
 ## Feature

src/app.py

@@ -19,9 +19,12 @@ def errorhandler_page(_):
 @app.route("/api/request")
 def request_handler():
     if request_string := request.args.get("request_string"):
-        return requests.get(f"{VATSIM_API_URL}{request_string}").json()
+        try:
+            return requests.get(f"{VATSIM_API_URL}{request_string}").json()
+        except requests.exceptions.JSONDecodeError:
+            return jsonify({"result": "error", "message": "Something went wrong. Report that error please"})
 
-    return jsonify({"result": "not found"})
+    return jsonify({"result": "not found", "message": "Not found"})
 
 
 @app.route("/<int:cid>/")
@@ -31,7 +34,7 @@ def viewer_page(cid):
     if "detail" in user and user["detail"] == "Not Found":
         return abort(404)
 
-    return render_template("viewer.html", data=(user, ))
+    return render_template("viewer.html", user=user)
 
 
 if __name__ == "__main__":

src/static/viewer.css

@@ -6,3 +6,10 @@
 .fox_active, .fox_atc_active {
     background-color: #dee2e6 !important;
 }
+
+#fox_map {
+    box-sizing: border-box;
+    position: absolute;
+    width: 100%;
+    height: calc(100% - 5rem);
+}

src/static/viewer.js

@@ -1,85 +1,84 @@
-// Fetching user's ATC session informations from API
+// // Fetching user's ATC session informations from API
-let userSession = {};
+// let userSession = {};
 
-fetch(ATC_API_URL, {}).then(response => response.json()).then(result => {
+// fetch(ATC_API_URL, {}).then(response => response.json()).then(result => {
-    if (result && result["result"] == "not found")
+//     if (result && result["result"] == "not found")
-        return
+//         return
 
-    for (let session of result["items"]) {
+//     for (let session of result["items"]) {
-        // Separate each session by it's connection ID
+//         // Separate each session by it's connection ID
-        let session_id = session["connection_id"]["id"];
+//         let session_id = session["connection_id"]["id"];
-        userSession[session_id] = session;
+//         userSession[session_id] = session;
 
-        // Long line. Not in the whole file, but still bad
+//         // Long line. Not in the whole file, but still bad
-        // Open to any suggestions about fix it
+//         // 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>";
+//         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);
+//         $("#fox_atc").append(sessionElement);
-    }
+//     }
 
-    // Click event handler to left menu button
+//     // Click event handler to left menu button
-    $(".fox_atc").click(function() {
+//     $(".fox_atc").click(function() {
-        if ($(this).hasClass("fox_atc_active")) return;
+//         if ($(this).hasClass("fox_atc_active")) return;
         
-        $(".fox_atc_active").removeClass("fox_atc_active");
+//         $(".fox_atc_active").removeClass("fox_atc_active");
-        $(this).addClass("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
+// // Fetching user's flightplans from VATSIM API
-let userFlightplans = {};
+// let userFlightplans = {};
 
-fetch(FLIGHTPLANS_API_URL, {}).then(response => response.json()).then(result => {
+// fetch(FLIGHTPLANS_API_URL, {}).then(response => response.json()).then(result => {
-    if (result && result["result"] == "not found")
+//     if (result && result["result"] == "not found")
-        return
+//         return
 
-    for (let flightplan of result) {
+//     for (let flightplan of result) {
-        // Separate each flight by it's connection ID
+//         // Separate each flight by it's connection ID
-        // Like it was with ATC session's
+//         // Like it was with ATC session's
-        let flightplan_id = flightplan["id"]
+//         let flightplan_id = flightplan["id"]
-        userFlightplans[flightplan_id] = flightplan;
+//         userFlightplans[flightplan_id] = flightplan;
-        userFlightplans[flightplan_id]["not_filed"] = flightplan["connection_id"] === 0
+//         userFlightplans[flightplan_id]["not_filed"] = flightplan["connection_id"] === 0
         
-        // Long line again
+//         // 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>";
+//         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_flightplans").append(flightplanElement);
-    }
+//     }
 
-    $(".fox_button").click(function() {
+//     $(".fox_button").click(function() {
-        if ($(this).hasClass("fox_active")) return;
+//         if ($(this).hasClass("fox_active")) return;
     
-        $(".fox_active").removeClass("fox_active");
+//         $(".fox_active").removeClass("fox_active");
-        $(this).addClass("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
+// // Fetching airports information
-// Get it from localhost
+// // Get it from localhost
-// Becase I think it would be much faster than getting it from VATSIM API
+// // Becase I think it would be much faster than getting it from VATSIM API
-let airports = {};
+// let airports = {};
 
-$.getJSON("/static/data/airports.json", function(json) {
+// $.getJSON("/static/data/airports.json", function(json) {
-        airports = 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_TARGET = L.latLng("0", "0");
-const MAP_DEFAULT_ZOOM_VIEW = 14;
+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", {
+L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png", {
-    attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors',
+    attribution: '&copy; <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
@@ -153,3 +152,9 @@ function showSession(session) {
     $(".atc_transfers").text(session["handoffsinitiated"]);
     $(".atc_received").text(session["handoffsreceived"]);
 }
+
+function showAlert(title, message) {
+    $("#notification_wrapper").css("display", "block");
+    $("#notification_title").text(title);
+    $("#notification_message").text(message);
+}

src/templates/include/template.html

@@ -10,36 +10,67 @@
     <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);
+    }
+
+	.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
+		--main-rgb: #FA8232;
+		--bs-primary-rgb: 250, 130, 50;
 	}
 </style>
 <body>
+	{% block above_content %}{% endblock %}
     <main>
-        <div class="container py-4">
+        <header class="border-bottom">
-            <header class="pb-3 mb-4 border-bottom">
+            <div class="container py-4">
                 <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>
+                    <span class="fs-4">🦊 VATSIM <span class="text-primary">Fox</span></span>
                 </a>
-            </header>
+            </div>
+        </header>
 
+        <div class="container py-4">
            {% block content %}{% endblock %}
-      
-          <footer class="pt-3 mt-4 text-muted border-top">
-            created by <a href="https://uw935.t.me/" style="text-decoration: underline; cursor: pointer;">uw935</a> (1606255)
-          </footer>
         </div>
-      </main>
 
-      <script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
+        <footer class="text-muted border-top">
-      {% block javascript_code %}{% endblock %}
+            <div class="container py-4">
+                created by 
+                <a href="https://uw935.t.me/" style="text-decoration: underline; cursor: pointer;">
+                    uw935
+                </a> (1606255)
+            </div>
+        </footer>
+	</main>
+
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
+	{% block javascript_code %}{% endblock %}
 </body>
 </html>

src/templates/index.html

@@ -7,28 +7,30 @@
     <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>
 </div>
 
 <div class="mb-4 row align-items-md-stretch">
-  <div class="col-md-6">
+	<div class="col-md-6">
-    <div class="h-100 p-5 text-bg-dark rounded-3">
+    	<div class="h-100 p-5 text-bg-dark rounded-3">
-      <h2>About</h2>
+    		<h2>About</h2>
-      <p>VATSIM Fox is an open-source project to make it easier for users to see their detailed profile statistic</p>
+    		<p>VATSIM Fox is an open-source project to make it easier for users to see their detailed profile statistic</p>
-    </div>
+    	</div>
-  </div>
+  	</div>
-  <div class="col-md-6">
+
-      <div class="h-100 p-5 bg-light border rounded-3">
+	<div class="col-md-6">
-          <h2>Open source project</h2>
+		<div class="h-100 p-5 bg-light border rounded-3">
-          <p>This project is fully opened, so you can contribute in it if you want</p>
+			<h2>Open source project</h2>
-          <a href="https://github.com/uw935/vatsimfox">
+			<p>This project is fully opened, so you can contribute in it if you want</p>
-            <button class="btn btn-outline-secondary" type="button">GitHub</button>
+			
-          </a>
+			<a href="https://github.com/uw935/vatsimfox">
-      </div>
+				<button class="btn btn-outline-secondary" type="button">GitHub</button>
-  </div>
+			</a>
+		</div>
+	</div>
 </div>
 {% endblock %}
 {% block javascript_code %}

src/templates/viewer.html

@@ -1,143 +1,56 @@
-{% extends "/include/template.html" %}
+<!DOCTYPE html>
-{% block title %}User {{user_cid}} statistic — VATSIM Fox{% endblock %}
+<html lang="en">
-{% block header_css %}
+<head>
-<link rel="stylesheet" href="{{ url_for('static', filename='viewer.css') }}">
+    <meta charset="UTF-8">
-<link href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css" rel="stylesheet"/>
+    <meta name="author" content="uw935">
-{% endblock %}
+    <meta name="description" content="Check detailed stastic of VATSIM user {{user['id']}}">
-{% block content %}
+    <meta name="keywords" content="VATSIM FOX, vatsim id, {{user['id']}}, fox, vatsim, vatsim statistic, statistic, vatsim fox, flight simulator">
-<div class="mb-5">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <h2 class="text-center text-primary mb-4">{{data[0]["id"]}}</h2>
+    <meta name="apple-mobile-web-app-capable" content="yes">
-    <p class="fs-4 text-secondary">Date of registration: <span class="date_registration"></span></p>
+    <meta content="yes" name="apple-touch-fullscreen" />
-</div>
+    <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 {{user["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">
+	.btn-outline-primary {
-    <h3 class="mb-3">Last 50 flightplans</h3>
+    	border-color: var(--main-rgb);
-    <div id="fox_flightplans" class="mb-4 col-md-3"></div>
+		color: var(--main-rgb);
+  	}
 	
-    <div class="col-md" style="height: 500px; overflow-y: scroll;">
+	:root {
-        <div id="fox_map" class="mb-4 h-50 bg-dark rounded-3"></div>
+		--main-rgb: #FA8232;
-        <div class="h-auto p-5 bg-light border rounded-3">
+		--bs-primary-rgb: 250, 130, 50;
-            <h2><span class="fp_callsign">Flight</span> — from <span class="fp_depa_city"></span> to <span class="fp_arra_city"></span></h2>
+	}
-            <span>
+</style>
-                <b class="fp_is_filed"></b>
+<body>
-            </span>
+    <main class="border-bottom">
-            <br>
+        <div class="container py-4">
-            <span>
+            <header class="d-flex">
-                <b>Aircraft type:</b> 
+                <a href="/" class="d-flex align-items-center text-dark text-decoration-none">
-                <span class="fp_aicraft"></span>
+                   <span class="fs-4 me-4">🦊 VATSIM <span class="text-primary">Fox: </span></span>
-            </span>
+
-            <br>
+                   <span class="fs-4">user {{user["id"]}}</span>
-            <span>
+                </a>
-                <b>Enroute time:</b> 
+            </header>
-                <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>     
         </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 src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
-</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>
+    <script type="text/javascript" src="{{ url_for('static', filename='viewer.js') }}"></script>
-{% endblock %}
+</body>
+</html>