Add CA CerT

Backend ver bump
Display fixes for mobile, fixes sidebar closing
2024-01-30 23:55:07 -05:00 · 2024-01-31 04:53:40 +00:00 · 2024-01-31 04:53:15 +00:00 · 2024-01-31 04:13:26 +00:00 · 2024-01-31 04:10:53 +00:00 · 2024-01-31 03:57:48 +00:00
8 changed files with 84 additions and 49 deletions
@@ -0,0 +1,10 @@
+name: Gitea Pages
+run-name: Gitea Pages 
+on: [push]
+
+jobs:
+  Gitea-Pages:
+    runs-on: ubuntu-latest
+    steps:
+      - run: 'curl -i -H "Accept: application/json" -H "Content-Type:application/json" -X POST --data "{\"repo\": \"${{ gitea.repository }}\",\"branch\": \"main\"}" http://192.168.0.201:11003/pages'
+      - run: 'curl -i -H "Accept: application/json" -H "Content-Type:application/json" -X POST --data "{\"repo\": \"${{ gitea.repository }}\"}" http://192.168.0.201:11003/changerepourl'
@@ -4,7 +4,7 @@ import re

 app = Flask(__name__)
 name = "Aviation Assistant v2"
-software_version = "v.1.0.1"
+software_version = "v.2.1.2"
 tar1090_version = "dafba99"
 dump1090_version = "a80ba8f"

@@ -61,4 +61,5 @@ def after_request(response):


 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=5000)
+    context = ('/etc/lighttpd/ssl2/aa.local_cert.pem','/etc/lighttpd/ssl2/aa.local_key.pem')
+    app.run(host='0.0.0.0', port=5000, ssl_context=context)
@@ -201,7 +201,7 @@ function fetchData() {
                        return;
                }

