From bc8ca017290af4128df730be63e151a73112e53a Mon Sep 17 00:00:00 2001
From: te5154c <techp910@gmail.com>
Date: Wed, 28 Feb 2024 00:45:17 +0300
Subject: [PATCH] add: notification in viewer when error appears && api
 requests exception && new map-style (preparing for new update) && buttons
 color change

---
 README.md                           |  2 +-
 src/app.py                          |  4 ++--
 src/static/viewer.css               |  4 ++++
 src/static/viewer.js                | 14 +++++++++++---
 src/templates/include/template.html | 12 ++++++++++++
 src/templates/index.html            |  2 +-
 src/templates/viewer.html           |  7 +++++++
 7 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 7427381..0ecb0db 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/src/app.py b/src/app.py
index 602bb13..dff3806 100644
--- a/src/app.py
+++ b/src/app.py
@@ -22,9 +22,9 @@ def request_handler():
         try:
             return requests.get(f"{VATSIM_API_URL}{request_string}").json()
         except requests.exceptions.JSONDecodeError:
-            return jsonify({"result": "not found"})
+            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>/")
diff --git a/src/static/viewer.css b/src/static/viewer.css
index c03c1cc..3220435 100644
--- a/src/static/viewer.css
+++ b/src/static/viewer.css
@@ -6,3 +6,7 @@
 .fox_active, .fox_atc_active {
     background-color: #dee2e6 !important;
 }
+
+#notification_wrapper {
+    display: none;
+}
diff --git a/src/static/viewer.js b/src/static/viewer.js
index 42ea216..8c0a63d 100644
--- a/src/static/viewer.js
+++ b/src/static/viewer.js
@@ -2,8 +2,10 @@
 let userSession = {};
 
 fetch(ATC_API_URL, {}).then(response => response.json()).then(result => {
-    if (result && result["result"] == "not found")
-        return
+    if (result && (result["result"] == "not found" || result["result"] == "error")) {
+        showAlert("Error while getting ATC information", result["message"]);
+        return;
+    }
 
     for (let session of result["items"]) {
         // Separate each session by it's connection ID
@@ -143,7 +145,7 @@ function showFlight(flight) {
 // Function to show ATC session 
 function showSession(session) {
     if (!session) return;
-    console.log(session);
+
     $(".atc_callsign").text(session["connection_id"]["callsign"]);
     $(".atc_start_time").text(session["connection_id"]["start"].replace("T", " "));
     $(".atc_end_time").text(session["connection_id"]["end"].replace("T", " "));
@@ -153,3 +155,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);
+}
diff --git a/src/templates/include/template.html b/src/templates/include/template.html
index ae3a9e5..87bc675 100644
--- a/src/templates/include/template.html
+++ b/src/templates/include/template.html
@@ -18,7 +18,19 @@
     {% 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 {
+        --main-rgb: #FA8232;
 		--bs-primary-rgb: 250, 130, 50
 	}
 </style>
diff --git a/src/templates/index.html b/src/templates/index.html
index e01fe89..7bb3f7c 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -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>
diff --git a/src/templates/viewer.html b/src/templates/viewer.html
index 601fb3b..af2b9af 100644
--- a/src/templates/viewer.html
+++ b/src/templates/viewer.html
@@ -6,6 +6,13 @@
 {% endblock %}
 {% block content %}
 <div class="mb-5">
+    <div id="notification_wrapper">
+        <div class="mb-4 alert alert-warning" role="alert">
+            <h4 id="notification_title"></h4>
+            <span id="notification_message"></span>
+        </div>
+    </div>
+    
     <h2 class="text-center text-primary mb-4">{{user["id"]}}</h2>
     <p class="fs-4 text-secondary">Date of registration: <span class="date_registration"></span></p>
 </div>