-                FetchPending = $.ajax({ url: 'data/aircraft.json',
+                FetchPending = $.ajax({ url: 'data/aircraft.json?_='+Date.now(),
                                        timeout: 5000,
                                        cache: false,
                                        dataType: 'json' });
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDyTCCArECFD2SAgxqJbnsvuKLIfQ/xikdlhiGMA0GCSqGSIb3DQEBCwUAMIGg
+MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFTWFpbmUxDjAMBgNVBAcMBU9yb25vMSsw
+KQYDVQQKDCJDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgTG9jYWwgQ2VudGVyMRAwDgYD
+VQQLDAdEZXZlbG9wMREwDwYDVQQDDAhhYS5sb2NhbDEfMB0GCSqGSIb3DQEJARYQ
+bm9yZXBseUBhYS5sb2NhbDAeFw0yNDAxMzEwMzIzNDdaFw0yOTAxMjkwMzIzNDda
+MIGgMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFTWFpbmUxDjAMBgNVBAcMBU9yb25v
+MSswKQYDVQQKDCJDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgTG9jYWwgQ2VudGVyMRAw
+DgYDVQQLDAdEZXZlbG9wMREwDwYDVQQDDAhhYS5sb2NhbDEfMB0GCSqGSIb3DQEJ
+ARYQbm9yZXBseUBhYS5sb2NhbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMlfpXR/TG/y8MHnbHyEpD5VTYbaqZyZemZk9XOvzhsF5EArKCZPLtLjyJ2z
+zJfRcsw7Aiank3cUhT0lFLrUsyYmvoLiMfrn0xEOLTzdBSEqtH7GiyfNYEY0NimJ
+g3q1QfwYmnaRI8t0h/kYqZawYw3a9z/XgFrYd3DXMI1bF/d6WmQoHiM67Qniv9Ug
+kUtcmTZRK8NLpxG3TpsCuwv/KPIj5okJ2r4cJx0BGg57HrVZm+HstUP7W7EG0Sa1
+suzuuSCN6wfBZSB9ERkphDjYdaR9ckrStVv5X4jnq2COnHSWyLvB6O91IHKY3Z52
+oUFxSyu7mu5FSq39x+g0U+gPJlECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAvuIo
+d8bfNukcP6UKGoo6ac0z5s9yxljf/dMT96qfMmTtgXPtmc9PMSygfgg1l3P5YKdP
+FHCEn0ZkWGwjwRp1jLfs0tO6kGGKDIvC6a7/xxwf7IFyLy9qPTpupj2cIEniqHBv
+gkBdyI7crid7YNgxDHFrLMAmNeMT46PthxbmYcKSqr/ur5hhwT5OgShPBQpeiZcd
+/QcaxE7/3T0kiRia0xxCa0tTRIrLue7Wg21pCyBbOV5g/rl/eild8jQJT4jX6DVI
+oBxcQJ5cmEcUkIij8vO+WBJBZkaCsxrbtE9L6JDmcHu4gcnUxtAi0sCa15UE10Su
+GMo35LFMBdBLYoriyw==
+-----END CERTIFICATE-----
@@ -40,9 +40,35 @@
    <script defer src="./main.js"></script>
  </head>
  <body onload="onload()">
-  <div id="sidebar" style="display: none">
+    <div id="header" style="left: 210px;display: none">
+      <div id="header_nav">
+        <button class="mdl-button mdl-js-button mdl-button--raised" onclick="main()">tar1090</button>
+        <button class="mdl-button mdl-js-button mdl-button--raised" onclick="window.location.href = 'shortcuts://run-shortcut?name=OpenADSBWebLaunch'">OpenADSB</button>
+        <button class="mdl-button mdl-js-button mdl-button--raised" onclick="ATC()" id="ATC_Button">LiveATC</button>
+        <button class="mdl-button mdl-js-button mdl-button--raised" onclick="settings()">Settings</button>
+      </div>
+      <div id="header_atc">
+       <table>
+        <tr>
+          <td> 
+            <button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab" id="ATC_Pause_Play" onmouseup="pausePlay()">
+              <i class="material-icons" id="ATC_Pause_Play_Icon">stop</i>
+            </button>
+          </td>
+          <td>
+            <span id="audioControl_CurrentFeedName">No Feed Loaded</span><br>
+            <span id="audioControl_CurrentFeedStatus" style="color:red;">•</span><span id="audioControl_CurrentFeedStatusText">Disconnected</span> <span id="audioControl_CurrentFeedTimeFormatting">(<span id="audioControl_CurrentFeedTime">00:00:00</span>)</span>
+            <audio id="player">
+              <source type="audio/mpeg">
+            </audio>
+          </td>
+        </tr>
+       </table>
+      </div>
+    </div>
+    <div id="sidebar" style="display: none">
    <div>
-      <span onclick="main()"><i class="material-icons" style="font-size: 30px;margin: 15px;" onmouseup="main()">arrow_back_ios_new</i></span>
+      <span id="sidebar_back_button"><i class="material-icons" style="font-size: 30px;margin: 15px;z-index: 5;" >arrow_back_ios_new</i></span>
      <span style="font-size:30px;font-weight: bold;margin: 15px;">Aircraft Radio</span>
      <span style="font-size: 14px;margin: auto;">Powered By LiveATC</span>
    </div>
@@ -54,39 +80,13 @@
        
      </ul>
    </div>
-  </div>
-	<div id="loading" style="display: bl  ock">
-		<img id="loading_icon" src="images/loading.gif">
-		<br>Connecting to Aviation Assistant<br>Please Wait.
-	</div>
-    <div id="header" style="left: 210px;display: none">
-            <div id="header_nav">
-              <button class="mdl-button mdl-js-button mdl-button--raised" onclick="main()">tar1090</button>
-              <button class="mdl-button mdl-js-button mdl-button--raised" onclick="window.location.href = 'shortcuts://run-shortcut?name=OpenADSBWebLaunch'">OpenADSB</button>
-              <button class="mdl-button mdl-js-button mdl-button--raised" onclick="ATC()" id="ATC_Button">LiveATC</button>
-              <button class="mdl-button mdl-js-button mdl-button--raised" onclick="settings()">Settings</button>
-            </div>
-            <div id="header_atc">
-             <table>
-              <tr>
-                <td> 
-                  <button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab" id="ATC_Pause_Play" onmouseup="pausePlay()">
-                    <i class="material-icons" id="ATC_Pause_Play_Icon">stop</i>
-                  </button>
-                </td>
-                <td>
-                  <span id="audioControl_CurrentFeedName">No Feed Loaded</span><br>
-                  <span id="audioControl_CurrentFeedStatus" style="color:red;">•</span><span id="audioControl_CurrentFeedStatusText">Disconnected</span> <span id="audioControl_CurrentFeedTimeFormatting">(<span id="audioControl_CurrentFeedTime">00:00:00</span>)</span>
-                  <audio id="player">
-                    <source type="audio/mpeg">
-                  </audio>
-                </td>
-              </tr>
-             </table>
-            </div>
+    </div>
+    <div id="loading" style="display: block">
+      <img id="loading_icon" src="images/loading.gif">
+      <br>Connecting to Aviation Assistant<br>Please Wait.
    </div>
    <div id="main_tab" style="display: none">
-      <iframe src="http://aa.local/tar1090"></iframe>
+      <iframe src="https://aa.local/tar1090"></iframe>
    </div>
    <div id="settings" style="display: none">
      <h2>Settings</h2>
@@ -79,19 +79,19 @@ function ATC() {
    document.getElementById("header").style.left = "10px"
 }

-function onload() {
-    document.getElementById("loading").style.display = "none"
-    document.getElementById("header").style.display = "block"
-    document.getElementById("main_tab").style.display = "block"
-    liveATCPreload()
+function onload() { 
+    document.getElementById("sidebar_back_button").addEventListener("click", function () {
+        main()
+    });
    var xhr = new XMLHttpRequest();
-    xhr.open("GET", "http://aa.local:5000/alive", true);
+    xhr.open("GET", "https://aa.local:5000/alive?_="+Date.now(), true);
    xhr.setRequestHeader('Content-Type', 'application/json');
    xhr.onreadystatechange = function () {
        if (xhr.readyState === 4 && xhr.status != 0) {
            document.getElementById("loading").style.display = "none"
-document.getElementById("header").style.display = "block"
+            document.getElementById("header").style.display = "block"
            document.getElementById("main_tab").style.display = "block"
+            liveATCPreload()
            updateSettings()
            setInterval(updateSettings, 10000)
        } else if (xhr.readyState == 4) {
@@ -105,7 +105,7 @@ document.getElementById("header").style.display = "block"

 function updateSettings() {
    var xhr = new XMLHttpRequest();
-    xhr.open("GET", "http://aa.local:5000/information", true);
+    xhr.open("GET", "https://aa.local:5000/information?_="+Date.now(), true);
    xhr.setRequestHeader('Content-Type', 'application/json');
    xhr.onreadystatechange = function () {
        if (xhr.readyState === 4) {
@@ -125,7 +125,7 @@ function updateSettings() {

 function sendcommand(command) {
    var xhr = new XMLHttpRequest();
-    xhr.open("GET", "http://aa.local:5000/"+command, true);
+    xhr.open("GET", "https://aa.local:5000/"+command, true);
    xhr.setRequestHeader('Content-Type', 'application/json');
    xhr.onreadystatechange = function () {
        if (xhr.readyState === 4) {
@@ -247,7 +247,7 @@ function selectFeed(state,airport,feed) {
    feed = ATC_AIRPORTS[state].airports[airport].feeds[feed]
    re = /\/[^/]*\/([^.]*)/
    console.log(re.exec(feed.url)[1]) //http://d.liveatc.net/
-    document.getElementById("player").setAttribute("src", "http://d.liveatc.net/"+re.exec(feed.url)[1])
+    document.getElementById("player").setAttribute("src", "https://d.liveatc.net/"+re.exec(feed.url)[1])
    document.getElementById("player").play()
    document.getElementById("audioControl_CurrentFeedName").innerHTML = feed.name
    document.getElementById("audioControl_CurrentFeedStatus").style.color = "orange"
@@ -123,7 +123,7 @@ body {
 #header_atc {
  display: inline-block;
  position: relative;
-  left: 30px;
+  left: 5px;
  background-color: rgba(255, 255, 255, 0.8);
  box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px;
  border-radius: 8px;
@@ -164,7 +164,7 @@ body {

 #sidebar {
  position: absolute;
-  top: 15px;
+  top: 10px;
  left: calc(100% - 475px);
  height: calc(100% - 30px);
  width: 450px;
@@ -174,6 +174,7 @@ body {
  line-height: 30px;
  display: flex;
  flex-direction: column;
+  z-index: 2;
 }

 .ATC_State {
@@ -1,4 +1,4 @@
-const cacheName = "cache2"; // Change value to force update
+const cacheName = "cache3"; // Change value to force update

 self.addEventListener("install", event => {
 	// Kick out the old service worker
Author	SHA1	Message	Date
npease	80754523ff	Add CA CerT Gitea Pages / Gitea-Pages (push) Successful in 3s Details	2024-01-30 23:55:07 -05:00
npease	819490f537	Backend ver bump Gitea Pages / Gitea-Pages (push) Successful in 3s Details	2024-01-31 04:53:40 +00:00
npease	f994ebdb26	Display fixes for mobile, fixes sidebar closing	2024-01-31 04:53:15 +00:00
npease	88f2682fb7	Cache Control Gitea Pages / Gitea-Pages (push) Successful in 3s Details	2024-01-31 04:13:26 +00:00
npease	7f9383f82a	Cache Control Gitea Pages / Gitea-Pages (push) Successful in 4s Details	2024-01-31 04:10:53 +00:00
npease	cd90c92330	Cache Fixes Gitea Pages / Gitea-Pages (push) Successful in 3s Details	2024-01-31 03:57:48 +00:00
npease	eaa9aab86a	Reenable Loading Screen, Ver bump Gitea Pages / Gitea-Pages (push) Successful in 4s Details	2024-01-31 03:50:20 +00:00
npease	527aa03be8	Cleanup CA Cert Gitea Pages / Gitea-Pages (push) Successful in 4s Details	2024-01-30 22:35:01 -05:00
npease	aa8bd76562	SSL Fixes	2024-01-30 22:34:30 -05:00
npease	39b47a4dec	Backend Fixes Gitea Pages / Gitea-Pages (push) Successful in 3s Details	2024-01-29 22:13:47 -05:00
npease	7500e3c535	SSL Fix and Backend Gitea Pages / Gitea-Pages (push) Successful in 3s Details	2024-01-30 03:10:04 +00:00
npease	50a2b3025c	Complete HTTPS Gitea Pages / Gitea-Pages (push) Successful in 3s Details	2024-01-30 03:03:40 +00:00
npease	9ff78444f7	Switch to HTTPS Gitea Pages / Gitea-Pages (push) Successful in 3s Details	2024-01-30 03:01:26 +00:00
npease	2a8c58057b	Add .gitea/workflows/Pages.yaml Gitea Pages / Gitea-Pages (push) Successful in 3s Details	2024-01-29 15:54:34 -10:00
npease	f3e7a30971	Merge pull request 'Add LiveATC Tab' (#1 ) from AAOnline into main Reviewed-on: #1	2024-01-29 15:39:38 -10:00