From e5d0a1188f936e3a2cf202ad231ccb158d3468e0 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 15:27:24 +0800
Subject: [PATCH 01/57] change to 1.3.6 version

---
 templates/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 7407cf0..119e303 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -39,7 +39,7 @@
     <!-- CSS Stylesheet linking -->
 
 <!--     <link href="{{ url_for('static', filename='style.css') }}" type="text/css" rel="stylesheet" />   ALWAYS CHANGE VERSIONING WHENEVER CHANGES ARE MADE TO AVOID BAD CACHING -->
-    <link rel="stylesheet" type="text/css" href="../static/style.css?ver=1.3.5"/>
+    <link rel="stylesheet" type="text/css" href="../static/style.css?ver=1.3.6"/>
 
   </head>
 
@@ -99,7 +99,7 @@
         </div>
 
         </div>
-<p class="text-white" id="version-text">Version 1.3.5</p>
+<p class="text-white" id="version-text">Version 1.3.6</p>
 <p class="text-white" id="version-text"><a href="https://docs.google.com/document/d/1TzvukZv_0Pd3TUM6Xe2wEkymn9uIT2qXUBFnMCQwp5g/edit?usp=sharing" target="_blank" id="footerlinks">Changelog</a></p>
       </nav>
 
@@ -8467,7 +8467,7 @@
     <script src="{{ url_for('static', filename='js/jquery-2.1.1.js') }}"></script>
 
 <!--     <script src="{{ url_for('static', filename='app.js') }}"></script>.  ALWAYS CHANGE VERSIONING WHENEVER CHANGES ARE MADE TO AVOID BAD CACHING -->
-    <script type='text/javascript' src='../static/app.js?ver=1.3.5'></script>
+    <script type='text/javascript' src='../static/app.js?ver=1.3.6'></script>
 
     <script>
 

From 9b778767128400b570a21f5d8db1ae3b49813f18 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 15:29:20 +0800
Subject: [PATCH 02/57] change forex from text input to dropdown menu

---
 templates/index.html | 132 +++++++++++++++++--------------------------
 1 file changed, 52 insertions(+), 80 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 119e303..e4b750a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -3271,155 +3271,130 @@
           <!-- Forex -->
 
           <div class="page" id="Page3" style="display: none">
-
             <div class="row">
-
               <div class="col-lg-6 col-md-6 col-sm-12">
-
                 <div class="row g-3 align-items-center mt-3">
-
                   <div class="col-auto">
-
                     <label for="inputScrollSpeed3Z" class="col-form-label"
-
                       >Scroll Speed:
-
                     </label>
-
                   </div>
 
                   <div class="col-auto">
-
                     <select
-
                       id="inputScrollSpeed3"
-
-                      class="form-select speed-select"
-
-                    >
-
+                      class="form-select speed-select">
                       <option {%if forex_settings.speed == 'medium' %} selected {% endif %}>Medium</option>
-
                       <option {%if forex_settings.speed == 'slow' %} selected {% endif %}>Slow</option>
-
                       <option {%if forex_settings.speed == 'fast' %} selected {% endif %}>Fast</option>
-
                     </select>
-
                   </div>
-
                 </div>
 
 
 
                 <div class="row g-3 align-items-center mt-3 left-div">
-
                   <div class="col-auto">
-
                     <label for="inputScrollSpeedRowZ3" class="col-form-label"
-
                       >Scroll Speed (Row 2):
-
                     </label>
-
                   </div>
 
                   <div class="col-auto">
-
                     <select
-
                       id="inputScrollSpeedRow3"
-
-                      class="form-select speed-select"
-
-                    >
-
+                      class="form-select speed-select">
                       <option {%if forex_settings.speed2 == 'medium' %} selected {% endif %}>Medium</option>
-
                       <option {%if forex_settings.speed2 == 'slow' %} selected {% endif %}>Slow</option>
-
                       <option {%if forex_settings.speed2 == 'fast' %} selected {% endif %}>Fast</option>
-
                     </select>
-
                   </div>
-
                 </div>
 
 
 
                 <div class="row g-3 align-items-center mt-3">
-
                   <div class="col-auto">
-
                     <label for="inputTransition" class="col-form-label"
-
                       >Intro Transition:
-
                     </label>
-
                   </div>
 
                   <div class="col-auto">
-
                     <select
-
                       id="inputTransition3"
-
-                      class="form-select animation-select"
-
-                    >
-
+                      class="form-select animation-select">
                       <option {%if forex_settings.animation == 'down' %} selected {% endif %}>Down</option>
-
                       <option {%if forex_settings.animation == 'up' %} selected {% endif %}>Up</option>
-
                       <option {%if forex_settings.animation == 'continuous' %} selected {% endif %}>Continuous</option>
-
                     </select>
-
                   </div>
-
                 </div>
 
 
-
                 <div class="row g-3 align-items-center mt-3">
-
-                  <div class="col-auto">
-
+<!--                   <div class="col-auto">
                     <label for="inputText" class="col-form-label"
-
                       >Base,Quote:
-
                     </label>
-
-                  </div>
-
+                  </div> -->
                   <div class="col-auto">
-
-                    <input
-
+<!--                     <input
                       type="text"
-
                       id="inputText5"
-
                       class="form-control"
-
                       aria-describedby="TextHelpInline"
-                           
-                      placeholder="e.g. JPY,EUR"
-
-                    />
-
+                      placeholder="e.g. JPY,EUR"/> -->
+                    <label for="inputText" class="col-form-label"
+                      >Base:
+                    </label>
+                    <select id="base-select" class="form-select animation-select">
+                      <option>USD</option><option>EUR</option><option>JPY</option><option>GBP</option><option>AUD</option><option>CAD</option>
+                      <option>CHF</option><option>CNY</option><option>HKD</option><option>NZD</option><option>SEK</option><option>KRW</option>
+                      <option>SGD</option><option>NOK</option><option>MXN</option><option>INR</option><option>RUB</option><option>ZAR</option>
+                      <option>TRY</option><option>BRL</option><option>TWD</option><option>DKK</option><option>PLN</option><option>THB</option>
+                      <option>IDR</option><option>HUF</option><option>ILS</option><option>CLP</option><option>PHP</option><option>AED</option>
+                      <option>CZK</option><option>COP</option><option>SAR</option><option>MYR</option><option>RON</option><option>CLP</option>
+                      <option>ARS</option><option>VND</option><option>QAR</option><option>KWD</option>
+                    </select>
                   </div>
 
-
-
                   <div class="col-auto">
+                    <label for="inputText" class="col-form-label"
+                      >Quote:
+                    </label>
+                    <select id="quote-select" class="form-select animation-select">
+                      <option>AED</option><option>AFN</option><option>ALL</option><option>AMD</option><option>AOA</option><option>ARS</option>
+                      <option>AUD</option><option>AWG</option><option>AZN</option><option>BAM</option><option>BBD</option><option>BDT</option>
+                      <option>BGN</option><option>BHD</option><option>BMD</option><option>BND</option><option>BOB</option><option>BRL</option>
+                      <option>BSD</option><option>BTN</option><option>BWP</option><option>BYN</option><option>BZD</option><option>CAD</option>
+                      <option>CDF</option><option>CHF</option><option>CLP</option><option>CNY</option><option>COP</option><option>CRC</option>
+                      <option>CUC</option><option>CUP</option><option>CVE</option><option>CZK</option><option>DJF</option><option>DKK</option>
+                      <option>DOP</option><option>DZD</option><option>EGP</option><option>ERN</option><option>ETB</option><option>EUR</option>
+                      <option>FJD</option><option>FKP</option><option>FOK</option><option>GBP</option><option>GEL</option><option>GGP</option>
+                      <option>GHS</option><option>GIP</option><option>GMD</option><option>GNF</option><option>GTQ</option><option>GYD</option>
+                      <option>HKD</option><option>HNL</option><option>HRK</option><option>HTG</option><option>HUF</option><option>IDR</option>
+                      <option>ILS</option><option>IMP</option><option>INR</option><option>IQD</option><option>IRR</option><option>ISK</option>
+                      <option>JMD</option><option>JOD</option><option>JPY</option><option>KES</option><option>KGS</option><option>KHR</option>
+                      <option>KID</option><option>KMF</option><option>KRW</option><option>KWD</option><option>KYD</option><option>KZT</option>
+                      <option>LAK</option><option>LBP</option><option>LKR</option><option>LRD</option><option>LSL</option><option>LYD</option>
+                      <option>MAD</option><option>MDL</option><option>MGA</option><option>MKD</option><option>MMK</option><option>MNT</option>
+                      <option>MOP</option><option>MRU</option><option>MUR</option><option>MVR</option><option>MWK</option><option>MXN</option>
+                      <option>MYR</option><option>MZN</option><option>NAD</option><option>NGN</option><option>NIO</option><option>NOK</option>
+                      <option>NPR</option><option>NZD</option><option>OMR</option><option>PAB</option><option>PEN</option><option>PGK</option>
+                      <option>PHP</option><option>PKR</option><option>PLN</option><option>PYG</option><option>QAR</option><option>RON</option>
+                      <option>RSD</option><option>RUB</option><option>RWF</option><option>SAR</option><option>SBD</option><option>SCR</option>
+                      <option>SDG</option><option>SEK</option><option>SGD</option><option>SHP</option><option>SLL</option><option>SOS</option>
+                      <option>SRD</option><option>SSP</option><option>STN</option><option>SYP</option><option>SZL</option><option>THB</option>
+                      <option>TJS</option><option>TMT</option><option>TND</option><option>TOP</option><option>TRY</option><option>TTD</option>
+                      <option>TVD</option><option>TWD</option><option>TZS</option><option>UAH</option><option>UGX</option><option>USD</option>
+                      <option>UYU</option><option>UZS</option><option>VES</option><option>VND</option><option>VUV</option><option>WST</option>
+                      <option>YER</option><option>ZAR</option>
+                    </select>
+                  </div>
 
+                  <div class="col-auto" style="padding-top: 7%;">
                     <button id="inputTextBtn5" class="btn set-btn" onclick="forexValidate()">Add</button>
-
                   </div>
                   
                   <p id="demo3" style="display: none"></p>
@@ -3427,13 +3402,10 @@
                 </div>
 
 
-
                 <div id="limit-msg">
-
                 </div>
 
 
-
                 <div class="row g-3 align-items-center mt-3">
 
                   <div class="col-auto">

From a639cb343b3dcacfb679ad037853f6deeef36e45 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 15:31:14 +0800
Subject: [PATCH 03/57] forex text input to dropdown menu

---
 static/app.js | 158 ++++++++++++++++++++++++++------------------------
 1 file changed, 81 insertions(+), 77 deletions(-)

diff --git a/static/app.js b/static/app.js
index 219724b..dd19f11 100755
--- a/static/app.js
+++ b/static/app.js
@@ -746,7 +746,7 @@ var allFeaturesFileAddBtn = [
 // features input text
 var stocksText = document.getElementById("inputText3");
 var cryptoText = document.getElementById("inputText4");
-var forexText = document.getElementById("inputText5");
+var forexText = document.getElementById("base-select").value + ',' + document.getElementById("quote-select").value;
 var currentWeatherText = document.getElementById("inputText6");
 var dailyForecastText = document.getElementById("inputText7");
 var messagesText = document.getElementById("inputText13");
@@ -903,10 +903,13 @@ allFeaturesTextAddBtn.map((value, index) => {
         }
 
         else{
-
           if (createLi === true) {
             var tag = document.createElement("li");
-            tag.innerHTML = allFeaturesText[index].value;
+            if (index == 2) {
+              tag.innerHTML= document.getElementById("base-select").value + ',' + document.getElementById("quote-select").value;
+            } else{
+              tag.innerHTML = allFeaturesText[index].value;
+            }
             allFeatures[index].appendChild(tag);
             changeVarValue();
             addEventOnFeaturesList();
@@ -2245,95 +2248,96 @@ var specialChars = /[`!@#$%^&*()_+\-=\[\]{};':"\\|<>\/?~]/;
 
 
 // Forex validation
-
 function forexValidate() {
+  createLi = true;
+}
 
-var specialChars = /[`!@#$%^&*()_+\-=\[\]{};':"\\|<>\/?~]/;
+// var specialChars = /[`!@#$%^&*()_+\-=\[\]{};':"\\|<>\/?~]/;
 
-  let x = document.getElementById("inputText5").value;
-  let quoteCurrency = x.split(",")[1];
-  let baseCurrency = x.split(",")[0];
+//   let x = document.getElementById("inputText5").value;
+//   let quoteCurrency = x.split(",")[1];
+//   let baseCurrency = x.split(",")[0];
 
-  // console.log("base"+baseCurrency);
-  // console.log("quote"+quoteCurrency);
+//   // console.log("base"+baseCurrency);
+//   // console.log("quote"+quoteCurrency);
 
-  let text;
-    if (x.toUpperCase() != x) {
-      document.getElementById('demo3').style.display = "block";
-      text = "Base and quote must be uppercase";
-      document.getElementById("inputText5").value = '';
-      // createLi = false;
-    }
-        else if (x === '') {
-        document.getElementById('demo3').style.display = "block";  
-        text = "No blanks"
-        }
+//   let text;
+//     if (x.toUpperCase() != x) {
+//       document.getElementById('demo3').style.display = "block";
+//       text = "Base and quote must be uppercase";
+//       document.getElementById("inputText5").value = '';
+//       // createLi = false;
+//     }
+//         else if (x === '') {
+//         document.getElementById('demo3').style.display = "block";  
+//         text = "No blanks"
+//         }
 
-        else if (x.includes(' ')) {
-        text = "No spaces";
-        document.getElementById('demo3').style.display = "block";
-        document.getElementById("inputText5").value = ''; 
-        }
+//         else if (x.includes(' ')) {
+//         text = "No spaces";
+//         document.getElementById('demo3').style.display = "block";
+//         document.getElementById("inputText5").value = ''; 
+//         }
 
-        else if (/\d/.test(x)) {
-          document.getElementById('demo3').style.display = "block";
-        text = "No numbers allowed";
-        document.getElementById("inputText5").value = ''; 
-        }    
-        // CAREFUL TO DELETE THE BACKEND LIST ITEMS, JUST DELETING THE VALUE LIKE THIS ISN"T 100% ACCURATE
+//         else if (/\d/.test(x)) {
+//           document.getElementById('demo3').style.display = "block";
+//         text = "No numbers allowed";
+//         document.getElementById("inputText5").value = ''; 
+//         }    
+//         // CAREFUL TO DELETE THE BACKEND LIST ITEMS, JUST DELETING THE VALUE LIKE THIS ISN"T 100% ACCURATE
 
-        else if (specialChars.test(x)) {
-          document.getElementById('demo3').style.display = "block";
-        text = "No special characters allowed";
-        document.getElementById("inputText5").value = ''; 
-        } 
+//         else if (specialChars.test(x)) {
+//           document.getElementById('demo3').style.display = "block";
+//         text = "No special characters allowed";
+//         document.getElementById("inputText5").value = ''; 
+//         } 
 
-        else if (!x.includes(',')) {
-        document.getElementById('demo3').style.display = "block";  
-        document.getElementById("inputText5").value = '';
-        text = "Missing ',' (e.g. EUR,USD)"
-        }
+//         else if (!x.includes(',')) {
+//         document.getElementById('demo3').style.display = "block";  
+//         document.getElementById("inputText5").value = '';
+//         text = "Missing ',' (e.g. EUR,USD)"
+//         }
 
-        else if (x.length > 7) {
-        document.getElementById('demo3').style.display = "block";
-        text = "No more than 7 characters";
-        document.getElementById("inputText5").value = ''; 
-        }
+//         else if (x.length > 7) {
+//         document.getElementById('demo3').style.display = "block";
+//         text = "No more than 7 characters";
+//         document.getElementById("inputText5").value = ''; 
+//         }
 
-        else if (!["USD","EUR","JPY","GBP","AUD","CAD","CHF","CNY","HKD","NZD","SEK","KRW","SGD","NOK","MXN","INR","RUB","ZAR","TRY","BRL",
-        "TWD","DKK","PLN","THB","IDR","HUF","ILS","CLP","PHP","AED","CZK","COP","SAR","MYR","RON","CLP","ARS","VND","QAR","KWD"].includes(baseCurrency)) {
-        document.getElementById('demo3').style.display = "block";  
-        document.getElementById("inputText5").value = '';
-        text = "Invalid base currency"
+//         else if (!["USD","EUR","JPY","GBP","AUD","CAD","CHF","CNY","HKD","NZD","SEK","KRW","SGD","NOK","MXN","INR","RUB","ZAR","TRY","BRL",
+//         "TWD","DKK","PLN","THB","IDR","HUF","ILS","CLP","PHP","AED","CZK","COP","SAR","MYR","RON","CLP","ARS","VND","QAR","KWD"].includes(baseCurrency)) {
+//         document.getElementById('demo3').style.display = "block";  
+//         document.getElementById("inputText5").value = '';
+//         text = "Invalid base currency"
 
-        }
+//         }
 
-        else if (!["AED","AFN","ALL","AMD","AOA","ARS","AUD","AWG","AZN","BAM","BBD","BDT","BGN","BHD","BMD","BND","BOB","BRL","BSD", "BTN", "BWP", "BYN", 
-        "BZD", "CAD", "CDF", "CHF", "CLP", "CNY", "COP", "CRC", "CUC", "CUP", "CVE", "CZK", "DJF", "DKK", "DOP", "DZD", "EGP", "ERN", "ETB", "EUR",
-        "FJD", "FKP", "FOK", "GBP", "GEL", "GGP", "GHS", "GIP", "GMD", "GNF", "GTQ", "GYD", "HKD", "HNL", "HRK", "HTG", "HUF", "IDR", "ILS", "IMP", 
-        "INR", "IQD", "IRR", "ISK", "JMD", "JOD", "JPY","KES","KGS","KHR","KID","KMF","KRW","KWD", "KYD","KZT","LAK","LBP","LKR","LRD","LSL", "LYD",
-        "MAD","MDL","MGA","MKD","MMK","MNT","MOP","MRU","MUR","MVR","MWK","MXN","MYR","MZN","NAD","NGN","NIO","NOK","NPR","NZD","OMR","PAB","PEN",
-        "PGK","PHP","PKR","PLN","PYG","QAR","RON","RSD","RUB","RWF","SAR","SBD","SCR","SDG","SEK","SGD","SHP","SLL","SOS","SRD","SSP","STN","SYP","SZL", 
-        "THB","TJS","TMT","TND","TOP","TRY","TTD","TVD","TWD","TZS","UAH","UGX","USD","UYU","UZS","VES","VND","VUV","WST","YER","ZAR"].includes(quoteCurrency)) {
-        document.getElementById('demo3').style.display = "block";  
-        document.getElementById("inputText5").value = '';
-        text = "Invalid quote currency"
+//         else if (!["AED","AFN","ALL","AMD","AOA","ARS","AUD","AWG","AZN","BAM","BBD","BDT","BGN","BHD","BMD","BND","BOB","BRL","BSD", "BTN", "BWP", "BYN", 
+//         "BZD", "CAD", "CDF", "CHF", "CLP", "CNY", "COP", "CRC", "CUC", "CUP", "CVE", "CZK", "DJF", "DKK", "DOP", "DZD", "EGP", "ERN", "ETB", "EUR",
+//         "FJD", "FKP", "FOK", "GBP", "GEL", "GGP", "GHS", "GIP", "GMD", "GNF", "GTQ", "GYD", "HKD", "HNL", "HRK", "HTG", "HUF", "IDR", "ILS", "IMP", 
+//         "INR", "IQD", "IRR", "ISK", "JMD", "JOD", "JPY","KES","KGS","KHR","KID","KMF","KRW","KWD", "KYD","KZT","LAK","LBP","LKR","LRD","LSL", "LYD",
+//         "MAD","MDL","MGA","MKD","MMK","MNT","MOP","MRU","MUR","MVR","MWK","MXN","MYR","MZN","NAD","NGN","NIO","NOK","NPR","NZD","OMR","PAB","PEN",
+//         "PGK","PHP","PKR","PLN","PYG","QAR","RON","RSD","RUB","RWF","SAR","SBD","SCR","SDG","SEK","SGD","SHP","SLL","SOS","SRD","SSP","STN","SYP","SZL", 
+//         "THB","TJS","TMT","TND","TOP","TRY","TTD","TVD","TWD","TZS","UAH","UGX","USD","UYU","UZS","VES","VND","VUV","WST","YER","ZAR"].includes(quoteCurrency)) {
+//         document.getElementById('demo3').style.display = "block";  
+//         document.getElementById("inputText5").value = '';
+//         text = "Invalid quote currency"
 
-        }
+//         }
 
-        else {
-          text = "Input OK";
-          document.getElementById('demo3').style.display = "none";
-          createLi = true;
-          // CALL ADDING ITEMS FUNCTION SO THAT ONLY VALIDATED ITEMS CAN GET ADDED TO LIST
-          // addingItems();
-          setTimeout(
-              function() {
-            document.getElementById('inputText5').value="";
-              }, 100);          
-        }
-          document.getElementById("demo3").innerHTML = text;
-        }
+//         else {
+//           text = "Input OK";
+//           document.getElementById('demo3').style.display = "none";
+//           createLi = true;
+//           // CALL ADDING ITEMS FUNCTION SO THAT ONLY VALIDATED ITEMS CAN GET ADDED TO LIST
+//           // addingItems();
+//           setTimeout(
+//               function() {
+//             document.getElementById('inputText5').value="";
+//               }, 100);          
+//         }
+//           document.getElementById("demo3").innerHTML = text;
+//         }
 
 
 // Custom messages validation

From d91866ac5f0e793735ffac7003006fb1a705e915 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 15:37:47 +0800
Subject: [PATCH 04/57] commodities and indices dropdown menus

---
 templates/index.html | 53 ++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index e4b750a..c369a4b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2536,30 +2536,24 @@
                   </div>
 
                   <div class="col-auto">
-
-                    <input
-
+<!--                     <input
                       type="text"
-
                       id="inputText20"
-
                       class="form-control"
-
                       aria-describedby="TextHelpInline"
-
-                      placeholder="e.g. BRENTOIL"
-                    />
-
+                      placeholder="e.g. BRENTOIL"/> -->
+                    <select id="commodities-items" class="form-select animation-select">
+                      <option>Aluminum</option><option>Brent Crude Oil</option><option>Coffee</option><option>Copper</option><option>Corn</option>
+                      <option>Cotton</option><option>Gold</option><option>Palladium</option><option>Platinum</option><option>Rice</option>
+                      <option>Silver</option><option>Soybean</option><option>Sugar</option><option>Wheat</option><option>WTI Crude Oil</option>
+                      <option>Ethanol</option><option>Natural Gas</option><option>Cocoa</option><option>Lumber</option><option>Live Cattle</option>
+                      <option>Lean Hog</option>
+                    </select>
                   </div>
 
-
-
                   <div class="col-auto">
-
                     <button id="inputTextBtn20" class="btn set-btn" onclick="commoditiesValidate()">Add</button>
-
                   </div>
-
                   <p id="demo8" style="display: none"></p>
 
                 </div>
@@ -2966,30 +2960,35 @@
                   </div>
 
                   <div class="col-auto">
-
+<!-- 
                     <input
-
                       type="text"
-
                       id="inputText21"
-
                       class="form-control"
-
                       aria-describedby="TextHelpInline"
-
                       placeholder="e.g. ^DJI"
-                    />
+                    /> -->
 
+                    <select id="indices-items" class="form-select animation-select">
+                      <option>Dow Jones - USA</option><option>S&P 500 - USA</option><option>Nasdaq 100 - USA</option>
+                      <option>Nasdaq Composite - USA</option><option>Russell 2000 - USA</option><option>VIX - USA</option>
+                      <option>S&P/TSX - Canada</option><option>IPC - Mexico</option><option>Bovespa - Brazil</option>
+                      <option>Dax - Germany</option><option>FTSE 100 - UK</option><option>IBEX 35 - Spain</option>
+                      <option>CAC 40 - France</option><option>SSMI - Switzerland</option><option>BEL 20 - Brussels</option>
+                      <option>ATX - Austria</option><option>AEX - Amsterdam</option><option>OMXS30 - Stockholm</option>
+                      <option>OMXH25 - Helsinki</option><option>FTSE MIB - Italy</option><option>PSI 20 - Lisbon</option>
+                      <option>STOXX 600 - EU</option><option>STOXX 50 - EU</option><option>Euronext 100 - EU</option>
+                      <option>KOSPI - South Korea</option><option>NZX 50 - New Zealand</option><option>ASX 200 - Australia</option>
+                      <option>STI - Singapore</option><option>SSE - Shanghai</option><option>SZSE - Shenzhen</option>
+                      <option>Nikkei 225 - Japan</option><option>NIFTY 50 - India</option><option>SENSEX - India</option>
+                      <option>HSI - Hong Kong</option><option>TAIEX - Taiwan</option><option>JKSE - Jakarta</option>
+                      <option>PSEI - Philippines</option><option>SET - Bangkok</option><option>BIST 100 - Istanbul</option>
+                    </select>
                   </div>
 
-
-
                   <div class="col-auto">
-
                     <button id="inputTextBtn21" class="btn set-btn" onclick="indicesValidate()">Add</button>
-
                   </div>
-
                   <p id="demo9" style="display: none"></p>
 
                 </div>

From 5296819e48906c31f50612c47b66759d6f6e9d26 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 15:39:30 +0800
Subject: [PATCH 05/57] commodities and indices dropdown menus

---
 static/app.js | 187 +++++++++++++++++++++++++-------------------------
 1 file changed, 94 insertions(+), 93 deletions(-)

diff --git a/static/app.js b/static/app.js
index dd19f11..2e48257 100755
--- a/static/app.js
+++ b/static/app.js
@@ -750,8 +750,8 @@ var forexText = document.getElementById("base-select").value + ',' + document.ge
 var currentWeatherText = document.getElementById("inputText6");
 var dailyForecastText = document.getElementById("inputText7");
 var messagesText = document.getElementById("inputText13");
-var commoditiesText = document.getElementById("inputText20");
-var indicesText = document.getElementById("inputText21");
+var indicesText = document.getElementById("indices-items");
+var commoditiesText = document.getElementById("commodities-items");
 
 var allFeaturesText = [
   stocksText,
@@ -2465,115 +2465,116 @@ function dailyWeatherValidate() {
 // Commodities validation
 
 function commoditiesValidate() {
+  createLi = true;
+}
+// var specialChars = /[`!@#$%^&*()_+\-=\[\]{};':"\\|<>\/?~]/;
 
-var specialChars = /[`!@#$%^&*()_+\-=\[\]{};':"\\|<>\/?~]/;
+//   let x = document.getElementById("inputText20").value;
 
-  let x = document.getElementById("inputText20").value;
+//   let text;
+//     if (x.toUpperCase() != x) {
+//       document.getElementById('demo8').style.display = "block";
+//       text = "Commodity symbol must be uppercase";
+//       document.getElementById("inputText20").value = '';
+//       // createLi = false;
+//     }
+//         else if (x === '') {
+//         document.getElementById('demo8').style.display = "block";  
+//         text = "No blanks"
+//         // createLi = false;
+//         }
 
-  let text;
-    if (x.toUpperCase() != x) {
-      document.getElementById('demo8').style.display = "block";
-      text = "Commodity symbol must be uppercase";
-      document.getElementById("inputText20").value = '';
-      // createLi = false;
-    }
-        else if (x === '') {
-        document.getElementById('demo8').style.display = "block";  
-        text = "No blanks"
-        // createLi = false;
-        }
+//         else if (x.includes(' ')) {
+//         text = "No spaces";
+//         document.getElementById('demo8').style.display = "block";
+//         document.getElementById("inputText20").value = ''; 
+//         // createLi = false;
+//         }
 
-        else if (x.includes(' ')) {
-        text = "No spaces";
-        document.getElementById('demo8').style.display = "block";
-        document.getElementById("inputText20").value = ''; 
-        // createLi = false;
-        }
+//         else if (specialChars.test(x)) {
+//           document.getElementById('demo8').style.display = "block";
+//         text = "No special characters allowed";
+//         document.getElementById("inputText20").value = ''; 
+//         // createLi = false;
+//         } 
 
-        else if (specialChars.test(x)) {
-          document.getElementById('demo8').style.display = "block";
-        text = "No special characters allowed";
-        document.getElementById("inputText20").value = ''; 
-        // createLi = false;
-        } 
+//         else if (!["ALU","BRENTOIL","LCO","COFFEE","XCU","CORN","COTTON","XAU","IRD","NI","XPD","XPT","XRH","RICE","RUTH","XAG","SOYBEAN",
+//           "XDR","SUGAR","TIN","WHEAT","WTIOIL","ZNC","ETHANOL","CPO","NG","COCOA","ROBUSTA","LUMBER","RUBBER","HOG","CATTLE"].includes(x)) {
+//         document.getElementById('demo8').style.display = "block";  
+//         document.getElementById("inputText20").value = '';
+//         text = "Invalid commodity symbol"
 
-        else if (!["ALU","BRENTOIL","LCO","COFFEE","XCU","CORN","COTTON","XAU","IRD","NI","XPD","XPT","XRH","RICE","RUTH","XAG","SOYBEAN",
-          "XDR","SUGAR","TIN","WHEAT","WTIOIL","ZNC","ETHANOL","CPO","NG","COCOA","ROBUSTA","LUMBER","RUBBER","HOG","CATTLE"].includes(x)) {
-        document.getElementById('demo8').style.display = "block";  
-        document.getElementById("inputText20").value = '';
-        text = "Invalid commodity symbol"
+//         }
 
-        }
-
-        else {
-          text = "Input OK";
-          document.getElementById('demo8').style.display = "none";
-          createLi = true;
-          // CALL ADDING ITEMS FUNCTION SO THAT ONLY VALIDATED ITEMS CAN GET ADDED TO LIST
-          setTimeout(
-              function() {
-            document.getElementById('inputText20').value="";
-              }, 100);          
-        }
-          document.getElementById("demo8").innerHTML = text;
-        }
+//         else {
+//           text = "Input OK";
+//           document.getElementById('demo8').style.display = "none";
+//           createLi = true;
+//           // CALL ADDING ITEMS FUNCTION SO THAT ONLY VALIDATED ITEMS CAN GET ADDED TO LIST
+//           setTimeout(
+//               function() {
+//             document.getElementById('inputText20').value="";
+//               }, 100);          
+//         }
+//           document.getElementById("demo8").innerHTML = text;
+//         }
 
 
 // Indices validation
-
 function indicesValidate() {
+  createLi = true
+};
+// var specialChars = /[`!@#$%&*()_+\-=\[\]{};':"\\|<>\/?~]/;
 
-var specialChars = /[`!@#$%&*()_+\-=\[\]{};':"\\|<>\/?~]/;
+//   let x = document.getElementById("inputText21").value;
 
-  let x = document.getElementById("inputText21").value;
+//   let text;
+//     if (x.toUpperCase() != x) {
+//       document.getElementById('demo9').style.display = "block";
+//       text = "Index symbol must be uppercase";
+//       document.getElementById("inputText21").value = '';
+//       // createLi = false;
+//     }
+//         else if (x === '') {
+//         document.getElementById('demo9').style.display = "block";  
+//         text = "No blanks"
+//         // createLi = false;
+//         }
 
-  let text;
-    if (x.toUpperCase() != x) {
-      document.getElementById('demo9').style.display = "block";
-      text = "Index symbol must be uppercase";
-      document.getElementById("inputText21").value = '';
-      // createLi = false;
-    }
-        else if (x === '') {
-        document.getElementById('demo9').style.display = "block";  
-        text = "No blanks"
-        // createLi = false;
-        }
+//         else if (x.includes(' ')) {
+//         text = "No spaces";
+//         document.getElementById('demo9').style.display = "block";
+//         document.getElementById("inputText21").value = ''; 
+//         // createLi = false;
+//         }
 
-        else if (x.includes(' ')) {
-        text = "No spaces";
-        document.getElementById('demo9').style.display = "block";
-        document.getElementById("inputText21").value = ''; 
-        // createLi = false;
-        }
+//         else if (specialChars.test(x)) {
+//           document.getElementById('demo9').style.display = "block";
+//         text = "No special characters allowed";
+//         document.getElementById("inputText21").value = ''; 
+//         // createLi = false;
+//         } 
 
-        else if (specialChars.test(x)) {
-          document.getElementById('demo9').style.display = "block";
-        text = "No special characters allowed";
-        document.getElementById("inputText21").value = ''; 
-        // createLi = false;
-        } 
+//         else if (!["^DJI","^GSPC","^NDX","^RUT","^VIX","^GSPTSE","^MXX","^BVSP","^GDAXI","^FTSE","^IBEX","^FCHI","^SSMI","^BFX","^ATX","^AEX","^OMX","^IXIC","FTSEMIB.MI",
+//           "^OMXH25","PSI20.LS","^STOXX","^STOXX50E","^N100","^KS11","^NZ50","^AXJO","^STI","000001.SS","399001.SZ","^N225","^NSEI","^BSESN","^HSI","^TWII","^JKSE","PSEI.PS","^SET.BK","XU100.IS"].includes(x)) {
+//         document.getElementById('demo9').style.display = "block";  
+//         document.getElementById("inputText21").value = '';
+//         text = "Invalid index symbol"
 
-        else if (!["^DJI","^GSPC","^NDX","^RUT","^VIX","^GSPTSE","^MXX","^BVSP","^GDAXI","^FTSE","^IBEX","^FCHI","^SSMI","^BFX","^ATX","^AEX","^OMX","^IXIC","FTSEMIB.MI",
-          "^OMXH25","PSI20.LS","^STOXX","^STOXX50E","^N100","^KS11","^NZ50","^AXJO","^STI","000001.SS","399001.SZ","^N225","^NSEI","^BSESN","^HSI","^TWII","^JKSE","PSEI.PS","^SET.BK","XU100.IS"].includes(x)) {
-        document.getElementById('demo9').style.display = "block";  
-        document.getElementById("inputText21").value = '';
-        text = "Invalid index symbol"
-
-        }
+//         }
   
-        else {
-          text = "Input OK";
-          document.getElementById('demo9').style.display = "none";
-          createLi = true;
-          // CALL ADDING ITEMS FUNCTION SO THAT ONLY VALIDATED ITEMS CAN GET ADDED TO LIST
-          setTimeout(
-              function() {
-            document.getElementById('inputText21').value="";
-              }, 100);          
-        }
-          document.getElementById("demo9").innerHTML = text;
-        }
+//         else {
+//           text = "Input OK";
+//           document.getElementById('demo9').style.display = "none";
+//           createLi = true;
+//           // CALL ADDING ITEMS FUNCTION SO THAT ONLY VALIDATED ITEMS CAN GET ADDED TO LIST
+//           setTimeout(
+//               function() {
+//             document.getElementById('inputText21').value="";
+//               }, 100);          
+//         }
+//           document.getElementById("demo9").innerHTML = text;
+//         }
 
 
 // portoflio stuff

From 016068e393e92f415c0a43c0e89bb4d17e2f2690 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 16:31:08 +0800
Subject: [PATCH 06/57] commodities convert dict key to value, vice versa

---
 server.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/server.py b/server.py
index 60187c9..b9f4f12 100755
--- a/server.py
+++ b/server.py
@@ -173,8 +173,18 @@ def index():
     stocks_settings = json.load(f)
     f.close()
     
+    dict1 = {
+        "Aluminum": "ALU", "Brent Crude Oil": "BRENTOIL", "Coffee": "COFFEE", "Copper": "XCU", "Corn": "CORN", "Cotton": "COTTON", "Gold": "XAU",
+        "Palladium": "XPD", "Platinum": "XPT", "Rice": "RICE", "Silver": "XAG", "Soybean": "SOYBEAN", "Sugar": "SUGAR", "Wheat": "WHEAT",
+        "WTI Crude Oil": "WTIOIL", "Ethanol": "ETHANOL", "Crude Palm Oil": "CPO", "Natural Gas": "NG", "Cocoa": "COCOA", "Robusta": "ROBUSTA",
+        "Lumber": "LUMBER", "Rubber": "RUBBER", "Live Cattle": "CATTLE", "Lean Hog": "HOG"}
     f = open('csv/commodities_settings.json', 'r')
     commodities_settings = json.load(f)
+    try:
+        reversed_dict1 = {value: key for key, value in dict1.items()}
+        commodities_settings['symbols'] = [reversed_dict1[value] for value in commodities_settings['symbols']]
+    except:
+        pass
     f.close()
     
     f = open('csv/indices_settings.json', 'r')
@@ -999,6 +1009,12 @@ def combine_dict(current_settings, input_symbols, current_key):
     
 def save_trade_settings(input_settings):
 
+    commodities_dict = {
+        "Aluminum": "ALU", "Brent Crude Oil": "BRENTOIL", "Coffee": "COFFEE", "Copper": "XCU", "Corn": "CORN", "Cotton": "COTTON", "Gold": "XAU",
+        "Palladium": "XPD", "Platinum": "XPT", "Rice": "RICE", "Silver": "XAG", "Soybean": "SOYBEAN", "Sugar": "SUGAR", "Wheat": "WHEAT",
+        "WTI Crude Oil": "WTIOIL", "Ethanol": "ETHANOL", "Crude Palm Oil": "CPO", "Natural Gas": "NG", "Cocoa": "COCOA", "Robusta": "ROBUSTA",
+        "Lumber": "LUMBER", "Rubber": "RUBBER", "Live Cattle": "CATTLE", "Lean Hog": "HOG" 
+    }
    
     filename = input_settings['feature'].lower() + '_settings.json'
     f = open('csv/' + filename, 'r')
@@ -1016,7 +1032,12 @@ def save_trade_settings(input_settings):
     if input_settings['feature'] == 'Stocks':
         current_settings['prepost'] = input_settings['prepost']
     if input_settings['feature'] == 'Stocks' or input_settings['feature'] == 'Crypto':
-        current_settings['chart'] = input_settings['chart']    
+        current_settings['chart'] = input_settings['chart']  
+    if input_settings['feature'] == 'Commodities':
+        try:
+            input_settings['symbols'] = [commodities_dict[symbol] for symbol in input_settings['symbols']]
+        except:
+            pass
     
     current_settings = combine_dict(current_settings, input_settings['symbols'], 'symbols')
     

From 52df206a4e6f3c4db6345b477a0db4e7b38818f6 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 16:57:05 +0800
Subject: [PATCH 07/57] indices dict and values

---
 server.py | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/server.py b/server.py
index b9f4f12..3bd0d3c 100755
--- a/server.py
+++ b/server.py
@@ -187,9 +187,23 @@ def index():
         pass
     f.close()
     
+    dict2 = {'BIST 100 - Istanbul': 'XU100.IS', 'SET - Bangkok': '^SET.BK', 'PSEI - Philippines': 'PSEI.PS', 'JKSE - Jakarta': '^JKSE',
+        'TAIEX - Taiwan': '^TWII', 'HSI - Hong Kong': '^HSI', 'SENSEX - India': '^BSESN', 'NIFTY 50 - India': '^NSEI', 'Nikkei 225 - Japan': '^N225',
+        'SZSE - Shenzhen': '399001.SZ', 'SSE - Shanghai': '000001.SS', 'STI - Singapore': '^STI', 'ASX 200 - Australia': '^AXJO',
+        'NZX 50 - New Zealand': '^NZ50', 'KOSPI - South Korea': '^KS11','Euronext 100 - EU': '^N100', 'STOXX 50 - EU': '^STOXX50E',
+        'STOXX 600 - EU': '^STOXX', 'PSI 20 - Lisbon': 'PSI20.LS', 'FTSE MIB - Italy': 'FTSEMIB.MI', 'OMXH25 - Helsinki': '^OMXH25',
+        'OMXS30 - Stockholm': '^OMX', 'AEX - Amsterdam': '^AEX', 'ATX - Austria': '^ATX', 'BEL 20 - Brussels': '^BFX',
+        'SSMI - Switzerland': '^SSMI', 'CAC 40 - France': '^FCHI', 'IBEX 35 - Spain': '^IBEX', 'FTSE 100 - UK': '^FTSE', 'Dax - Germany': '^GDAXI',
+        'Bovespa - Brazil': '^BVSP', 'IPC - Mexico': '^MXX', 'S&P/TSX - Canada': '^GSPTSE', 'VIX - USA': '^VIX', 'Russell 2000 - USA': '^RUT',
+        'Nasdaq Composite - USA': '^IXIC', 'Nasdaq 100 - USA': '^NDX', 'S&P 500 - USA': '^GSPC', 'Dow Jones - USA': '^DJI'}
     f = open('csv/indices_settings.json', 'r')
     indices_settings = json.load(f)
-    f.close()    
+    try:
+        reversed_dict2 = {value: key for key, value in dict2.items()}
+        indices_settings['symbols'] = [reversed_dict2[value] for value in indices_settings['symbols']]
+    except:
+        pass
+    f.close()
     
     f= open('csv/crypto_settings.json', 'r')
     crypto_settings = json.load(f)
@@ -1015,7 +1029,17 @@ def save_trade_settings(input_settings):
         "WTI Crude Oil": "WTIOIL", "Ethanol": "ETHANOL", "Crude Palm Oil": "CPO", "Natural Gas": "NG", "Cocoa": "COCOA", "Robusta": "ROBUSTA",
         "Lumber": "LUMBER", "Rubber": "RUBBER", "Live Cattle": "CATTLE", "Lean Hog": "HOG" 
     }
-   
+    indices_dict = {'BIST 100 - Istanbul': 'XU100.IS', 'SET - Bangkok': '^SET.BK', 'PSEI - Philippines': 'PSEI.PS', 'JKSE - Jakarta': '^JKSE',
+        'TAIEX - Taiwan': '^TWII', 'HSI - Hong Kong': '^HSI', 'SENSEX - India': '^BSESN', 'NIFTY 50 - India': '^NSEI', 'Nikkei 225 - Japan': '^N225',
+        'SZSE - Shenzhen': '399001.SZ', 'SSE - Shanghai': '000001.SS', 'STI - Singapore': '^STI', 'ASX 200 - Australia': '^AXJO',
+        'NZX 50 - New Zealand': '^NZ50', 'KOSPI - South Korea': '^KS11','Euronext 100 - EU': '^N100', 'STOXX 50 - EU': '^STOXX50E',
+        'STOXX 600 - EU': '^STOXX', 'PSI 20 - Lisbon': 'PSI20.LS', 'FTSE MIB - Italy': 'FTSEMIB.MI', 'OMXH25 - Helsinki': '^OMXH25',
+        'OMXS30 - Stockholm': '^OMX', 'AEX - Amsterdam': '^AEX', 'ATX - Austria': '^ATX', 'BEL 20 - Brussels': '^BFX',
+        'SSMI - Switzerland': '^SSMI', 'CAC 40 - France': '^FCHI', 'IBEX 35 - Spain': '^IBEX', 'FTSE 100 - UK': '^FTSE', 'Dax - Germany': '^GDAXI',
+        'Bovespa - Brazil': '^BVSP', 'IPC - Mexico': '^MXX', 'S&P/TSX - Canada': '^GSPTSE', 'VIX - USA': '^VIX', 'Russell 2000 - USA': '^RUT',
+        'Nasdaq Composite - USA': '^IXIC', 'Nasdaq 100 - USA': '^NDX', 'S&P 500 - USA': '^GSPC', 'Dow Jones - USA': '^DJI'
+    }
+	
     filename = input_settings['feature'].lower() + '_settings.json'
     f = open('csv/' + filename, 'r')
     current_settings = json.load(f)
@@ -1038,6 +1062,11 @@ def save_trade_settings(input_settings):
             input_settings['symbols'] = [commodities_dict[symbol] for symbol in input_settings['symbols']]
         except:
             pass
+    if input_settings['feature'] == 'Indices':
+        try:
+            input_settings['symbols'] = [indices_dict[symbol] for symbol in input_settings['symbols']]
+        except:
+            pass
     
     current_settings = combine_dict(current_settings, input_settings['symbols'], 'symbols')
     

From c9c224675a53f527f6944a7b18809f22eafc047d Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 18:01:33 +0800
Subject: [PATCH 08/57] ipo calendar feature added

---
 server.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/server.py b/server.py
index 3bd0d3c..87ba292 100755
--- a/server.py
+++ b/server.py
@@ -121,7 +121,8 @@ app = Flask(__name__)
 def index():
     global command
     all_features = ['Current Weather','Daily Forecast','News', 'Sports (Upcoming Games)','Sports (Past Games)','Sports (Live Games)',
-                'Sports (Team Stats)','Custom Images', 'Custom GIFs', 'Custom Messages', 'Stocks', 'Crypto', 'Forex', 'Commodities', 'Indices', 'Movies', 'IPO Calendar']
+                    'Sports (Team Stats)','Custom Images', 'Custom GIFs', 'Custom Messages', 'Stocks', 'Crypto', 'Forex', 'Commodities', 'Indices', 'Movies',
+		    'IPO Calendar', 'Economic Calendar']
     
     global professional
     
@@ -433,11 +434,11 @@ def save_displaying(input_settings):
     global professional
   
     all_settings = ['Stocks', 'Crypto', 'Forex', 'Commodities', 'Indices', 'Current Weather', 'Daily Forecast', 'News', 'Sports (Upcoming Games)', 'Sports (Past Games)',
-                    'Sports (Live Games)', 'Sports (Team Stats)', 'Custom Images', 'Custom GIFs', 'Custom Messages', 'Movies', 'IPO Calendar']
+                    'Sports (Live Games)', 'Sports (Team Stats)', 'Custom Images', 'Custom GIFs', 'Custom Messages', 'Movies', 'IPO Calendar', 'Economic Calendar']
     professional = len(input_settings) == 2
     if professional:
         all_settings = ['Stocks', 'Crypto', 'Forex', 'Commodities', 'Indices', 'Current Weather', 'News', 'Daily Forecast', 'Sports (Upcoming Games)',
-                        'Sports (Past Games)', 'Sports (Team Stats)', 'Sports (Live Games)', 'Custom Messages', 'Custom Images', 'Movies', 'IPO Calendar']
+                        'Sports (Past Games)', 'Sports (Team Stats)', 'Sports (Live Games)', 'Custom Messages', 'Custom Images', 'Movies', 'IPO Calendar', 'Economic Calendar']
         
    
     positions = []

From a58109d6a592eed765f415dfdebc6c06b90b7282 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 18:05:01 +0800
Subject: [PATCH 09/57] added frontend economic calendar

---
 templates/index.html | 243 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 197 insertions(+), 46 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index c369a4b..1154cad 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1204,49 +1204,29 @@
                 class="display-features-list text-white">
 
               {%if professional%}
-
                {% for f in not_displaying2 %}
-
                       <li>{{f}}</li>
-
                   {% endfor%}
-
-
             	{%else%} 
                 
                 <li>Stocks</li>
-
                 <li>Crypto</li>
-
                 <li>Forex</li>
-                
                 <li>Commodities</li>
-                
                 <li>Indices</li>
-
                 <li>Current Weather</li>
-
                 <li>Daily Forecast</li>
-
                 <li>News</li>
-
                 <li>Custom Images</li>
-
                 <li>Custom Messages</li>
-
                 <li>Custom Gifs</li>
-
                 <li>Sports (Upcoming Games)</li>
-
                 <li>Sports (Live Games)</li>
-
                 <li>Sports (Past Games)</li>
-
                 <li>Sports (Team Stats)</li>
-                
                 <li>Movies</li>
-                
                 <li>IPO Calendar</li>
+                <li>Economic Calendar</li>
 
               {%endif%}
                 
@@ -1329,59 +1309,36 @@
     <!-- What to Display in Each Feature -->
 
     <div class="row" style="padding:2%">
-
       <h3 class="pt-3">What to Display in Each Feature</h3>
-
     </div>
 
       <div class="row justify-content-center">
 
           <div class="col-auto">
-
             <label for="dropZ" class="col-form-label">Feature:</label>
-
           </div>
 
           <div class="col-auto">
-
             <select id="drop" class="form-select">
-
               <option value="1">Stocks</option>
-
               <option value="2">Crypto</option>
-
               <option value="3">Forex</option>
-              
               <option value="14">Commodities</option>
-              
               <option value="15">Indices</option>
-
               <option value="4">Current Weather</option>
-
               <option value="5">Daily Forecast</option>
-
               <option value="6">News</option>
-
               <option value="7">Sports (Upcoming Games)</option>
-
               <option value="8">Sports (Past Games)</option>
-
               <option value="9">Sports (Live Games)</option>
-
               <option value="10">Sports (Team Stats)</option>
-
               <option value="11">Custom Images</option>
-
               <option value="12">Custom GIFs</option>
-
               <option value="13">Custom Messages</option>
-              
               <option value="16">Movies</option>
-              
-              <option value="17">IPO Calendar</option> 
-
+              <option value="17">IPO Calendar</option>
+              <option value="18">Economic Calendar</option>
             </select>
-
           </div> 
 
         </div><!-- End Row Dropdown Display Feature -->
@@ -6656,6 +6613,200 @@
 
           </div>      
 
+      
+      
+    <!-- Economic Calendar -->
+
+          <div class="page" id="Page18" style="display: none">
+            <div class="row">
+              <div class="col-lg-6 col-md-6 col-sm-12">
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputScrollSpeedZ222" class="col-form-label">Scroll Speed:</label>
+                  </div>
+
+                  <div class="col-auto">
+                    <select
+                      id="economic_speed"
+                      class="form-select speed-select">
+
+                      <option {%if economic_settings.speed == 'medium' %} selected {% endif %}>Medium</option>
+                      <option {%if economic_settings.speed == 'slow' %} selected {% endif %}>Slow</option>
+                      <option {%if economic_settings.speed == 'fast' %} selected {% endif %}>Fast</option>
+
+                    </select>
+                  </div>
+                </div>
+
+
+                <div class="row g-3 align-items-center mt-3 left-div">
+                  <div class="col-auto">
+                    <label for="inputScrollSpeedRowZ222" class="col-form-label">Scroll Speed (Row 2):</label>
+                  </div>
+
+                  <div class="col-auto">
+                    <select
+                      id="economic_speed2"
+                      class="form-select speed-select">
+
+                      <option {%if economic_settings.speed2 == 'medium' %} selected {% endif %}>Medium</option>
+                      <option {%if economic_settings.speed2 == 'slow' %} selected {% endif %}>Slow</option>
+                      <option {%if economic_settings.speed2 == 'fast' %} selected {% endif %}>Fast</option>
+                    </select>
+
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputTransitionZ222" class="col-form-label">Intro Transition:
+                    </label>
+
+                  </div>
+
+                  <div class="col-auto">
+                    <select id="economic_animation" class="form-select animation-select">
+                      <option {%if economic_settings.animation == 'down' %} selected {% endif %}>Down</option>
+                      <option {%if economic_settings.animation == 'up' %} selected {% endif %}>Up</option>
+                      <option {%if economic_settings.animation == 'continuous' %} selected {% endif %}>Continuous</option>
+                    </select>
+                  </div>
+
+                </div>
+
+                <div class="row g-3 align-items-center left-div" style="padding-top: 25px;">
+                  <div class="col-auto">
+                    <label for="inputTransitionZ222" class="col-form-label">
+                      Display Feature Title
+                    </label>
+                  </div>
+
+                  <div class="col-auto">
+                    <input
+                      class="form-check-input title-select"
+                      type="checkbox"
+                      value=""
+                      id="economic_settings_title"
+
+                      {% if economic_settings.title%}
+                      checked
+                      {%endif%}
+                    />
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputText" class="col-form-label">Countries: </label>
+                  </div>
+
+                  <div class="col-auto">
+                    <select id="inputTransition2222" class="form-select economic-countries-select">
+                      <option>United States</option><option>Canada</option><option>United Kingdom</option><option>China</option>
+                      <option>Germany</option><option>France</option><option>Italy</option><option>Singapore</option><option>South Korea</option>
+                      <option>Japan</option><option>Australia</option><option>New Zealand</option><option>India</option><option>Switzerland</option>
+                      <option>Spain</option><option>Hong Kong</option><option>Portugal</option><option>Netherlands</option><option>Belgium</option>
+                      <option>Austria</option><option>Denmark</option><option>Turkey</option><option>Brazil</option><option>Mexico</option>
+                      <option>Sweden</option><option>Finland</option><option>Norway</option><option>Taiwan</option><option>Indonesia</option>
+                      <option>Philippines</option><option>Thailand</option><option>South Africa</option>
+                    </select>
+                  </div>
+
+                  <div class="col-auto">
+                    <button id="economic-countries-btn" class="btn set-btn">Add</button>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputText" class="col-form-label">Importance: </label>
+                  </div>
+                  <div class="col-auto">
+                    <select id="inputTransition2225" class="form-select economic-importance-select">
+                      <option {%if economic_settings.importance == -1 %} selected {% endif %}>Low - High</option>
+                      <option {%if economic_settings.importance == 0 %} selected {% endif %}>Med - High</option>
+                      <option {%if economic_settings.importance == 1 %} selected {% endif %}>High</option>
+                    </select>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputText" class="col-form-label">Timezone: </label>
+                  </div>
+                  <div class="col-auto">
+                    <select id="inputTransition22259" class="form-select economic-tz-select">
+                      <option {%if scheduler_settings.timezone == 'US/Eastern' %} selected {% endif %}>US/Eastern</option>
+                      <option {%if scheduler_settings.timezone == 'US/Central' %} selected {% endif %}>US/Central</option>
+                      <option {%if scheduler_settings.timezone == 'US/Pacific' %} selected {% endif %}>US/Pacific</option>
+                      <option {%if scheduler_settings.timezone == 'GMT' %} selected {% endif %}>GMT</option>
+                      <option {%if scheduler_settings.timezone == 'CET' %} selected {% endif %}>CET</option>
+                      <option {%if scheduler_settings.timezone == 'GB' %} selected {% endif %}>GB</option>
+                      <option {%if scheduler_settings.timezone == 'NZ' %} selected {% endif %}>NZ</option>
+                      <option {%if scheduler_settings.timezone == 'Australia/ACT' %} selected {% endif %}>Australia/ACT</option>
+                      <option {%if scheduler_settings.timezone == 'Japan' %} selected {% endif %}>Japan</option>
+                      <option {%if scheduler_settings.timezone == 'Asia/Singapore' %} selected {% endif %}>Asia/Singapore</option>
+                      <option {%if scheduler_settings.timezone == 'Asia/Dubai' %} selected {% endif %}>Asia/Dubai</option>
+                    </select>
+                  </div>
+                </div>
+
+
+              </div>
+
+
+
+              <div class="col-lg-4 col-md-4 col-sm-12">
+                <h6 class="mt-3">List:</h6>
+                <div class="features-div-two">
+                  <ul
+                    id="economic-list"
+                    class="display-features-list text-white symbol-list"
+                  >
+                  </ul>
+                </div>
+              </div>
+
+              <div class="col-lg-2 col-md-2 col-sm-12">
+                <div class="icons-list">
+                  <i
+                    id="economic-increase-btn"
+                    class="upbutton fa fa-chevron-up"
+                    aria-hidden="true"
+                  ></i>
+
+                  <br />
+                  <br />
+
+                  <i
+                    id="economic-decrease-btn"
+                    class="downbutton fa fa-chevron-down"
+                    aria-hidden="true"
+                  ></i>
+
+                  <a style="position: relative; bottom: 30px; left: 10px">Sort Order</a>
+                  <br />
+                  <br />
+
+                  <i
+                    id="economic-remove-btn"
+                    class="fa fa-minus"
+                    aria-hidden="true"
+                  ></i>
+
+                  <span style="position: relative; bottom: 0; left: 10px">Remove</span>
+
+                </div>
+              </div>
+            </div>
+
+            <div class="save-btn-div">
+              <a href="#" class="btn save-btn">Save</a>
+            </div>
+
+          </div>      
+
+      
 
     <!-- IPO Calendar -->
 

From aefaa56fb4fd97e75c74499ba3823f9a5475222f Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 18:13:38 +0800
Subject: [PATCH 10/57] economic_settings

---
 server.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server.py b/server.py
index 87ba292..7caf2a3 100755
--- a/server.py
+++ b/server.py
@@ -266,6 +266,10 @@ def index():
     general_settings = json.load(f)
     f.close()
 
+    f = open('csv/economic_settings.json', 'r')
+    economic_settings = json.load(f)
+    f.close()
+
     try:
         f = open('csv/scheduler.json','r')
         scheduler_settings = json.load(f)

From 8c12504f6445687ac8e787b512dcacd4b5a2d0a9 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 18:17:35 +0800
Subject: [PATCH 11/57] economic_settings added to render template

---
 server.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server.py b/server.py
index 7caf2a3..8e9e72b 100755
--- a/server.py
+++ b/server.py
@@ -332,7 +332,8 @@ def index():
         'ipo_api_key':ipo_api_key,
         'wifi_SSID':wifi_SSID,
         'wifi_PSK':wifi_PSK,
-	'scheduler_settings':scheduler_settings
+	'scheduler_settings':scheduler_settings,
+	'economic_settings':economic_settings
       }
       
 

From 29af10698aabf05092b066ab39320b9ff156e0ad Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 18:21:27 +0800
Subject: [PATCH 12/57] economic_timezone fix

---
 templates/index.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 1154cad..2df4187 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6736,17 +6736,17 @@
                   </div>
                   <div class="col-auto">
                     <select id="inputTransition22259" class="form-select economic-tz-select">
-                      <option {%if scheduler_settings.timezone == 'US/Eastern' %} selected {% endif %}>US/Eastern</option>
-                      <option {%if scheduler_settings.timezone == 'US/Central' %} selected {% endif %}>US/Central</option>
-                      <option {%if scheduler_settings.timezone == 'US/Pacific' %} selected {% endif %}>US/Pacific</option>
-                      <option {%if scheduler_settings.timezone == 'GMT' %} selected {% endif %}>GMT</option>
-                      <option {%if scheduler_settings.timezone == 'CET' %} selected {% endif %}>CET</option>
-                      <option {%if scheduler_settings.timezone == 'GB' %} selected {% endif %}>GB</option>
-                      <option {%if scheduler_settings.timezone == 'NZ' %} selected {% endif %}>NZ</option>
-                      <option {%if scheduler_settings.timezone == 'Australia/ACT' %} selected {% endif %}>Australia/ACT</option>
-                      <option {%if scheduler_settings.timezone == 'Japan' %} selected {% endif %}>Japan</option>
-                      <option {%if scheduler_settings.timezone == 'Asia/Singapore' %} selected {% endif %}>Asia/Singapore</option>
-                      <option {%if scheduler_settings.timezone == 'Asia/Dubai' %} selected {% endif %}>Asia/Dubai</option>
+                      <option {%if economic_settings.timezone == 'US/Eastern' %} selected {% endif %}>US/Eastern</option>
+                      <option {%if economic_settings.timezone == 'US/Central' %} selected {% endif %}>US/Central</option>
+                      <option {%if economic_settings.timezone == 'US/Pacific' %} selected {% endif %}>US/Pacific</option>
+                      <option {%if economic_settings.timezone == 'GMT' %} selected {% endif %}>GMT</option>
+                      <option {%if economic_settings.timezone == 'CET' %} selected {% endif %}>CET</option>
+                      <option {%if economic_settings.timezone == 'GB' %} selected {% endif %}>GB</option>
+                      <option {%if economic_settings.timezone == 'NZ' %} selected {% endif %}>NZ</option>
+                      <option {%if economic_settings.timezone == 'Australia/ACT' %} selected {% endif %}>Australia/ACT</option>
+                      <option {%if economic_settings.timezone == 'Japan' %} selected {% endif %}>Japan</option>
+                      <option {%if economic_settings.timezone == 'Asia/Singapore' %} selected {% endif %}>Asia/Singapore</option>
+                      <option {%if economic_settings.timezone == 'Asia/Dubai' %} selected {% endif %}>Asia/Dubai</option>
                     </select>
                   </div>
                 </div>

From 3e20abac2f8812b1d781fa6caa26db8c2265fcd2 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 12 Jun 2023 22:44:31 +0800
Subject: [PATCH 13/57] economic settings show countries

---
 templates/index.html | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 2df4187..6a9217a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1756,19 +1756,11 @@
                 <div class="features-div-two">
 
                   <ul
-
                     id="stocks-features"
-
-                    class="display-features-list text-white symbol-list"
-
-                  >
-
+                    class="display-features-list text-white symbol-list">
                   {% for f in stocks_settings.symbols %}
-
                       <li>{{f}}</li>
-
                     {% endfor%}
-
                   </ul>
 
                 </div>
@@ -6763,6 +6755,9 @@
                     id="economic-list"
                     class="display-features-list text-white symbol-list"
                   >
+                  {% for f in economic_settings.countries %}
+                      <li>{{f}}</li>
+                    {% endfor%}
                   </ul>
                 </div>
               </div>

From 5203d0a0ee4ac977b200eb613f9b4ff523a88411 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 15:00:14 +0800
Subject: [PATCH 14/57] inputscrollspeedrow18

---
 templates/index.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 6a9217a..4b9f3ff 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6619,13 +6619,11 @@
 
                   <div class="col-auto">
                     <select
-                      id="economic_speed"
+                      id="inputScrollSpeed18"
                       class="form-select speed-select">
-
                       <option {%if economic_settings.speed == 'medium' %} selected {% endif %}>Medium</option>
                       <option {%if economic_settings.speed == 'slow' %} selected {% endif %}>Slow</option>
                       <option {%if economic_settings.speed == 'fast' %} selected {% endif %}>Fast</option>
-
                     </select>
                   </div>
                 </div>
@@ -6638,7 +6636,7 @@
 
                   <div class="col-auto">
                     <select
-                      id="economic_speed2"
+                      id="inputScrollSpeedRow18"
                       class="form-select speed-select">
 
                       <option {%if economic_settings.speed2 == 'medium' %} selected {% endif %}>Medium</option>
@@ -6657,7 +6655,7 @@
                   </div>
 
                   <div class="col-auto">
-                    <select id="economic_animation" class="form-select animation-select">
+                    <select id="inputTransition18" class="form-select animation-select">
                       <option {%if economic_settings.animation == 'down' %} selected {% endif %}>Down</option>
                       <option {%if economic_settings.animation == 'up' %} selected {% endif %}>Up</option>
                       <option {%if economic_settings.animation == 'continuous' %} selected {% endif %}>Continuous</option>

From a5f495be5eac2475388e1837f1f1c9c43daeda64 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 15:57:05 +0800
Subject: [PATCH 15/57] added economic settings backend

---
 static/app.js | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/static/app.js b/static/app.js
index 2e48257..d3e295b 100755
--- a/static/app.js
+++ b/static/app.js
@@ -48,6 +48,7 @@ var commoditiesFeatures = document.querySelectorAll("#commodities-features li");
 var indicesFeatures = document.querySelectorAll("#indices-features li");
 var moviesFeatures = document.querySelectorAll("#movies-features li");
 var ipoFeatures = document.querySelectorAll("#ipo-features li");
+var economicFeatures = document.querySelectorAll("#economic-list li");
 
 var allFeaturesList = [
   stocksFeatures,
@@ -67,6 +68,7 @@ var allFeaturesList = [
   indicesFeatures,
   moviesFeatures,
   ipoFeatures,
+  economicFeatures,
 ];
 
 // features remove buttons
@@ -93,6 +95,7 @@ var commoditiesRemoveBtn = document.getElementById("commodities-remove-btn");
 var indicesRemoveBtn = document.getElementById("indices-remove-btn");
 var moviesRemoveBtn = document.getElementById("movies-remove-btn");
 var ipoRemoveBtn = document.getElementById("ipo-remove-btn");
+var economicRemoveBtn = document.getElementById("economic-remove-btn");
 
 var allFeaturesRemoveBtns = [
   stocksRemoveBtn,
@@ -112,6 +115,7 @@ var allFeaturesRemoveBtns = [
   indicesRemoveBtn,
   moviesRemoveBtn,
   ipoRemoveBtn,
+  economicRemoveBtn,
 ];
 // features increase buttons
 var stocksincreaseBtn = document.getElementById("stocks-increase-btn");
@@ -137,6 +141,7 @@ var commoditiesincreaseBtn = document.getElementById("commodities-increase-btn")
 var indicesincreaseBtn = document.getElementById("indices-increase-btn");
 var moviesincreaseBtn = document.getElementById("movies-increase-btn");
 var ipoincreaseBtn = document.getElementById("ipo-increase-btn");
+var economicincreaseBtn = document.getElementById("economic-increase-btn");
 
 var allFeaturesIncreaseBtns = [
   stocksincreaseBtn,
@@ -156,6 +161,7 @@ var allFeaturesIncreaseBtns = [
   indicesincreaseBtn,
   moviesincreaseBtn,
   ipoincreaseBtn,
+  economicincreaseBtn,
 ];
 
 // features decrease buttons
@@ -182,6 +188,7 @@ var commoditiesDecreaseBtn = document.getElementById("commodities-decrease-btn")
 var indicesDecreaseBtn = document.getElementById("indices-decrease-btn");
 var moviesDecreaseBtn = document.getElementById("movies-decrease-btn");
 var ipoDecreaseBtn = document.getElementById("ipo-decrease-btn");
+var economicDecreaseBtn = document.getElementById("economic-decrease-btn");
 
 var allFeaturesDecreaseBtns = [
   stocksDecreaseBtn,
@@ -201,6 +208,7 @@ var allFeaturesDecreaseBtns = [
   indicesDecreaseBtn,
   moviesDecreaseBtn,
   ipoDecreaseBtn,
+  economicDecreaseBtn,
 ];
 
 const changeVarValue = () => {
@@ -227,6 +235,7 @@ const changeVarValue = () => {
   indicesFeatures = document.querySelectorAll("#indices-features li");
   moviesFeatures = document.querySelectorAll("#movies-features li");
   ipoFeatures = document.querySelectorAll("#ipo-features li");
+  economicFeatures = document.querySelectorAll("#economic-list li");
   
   allFeaturesList = [
     stocksFeatures,
@@ -246,6 +255,7 @@ const changeVarValue = () => {
     indicesFeatures,
     moviesFeatures,
     ipoFeatures,
+    economicFeatures,
   ];
 };
 
@@ -610,6 +620,7 @@ var commodities = document.getElementById("commodities-features");
 var indices = document.getElementById("indices-features");
 var movies = document.getElementById("movies-features");
 var ipos = document.getElementById("ipo-features");
+var economics = document.getElementById("economic-list");
 
 var allFeatures = [
   stocks,
@@ -629,6 +640,7 @@ var allFeatures = [
   indices,
   movies,
   ipos,
+  economics,
 ];
 
 // features select box
@@ -638,6 +650,7 @@ var pastGamesSelect = document.getElementById("inputTransition83");
 var liveGamesSelect = document.getElementById("inputTransition93");
 var teamStatsSelect = document.getElementById("inputTransition103");
 var moviesSelect = document.getElementById("inputTransition64");
+var economicSelect = document.getElementById("inputTransition2222");
 var allFeaturesSelectBox = [
   null,
   null,
@@ -656,6 +669,7 @@ var allFeaturesSelectBox = [
   null,
   moviesSelect,
   null,
+  economicSelect,
 ];
 
 // features select add buttons
@@ -664,6 +678,8 @@ var upcomingGamesAddBtn = document.getElementById("inputTransitionBtn73");
 var pastGamesAddBtn = document.getElementById("inputTransitionBtn83");
 var liveGamesAddBtn = document.getElementById("inputTransitionBtn93");
 var teamStatsAddBtn = document.getElementById("inputTransitionBtn103");
+var economicAddBtn = document.getElementById("economic-countries-btn");
+
 var allFeaturesSelectAddBtn = [
   null,
   null,
@@ -682,6 +698,7 @@ var allFeaturesSelectAddBtn = [
   null,
   null,
   null,
+  economicAddBtn,
 ];
 
 allFeaturesSelectAddBtn.map((value, index) => {
@@ -718,6 +735,7 @@ var allFeaturesFile = [
   null,
   null,
   null,
+  null,
 ];
 // features file add button
 var imagesFileAddBtn = document.getElementById("inputTextBtn11");
@@ -741,6 +759,7 @@ var allFeaturesFileAddBtn = [
   null,
   null,
   null,
+  null,
 ];
 
 // features input text
@@ -771,6 +790,7 @@ var allFeaturesText = [
   indicesText,
   null,
   null,
+  null,
 ];
 
 // features text add button
@@ -801,6 +821,7 @@ var allFeaturesTextAddBtn = [
   indicesTextAddBtn,
   null,
   null,
+  null,
 ];
 
 
@@ -822,6 +843,7 @@ var allFeaturesLimit = [
   40,
   null,
   null,
+  null,
 ];
 
 
@@ -1086,6 +1108,7 @@ function getFeatureSettings() {
     "Indices",
     "Movies",
     "IPO Calendar",
+    "Economic Calendar",
   ];
   let pageNum = features.indexOf(feature) + 1;
   let pageSelector = "Page" + pageNum.toString();
@@ -1148,6 +1171,9 @@ function getFeatureSettings() {
     case 17:
       s = getIpoSettings(page);
       break;
+    case 18:
+      s = getEconomicSettings(page);
+      break;
   }
   
   settings = { ...settings, ...s }; // merge both sets of settings
@@ -1339,6 +1365,7 @@ function saveMovieAPIKey(){
     "Indices",
     "Movies",
     "IPO Calendar",
+    "Economic Calendar",
   ];
   let pageNum = features.indexOf(feature) + 1;
   let pageSelector = "Page" + pageNum.toString();
@@ -1380,6 +1407,7 @@ function saveIpoAPIKey(){
     "Indices",
     "Movies",
     "IPO Calendar",
+    "Economic Calendar",
   ];
   let pageNum = features.indexOf(feature) + 1;
   let pageSelector = "Page" + pageNum.toString();
@@ -1630,6 +1658,25 @@ function getMessageSettings(page) {
   return { title: title, messages: new_messages };
 }
 
+// economic settings
+function getEconomicSettings(page) {
+  
+  let title = page.querySelectorAll(".title-select")[0].checked;
+  let countries = getListItems(page.querySelectorAll(".symbol-list")[0]);
+  let importance = page.querySelectorAll(".economic-importance-select")[0].value;
+  let timezone = page.querySelectorAll(".economic-tz-select")[0].value;
+
+  settings = {
+    title: title,
+    countries: countries,
+    importance: importance,
+    timezone: timezone,
+  };
+  console.log(settings);
+  return settings;
+}
+
+
 // Join Network
 
 let wifiSsidInput = document.getElementById("wifi-ssid-input");
@@ -1761,7 +1808,7 @@ inputAnimationBtn.addEventListener("click", () => {
 // scroll speed row two
 let inputScrollSpeedRow = [];
 
-for (let i = 1; i <= 17; i++) {
+for (let i = 1; i <= 18; i++) {
   inputScrollSpeedRow.push(
     document.getElementById(
       i === 1 ? "inputScrollSpeedRow" : `inputScrollSpeedRow${i}`

From ce6d99f1a4d8ae92327df659a6a2aaccb69820fd Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 16:17:54 +0800
Subject: [PATCH 16/57] added economic calendar

---
 csv/last_updates.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/csv/last_updates.json b/csv/last_updates.json
index 02368cb..45420d7 100644
--- a/csv/last_updates.json
+++ b/csv/last_updates.json
@@ -1 +1 @@
-{"scheduler":{"force": false}, "stocks": {"time": "14/06/2022 06:42:06", "force": false}, "crypto": {"time": "14/06/2022 06:58:18", "force": false}, "news": {"time": "14/06/2022 05:29:08", "force": false}, "weather": {"time": "14/06/2022 05:29:08", "force": false}, "forex": {"time": "14/06/2022 05:29:14", "force": false}, "sports_l": {"time": "14/06/2022 04:42:37", "force": false}, "sports_p": {"time": "14/06/2022 06:27:34", "force": false}, "sports_u": {"time": "14/06/2022 06:28:34", "force": false}, "sports_t": {"time": "14/06/2022 06:26:23", "force": false}, "commodities": {"time": "14/06/2022 06:51:07", "force": false}, "indices": {"time": "05/10/2022 04:06:10", "force": false}, "movies": {"time": "05/10/2022 02:31:40", "force": false}, "ipo": {"time": "05/10/2022 02:31:40", "force": false}, "prepost": {"time": "05/10/2022 02:31:40", "force": false}}
+{"scheduler":{"force": false}, "stocks": {"time": "14/06/2022 06:42:06", "force": false}, "crypto": {"time": "14/06/2022 06:58:18", "force": false}, "news": {"time": "14/06/2022 05:29:08", "force": false}, "weather": {"time": "14/06/2022 05:29:08", "force": false}, "forex": {"time": "14/06/2022 05:29:14", "force": false}, "sports_l": {"time": "14/06/2022 04:42:37", "force": false}, "sports_p": {"time": "14/06/2022 06:27:34", "force": false}, "sports_u": {"time": "14/06/2022 06:28:34", "force": false}, "sports_t": {"time": "14/06/2022 06:26:23", "force": false}, "commodities": {"time": "14/06/2022 06:51:07", "force": false}, "indices": {"time": "05/10/2022 04:06:10", "force": false}, "movies": {"time": "05/10/2022 02:31:40", "force": false}, "ipo": {"time": "05/10/2022 02:31:40", "force": false}, "prepost": {"time": "05/10/2022 02:31:40", "force": false}, "economic": {"time": "05/10/2022 02:31:40", "force": false}}

From db8a0d3b6f4d1c76bf8b20c27ba38f75b110f25b Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 16:28:09 +0800
Subject: [PATCH 17/57] save_economic_settings

---
 server.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/server.py b/server.py
index 8e9e72b..a133652 100755
--- a/server.py
+++ b/server.py
@@ -596,6 +596,8 @@ def save():
         save_movie_settings(input_settings)
     elif feature == 'IPO Calendar':
         save_ipo_settings(input_settings)
+    elif feature == 'Economic Calendar':
+        save_economic_settings(input_settings)
     elif 'Sports' in feature:
         save_sports_settings(input_settings)
         
@@ -1233,6 +1235,34 @@ def save_ipo_settings(input_settings):
     f.close()
 
 
+def save_economic_settings(input_settings):
+    filename = 'economic_settings.json' 
+    f = open('csv/' + filename, 'r')
+    current_settings = json.load(f)
+    f.close()
+	
+    current_settings['speed'] = input_settings['speed'].lower()
+    current_settings['speed2'] = input_settings['speed2'].lower()
+    current_settings['animation'] = input_settings['animation'].lower()
+    current_settings['title'] = input_settings['title']
+    current_settings['timezone'] = input_settings['timezone']
+    current_settings['countries'] = input_settings['countries']
+    current_settings['importance'] = input_settings['importance']
+
+    f = open('csv/' + filename, 'w')
+    json.dump(current_settings, f)
+    f.close()
+    f = open('csv/last_updates.json', 'r')
+    last_updates = json.load(f)
+    f.close()
+
+    last_updates['economic']['force'] = True
+
+    f = open('csv/last_updates.json', 'w')
+    json.dump(last_updates, f)
+    f.close()
+
+
 def save_sports_settings(input_settings):
     
     feature = input_settings['feature']

From 4fae1812a5fc6920af53b501b8042219e01db7a9 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 16:29:13 +0800
Subject: [PATCH 18/57] economic settings last updates

---
 database_caller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database_caller.py b/database_caller.py
index 0f43ce2..6480061 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -1468,7 +1468,7 @@ if __name__ == '__main__':
                 "news": {"time": "06/03/2022 04:07:09", "force": True}, "weather": {"time": "06/03/2022 04:08:20", "force": True}, 
                 "forex": {"time": "06/03/2022 03:54:02", "force": True}, "sports_l": {"time": "06/03/2022 04:10:09", "force": True}, 
                 "sports_p": {"time": "06/03/2022 04:10:09", "force": True},
-                "sports_u": {"time": "06/03/2022 04:10:09", "force": True},"sports_t": {"time": "06/03/2022 04:10:09", "force": True}, "commodities": {"time": "06/03/2022 04:10:09", "force": True}, "indices": {"time": "06/03/2022 04:10:09", "force": True}, "movies": {"time": "06/03/2022 04:10:09", "force": True}, "ipo": {"time": "06/03/2022 04:10:09", "force": True}, "prepost": {"time": "06/03/2022 04:10:09", "force": True}}
+                "sports_u": {"time": "06/03/2022 04:10:09", "force": True},"sports_t": {"time": "06/03/2022 04:10:09", "force": True}, "commodities": {"time": "06/03/2022 04:10:09", "force": True}, "indices": {"time": "06/03/2022 04:10:09", "force": True}, "movies": {"time": "06/03/2022 04:10:09", "force": True}, "ipo": {"time": "06/03/2022 04:10:09", "force": True}, "prepost": {"time": "06/03/2022 04:10:09", "force": True}, "economic": {"time": "06/03/2022 04:10:09", "force": True}}
 
             try:
                 if last_updates['scheduler']['force']:

From b40842e040880969fd72169816ae1ae07dccf5e4 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 16:44:37 +0800
Subject: [PATCH 19/57] economic settings db caller (WIP)

---
 database_caller.py | 104 ++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 59 deletions(-)

diff --git a/database_caller.py b/database_caller.py
index 6480061..96a4080 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -591,12 +591,8 @@ def updateIndices(api_key, logf):
         
         
 def updateCrypto(api_key, logf):
- 
-
 
     try:
-        
-        
         f = open('csv/crypto_settings.json', 'r')
         all_crypto_settings = json.load(f)
         f.close()
@@ -618,8 +614,6 @@ def updateCrypto(api_key, logf):
         response = requests.get(url)
         data = response.json()
     
-    
-        
         coin_info = {}
         if len(data) > 0:
             for sb in symbol_base:
@@ -639,7 +633,6 @@ def updateCrypto(api_key, logf):
         
     except:
         pass
-        
         #logf = open('log.txt', "a")
         #exc_type, exc_obj, exc_tb = sys.exc_info()
         #fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1]
@@ -651,9 +644,7 @@ def updateCrypto(api_key, logf):
         #logf.close()
 
 def updateForex(api_key, logf):
-    
 
-    
     try:
         f = open('csv/forex_settings.json', 'r')
         all_forex_settings = json.load(f)
@@ -670,8 +661,7 @@ def updateForex(api_key, logf):
         targets = ','.join(symbols)
         
         url = 'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/forex?symbols='
-        
-        
+
         for i,s in enumerate(symbols):
             url += s + '-' + bases[i] + ','
         url = url[:-1] #remove last comma
@@ -679,8 +669,7 @@ def updateForex(api_key, logf):
             
         response = requests.get(url)
         data = response.json()
-        
-      
+
         if len(data) > 0:
 
             c_dict = {}
@@ -689,9 +678,6 @@ def updateForex(api_key, logf):
                     if d['uid'].replace('/',',') == sb:
                         c_dict[d['uid'].replace('/',',')] = {'current': d['rate'], '24hr_change': d['rate_over_24hr'], 'percent_change':d['percent_over_24hr']}
             
-         
-            
-            
             all_forex_settings['symbols'] = c_dict
             
             f = open( "csv/forex_settings.json", 'w+' )
@@ -709,9 +695,12 @@ def updateForex(api_key, logf):
         #logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
         #logf.close()
 
+        
+def updateEconomic(api_key, logf):
+    
+        
 
 def updateNews(api_key, logf):
-    
     try:
         f = open('csv/news_settings.json', 'r')
         all_settings = json.load(f)
@@ -1386,11 +1375,7 @@ if __name__ == '__main__':
     
     t = time.time()
     
-    
-    
-    
-
-    update_frequencies = {'stocks':2, 'crypto':7, 'forex':60, 'news':120, 'weather': 120, 'sports': 1440, 'commodities': 15, 'indices': 15, 'movies': 1440, 'ipo': 1440, 'prepost': 15} #minutes
+    update_frequencies = {'stocks':2, 'crypto':7, 'forex':60, 'news':120, 'weather': 120, 'sports': 1440, 'commodities': 15, 'indices': 15, 'movies': 1440, 'ipo': 1440, 'prepost': 15, 'economic': 15} #minutes
 
     NY_zone = pytz.timezone('America/New_York')
     CET_zone = pytz.timezone('EST')
@@ -1417,15 +1402,15 @@ if __name__ == '__main__':
         weather_key = api_keys[1].strip()
     except Exception as e:
         weather_key = False
-        logf = open('log.txt', "a")
-        exc_type, exc_obj, exc_tb = sys.exc_info()
-        fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1]
-        logf.write(str(e))
-        logf.write('. file: ' + fname)
-        logf.write('. line: ' +  str(exc_tb.tb_lineno))
-        logf.write('. type: ' +  str(exc_type))
-        logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
-        logf.close()
+#         logf = open('log.txt', "a")
+#         exc_type, exc_obj, exc_tb = sys.exc_info()
+#         fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1]
+#         logf.write(str(e))
+#         logf.write('. file: ' + fname)
+#         logf.write('. line: ' +  str(exc_tb.tb_lineno))
+#         logf.write('. type: ' +  str(exc_type))
+#         logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
+#         logf.close()
     
     try:
         movie_key = open('movie_api_key.txt').readlines()[0]
@@ -1457,7 +1442,6 @@ if __name__ == '__main__':
     
     try:
         while True:
-            
             try:
                 f = open('csv/last_updates.json', 'r')
                 last_updates = json.load(f)
@@ -1516,8 +1500,6 @@ if __name__ == '__main__':
          
             #msg = getInput()
             
-                 
-              
             NY_time = datetime.now(NY_zone).replace(tzinfo=None)
             #stocks
             
@@ -1568,50 +1550,58 @@ if __name__ == '__main__':
                 
             # crypto
             crypto_time = datetime.strptime(last_updates['crypto']['time'], "%d/%m/%Y %H:%M:%S")
-           
             
             NY_time = datetime.now(NY_zone).replace(tzinfo=None)
             diff = (NY_time - crypto_time).total_seconds()/60 #minutes
-           
-            
+          
             if last_updates['crypto']['force'] or diff >= update_frequencies['crypto']:# or msg == 'c':
                 crypto_time = NY_time.strftime("%d/%m/%Y %H:%M:%S")
                 #updateCrypto(api_key, logf)
-               
-                
                 last_updates['crypto']['time'] = crypto_time
                 last_updates['crypto']['force'] = False
                 update_process = Process(target = updateCrypto, args = (api_key,logf))
                 update_process.start()
                 update_processes.append(update_process)
   
+
             # commodities
             commodities_time = datetime.strptime(last_updates['commodities']['time'], "%d/%m/%Y %H:%M:%S")
-           
-            
+
             NY_time = datetime.now(NY_zone).replace(tzinfo=None)
             diff = (NY_time - commodities_time).total_seconds()/60 #minutes
-           
-            
+
             if last_updates['commodities']['force'] or diff >= update_frequencies['commodities']:# or msg == 'c':
                 commodities_time = NY_time.strftime("%d/%m/%Y %H:%M:%S")
                 #updateCrypto(api_key, logf)
-               
-                
+
                 last_updates['commodities']['time'] = commodities_time
                 last_updates['commodities']['force'] = False
                 update_process = Process(target = updateCommodities, args = (api_key,logf))
                 update_process.start()
                 update_processes.append(update_process)
+
+                
+            # economic calendar
+            economic_time = datetime.strptime(last_updates['economic']['time'], "%d/%m/%Y %H:%M:%S")
+           
+            NY_time = datetime.now(NY_zone).replace(tzinfo=None)
+            diff = (NY_time - economic_time).total_seconds()/60 #minutes
+           
+            if last_updates['economic']['force'] or diff >= update_frequencies['economic']:# or msg == 'c':
+                economic_time = NY_time.strftime("%d/%m/%Y %H:%M:%S")               
+                last_updates['economic']['time'] = economic_time
+                last_updates['economic']['force'] = False
+                update_process = Process(target = updateEconomic, args = (api_key,logf))
+                update_process.start()
+                update_processes.append(update_process)
         
+                
             # indices
             indices_time = datetime.strptime(last_updates['indices']['time'], "%d/%m/%Y %H:%M:%S")
-           
-            
+
             NY_time = datetime.now(NY_zone).replace(tzinfo=None)
             diff = (NY_time - indices_time).total_seconds()/60 #minutes
-           
-            
+
             if last_updates['indices']['force'] or diff >= update_frequencies['indices']:# or msg == 'c':
                 indices_time = NY_time.strftime("%d/%m/%Y %H:%M:%S")               
                 
@@ -1621,14 +1611,13 @@ if __name__ == '__main__':
                 update_process.start()
                 update_processes.append(update_process)        
         
+        
             # movies
             movies_time = datetime.strptime(last_updates['movies']['time'], "%d/%m/%Y %H:%M:%S")
-            
-            
+
             NY_time = datetime.now(NY_zone).replace(tzinfo=None)
             diff = (NY_time - movies_time).total_seconds()/60 #minutes
-           
-            
+
             if last_updates['movies']['force'] or diff >= update_frequencies['movies']:
                 movies_time = NY_time.strftime("%d/%m/%Y %H:%M:%S")
                 last_updates['movies']['time'] = movies_time
@@ -1640,12 +1629,10 @@ if __name__ == '__main__':
         
             # ipos
             ipo_time = datetime.strptime(last_updates['ipo']['time'], "%d/%m/%Y %H:%M:%S")
-            
-            
+
             NY_time = datetime.now(NY_zone).replace(tzinfo=None)
             diff = (NY_time - ipo_time).total_seconds()/60 #minutes
-           
-            
+
             if last_updates['ipo']['force'] or diff >= update_frequencies['ipo']:
                 ipo_time = NY_time.strftime("%d/%m/%Y %H:%M:%S")
                 last_updates['ipo']['time'] = ipo_time
@@ -1657,8 +1644,7 @@ if __name__ == '__main__':
         
             # weather
             weather_time = datetime.strptime(last_updates['weather']['time'], "%d/%m/%Y %H:%M:%S")
-        
-            
+
             NY_time = datetime.now(NY_zone).replace(tzinfo=None)
             diff = (NY_time - weather_time).total_seconds()/60 #minutes
             if last_updates['weather']['force'] or diff >= update_frequencies['weather']:# or msg == 'w':

From 33461dd190fd1eb199fb911a55023630e167506f Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 16:54:49 +0800
Subject: [PATCH 20/57] Update index.html

---
 templates/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 4b9f3ff..ecf6a11 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6713,9 +6713,9 @@
                   </div>
                   <div class="col-auto">
                     <select id="inputTransition2225" class="form-select economic-importance-select">
-                      <option {%if economic_settings.importance == -1 %} selected {% endif %}>Low - High</option>
-                      <option {%if economic_settings.importance == 0 %} selected {% endif %}>Med - High</option>
-                      <option {%if economic_settings.importance == 1 %} selected {% endif %}>High</option>
+                      <option {%if economic_settings.importance == 'Low - High' %} selected {% endif %}>Low - High</option>
+                      <option {%if economic_settings.importance == 'Med - High' %} selected {% endif %}>Med - High</option>
+                      <option {%if economic_settings.importance == 'High' %} selected {% endif %}>High</option>
                     </select>
                   </div>
                 </div>

From 4225df4e4c52ea30f86e6015c8ed3ae6e56a277e Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 17:00:48 +0800
Subject: [PATCH 21/57] update economic function

---
 database_caller.py | 110 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/database_caller.py b/database_caller.py
index 96a4080..e312c6f 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -698,6 +698,116 @@ def updateForex(api_key, logf):
         
 def updateEconomic(api_key, logf):
     
+    try:
+        with open('csv/economic_settings.json','r') as f:
+            all_economic_settings = json.load(f)
+    except:
+        all_economic_settings = {"feature": "Economic Calendar", "speed": "medium", "speed2": "medium", "animation": "up", "importance": "Med - High", "title": True, "timezone": "US/Eastern", "countries": ["United States"], "events": []} 
+
+    try:
+        url = 'https://economic-calendar.tradingview.com/events'
+        headers = {'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36'}
+        country_codes = {
+            'United States':'US', 'Canada':'CA', 'Hong Kong':'HK', 'China':'CN', 'Germany':'DE','France':'FR', 'Italy':'IT', 'Singapore':'SG',
+            'South Korea':'KR', 'Japan':'JP', 'Australia':'AU', 'New Zealand':'NZ', 'India':'IN', 'Switzerland':'CH', 'United Kingdom':'GB',
+            'Spain':'ES', 'Portugal':'PT', 'Netherlands':'NL', 'Belgium':'BE', 'Austria':'AT', 'Denmark':'DK', 'Turkey':'TR', 'Brazil':'BR',
+            'Mexico':'MX', 'Sweden':'SE', 'Finland':'FI', 'Norway':'NO', 'Taiwan':'TW', 'Indonesia':'ID', 'Philippines':'PH', 'Thailand':'TH',
+            'South Africa':'ZA'}
+
+        country = all_economic_settings['countries']
+        if all_economic_settings['importance'] == 'Low - High'
+            importance = -1
+        elif all_economic_settings['importance'] == 'Med - High'
+            importance = 0
+        elif all_economic_settings['importance'] == 'High'
+            importance = 1
+        country_codes_list = [country_codes[c] for c in country]
+        result = ",".join(country_codes_list)
+        timezone = pytz.timezone(all_economic_settings['timezone'])
+        # date_local = datetime.now(timezone)
+        # date_local = (date_local - timedelta(hours=1)).strftime('%Y-%m-%dT%H:%M:00')
+        date_local = datetime.now(timezone).strftime('%Y-%m-%dT00:00:00')
+        date_local2 = datetime.now(timezone).strftime('%Y-%m-%dT23:59:00')
+        date_from = timezone.localize(datetime.strptime(date_local,'%Y-%m-%dT%H:%M:%S')).astimezone(pytz.timezone('GMT')).strftime('%Y-%m-%dT%H:%M:%S.000Z')
+        date_to = timezone.localize(datetime.strptime(date_local2,'%Y-%m-%dT%H:%M:%S')).astimezone(pytz.timezone('GMT')).strftime('%Y-%m-%dT%H:%M:%S.000Z')
+
+        params = {
+            'from': date_from,
+            'to': date_to,
+            'countries': result,
+            'minImportance': importance
+        }
+
+        data = requests.get(url, params=params, headers=headers).json()
+        events = []
+
+        try:
+            for each in data['result']:
+                try:
+                    print(each['actual'], each['previous'], each['forecast'])
+                    time = pytz.timezone('GMT').localize(datetime.strptime(each['date'], '%Y-%m-%dT%H:%M:%S.%fZ')).astimezone(timezone).strftime('%a %m/%d %H:%M%p')
+                    if datetime.now(timezone).strftime('%a %m/%d %H:%M%p') >= time:
+                        happened = True
+                    else:
+                        happened = False
+                    try:
+                        unit = str(each['unit'])
+                    except:
+                        unit = ''
+                    try:
+                        scale = str(each['scale'])
+                    except:
+                        scale = ''
+                    if scale != '':
+                        if each['actual'] != '' and each['actual'] is not None:
+                            each['actual'] = str(each['actual']) + scale
+                        if each['previous'] != '' and each['previous'] is not None:
+                            each['previous'] = str(each['previous']) + scale
+                        if each['forecast'] != '' and each['forecast'] is not None:
+                            each['forecast'] = str(each['forecast']) + scale
+                    if unit != '' and scale != '':
+                        if each['actual'] != '' and each['actual'] is not None:
+                            each['actual'] = str(each['actual']) + ' ' + unit
+                        if each['previous'] != '' and each['previous'] is not None:
+                            each['previous']= str(each['previous']) + ' ' + unit
+                        if each['forecast'] != '' and each['forecast'] is not None:
+                            each['forecast'] = str(each['forecast']) + ' ' + unit
+                    elif unit != '' and scale == '':
+                        if each['actual'] != '' and each['actual'] is not None:
+                            each['actual'] = str(each['actual']) + unit
+                        if each['previous'] != '' and each['previous'] is not None:
+                            each['previous']= str(each['previous']) + unit
+                        if each['forecast'] != '' and each['forecast'] is not None:
+                            each['forecast'] = str(each['forecast']) + unit
+
+                    events.append({
+                        'title':each['title'],
+                        'indicator':each['indicator'],
+                        'period':each['period'],
+                        'source':each['source'],
+                        'country':each['country'],
+                        'currency':each['currency'],
+                        'importance':each['importance'],
+                        'time':time,
+                        'actual':each['actual'],
+                        'previous':each['previous'],
+                        'forecast':each['forecast'],
+                        'happened': happened
+                    })
+                except:
+                    pass
+        except:
+            pass
+
+        all_economic_settings['events'] = events
+            
+        with open('csv/economic_settings.json', 'w') as f:
+            f.write(all_economic_settings)
+
+    except:
+        pass
+    
         
 
 def updateNews(api_key, logf):

From d1d044577ffecb7fab6a63e78feacb8a9c9dc0b4 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 17:05:02 +0800
Subject: [PATCH 22/57] added economic settings for reset

---
 setup_config_files.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup_config_files.sh b/setup_config_files.sh
index 1f7ced0..df0d59c 100755
--- a/setup_config_files.sh
+++ b/setup_config_files.sh
@@ -14,14 +14,14 @@ touch crypto_settings.json last_updates.json system_info.json
 touch league_tables.json
 mkdir sports
 touch current_weather.json stocks_settings.json daily_weather.json live_games.json live_mlb.json live_mls.json live_nba.json live_nfl.json live_nhl.json live_pl.json commodities_settings.json indices_settings.json movie_settings.json ipo_settings.json
-touch display_settings.json  message_settings.json  upcoming_games.json forex_settings.json prepost_settings.json scheduler.json
+touch display_settings.json  message_settings.json  upcoming_games.json forex_settings.json prepost_settings.json scheduler.json economic_settings.json
 touch GIF_settings.json news_settings.json image_settings.json past_games.json general_settings.json portfolio_settings.json portfolio_crypto_settings.json
 
-filenames="crypto_settings.json last_updates.json league_tables.json current_weather.json stocks_settings.json daily_weather.json live_games.json live_mlb.json live_mls.json live_nba.json live_nfl.json live_nhl.json live_pl.json commodities_settings.json indices_settings.json movie_settings.json ipo_settings.json display_settings.json  message_settings.json  upcoming_games.json forex_settings.json GIF_settings.json news_settings.json image_settings.json past_games.json portfolio_settings.json portfolio_crypto_settings.json prepost_settings.json scheduler.json"
+filenames="crypto_settings.json last_updates.json league_tables.json current_weather.json stocks_settings.json daily_weather.json live_games.json live_mlb.json live_mls.json live_nba.json live_nfl.json live_nhl.json live_pl.json commodities_settings.json indices_settings.json movie_settings.json ipo_settings.json economic_settings.json display_settings.json  message_settings.json  upcoming_games.json forex_settings.json GIF_settings.json news_settings.json image_settings.json past_games.json portfolio_settings.json portfolio_crypto_settings.json prepost_settings.json scheduler.json"
 
 echo '{"update_available": false, "first_boot": true}' >> system_info.json
 echo [\"Standard\", [[\"Stocks\", \"Crypto\", \"Forex\"]]] >> display_settings.json
-echo '{"scheduler":{"force": false}, "stocks": {"time": "07/03/2022 12:33:06", "force": true}, "crypto": {"time": "07/03/2022 12:28:51", "force": true}, "news": {"time": "07/03/2022 12:28:51", "force": true}, "weather": {"time": "07/03/2022 12:28:51", "force": true}, "forex": {"time": "07/03/2022 12:28:51", "force": true}, "sports_l": {"time": "07/03/2022 12:32:46", "force": true}, "sports_p": {"time": "07/03/2022 12:32:26", "force": true}, "sports_u": {"time": "07/03/2022 12:31:55", "force": true}, "sports_t": {"time": "07/03/2022 12:32:56", "force": true}, "commodities": {"time": "07/03/2022 12:32:56", "force": true}, "indices": {"time": "07/03/2022 12:32:56", "force": true}, "movies": {"time": "07/03/2022 12:32:56", "force": true}, "ipo": {"time": "05/10/2022 02:31:40", "force": false}, "prepost": {"time": "05/10/2022 02:31:40", "force": false}}' >> last_updates.json
+echo '{"scheduler":{"force": false}, "stocks": {"time": "07/03/2022 12:33:06", "force": true}, "crypto": {"time": "07/03/2022 12:28:51", "force": true}, "news": {"time": "07/03/2022 12:28:51", "force": true}, "weather": {"time": "07/03/2022 12:28:51", "force": true}, "forex": {"time": "07/03/2022 12:28:51", "force": true}, "sports_l": {"time": "07/03/2022 12:32:46", "force": true}, "sports_p": {"time": "07/03/2022 12:32:26", "force": true}, "sports_u": {"time": "07/03/2022 12:31:55", "force": true}, "sports_t": {"time": "07/03/2022 12:32:56", "force": true}, "commodities": {"time": "07/03/2022 12:32:56", "force": true}, "indices": {"time": "07/03/2022 12:32:56", "force": true}, "movies": {"time": "07/03/2022 12:32:56", "force": true}, "ipo": {"time": "05/10/2022 02:31:40", "force": false}, "prepost": {"time": "05/10/2022 02:31:40", "force": false}, "economic": {"time": "05/10/2022 02:31:40", "force": false}}' >> last_updates.json
 
 
 echo '{"feature": "Stocks", "speed": "medium","speed2": "medium", "animation": "down", "percent": false, "point": true, "logos": true, "chart": false, "title": true, "symbols": {"ETH,USD": {"current": "2629.32", "24hr_change": "-27.6432", "percent_change": "-1.04"}, "BTC,USD": {"current": "38161.00", "24hr_change": "-50.8386", "percent_change": "-0.13"}, "BNB,USD": {"current": "372.57", "24hr_change": "0.4140", "percent_change": "0.11"}, "ADA,BTC": {"current": "0.0000", "24hr_change": "-0.0000", "percent_change": "-3.74"}}}' >> crypto_settings.json 
@@ -52,6 +52,7 @@ echo '{"symbols": {}}' >> portfolio_settings.json
 echo '{"symbols": {}}' >> portfolio_crypto_settings.json
 echo '{}' >> prepost_settings.json
 echo '{"shutdown": {"hour": "00", "minute": "00", "enabled": false}, "reboot":{"hour": "00", "minute": "00", "enabled": false}, "timezone": "GMT", "brightness1":{"hour": "00", "minute": "00", "bright": "10", "enabled": false}, "brightness2":{"hour": "00", "minute": "00", "bright": "10", "enabled": false}}, "brightness3":{"hour": "00", "minute": "00", "bright": "10", "enabled": false}}, "brightness4":{"hour": "00", "minute": "00", "bright": "10", "enabled": false}}' >> scheduler.json
+echo '{"feature": "Economic Calendar", "speed": "medium", "speed2": "medium", "animation": "up", "importance": "Med - High", "title": true, "timezone": "US/Eastern", "countries": ["United States"], "events": []}' >> economic_settings.json
 
 echo '{"brightness": 10, "country_code": "GB", "hostname": "fintic"}' >> general_settings.json
 chmod 777 *

From 8c776d6660a23173f73d73986dc633e7df009945 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 17:06:37 +0800
Subject: [PATCH 23/57] economic calendar.ppm

---
 setup_config_files.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup_config_files.sh b/setup_config_files.sh
index df0d59c..19e3c07 100755
--- a/setup_config_files.sh
+++ b/setup_config_files.sh
@@ -103,6 +103,8 @@ touch 'Movies.ppm'
 touch 'Movies Prof.ppm'
 touch 'IPO Calendar.ppm'
 touch 'IPO Calendar Prof.ppm'
+touch 'Economic Calendar.ppm'
+touch 'Economic Calendar Prof.ppm'
 chmod 777 *
 
 

From bd6e28272a9b0ac68b0155c0a5c59329915c35b7 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 17:11:17 +0800
Subject: [PATCH 24/57] forgot to add ':'

---
 database_caller.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/database_caller.py b/database_caller.py
index e312c6f..65f779d 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -716,11 +716,11 @@ def updateEconomic(api_key, logf):
             'South Africa':'ZA'}
 
         country = all_economic_settings['countries']
-        if all_economic_settings['importance'] == 'Low - High'
+        if all_economic_settings['importance'] == 'Low - High':
             importance = -1
-        elif all_economic_settings['importance'] == 'Med - High'
+        elif all_economic_settings['importance'] == 'Med - High':
             importance = 0
-        elif all_economic_settings['importance'] == 'High'
+        elif all_economic_settings['importance'] == 'High':
             importance = 1
         country_codes_list = [country_codes[c] for c in country]
         result = ",".join(country_codes_list)

From 97f47ed4586f017563b5ec82ae30251567af1a7e Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 17:29:00 +0800
Subject: [PATCH 25/57] fixed some json stuff with update economic

---
 database_caller.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/database_caller.py b/database_caller.py
index 65f779d..6270c91 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -799,11 +799,9 @@ def updateEconomic(api_key, logf):
                     pass
         except:
             pass
-
         all_economic_settings['events'] = events
-            
         with open('csv/economic_settings.json', 'w') as f:
-            f.write(all_economic_settings)
+            json.dump(all_economic_settings, f)
 
     except:
         pass

From 5a0938a528bc6041cfd5b99660c22e3c5e85e961 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 17:48:16 +0800
Subject: [PATCH 26/57] economic calendar country logos

---
 logos/economic_logos/AT.png | Bin 0 -> 892 bytes
 logos/economic_logos/AU.png | Bin 0 -> 1345 bytes
 logos/economic_logos/BE.png | Bin 0 -> 945 bytes
 logos/economic_logos/BR.png | Bin 0 -> 1064 bytes
 logos/economic_logos/CA.png | Bin 0 -> 1332 bytes
 logos/economic_logos/CH.png | Bin 0 -> 948 bytes
 logos/economic_logos/CN.png | Bin 0 -> 1214 bytes
 logos/economic_logos/DE.png | Bin 0 -> 924 bytes
 logos/economic_logos/DK.png | Bin 0 -> 972 bytes
 logos/economic_logos/ES.png | Bin 0 -> 1310 bytes
 logos/economic_logos/EU.png | Bin 0 -> 1747 bytes
 logos/economic_logos/FI.png | Bin 0 -> 820 bytes
 logos/economic_logos/FR.png | Bin 0 -> 1008 bytes
 logos/economic_logos/GB.png | Bin 0 -> 792 bytes
 logos/economic_logos/HK.png | Bin 0 -> 1644 bytes
 logos/economic_logos/ID.png | Bin 0 -> 773 bytes
 logos/economic_logos/IN.png | Bin 0 -> 1218 bytes
 logos/economic_logos/IT.png | Bin 0 -> 902 bytes
 logos/economic_logos/JP.png | Bin 0 -> 1081 bytes
 logos/economic_logos/KR.png | Bin 0 -> 1623 bytes
 logos/economic_logos/MX.png | Bin 0 -> 1219 bytes
 logos/economic_logos/NL.png | Bin 0 -> 965 bytes
 logos/economic_logos/NO.png | Bin 0 -> 1074 bytes
 logos/economic_logos/NZ.png | Bin 0 -> 1391 bytes
 logos/economic_logos/PH.png | Bin 0 -> 1339 bytes
 logos/economic_logos/PT.png | Bin 0 -> 1553 bytes
 logos/economic_logos/SE.png | Bin 0 -> 932 bytes
 logos/economic_logos/SG.png | Bin 0 -> 1248 bytes
 logos/economic_logos/TH.png | Bin 0 -> 916 bytes
 logos/economic_logos/TR.png | Bin 0 -> 1454 bytes
 logos/economic_logos/TW.png | Bin 0 -> 1323 bytes
 logos/economic_logos/US.png | Bin 0 -> 1353 bytes
 logos/economic_logos/ZA.png | Bin 0 -> 1173 bytes
 33 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 logos/economic_logos/AT.png
 create mode 100644 logos/economic_logos/AU.png
 create mode 100644 logos/economic_logos/BE.png
 create mode 100644 logos/economic_logos/BR.png
 create mode 100644 logos/economic_logos/CA.png
 create mode 100644 logos/economic_logos/CH.png
 create mode 100644 logos/economic_logos/CN.png
 create mode 100644 logos/economic_logos/DE.png
 create mode 100644 logos/economic_logos/DK.png
 create mode 100644 logos/economic_logos/ES.png
 create mode 100644 logos/economic_logos/EU.png
 create mode 100644 logos/economic_logos/FI.png
 create mode 100644 logos/economic_logos/FR.png
 create mode 100644 logos/economic_logos/GB.png
 create mode 100644 logos/economic_logos/HK.png
 create mode 100644 logos/economic_logos/ID.png
 create mode 100644 logos/economic_logos/IN.png
 create mode 100644 logos/economic_logos/IT.png
 create mode 100644 logos/economic_logos/JP.png
 create mode 100644 logos/economic_logos/KR.png
 create mode 100644 logos/economic_logos/MX.png
 create mode 100644 logos/economic_logos/NL.png
 create mode 100644 logos/economic_logos/NO.png
 create mode 100644 logos/economic_logos/NZ.png
 create mode 100644 logos/economic_logos/PH.png
 create mode 100644 logos/economic_logos/PT.png
 create mode 100644 logos/economic_logos/SE.png
 create mode 100644 logos/economic_logos/SG.png
 create mode 100644 logos/economic_logos/TH.png
 create mode 100644 logos/economic_logos/TR.png
 create mode 100644 logos/economic_logos/TW.png
 create mode 100644 logos/economic_logos/US.png
 create mode 100644 logos/economic_logos/ZA.png

diff --git a/logos/economic_logos/AT.png b/logos/economic_logos/AT.png
new file mode 100644
index 0000000000000000000000000000000000000000..4601ee6ff2a23fa775e73d2a940ac5577324ee64
GIT binary patch
literal 892
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9F5
zM?jcysy3fAP(gfvPlzi}@;?}SpEVD{z(xMPaPi-pw?Jj@E$rXQsC=+<{jq4-zfYgw
z>i>QI3{>+eKIL;p?w`B&AmTugFXc5~s_OrJ{|*uPb?C_F%>2I(9zqpdy!0_7>T^=Y
zpR3n_BL6;rfk=I+r~zvEeeu%YhmRmCKW7y{*#F+Ye`jF+@5@)9_@6(2e*XOV_wQeb
znqR+u!PyWIAo=_EZ@3`P{I{A0|GxhKihs_``%+N)_vI@f`_H}m@DTV?SoZhzYmkEM
zg1?WS02vT2&|%+a&HWFw;=x0RE+7Nw>tB2Je+&!<`s?4fZ$QOB02Be!|7Yzz_!1bz
zr6oar!3?5>n{Isk`{(`DwHf@TTYrL8d|$1`xAYItjng=R-n^#l`sx2`eG_1yzUF;&
zdFlV=Kfjc={GTZD{qN@jpn9)O|GSU8`u%+W|CV%@uYW(R`v1RK_16!{ss9hM{eLL_
zP~pn|gTH<hO#(UNQ;T=^FRnkwzuX4KwW+6zV@SoE<b(!hH?=geFtai~KfOFTHlG8h
zkLxRFu&^CcT9ouC<C4&%pi5334sKz7a<03Z770iN1cf=CSiQ<~@o8?(mDw4Go^0Jx
zYVfqRrR3{^v=`C|7x~Q&3q0aePJZ*rp?pSzuE9}NeU+3nzL12*!%PAjwj?EN*tYQ~
z^P4Y{Z)9aYGN`AsiHFy4#oU#M_;AwNYM1ebN8t|+9%zeav{q!D$0PGYw8F3eD0KEf
z>-E`o`*`a7eu!B7H1=R&dBo^=fP<g!plsyA!~-{Y`VVO8OGvVM30(BrA;MwM7(8Xq
zCabcaGj3RTEDE`J;i#JY{0SW1*Jf2koaylNa!cWvDpFF;v22;Dkpg4o<Ps5QCu5_>
z7mAj9g_Zf~xrC|f?^odR{x?lSr|A0!oo}D?0(2cam>9mzoKhWgVb?rh3^I7S`njxg
HN@xNA8%ZZ<

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/AU.png b/logos/economic_logos/AU.png
new file mode 100644
index 0000000000000000000000000000000000000000..d844540980aae9c69df7d49361f504f96cb6f4c2
GIT binary patch
literal 1345
zcmV-H1-|-;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA1m;OZK~#90#g}_blUEqVfdP`REV!rvFF=?f
z8lo|Hiw69|3nrKlZMFo7(I}acCC2!Nae@Vv#4Oo>g{v-u0V)I#U4tm<;zs9XV+1Da
zV1R`>0*+fOv_MNQ&))Zxc136l*lj0y@}=L`?>xWro^#&wejXlkYyjRRNvf+mO6dBW
zG)yv*%%o9L2T4XsA_dL0-?<ovDV6FBjb>6y=Ge03I@Yc&LQYN-^i9NZ;smgKIgpY9
zsMX-6(dbQdxk=hi@>;0zdj^9koy>Ld@ip-9_#7KHl%Tj+0sYU7z|o^Xa4>M;0-)6j
zW36@)g@r9xv7!Kb_g3M_lU|ri<_dZgI$!f}s8sS-eOeP6Z{B=ObUae`1912-5E%(v
zx&*v@DU4sg)*(B)NdS6zeIa12I(V=K-QDUg`djQ=%_E>tbmHVm{MDyHQPFQ0{iOvs
zbO;Cu0n*cfo*rR5Hf9;|nl*(pjO`T_RfgJH<p{l!;Ckfk?VXTFfYqx(@dFwu+^0?f
z=g$L!gRr)V2?MgS8gcyi1JeCzii|9s0m0F^aidj3uO4tX=NKQCBR(GBpG%hlxw$}I
z-n^9-`{k^W*t+#PZr$qW<tWbvkWTm}Vg8m%^N4Xc9TLg6G{b}6lb^4>c^H&Rojc53
z0kEp7+Ibc~v<JvQc{y<82;l8)>1gp{;M}<dDJ?49DFE*(f>4MYAu`<Lq!t4Mz_Vw7
zpPvPQ7opi~TXf=iaWPO<Mmca;EJ7X$?}9fK7kAq!081_xJ1Lq0Bqog(b#>j)*FT;H
zFgP$K?%Oz2D&W{LATSU(a|Y_JK3u;169p^BrJ=pNy)&?9PbEW?FhB_}jEx&hq5V!i
z4WO-cNW8FfXT@}owzhvjC?O5Es*s#4$FgO4PL2KivaoXH6=JW)k|nv^Q#S)V=ZDS!
zSc?{AV&A@M)YQCyUT?JIh=vBsS+H&$%&Dp9`cZ+47oR!=@%7C_ett7XNA<XSmy;t*
z3@|(w0Q*jM@2<q7M}NX-G+RKLnk<<zEDVrJ@#!abW(8Qkz8DW5szeZ*oBPF;0gU{R
zvzPjQJq&*SFnGKJ!w2C|v<x_%#~nM$aqnK2h=@UFfT2YJL*mDf`b!+X7ZXz@vSmWT
z9UFkzI<k<!Y=nBI(9xBQQ14W6s?B9V1qWY6Xy{i{x{3hb&m8{W$0x&fwE~RJX9c@c
zR)CKG8$cEw{`Is65fR_~R{(<ykW^6ctL<h$KsKLP|GN36P1jIa`A01S1oiiina-ZA
z$EsCVuz&w;u}_173d9*Ml|H5gn&EZ;GUo_<WIc>-R#&&vkzm5m(72eJo*s?J_YCB2
zbKWhPnT=fC_*((CH#EGWR6hdyMrD-KQfr|ibMF4M{c-F?dA@=w*l7Uc;|38bcP`3p
z+ipN6d!eN6-+!|r3Z0lRc3I7JI-?*>Osqq6bU8dd-`+ehFrUt@r(@K8oTIuhmc9i>
zc+{L;ckQZhYv{?GzoeujPiK{JLRnd>rnK~TI$vttVmvi+BQ5eQ>fgtqxgEp-nXI!n
zDd~Z`=6q~w<gU%_AR@SW<+6)wxCL%Cs@^7e!NoZZyAudsu3ou-<Qk64C|AZ)8IHdb
zd7q!2vDz2Xc$;zo$u%68QC!Jj_Qs~QoZ)Oq#zp%Zf~d`}U)l>h00000NkvXXu0mjf
DI52V`

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/BE.png b/logos/economic_logos/BE.png
new file mode 100644
index 0000000000000000000000000000000000000000..28abbe27c4f75069040bf5375401e610447a0cd4
GIT binary patch
literal 945
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP(ee0Plzi}@;?~-{k#Lhz(ZcVc=6+h*MGn4`295b*8`{DPa^+*T>bC;
zqyPW@!F9cV{~o9;ARr*bTkQ8kr>|4&K1OH!I&|#+pT7__SFT)1O-%*b`&QHPb5ZS|
zhmRrR4<9}Z3JUrdk@9ozA)p9QS#)&tr<DBPXD<M`Kx03KB>vpC8>0AgR@tBHw}9*)
zD>pzyK6pn!*e_qc{I&lGP;mbI`5&XwAZ#5S9f&d@DK9S%Bzt>%Kln!dSiAY=&6_|H
zDDv;$KN}mHe;+>q+1s{l`%=~N@9q0PfBuArhkp!B`nhvIQ2h4o+ZGlU5cY-*8{FL7
zKKMlaShMN>&tHcRA2v2N2C7-HVuhcdAJDk-=g-faIa5PJ185GAapvT%KQD5BKTZ67
zbqi40zi-EZ<g-&X6M$jSP!i-9%pjI9`Pi#pe?DAXSfs|NxA-ei{{R0!`#qTj`oDwO
zf48V;p98U8`pa$m`~RBFwtxR`hM)WY&S1j-;~f9f7XQD){`J4l|Njdn|Gx}0{^9@s
zoBsSy+W-HZ;NSlpKwBS)zWDzu_}c&f?^<sDPk#5m1*qup9gvCb3pT}{?rR063p-C2
z$B>FS$q5b2Zfa>_VP<7~etLOwacn#Xj_WIEsPM2UElPSMG-<`9pi4%Zias4OSg>Hl
zk~K{_>sKvXx3F=ILvXNnG`r&Z)yvm6u5-A2-~z`pq0nSuULV$3%hH|&{ML2&Whj~v
z6&2YmdSgX)LimEr>~#K5^LyCzSZDF|Ik5U|+97JOdxw$1uFMBv3tqlEc;HE=f8%uX
z=6-!U)>(Bt|D-BJHyCet6fSV!fSU)SwIZubi%5Y`&;ikoa7O{=asxY7#f3aJi9bYI
z+zmdsxjhUNkUe}rL9jd8F~-JVm#VN(p{9qIALCMusaH&7xGothbOxy#bI)#iGbbiu
zli8`$#}_FqKOj0yzv3)+_XSavrQ(O5HXhiuWDAe0V@xGm7TdP+H7nLMoeaP3a(!7s
pN`831mHjsc0ghGr9gW<~43D1HoqHW9{|6YW44$rjF6*2Ung9%TDRuw=

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/BR.png b/logos/economic_logos/BR.png
new file mode 100644
index 0000000000000000000000000000000000000000..a20d8f99ad5d8ca4dc3d6c5b7687c6bbf57ef7d7
GIT binary patch
literal 1064
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP(goyPlzi}@;?mBxv?3>M5iBpd3oc*L!bh!)lm$ytu$9h&Azee`uhie
z{{00i{q*ZAP(jT8Mu@hn@9(D{?g9z|xoht2587P`6fxb9%sR(1YO|WjO1<r81b*LR
zjNPJo_Zr8)`wUETtZY{6>_5l<?lQ-T9g<7tY3)D9$27;1XP)_lLz18FFwdExr|FW+
ztXaySUZ&xaJn@jE)oR@{m$<vS&8%1J0&NjpXgc+<#Ls(-(+*3p&9%(ju5|4R=idhc
zGqz2uShK8S%f`x8D<-TsklD7{AheG|uZl~*I%~TU-+c2mCxvewQw}d$sO#IO>egi%
zGRZ%GZpWhCla6dzcHuy5?UMMdDi5x+vual|X_i|?OiAin*t>hPZ_#XS!<vMxDy-TS
zvQ8~k3)i)6*tC1Isk%ouvsMMaNu8KglV{e9Pj?N>0<wh78yGdpxD2XUbt=`|yN!G@
zm^CX{v@1CEt9cA-xD9G}jcSF=fNIJ$U6af2#b*Pfq_rf-FPMQ@J$ccEw|_1!PSKEE
z@(~=iAD8fUJpSLIb>;t+;0OO7K*Adrxd@j83F12*mx=<@%0f>U$B>FSt-(K?868FB
zM1m5nCTKVvRhg0zztrPW?Zw*pmsUD2*Zcc$?b5qj>u$VXKJ)$T%Flbv-z$FM?+ghG
z)eYBpa!M+6ElcQvb#ZGiCb9AM`kpOiid=5KB|$EV$4xdq-*o0ihG*Nt{PMR)v|1gz
z)>rneu6=FL@f&HHM=xwG{Qj1&eQtN6)-Qvi_vK}!<>jSCc3*tz*rpZi;^3V=S(T?`
z+oWefb++%~9)0{(6UYCu`1|xtYo{x$+_mEyKZ{4f1f~UTO)3U&^fzT`PRg8d)uUrV
zphn`92^S=svr{x;R^+GHczFm!uyA(zxnwv-w@#5buJ(A#_LVPZ-rV`K_2|;n21kD1
zBjHIB+7o5eC$YXyDb1}-F3zq_FVC0M(05i9j_4El&3>ls2OneKix0=um#1sSPqelO
z|G;-4iR)5kL-*;`+3y&Bw@lx)ll8<MQJ;JE1^ye<Z2KqFHa!=Qs;_-K^U3m`^IBux
zJvN^Fba`apiuLd3Z*t=FntMKY|I?*ne|0Xt7t5FUI88V=>f<(Xd6|zFh56R+N~$=0
h%zn+JqR0Q)<(`($dM<D{514uwJYD@<);T3K0RXWaF3tb|

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/CA.png b/logos/economic_logos/CA.png
new file mode 100644
index 0000000000000000000000000000000000000000..91010f470ec1299811383bfb4387178f6ed5a398
GIT binary patch
literal 1332
zcmcIjdrXs86fdomQVQ}8*_f896-t2;1q|SX3JB4a4y1?}C=W4l@)$7K3=#Ndc#dp}
zGcYkCkV+VAr7$oW<!NDvATksXHike7gGxY#LEyLVo6P^V|8|ml&*S&I=iGC0Z@yG=
z#E|_Sn?|D<2Kf5~k(x^_7K7Y<stVMk(n$$ABGwuCS(r&W`bqv_DKwga8MSn1-<4U>
zXmn@kvE#lZi2qeqR<OKGRTvsVV<WY9c2e%kmk0_%K>;2-z<~p(uBL*gPlLSA(h>#-
z!DK=rL4Q9L9~i*VquAU;X({DOrP$cO>?|xT!C>ItJ<QBtejc{ATLcnvc7{j<E*E?E
zVt5!04b;IKHxLj2LqoiI19x{SC=_CD4$qz;J{}GZn3}@)IK?F8^=l+1A~_jJNwBd&
zT^+7pM|e0!M<Es?Fc6uUh>XO<1X5DKV&Tvs@Obd>!0Ia1DV>hAG#oq#YisoMptl!x
zb}%tPRTZYE;qMPVA6;G8xfA4w5)$C$MHMY7!tLA8*N2`S3=EKw0f7KzWf&QOS`C80
zty}2mKz%(53!zX@5GmwjJUyY+Qg%}lMJ_K#R20?P`Z{DXYK$c%aB)FxEyW>)?Be0W
zEmx^TO%3|`s0PWdH5zJ|{~}YuOS{NNb2l|e5=^s{7pv#i))xnECi8V1D_77Gz%c%L
zb)#{&pl>#CN7GZ!rcI25_HB^K7DR6|cCl7TBko=LF};<y_OZWJ`4%wP^^WnM#_wCG
zYW*KtObfIoRK?szD)ho)j|OYOPXX=45pAsY;)}7oa+QGd{6q4S3<dajAOE~8MxMp+
z<HuRbT+@ssjtM&=n4H!wCoW5GUfj;Beo_%VN!WUcgV<paC;f~W-90u_(-yl$7A%3F
z?G&%Bmhg>`hJ5tF*_IrIrK|3!`<?T0-RLzYOE<@lrK{#E;<zY%pKJG6rS!2CDOF6t
zM02*iGUTU*^rY0}9Q&kCKZ}v4x@FlbUoGwzEiV0;Z7*6}iIFem+9?~&IW(0a{Y#-k
z6q`6~RdP6r-QKRd%Zts^t*nS*bE2)H4O`ihlV+yHmxH~^erbI5Rd4ONJbD^amPc>1
z=6-vPJvlYa$S1^kbZ@3>HBk}Gh?VkK!L3Fg%R>uziBg$SaI22X%?i`7`!%DciY&7l
zFQvlLCNk8C)l7V^GxJEz*Q?G*F(13;z!|Gs{N~&zZklTL{C<&!$c;_k&Ioim<sFG_
z3;A`^#r(i*`x5t}?DRFx)NpMnVLr}e?mOcwV)gsUL}wgT#23ri0}d*=&1J&3@RGSO
z><;Hj#nm4ld)wxn%&(FUo%OG{65b#)HaO9IfgudDkMC5-2jkpM+@A>fjj-!)vT)qK
z?R>pv>A9>jPQLGth3+TeX~K@~UlT5P#0<Bo9PTO}5e5tzgLgG-PkUei`A%s8z7n4w
H#B$;<#C|Yx

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/CH.png b/logos/economic_logos/CH.png
new file mode 100644
index 0000000000000000000000000000000000000000..fff4724abaa67a73959c2b0656bd2a97b60fa58c
GIT binary patch
literal 948
zcmaJ;e=O8t82{c~#o_!&MG@8{ag`;_j0|@iopU?4Suw6FrM2d}aFbeoM5vWDt->J@
zZY0#M7E4iz$x&)uq*It*-L*vLy7TnDX#Lk`-}iYw&*%NT@ArM)H=oZ7VVG<(AqavI
z%3%pmcEZD$h9ax#Vkb(JBtb|ZMcKtnM+Kea97rMvQ)@gZM6uKs8N__9kc}o`8Rg|G
z<UgsuA0{UOIhjmA3mqNd@?}seVR7-_B8>)+jn4;PUy#c|uV0xO7=ZYAh>C*2!4+j>
z1Ox)`_J+nrtRO>lG+0=GwKY&E5F8909au*j%4G274VamMrzh0bViBRY7e{k*;PF7A
zz`UpkM+8^b6@LFdE`5ApnIJwl2Yr2b=k43!#}C-O8|>_W!2lW!JKfwsD#afHYD%rf
zL@b8sY4Gxb`g&ZV^DmQ<63}X~f{ujDhYrEi6u7%XX(<-};?*Pl9(2o+WC1Ud*dQwG
zoYLvP_g9>9q3o=jTQcdNgwiYvegPOBIJ={!CL<i=26*o)U%FLg)KZ^nj{<CdX$(gz
zVaN!$aI5g`-+#aeG{fOGwH4&T*L4%RNOks+Z`tq_Aa8xMIOS!!1ikn1P*#92Rhm<{
z5Jw5H&CN|H%?Y^HQWZGXeRb&6wy25Q!ijwVJs(oeN&MP+S~b6vikX>S!XxWN>=*I|
z-676tUH&tB_qw$*Gx4a&SaF!&=6i_=4@he1ut?eyUJ^~NnU%*&H8bkh<CX_cN~XfO
zzm1N}_GOahrZ)zI8q)Wq4NnJYyWB|o=j~mo2EMITMRx-8%6v^`GL`FW)GoUo%emv3
zu{HB2wP&1&?sgtERdG9=pKej93}=FFCNZylZ;c6{QywLd+V&*j30M00F*db{quQ}n
zdudhXSr2c66_*}jlNy`oR6)-+sn(FESF^%gMs#cP5>w0q>lhhf5xa&yS)6<LQB-a1
zV^J`{+E`vMtchU{$eIW39KtTWW=q_>Sm&8K#Xyt1g+`Vw?!WNZMyxoIyjPw4Id~yM
z#JpPE{n<b5t&MjX_t>mZxA0E4Sky9H6jQ-bo!pxaA1mkm#Rqe`sO9Rr=-G)-HjmX1
HD9ZW+76m{q

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/CN.png b/logos/economic_logos/CN.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ae59c6913cd597fb8d26e98ae78881db2a1bfa1
GIT binary patch
literal 1214
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP{F4FpAc7|<bN>uylyFkfrtEg<I116uYf9__*vf56u567@W@&B!~7|~
z?%)3Z?;l*_-%lTaDqrM8zpLZ?IGO!fw8ytYyZ`_B15xnn&W*R-xsM$A?&}JCoW%Zp
zGs|OFzL!NwzaHL&DER&C@yoo}mr2}jN;&Uo3p|hEzNaPdG{WWU-mO3dK<%$eQ$NpQ
z`?i+lSrE_jD4ypjLEq0F2TJ|@{Ndw_$kzp2Z^}4-pJe)bf$?1}=c_F4C$4<=^#nfj
zaQr#T^fH<IX^6v@ZEGQRy=lt(b%^=@J%-<>m|o{|Juu;a<iPhTgZq&k-;1ospVuz|
zl|6Rl{kf0%X#nr1mGdFG9$NDMI>`L*8sp!~jDOBBJuu~e>}?8>eICv8b1(DrNS+_t
znP25{-3PiqoafV2_NTtQU-$0-ndZXx$cFDlBKNx{ju&y<Povx*;?IJ3pM~-~cH#r7
zdE(CZWj-5_abHIO#PzlKw01EN0olNC{`>JgkbYg2{paoLmxYN>L!G|t+z65a2F`;!
z5cXqlvrnrR{`>g@C<yZGzkfi*U?u-A^)6`z#`?07AirP+v4qLTU;X;?;o`y~HAcO~
zUm;5V?DJ$6=>HDl{N19Wbq*r>|E0g&w!aYeHJfda_`Vr_4k`qZcx%uPRSl$$bAZ@s
zV0Qx<ci2H(2=IYW3nl~U%OLi{|C|0N?SCiuza1DxqN*={1^<87lJc(Qar>su*OzU8
z>2<TGi(^Q|oaBTCW;eAou`shTK0m!Yxi~hS1IP6hG*onSbd+>-wAAzzHCwfGb(OW%
zd6+(NC3ppTMzTi6h5E)a>nvQkbS-ll$Lm)wm7nnP^!E53IJ8VE?a(s;QL$-Z2GdtW
z-JWs#R;JUDv#oDs71}JUES=w$7nT-(|L~>g^EbxM-@kscJ6vI7V{H~~X<=(=Wp;E)
z5s9#|QWIO`V4-Kn_{2Uk@!^pr9}4<YRy=*S?2y5PNn9Zl*uKP9xuu0|<MXj#U#DQM
zKff`M;e>_;kA{|BBgeF9Q^OCOU9l!9L5SrN-_=8hOt%UcUf#8&YKI_iFORQN!v2FC
z3K@Bst=a;4$q9mPY|q|q)u>4<V+#vu?BkIYsZ(c`=Gwp7GDyOgakoL-g_8#yJs8y$
zSz{Jeh?W=^bU&Q@{$=U|!Q;ypte@Xl-lQbQDy(j3;Gy+!+I$;UiMv6kf(uXj&$eTp
zvMBA`rUMHTzR7qjy0X3Gh?;Hry_$$k+lsi3EK0c7R1>l9L1~;sd*c5$t_76}9DV*L
zT}%HzvRol)p=i2(6QkPg%jShAd3xT=jlX*1*ga0ByWYRm54JMikZbrOU@IUEOmGaI
Lu6{1-oD!M<xn-|O

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/DE.png b/logos/economic_logos/DE.png
new file mode 100644
index 0000000000000000000000000000000000000000..6de38d086ccc4b382284486d6bcc4ffc1e7dd0a1
GIT binary patch
literal 924
zcmZuvYfO?+82*q+Wmry0&1FfmjG$6;mg`5!z}u35=%VWf<-M$-HkakPI9JweY*Ma1
z4GryTHoL5rYt!taSOZaU)UXLnt!7-L56j^>y-4d<@Af|DectDJzq51BcTp@#4Gf3~
zAP6EbJxw5mHOiX{>41XPOYdNzl}S_iw2xZe86b-kX<20iu{gw=G=gjl2g6D6PMHuy
zJRfSc+E@G+O(qjXQQ+ZnxiG@va7dDLxm^Fupn^vxlS!pgqtS>E0%>SysHmu@u&~hQ
z1cO8($;`~u>2y9-EEXFK2AK7Azy=f~Qnsgvpj{J7CJhEeQD%aev)iFRtyVi!DkvbV
zT&^WL`XBW*eQ4!yENr$zsRZh5Xz&%t?V3!c%{hNS6MdE<9f3wOv0H~{j9$bDSqqUR
z4|^QmkIcEys0f)eFs1cU2)7=MivLo#0h!bB&psGL)`Gty;PFgj_aF?<`v<Ydj=!sr
zF&YiC@i!&*c(;a*7co8>vPA_~dHT3iw3`SxsL|Ox_JLb@%$WMAdEG{?r>WqAsq4Ic
zjP-FgILk&Gc4`MyH{A7LX_~^$AdHJO7`N$7Gx%dG#_hQnD{R;m40;PSLjwBgF*YuZ
zb>g3ikOSDbCGdv3WkZwGyNj!(?N@tfSAQz}4{_;&WZ8+v9Qj##%G&(Uy@`qCOGF!w
zF?M#pe&4$(Y9WK)vs!b=dUvokxK3J?wj(<w^ero?!aq5o`EF}%?#oN-J6|?8lbwtM
zUAI}cp{!3FW~M~)W?$uh<(qF_IJn&$IUCjGNVC?3u@Z=+*8_dwF|l#}o!uW+EbZvX
zl|Sye)BWlEtC1y5ey0{NQY)t?CPd5!zm{#?++o=_#@|od#^!Eya20uqvfdcGMLRZr
zdDl7RCi?TH?JI+V`nsbcShXS5)qXj<dCcck3Nab1ta-C$)v`!>hQ$1+#5DdTB$$0M
zo|EL?R(UvrmvyA|g1o;Vw`Y8L_?0J*<EHdlp)R}PxBt44>guqyntYK{W33yEuPLq&
t=3Omi=A&m%@0FL9m)t99rve2venkA|7x#td*#+>7M7mHUc*vJm{Q>6PFG~Ob

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/DK.png b/logos/economic_logos/DK.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4ee7439050ad69ca783733e88b2840b4f3dad5a
GIT binary patch
literal 972
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9F5
zM?jcysy3fAP(fROPlzi}@;?}S+Ibklz(xM~^XK2ce?NZwcwW<ggF*eCrq{d4Oa8w9
z1Xus}!>8ZxK7RZ5?Zbx;kJD>k<~04hb_Xu|{lvvLZ8Kl3-SM`2?%%K9A>v=Q9efs7
z{xZMy=gs>-5ulnUKIzYstG}PU3giL}d|A-;^VS0(`yW`#x8oNe+-I?6KW~G?e?NZ>
zB;R(;`MhZ#kO2gD6`US>q<r48|F)#<t1bJUly*YI(a2kZrmr^bc~Z~{6u+nC{c7Eg
zCw`e<b{zq7-%nZcWd|rU{(kueBwttc{eJoqXa$H}GvW8MS3t(A;*MW;9|0K<?p=Au
zx1F>9{rLIk%eU{}zyE&n0w@IpfB*gk2HNl6zh6&Y{KPlo%l1PMaUl8a+%-7+*=diD
zz?f(%3GxeO5G&k#>+}DAAFpr75is5Q6RhaRI!*qSe?iROv$)Kk0O=cQo}YmpHv$o=
zPySzD*>3Uo_m2NlC4QCu|L?oy|NnlVq7$$F{`vj>IgkbNPDl3t|L$M7|9AY9{(qGH
z{}ah4O8@^K{r&%EnerrXgmm(G_rC4$$iB|g1WX@+o-U3d6?0lI|1@U`6k-3+oiXuk
zP^6n_N|%_H>TV~On@YR8gl>MX{e3=k@hs!hpa16G`@84!v$^H^4w|A<LpQyW+Uc}%
zRcNz8=~v!f-w2Q5ZnxEsr$*ntWv#JFxcj1XkID9XS94!2+`%x>F#6Qjdv@BN7;nAl
zyY%lLqX<*Ut~>S5`J)1P792nQ@Aw4Hql`xTYHBN3mNN7`<Cm14&Nh#;;iTpiwiSWR
z_6|&!jSZw#8h2JsXuYBH<Uo?g1Op9?B&7{5Y^VP>ibkk5n+CYuT=RUN*`lT+4qH#g
zWq5y?b=!KwZg-~N><g|<aIj%qaMio{N#Z-xQZ`Qk8?UF*hfa9xbv+ROLgQABF#F5L
zJh!Ka?GEOdGbgP(_iaICi$ZN#oE*>g=?@#bPp{S~aQeM2e}_V4_4J3n&;K5NeAzg<
vwz7BsQkQ4H|2{VUqdMI^>ArpEr&sz4effpikGwsBQO)4#>gTe~DWM4f6KHQ4

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/ES.png b/logos/economic_logos/ES.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d133f3b3ec97b94b94289fdb664fa6f5ecb72f9
GIT binary patch
literal 1310
zcmV+(1>yRMP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA1j9*0K~#90y_b7TQ&$|v%WG`KQJM-uTp-Js
zac%=fNVW)O4<QqQF+(OZR+NEAVy07ZY+)JMbc1A01~}273|2%aGJ)1Y%b>^r0Rab$
zcbN(kDUVW6sH2bX&Mj!5QXVaOl27}`@AiDZ{hf2~`Cb}ri35NgVb36kn@ql|34??w
zf{Gv~G!ZfghY0HkCQF@rF=3a9mNw4R;P3<y$6p>ksHQv4OT#N0(VvtGMOTjs8ciAb
ztuMjMP+=RTd@O;8D>{Pr>J`;Ti+2!4g<`cvrQ(yhoR=&9>O@;-W6%ERWee-l8L}S=
z$xSJlGjOTmjt_e82s(B|sErkW)QxunF~SqJk-5DV+#56hT+kJIK(kWf4`~ZvW4x-a
zlV}7lwC0T~`OkG}^7O-SZs7>ga+}XU!mZDbqW*=oPZUXLC?;F~zDD$(oh|O7kvA(Q
zvn}v6P)bsXBqC-T;Gq3OppvE+&7U-=D)iTvMZ<dF?pX=ZwVZy!O-U#83!6YuZh<~N
z9nHB6$V)7ttS~p;#0Zb-f<I+o52U}&d(ouW9Gw@fQJca-{Ye%?akgkXZH4-?EZoeu
zHqJoPM#@AwWgr=iug!bWP_ZS-!dc)3tVXt{9XNh=$l1gM&u0y;#<Ps?0?<O!9xOTq
zHCb;N-xSKLG&CeXgS0RPQX^S7zt<Wmk*kpv$-qE?38qMWyu`#911g&KRMRO8^GuO;
z)B?RZX6QQh9CCuKkmPQIi(&60@7wLD$@9lhxhtwpnIkvW!WaXfX^&K$!aeaSlybMD
zkIO{Cn=Jg`M@QOvTZm33Lzs{T@v&2AEjf&C!Rx5Z-E6c0)ngsFYy)xJPShS*gA1<q
zIJoO2B)T|3nD{eFQnFATpNYEc7}OniL&b@$P?j0E3^NAgx`l=>9Z>XBENWsMamj;)
zSZ@~`@p=OhfggkW%?Xs}6r$-$45|`*QSenbq!|X@mNN#LbPNCf!T>)s03As-$lpf?
zhi!$=yxxMp4;yDZUqt>kdsKhQL|ya-6o<bJMUkmd1~PEnX-?r*h68Fur*T)b7J>tG
z<Pj4&J67S+76uAKn8+twKWK&i$`4S^iN<}t!3J(qpNDbh$2o=ZGHX;6>_&ev6Gbxy
za(6S3A7l#wn}I7K3^W|FLXXHD)xU2wOuTUeFmSGrrVWsjopUx~Eq5JazTb(`Ojood
zS%4SCL{_vnev4v*$96;6E(QiO&5@W8fUo1(xL0Pmd;<gLs1Aft2FMoHh|%ozs5n~s
zJi7T#7%s8V9ztUxI{Jjp<hFChpwJ1EBD3kG5;$nDo2oEdz5%67Mzom^PeWhLh(N6t
zo8W1nY5#;geFo!ZAID};tN6WNM4-jP{)r+9*@7`Kua9Wj>L#L>72W?xsQ~$;A{oW-
zWdZdv6QnN}22$yj3Xm%;e8YV+r0Ll*^@IP8FP4nGsPsw&$dxoeiBr2?n}QY^({}}e
zNqUvFe-vi4aPy{s>9%V$-z_SxW5n%#Q|q;X^A~W#?OlV!CHtZ<H8f0ZxFCaGR;lPr
zrB`A?A`|?9miM+Tb*-Tsl~XN`du+EGGN{&30g{+Vr(zUAjrqrILgCC>GnX>=|D-|F
UbnrZ%q5uE@07*qoM6N<$f~wC=wEzGB

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/EU.png b/logos/economic_logos/EU.png
new file mode 100644
index 0000000000000000000000000000000000000000..dae9e986f7ff43d2d20f5cedddb45fb1983fd054
GIT binary patch
literal 1747
zcmaJ>dpwhS7~h4Ncc>_Hjgroav_mAR+^SKD8L_#Hxn|R9uC<O!8{Lj%(aNxckX&Y(
z(8;x=i(4htsiYz@*Od}-UUqc)tKaAId!Fy}`##V2ectzd-uIM~<8DPj1AssviuO1=
zJm_`jHxdq7yS&rQpo22-yKSJ)?-|B|fjk}O!GJ(eD)So(xy)08Kw#redkH&1a&BQ2
zHxEj|FYJfWss53#V5VtA3&go*b#PNkMel=`<Fntt|6Fylw8tm)2^3$wm)-vG<@nU}
ztdxB{FbPsx{*6%QYQ5kb6GocL>5ixGK1tbO$v2PWM~cL9sB?`|VnRbF_VG(SR-uoK
zOBHaS0_i4_b_j}4(z;{`H#GdNFmrvE5=&$WmBmflpS)hBNhy#eRH^wE9poOeW}a0f
z3fG3-PQURE)F1ymy_8gzRqZe}i4ZhzQzDil-L9L4rx}K2sFJTmWCacmExY|_!%F|W
z4fJMyZ68?TnH+PX&@+@vv;E_AG~fR)FJyOo>z(dVkOH5Bs?Rl)yHMS?P{pf6(W6}1
zs|4;+rRX8dsqdHGj)I3!FZi#-BBE|!uKa=PGV=`=gl7huMR1Jh&C;~ga;M2pNdHuZ
z5>a3gl`=S_e5=j)TtzRaK;_aJIyRaz(&{^~7e$V%f}5o0%e{+Lyi4TVL@M6JU>YVg
z+xRe7#^uH)#)bSkn<Km+Ey|T8#IijJ33s~;Y?!Cy-LAv%)sE~FgF`B<&wf+zsK~vw
z>(c}f%@2@stu#53?tb=IM0QZvB^oX+5uX$X!&gD^HNk0gM;1$sd=<QehTqlre4ppN
zD?`%hw#U!ZbzrlrapsY!dsuDYs}Ii#>UyoaEhf4Bg+3S>(0J;;S9JsPWL+!QQ!`B%
z>G)F}Pu@zlMyIR^=7ZA$3NG_1jm!7${6{ajj39qNgdkKN&Irk>#;v1ff(gX4(H}l8
zPblz$;A=>KMu%qw8qhK<BF|@5<H(#R1EW)*!sbYh79}6*d~-dO*WIHd9$w;<7`HVl
z)sU94{b;f@2jMDW6_U;i@GyMMmv6IR57Hr>y>EIH9Qx^SyrT<5-G%$`<F{GKi_$}z
zU}|v^P<w9fd!-3NDXMK|Zf>Ax-Kr|-XupFhcPy|A=2OT|!NSR;Pu2hQJQ7>{7vEXd
zw#ZC+#VtZmTy+uCr9jACJou$=|G{$R(X=$21&jL)eo$cZi;It3M00bs=y}ZV=W=Fi
zg-Gxp5N>a0O^D`E$Z_ypYXeo?%p#Q>jlx!XBNXcIZq&uBQ9!KD@q4SBTKEY6$XH0W
z-?9a(U&b$F8I~326d}@`x;qF-YPnZh^WYb|yB^B{>PVEPhI$6~vOFq-ghZh{hz*`O
zRGOY4H8g1S4Td`OUc6fTv45m@ouRmI7%u8T=k>Jj(8c1+&DU(&>uzMZ+8Dqr*H%Hf
z>6QSMn~b(ws{zWKRBh{Uhl3g|v4aQ6(<a6hWI)I`B4J4s*=!UL51jUApV{N^;6B^g
zYG;6JL?V43O&gvYC!jkXx232Q!S42_KQ;F4t&BvhwdRjnSlncFTE#>yNf8fI2ILaU
zdS#kU4FC#j_aQ87xF_Oey%10<ARjA$-Mf0py{{mCg+P9P_V0|R)V)(%7#~`FAcT6O
zzv-QC^?kWOx)G_?Pu~feBp55|3VkndFOPh6G-U;^u~E~^=ytyD5@bA3WoM;j2$&_<
zM<T+U`Nz;<FHWwii$S$ykkq4Zv)DIiJ>@2F*VlgCBioMkvAzrky;*S)ZDvUyTUw*P
zFDaACW}h3wVsRKGN@rW7r~6l#)M-@!ooyL_VSZD<dO55=7%z*?GG!T<%gLk9OVC#9
z9PBkO=oop|Fl8~!F0kUo=QhpF)<D={TV;LD6?96}bla<AjR9YDEIlzZ0~3@KPL}0y
zgfpMgr@g^&X68=m#l|x4x|mSR%*bpKnLl%Pzkt~=q{4wIsFB^7-zPqE1!J3SZEeq!
zdU_|UmSzy0;6hPO6;t`y@q$?T4%>UY5VnYRi|!-dIw67Wnk)?+eaD3%#H85qdWk+H
X{Bt`g0@@-5KSPN9PDi^^8*;+Gkyplg

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/FI.png b/logos/economic_logos/FI.png
new file mode 100644
index 0000000000000000000000000000000000000000..36df82b8a15884ae842c239da44cc8d691bcaffe
GIT binary patch
literal 820
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP=S7cPlzi}@;?~N-+Ugzz(ZcV{o>`jFF=(#5!1FExrL_k{ip9h1py^1
z7)%?GrLNq4mD;)qF7ojChoG{R5bl$gAERs6!lhR2z5-`A&p8NZqcLthdOK(1xqy=8
z`MujWAHI3#$ve0LdB1)jd)v|5F?H+oqozA$EG(b0XZOjwa0PJ2yiFkgUb_9lEoU*1
zarpd0<Jg%%#)@56{EC+Y8Ru_4pSkXgM(7kEX_Y(|Xc15_d``eWV34Jj1o;Ish$T!u
z{_5AC4;L2}sWIv;{tA@;zu%Ktp#S^-|9`irXrKH4(qC@d-)lD8{@n~e_xG(q|9_6}
zX^Zc$fAs+={l8%H<zxRJf|;9=-U+rp7X2T5?SIS7|H*Ivw;uoh|IYsfo1Q(GoCJ(3
zT~8Oskcv62movkg97Nb2tk!(&)*ZVwHNZQ1%^ID}Cp1nQ-6}X~c6<8&|I$vm1}tsg
zrT3h-G$_z-5bQ5M@?6|QL4wQOWkX6yPK}aP=idntHi_$&FH29;T*{;1b@Ix8J6m)A
zm7EG`o0{tq3p=A2^q$|Cy(BzrCGUZ)f9`+2ZoWeIz*#5$oQK<(9pX1u?~_e$P?de7
z#Qx^wgPYG8b(+6B1oBB*1hoZOwoTS}x|D1Aoq1jlo-?x?<P|U%C}4Ip7qEKVB-L_0
z^lMXW+$!gtyV^J&*1eJzNVZvUmGO}fyUCaPb3Lq@(^gvtt~|4rS>V>+g=g;Fz0LHt
zvA6Wy$CGRsvNPYd&Zw{3$nfy$i?1U0?%AJNaMMh`VB?p_pHd8KFK$}1J?7uKNpaD?
eUta0Gy?<|hnk1u9iUTmF7(8A5T-G@yGywoP8}H}<

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/FR.png b/logos/economic_logos/FR.png
new file mode 100644
index 0000000000000000000000000000000000000000..470fad77703a684af1d78c474d765f538316ae51
GIT binary patch
literal 1008
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP{G;&pAc7|<bN>u^XCtQft9>?^VR!LKY(g}{rdIu=g+@?|Ni^(1+MbT
zw_g`;y^62ht{1-Gt)9W>+`K>c??YrS-FjU;`LMjlELr!NZ<SQO)Ybp{{v9H9<lK{#
z`kjiNvp?tN|9$unD0unS>*(^W%3gCmr)B)PcK!3$U+ImzRlVmzWb3CK)$o}I(GFCp
z<vSlDp4GGm!g%-byN=(2f1f`Cjaszv>aTtKAr^V0uKgGq4&>_jFNBDok-nMhKSoCV
zI(!5uzH0kT2;=kDpZ~sngQzU(Jn*Hs^zX}8K<<O5AK%;Bf1fiKBGo+oIE4NE=bysP
z{a;GU{=R+<lzRB=Q)ct-&-n#^A3p(duitx{-?0xO1>`<@{;78A(f4-t-{;Qz|LfQH
zpT8eI|CHUf2WZ8^XCHy#`TO_pe?NXetN?~KgmM4jvRS|g>n{oN3uX{0*mUFL-}hJ7
zrt_I>0SD=qRjRy8{`?23{xy~J5m?JLW!FzY#%p~r2^71s^#A{6(?9=zZ~Z?>^ymL?
zh5!G1Z~Fhg`~Q(we||sTzwZD4mW==Z`M-bSS`B2X{r>+$a@zm@Mc4lSKg0&~)<f~v
z{~szST?U$Yu<6(T9}_<R|IqB!-QsdwVA&*KnsW4XaSW-Llbq1N?536`7G`Ev#^<M(
z$L4e3@ag0F3LI=qPKT5hWn4;nBs3|gsX#$jSzEn-QLJO2r(|SfSJ$dpR!(uw!QRrb
zja_}~<YM;kYgAmuB&wXeLh_E<va}l_D_+cSzLS`k*$Py!%GBfDv1@$OnMA86sPgsg
z5Pe}`Xkf8>$D^<XkB*&v@UGFnak+T&c78k7eRVuK|9*(9U@_S6C|uygfwp)@0cU|a
z)`L86eu%ah6g&tQI3*y~=kMsE;v8aP$7(3Wv$61p$Psk|0~NK0VH4&s^_;z8GKcGu
zv5_OElD72pra3VMU6anAKE7_jf(;y#G_H1gZ_w1x)oxeK-rMEn!^#?ZwWB96IJ$k=
zf_)1&&SB&{VQ#uzLE9s*RNv|JT+`gQP8ZJHR=jd^YNu*_cj<Q)7B<%QmT%t_Q)3vq
Xv+F!GV<p0Y@yy`q>gTe~DWM4f%)@K-

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/GB.png b/logos/economic_logos/GB.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2034d20ce64875239dddfba23ff8fbc51b3ecfd
GIT binary patch
literal 792
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkQ1EJiPlzj!{tp8`fBu9qq4c9S->*OUyzJ1EPoF-$Ieqa4gZiJp{~&Uo
zzWsjm`diF|^9(^-q*Hc(`0ycm!uf}<zd>YQy#J9o>++9Ze<0jn-@bqR^rdj_1&;7-
zg)`5-oWJhpwL7n-EPnd(?VSmWZ*m(vsp$Uj`VC9y*2me6H#zj)KYQ`&&HH<W?X^oT
z*DSgGv~D8M<lEAA&nGPe8u;ea#h0tMJ*nuq$)Wo=yWz*Lzc1c>|MUCzt0_x9t=|oF
zl}qckJwT7Smjw9*GcaqUEV}sa?_$}dA3=^;D#zRT1njCOomyA_U)2tI0OmnRFcVBH
z{r`Uvm~r*$gZ~d6FF0584;ZMOo-U3d6?0lA-<;NDz|+R9)x-Vn+NzFd%~MM6_^gc9
zeg4;P;ySHqp7PFDp8M1?f3Y`Qu&|qamUEHDlYK@u?DuryHKr{oYK@B25?#G@dcod{
zIS0)?F<xn#o3~!B|8y<uAq$3uMiQHTWY`?c5(?-vlWqO@u%xYI4ogSkxno5E^$TWR
zlS!P-XcnoXYx44U?H7?GowZk`j2m)Zh{|g7>c_pl)Wm(+>6aNxSzG2>f!x*J@ux$r
zw>*C?D#BDftKN5Z)7*T%53W@W+rm|uWc2sH{n>4EV#+Q5+i&MObI1tX`gJdeO-A*I
z4#N!3$O*qYZ=PiKEA;2%nA)$#@X=Ud8S_fjpxHjPX(k#iHx|sXl@2k;T5~>D{nUeh
zQYtd0;kg%?<AR^tF+E$iQ}N1Ot$@nsvjdK1Je|e%J5P4!vzaS4%>2&!`04WS83`Y%
zo`!y8WqviC^K89Z;mO4HU1hvW^zXl0<~V85QLA0{N)P+xq$;P{&by;@Gx%Zreevf?
p>f!I-KYq1TKR@Yj|HrTY*=vO&dN__ea0bRRgQu&X%Q~loCICNdwbcLs

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/HK.png b/logos/economic_logos/HK.png
new file mode 100644
index 0000000000000000000000000000000000000000..a283f1a111687a14e4d12db67014b42cc45289c0
GIT binary patch
literal 1644
zcmbtTc{mhk7#}&pO6YO4N}je{X{gXf&Wy~eaU_|Folr!inkc1~LRp3BT<JvVLUN}q
zt&rr*Ihh%AW9}I<=H8F7$6x!;e$Vs0zu)`5zxR8-_j}&&au8zs65a20ArQzCxW8`*
zK+CzUtq!bjX>J<;wG$!Rebh!j*`EiFPO?Ap1OV5$t;UJL`~-n4>I~Wu3Ij>y{NlYV
zQIY?!;^BT7V-hIIJAcI48W4T#IrlJ<@iC=B@pqM+%LX!fJd(24Z{}TtQYKTS#A8F#
z=}D8xC<z{`ib%;5^u+y?ux)~-Y7hZ}DReX~DoFJCBXGevxOGM(|4o!|U;KJwa)<}N
z=7p+o!rhwp{Gp6a<vzJfj}I3Q_JTOUd8Oz}J2U4rul$}$#wxfVB@q;}BJtNA65L4@
zm*B>fQVHXiV^Shs&gIPfUI)aKFdv0jEa!1RBfJ+S<Um(e;f3k6gb5ED3KFK$FfXMs
zvrkb%y>NDhb3Kj@P9BYvV271bsi5Zh#MZUo99Dj&LL}rqyd|i6Df-eu^t6>u;3VHh
zK+6*Bkf5$YF(VMRzbCk?Qp)9W7K2k<AZIfvyF6#RI~W<q8JXzW-p>jFpI=cX7x2N;
z$);%2XA>v3te$ySFPow>vQlY3?;r=e6P#Ay9nH9<zsWi5$s_wF+}2Q$ev)s)?CX~(
zAs$38JMQCR@yGx@0ZH8tpV(@}uPl=>rxX&gWPFsFdzR>7%_%M<!5pPj5-lo_9v8;U
zJ2%_cMR2hYb+&@{lugr_S*hZIZYc?`n4P5{{Xlor2>8s~I@$E3@Q-Fr(N#fxB|UBr
zDZqvI>;VgtC1Xx=?q8=JK*(4OT68c7f)c_ebLOw-aJGhcs4@Fyu9Qk9`E8JMSRh68
zh4NpOv+~YQCPjcrVBgN0N{a`VBzoC0vr`G1S5bC*3mPhc5^ujuMMwe8yr=gS;#m+}
zSaLZiQSl>fVQ4VTEOZEB7sNE`#wUhc$r~s|+o(A{7S2m#Ej!c=F`!yeZ)Fc=W-7$8
zL9QI}XizA}kaIJnRI)c>=CM;}4&olqJ2>rmP$E<?XCK}8hbssF#s42A{Z(GGKn^Y-
z+h~F0&LP=EDcP-L=PWw3IES2DQ@RH75d3FvxUYBUsp4qVFY10)hfKm;QuGnfB#THb
zz4z@7mNskjv{pZgA{t@J`$PISR)6sKLPUBSA|v5QnAwu@XHS11J3H0(QnIpYPofV%
zgZl^CubY~<I67sH9nCAnw|?zf(N<SgvuItFUp2mMsN15#Yow)5hwQohV)N_o+}^Ci
ztWRQjX<GOz_%R}$&^v@MP3w7Y19^qj@YT}L(#)}Rb8^bdfE#q_)<X&nBMXE3HoU4!
zI>t57)VZt&FW~IdzY+l78L$-9)6o?b8{5<UDXY9A8kOP5%Xp-j1ylRDw(KCq_{MI=
zpfl>2i&j{9e*E;5dA#|ZqJ4X@BLi4B*EdZqM26lG15J02yKmDOa-U^Zh@!1!7t*I{
zY9@m;89}0MdbH@-?JWty;zqs(%^_TyujQt`IPY*%92Zme`DSG}vfeJe*3n1J`oqAr
zp%)Q1YoWK^+NY1FU0eh;G<y@P-fL~XIq?v_`Xn~xHbGx2DcJ1HlT<vka{P?YuaOmv
zUux`@T#&I{uhV5q>$%xW^`gGR!RhVs`P(!Di(?4Jx70TU-c3Tq=8u&gr!pE{g?!To
zy3oidR6#*bl|#LDWMdknwJAlOt>ep}u1BE*?8<dZGO?*FA2Sil6H;aab50D^j9ulk
zJl|rQQCZW~3`Y|VdGa-_H|AwRTn4OVz|`S@ICHq8UoAp{E7_BL+Oq06nhz^{Czfze
zXvGl7EYl*$HTPs9@y=qiQLLx^hWsllHBy@0PwPPSAYRaB5B+THJ@Abna2Ue3!UvW4
ECsbAwX#fBK

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/ID.png b/logos/economic_logos/ID.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d2ebd7a11e522d4d146eb0579e3d49654ae9378
GIT binary patch
literal 773
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP=Qo{Plzi}@;?~7UA7Lwz(an!dh_?|w?LKGt$of3s$J1{d^v6Yk30AO
z|N95m_2<J!pt8F$S+_hRKkh#G@6R8I)b|^=ALiHGPb&Cv_W?xY=i{gM;&N`fhJDz&
z2Pgtma6hg1c2Lsi<7a?epgA`j1K+LN3Q>GFD&yOwYe4qv1uGyT*UUU1><>Hk0Yz@Q
zheH?;*`E)eKp13`pPn)80ftUoNswPKgJ}HZV=sUIeSdLbp&Fy^qOV|6|LpT*7U=)}
z|Nq}DDq3g%|9|N(xApJ;Yc^Z|{l6K0_WwJB{{P20{--Vae~10Q&;JFJFaQ7lXw#qM
z{X!jE9{&ot*2Z)*<=yc+3pR^#?wbaR4^J1zkcv62lV3(PIfyvutMTbQDT>~*<%-em
zoQ<1|yf;nKnSN?ZPUZjW93CAq&#LN*_|DAjmt<f+Y5sURvkzz6Awf}#w8a}Mm~@{#
z6BnDj@_$vP<y=Q`?bSEu+<t!jT4B>6w~y!Z^K$*Gj?BF~$=0(jfByFl_V%YAf4R%O
zpDi;#WX*#q(f6Od*^~87U-wgoxT*4vGab#Vcd-Teyb)Y4{h&Me;91=}sw)^~KTx+d
zn()%0{lJ!nyOUomcwr(iN312|ev^T$jl+|PJhv8<X{;|{oYccnb?m*LZRg+3Df3p$
z(fOqR_r7yvjVO<SL|=dD%d?mFXMfupa9X+lJ-<wTz|RNIUh^OH-TLk2wZ-#}#OAO4
kcr|5OZteEn=N`*T)z01@RJvq8Fg_SOUHx3vIVCg!0HfvK4*&oF

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/IN.png b/logos/economic_logos/IN.png
new file mode 100644
index 0000000000000000000000000000000000000000..aec404cc2296cbd5e04e7e486ddc0faaedb7d70f
GIT binary patch
literal 1218
zcma)4YfO`86mF?QKyErg#x{b;+~ydtaaj!85C=kqbaELCK`fM!B|rz1i;a$PDH9C|
z4CE>s2rL3}Dc#pvD1#0~F5%jaOQBRK5`wf)1QfLG*<0IW|CXKPJ<s!;_jylFzVF<)
zK=L&)vNpoua3(}Q?;wP>nqxpf*}LK9BLsL_kndT%XvpCwBn*@M!f80%p*J-LkE^P-
z!r}DHF9d}6pi9t(h@~U{0rEL`E(hei7Ydaw@OuDEHh^LYK>hEd{bzt|oiym6fV3af
zD&5t_0{q2*ZaQp9b(QT^=t_fjGCbyMD#-BXHDJfX>bORtKCO`;?$mG;++>i6G-SF}
zlTkDU>-hdQ@X}#@T3cRO+2-??c)Z6VkzB3T4K_0)qfprK@tp|?ozc-4hRq{$L_~)~
zqF7wq>gicpUEN_Y`tRPIdi6>rk!;?-zfe>(oRQJf(lRqOwH_0L_4P@MiiX0%+Wq~T
z>GU3<aJ{BRP*yhT>ROYS*wx-XS5h)Ur}t8+T_q*MV(~^wN;igyb8{aGg-^xe&DK^?
zR#xBE)*gj|(P-T&m2R*H52WSgqinVq&7;^;+#W5TmCYco2KD&{uOs;fH(zWZ$y?wi
za^hsqWlFU&h8gkI9S_!Q8>*vN*qA?8_k~t+=2*c^{->**>nCgWlzRiq{a&@F+oqc@
zwgjVwg0+d-@#@cRJ0`HdTi;zroGWJg)q5iI>rQ}V!8B8fc7mB2L<+`Pl1m;veW_GT
z-bp!$cdXxi?Nas<3Fd__092U$sWE`HuWdLgnEsrj22t1;$ejyezyRXvL3|KB2+($}
zEzzP-3;!oCB_kJ02|(#ZyKz_r*D-+QqwlT3%V6}YHy9$217iT0mNg&mx<&1dd^H9w
zej(A@E96Qwg`7n=cQVd0)IHsl<VdxN(l_Q0IN5$+Z>(=u7b87V+$abVe9G$cJ41@{
zIvgHF4EM1zX>4vf@x;xQJ+YFP$4*O)b_^5<2W}m+ba!^mnfsx@$J3yqqAJ^>f--AH
zuq+F;g`vgbW0o8a{uHyczm-2G$<CgfG&D;}k0z)1=u<arev2B^lNf(F7<t(fviP>K
zzmWAUWA}?Dn2P+t#_t*C9)ypI_cK4~NZvBMK^*d{vYItd$N=W8zp<Ty5r^0}WCk4H
zGgq!%Oeay}Y*>1x2j*Rz?T+`>G8?%E!tw9t$Sp#uzAcN03JlL{$vPwo4xFm2bSq{1
z*`*op4jR?HZM|Jpw99jMQDB%9pC~u(e)rc)T(1l>Law(Hb-yQ*oa#@i$oJ0_Jo&Kp
zs9V}x>N`epBMkfVyWxLy5XUP$%*tBQR-O2DWGau~a9LsfaU>%e3i^}iw$2f()VFRb
zpINvBx-d&ehrhYE#A#oP;+dYf>cMR>`}yIImuOebBCT*k>Bhsy>5&0wt#Cvil6Tu#
Ga?U@lI{rHV

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/IT.png b/logos/economic_logos/IT.png
new file mode 100644
index 0000000000000000000000000000000000000000..9602249fe23f14a0e9fab7d2d2deb4551c22f8b7
GIT binary patch
literal 902
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#X!mm
zgc(1iO!5LM$PVxcaRo~Lrwn}j`Ss_YU;qF91tBoF{N{e~;hERpJ^J_a=d+2^f82iv
z5x@WOMc~#(i8&EBqmpk#B);FhA1Dq~9J!;NVUpW9ZS&hHIiF9T0}8(T@%eg4?7OWy
zAsSQm_TSAe{(AKWkbC~so!2YZ0vUdr>#ur;Lf9|9zWcE65KwUL)g3pZQh;pjC8<EJ
z-250I*?o5PHQ(?zt2Y3h1SEkX|Nj58T3ztx!$%-{^ZgSKs+)elefQ_z-_UI>H^LI$
z@7Mzrzxn>L*~(l9d+nVgF6+y$`Gmb*wf^7FUqIP|Pc9iQ&jK=lVA;)mal5)6)-(e{
z0O+0fKR*Ba{rk_yPY_u+DYL`S85rD^B|(0{4B|;sPrmv4|I_6qB^rzd%f9_N=)){H
z>BqnAYC0D{I$i}S>;MJl4Z9uxfYhzX3;*96P5S@;6z7ls8UO#^<M{U9@BjZr|F8ak
z{Qv)!KmSt?{(mp@?|;|!|Nozez54$v6c|?T+nH|tPh)@o|9|@_pzyu-U5mDGWG}i0
zjC*}g7srr_ImrnP%x-FFVqs=we13X)a&c@t2af9>;A3xcI;6DX(xRkCZ!{d7g192%
zqTIsxLL2uqEfR8yi*ya;jcwf3woL4d>ZMy&yJm2G`NGSy@SF6?S4qJO(sPoy!V=Qf
zb;mZ&Yh5aOqW;>h9U?Do-e3~_aQh)Ja37pF@M1}KbmP3u+{}};?O5~P@tl$SA@ZWq
zXv2#~p$Co~=!$2wW|mfDebXXRAP{uG(}QukcpU3Jo;!9wM1K4-{P5#(uz<jc1JWWr
z?v5TB%*_Q7d8`iw54;fT>^Zbl!AebR%AzHY9u;bMc(kZ^EnSk5!xa>C`O?CZQQFGF
z-Az~4<V5UyV0z}HYxsoe6ZogIGhJ?S3So6U+WC^_#DP=WSR(gr(GgRww%#?RdQ)TS
fUTr4lhld!p*2h|(yQ}R8j6ViXS3j3^P6<r_F9jrF

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/JP.png b/logos/economic_logos/JP.png
new file mode 100644
index 0000000000000000000000000000000000000000..b037adeede812ade5a781c0e907ec8ef029cd315
GIT binary patch
literal 1081
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9Fr
zogmDZn=$tnP{IBHpAc7|<o|&Nf4+VHbn)tob=#h=-tytp`QM*DBV6?F-<$nM&juvz
zl``5RroTtR;G}cd^R-+4{rLk?^LW9^y;8=v8hZZy{tXd%d*Ij}af2s|S3|gezkNR&
zlzi00^XJRgK#@<EufN*52grD_VaNRmv+wuK{CM`#UI{~p;y<6ioN|vmr0w+m@l%kR
zjXNGpnhTM-(>CdHTIt{K-yvKe`E2?6qvk$`be$hep7;0r4~Y2B*Kc3%*#G^>Gq^IE
zGAdQ#fHBB0wIs+dn1L;D`jH18K0ZD<Kb}XU|LOmCW{jM9Z@)DQ%4|EUqj>YB)hmO`
zqPa}!znuFZj@roj1n#;YejsM`R3NeAAc%SQ|9?mr|2+!g&i?;@e-w~z;d%q&{{O88
zB=#A9`4?2bi2u|hdCg~^OrM9If9NFK{d1xH+C2d*66IT)R1!9SaR;WgB2O2`kcv5_
zlT*W)93@(hA8<H&kij+3M?{pl$8qCs(U3QJNAd)@rGK;UK5}H<-M#bQ-FtrS%*@T7
znH)sK<ODUlyZSn(9zV*wP)MY6f`_KR*R#h{LPVc<&YgCy$d^q-BiOq#Y}*9q6{i(n
zyIQvFtX%ln^&7v|euV&yDUSrSzR2hYd5U-O#w={%^g7-1RCKCO0BgfZpM9&cvtA2q
zx?&#Td1VEo?-cXx3mSCR=Bnhd%N{9jvv7*NtMZ0%?~QL?l@~QS&Y5*kVB2BcEe&o3
zR$M1kb9vm$ir4~@(o?vTw<sLWt7+1dD15~*`G%iwu$^&tu<Q)w*=H~7ih1ndnAWjf
zFWRXlb!tm?LT$5|+4esbw|6=#UDr!E*HDmuKXbdR!9m6E=KXyOm-zYp<$vb0t03=_
zxSrn9A5*P=Xsow=^ygT^{I754YV2R$ys%cF=)JOal>d4Cnl}}tpWB1~e_OZg#?#+F
pM9zJ`{=NVD(Y0TH)cw!+#sBY2J~wZR)DBSk@O1TaS?83{1OQ@&!!G~;

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/KR.png b/logos/economic_logos/KR.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac592190e9495b91438d4231da79b2df6216eadf
GIT binary patch
literal 1623
zcmcIjYdDl?7@lvO4eb~iV(2qU(!`L|EbE#aatJ%lBrZ%FYm2cnV=24M49Y1v%c&+S
z=W<w47uJxC7$(vdiqWFN6lw;kv7fB1-Cz4>pX++w`|#ZF^ZohWM3S?uqP)613<guQ
zx3hMI5L|Cr3Fx#gNxBOGKy|gX1cvY7&O$<tV&_AJ!4S&p4Z!jX)nG7qJ;~AC1{$vY
z&*kLg)Ya7`7K=F?j*E*6^tJT#bYo*<GMSv1m?#hkrlzK%qoX4tA`A@;i;9Y%0H4oC
zB9YnI*(xe3@$vBl0>RYO6pcpb=jVrqhYN*5C}Uw^!D6wnSZr2S77B&x@9!7CTU~nc
zZ0YH<-riniW#y!#Bpn@{jEoE`D=R3UmX>B>ViFV-<n8TkV`IZ$FqXz9pPY>6?f2?4
zaCvene)-w+s;a8O!a@p#g2&^bD^N8wH00*y#>K_qa5#}j^t!d1cffn0vwwAURbO9U
zRaG@FFR!Vo2};h)%rrMQ^LRYb#5C`q56{$Vd19K&<yKc$&&|z2frk$t-lL_CpH74L
z`w!wA8_HEe5Y?J?$?QbGvHORmWyqhHedFZFA{}7?{%n{(+sq~Do}t_F_!Kmn6ubre
z*fED90`1PQh+$&!nsP{~wpSLxC3%~7uDk1bDC2*rBldFp?c28@J~A>=Qc|L!q0!pf
z`f^^R5?c0RUUc*3O?7qk%*@QOu`wtERY5_4l9CbzgPEV7=Z?+Z=L=R=R&sK3Hm2p}
z<=WcXG#bsv$0s;AII65y<=fKJ72MgyrP$cm`uh5snwqe%u+-GlmX?+eVzIBUFLY5&
zO>N)4eXg#q8%ruHD?t#X)9DKf3w3pM8)j%|=%YuEhK7cyRO*KFAJ1y?*C(OBcADnu
z>;_XLSMXjgFTLn5^+)Wk6t2A~(U#47w{lTt^Z`f^>>c^IbKuiv<|n#_{fw{E^nd9!
z(UyNWM?R@!h<5%ZXE*KDO#)#b)E%Gc^M0GcR(_NHjR_FbNc|`y2iM`Z?UUPZ_s`Pp
zlkPm{oIAX;>}U}5ULEbN54lGbk^>kLhjmY&JxwFGI2(j%Njq|Sy9{A6EX$6NL2Pjl
zT#tCn5@pkz1(Qz8In>?T6WD{0t?juZBxlQ1GV-;HL6BWulA>ExT!~}r!aYHKkbUE7
z#kC8#>pxeOg@a&#Y$MT;)BU(}h>ICkK+uou`A!2c@@2y<0Kn{wjP0)Aw7BG|0z^XO
z()`;+kqdfW>fH7=#+9?g01}>baEA%b+#H8Rb*ChGrX*fKCnN_4ppbTUCQc5{N=Q2=
zgiLG$4Pd4?wpGtz0Om326YRy7m@+uP>?o$_=@}>?^@MtRWE?#3wG2%UxlWG>3Q17~
zg)9#Yh$pl(Zo&GD-&Y$OQcyk>7;xUmca*az&@3wQd-@fAz(0=lt5}Y>l2`=dD<pOG
z?{WaL^W{MTeS}sU^ISnSDhAJ$d_ep{jyn?<J4}3qp>+3u!-r?QnKty+18YN!9DnLT
z0nBT?IW;hc>&Lx!g8Zh_7sf~EaQN(1eRMby`S@03X5AmU0JBfQS5m4mY*gzOc^7G=
z*w5`tvmag$BaXist+~`7U@$=ZioBd`xt9546CdB*qmzu*1P0^~EahJ=>LV}`cS{ut
z7@~-({WIe3fgiC0j~9-gV=V6`u@3G9DbsU=aE(bx>KJ!!P6}Wq^SADdwkPrzRR9x;
zFrUGphYYs0GYt^Hf$;VW;VIAR#m0mbZK{l$_}yOV9pLv~7>}dxwH$tzfCtJ=a+?>o
r=DhEVT5GrRG^(?`c*XoF3n>ND%<e$7Iq%4VUJ}gS#@YIYWdQ3>^Q*R3

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/MX.png b/logos/economic_logos/MX.png
new file mode 100644
index 0000000000000000000000000000000000000000..9903222593dd3dbe5121eef7b4eb13e66b5aabd7
GIT binary patch
literal 1219
zcma)*drXs87{<#wCRA8t2t$%#XOu8NERYFNlSS@zSWD@Ef{s!yk_-_636KzI8J9N7
zP3MMmSSZUtg+XZvE7!rorCbCGg<dE{#Mug^6jB(pJv&{E|86Ha@B5tR{Lbb3@*X-K
z7ix=gMj;RgTWnYm0cNzRTOnZ#YGRDQWRXP(4X_Z8dltfhbw(H|3xPOlZ|W9^$4n;#
z;sZx~I58Mbg8$uSU&*(1yAaoFw7_V5zivyn1E=smQi-+2syem=OWN-F!>HGrfrZzr
z$xT&=)X-@=*A+^}{<6aCuWl*{wKQ>Xl!n&}9f-x%)1?H;&gdi@!abKRN2uF)W_UR^
zRW~Ps`Yo&3?1;{XnYB{8rRna6=93Y=I5Zk+Puk5rty<XIvbp~5EC7s(g|4phC<e(l
zHOO;OFa-JiopsqFpI?15;Q~7Ess}wG#Q5(=84UW3%{8rRML5#XQXG>W=Fw4KO-+s2
z+uJ!f(5=XZ`UK;@aq6e~8W?wC^5d@#_i~p+{B6x&DwSL=8K@ZgGmXW(^^jWH+9;O_
zXJ&YM{eeU}Ha^Sk?5yc;rg0~GCMH@>=HJ-eRm<c;g>X`-lEeGl?`eg9)nGJ={I6`V
zpNZeRf)V=gR+sK&>bJI`?wS{@rsW;J-P9Wl(ah4NfXFRQH}s{db$|M8vu>Xm38~H(
z`C&I2pBnf79+uAgmZm|bd14Uvs1R=VVog>%%yTPBI^0l0F}W()TarTHeY=s28i19-
z$tK_;5su^sqsjxlX0{>I)xwLd1Ns3h@>u1bi8gRgyHA^h@|sJR0f;Vj8G$%@8mKXq
zVAKkvuz~D|4uk{1GC{%-Qv^U|PT=re{;#xZ0yuh*H~`dk22jQYV9h}Z4kBSesJ|D3
zq)kvV3OyMBWye{Zii-J3_yEeWL6?cS%tUe#GQ>5-G3tEI$2hNamv29^85})_wmK3p
zbgHp=j`H%88iJMOoDU~cJElc3t_TEUC?b)#FmI=IejF=!gCcV8W+!+>%m|}Lh%5>@
z^+Vo@Q`5;vDudo~B8K{VjZcoHyW^uMG{Cy85m=O4NFv#T9!LGT4~b;6ebO!6anm;8
zUi-(p`QDfwwwp$?8xX~MIi+CVYZ_d9@f8|lMY6aUh~dzxX4*C7V{WG{X*RP~mfjtA
zwyo*d@s2OXP)l|wf^g2)r<0SFxl`qkfhJYQ<70@|39(TX&x`EEwhljhv+yO4=9aE_
z8mLPt2u!qR_|={0j>8W%@NCbpBp01>FKm}2Mf)LdUpwbwSzxfSIc1;W@sq!`({kg3
zUljz*T}d{cQS-#xzKlld{G3iGn7*EddOa17_*%q2`e{N0rmzF)8Lx3ZOJcN<RnL<%
z^3a&Le##jJjs7f!okI4gTlnr6N~CLztE}$(jOmx#S^P_#U(Viei3Mfz{#m9gw;fg#
N0vn7AY6~FK{sEMr_2B>j

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/NL.png b/logos/economic_logos/NL.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fa2c82574ba9370a5f627a3f771f44adcd8b0fb
GIT binary patch
literal 965
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#X!Z^
zL734=V|E2l!PEes5Lck&e=xY#Hw(hRO1?gM{`-s9S9@lzmA6>LAiG}G?#9%GKi_|Z
zEB^K2)9VxG_Ik!03`zfR{SHL@^@;PxQ_D|eR{j3^4I=V%$AN=knV)XmgDN<Aey3f?
zKHtQ*=dJ)nfQIb#ia!*d_38ElAQz|$Xz!=n_krwBcR(V4zW=y7XZhb>zkqBY`0?Y%
zhYufq|Naf(e){z3^XJcSE<_M3`Q^(Oh_atQe*zVJ|M{nQ-o;<P|Aus*WeD05JMsL}
zx8JWn`7E2Zw`;>)pn}Yqmm!R=KmLUEoQ<1w;n}+%K=E78zWBDCj_5mg_r+Hr_uRdY
z5b@j3zWn(07pVC5^Dp7O=bpU%e&_ku4_|+8I{m_`@~B<Su^s1MefjYRs09eNoOuah
zz{%o%^<-egw3h_=1v7{jZ@%^E--m1KvjohyLp=U{tp@)Jpzhx@xt{$0e?!&%^Z&Po
zW}pB6f2#uIUt8Yx=l8ZLqQCxs=PLl3>AmUy|DGF1Kfe0==lA>PR}cJe&G_&7{XbCo
z|MuVie@g%VUwY&J|0C>g|Nnm?`S!8WwId+mDc?cP`P}Z?cl^!EL)`zjvxWlGjG3p4
zV@SoE<b(!hH?=geFf+3<K0m!YHlG8BPaoG;;9zq)q_ik0<I*FcNkL5>4pDAle6G9q
zG$}|0gao;rSiQn);c0HJRV%X(JTcw6#qcRBYiY^X1>asvCrlO>F)?Y{aaiJT-41J?
z17b5CO#+HAM<(?hX4;@C#=|o$>{>-buWs|)z07hCUL1Mwrpdo?wRE$!T_rm^Kb!v_
zu00ZaK5BnR{BUsnf$0bN_cPVEG5q0Tl63i4WvnqnQAK1v({Tf~j~_T}6oe!mE(*M8
z;pn4dV0QFT!KvfwDosKyIYN4@Cp904s7{~N7Hem#EIdhL>gG)wPd<P0?BJxWZgyhE
zm$<nEC7pM2+?D-!@@OTGhr_xhTX>GvKh>O>u`_u6qD`x$l%j*9!{>LX)_0qmn3-;_
i+`i@7>Me>cj0=vO+9r7CS{5);89ZJ6T-G@yGywpiwqI!g

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/NO.png b/logos/economic_logos/NO.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba406b913843638f8c7a543e8c3d0225ec040da4
GIT binary patch
literal 1074
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP{FnUpAc7|<bN=D_u&hKfrq?!<H^f6pVsa?clqX1pt4W?0q?bSKYDom
zSg`Q#{RjX5{e$cM^Y`!dyU)|>mojK%sJPXhIDhX;R?e?OhyVZm3sv*y&zG-1G(79S
zb$0!I_z)ua_vOpKFJC=>_2F}B`meqFfP#N+-}ydm`k$LOzm}H$K6?%*^6%59Z_O<q
ztZY8VC;ZyJ9is93tl3}d8~$9s4$^Y-=Fe5DA>v;fn?41FK)C<jzWsIJ08sqbuHBzP
z!~fp9_a!~!Yfatn)2D%ge{bFTbK%0D%a{Ls|NiI34WNjQPb0ft4x4VavP(6P%b=eA
z>h0$%x1OrH)haqyZ$EeiWYq56U((XQ6cqh^{N!7G!?)Jf-zQG|T(=G=_3z_HAPIE*
zzjyCHCnW<d1*r#<pF+cau3h{8=g;34Fa3S=2&DMy*N>mR0R!;ouiq=TozV|y`95{p
zzjyCut~|VX|E1*WMIiNHaPZVEAU$c0gBvjBCY1#F1v7{xOg{eV_n!|J7Z#~8>Mi~X
zQTYGQeotnB{_kMk-z_TIpul_SFSiXC0oQD{0i)_>_&Ff^twI0)|HnDL|4&=||NkBK
zum63(Iu=X@Q<p*HFEH~zG?F&`PkJZ#zy1GXkzc|8-?iNQpZxBB%W<HR$9I54hv<S$
zt=8_qB*|Fr>EaktF()~pf!R$hO)Si;jL%OmPcDv)=fH7&1q~G)B`%hvM?#Z=F0Hs^
zw5jM5SC^LntHXjdi&nMitY5cq<<f>V4k01Y?&6B;m**#RtaG?>;s(nzq0(UEVjtE;
zV$;F`ey`2V*{CV7b#pm`c0q~IQJ|8WM@665n+L{lx!kpF;Ii3Up#9<7$JB%`!bjIS
zT(NIx)C}<P(b14trQpIN+R|p&;_l++=H}`wdc<W>V+5O6qCtb!0fsj`YYGz<h^}8S
zVS+?EV~gY@kq=CXY-LVd7Lybij(8tqIm9zZGhxE4WeX<Eo7e<Yu;asTrOA!f+Sb<A
z>f);u^rc0gh#P$Hc)<PYkP=&*XQ~ZXm$!t(l8^#z4P9op?ORrv>9IZ)ow`6|>9XV&
zXU9-emB3e0*2%#E!O`sA*VMl9Mu=Q7`*r9O>-x}O<6TXkR*CJf5wO^@ZR=u<7cbVh
zojtHlF7~di0jufWqqTn}Zr(OeaMH0>`J-+&?LaFd<C5uZ-hvtIzy!kJ>FVdQ&MBb@
E0E2de00000

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/NZ.png b/logos/economic_logos/NZ.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf04ed3eb11e092b5e5d8a41684e893bdc96fc63
GIT binary patch
literal 1391
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wk0|Qe*fKP}kQ1U+*+_?S}!oWjbyZ!3(=kKqNoOw`C_kPRnH*ddGb?;`^
zY+z8SmACKhoqP1=y*K~<{ezqE>C2C2Pv701vglrF$(OU2s(N<w={MU%%-MF})}KFr
zA<BNg|M>m&yH~T9em#E~D01WO>!}M*bWA@aXw(*-zw*)3_Yh@2A3uB2*!!@w`C)03
zj9y)I&a#)ME&-*!UB7)Vqx_7B_E`~aDWwuollJne)mN@R14{k-`Rk^C!n4k)&pM_&
zZJF@2ZPLTm$@iNl-EW>KW6)q6Fnz@qkc~j_=*hcBZIch3dhq7$=a2i3KB{OvGkHZv
z%Ldoj1(w0H*tHtDbejCqm!7}&9H{u}?N=Ss588##F%OzCfA!htmu|n9H1}3o+1m6r
z|F9`Mdd(unt*Jqs34ZNDMy<0}oB`YLKOl1%t46&=@XQ5k&fdHB=*{vCx6;ekq_+v^
zHi(+EEsv{T6yGdl*rMq^Y2KQ%KrJude2FStJw2+SOUi9(O1GNx1ZBs*rb+vkFF!UT
zp-o7&f<voO-?_)YrI$^!Ve`HlKrQpvp0f&@4PoneO@`PDA*C!kdG(r^)aso4C(Vp(
zC<<yd^`5M1-LcOtu`{HBO`}1=v|Yow&&&s;OUq-@oK<Im2*`f-;Tw=lEMNEP?HALa
z8EbZ21#)jccxw?d3&P&8`?_1g!r3d&{P_9%@aYFYSzxFF(*Q86W-dRi;WiPd5hw^`
z14$s@a20z6Omi1Xg8YIR#1bYSfBEarhl>k~)EM;^e}yOkl7IGlG7C)j4&ndZqN05c
zF7?u1ZW}o1T(j8*NohC35wic^8uY`Jf*2<_pr*h@Qy0UTV8$JGguM_Mpa1_CO#XlQ
z*sI^DDj)ve^gsEX;Q#jjk40bp{}p`g|GSo(Deqd2|Ns9u?M}xgfp66|z>K%Y)5S5Q
zVoq{G1GAf2npl`w8K0kCo?ILo&w=Cm3K}XpN?K}qdWxE=y2{;Jy6Wo}tXQJ6Xpt5l
zW7aFFStmY4-Ll$M^^2{|&CTstfU4TEG>*z*Zf|Xk4ci*E1h#M8+`iN0^uddqY;$50
zxMJ?!v0d=3I?AfD^7oHlKiOGWSlBubI~I6oL^ww5m>TSo5>n!m6I0{lq~xKc$+<?!
zQdRWH{w*ci%Nu&mta&r%&YnL^6I>Dl3ppcPGbIBYD_aEv9GfaqLrZ;gV{4fM_H10a
zlXcC4t!w8tZgk$WdG+q);wRR=c|G5tP-uc-<*6%~0_i^U4<0ZHmf@daIy>=PObyqO
z=Z0sFYwMpow}D|lQ*B$T#Zxg|HtmGtihEODZhETiz-3V&xuNLlD^ms5IXgtw#BSdw
zw4}kCX}z+!L4o(9$@h13Ho9}oZ#o+-QL*&u2aOxMdK(?xWViqMCVSw;w5tXORreQP
z&kN|fbZ4`8dsFRi#m-A_4mjpqTHDTdc+%Ft6BBf}_+)e2pK{0bC!dt~_THLrI(yRv
zVRiq7yZ(QvyTUW4>e-twkp?$=XK$Z(yLaN=+v#WK9bd=KBz-RbCYv}LgQNVCG^HOG
RY=LQ%!PC{xWt~$(699}7FjD{k

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/PH.png b/logos/economic_logos/PH.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f5f8e3c1ec30cb56040e7552e4769448055329d
GIT binary patch
literal 1339
zcmZ`&Yfuwc6kZ-hK!^w<V~fRr793jfK`qjjDiM*ikYb2I%Uh->ZD7KH2-s8#f`TY$
z3%;Nuk2(yXB#2aNDHTMZ2&E{L5Z-wZz_6QSLv{(t_J+00^hfW^{mwbx`OcYhch2UA
zFb>&Tzhw<UkS#sXp9w70crDEU`d1e`1I8qUd5C5r?0)Yo2&}k)$5J4O^3-@uO5UY7
zL6GT@kRaAUkR(=4p<s-3{tvr^@C=My<c~SWw?NFMtzWf%-#oE^F0JYjjjmG&2j+A$
z3!V>()vJ8h2>j)>frJ|`G}tmpKKyfzey;mSVXsh%lFah*^36x%!FfHsV+hF@3<j-I
zq=e-el`q(Zy(2QC5>p8cqpZc58U#T=H*mDF+vt1;nMF|)L158}5|qRL&W2%_`c)r-
zyb}B&C!4EODoj$cG{w`(s+K2{eKI=k_ZU-)Gqp?8-|EMY6C?hH(GXmG9+wmWUJ1__
zMw#e*r*dKXbq9qA7v~Y8Pj!<i>iI4NQQ+c>N?2+T1>@p;m0}2!Uc)3;l<@3yO!_e7
z4yrVBtx8x%mM_X1w6ZeYM51Bzh<4@<CcQ!Oxa6{Cwn;acI^`RVK57Rfj^iqY5dFCg
z_~21`bdgkQG#Uh1kVU5Hq_cq0>-CuAsz%;4`u2WBK^dvRP_ce2Tq~<sWsF}{Es;f?
z*2(5b4Je#1u8@W$FO9x_nznC9%H{$AJ~Am!$Wr9rGGMqtqXnTX;*?H20}64`q#jnO
z1uauPVPqfm{ohCj;MPc%H(0FBR3;-7+L+ojq9zQ=VLoU5-iPG6U=1GYYV-u5yJ_t$
zA&6nOLttGLyZ5L7zC&4=<L^7hcIUyy=$Z+l#Bm9;OExl$Mk5kLk&v`Rm(eOfv;Q8L
zAm#>1s{NkPUN{LLP>Zgu2R7f`I0)`k3XnKuHAD~{Yqrc2gyhX#3PNHG&+7<0tpo$o
zO-1uhFJ$jZFabYRJ>B1rm0lJXlVuj*7VpUZAdSNCOmeme`n{)f2X&jdMVo8o@#&KT
z_E(t$w7~rVY=-l(D8IvWOWSRAHLjAumwWo9x#!-0&=jls@R!W%DjIFcBF`>kOPoWf
z7suoIcIpDZsj*qmQA-n2IN!D0&8ga+wt+$YtSpifnV2Z3+j%-JhO6c0nsPioZrS)N
zkCVvLb9jO}WL=D<P2&Swij{49Qb4--f$Bt7Y7mDL@r@~aL%z+XW_q`PT5QTHE~s$5
z<l?)<Yi&LCBX{o|UYjG|a5|7#d%)zVU+m$eWO~9eACH(5HT>Y*Z8hd!9M1KOj_M7G
z3l9(5>?G<RHfLqIM2|o3H$~%<zYc%AosC~+<lRdO7yTF^a;{fNTX;71dj9QauF;>w
zx|+3DcQ=P}yFV|tDD0i};+*Jf^W1l)FCrxSy7$>9G$6m|m=pT)>Q6m8+t%2WHXOC0
z|4_$nc;eQYHkNs`ah#v*;HbY9=CV6)s`RdWLDbCiHM1|C5IA%cM?Tip`}dURozW`x
xL01&=axP+5x~$m1-Mi~jxxVYKIG)4$N=T(MsY*k`#=$B=^n(old$gGBe*pJmc=rGR

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/PT.png b/logos/economic_logos/PT.png
new file mode 100644
index 0000000000000000000000000000000000000000..80b9b39b195ea537d0925777a5b2a67c0c1266c0
GIT binary patch
literal 1553
zcmV+s2JZQZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA1-3~<K~#90t(OZ-lUEeS4|G~&gMraGGcD+-
zqo4*MPGrrNZ3)rEpi!e{?x6x=hMFjB&S$1WbUuc`$0(xUa1%FX7)4|{pCI5+DuQ5n
zC=VY{6bYap6#hH6P{J50eDEdzuW9r3{(twJd(S-|Q7<n5Z?G02I(jdErn3yJW|omv
z%gSLLVXbD3V_Ece?3Wo&%&EwUHPlr-F~mg!<HrNy=bq%?0PNlk==DalwVmhxPG`xa
z8rwa7@;Hpm8)qGu1uI`d#)#(__awC%NKS5r(U`<zIrY`tHSb<twtuWYXepW0X8^P2
z&j*T%s(8$qy){>qJt|9{{nPALvw6P&ggiZggoJz^Tm8bd(J}Mng@+clbv5rdfRML0
zkeaGzkNGdkd3N`i4;X-uhX)WB_lUjRdIH$fHRs*+x<4V!k<cRRCxnj=pwnfrpH)|L
zvDF&8n+{z;n7NA(a*Po1C*kVPgxg_+k|08j2f_G?L<o(BEwQvKK&;qmW@A|Z;iIjD
zeF=o+k%UPb3DdR{^sG7s;o*mb!camnKhyB01OR7e0a47pa#Mw?s;hcxHn(K+Svv`*
z5=UXfMpyVRcEz$UT(N$&E3($OpwdMJgGz<sDJo>Gp9EdpAk>YN0HM{2D9jK5U&f@z
zbk6?$%@#P9Mz|EM#L0DpyPS6;|DixlI2*_jkhg!o{3+r5iqW`s+y+<nb0miJ5x~n!
zK*R`uy%RQ1FqzAF_L>wzQxhRKUWsd85$;bJfd+SX6b88CpRh@&p5lfEH#g+Zl_4iU
z0bQsqGSdk~?@5RPa6{ZP%(I`yc}>kEl$P><8YSBJp@!hE#e>K$sK!yP9?dPSrtb}Q
zc4$y2Q1po{$|v)}jFbdm6nBFeVCNr%po4^{Bwl2ZN*HVjwciAr49{iV!`kpnv>4j~
z?vJ!XrIP|BUN(4Y%@I36XzuH-;7i<_%>YN)Sma-$<!u+Hgf`3qSz#-2IH3TiGb(WG
zR1q#*y$|ihQk>pkhjSYhDBNO$+}{Yg3_`U+8i3IZ@CzINnoJ1hrLi+eiMtaBH&-o(
z|92OliNA@UU6&c=7Iqxg;f{wL%G4Zz1vaSI!d3D#q0-Sp5<smP-~a;zMi4#@A%q8y
zfzi?u4ZeP+2e0cN;`cKprWCY1dxj>t9Cc1k&}|!xN_RpYr|)TBcR~li4Ku)JdkMSZ
z2}70<=Byls2V?A!GkrAb3iI(-dW9(hEygyK$A+UoMW~oP9(9koAT1)?IxcAungEVC
zu5~m4*z&eJm}r4BX<|VR!U4axk+R<sr868*9~z4KhzQjC`Qu8U3@Phg!|jXXP+m@G
zY~)?DKoUTixUc&0%#WRgXfD_Oq_c!Ihj>T)FdUgn-$IkM3@uhxXtuFIE2qUU_EluA
zS0O)34qY~%4_CQB^|d6sxByX6i2`7pzEa=05ak^H4Mzzl{w91IP1t_W4u^c5a8W%L
z58ida-HGoYKVU3Mw#rfPJ?B1^a8E5^_EAwH0=@#kqKz9!^$vAs6s$QFfm{#v@ZSD_
zO@?v_p1Nr;3N~A#-pUfSqd5Pc^WnsR)l(&y3)R%ru(!SWG@PECoBW?fM4X7?6x_to
z*vEm2=IyEDBl%7^S3O>=<$i=G!zG$8Ud-jsu&wKHEHkzmljcRv`(Gns!LnaYP;n2C
z#<Q&-O?YM{(O78mWFS7if<1?K?}(IzRfSca+dX^ihz6u36N--)FEewV*B8!AxSo*j
zy~lgt0oqr64Ii~3FYAoesYR)JkF6d93n0vS)tkDY7hQr*w9au^agTiV`}7~6J?G8*
zsuuE6^KKw+x^i8H=8^`^o1CQqELj3nSBnKVN7BoxXq`p($`HjTbF|2t;nmw*oA>!P
z*04Ss_W&Xn4P<?aHikcQJ6_3qy2@CI9l5se&Dj3}ZfnN(7M-Y$00000NkvXXu0mjf
DY-QDz

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/SE.png b/logos/economic_logos/SE.png
new file mode 100644
index 0000000000000000000000000000000000000000..84598109ce7048e4728182f66b201e1921045aee
GIT binary patch
literal 932
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP(gNpPlzi}@;?~-d%Xa{z(;<&`2Y9I|F7r&y`sk)JeeVAvV8i2-c9Fk
zK7If1ACkU5@Be?h`0sYWztaqVPBYn5ui19?!JofS74P2P|Mws@ym!a#=N}+?9=`sx
za&wDC#p(?w??FVaJbD{FVOK-Hms{h;!`Gex1>b-95!AKKxOC-;Bex)GQm60pYu|GI
z-fJND;)6FccU^&q2Xt)J$Xx>AzWnfQ^XdCQ@%j6%Syirqu=NU;HTHY4hD-vA|2@qJ
zB*U8;9SZa3&$DnU%mZ?@@|Mooa}|hy?027k0LjEDdtQC~W?Hs#&G9=xE`$Us`0?w{
z%%yqPZyoq|+Yb~1U(f%4HS^zP4WMEm<Ny23|E^mB)dLwoVp`FQ6TslEED7=pW)Mr5
zeC*Y)KOZhGEK+0CTl^KI>i_>g`#qTj`oDvif48V;o%{d)rN7*^zyGh<Xm0}=e>42t
z-~Vq7`v3nw&hh<!+T#EJ@34RU@ALovg2_M~mqFV8|9|*@)Bogmg8$q9KNkHJ{I2Ey
zyZ<f6|Nnmsba=;tO{!(R%D}ky^>lFzshHDx`D^qc2Z;k8#aY~<=1eJ^!nLA-Q9?q4
zt&6v#X^O{<we|a?i#ble&%gb<a^Bl*)(vGwmHkdDm99vw^~-1Q+gtmWx!KLdG{q=-
z&9-+RKb&|WajZ;gg5?~&^5-=*NkWhP8YUcn{d>N@@A(8Xhkp(eDktCE`IA-8VPV0O
z_dmP6JNOqootnYDW}RYP!!`4yE5FPp3OGa;3gx`#Xui9b<;1s%1`h0=6Xd%Z7bja-
znogQ~@xh%FdaPX5p;DKdgc-ebqS!)$8YVDhX)c(^bgNtEX6kFL+Nr72ndf@Gaelhq
zF<*?iRY^jJPcT4>Ib!ai1x3#P@@Ah_W?8k}G|PSG-a5vB{0p-$iF15xtoht`^V-1=
zw)`1l!e@3GxX8)fTo6^Cb^hd{^ZM&!7ks+*!tTJvAHR>QGk<Em6y96BNBHD>k%<dW
f{S`U=_V)gq`6V3wkD5AxvCH7;>gTe~DWM4fVH`4G

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/SG.png b/logos/economic_logos/SG.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8ca181658cf7a0c55be116af669f06061e46617
GIT binary patch
literal 1248
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wk0|S#-fKP}kQ1U+*{8+aI!oWlRxq0W`+xI`#Z~fpG{Z`ZRy>sCA`OE&?
zfB663Ke(=cKYslC`t{$}Z$I}O{G4C)-pb=+bjGhk$NvBM3sLj$)93$x|NedU;!{G-
zr{w(4MYVq(K88xY|M>6A*MHxCd~N7_t7G%t!SDCQD_>jtKSred+<OS9=Fhzcf9^d5
zGJfvd_s+onotf*`#_mtCS?|nT-fCHWO3D9y_5x7$Yyb4m*<~N2(|;^m`@ucror&}J
z*^9oEH+~FB{JCv6#I7%O?O&=|{=NVB!9V6xZ066cyFa)Fzty(>v1Ikv&PkuM%Klux
z1+wwR?JqTL|K7d-;2ZtUz~P;d(_1~eA1gON4EdZ>{wXf||F2*F|NQxsTJToG;)6%n
z2hZ>i-VqQrf8V})XXWwx%5`AyzSXt;7@79_%!RKV6Mmn+{A>Rapdp_Nt3h7={N=r)
z|EH9Kx0+VpdZvDg$@mzR22t?N(DBFWO~4Qa2L1=%sCPOxZ?&zUUZ`yTbLSo~Jijko
z@hL9rou$WnJD>N~UO?HuPoG27kVo#2`ql?b8JkLi{DK+85+)ye_3O`viwld?81)u^
z1snNizbCUm|93F^?-mv9b70m>f4ObYX#RiAW*Z_^+zf{a|9@*R0m)IvIUr{I|DU!P
zE_{a_VhKpV2QIo`GL(7wI85yK|A(8B_rDYT+rH(o=!@WMEjRCUEZ8{JxYit)0hW5Y
zIEGZrX`LJze%L{vbvl!7SWZFt_eU(Ta~{Rrx!b*a_ipj>-|b6Ux18nV{hnI<?(eyG
zZ_?NlcV4l0B{eH%-n4Cf>*VAOm*gj8r0^KcoH1)=bi}1(?QH32>uUA|PhLEEvuMul
zT|28QCheO(haq1+-u2ycc>xI(1`a;XP=UmUf+4EwCI-5c@El<}a@3h=S;vtjPws!d
z8^m-sxG<`UEkWnZ8KD4|GQV{^Cr;}taCI-(v1E#gYwFXkU@fiHOTMpelUlTm@0GOF
z(q#cF7#6IY$r2T{aP8j3!V6Z<-cq$|O3{nA!pd9g8X6swG9=vGj&C?w(P+dVJh{Wz
zWnJ)P<8Kw)YWSXsi)9|TWE3@V-}_g$ejQU2%RRWw!+|-0{q3o15BL6UKD;<Np`+cT
ze*cHgkD6&rELO?0N*c<~X)$FAzHz$spV8{gPu5GR?0OUB`b8%w{1c6?t8JceRF}KJ
z{a@bc>Z?BwFW#~^W?snCJJ07Y`%)VictHE=HNpJ)XF`Ui;(wmJw*OW?_4$&ba>=i@
zm)Uo$`Z;&o-{Z>3dyY<?Z*9N6>Z9t;iMQ`J-aj$@)5g`efXR)))78&qol`;+0Fovn
A!2kdN

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/TH.png b/logos/economic_logos/TH.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb43f2411e647b87057dfe7906847d2f3589036f
GIT binary patch
literal 916
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP(f9IPlzi}@;?~-ShW_yz(fAIcKz?`H$asioW0)4sJyqZ|2}K(pS$<|
z|N95m_3z_Hpt8@&nI8iqe(gK(|IZ(Y)Sp|ozm!#f&dmFB?><E2?~|vWQ?ow$h5X#P
z8zS=W)8}8i_kEu>>*wZee_y?Z2ogj7`0;Do<|8j(yag&=yK1kBjDJ`_`My1;fm|<_
zToqY=Aj94=6=Kx9*&98bb62m}{pR)ix~dsx&s>Ly<0Aik`SR!Ht>355{JC=F-@Erf
zWxr3K{pcI~PC?_x$~8dl&rMrCC#HY&4*I!u2QVo9T)FmR$?^{lZeNPZ|Gjw&WCK0*
zF(B-NqsNcstNwlX0OSI7vCnK*0)~EFNswPKgIL1kW3PVw`EYSzks71k;;&%0{MqNp
zEHL5w|NnotsA`@2|No`G+_t~}ui0pC0|xia@N<9vzcc7R&hb5M@f~)c4j-VV1(W~(
zzx@AU;s5^|f#IICU$A}4V^Nit!PkIt?^<pGiR5?x|Nm+^4&*<+1G44af=wSbU+@K{
z2Te~G$B>FS$q5b2Zfa>_VP<7~etLOwacn#Xj_WIEsPM2UElPSMG-<`9pi4%Z4tY5E
z#W@N_#(74%O7N~&wNm+ssmaz0Pg`5JmX;*yUA$~=aD=I+$9KWE*|TOQvx`kjU=6ca
z(s<w&+Y|ffJ6vbpHgLW9cw)A-g^_`k<zq&@bv!<K?<yMF)tjep=eK)s`ao0oz4p0{
zqWhVO+02}{Zg6ToP*~D1c><H3{T{AAl1xk=PqMQbe`slW#F+SyXOG|yrPE528XcL!
zix?X<5=y+?9#8A<WL>&qM@7u19L@<YE9cFa(!;uB$+Cl!w&qp2si~bfRo3#9J8trv
zm@hdKr^ho)XJ<NnXi<{L&q<e9uJGg}hlj;6PF}laRbSW96ZiVoneKa&aQyf6H1|WT
ZjCDzuj@MpZR}G9l22WQ%mvv4FO#t!@HQ@jN

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/TR.png b/logos/economic_logos/TR.png
new file mode 100644
index 0000000000000000000000000000000000000000..587e1b56594e0e0e0e790df2e7cb1884edb4ce5e
GIT binary patch
literal 1454
zcmaJ=c~BE)6c3>V4WJ+(pd8U4A}A<OZ50Ql2@s1RTv8lC&`Mh`RJ>Zp)Ceg>G6N`9
zL{t==qR1gAh@z%ZE)RsDL=;mco6SKIA|VOcY_k1AnASf!eKX%Xf8Tri-uJeEPK$OR
z%pu@#I0tGBIRQwb`AoA0oP6a(2M|^{3DJ>OgWZdN0mk$_F{wE?oSn1zSmDYm+;KSk
z9(rsN1q8848n3FhDF4He{#QoX2tZ20B7_7t*gtfv<c#6X5N0y{bIYhw0hl}`Lq?|Q
zTJK{hY6&6yLFJAdMS7NDNMP}x!;n06i*(I8ZBq;I0DvNM`^fr~iS{mFf;`ey6irQo
z1q?ZQio6zyyaOO7FL`o0($^3CLVJ&otilOyJMxN;47}F2ca5=2Mq-m8N3Zeomn|1z
zVxWqVhl(ZUoTDmz*Hg{)dflBib?I5yZ<%=MDhm?!4$yaYn-IjLN3=H@q!Coe*+=Lw
zM;!E(BJ)R)r@yZGF32!`rCM84KgK=@xy}>Xxx+qz(#Tj#Xe53kW-uVUmoRa$cu^<-
zt4qs4`|?fS>00iBDH-0rgMEX+m+S7_Q!!Y&yZ12zs_*E6X3Uj_N1MjfV2l%wI#fS1
z^-rE*sBtv=5J-Z;V&vt3?%qR#;Jq|FN^`Bwq}9rz==$zwk`-%3ZX`)axFRh}*W4<L
zi8mKLU5-5ORczTVbnt*&h|o+=NyzH)%BzwUkti%NDo0gEnDD|7-~nJzQMx)>Ti0mP
z>%prjckNg1Iv|Vu1`G-WA=mkej2}>;$TY4oX*8$^p5Q$Gc>Fh*6s-I{+c+YZr)?7l
zE|-Q=#7n+}X8CCAo6I>e40LMIK^4=49#jEfOQ?Qt5dwCucYgvc5jQ*IREG>fNBb`A
z^Ro)7(o90o2UKgvA{}_GTfPB37$%MLZZ={A;msy&Fr^1mEG?RZbxyM+H1n*ge|2og
z_7ek(oiZv<O)BQC`42L8`zd{xG8!#%>%%Eq=`^JPkw2*lT^C4@L}gx{Fu$>E<I^+X
z$1_mLYm*LFY|S`k9p#rbd&BaBGiX7(z0+;%Ii0~oe_wl>`Iom0&pKJnOW=hxa%0xe
z($_krrc+ZX?he)0uaTfH!fyA9SghLz_Gbpg^ZGkW-DWRe8g~3mHk%SLt*oq^=~|X6
zZ)v#I*g?<Sy2EztBD>*!ac<SArox(YtI7#8<0|pNso6f8BO<V498TqX$E43MWqz<{
z<DE+48GXxc?&WenPA{NV2b@fFFH7i0(aXG0BK~Y@HK8%beV=;Fh!O}TpA{A-yM#8B
zPUuhnKCke!b!|cJ-q#-A2BK&{O|fed|K-4+q>dtHt>8udC8wZsgQWtw*v+$u&JhfY
z`P*lv&|eP-hWUMq*!1343Nb%-xK;K<@PLtr@0reEI4_(RSQbt>EDOuS*GU-+M(A*{
z%QNzZ)rHI>TF;1waI3l!uV%5_h~2@P9&<>|hYK$L#oM-l$QZgJ;`(Q_ud@*(@2lb8
z(9~>pYh&c*c19)r^kMxu4|iXP)v{CZuK8$ZPue|QW%uYiTlQ`$%gE&p*v`=UtYrHw
zX+yf==_ghm+%z}MhCr*x^Idnq%X%lzF7EuV3wES^?Yx*ktF_M;*`<>b=h_?MDwt2L
znP+RG{jVEdTp&N^9K4X(J-Fv>%FdOCTu4Xq|A1VY3{1`qb>NCeEGyc^t9D1%+-w6Y
Oj-yg&<hsa=<9`Fo>XJSH

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/TW.png b/logos/economic_logos/TW.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3e389fcf26a6506d55767aaf9e8611d62996ecb
GIT binary patch
literal 1323
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wk0|S#`fKP}kQ1U+*tlxM6!oWk`y!rC&+b=+s0l_o0^_yKiCM{TW;{JoT
z|NbE~efsqM=B<|nMXSAhr>12t(=lk#H*SqhSa9U<?SFs%Le$;4`?|hyi=I(ySI=%M
zyPnSOUF$bqoHOsJu3?LTe&hAr+CTRnKvX_^{-L0F&8#^`I=XlDPu#nD?YVsiZXQ;$
z{NNw*bLVb|n%j3?l~=AWt6bmGw*B1sN0%-?-MINuUcsuGx=md@y9|um-pHwZj7j)?
z>NHS2(0Tbqt8MIi7c4x!cKwClzyAOQckH~je!~T4_lY081AcDW0x{OnbwXa@s)nYm
z*RDVR{rhiG=~_>pDW8(le_y=@Q~(T${)zi;+<fu(@4uS*%@Zc=^YNeded%(DUQ^4?
z?!G-+w_Q1Q{NBvjhu=H8L8Qv7Hq4%TG%I(-*6mmB+<A5X!J7kzZfEDNm^%Gn--NwC
z_v`~|H#BXVGVS2RDf@f+_AFU;D!*{`uHDxSOxivKhCvi;+kVB+q;1XGb3nyLX6=EY
zv$XYF4k=k)RW!J&VDMaC{hg&fQ0n`vx$j*(f2>^n=k7fq2^9JN@85^uh<_hG0GYq`
zANX8S{`bw>|9}2`%Fh4b8}xJA4xl)MeDCb>W5ud}KYv1W0hIx{Aol<NiQ!_gz(ljV
zB*-tAK`deNu~)zTe7Lx<NR3f%@mH{lKl?nH1^T~(+5i7;QPBc96bfGY%WZ=ug8$cS
zw6`H8oc}k&&%vbr|9@xD57Tp;18Ua)w8apyJM1tyAngNZFPIEuUWRcW{{O$}&;O+T
z|KADz{of9Z)JLMfg8#p3Np5-kzkSmRi3|ULndFS8i(^Q|oaBTCW;eAou`shTK0m!Y
zxi~hS1IP6hG*o!llolmD5}LH)QqU!%O^1p;9pdT|F!eg6wd%yDtXERAqHbC3;;Q;3
zz<P+S&FvURrEst@Yhp3Cw{~TAVq%97vvjm|^$c$rnYki!W1p;zxqHXfX78SbTs1X+
z|1A8*&cemb&f4D6*4o<Y?!t9g<cEvv@dnW&SsdKQkE*LMJv}^W(%j$&Ts1+LFFF1@
z&G1P%)@ZW>*QVm4&jMUEpST;ixNIGmT#u^WbYNYYdh3t}*C}l+NeNbmnzO53&APSg
zSKF~=X}&6~cDieMe3}&Y)y*!bc25s4?=R5rYT8%V#(Ckx)%>nAb1gDAZ7|p*YG)TL
z5wSq2E4X#JD);uUi!>9`6GYpXS!-FOmnrl#=30d%7%(qus8tIy$Tss~Z0C;?ICj9(
zgYmk|9<FCb1?LZ|+t)KPpLeR^64On45W7jFzbW;!q=ZV?gK6<Qxg_pRT7CV&r1;%=
zwi>Q0rEWe7*pR5K5-4^1XVT<*TPnGAB5(h8O$^*nnXRf5|KXSW@}wL46QyJ1IFc@X
zIvsd-f30#Bo1gxQjF-)~_a)yv_f_KN?oC_kxvVu_wx7MbwbU|3f<e~lk99*Lw-+#Z
OGI+ZBxvX<aXaWEg{|lV}

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/US.png b/logos/economic_logos/US.png
new file mode 100644
index 0000000000000000000000000000000000000000..f051711dd7e091c2871e77116158967deaf9ed33
GIT binary patch
literal 1353
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wk0|S$7fKP}kQ1U+v%-{D2#zdzdzW#Ro$>-U-9~I5J%n-CiB5Bu+2d_SS
z`0(k|r=LH6{{8zGuHpBef3H6Lh@NoXqWn<)><i~_y~v+)K_Pw5*RNmU%KrTMbNK2j
z?#S)TAzLSHy7A`i`}Aq&#6#Dg$?1HY-|}wdw!hzg01Z5L<89sY>q(Q(^2h8boqy4`
z>ac&?2{Er_hd4}cFsMHb%K35S_LWDUtgDXlL~Z8?-^LQM^?_-~r`0<?efu5ObGCNL
zW$BdNoDti)*Ij21-v(3+ab(7fOH#?Zde&Wk_VVqnGml;Bj~W#p+;-~G%Qx@l?YbkG
zyh}V}-I<i8M`^Y17H|Cb^Vj1y-(4GyK6&wW;>H_nVOtr4x3sOg7TbUN@85rUbFP?`
z9TJS);ZSpgFM3Bv=SjZk?LcqddiKSz=zvMdL5PieFTIjU-OUudW&Z9vq6s@?Q+IDZ
z@lZZ}k3{^AYbUO~yL#)#`;S1CFW-KM>^;@8^6I|xPfSY>s%7upb@uV>9k=gkd4HI@
zX34(0N*Q|t+E4VYzrhu`y?6cfuC>?WC!S#q-6|NjQ!sX?cGTMA@*cM&tZ&_a`TFMF
zcQ@_;qvqqX&9|lPeqO)(|IeRi(IvkgJ_Di;I}bnWn)UDdkAMIEK_Uf6e*XOV*RNkd
zXZ(Ku@%@(lPa7w{-@NbNuU~&Zefj<9`Lmc(Ao*eTs(YGVA7-umFlRMT<<o6(&A<e-
zza+>nn1NX%W$~qVfB(F_xL9r}$U9*0afvK%=MyOBafkL5C=*Cs33-6vJb<ttT!jc-
z<?BSqfmxl8p#n>x^b(*Q>dDBe7Qs1-;Vc*fDED#c|D`~ebY8il_2B=5V318$fldRN
zw>WkF_32N5ndX+Ki(^Q|oaBTCMmM!Iu`shTK0m#@G&MIio&$$ZAJ<pV&`{A)Qqoe>
zQ|wgJRn=A2R$sqh1xpYE%PFl@K_@<Cy^@;M6m`pLS5wt5Hi3kUC2bST%?wSA#YMJk
z*dnxL+s0NV>+0kkb?oly>Ee!#>gwq#tlQS*1sE^6V{2l&cMt1a)7m*T6Gd*^`uVe2
zl!b+jwY{Z{v(4Sb&Gq<^V~P$nOdfGYfdK}Zma3r!y0(_i0<X9=0vLZyGc@)NFtAoP
z_YW}G@4)BVSfr@T96V7$KqR~Igpi{NtJ0&TJgHAbr#=%6Rds5*YPz-5@+)uei3KZr
z7VcacYOvgQ$zJCTo4uFZmboeJaN+Xl16Qx>Ygi;E-Bxitcrthy*CNdgsi_IGpQ&hA
z#2Orr3^0f)U~6MCV=Ge>F(|&4BXZ!}0mUAsXJ_WNGg(MjxPD;rW7GS?wL@Z->&KJb
z=h746HVE)X95{1e%Ly_5h$BZ1?5N<(`>E>Pcye~SWFG73iUXW!Ke=QQetLOKieB1t
zm;2P}g`V|iZ<XG7a(!()v-dUWYsrSrm2cTxjzw%PyqspTA@#Ksn~K8L+~0g6|8==P
zxSyUo$y)sFE#8TD_oiP=k~{N;_sqZQoi}dWycx0cyJBiRL+buVHsu>u@d6VpgQu&X
J%Q~loCIFNVAP@im

literal 0
HcmV?d00001

diff --git a/logos/economic_logos/ZA.png b/logos/economic_logos/ZA.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f9928b423c2cce317a8734d4d02f8f2bb701b61
GIT binary patch
literal 1173
zcmZ{ie=yr;9LHnCj}UG5Q(~N$wN7(dy=l#^8}>yUQc_~Jj@&vwvXwGFPSjdeZ6(yK
zqqkDEcDQD`$jsKYOo<;OXt8F3GLs)-Dnb(Z?b-8{yZ*QD-RJ%Jd|uD{dA|32?qSDK
zBk?#Q4uiqqqbLXsW-l}xZJ{E~oFSNO@@SD^HZvpSbFgvBp(N*FFs=h=*wpQJb%zF1
zTueeZTm(DcTGdT!@qeltnKUi0u2nY9dxnTH`{sSZmESa*l^f6f7L{5zJRylnlhIBY
zM03x%;UD>O+LsDusYR=^LX*j)(P$)DWwON6hMB*uaA8#>nC?)iRMOZ?-M9!stwDXQ
zhn3ZWw2#)y=sAYjMF?AmuWV~|8=Io+7KA6Pw?ZIg^$#G1xkc6bibafoSwt{^Sk^bK
zCv!NQlsJO4fIWYRrtKTGLJtoQc=wcef?BOM8jY#(M4s@vM6m!@Q)$G$0R$Ed8u1L1
zv^|4#^dQAd5+uc$q>hJ3*Hqi`suZ?9K0d4rub&?x-BWkrr68%Tt^KHa)H}1gPxK77
zx~&b%3_|A!F|<yN-V6zlmwx>9W7(Q+Q?uxi{yT?1k3s;r!Wvi`OuEMYvXrY6a;4tN
zS2mU=76+5AJbJpUwGy-0tkr6*2F1FbdHqjz`%}HqqSc#c<r;d`xO5Gj^PF6>t}%9u
zDuP*qN6!r1d-N}aontH3L!eHLw<f_6aPw)@;~2O6&RI3s-k9c}+H>TdamS?R`R%%6
z0l-v`3zPsL-b+CTx_0Po4VvDRp{D5{z-82OAAmY^mwtBvia~5As#P!sp%<+I`hU=i
z%Eix7jYMy#aR#8m3=HlK0L(zM!#*VdQbNEgkiPL3>@S;up|Eae7VPTbfr{7_@dNmF
z&qg7k2}L(fGD>YD_NKo|KV0Za_0RUSkLex#<A9g1oxQ;O_9si3Q!ienO@&cHBIs1l
z<do3(C`Y_++Z}JI=t<yPldm{3nXA3h0<8w`axl@2NO)h$iisH?`-#ivm;cr;oE>xN
z!lk+MvA-6EVAHq62|=ag-25*N_qPZHShushY^7&VVo`BGkxB2(RjDJfHs@VJ`$)Ga
zeiI=d1ldMYC=|Px@K0Y3u1IHK{T$i3d0z$g<CfgSA-J%mTrMMn;jo`V$v-BzRch<g
zR298IzIgs6-==!SO?!E3#&;KD?0I)<o*}x|`6d3Bjs$MHZ93P;oGar(bDb_EF$rNk
z-7nx1=m7_F5+&E#x!9rBA`hy;cqt;TEc3G=QtIRqo*JL{W0qJp_f9a0-O<+N&`@$Z
z^*wU(v2TN%Dz`_D?<SlSK4B`94ex&6WaBja_(q`n;JG|`;cXdJ!cxCRE+6*)@WlP*
qJ<;1+xDyY^)s08f47gwX%6%~rcB>_X14Jc!KA5O*D#8n6l>G+~eA6`m

literal 0
HcmV?d00001


From 528fc81c01bfee21934986c5b7d053d19b53d568 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 17:53:32 +0800
Subject: [PATCH 27/57] fail safe economic settings

---
 server.py | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/server.py b/server.py
index a133652..20a0f3d 100755
--- a/server.py
+++ b/server.py
@@ -266,9 +266,12 @@ def index():
     general_settings = json.load(f)
     f.close()
 
-    f = open('csv/economic_settings.json', 'r')
-    economic_settings = json.load(f)
-    f.close()
+    try:
+        f = open('csv/economic_settings.json', 'r')
+        economic_settings = json.load(f)
+        f.close()
+    except:
+	economic_settings = {"feature": "Economic Calendar", "speed": "medium", "speed2": "medium", "animation": "up", "importance": "Med - High", "title": True, "timezone": "US/Eastern", "countries": ["United States"], "events": []}
 
     try:
         f = open('csv/scheduler.json','r')
@@ -1236,10 +1239,13 @@ def save_ipo_settings(input_settings):
 
 
 def save_economic_settings(input_settings):
-    filename = 'economic_settings.json' 
-    f = open('csv/' + filename, 'r')
-    current_settings = json.load(f)
-    f.close()
+    filename = 'economic_settings.json'
+    try:
+        f = open('csv/' + filename, 'r')
+        current_settings = json.load(f)
+        f.close()
+    except:
+	current_settings = {"feature": "Economic Calendar", "speed": "medium", "speed2": "medium", "animation": "up", "importance": "Med - High", "title": True, "timezone": "US/Eastern", "countries": ["United States"], "events": []}
 	
     current_settings['speed'] = input_settings['speed'].lower()
     current_settings['speed2'] = input_settings['speed2'].lower()
@@ -1249,9 +1255,14 @@ def save_economic_settings(input_settings):
     current_settings['countries'] = input_settings['countries']
     current_settings['importance'] = input_settings['importance']
 
-    f = open('csv/' + filename, 'w')
-    json.dump(current_settings, f)
-    f.close()
+    try:
+        f = open('csv/' + filename, 'w')
+        json.dump(current_settings, f)
+        f.close()
+    except:
+	with open('csv/economic_settings.json', 'w') as f:
+	    json.dump(all_economic_settings, f)
+	
     f = open('csv/last_updates.json', 'r')
     last_updates = json.load(f)
     f.close()

From 0d464c965f1bb45172ad4b2a684b753d07de7e3b Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 14 Jun 2023 18:03:19 +0800
Subject: [PATCH 28/57] fixed indent spacing issues

---
 server.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server.py b/server.py
index 20a0f3d..fe80e4c 100755
--- a/server.py
+++ b/server.py
@@ -271,7 +271,7 @@ def index():
         economic_settings = json.load(f)
         f.close()
     except:
-	economic_settings = {"feature": "Economic Calendar", "speed": "medium", "speed2": "medium", "animation": "up", "importance": "Med - High", "title": True, "timezone": "US/Eastern", "countries": ["United States"], "events": []}
+        economic_settings = {"feature": "Economic Calendar", "speed": "medium", "speed2": "medium", "animation": "up", "importance": "Med - High", "title": True, "timezone": "US/Eastern", "countries": ["United States"], "events": []}
 
     try:
         f = open('csv/scheduler.json','r')
@@ -1245,7 +1245,7 @@ def save_economic_settings(input_settings):
         current_settings = json.load(f)
         f.close()
     except:
-	current_settings = {"feature": "Economic Calendar", "speed": "medium", "speed2": "medium", "animation": "up", "importance": "Med - High", "title": True, "timezone": "US/Eastern", "countries": ["United States"], "events": []}
+        current_settings = {"feature": "Economic Calendar", "speed": "medium", "speed2": "medium", "animation": "up", "importance": "Med - High", "title": True, "timezone": "US/Eastern", "countries": ["United States"], "events": []}
 	
     current_settings['speed'] = input_settings['speed'].lower()
     current_settings['speed2'] = input_settings['speed2'].lower()
@@ -1260,8 +1260,8 @@ def save_economic_settings(input_settings):
         json.dump(current_settings, f)
         f.close()
     except:
-	with open('csv/economic_settings.json', 'w') as f:
-	    json.dump(all_economic_settings, f)
+        with open('csv/economic_settings.json', 'w') as f:
+            json.dump(all_economic_settings, f)
 	
     f = open('csv/last_updates.json', 'r')
     last_updates = json.load(f)

From fe51c01170888d5ddea4b936916de3733f1923c3 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 01:36:37 +0800
Subject: [PATCH 29/57] tradingview in credits

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index ecf6a11..8737afe 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8568,7 +8568,7 @@
 
         <p>&copy; 2020-2023 Fintic Limited., All Rights Reserved. <a href="mailto:info@fintic.io" id="footerlinks">Contact Us.</a></p>
 
-        <p>Data Provided by IEX Cloud, Open-Meteo, CoinGecko, Exchangerate-API, TheSportsDB, Google News, Yahoo Finance, ESPN, The Movie DB, Finnhub</p>
+        <p>Data Provided by TradingView, IEX Cloud, Open-Meteo, CoinGecko, Exchangerate-API, TheSportsDB, Google News, Yahoo Finance, ESPN, The Movie DB, Finnhub</p>
 
         <p>Useful resources: <a href="https://www.youtube.com/playlist?list=PLf8pW0bNjnebNZh3y0AsY18sxJj6IhAsv" id="footerlinks" target="_blank">YouTube Tutorials</a> , <a href="https://docs.google.com/spreadsheets/d/1IZkEl49j97xvG8jcEdWc5XdOLOUb_-ZLVHle2vezWCc/edit?usp=sharing" id="footerlinks" target="_blank">Formatting Guide & Info</a> , <a href="https://fintic.io" id="footerlinks" target="_blank">Official Website</a></p>
 

From a59bf0ea11fb2c4b18170ca5be2b41cd5243e90b Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 13:25:22 +0800
Subject: [PATCH 30/57] economic fature title

---
 feature_titles/economy.png | Bin 0 -> 281 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 feature_titles/economy.png

diff --git a/feature_titles/economy.png b/feature_titles/economy.png
new file mode 100644
index 0000000000000000000000000000000000000000..70c7af09309e4625f7e46f8d7abf892a4535401b
GIT binary patch
literal 281
zcmeAS@N?(olHy`uVBq!ia0vp^DnP8j!VDxk_8;F1q!^2X+?^P2p46!aaySb-B8wRq
zxP?KOkzv*x380`vfKP}kkmm6<-u3^n-@Xa4It>56togs2;eQ5$vGdDLpd3d@kY6yv
ze+amGD#QpV*5>Kr7*a83Yu{<!1_c2Z)r}0(g%&V5G0SXV(P5NUSXleBoz-4_=f@f5
zhd0&8-f(l;AtCs*s6+7BQvu}ztb59q>b87hUAX7!;!Ujq_f~ZrxZ)b!-RFLE)~!vm
z4$r&SDll2GO(1}iRW<N?tnSyAuFKuKH(s-z;<O^XYsNiWue%FQ{*IlqZ<QWXR#L9i
Tt2k4jix@mz{an^LB{Ts5KO$<1

literal 0
HcmV?d00001


From 8ab9b4f26552ae7b5864d0b511bd723be2ccf842 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 13:26:01 +0800
Subject: [PATCH 31/57] economy prof feature title

---
 feature_titles/small_feature_titles/economy.png | Bin 0 -> 229 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 feature_titles/small_feature_titles/economy.png

diff --git a/feature_titles/small_feature_titles/economy.png b/feature_titles/small_feature_titles/economy.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c2e1a1775358f8dfe0cf6ba06179821250c9375
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0vp^f<VmA!VDxo%(qkmQjEnx?oNz1PwLbIIh+L^k;M!Q
z+`=Ht$S`Y;1W-^hz$e5NNb}liYVEF%)nWMmvg`kDhX1n|{%0`!|IqdSZu<XK3|E_$
zya6iWE(!7rX7~>WwPm$efx>Q{E{-7;bCMGnm>AhK5<*%wwoF;j)Z^t9;OOS)>c~^-
zFm0pZl%sEE<u#l#Vq;`xOG|!y?nBaq8J;1AQ&M?YPb8fQFl1vmn<=OgZSg1<Xd;8B
LtDnm{r-UW|--%9Y

literal 0
HcmV?d00001


From 1da1ec7a45e11471b13d4c5c11b7102c6a1cfaa4 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 13:53:04 +0800
Subject: [PATCH 32/57] updated feature title for economic calendar

---
 feature_titles/economy.png | Bin 281 -> 477 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/feature_titles/economy.png b/feature_titles/economy.png
index 70c7af09309e4625f7e46f8d7abf892a4535401b..abea06e8c19328cabcb9347c4d0b1788bc0eeaab 100644
GIT binary patch
delta 452
zcmV;#0XzPg0^I{4iBL{Q4GJ0x0000DNk~Le0001o0000W1Oos70LsvIZ;>G-e;ZIt
zR7C&)01Qnty8q)&zL5X_|6MEq|MaZ?y8!=a0L7Ifp#T5?33O6UQvm<}|NsC0|Nl1v
zo74aR0Y*tgK~#90?Uc=J!!Qhm89=#L9wD9}@B%z=fLz=W(h=MR0(k6-r2Z(UO;QEO
zB?Lm4g7o=4QVziDW9Od$8K#eZe<6qI*e~QT^-J-?<oo?}_C)8BAjARSI6-_2PY&xU
zWL}WfT7!iI24T*+y{Z@@FG-L%mkiO2d`!<c-fFAxD%nU`h|a}8T*-vu%wet)B&p(v
zbFmQ2Ih;m?)D=6%xXqVt`~{Ky7RkP}CA%?oV?T4;2|<B?wgrYUb>s8Ae=O^IiqpXc
z0#rk!#}p?X<}&hN?tx$f0cni5@#E1eMBL1$U+ko_5kgQ8xb&n_at#7hL4e#pA!H!f
zLgo?$VlEqs|5EYow~+n$Yx!OqCHC5*F67D)+=6UBzzE5efy`|bNW294@gvlK1(+{3
u|5U@JQSx9s2XfWUOO(9r8f;@@2jB;jyubu%z3iO;0000<MNUMnLSTaBe$Fib

delta 254
zcmcc1Jd;VWGr-TCmrII^fq{Y7)59eQNUH#`0t+*c?AU*N??gq_dWis^5LY0d$Jcn*
z|Hpp&CdBG6{Qt7%|89o=84SkGFFS#993?@1!3_T);OeOmBcNEDr;B4q#hk5ur+FI`
z1YA@%GE5g*z~sa%vw=m2QCeYP?ay{rd-a_kXP6(}R3m%C&1r{(;M1ZG!DCMaln=1(
zDO;-B@`-ifo{+1HH?;=bTh(#kifeRtpZn2Sw>Hf>Jnvqsz+}ZXfdEcc)xhtux?fwm
yE_d(Vc+Gl>(~9t}8TV|x?k+g_J9f^#ReDTWNx4$5;!J@~V(@hJb6Mw<&;$T-U}qZu


From 1f2ee5cfbee1cc597e2ee63aee890cc1ddfd3e89 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 13:53:35 +0800
Subject: [PATCH 33/57] updated economic calendar prof title

---
 feature_titles/small_feature_titles/economy.png | Bin 229 -> 389 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/feature_titles/small_feature_titles/economy.png b/feature_titles/small_feature_titles/economy.png
index 2c2e1a1775358f8dfe0cf6ba06179821250c9375..8410c5a7ff1cdda252f175378a82ca83cd45ac8e 100644
GIT binary patch
delta 337
zcmaFL*vhQf8Q|y6%O%Cdz`(%k>ERLtr1OE8pM@DnO33$cPE=IoRtfM4aRu`K|NlSH
zPp*F5szZN(Jf4yuzhICU3~(L^Py>oT@^o<wshHC{`J!O60Y_WsbB2>_^X@u`zi{5=
zl>Q=C`~`#G#Z2x$3p}rEt2ilmNL;~j(Gj7}625>+mKhNb6_+KrEoxLaDL8NPFDZ$f
z#f-a8I-W`5USJZS65!Y`xO!(?{j-G(e`BsPtm;%YO)x(n%y}#{HQ>{gJ5#1-nR}c2
zJ+4pi5xsFGqWRBT$F&Rz=jvA5JLrUM*uQ_B`htpe3-liZH?Xg)W8Qp1Qo~hL!D!OO
z=YQ&SQjffnWmJ1VV@u=q=RwV-&u?@uF4i)b{o|?0UakvOqUtiPcmB&xbKJCycjFp~
cz}6Sc78dH4bS-Dt1O3b3>FVdQ&MBb@0K?~vod5s;

delta 175
zcmZo=e#)rW8Q|y6%O%Cdz`(%k>ERLtqy>SPpM@Dnewc5mG*MBNLovW7#1+V&7${eH
zwQ0#4Ad|Z!$S;`TKOEGS)m{Y(yLq}ehE&W+PGDeSWYb6pY1!B^WkFMqmsfzJo1?2E
zPpQMSjfPW>zL}NRaLR~{k(n(m`SH0ANfTyxh8Rvs<zYRMbSA)%jp1yjph~pGqg<eg
N44$rjF6*2UngF@XJF5Ty


From 9e111f1013fc656024de47f712918f7d44375279 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 15:05:02 +0800
Subject: [PATCH 34/57] changed LCID logo

---
 logos/stocks/LCID.png | Bin 1877 -> 3450 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/logos/stocks/LCID.png b/logos/stocks/LCID.png
index 5c54129da0fc402343890adc097641ccb88cb3a0..97e48e7e30da9f9a6e6632840db7295e21c08ebb 100644
GIT binary patch
literal 3450
zcmV-=4TbWFP)<h;3K|Lk000e1NJLTq0046U001Be0ssI2t~=1^00001b5ch_0olnc
ze*gdg32;bRa{vG?BLDy{BLR4&KXw2B4IfEFK~#90?V1TtR96;;duM67*_xe(rlHxI
zRY5=nSt7_5KtNUj5edpBXcSc921Wq~bs~;BiAti0D3};a<1+4}PK{+WBpPuW#Y!Ap
zO3hX=3-i+#9?$NkZ45Ea)SP-ny?5Wa+jq}B_ng--%o1L;DJY;{hCx9LN|;QGloTZe
zTvoX`OcrZEi^X!DIL)u3fqpU6iII`f%9ShEtXWf2Q=?WvS68>HstO8CO-=N22M32W
z3dzdKQmUe_ub+~V($?12(b3V_*?H>JsTC_$xVX3|sU;;Pkrq5XJ@F_I2<q$W*U$t5
zD=RC*TON<6c5FivS^Wy{UG4Ns6g`1@t7B#5)w*3t0heV~CcP22^pcFD_p<)}n0~44
z&c?>(`|rQ+>FK$0<%(Jbp-}kQXP-gg$&)Aa@}Qug9))b$w259G5)uOaUw{3z=V|%o
zn{PnMz`%gg#N*FD|Ga$pavdEVJX%;-JbLt~M@7)@r=NZrA0IzNkSd}|mQP!4^NC5S
zSe;ikviW>UN9698e)!)?SYHg;u&^+|BIUS&&7MAe`tIGk6sGp}b~c+$lxu5i^Yinm
zx`UCWBt1QS=s0PjMAmJ?298ijUa@p_@u-B=Yv&HWt1DGqAa+dIdqWlL3m_|zNV>YZ
zNa2A42gG7=->_M%qM{<$EO~`3Pj#J_mv`jIk<`>w290cYcehX>rlzLB!NG7Qq~e1I
z4}5)nhmEYHYA$?hA2n|;@Aft&vf`3rN<q)mB68gUwOC&O*>~P~hm>sFwvB9Xx<o`o
z{P4pMc#FSQR#ps!Hz4{M85s;3**kac&?};;&6_t9&7C`U4hiN{qD0m*qkju9nKp&f
zl(6<%w2@KYdloBb!TQ0l{@!HaKyTl^jmKYp`9<}xQVgG&o10sy5UEtk(3)&76PXOn
zl2^k19Xw=FA}jRwC*@p`NWOWKk{>V*3#BT$XIEsMd^8x=kT<uf?QXcp%H?u$YC&1c
znQBiKa{2OQ4a=sL(8+r3XysX0kaE+gNF{@{udHD9p9a=}<1>!kSIac>_=6E8bsSwi
zwcQODS%d`SanGJTTF!JxWDg%cOqBimO>M|RC+og(1Cz@o<<doqo-)|h?L2dH^2$)+
zn)Kn9YO!V<z3Uj4qoKRuB8v%=$79EiX*ts&kv)0xBvJP9@zJt<WucRmzR?%G!<l-u
z?WB{136ob`z94SvKh<IdZX>C?=I(}zEDj}d`hWZFw@5CunW^?<;iK=}yGKqxTU%Rg
z8doE9vKDD+q|iJinU2+I`I{sjVC(1wFWsUB>&ZtEt9R=fn?19;XOiXf`Df3bg#z3t
z{q%^7iz8fCuU<_ifBg7yQc_x4s@jgRu`vSv+X@*uawKCYWMgAviRPtCm$?0#c*rt9
zw!Mw-=EhKr+HGAkh1K(e_Yr>e7PHvyndPddR_2L^0drRKgvL)zjH9o%yJwOGGQ>J$
zVigq?q!1zMd+)tR3Xy=4LS(cgu0r4mSS(t$4U2AVZ6*2_E?gk5v>^*kglku?UL{Mr
zc=6)r#LA$NmA7nRD{?`7XXmHmunc0b(&$XpQw!ObEU5s{2L{Jrh6$Zd$zRt@7C2U@
zNKQ_#kDfAR3PAwP^78Vis3@eQKmGJmk0Q~c4r@?YwQ3d7#M^!Q_GM*d!L(=3o=pNW
z2-uApHHzpDMi%~r^p4$t6b@d9sGT`;#;8BU{7qz?8yg5g>%6>y0QN8II069*4ISK4
zKe?rZHKFx_RX_y2HCvwX8cEu9pQX2amuV)eR(9>$1sy#-y^lWnNcAm@XyL+z^wtp7
zH#Rm>39gddym>P`Je*P<jI3HYc<|u!dsrp1;^G;2Wb5m@Hm{`uSVP5vW2Yy!UsS>x
zyXBO=`9R-nCM(_4?~?Z-FeTSuWFJ3%{A3WJavm5<Q&ZE!hYzW#-nw-Q{*?L%KnW}t
zZejoa{XhQrBc=S+S6?+ZH<JW`l7@x`(hK<@U~X=H|Neb?@9-^HjP~~S{QP`<ef8e#
zdB}>Qqw#1Q5<+FP_OoZfidh_PaNWDgiNLb0EbhRkHYZ*4Hd!IXR0G)|2~099EDULW
zU|^ssQzgOChafj5CdSj#lkRi>Fd<|;w|@Zl3XTr*=k@u4b<I38Go-M7l@0V$3y#$_
zZ3b|Y>ZTlim3367_hKci!$S7ITL@YBQ<knS$I#H@-4;UDB%;@WipRZ5|L~f;=bB`E
z3US9w1~bCYb+1c_D${3@6^q3<mk<nbI2?vzV+I5S;L*gygeagSGBOe|ED3r<B9Su|
zUh)0g%*+hF0{Tc6tgWqoZ$8g2gsh~x3il>qVSNGYvN~9+Nba9@=njQ-!e5UH?VU+2
z5yxPoH2a26?O<3nkPQwFzIgHCp+kodcr9DD4D6;)pZ@jNUn4x~=;$ytHTCxP{`~XL
zkzXQZ*tl^cd;$*r-Me?A?)vrX^YZedqocq3?z?m6&UJQn{?>Em_Y*=EIRcZ-mNnG(
zdWQG6@hmL`V#oMxXDO^m5OfTC4T{5LPca*PMm|>qQxM-SD^S}Vyy3NL*P<0ZT_6wu
z6U-B2ad5*q0#;H|(#IcvjKB+lEtsA^e?B)iSCuUJ5cBriZ$tA1(i(~ovcggRdJ+lA
zXe~1{m~77Y=1&H`uoTz!DeIblAS=+o6vP+W#5(E@nv7xpc6WE<?}7yj4k`rHKz751
z4aLR9fbQkx^~D!oI5{~Heb{VmZLKO<gbfJMZrr#*X})wq$Z|y@%Zzjq)gtg3HTzF}
z=hcyJ@wj+6Rt}R@Z5?&hXNg*%m%SIScgPyaw}bQ5+#Pa!Z28R0Ok}Q(j*eYjT`*E&
zvn?$xGiJ;{46tLzj=6K^!e$K&4B#;k8%&xs>BNZ>FlvNEh?zk4`t|EbmMr?e%)N{P
zvhvNFkPf)M^=Gfv?R<B4Sz>-)#M*M&#Ki|p!-XzK-78grUhrH1Z#&V%$AGQ;NneA=
z<#GT;28lo&=_3ddvN)Ykg2M_oFkY}jyotOBKtT|ZCM*>07>=0o1~0XMtn`f<WCSo+
zyNa2XexWIQ{{^g}4LkT&c4l0`a&h7n@25=ln$OaGuBBy`VNxB@V9l~L8ZR8EtE(#*
zkw+w50!5~W67stXEEicU`IUvL;^yWCO>$4weR&0BMR9TVvt}Xi5;(|`KKwHC#6#cW
zr8+!4<W%Q8=TSg!`qur!W9}U5NO)TqvT9R0ERLOy$t2T}tL#$`x|P59xx8EgvV1o;
z`IgNVaS4&@_NVUef;W)sTjQjnf-3C#6?RF%0w<+ikBnBLV;XDZ2^ZYrn1|zwd@=Zc
zrqC-0U5&#+9jdGSW;IUSeMK4&S!fa5;Z*}Pz=Yr_TND6Gr1bSzT%1&sMFI786Zg56
z06J`0`*;>k7EwWIX(^QyXqM#UWLMgc@Pi3lv*y6o*w`4k$+&UjwErN0eqVd-HQb<O
zB-vWl8W7u}BEa=7uSFsdU_0Wt`z$~?C4YUI`B*qvh9cLp;u^*nc{JE1|IKZt=IlV5
zOaW)Tot@o?5hF4(G7uh2n>GzcKazbPA0Lz;K84Rk_J!yQxz^ULTV*m?NJz-ksZ)`6
zA!jQnDDd#`Kpa+BSQrx%gK`9FgzWh7<Fm7~Cr_S?UQmcvSQrwP!DZu|3=Iv1vzACC
zI2Dod1qKG9oiSs^;1RWy@S%E5O$}B8RWKMoKR+Iihj<YY3(f%KJ19i^Ha0eR#5o)u
z9*%Kh3VlD(TjfmlSg<^C=36UWvH`BjI%<r-5dmp}u{ZADb)0hEbH0`+heWobq5=ag
zFE0lyOcj_Aav_iK_4UPw>+0$-VIW5Mg}fH8P;utWnV2W4AY!YpuSZ3gKgzKKpp2!e
zuCB(c($dnfGsstS^c5Q$OOdUttOS}ROO`-q!h{LP06`7$2{Pt+^XAb*V;rIA2#XC%
zCuE_9#aO#`Eog!u^r40}F&7LErhtW?GiMGKppUFmVae3&x+aH7i*4hkTa0V8OWx~J
zLU)(XeQ72OQ^h?-kJT27#UM*cq*5uY5(#cfN(!PYkj1XVTf8bOD+7918OY9`KOZHe
z3iJtC%oC3=OiT~UfcwP6L?yEDLbw4JAVv-XYS=L-ba!_ru!x`{lmQee47Lbvus^Vz
zh`tdBVt-&@P{Y7rvls@VMm(Z5*gn>^w+Xq}6Gu?0$%rXtLBo3uMizzuuNS2Fk4Nm;
zqN1XloE$7TDM37o8%zVdkodmx$}8BaKnyQ|)PT$7f*R6|$jIJbJV_P&#d=_Q#*Q7!
zQ2ZYTD#pddVLQVrM~@!OQ2cO-x7hEndbkekWfY=WfPfD{gXk_kJ|1cq5?)dN)CJSV
z(qeezLogz1@--dG7!taG%kua4FDWTuD1NNN8eprDk^Bz|_5n;AnI7!!1$?VbNJy}^
cw^u6s59=x{**;}E`v3p{07*qoM6N<$f>8Z`>Hq)$

literal 1877
zcmeHH`8U)H6rZupn9PV~DEruEEFpwJ$}pLcElZ5*2(M64_Gz*AooCAyqfiW<LAFPZ
zJVkaQjrEc8gvL@+wy`sB`k{Z~op;Z<_w%{;e9q^Gd(XKE4t7>>m=p{I0>Mc{OGglh
z56|NYP<~$R{V;FM18}gT6&^g%s~N>>gl`kc!5|RY=x2fnv=di&f>j3_X9D+E@KnF(
z|M*|tK${tBo_Fk$5Jx*F<vJ^nv;qA1<p(8?qq*cfTU7zQYe!vbzD~@hofVdhnAzX$
z;@8~S$dD4czdU!EPw=<Rq5i79kulbp8=QmI0CkB~*eS}?0vh=P{48hP=wVpqUjrhO
zmf7MlPI&!ftmhgg__~r#B=okc!qdw3#&3S?phfv+v6T~{q<Ql~<9Ez%>J{G*#h0TE
zSsxyGm^i+@vt3?v<l{I!sRc2-r9mKGl-0J^=a(M<fds5cmgdfsJa*ppMRD_^-G5(D
zeAIcke?eym)rP3h8R}42(CMqKwJ@o$IgahC=<oR6^rCh_tLfmqgxbCA-$Q-mrpi9w
z*;tb{GWn7HM6|EA9SaqVCeK6_r3E5Jzv`ctF`6`G_y&MY5;;n4#VyDM!v<ZO=MG*^
zd^7;18;})cNGDU#+dI#KV>~Y=f5D*TeoP0F5ec;hG;``}++O;wWGn_z@p|X~9H~#{
zgv=G;Gn~m^(xS5UkU23+>V~_$J@$ZdZ{5dSEgx(#>0M$L*GqlX1x<3V|B$WD8xhz!
z_2uBTmt)&x2Zp=~1Q>%HE($1hjjAw_cKjj&yci#cBA^ETFyO|rQ+j$FKG#1Ur#Q7h
ztGq4K;4cXW^!=(J>~OcX<6G(Rp9yF{V$IGdO{JcSckgLBvo`i=>yGa<5e=NmifRgP
zI0p0cjK$DjZv~c4pQE!P3b^}hDqboxdJMA6h(R<X#iid=rf?u|pmtaeR4F<-(@l@n
z0}$=!mJk;7Zx2ihLNSq2#zsy=O^9H58x>E+@kwc$B<52QQ%GYW*iDlFY-W}gbE|{2
zrysIh!c;S&g;~%mjNIPyp<by8SYe##0YV%o&L3MWd<z!(9JLgaH27L%No+_`05>qb
zY0qGind3*=>@6U-V4PUK?{a9CK<cc>Qu+)Zjy4-^&qx!l!Wc|5=y8U?OhL4ss^vgT
z_x#oUS@NK0(E3k-!#6(P2(i;}**rDne2CxxL147|AUfJ3E%Tg0_w?2E?~BNc>gciE
zszRQL9`FF{@CFU@@`aiXvfHbPJtwzj6Ft{~z_)@ao;9>_imZu<%6+xDIM-ndGy&a+
zFxAUAQ%$s9#M*@MH{G)a)B|E!4Ldc%%+_ptf*3REX$4kURjAbotbLc{*uT6-k=`vz
z-q^&K-;)nl?D1Qewnl4TGLvz(!<8lFH!bh3$E$3#RF(Z`m3g=+U%)DGAx1()DI;X+
zF{*eZGQ(Sff`Cn-hGD&_pM6O&n6c6cstww_xjE7$h4H?tYbD5(;Y@rb^pAhWZfD<o
z$zgY?H(~o&9CpO`kaijFdPJcVaxrk}vKa?ep(&R+VsrB>3)Nbjz^+!ghMVp*o<Jbb
zX-~T1XhJpl1H#roY$b(+(WNRK%{M;DXz9dQ>2Z_cts1USNp9T3i{guBy1S_TXF-@-
zhG5%dRmR)>MlmF(?y0FRV7U^XzrArjfud2kw`$8;JeF_j(!)+Y&@znB9-Q2u{b5-Q
zOXy93XYG9Y0$rpo(3Zlr_NRiBv{6AV{<#NBhyW`O*(h$z#DT3B&&<29)Q{NGeMy1a
zAmRnoZw>p<$gB4BEcvO_IO&aY6x?IAZ|-rNutzV(mfm=GRXSJ3uQb3oE0ViXmvos{
pw<C;2)z%$)u4AyRQs&;iB{&(J?sXm02Iu`j5Q$)CS%tq6`!A$VauWam


From b584dd31f004cd8ef2d7ac861f6a078b8e38ef92 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 18:07:02 +0800
Subject: [PATCH 35/57] indicator icon for economic calendar

---
 logos/indicator.png | Bin 0 -> 137 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 logos/indicator.png

diff --git a/logos/indicator.png b/logos/indicator.png
new file mode 100644
index 0000000000000000000000000000000000000000..36ebf5cf73aacfd4c27a54b3e9c59011c407dc4d
GIT binary patch
literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^tRT$D3?#QN+_DTvF%}28J2BoosZ$T+a29w(7Bet#
z3xhBt!>l<HKtZ+upAc6d{r@t<##hq+fGnnxAirRS|IrhbwgP#4o-U3d6?2j`5`HkY
au`&pKVm`U`dtD1qhQZU-&t;ucLK6VQ3?gCx

literal 0
HcmV?d00001


From b7d536749b85b561687660247fc8cdbe697ed043 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 18:14:48 +0800
Subject: [PATCH 36/57] low to high importance icons for economic calendar

---
 logos/high_imp.png | Bin 0 -> 135 bytes
 logos/low_imp.png  | Bin 0 -> 140 bytes
 logos/med_imp.png  | Bin 0 -> 140 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 logos/high_imp.png
 create mode 100644 logos/low_imp.png
 create mode 100644 logos/med_imp.png

diff --git a/logos/high_imp.png b/logos/high_imp.png
new file mode 100644
index 0000000000000000000000000000000000000000..77c75e375780ab5a65439b4f353554e1722635f2
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^96-#*$P6Tpoc7%Tq!^2X+?^P2p46!aaySb-B8wRq
zxP?KOkzv*x36SytpAc7u(*HoFSHOivAjMP?<QM#(;puh*FCdS{)5S5QVoq{EVuLdS
Xs|>?UW9GUGKye07S3j3^P6<r_C!ZeL

literal 0
HcmV?d00001

diff --git a/logos/low_imp.png b/logos/low_imp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c40e6f3415fa85ecc18a1cf4d61aa96c3360848b
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^96-#*#0(^xv&}Pr6k~CayA$KhlREW44rhT!WHAE+
zw=f7ZGR&GI0TK-G32|j8{SRbnYHA+ob$bJ3F_#4S1^;LGpZP|9ACSxI>EaktF()};
c_R)qe1_d$ZgAX&Dm4Ffqp00i_>zopr0H3=dhX4Qo

literal 0
HcmV?d00001

diff --git a/logos/med_imp.png b/logos/med_imp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7545c9eff77a11f7f3d4ca1d533ac5cf00375593
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^96-#*#0(^xv&}Pr6k~CayA$KhlREW44rhT!WHAE+
zw=f7ZGR&GI0TK-G32|j8{SRbnYHA+ob$bJ3F_#4S1^;LGpZP|9ACSxI>EaktF()};
cVv>U^1DguNR<(J?mOu#xPgg&ebxsLQ0Dq7l`~Uy|

literal 0
HcmV?d00001


From d0dccfce52bd818b38a646633d81e76274720275 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 22:18:57 +0800
Subject: [PATCH 37/57] period ecnoomic calendar icon

---
 logos/period.png | Bin 0 -> 145 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 logos/period.png

diff --git a/logos/period.png b/logos/period.png
new file mode 100644
index 0000000000000000000000000000000000000000..d286a0366633575a267bf5ff183adef249fac77d
GIT binary patch
literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^>>$j@3?%=}IXVGIF%}28J2BoosZ$T+a29w(7Bet#
z3xhBt!>l<HKtZ+upAc6d{eLfm*Ob`nKo(O;kY6yv|LBQITY)?=PZ!6KiaE&}5>6ym
i9RJYqP~MrhnUz6i2aEds1##^_6%3xPelF{r5}E)2_a&47

literal 0
HcmV?d00001


From e1572cdcd7e502ba8e288aa68d6ef79a10f5847f Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 22:21:31 +0800
Subject: [PATCH 38/57] economic calendar standard display

---
 stockTicker.py | 133 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 131 insertions(+), 2 deletions(-)

diff --git a/stockTicker.py b/stockTicker.py
index ddb7a05..0beb666 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -71,7 +71,7 @@ class StockTicker():
                 'Sports (Team Stats)':lambda : self.getLeagueTableImage('premier_league'), 'Sports (Past Games)': lambda:self.getLeagueImage('NBA', 'past'), 
                 'Sports (Upcoming Games)': lambda : self.getLeagueImage('NHL', 'future'), 'Sports (Live Games)': lambda: self.getLeagueImage('NBA', 'live'), 
                 'News':self.getNewsImage, 'Custom Messages': self.getUserMessages, 'Commodities': self.getCommoditiesImage, 'Indices': self.getIndicesImage, 'Movies': self.getMoviesImage,
-                'IPO Calendar':self.getIpoImage, 'IPO Calendar Prof':self.getIpoProfessional,
+                'Economic Calendar': self.getEconomicImage, 'IPO Calendar':self.getIpoImage, 'IPO Calendar Prof':self.getIpoProfessional,
                 
                 'Stocks Prof': self.getStockProfessional, 'Crypto Prof': self.getCryptoProfessional, 'Forex Prof': self.getForexProfessional, 
                 'Current Weather Prof': self.getTodayWeatherProfessional, 'News Prof':self.getNewsProfessional, 'Commodities Prof':self.getCommoditiesProfessional, 'Indices Prof': self.getIndicesProfessional,
@@ -80,7 +80,7 @@ class StockTicker():
                 
         self.JSONs = {'Stocks': 'csv/stocks_settings.json', 'Crypto': 'csv/crypto_settings.json', 'Forex': 'csv/forex_settings.json', 
                 'Daily Forecast':'csv/daily_weather.json', 'Current Weather': 'csv/current_weather.json', 'Commodities':'csv/commodities_settings.json', 'Indices': 'csv/indices_settings.json',
-                'Sports (Team Stats)': 'csv/league_tables.json', 'Sports (Past Games)': 'csv/past_games.json', 'IPO Calendar': 'csv/ipo_settings.json',
+                'Sports (Team Stats)': 'csv/league_tables.json', 'Sports (Past Games)': 'csv/past_games.json', 'IPO Calendar': 'csv/ipo_settings.json', 'Economic Calendar': 'csv/economic_settings.json',
                 'Sports (Upcoming Games)': 'csv/upcoming_games.json', 'Sports (Live Games)': 'csv/live_games.json', 'Movies': 'csv/movie_settings.json',
                 'News':'csv/news_settings.json', 'Custom Images': 'csv/image_settings.json', 'Custom GIFs': 'csv/GIF_settings.json', 'Custom Messages': 'csv/message_settings.json',
                 'Stocks Prof': 'csv/stocks_settings.json', 'Crypto Prof': 'csv/crypto_settings.json', 'Forex Prof': 'csv/forex_settings.json', 
@@ -5812,6 +5812,132 @@ class StockTicker():
         return self.stitchImage(image_list)
 
     
+    def getEconomicImage(self):
+    
+        f = open('csv/economic_settings.json', 'r')
+        econ_settings = json.load(f)
+        f.close()
+        
+        if econ_settings['title']:
+            title_img = self.openImage('feature_titles/economy.png')
+            image_list = [title_img]
+        else:
+            image_list = []
+
+        font = ImageFont.load("./fonts/7x14B.pil")
+        font2 = ImageFont.load("./fonts/6x12.pil")
+        small_font = ImageFont.load("./fonts/6x10.pil")
+
+        if len(econ_settings['events']) != 0:
+            try:
+                for event in econ_settings['events']:
+                    if event['importance'] == -1:
+                        imp_img = Image.open('logos/low_imp.png')
+                    elif event['importance'] == 0:
+                        imp_img = Image.open('logos/med_imp.png')
+                    elif event['importance'] == 1:
+                        imp_img = Image.open('logos/high_imp.png')
+                    x_offset = 15
+                    if event['period'] != "":
+                        clock_img = Image.open('logos/period.png')
+                        period_img = self.textImage(event['period'].upper(), small_font, r=255, g= 255, b =255)
+                    else:
+                        clock_img = None
+                        period_img = None
+                    flag_img = Image.open('logos/economic_logos/' + event['country'] + '.png')
+                    circle_img = Image.open('logos/indicator.png')
+                    title_img = self.textImage(event['title'].upper(), font, r = 255, g = 255, b = 255)
+                    country_img = self.textImage(event['country'].upper(), font2, r= 255, g = 255, b = 0)
+                    date_img = self.textImage(event['time'], small_font, r=0, g=150, b=255)
+                    indicator_img = self.textImage(event['indicator'], font2, r=255, g=255, b=255)
+                    after_offset = 0
+                    if event['forecast'] != None or event['previous'] != None or event['actual'] != None:
+                        tiny_font = ImageFont.load("./fonts/5x7.pil")
+                        try:
+                            if event['forecast'] != None:
+                                fore_img = self.textImage('Forecast', tiny_font, r=255,g=255,b=255)
+                                fore2_img = self.textImage(str(event['forecast']), tiny_font, r=0, g=255, b=0)
+                                after_offset += max(fore_img.size[0], fore2_img.size[0]) + 3
+                            if event['previous'] != None:
+                                prev_img = self.textImage('Prior', tiny_font, r=255,g=255,b=255)
+                                prev2_img = self.textImage(str(event['previous']), tiny_font, r=0, g=255, b=0)
+                                after_offset += max(prev_img.size[0], prev2_img.size[0]) + 3
+                                actual_img = self.textImage('Actual', tiny_font, r=255,g=255,b=255)
+                                if event['actual'] == None:
+                                    actual2_img = self.textImage('Soon', tiny_font, r=255, g=40, b=40)
+                                else:
+                                    actual2_img = self.textImage(str(event['actual']), tiny_font, r=0, g=255, b=0)
+                                after_offset += max(actual_img.size[0], actual2_img.size[0]) + 3
+                        except:
+                            pass
+                            
+                    try:
+                        img = Image.new('RGB', (
+                            max(flag_img.size[0] + x_offset + 5 + 3 + title_img.size[0] + country_img.size[0],
+                                max(flag_img.size[0] + x_offset + 5 + 1 + circle_img.size[0] + 2 + indicator_img.size[0] + 2 + imp_img.size[0],
+                                    flag_img.size[0] + x_offset + 5 + 1 + date_img.size[0] + 3 + 2 + clock_img.size[0] + period_img.size[0]) + 10 + after_offset
+                                 )
+                               ,32))
+                    except:
+                        img = Image.new('RGB', (
+                    	    max(flag_img.size[0] + x_offset + 5 + 3 + title_img.size[0] + country_img.size[0],
+                    	        max(flag_img.size[0] + x_offset + 5 + 1 + circle_img.size[0] + 2 + indicator_img.size[0] + 2 + imp_img.size[0],
+                                    flag_img.size[0] + x_offset + 5 + 1 + date_img.size[0]) + 10 + after_offset
+                    	         )
+                               ,32))
+
+                    img.paste(flag_img,(x_offset, 0))
+                    x_offset += flag_img.size[0] + 5
+                    x_offset2 = x_offset + 1
+                    img.paste(circle_img, (x_offset2, 15))
+                    img.paste(indicator_img, (x_offset2 + circle_img.size[0] + 2, 11))
+                    img.paste(imp_img, (x_offset2 + circle_img.size[0] + 2 + indicator_img.size[0] + 2, 15))
+                    img.paste(title_img, (x_offset , 0))
+                    x_offset += title_img.size[0] + 3
+                    img.paste(country_img, (x_offset, 2))
+                    x_offset += country_img.size[0]
+
+                    img.paste(date_img, (x_offset2, 23))
+                    try:
+                        img.paste(clock_img, (x_offset2 + 3 + date_img.size[0], 24))
+                        img.paste(period_img, (x_offset2 + 3 + date_img.size[0] + 2 + clock_img.size[0], 23))
+                        x_offset2 += max(circle_img.size[0] + 2 + indicator_img.size[0] + 2 + imp_img.size[0], 
+                                         date_img.size[0] + clock_img.size[0] + 3 + 2 + period_img.size[0]) + 10
+                    except:
+                        x_offset2 += max(circle_img.size[0] + 2 + indicator_img.size[0] + 2 + imp_img.size[0], date_img.size[0]) + 10
+
+                    try:
+                        if event['forecast'] != None:
+                            img.paste(fore_img, (x_offset2, 14))
+                            img.paste(fore2_img, (x_offset2, 22))
+                            x_offset2 += max(fore_img.size[0], fore2_img.size[0]) + 3
+                    except:
+                    	pass
+                    try:
+                        if event['previous'] != None:
+                            img.paste(prev_img, (x_offset2, 14))
+                            img.paste(prev2_img, (x_offset2, 22))
+                            x_offset2 += max(prev_img.size[0], prev2_img.size[0]) + 3
+                            img.paste(actual_img, (x_offset2, 14))
+                            img.paste(actual2_img, (x_offset2, 22))
+                            x_offset2 += max(actual_img.size[0], actual2_img.size[0]) + 3
+                    except:
+                        pass
+                    image_list.append(img)
+            except:
+                pass
+
+        elif len(econ_settings['events']) == 0:
+            time.sleep(0.1)
+            no_econ = self.textImage('No upcoming economic events today.', font, r = 255, g = 255, b = 255)
+            img = Image.new('RGB', (no_econ.size[0] + 15, 32))
+            img.paste(no_econ, (10, 10))
+            image_list.append(img)
+
+        return self.stitchImage(image_list)
+    
+    
+    
     def ip_viewer(self):
 
         font = ImageFont.load("./fonts/6x10.pil")
@@ -5970,6 +6096,9 @@ class StockTicker():
         elif msg == 'IPO': #ipo
             self.scrollFunctionsAnimated(['ipo', 'ipo'],animation = 'traditional')
             
+        elif msg == 'EC': #economic calendar
+            self.scrollFunctionsAnimated(['economic', 'economic'],animation = 'traditional')
+            
         elif msg == 'A': #everything
   
             #userSettings = ['display_gif', 'text', 'display_image', 'stocks', 'crypto', 'forex', 'today_weather', 'daily_weather', 'league_table', 'league_games', 'news'] # these wil be read from csv, just for demo

From 73bfbf5ece34bb65677d1b70dfec16b8599e8b3f Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 22:37:20 +0800
Subject: [PATCH 39/57] only show events for 1 hour for economic calendar

---
 database_caller.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/database_caller.py b/database_caller.py
index 6270c91..690d304 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -725,9 +725,9 @@ def updateEconomic(api_key, logf):
         country_codes_list = [country_codes[c] for c in country]
         result = ",".join(country_codes_list)
         timezone = pytz.timezone(all_economic_settings['timezone'])
-        # date_local = datetime.now(timezone)
-        # date_local = (date_local - timedelta(hours=1)).strftime('%Y-%m-%dT%H:%M:00')
-        date_local = datetime.now(timezone).strftime('%Y-%m-%dT00:00:00')
+        date_local = datetime.now(timezone)
+        date_local = (date_local - timedelta(hours=1)).strftime('%Y-%m-%dT%H:%M:00')
+        #date_local = datetime.now(timezone).strftime('%Y-%m-%dT00:00:00')
         date_local2 = datetime.now(timezone).strftime('%Y-%m-%dT23:59:00')
         date_from = timezone.localize(datetime.strptime(date_local,'%Y-%m-%dT%H:%M:%S')).astimezone(pytz.timezone('GMT')).strftime('%Y-%m-%dT%H:%M:%S.000Z')
         date_to = timezone.localize(datetime.strptime(date_local2,'%Y-%m-%dT%H:%M:%S')).astimezone(pytz.timezone('GMT')).strftime('%Y-%m-%dT%H:%M:%S.000Z')

From 1ce144b767f9bed7c9af70bf49005f982893c779 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 22:59:46 +0800
Subject: [PATCH 40/57] changed to 2 hours for past economic events

---
 database_caller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database_caller.py b/database_caller.py
index 690d304..b48980a 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -726,7 +726,7 @@ def updateEconomic(api_key, logf):
         result = ",".join(country_codes_list)
         timezone = pytz.timezone(all_economic_settings['timezone'])
         date_local = datetime.now(timezone)
-        date_local = (date_local - timedelta(hours=1)).strftime('%Y-%m-%dT%H:%M:00')
+        date_local = (date_local - timedelta(hours=2)).strftime('%Y-%m-%dT%H:%M:00')
         #date_local = datetime.now(timezone).strftime('%Y-%m-%dT00:00:00')
         date_local2 = datetime.now(timezone).strftime('%Y-%m-%dT23:59:00')
         date_from = timezone.localize(datetime.strptime(date_local,'%Y-%m-%dT%H:%M:%S')).astimezone(pytz.timezone('GMT')).strftime('%Y-%m-%dT%H:%M:%S.000Z')

From 928905f61ec9f195f8aa6f8636ee354018295f14 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 23:01:17 +0800
Subject: [PATCH 41/57] deleted source from economic events

---
 database_caller.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/database_caller.py b/database_caller.py
index b48980a..800883d 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -785,7 +785,6 @@ def updateEconomic(api_key, logf):
                         'title':each['title'],
                         'indicator':each['indicator'],
                         'period':each['period'],
-                        'source':each['source'],
                         'country':each['country'],
                         'currency':each['currency'],
                         'importance':each['importance'],

From 5237144856e61d7ba5b180622d6b4e0d14ef8acf Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 16 Jun 2023 23:02:07 +0800
Subject: [PATCH 42/57] deleted currency from economic calendar

---
 database_caller.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/database_caller.py b/database_caller.py
index 800883d..8256ada 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -786,7 +786,6 @@ def updateEconomic(api_key, logf):
                         'indicator':each['indicator'],
                         'period':each['period'],
                         'country':each['country'],
-                        'currency':each['currency'],
                         'importance':each['importance'],
                         'time':time,
                         'actual':each['actual'],

From 45f3b7cb3be5e0d4a826e14106edccfc1cad8b1e Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 20 Jun 2023 18:49:08 +0800
Subject: [PATCH 43/57] removed brackets for economic event titles

---
 stockTicker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stockTicker.py b/stockTicker.py
index 0beb666..6c64f5e 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -5846,7 +5846,7 @@ class StockTicker():
                         period_img = None
                     flag_img = Image.open('logos/economic_logos/' + event['country'] + '.png')
                     circle_img = Image.open('logos/indicator.png')
-                    title_img = self.textImage(event['title'].upper(), font, r = 255, g = 255, b = 255)
+                    title_img = self.textImage((event['title'].upper()).replace("(", '').replace(")", ''), font, r = 255, g = 255, b = 255)
                     country_img = self.textImage(event['country'].upper(), font2, r= 255, g = 255, b = 0)
                     date_img = self.textImage(event['time'], small_font, r=0, g=150, b=255)
                     indicator_img = self.textImage(event['indicator'], font2, r=255, g=255, b=255)

From 72f7530950baf2bdf11acdf0b17a011f78da8ab5 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 26 Jun 2023 17:31:31 +0800
Subject: [PATCH 44/57] economic calendar prof

---
 stockTicker.py | 142 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 140 insertions(+), 2 deletions(-)

diff --git a/stockTicker.py b/stockTicker.py
index 6c64f5e..05b01f1 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -71,7 +71,7 @@ class StockTicker():
                 'Sports (Team Stats)':lambda : self.getLeagueTableImage('premier_league'), 'Sports (Past Games)': lambda:self.getLeagueImage('NBA', 'past'), 
                 'Sports (Upcoming Games)': lambda : self.getLeagueImage('NHL', 'future'), 'Sports (Live Games)': lambda: self.getLeagueImage('NBA', 'live'), 
                 'News':self.getNewsImage, 'Custom Messages': self.getUserMessages, 'Commodities': self.getCommoditiesImage, 'Indices': self.getIndicesImage, 'Movies': self.getMoviesImage,
-                'Economic Calendar': self.getEconomicImage, 'IPO Calendar':self.getIpoImage, 'IPO Calendar Prof':self.getIpoProfessional,
+                'Economic Calendar': self.getEconomicImage, 'IPO Calendar':self.getIpoImage, 'IPO Calendar Prof':self.getIpoProfessional, 'Economic Calendar Prof': self.getEconomicProfessional,
                 
                 'Stocks Prof': self.getStockProfessional, 'Crypto Prof': self.getCryptoProfessional, 'Forex Prof': self.getForexProfessional, 
                 'Current Weather Prof': self.getTodayWeatherProfessional, 'News Prof':self.getNewsProfessional, 'Commodities Prof':self.getCommoditiesProfessional, 'Indices Prof': self.getIndicesProfessional,
@@ -85,7 +85,7 @@ class StockTicker():
                 'News':'csv/news_settings.json', 'Custom Images': 'csv/image_settings.json', 'Custom GIFs': 'csv/GIF_settings.json', 'Custom Messages': 'csv/message_settings.json',
                 'Stocks Prof': 'csv/stocks_settings.json', 'Crypto Prof': 'csv/crypto_settings.json', 'Forex Prof': 'csv/forex_settings.json', 
                 'Current Weather Prof': 'csv/current_weather.json', 'News Prof':'csv/news_settings.json', 'Commodities Prof':'csv/commodities_settings.json', 'Indices Prof': 'csv/indices_settings.json',
-                'Daily Forecast Prof':'csv/daily_weather.json', 'Sports (Team Stats) Prof': 'csv/league_tables.json', 'Sports (Upcoming Games) Prof': 'csv/upcoming_games.json', 'Sports (Past Games) Prof': 'csv/past_games.json', 'Custom Messages Prof': 'csv/message_settings.json', 'Custom Images Prof': 'csv/image_settings.json', 'Movies Prof': 'csv/movie_settings.json', 'Sports (Live Games) Prof': 'csv/live_games.json', 'IPO Calendar Prof': 'csv/ipo_settings.json'}
+                'Daily Forecast Prof':'csv/daily_weather.json', 'Sports (Team Stats) Prof': 'csv/league_tables.json', 'Sports (Upcoming Games) Prof': 'csv/upcoming_games.json', 'Sports (Past Games) Prof': 'csv/past_games.json', 'Custom Messages Prof': 'csv/message_settings.json', 'Custom Images Prof': 'csv/image_settings.json', 'Movies Prof': 'csv/movie_settings.json', 'Sports (Live Games) Prof': 'csv/live_games.json', 'IPO Calendar Prof': 'csv/ipo_settings.json', 'Economic Calendar Prof': 'csv/economic_settings.json'}
         
 
     def openImage(self, image_file):
@@ -5936,6 +5936,142 @@ class StockTicker():
 
         return self.stitchImage(image_list)
     
+
+    def getEconomicProfessional(self):
+
+        f = open('csv/economic_settings.json', 'r')
+        econ_settings = json.load(f)
+        f.close()
+        
+        if econ_settings['title']:
+            title_img = self.openImage('feature_titles/small_feature_titles/economy.png')
+            image_list = [title_img]
+        else:
+            image_list = []
+
+        font = ImageFont.load("./fonts/5x8.pil")
+        small_font = ImageFont.load("./fonts/4x6.pil")
+
+        if len(econ_settings['events']) != 0:
+            try:
+                for event in econ_settings['events']:
+                    x_offset = 5
+                    if event['importance'] == -1:
+                        imp_img = Image.open('logos/low_imp.png')
+                    elif event['importance'] == 0:
+                        imp_img = Image.open('logos/med_imp.png')
+                    elif event['importance'] == 1:
+                        imp_img = Image.open('logos/high_imp.png')
+                    if event['period'] != "":
+                        clock_img = Image.open('logos/period.png')
+                        period_img = self.textImage(event['period'].upper(), small_font, r=255, g= 85, b =0)
+                    else:
+                        clock_img = None
+                        period_img = None
+                    flag_img = Image.open('logos/economic_logos/' + event['country'] + '.png')
+                    width, height = flag_img.size
+                    flag_img = flag_img.resize((int(width/2), int(height/2)))
+                    circle_img = Image.open('logos/indicator.png')
+                    title_img = self.textImage((event['title'].upper()).replace("(", '').replace(")", ''), font, r = 255, g = 255, b = 255)
+                    country_img = self.textImage(event['country'].upper(), small_font, r= 255, g = 255, b = 0)
+                    date_img = self.textImage(event['time'].split(' ')[2], small_font, r=0, g=150, b=255)
+                    indicator_img = self.textImage(event['indicator'], small_font, r=255, g=255, b=255)
+
+                    if event['forecast'] != None or event['previous'] != None or event['actual'] != None:
+                        try:
+                            if event['forecast'] != None:
+                                fore_img = self.textImage('Forecast', small_font, r=255,g=255,b=255)
+                                fore2_img = self.textImage(str(event['forecast']), small_font, r=0, g=255, b=0)
+                            if event['previous'] != None:
+                                prev_img = self.textImage('Prior', small_font, r=255,g=255,b=255)
+                                prev2_img = self.textImage(str(event['previous']), small_font, r=0, g=255, b=0)
+                                actual_img = self.textImage('Actual', small_font, r=255,g=255,b=255)
+                                if event['actual'] == None:
+                                    actual2_img = self.textImage('Soon', small_font, r=255, g=40, b=40)
+                                else:
+                                    actual2_img = self.textImage(str(event['actual']), small_font, r=0, g=255, b=0)
+                        except:
+                            pass
+
+                    x_off1 = x_offset + flag_img.size[0] + 2 + title_img.size[0] + 2 + country_img.size[0] + imp_img.size[0] + 2
+                    x_off2 = x_offset + flag_img.size[0] + 2 + circle_img.size[0] + 2 + indicator_img.size[0] + 2 + date_img.size[0] + 2
+                    try:
+                        x_off2 += clock_img.size[0] + 2 + period_img.size[0] + 2
+                    except:
+                        pass
+                    x_off3 = max(x_off1, x_off2)
+                    try:
+                        if event['forecast'] != None:
+                            x_off3 += max(fore_img.size[0], fore2_img.size[0]) + 2
+                    except:
+                        pass
+                    try:
+                        if event['previous'] != None:
+                            x_off3 += max(prev_img.size[0], prev2_img.size[0]) + 2
+                            x_off3 += max(actual_img.size[0], actual2_img.size[0]) + 2
+                    except:
+                        pass
+
+                    img = Image.new('RGB', (x_off3 + 5,16))
+
+                    img.paste(flag_img, (x_offset, 0))
+                    x_offset += flag_img.size[0] + 2
+                    x_offset2 = x_offset
+                    img.paste(title_img, (x_offset, 0))
+                    x_offset += title_img.size[0] +2
+                    img.paste(country_img, (x_offset, 2))
+                    x_offset += country_img.size[0]
+                    img.paste(imp_img, (x_offset, 1))
+                    x_offset += imp_img.size[0] + 2
+
+                    img.paste(circle_img, (x_offset2, 9))
+                    x_offset2 += circle_img.size[0] + 2
+                    img.paste(indicator_img, (x_offset2, 9))
+                    x_offset2 += indicator_img.size[0] + 2
+                    img.paste(date_img, (x_offset2, 9))
+                    x_offset2 += date_img.size[0] + 2
+                    try:
+                        img.paste(clock_img, (x_offset2, 8))
+                        x_offset2 += clock_img.size[0] + 2
+                        img.paste(period_img, (x_offset2, 9))
+                        x_offset2 += period_img.size[0] + 2
+                    except:
+                        pass
+
+                    x_offset3 = max(x_offset, x_offset2)
+                    try:
+                        if event['forecast'] != None:
+                            img.paste(fore_img, (x_offset3, 3))
+                            img.paste(fore2_img, (x_offset3, 9))
+                            x_offset3 += max(fore_img.size[0], fore2_img.size[0]) + 2
+                    except:
+                    	pass
+                    try:
+                        if event['previous'] != None:
+                            img.paste(prev_img, (x_offset3, 3))
+                            img.paste(prev2_img, (x_offset3, 9))
+                            x_offset3 += max(prev_img.size[0], prev2_img.size[0]) + 2
+                            img.paste(actual_img, (x_offset3, 3))
+                            img.paste(actual2_img, (x_offset3, 9))
+                            x_offset3 += max(actual_img.size[0], actual2_img.size[0]) + 2
+                    except:
+                        pass
+
+                    image_list.append(img)
+            except:
+                time.sleep(0.1)
+                no_econ = self.textImage('No upcoming economic events today.', font, r = 255, g = 255, b = 255)
+                img = Image.new('RGB', (no_econ.size[0] + 15, 16))
+                img.paste(no_econ, (10, 1))
+                image_list.append(img)
+        elif len(econ_settings['events']) == 0:
+            time.sleep(0.1)
+            no_econ = self.textImage('No upcoming economic events today.', font, r = 255, g = 255, b = 255)
+            img = Image.new('RGB', (no_econ.size[0] + 15, 16))
+            img.paste(no_econ, (10, 1))
+            image_list.append(img)
+
+        return self.stitchImage(image_list)
     
     
     def ip_viewer(self):
@@ -6013,6 +6149,8 @@ class StockTicker():
         x_offset += images.size[0]
         news.paste(ipo, (x_offset, 16))
         x_offset += ipo.size[0]
+        news.paste(economic, (x_offset, 16))
+        x_offset += economic.size[0]
         self.double_buffer = self.matrix.CreateFrameCanvas()
         while True:
             kill = stock_ticker.scrollImage(news, offset_x = 128)

From 252900085c0fd8f1f519bf0a06ce997454629e0d Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 26 Jun 2023 18:25:17 +0800
Subject: [PATCH 45/57] DXY us dollar index

---
 logos/indices/DX-Y.NYB.png | Bin 0 -> 1353 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 logos/indices/DX-Y.NYB.png

diff --git a/logos/indices/DX-Y.NYB.png b/logos/indices/DX-Y.NYB.png
new file mode 100644
index 0000000000000000000000000000000000000000..f051711dd7e091c2871e77116158967deaf9ed33
GIT binary patch
literal 1353
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wk0|S$7fKP}kQ1U+v%-{D2#zdzdzW#Ro$>-U-9~I5J%n-CiB5Bu+2d_SS
z`0(k|r=LH6{{8zGuHpBef3H6Lh@NoXqWn<)><i~_y~v+)K_Pw5*RNmU%KrTMbNK2j
z?#S)TAzLSHy7A`i`}Aq&#6#Dg$?1HY-|}wdw!hzg01Z5L<89sY>q(Q(^2h8boqy4`
z>ac&?2{Er_hd4}cFsMHb%K35S_LWDUtgDXlL~Z8?-^LQM^?_-~r`0<?efu5ObGCNL
zW$BdNoDti)*Ij21-v(3+ab(7fOH#?Zde&Wk_VVqnGml;Bj~W#p+;-~G%Qx@l?YbkG
zyh}V}-I<i8M`^Y17H|Cb^Vj1y-(4GyK6&wW;>H_nVOtr4x3sOg7TbUN@85rUbFP?`
z9TJS);ZSpgFM3Bv=SjZk?LcqddiKSz=zvMdL5PieFTIjU-OUudW&Z9vq6s@?Q+IDZ
z@lZZ}k3{^AYbUO~yL#)#`;S1CFW-KM>^;@8^6I|xPfSY>s%7upb@uV>9k=gkd4HI@
zX34(0N*Q|t+E4VYzrhu`y?6cfuC>?WC!S#q-6|NjQ!sX?cGTMA@*cM&tZ&_a`TFMF
zcQ@_;qvqqX&9|lPeqO)(|IeRi(IvkgJ_Di;I}bnWn)UDdkAMIEK_Uf6e*XOV*RNkd
zXZ(Ku@%@(lPa7w{-@NbNuU~&Zefj<9`Lmc(Ao*eTs(YGVA7-umFlRMT<<o6(&A<e-
zza+>nn1NX%W$~qVfB(F_xL9r}$U9*0afvK%=MyOBafkL5C=*Cs33-6vJb<ttT!jc-
z<?BSqfmxl8p#n>x^b(*Q>dDBe7Qs1-;Vc*fDED#c|D`~ebY8il_2B=5V318$fldRN
zw>WkF_32N5ndX+Ki(^Q|oaBTCMmM!Iu`shTK0m#@G&MIio&$$ZAJ<pV&`{A)Qqoe>
zQ|wgJRn=A2R$sqh1xpYE%PFl@K_@<Cy^@;M6m`pLS5wt5Hi3kUC2bST%?wSA#YMJk
z*dnxL+s0NV>+0kkb?oly>Ee!#>gwq#tlQS*1sE^6V{2l&cMt1a)7m*T6Gd*^`uVe2
zl!b+jwY{Z{v(4Sb&Gq<^V~P$nOdfGYfdK}Zma3r!y0(_i0<X9=0vLZyGc@)NFtAoP
z_YW}G@4)BVSfr@T96V7$KqR~Igpi{NtJ0&TJgHAbr#=%6Rds5*YPz-5@+)uei3KZr
z7VcacYOvgQ$zJCTo4uFZmboeJaN+Xl16Qx>Ygi;E-Bxitcrthy*CNdgsi_IGpQ&hA
z#2Orr3^0f)U~6MCV=Ge>F(|&4BXZ!}0mUAsXJ_WNGg(MjxPD;rW7GS?wL@Z->&KJb
z=h746HVE)X95{1e%Ly_5h$BZ1?5N<(`>E>Pcye~SWFG73iUXW!Ke=QQetLOKieB1t
zm;2P}g`V|iZ<XG7a(!()v-dUWYsrSrm2cTxjzw%PyqspTA@#Ksn~K8L+~0g6|8==P
zxSyUo$y)sFE#8TD_oiP=k~{N;_sqZQoi}dWycx0cyJBiRL+buVHsu>u@d6VpgQu&X
J%Q~loCIFNVAP@im

literal 0
HcmV?d00001


From f1a7758e7ee397a0a0d59bc9325001201475be07 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 26 Jun 2023 18:26:58 +0800
Subject: [PATCH 46/57] added us dollar index

---
 templates/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/index.html b/templates/index.html
index 8737afe..8939b61 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2921,6 +2921,7 @@
                     <select id="indices-items" class="form-select animation-select">
                       <option>Dow Jones - USA</option><option>S&P 500 - USA</option><option>Nasdaq 100 - USA</option>
                       <option>Nasdaq Composite - USA</option><option>Russell 2000 - USA</option><option>VIX - USA</option>
+                      <option>U.S. Dollar (DXY) - USA</option>
                       <option>S&P/TSX - Canada</option><option>IPC - Mexico</option><option>Bovespa - Brazil</option>
                       <option>Dax - Germany</option><option>FTSE 100 - UK</option><option>IBEX 35 - Spain</option>
                       <option>CAC 40 - France</option><option>SSMI - Switzerland</option><option>BEL 20 - Brussels</option>

From 98ddffa26538b5876b08d949789ae1116d83cd38 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 26 Jun 2023 18:29:12 +0800
Subject: [PATCH 47/57] usd index

---
 server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server.py b/server.py
index fe80e4c..c1e2448 100755
--- a/server.py
+++ b/server.py
@@ -196,7 +196,7 @@ def index():
         'OMXS30 - Stockholm': '^OMX', 'AEX - Amsterdam': '^AEX', 'ATX - Austria': '^ATX', 'BEL 20 - Brussels': '^BFX',
         'SSMI - Switzerland': '^SSMI', 'CAC 40 - France': '^FCHI', 'IBEX 35 - Spain': '^IBEX', 'FTSE 100 - UK': '^FTSE', 'Dax - Germany': '^GDAXI',
         'Bovespa - Brazil': '^BVSP', 'IPC - Mexico': '^MXX', 'S&P/TSX - Canada': '^GSPTSE', 'VIX - USA': '^VIX', 'Russell 2000 - USA': '^RUT',
-        'Nasdaq Composite - USA': '^IXIC', 'Nasdaq 100 - USA': '^NDX', 'S&P 500 - USA': '^GSPC', 'Dow Jones - USA': '^DJI'}
+        'Nasdaq Composite - USA': '^IXIC', 'Nasdaq 100 - USA': '^NDX', 'S&P 500 - USA': '^GSPC', 'Dow Jones - USA': '^DJI', 'U.S. Dollar (DXY) - USA': 'DX-Y.NYB'}
     f = open('csv/indices_settings.json', 'r')
     indices_settings = json.load(f)
     try:
@@ -1048,7 +1048,7 @@ def save_trade_settings(input_settings):
         'OMXS30 - Stockholm': '^OMX', 'AEX - Amsterdam': '^AEX', 'ATX - Austria': '^ATX', 'BEL 20 - Brussels': '^BFX',
         'SSMI - Switzerland': '^SSMI', 'CAC 40 - France': '^FCHI', 'IBEX 35 - Spain': '^IBEX', 'FTSE 100 - UK': '^FTSE', 'Dax - Germany': '^GDAXI',
         'Bovespa - Brazil': '^BVSP', 'IPC - Mexico': '^MXX', 'S&P/TSX - Canada': '^GSPTSE', 'VIX - USA': '^VIX', 'Russell 2000 - USA': '^RUT',
-        'Nasdaq Composite - USA': '^IXIC', 'Nasdaq 100 - USA': '^NDX', 'S&P 500 - USA': '^GSPC', 'Dow Jones - USA': '^DJI'
+        'Nasdaq Composite - USA': '^IXIC', 'Nasdaq 100 - USA': '^NDX', 'S&P 500 - USA': '^GSPC', 'Dow Jones - USA': '^DJI', 'U.S. Dollar (DXY) - USA': 'DX-Y.NYB'
     }
 	
     filename = input_settings['feature'].lower() + '_settings.json'

From 13d6dfd93656686b55788f6c29558a764d8ab2d1 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 29 Jun 2023 15:55:13 +0800
Subject: [PATCH 48/57] changed to google.com

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index 8939b61..760d9c8 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8629,7 +8629,7 @@
 
       try {
 
-        const online = await fetch("https://static-global-s-msn-com.akamaized.net/hp-neu/sc/2b/a5ea21.ico?d="+Date.now());
+        const online = await fetch("https://www.google.com/");
 
         console.log(online.status);
 

From f742c9aeff18945d36fb4eba64894e972cbc582c Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 29 Jun 2023 16:02:59 +0800
Subject: [PATCH 49/57] google ssl?

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index 760d9c8..73f21d0 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8629,7 +8629,7 @@
 
       try {
 
-        const online = await fetch("https://www.google.com/");
+        const online = await fetch("https://ssl.gstatic.com/");
 
         console.log(online.status);
 

From 25573f9a8f28bfcfabcb1eb77af79960532b65c6 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 30 Jun 2023 18:43:18 +0800
Subject: [PATCH 50/57] Delete commodities_settings.json

---
 csv/commodities_settings.json | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 csv/commodities_settings.json

diff --git a/csv/commodities_settings.json b/csv/commodities_settings.json
deleted file mode 100644
index 043aa5c..0000000
--- a/csv/commodities_settings.json
+++ /dev/null
@@ -1 +0,0 @@
-{"feature": "Stocks", "speed": "fast", "speed2": "fast", "animation": "down", "percent": true, "point": true, "logos": true, "chart": false, "title": true, "symbols": {"BRENTOIL": {"current": "123.053", "unit": "bbl", "24hr_change": "1.0150", "percent_change": "0.83"}, "WTIOIL": {"current": "121.588", "unit": "bbl", "24hr_change": "0.8902", "percent_change": "0.74"}, "XAU": {"current": "1821.205", "unit": "oz", "24hr_change": "4.0045", "percent_change": "0.22"}, "XAG": {"current": "21.1034", "unit": "oz", "24hr_change": "-0.0550", "percent_change": "-0.26"}, "XCU": {"current": "0.2633", "unit": "oz", "24hr_change": "-0.0006", "percent_change": "-0.22"}, "NG": {"current": "8.6595", "unit": "mmbtu", "24hr_change": "-0.0236", "percent_change": "-0.27"}, "WHEAT": {"current": "393.123", "unit": "ton", "24hr_change": "-1.2642", "percent_change": "-0.32"}, "COTTON": {"current": "1.4494", "unit": "lb", "24hr_change": "0.0004", "percent_change": "0.03"}, "RICE": {"current": "16.3849", "unit": "cwt", "24hr_change": "0.0093", "percent_change": "0.06"}, "SUGAR": {"current": "0.1866", "unit": "lb", "24hr_change": "-0.0007", "percent_change": "-0.40"}, "COCOA": {"current": "2374.074", "unit": "ton", "24hr_change": "2.5206", "percent_change": "0.11"}, "LUMBER": {"current": "527.842", "unit": "oz", "24hr_change": "0.2641", "percent_change": "0.05"}, "SOYBEAN": {"current": "17.1621", "unit": "bu", "24hr_change": "0.0270", "percent_change": "0.16"}}}
\ No newline at end of file

From a1290f5213ec06d8240ad7bd49f7d9e1c660547d Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 30 Jun 2023 18:43:38 +0800
Subject: [PATCH 51/57] Delete indices_settings.json

---
 csv/indices_settings.json | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 csv/indices_settings.json

diff --git a/csv/indices_settings.json b/csv/indices_settings.json
deleted file mode 100644
index af92599..0000000
--- a/csv/indices_settings.json
+++ /dev/null
@@ -1 +0,0 @@
-{"feature": "Stocks", "speed": "fast", "speed2": "slow", "animation": "up", "percent": true, "point": true, "logos": true, "chart": false, "title": true, "symbols": {"^HSI": {"name": "HSI", "current": "18083.06", "point_change": "1003.55", "percent_change": "5.88"}, "^GSPC": {"name": "S&P 500", "current": "3790.93", "point_change": "112.50", "percent_change": "3.06"}, "^RUT": {"name": "RUSSELL 2000", "current": "1775.77", "point_change": "66.90", "percent_change": "3.91"}, "^GDAXI": {"name": "DAX", "current": "12648.95", "point_change": "-21.53", "percent_change": "-0.17"}, "^FTSE": {"name": "FTSE 100", "current": "7058.68", "point_change": "-27.82", "percent_change": "-0.39"}, "^FCHI": {"name": "CAC 40", "current": "6031.45", "point_change": "-8.24", "percent_change": "-0.14"}, "399001.SZ": {"name": "SZSE", "current": "10778.61", "point_change": "-140.83", "percent_change": "-1.29"}, "^STOXX50E": {"name": "STOXX 50", "current": "3476.55", "point_change": "-7.93", "percent_change": "-0.23"}, "^AXJO": {"name": "ASX 200", "current": "6815.70", "point_change": "116.40", "percent_change": "1.74"}, "^DJI": {"name": "DOW JONES", "current": "30316.32", "point_change": "825.43", "percent_change": "2.80"}, "^STOXX": {"name": "STOXX 600", "current": "402.33", "point_change": "-0.70", "percent_change": "-0.17"}}}
\ No newline at end of file

From 2c57fcc7ce6892ed8dc73a969ff61d2132a5c30d Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 30 Jun 2023 18:43:49 +0800
Subject: [PATCH 52/57] Delete ipo_settings.json

---
 csv/ipo_settings.json | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 csv/ipo_settings.json

diff --git a/csv/ipo_settings.json b/csv/ipo_settings.json
deleted file mode 100644
index c16386b..0000000
--- a/csv/ipo_settings.json
+++ /dev/null
@@ -1 +0,0 @@
-{"feature": "IPO", "speed": "medium", "speed2": "medium", "animation": "down", "title": true, "symbols": ["No Data"]}
\ No newline at end of file

From 0e4e798dcfcd0a91467d185e199ee452b1bbadc8 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 30 Jun 2023 18:43:58 +0800
Subject: [PATCH 53/57] Delete movie_settings.json

---
 csv/movie_settings.json | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 csv/movie_settings.json

diff --git a/csv/movie_settings.json b/csv/movie_settings.json
deleted file mode 100644
index 52e9431..0000000
--- a/csv/movie_settings.json
+++ /dev/null
@@ -1 +0,0 @@
-{"feature": "Movies", "speed": "fast", "speed2": "fast", "animation": "continuous", "category": "Popular All", "title": true, "movies": [{"title": "Avatar: The Way of Water", "language": "EN", "votes": "8.1", "date": "2022-12-14", "media_type": "Movie", "genre": ["Sci-Fi", "Action", "Adventure"], "backdrop": "198vrF8k7mfQ4FjDJsBmdQcaiyq.jpg", "logo": "https://image.tmdb.org/t/p/w500/198vrF8k7mfQ4FjDJsBmdQcaiyq.jpg"}, {"title": "Violent Night", "language": "EN", "votes": "7.3", "date": "2022-11-30", "media_type": "Movie", "genre": ["Action", "Comedy", "Crime", "Thriller"], "backdrop": "g9Kb3RaLjsybI1jpqHQ3QZTCYpB.jpg", "logo": "https://image.tmdb.org/t/p/w500/g9Kb3RaLjsybI1jpqHQ3QZTCYpB.jpg"}, {"title": "Avatar", "language": "EN", "votes": "7.5", "date": "2009-12-15", "media_type": "Movie", "genre": ["Action", "Adventure", "Fantasy", "Sci-Fi"], "backdrop": "Yc9q6QuWrMp9nuDm5R8ExNqbEq.jpg", "logo": "https://image.tmdb.org/t/p/w500/Yc9q6QuWrMp9nuDm5R8ExNqbEq.jpg"}, {"title": "The Banshees of Inisherin", "language": "EN", "votes": "7.7", "date": "2022-10-21", "media_type": "Movie", "genre": ["Drama", "Comedy"], "backdrop": "9Md4CqzUGDtK5oEkRRvozLkGc9d.jpg", "logo": "https://image.tmdb.org/t/p/w500/9Md4CqzUGDtK5oEkRRvozLkGc9d.jpg"}, {"title": "Wednesday", "language": "EN", "votes": "8.8", "date": "2022-11-23", "media_type": "Tv", "genre": ["Sci-Fi & Fantasy", "Mystery", "Comedy"], "backdrop": "iHSwvRVsRyxpX7FE7GbviaDvgGZ.jpg", "logo": "https://image.tmdb.org/t/p/w500/iHSwvRVsRyxpX7FE7GbviaDvgGZ.jpg"}, {"title": "1923", "language": "EN", "votes": "8.8", "date": "2022-12-18", "media_type": "Tv", "genre": ["Drama", "Western"], "backdrop": "9I6LgZ5110ycg4pyobJxGTFWFCF.jpg", "logo": "https://image.tmdb.org/t/p/w500/9I6LgZ5110ycg4pyobJxGTFWFCF.jpg"}, {"title": "The Recruit", "language": "EN", "votes": "7.2", "date": "2022-12-16", "media_type": "Tv", "genre": ["Drama", "Crime"], "backdrop": "rey2eh6752C2UbGYRileKk1PVTo.jpg", "logo": "https://image.tmdb.org/t/p/w500/rey2eh6752C2UbGYRileKk1PVTo.jpg"}, {"title": "Black Adam", "language": "EN", "votes": "7.2", "date": "2022-10-19", "media_type": "Movie", "genre": ["Action", "Fantasy", "Sci-Fi"], "backdrop": "bQXAqRx2Fgc46uCVWgoPz5L5Dtr.jpg", "logo": "https://image.tmdb.org/t/p/w500/bQXAqRx2Fgc46uCVWgoPz5L5Dtr.jpg"}, {"title": "Nanny", "language": "EN", "votes": "5.4", "date": "2022-11-23", "media_type": "Movie", "genre": ["Horror", "Drama"], "backdrop": "nfuPlOK6ywGzKGb0yf7VJKyTFWb.jpg", "logo": "https://image.tmdb.org/t/p/w500/nfuPlOK6ywGzKGb0yf7VJKyTFWb.jpg"}, {"title": "Tom Clancy's Jack Ryan", "language": "EN", "votes": "7.7", "date": "2018-08-30", "media_type": "Tv", "genre": ["Action & Adventure", "Drama", "War & Politics"], "backdrop": "6ovk8nrrSmN1ieT14zBAxcHbMU7.jpg", "logo": "https://image.tmdb.org/t/p/w500/6ovk8nrrSmN1ieT14zBAxcHbMU7.jpg"}, {"title": "High Heat", "language": "EN", "votes": "6.5", "date": "2022-12-16", "media_type": "Movie", "genre": ["Action", "Comedy", "Crime"], "backdrop": "gjNM0odqkq5F7V58OjfTxPJ9p9Z.jpg", "logo": "https://image.tmdb.org/t/p/w500/gjNM0odqkq5F7V58OjfTxPJ9p9Z.jpg"}, {"title": "A Not So Merry Christmas", "language": "ES", "votes": "4.8", "date": "2022-12-20", "media_type": "Movie", "genre": ["Comedy"], "backdrop": "8uyJzaiGbiezZ9K48Cy5wXeqnYw.jpg", "logo": "https://image.tmdb.org/t/p/w500/8uyJzaiGbiezZ9K48Cy5wXeqnYw.jpg"}, {"title": "Guillermo del Toro's Pinocchio", "language": "EN", "votes": "8.5", "date": "2022-11-09", "media_type": "Movie", "genre": ["Animation", "Fantasy", "Drama"], "backdrop": "e782pDRAlu4BG0ahd777n8zfPzZ.jpg", "logo": "https://image.tmdb.org/t/p/w500/e782pDRAlu4BG0ahd777n8zfPzZ.jpg"}, {"title": "His Dark Materials", "language": "EN", "votes": "8.0", "date": "2019-11-03", "media_type": "Tv", "genre": ["Sci-Fi & Fantasy", "Drama"], "backdrop": "dGOhplPZTL0SKyb0ocTFBHIuKUC.jpg", "logo": "https://image.tmdb.org/t/p/w500/dGOhplPZTL0SKyb0ocTFBHIuKUC.jpg"}, {"title": "The Fabelmans", "language": "EN", "votes": "7.8", "date": "2022-11-11", "media_type": "Movie", "genre": ["Drama", "Comedy"], "backdrop": "6RCf9jzKxyjblYV4CseayK6bcJo.jpg", "logo": "https://image.tmdb.org/t/p/w500/6RCf9jzKxyjblYV4CseayK6bcJo.jpg"}, {"title": "The Seven Deadly Sins: Grudge of Edinburgh Part 1", "language": "JA", "votes": "7.8", "date": "2022-12-20", "media_type": "Movie", "genre": ["Animation", "Fantasy", "Adventure", "Action"], "backdrop": "24fe6ou97ammOg3O6ShCgaiolp4.jpg", "logo": "https://image.tmdb.org/t/p/w500/24fe6ou97ammOg3O6ShCgaiolp4.jpg"}, {"title": "Mindcage", "language": "EN", "votes": "7.6", "date": "2022-12-16", "media_type": "Movie", "genre": ["Mystery", "Thriller", "Crime", "Drama"], "backdrop": "An2M2gm0p8POaiGTcZvP1JnUItH.jpg", "logo": "https://image.tmdb.org/t/p/w500/An2M2gm0p8POaiGTcZvP1JnUItH.jpg"}, {"title": "Private Lesson", "language": "TR", "votes": "7.3", "date": "2022-12-16", "media_type": "Movie", "genre": ["Comedy", "Romance"], "backdrop": "uZtYhcnk3WWvUzQkJLqnNywMQpb.jpg", "logo": "https://image.tmdb.org/t/p/w500/uZtYhcnk3WWvUzQkJLqnNywMQpb.jpg"}, {"title": "Sonic Prime", "language": "EN", "votes": "8.7", "date": "2022-12-15", "media_type": "Tv", "genre": ["Animation", "Family"], "backdrop": "1Iiz2uLcZuLn4Khog2yiKpbl11.jpg", "logo": "https://image.tmdb.org/t/p/w500/1Iiz2uLcZuLn4Khog2yiKpbl11.jpg"}, {"title": "The Big 4", "language": "ID", "votes": "7.0", "date": "2022-12-19", "media_type": "Movie", "genre": ["Action", "Comedy", "Crime"], "backdrop": "clO1mWRYT24ogzN3o6LsqHjqrQu.jpg", "logo": "https://image.tmdb.org/t/p/w500/clO1mWRYT24ogzN3o6LsqHjqrQu.jpg"}]}
\ No newline at end of file

From f6d1c18ca3a519acf10b1ff7fc5338eb256c5873 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 30 Jun 2023 19:57:12 +0800
Subject: [PATCH 54/57] fixed web panel internet connection status bug

---
 templates/index.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 73f21d0..9160d20 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8629,13 +8629,11 @@
 
       try {
 
-        const online = await fetch("https://ssl.gstatic.com/");
+        const online = await fetch("http://api.openweathermap.org/data");
 
         console.log(online.status);
 
-
-
-        if (online.status >= 200 && online.status < 300){
+        if ((online.status >= 200 && online.status < 300) || online.status === 401) {
 
           statusDisplay.text("Connected");
 
@@ -8673,7 +8671,7 @@
 
       }
 
-    }, 3000);
+    }, 10000);
 
 
 

From 6dc21b0f8763771917501d7d543dba757046140e Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 30 Jun 2023 19:59:11 +0800
Subject: [PATCH 55/57] try and except statements to fix internal server errors

---
 server.py | 397 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 228 insertions(+), 169 deletions(-)

diff --git a/server.py b/server.py
index c1e2448..8b9ebbd 100755
--- a/server.py
+++ b/server.py
@@ -126,26 +126,35 @@ def index():
     
     global professional
     
-    f = open('csv/display_settings.json', 'r')
-    feature_settings = json.load(f)
-    feature_settings2 = feature_settings[0]
-    f.close()
-    
-   
+    try:
+        f = open('csv/display_settings.json', 'r')
+        feature_settings = json.load(f)
+        feature_settings2 = feature_settings[0]
+        f.close()
+    except:
+        feature_settings = ["Standard", [["Stocks", "Crypto", "Forex"]]]
+        feature_settings2 = feature_settings[0]
 
     if not professional:
-        f = open('csv/display_settings.json', 'r')
-        currently_displaying = json.load(f)[1]
-        f.close()
+        try:
+            f = open('csv/display_settings.json', 'r')
+            currently_displaying = json.load(f)[1]
+            f.close()
+        except:
+            currently_displaying = ["Standard", [["Stocks", "Crypto", "Forex"]]][1]
         not_displaying = [f for f in all_features if f not in currently_displaying[0]]
         not_displaying2 = [f for f in all_features if f not in currently_displaying[0]]
 
     elif professional:
-        f = open('csv/display_settings.json', 'r')
-        currently_displaying = json.load(f)[1]
-        f.close()
+        try:
+            f = open('csv/display_settings.json', 'r')
+            currently_displaying = json.load(f)[1]
+            f.close()
+        except:
+            currently_displaying = ["Standard", [["Stocks", "Crypto", "Forex"]]][1]
         not_displaying = [f for f in all_features if f not in currently_displaying[0]]
         not_displaying2 = [f for f in all_features if f not in currently_displaying[1]]
+
     
 #     with open('api_keys.txt', 'r') as f:
 #         api_key2 = f.readlines()
@@ -170,23 +179,30 @@ def index():
     logos_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'logos')
     LogoList = os.listdir(logos_path)
 	
-    f = open('csv/stocks_settings.json', 'r')
-    stocks_settings = json.load(f)
-    f.close()
+    try:
+        f = open('csv/stocks_settings.json', 'r')
+        stocks_settings = json.load(f)
+        f.close()
+    except:
+        stocks_settings = {"feature": "Stocks", "speed": "medium", "speed2": "medium", "animation": "down", "percent": False, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"AAPL": {"current": "164.02", "change": "-1.59", "percent_change": "-0.97"}, "MSFT": {"current": "288.29", "change": "-1.32", "percent_change": "-0.46"}, "GOOG": {"current": "2586.74", "change": "-34.01", "percent_change": "-1.31"}, "NFLX": {"current": "380.52", "change": "-7.59", "percent_change": "-1.99"}}, "prepost": False}
     
     dict1 = {
         "Aluminum": "ALU", "Brent Crude Oil": "BRENTOIL", "Coffee": "COFFEE", "Copper": "XCU", "Corn": "CORN", "Cotton": "COTTON", "Gold": "XAU",
         "Palladium": "XPD", "Platinum": "XPT", "Rice": "RICE", "Silver": "XAG", "Soybean": "SOYBEAN", "Sugar": "SUGAR", "Wheat": "WHEAT",
         "WTI Crude Oil": "WTIOIL", "Ethanol": "ETHANOL", "Crude Palm Oil": "CPO", "Natural Gas": "NG", "Cocoa": "COCOA", "Robusta": "ROBUSTA",
         "Lumber": "LUMBER", "Rubber": "RUBBER", "Live Cattle": "CATTLE", "Lean Hog": "HOG"}
-    f = open('csv/commodities_settings.json', 'r')
-    commodities_settings = json.load(f)
+    try:
+        f = open('csv/commodities_settings.json', 'r')
+        commodities_settings = json.load(f)
+        f.close()
+    except:
+        commodities_settings = {"feature": "Stocks", "speed": "fast", "speed2": "fast", "animation": "down", "percent": True, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"BRENTOIL": {"current": "123.053", "unit": "bbl", "24hr_change": "1.0150", "percent_change": "0.83"}, "WTIOIL": {"current": "121.588", "unit": "bbl", "24hr_change": "0.8902", "percent_change": "0.74"}, "XAU": {"current": "1821.205", "unit": "oz", "24hr_change": "4.0045", "percent_change": "0.22"}, "XAG": {"current": "21.1034", "unit": "oz", "24hr_change": "-0.0550", "percent_change": "-0.26"}, "XCU": {"current": "0.2633", "unit": "oz", "24hr_change": "-0.0006", "percent_change": "-0.22"}, "NG": {"current": "8.6595", "unit": "mmbtu", "24hr_change": "-0.0236", "percent_change": "-0.27"}, "WHEAT": {"current": "393.123", "unit": "ton", "24hr_change": "-1.2642", "percent_change": "-0.32"}, "COTTON": {"current": "1.4494", "unit": "lb", "24hr_change": "0.0004", "percent_change": "0.03"}, "RICE": {"current": "16.3849", "unit": "cwt", "24hr_change": "0.0093", "percent_change": "0.06"}, "SUGAR": {"current": "0.1866", "unit": "lb", "24hr_change": "-0.0007", "percent_change": "-0.40"}, "COCOA": {"current": "2374.074", "unit": "ton", "24hr_change": "2.5206", "percent_change": "0.11"}, "LUMBER": {"current": "527.842", "unit": "oz", "24hr_change": "0.2641", "percent_change": "0.05"}, "SOYBEAN": {"current": "17.1621", "unit": "bu", "24hr_change": "0.0270", "percent_change": "0.16"}}}
     try:
         reversed_dict1 = {value: key for key, value in dict1.items()}
         commodities_settings['symbols'] = [reversed_dict1[value] for value in commodities_settings['symbols']]
     except:
         pass
-    f.close()
+
     
     dict2 = {'BIST 100 - Istanbul': 'XU100.IS', 'SET - Bangkok': '^SET.BK', 'PSEI - Philippines': 'PSEI.PS', 'JKSE - Jakarta': '^JKSE',
         'TAIEX - Taiwan': '^TWII', 'HSI - Hong Kong': '^HSI', 'SENSEX - India': '^BSESN', 'NIFTY 50 - India': '^NSEI', 'Nikkei 225 - Japan': '^N225',
@@ -197,70 +213,115 @@ def index():
         'SSMI - Switzerland': '^SSMI', 'CAC 40 - France': '^FCHI', 'IBEX 35 - Spain': '^IBEX', 'FTSE 100 - UK': '^FTSE', 'Dax - Germany': '^GDAXI',
         'Bovespa - Brazil': '^BVSP', 'IPC - Mexico': '^MXX', 'S&P/TSX - Canada': '^GSPTSE', 'VIX - USA': '^VIX', 'Russell 2000 - USA': '^RUT',
         'Nasdaq Composite - USA': '^IXIC', 'Nasdaq 100 - USA': '^NDX', 'S&P 500 - USA': '^GSPC', 'Dow Jones - USA': '^DJI', 'U.S. Dollar (DXY) - USA': 'DX-Y.NYB'}
-    f = open('csv/indices_settings.json', 'r')
-    indices_settings = json.load(f)
+    try:
+        f = open('csv/indices_settings.json', 'r')
+        indices_settings = json.load(f)
+        f.close()
+    except:
+        indices_settings = {"feature": "Stocks", "speed": "fast", "speed2": "slow", "animation": "up", "percent": True, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"^HSI": {"name": "HSI", "current": "18083.06", "point_change": "1003.55", "percent_change": "5.88"}, "^GSPC": {"name": "S&P 500", "current": "3790.93", "point_change": "112.50", "percent_change": "3.06"}, "^RUT": {"name": "RUSSELL 2000", "current": "1775.77", "point_change": "66.90", "percent_change": "3.91"}, "^GDAXI": {"name": "DAX", "current": "12648.95", "point_change": "-21.53", "percent_change": "-0.17"}, "^FTSE": {"name": "FTSE 100", "current": "7058.68", "point_change": "-27.82", "percent_change": "-0.39"}, "^FCHI": {"name": "CAC 40", "current": "6031.45", "point_change": "-8.24", "percent_change": "-0.14"}, "399001.SZ": {"name": "SZSE", "current": "10778.61", "point_change": "-140.83", "percent_change": "-1.29"}, "^STOXX50E": {"name": "STOXX 50", "current": "3476.55", "point_change": "-7.93", "percent_change": "-0.23"}, "^AXJO": {"name": "ASX 200", "current": "6815.70", "point_change": "116.40", "percent_change": "1.74"}, "^DJI": {"name": "DOW JONES", "current": "30316.32", "point_change": "825.43", "percent_change": "2.80"}, "^STOXX": {"name": "STOXX 600", "current": "402.33", "point_change": "-0.70", "percent_change": "-0.17"}}}
     try:
         reversed_dict2 = {value: key for key, value in dict2.items()}
         indices_settings['symbols'] = [reversed_dict2[value] for value in indices_settings['symbols']]
     except:
         pass
-    f.close()
-    
-    f= open('csv/crypto_settings.json', 'r')
-    crypto_settings = json.load(f)
-    f.close()
-    
-    f= open('csv/movie_settings.json', 'r')
-    movie_settings = json.load(f)
-    f.close()    
 
-    f= open('csv/ipo_settings.json', 'r')
-    ipo_settings = json.load(f)
-    f.close()
+    try:
+        f= open('csv/crypto_settings.json', 'r')
+        crypto_settings = json.load(f)
+        f.close()
+    except:
+        crypto_settings = {"feature": "Stocks", "speed": "medium","speed2": "medium", "animation": "down", "percent": False, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"ETH,USD": {"current": "2629.32", "24hr_change": "-27.6432", "percent_change": "-1.04"}, "BTC,USD": {"current": "38161.00", "24hr_change": "-50.8386", "percent_change": "-0.13"}, "BNB,USD": {"current": "372.57", "24hr_change": "0.4140", "percent_change": "0.11"}, "ADA,BTC": {"current": "0.0000", "24hr_change": "-0.0000", "percent_change": "-3.74"}}}
     
-    f = open('csv/forex_settings.json', 'r')
-    forex_settings = json.load(f)
-    f.close()
+    try:
+        f= open('csv/movie_settings.json', 'r')
+        movie_settings = json.load(f)
+        f.close()
+    except:
+        movie_settings = {"feature": "Movies", "speed": "fast", "speed2": "fast", "animation": "continuous", "category": "Popular All", "title": True, "movies": [{"title": "Avatar: The Way of Water", "language": "EN", "votes": "8.1", "date": "2022-12-14", "media_type": "Movie", "genre": ["Sci-Fi", "Action", "Adventure"], "backdrop": "198vrF8k7mfQ4FjDJsBmdQcaiyq.jpg", "logo": "https://image.tmdb.org/t/p/w500/198vrF8k7mfQ4FjDJsBmdQcaiyq.jpg"}, {"title": "Violent Night", "language": "EN", "votes": "7.3", "date": "2022-11-30", "media_type": "Movie", "genre": ["Action", "Comedy", "Crime", "Thriller"], "backdrop": "g9Kb3RaLjsybI1jpqHQ3QZTCYpB.jpg", "logo": "https://image.tmdb.org/t/p/w500/g9Kb3RaLjsybI1jpqHQ3QZTCYpB.jpg"}, {"title": "Avatar", "language": "EN", "votes": "7.5", "date": "2009-12-15", "media_type": "Movie", "genre": ["Action", "Adventure", "Fantasy", "Sci-Fi"], "backdrop": "Yc9q6QuWrMp9nuDm5R8ExNqbEq.jpg", "logo": "https://image.tmdb.org/t/p/w500/Yc9q6QuWrMp9nuDm5R8ExNqbEq.jpg"}, {"title": "The Banshees of Inisherin", "language": "EN", "votes": "7.7", "date": "2022-10-21", "media_type": "Movie", "genre": ["Drama", "Comedy"], "backdrop": "9Md4CqzUGDtK5oEkRRvozLkGc9d.jpg", "logo": "https://image.tmdb.org/t/p/w500/9Md4CqzUGDtK5oEkRRvozLkGc9d.jpg"}, {"title": "Wednesday", "language": "EN", "votes": "8.8", "date": "2022-11-23", "media_type": "Tv", "genre": ["Sci-Fi & Fantasy", "Mystery", "Comedy"], "backdrop": "iHSwvRVsRyxpX7FE7GbviaDvgGZ.jpg", "logo": "https://image.tmdb.org/t/p/w500/iHSwvRVsRyxpX7FE7GbviaDvgGZ.jpg"}, {"title": "1923", "language": "EN", "votes": "8.8", "date": "2022-12-18", "media_type": "Tv", "genre": ["Drama", "Western"], "backdrop": "9I6LgZ5110ycg4pyobJxGTFWFCF.jpg", "logo": "https://image.tmdb.org/t/p/w500/9I6LgZ5110ycg4pyobJxGTFWFCF.jpg"}, {"title": "The Recruit", "language": "EN", "votes": "7.2", "date": "2022-12-16", "media_type": "Tv", "genre": ["Drama", "Crime"], "backdrop": "rey2eh6752C2UbGYRileKk1PVTo.jpg", "logo": "https://image.tmdb.org/t/p/w500/rey2eh6752C2UbGYRileKk1PVTo.jpg"}, {"title": "Black Adam", "language": "EN", "votes": "7.2", "date": "2022-10-19", "media_type": "Movie", "genre": ["Action", "Fantasy", "Sci-Fi"], "backdrop": "bQXAqRx2Fgc46uCVWgoPz5L5Dtr.jpg", "logo": "https://image.tmdb.org/t/p/w500/bQXAqRx2Fgc46uCVWgoPz5L5Dtr.jpg"}, {"title": "Nanny", "language": "EN", "votes": "5.4", "date": "2022-11-23", "media_type": "Movie", "genre": ["Horror", "Drama"], "backdrop": "nfuPlOK6ywGzKGb0yf7VJKyTFWb.jpg", "logo": "https://image.tmdb.org/t/p/w500/nfuPlOK6ywGzKGb0yf7VJKyTFWb.jpg"}, {"title": "Tom Clancys Jack Ryan", "language": "EN", "votes": "7.7", "date": "2018-08-30", "media_type": "Tv", "genre": ["Action & Adventure", "Drama", "War & Politics"], "backdrop": "6ovk8nrrSmN1ieT14zBAxcHbMU7.jpg", "logo": "https://image.tmdb.org/t/p/w500/6ovk8nrrSmN1ieT14zBAxcHbMU7.jpg"}, {"title": "High Heat", "language": "EN", "votes": "6.5", "date": "2022-12-16", "media_type": "Movie", "genre": ["Action", "Comedy", "Crime"], "backdrop": "gjNM0odqkq5F7V58OjfTxPJ9p9Z.jpg", "logo": "https://image.tmdb.org/t/p/w500/gjNM0odqkq5F7V58OjfTxPJ9p9Z.jpg"}, {"title": "A Not So Merry Christmas", "language": "ES", "votes": "4.8", "date": "2022-12-20", "media_type": "Movie", "genre": ["Comedy"], "backdrop": "8uyJzaiGbiezZ9K48Cy5wXeqnYw.jpg", "logo": "https://image.tmdb.org/t/p/w500/8uyJzaiGbiezZ9K48Cy5wXeqnYw.jpg"}, {"title": "Guillermo del Toros Pinocchio", "language": "EN", "votes": "8.5", "date": "2022-11-09", "media_type": "Movie", "genre": ["Animation", "Fantasy", "Drama"], "backdrop": "e782pDRAlu4BG0ahd777n8zfPzZ.jpg", "logo": "https://image.tmdb.org/t/p/w500/e782pDRAlu4BG0ahd777n8zfPzZ.jpg"}, {"title": "His Dark Materials", "language": "EN", "votes": "8.0", "date": "2019-11-03", "media_type": "Tv", "genre": ["Sci-Fi & Fantasy", "Drama"], "backdrop": "dGOhplPZTL0SKyb0ocTFBHIuKUC.jpg", "logo": "https://image.tmdb.org/t/p/w500/dGOhplPZTL0SKyb0ocTFBHIuKUC.jpg"}, {"title": "The Fabelmans", "language": "EN", "votes": "7.8", "date": "2022-11-11", "media_type": "Movie", "genre": ["Drama", "Comedy"], "backdrop": "6RCf9jzKxyjblYV4CseayK6bcJo.jpg", "logo": "https://image.tmdb.org/t/p/w500/6RCf9jzKxyjblYV4CseayK6bcJo.jpg"}, {"title": "The Seven Deadly Sins: Grudge of Edinburgh Part 1", "language": "JA", "votes": "7.8", "date": "2022-12-20", "media_type": "Movie", "genre": ["Animation", "Fantasy", "Adventure", "Action"], "backdrop": "24fe6ou97ammOg3O6ShCgaiolp4.jpg", "logo": "https://image.tmdb.org/t/p/w500/24fe6ou97ammOg3O6ShCgaiolp4.jpg"}, {"title": "Mindcage", "language": "EN", "votes": "7.6", "date": "2022-12-16", "media_type": "Movie", "genre": ["Mystery", "Thriller", "Crime", "Drama"], "backdrop": "An2M2gm0p8POaiGTcZvP1JnUItH.jpg", "logo": "https://image.tmdb.org/t/p/w500/An2M2gm0p8POaiGTcZvP1JnUItH.jpg"}, {"title": "Private Lesson", "language": "TR", "votes": "7.3", "date": "2022-12-16", "media_type": "Movie", "genre": ["Comedy", "Romance"], "backdrop": "uZtYhcnk3WWvUzQkJLqnNywMQpb.jpg", "logo": "https://image.tmdb.org/t/p/w500/uZtYhcnk3WWvUzQkJLqnNywMQpb.jpg"}, {"title": "Sonic Prime", "language": "EN", "votes": "8.7", "date": "2022-12-15", "media_type": "Tv", "genre": ["Animation", "Family"], "backdrop": "1Iiz2uLcZuLn4Khog2yiKpbl11.jpg", "logo": "https://image.tmdb.org/t/p/w500/1Iiz2uLcZuLn4Khog2yiKpbl11.jpg"}, {"title": "The Big 4", "language": "ID", "votes": "7.0", "date": "2022-12-19", "media_type": "Movie", "genre": ["Action", "Comedy", "Crime"], "backdrop": "clO1mWRYT24ogzN3o6LsqHjqrQu.jpg", "logo": "https://image.tmdb.org/t/p/w500/clO1mWRYT24ogzN3o6LsqHjqrQu.jpg"}]}
+
+    try:
+        f= open('csv/ipo_settings.json', 'r')
+        ipo_settings = json.load(f)
+        f.close()
+    except:
+        ipo_settings = {"feature": "IPO", "speed": "medium", "speed2": "medium", "animation": "down", "title": True, "symbols": ["No Data"]}
     
-    f = open('csv/current_weather.json', 'r')
-    current_weather= json.load(f)
-    f.close()
+    try:
+        f = open('csv/forex_settings.json', 'r')
+        forex_settings = json.load(f)
+        f.close()
+    except:
+        forex_settings = {"feature": "Stocks", "speed": "medium", "speed2": "medium", "animation": "down", "percent": False, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"EUR,USD": {"current": "1.1334", "24hr_change": "-0.0003", "percent_change": "0.00"}, "USD,JPY": {"current": "114.960", "24hr_change": "0.1600", "percent_change": "0.14"}, "GBP,USD": {"current": "1.3577", "24hr_change": "-0.0031", "percent_change": "-0.23"}, "USD,CHF": {"current": "0.9198", "24hr_change": "0.0029", "percent_change": "0.32"}}}
+
+    try:    
+        f = open('csv/current_weather.json', 'r')
+        current_weather = json.load(f)
+        f.close()
+    except:
+        current_weather = {"feature": "Current Weather", "speed": "medium", "animation": "down", "temp": "celsius", "wind_speed": "miles/hour", "colour": "white", "city_colour": "yellow", "title": True, "locations": {"Hong Kong": {"main_weather": "Clouds", "description": "overcast clouds", "temp": 30.4, "min_temp": 28.2, "max_temp": 30.8, "feels_like": 36.0, "humidity": 77, "clouds": 100, "visibility": 10000, "uv": 5.3, "rain_chance": 17, "wind_speed": 11.1, "wind_direction": 193, "is_day": 1}}, "current_weather": True, "speed2": "medium"}
     
-    f = open('csv/daily_weather.json', 'r')
-    daily_weather = json.load(f)
-    f.close()
+    try:
+        f = open('csv/daily_weather.json', 'r')
+        daily_weather = json.load(f)
+        f.close()
+    except:
+        daily_weather = {"feature": "Current Weather", "speed": "medium", "animation": "down", "temp": "celsius", "wind_speed": "miles/hour", "colour": "white", "city_colour": "yellow", "title": True, "locations": {"Hong Kong": [{"main_weather": "Thunderstorm", "description": "Slight or moderate", "min_temp": 28.2, "max_temp": 30.8, "temp": 30.4, "rain_chance": 17, "humidity": 77, "wind_speed": 11.1, "uv": 5.3, "clouds": 100, "wind_direction": 193, "visibility": 10000}, {"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 27.9, "max_temp": 32.3}, {"main_weather": "Thunderstorm", "description": "Slight or moderate", "min_temp": 27.7, "max_temp": 31.2}, {"main_weather": "Thunderstorm", "description": "Slight or moderate", "min_temp": 28.1, "max_temp": 31.5}, {"main_weather": "Rain", "description": "light intensity shower rain", "min_temp": 28.5, "max_temp": 31.1}, {"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 28.9, "max_temp": 31.5}, {"main_weather": "Clouds", "description": "scattered clouds", "min_temp": 29.0, "max_temp": 31.9}]}, "current_weather": False, "speed2": "medium"}
     
-    f = open('csv/news_settings.json', 'r')
-    news_settings = json.load(f)
-    f.close()
+    try:
+        f = open('csv/news_settings.json', 'r')
+        news_settings = json.load(f)
+        f.close()
+    except:
+        news_settings = {"feature": "News", "speed": "medium", "speed2": "medium", "animation": "down", "country": "US", "category": "General", "title": True, "headlines": [], "use_category": True, "use_country": False, "num_headlines": "10"}
+
+    try:    
+        f = open('csv/upcoming_games.json', 'r')
+        upcoming_games = json.load(f)
+        f.close()
+    except:
+        upcoming_games = {"feature": "Sports (Upcoming Games)", "speed": "medium", "speed2": "medium", "animation": "down", "title": True, "leagues": {"NFL": [{"date": "2021-11-22", "time": "01:20:00", "round": "11", "home_team": "Los Angeles Chargers", "home_score": "41", "away_team": "Pittsburgh Steelers", "away_score": "37"}]}}
     
-    f = open('csv/upcoming_games.json', 'r')
-    upcoming_games = json.load(f)
-    f.close()
+    try:
+        f = open('csv/live_games.json', 'r')
+        live_games = json.load(f)
+        f.close()
+    except:
+        live_games = {"feature": "Sports (Live Games)", "speed": "medium", "speed2": "medium", "animation": "down", "title": True, "leagues": {}}
     
-    f = open('csv/live_games.json', 'r')
-    live_games = json.load(f)
-    f.close()
+    try:
+        f = open('csv/past_games.json', 'r')
+        past_games = json.load(f)
+        f.close()
+    except:
+        past_games = {"feature": "Sports (Past Games)", "speed2": "medium", "speed": "medium", "animation": "down", "title": True, "leagues": {}}
     
-    f = open('csv/past_games.json', 'r')
-    past_games = json.load(f)
-    f.close()
+    try:
+        f = open('csv/league_tables.json', 'r')
+        team_stats = json.load(f)
+        f.close()
+    except:
+        team_stats = {"feature": "Sports (Team Stats)", "speed": "medium", "speed2": "medium","animation": "down", "title": True, "top20": 20, "leagues": {}}
     
-    f = open('csv/league_tables.json', 'r')
-    team_stats = json.load(f)
-    f.close()
+    try:
+        f = open('csv/image_settings.json', 'r')
+        image_settings = json.load(f)
+        f.close()
+    except:
+        image_settings = {"speed": "slow", "speed2": "medium","animation": "down", "title": True, "pause": "/", "images": []}
     
-    f = open('csv/image_settings.json', 'r')
-    image_settings = json.load(f)
-    f.close()
+    try:
+        f = open('csv/GIF_settings.json', 'r')
+        GIF_settings = json.load(f)
+        f.close()
+    except:
+        GIF_settings = {"speed": "medium", "speed2": "medium", "animation": "down", "title": True, "pause": "2", "images": []}
     
-    f = open('csv/GIF_settings.json', 'r')
-    GIF_settings = json.load(f)
-    f.close()
-    
-    f = open('csv/message_settings.json', 'r')
-    message_settings = json.load(f)
-    f.close()
+    try:
+        f = open('csv/message_settings.json', 'r')
+        message_settings = json.load(f)
+        f.close()
+    except:
+        message_settings = {"feature": "Custom Messages", "speed": "medium", "speed2": "medium", "animation": "down", "title": False, "messages": [{"name": "welcome", "text": "Welcome to Fintic!", "text_colour": "White", "size": "Large", "background_colour": "Black"}, {"name": "get_started", "text": "To get started, connect your device to the \"Fintic Hotspot\" and access \"fintic.local:1024\" on your web browser. You can connect your ticker to Wi-Fi there.", "text_colour": "White", "size": "Small", "background_colour": "Black"}]}
     
     f = open('csv/general_settings.json', 'r')
     general_settings = json.load(f)
@@ -335,8 +396,8 @@ def index():
         'ipo_api_key':ipo_api_key,
         'wifi_SSID':wifi_SSID,
         'wifi_PSK':wifi_PSK,
-	'scheduler_settings':scheduler_settings,
-	'economic_settings':economic_settings
+        'scheduler_settings':scheduler_settings,
+        'economic_settings':economic_settings
       }
       
 
@@ -448,19 +509,13 @@ def save_displaying(input_settings):
         all_settings = ['Stocks', 'Crypto', 'Forex', 'Commodities', 'Indices', 'Current Weather', 'News', 'Daily Forecast', 'Sports (Upcoming Games)',
                         'Sports (Past Games)', 'Sports (Team Stats)', 'Sports (Live Games)', 'Custom Messages', 'Custom Images', 'Movies', 'IPO Calendar', 'Economic Calendar']
         
-   
     positions = []
     display_settings = []
 
     if professional:
-        
         input_settings[0] = [i for i in input_settings[0] if i in all_settings]
         input_settings[1] = [i for i in input_settings[1] if i in all_settings]
    
-        
-    
-    
-    
     s = "Professional" if professional else "Standard"
     display_settings = [s] + [input_settings]
     with open('csv/display_settings.json', 'w') as f:
@@ -576,13 +631,9 @@ def save():
    
     global uploading
     
-    
     data = str(request.data.decode('utf-8'))
-    
-    
-    input_settings = json.loads(data)
-  
 
+    input_settings = json.loads(data)
   
     save_displaying(input_settings['displaying'])
     
@@ -605,8 +656,7 @@ def save():
         save_sports_settings(input_settings)
         
     elif feature in ['Custom GIFs', 'Custom Images']:
-        
-        
+
         images = request.files
         names = list(request.files.keys())
 
@@ -614,7 +664,6 @@ def save():
 
             images[name].save('user_uploads/' +name)
      
-        
         save_image_settings(input_settings)
         
     elif feature == 'Custom Messages':
@@ -622,6 +671,7 @@ def save():
         
     return index()
 
+
 # saves files uploaded to the webpage for images and GIFs
 @app.route("/upload", methods = ['PUT', 'POST', 'GET'])
 def upload():
@@ -1051,12 +1101,23 @@ def save_trade_settings(input_settings):
         'Nasdaq Composite - USA': '^IXIC', 'Nasdaq 100 - USA': '^NDX', 'S&P 500 - USA': '^GSPC', 'Dow Jones - USA': '^DJI', 'U.S. Dollar (DXY) - USA': 'DX-Y.NYB'
     }
 	
-    filename = input_settings['feature'].lower() + '_settings.json'
-    f = open('csv/' + filename, 'r')
-    current_settings = json.load(f)
+    try:
+        filename = input_settings['feature'].lower() + '_settings.json'
+        f = open('csv/' + filename, 'r')
+        current_settings = json.load(f)
+        f.close()
+    except:
+        if input_settings['feature'].lower() == 'stocks':
+            current_settings = {"feature": "Stocks", "speed": "medium", "speed2": "medium", "animation": "down", "percent": False, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"AAPL": {"current": "164.02", "change": "-1.59", "percent_change": "-0.97"}, "MSFT": {"current": "288.29", "change": "-1.32", "percent_change": "-0.46"}, "GOOG": {"current": "2586.74", "change": "-34.01", "percent_change": "-1.31"}, "NFLX": {"current": "380.52", "change": "-7.59", "percent_change": "-1.99"}}, "prepost": False}
+        elif input_settings['feature'].lower() == 'crypto':
+            current_settings = {"feature": "Stocks", "speed": "medium","speed2": "medium", "animation": "down", "percent": False, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"ETH,USD": {"current": "2629.32", "24hr_change": "-27.6432", "percent_change": "-1.04"}, "BTC,USD": {"current": "38161.00", "24hr_change": "-50.8386", "percent_change": "-0.13"}, "BNB,USD": {"current": "372.57", "24hr_change": "0.4140", "percent_change": "0.11"}, "ADA,BTC": {"current": "0.0000", "24hr_change": "-0.0000", "percent_change": "-3.74"}}}
+        elif input_settings['feature'].lower() == 'indices':
+            current_settings = {"feature": "Stocks", "speed": "fast", "speed2": "slow", "animation": "up", "percent": True, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"^HSI": {"name": "HSI", "current": "18083.06", "point_change": "1003.55", "percent_change": "5.88"}, "^GSPC": {"name": "S&P 500", "current": "3790.93", "point_change": "112.50", "percent_change": "3.06"}, "^RUT": {"name": "RUSSELL 2000", "current": "1775.77", "point_change": "66.90", "percent_change": "3.91"}, "^GDAXI": {"name": "DAX", "current": "12648.95", "point_change": "-21.53", "percent_change": "-0.17"}, "^FTSE": {"name": "FTSE 100", "current": "7058.68", "point_change": "-27.82", "percent_change": "-0.39"}, "^FCHI": {"name": "CAC 40", "current": "6031.45", "point_change": "-8.24", "percent_change": "-0.14"}, "399001.SZ": {"name": "SZSE", "current": "10778.61", "point_change": "-140.83", "percent_change": "-1.29"}, "^STOXX50E": {"name": "STOXX 50", "current": "3476.55", "point_change": "-7.93", "percent_change": "-0.23"}, "^AXJO": {"name": "ASX 200", "current": "6815.70", "point_change": "116.40", "percent_change": "1.74"}, "^DJI": {"name": "DOW JONES", "current": "30316.32", "point_change": "825.43", "percent_change": "2.80"}, "^STOXX": {"name": "STOXX 600", "current": "402.33", "point_change": "-0.70", "percent_change": "-0.17"}}}
+        elif input_settings['feature'].lower() == 'commodities':
+            current_settings = {"feature": "Stocks", "speed": "fast", "speed2": "fast", "animation": "down", "percent": True, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"BRENTOIL": {"current": "123.053", "unit": "bbl", "24hr_change": "1.0150", "percent_change": "0.83"}, "WTIOIL": {"current": "121.588", "unit": "bbl", "24hr_change": "0.8902", "percent_change": "0.74"}, "XAU": {"current": "1821.205", "unit": "oz", "24hr_change": "4.0045", "percent_change": "0.22"}, "XAG": {"current": "21.1034", "unit": "oz", "24hr_change": "-0.0550", "percent_change": "-0.26"}, "XCU": {"current": "0.2633", "unit": "oz", "24hr_change": "-0.0006", "percent_change": "-0.22"}, "NG": {"current": "8.6595", "unit": "mmbtu", "24hr_change": "-0.0236", "percent_change": "-0.27"}, "WHEAT": {"current": "393.123", "unit": "ton", "24hr_change": "-1.2642", "percent_change": "-0.32"}, "COTTON": {"current": "1.4494", "unit": "lb", "24hr_change": "0.0004", "percent_change": "0.03"}, "RICE": {"current": "16.3849", "unit": "cwt", "24hr_change": "0.0093", "percent_change": "0.06"}, "SUGAR": {"current": "0.1866", "unit": "lb", "24hr_change": "-0.0007", "percent_change": "-0.40"}, "COCOA": {"current": "2374.074", "unit": "ton", "24hr_change": "2.5206", "percent_change": "0.11"}, "LUMBER": {"current": "527.842", "unit": "oz", "24hr_change": "0.2641", "percent_change": "0.05"}, "SOYBEAN": {"current": "17.1621", "unit": "bu", "24hr_change": "0.0270", "percent_change": "0.16"}}}
+        elif input_settings['feature'].lower() == 'forex':
+            current_settings = {"feature": "Stocks", "speed": "medium", "speed2": "medium", "animation": "down", "percent": False, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"EUR,USD": {"current": "1.1334", "24hr_change": "-0.0003", "percent_change": "0.00"}, "USD,JPY": {"current": "114.960", "24hr_change": "0.1600", "percent_change": "0.14"}, "GBP,USD": {"current": "1.3577", "24hr_change": "-0.0031", "percent_change": "-0.23"}, "USD,CHF": {"current": "0.9198", "24hr_change": "0.0029", "percent_change": "0.32"}}}
 
-    f.close()
-    
     current_settings['speed'] = input_settings['speed'].lower()
     current_settings['speed2'] = input_settings['speed2'].lower()
     current_settings['animation'] = input_settings['animation'].lower()
@@ -1081,9 +1142,9 @@ def save_trade_settings(input_settings):
     
     current_settings = combine_dict(current_settings, input_settings['symbols'], 'symbols')
     
-    f = open('csv/' + filename, 'w')
-    json.dump(current_settings, f)
-    f.close()
+    with open('csv/' + filename, 'w') as f:
+        json.dump(current_settings,f)
+
     f = open('csv/last_updates.json', 'r')
     last_updates = json.load(f)
     f.close()
@@ -1092,9 +1153,7 @@ def save_trade_settings(input_settings):
         last_updates[input_settings['feature'].lower()]['force'] = True
         if input_settings['feature'] == 'Stocks':
             last_updates['prepost']['force'] = True
-        
-   
-        
+
     f = open('csv/last_updates.json', 'w')
     json.dump(last_updates, f)
     f.close()
@@ -1102,57 +1161,53 @@ def save_trade_settings(input_settings):
     
 def save_weather_settings(input_settings):
     
-
-   
-   
     filename = 'current_weather.json' if input_settings['feature'] == 'Current Weather' else 'daily_weather.json'
 
-    f = open('csv/' + filename, 'r')
-    current_settings = json.load(f)
-    f.close()
+    try:
+        f = open('csv/' + filename, 'r')
+        current_settings = json.load(f)
+        f.close()
+    except:
+        if input_settings['feature'] == 'Current Weather':
+            current_settings = {"feature": "Current Weather", "speed": "medium", "animation": "down", "temp": "celsius", "wind_speed": "miles/hour", "colour": "white", "city_colour": "yellow", "title": True, "locations": {"Hong Kong": {"main_weather": "Clouds", "description": "overcast clouds", "temp": 30.4, "min_temp": 28.2, "max_temp": 30.8, "feels_like": 36.0, "humidity": 77, "clouds": 100, "visibility": 10000, "uv": 5.3, "rain_chance": 17, "wind_speed": 11.1, "wind_direction": 193, "is_day": 1}}, "current_weather": True, "speed2": "medium"}
+        else:
+            current_settings = {"feature": "Current Weather", "speed": "medium", "animation": "down", "temp": "celsius", "wind_speed": "miles/hour", "colour": "white", "city_colour": "yellow", "title": True, "locations": {"Hong Kong": [{"main_weather": "Thunderstorm", "description": "Slight or moderate", "min_temp": 28.2, "max_temp": 30.8, "temp": 30.4, "rain_chance": 17, "humidity": 77, "wind_speed": 11.1, "uv": 5.3, "clouds": 100, "wind_direction": 193, "visibility": 10000}, {"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 27.9, "max_temp": 32.3}, {"main_weather": "Thunderstorm", "description": "Slight or moderate", "min_temp": 27.7, "max_temp": 31.2}, {"main_weather": "Thunderstorm", "description": "Slight or moderate", "min_temp": 28.1, "max_temp": 31.5}, {"main_weather": "Rain", "description": "light intensity shower rain", "min_temp": 28.5, "max_temp": 31.1}, {"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 28.9, "max_temp": 31.5}, {"main_weather": "Clouds", "description": "scattered clouds", "min_temp": 29.0, "max_temp": 31.9}]}, "current_weather": False, "speed2": "medium"}
     
     current_settings['speed'] = input_settings['speed'].lower()
     current_settings['speed2'] = input_settings['speed2'].lower()
     current_settings['animation'] = input_settings['animation'].lower()
     current_settings['temp'] = input_settings['temp'].lower()
     current_settings['wind_speed'] = input_settings['wind_speed'].lower()
-    
     current_settings['title'] = input_settings['title']
     
     if input_settings['feature'] == 'Daily Forecast':
         current_settings['current_weather'] = input_settings['current_weather']
-    
-    '''
-    locations = {}
-    for key in input_settings['locations']:
-        locations[key] = []
-    current_settings['locations'] = locations
-    '''
-    
+
     current_settings = combine_dict(current_settings, input_settings['locations'], 'locations')
-    f = open('csv/' + filename, 'w+')
-    json.dump(current_settings, f)
-    f.close()
     
-    #api_caller.sendline('w')
+    with open('csv/' + filename, 'w+') as f:
+        json.dump(current_settings,f)
+
     f = open('csv/last_updates.json', 'r')
     last_updates = json.load(f)
     f.close()
     if any([current_settings['locations'][k] == [] for k in input_settings['locations']]):
-        
         last_updates['weather']['force'] = True
         
     f = open('csv/last_updates.json', 'w')
     json.dump(last_updates, f)
     f.close()
     
-def save_news_settings(input_settings):
-    filename = 'news_settings.json' 
-    f = open('csv/' + filename, 'r')
-    current_settings = json.load(f)
-    f.close()
-    
 
+def save_news_settings(input_settings):
+
+    filename = 'news_settings.json' 
+    try:
+        f = open('csv/' + filename, 'r')
+        current_settings = json.load(f)
+        f.close()
+    except:
+        current_settings = {"feature": "News", "speed": "medium", "speed2": "medium", "animation": "down", "country": "US", "category": "General", "title": True, "headlines": [], "use_category": True, "use_country": False, "num_headlines": "10"}
     
     current_settings['speed'] = input_settings['speed'].lower()
     current_settings['speed2'] = input_settings['speed2'].lower()
@@ -1164,13 +1219,9 @@ def save_news_settings(input_settings):
     current_settings['use_country'] = input_settings['use_country']
     current_settings['num_headlines'] = input_settings['num_headlines']
     
-    
-   
- 
-    f = open('csv/' + filename, 'w')
-    json.dump(current_settings, f)
-    f.close()
-    #api_caller.sendline('n')
+    with open('csv/' + filename, 'w') as f:
+        json.dump(current_settings,f)
+
     f = open('csv/last_updates.json', 'r')
     last_updates = json.load(f)
     f.close()
@@ -1184,23 +1235,22 @@ def save_news_settings(input_settings):
     
 def save_movie_settings(input_settings):
     filename = 'movie_settings.json' 
-    f = open('csv/' + filename, 'r')
-    current_settings = json.load(f)
-    f.close()
-    
-
+    try:
+        f = open('csv/' + filename, 'r')
+        current_settings = json.load(f)
+        f.close()
+    except:
+        current_settings = {"feature": "Movies", "speed": "fast", "speed2": "fast", "animation": "continuous", "category": "Popular All", "title": True, "movies": [{"title": "Avatar: The Way of Water", "language": "EN", "votes": "8.1", "date": "2022-12-14", "media_type": "Movie", "genre": ["Sci-Fi", "Action", "Adventure"], "backdrop": "198vrF8k7mfQ4FjDJsBmdQcaiyq.jpg", "logo": "https://image.tmdb.org/t/p/w500/198vrF8k7mfQ4FjDJsBmdQcaiyq.jpg"}, {"title": "Violent Night", "language": "EN", "votes": "7.3", "date": "2022-11-30", "media_type": "Movie", "genre": ["Action", "Comedy", "Crime", "Thriller"], "backdrop": "g9Kb3RaLjsybI1jpqHQ3QZTCYpB.jpg", "logo": "https://image.tmdb.org/t/p/w500/g9Kb3RaLjsybI1jpqHQ3QZTCYpB.jpg"}, {"title": "Avatar", "language": "EN", "votes": "7.5", "date": "2009-12-15", "media_type": "Movie", "genre": ["Action", "Adventure", "Fantasy", "Sci-Fi"], "backdrop": "Yc9q6QuWrMp9nuDm5R8ExNqbEq.jpg", "logo": "https://image.tmdb.org/t/p/w500/Yc9q6QuWrMp9nuDm5R8ExNqbEq.jpg"}, {"title": "The Banshees of Inisherin", "language": "EN", "votes": "7.7", "date": "2022-10-21", "media_type": "Movie", "genre": ["Drama", "Comedy"], "backdrop": "9Md4CqzUGDtK5oEkRRvozLkGc9d.jpg", "logo": "https://image.tmdb.org/t/p/w500/9Md4CqzUGDtK5oEkRRvozLkGc9d.jpg"}, {"title": "Wednesday", "language": "EN", "votes": "8.8", "date": "2022-11-23", "media_type": "Tv", "genre": ["Sci-Fi & Fantasy", "Mystery", "Comedy"], "backdrop": "iHSwvRVsRyxpX7FE7GbviaDvgGZ.jpg", "logo": "https://image.tmdb.org/t/p/w500/iHSwvRVsRyxpX7FE7GbviaDvgGZ.jpg"}, {"title": "1923", "language": "EN", "votes": "8.8", "date": "2022-12-18", "media_type": "Tv", "genre": ["Drama", "Western"], "backdrop": "9I6LgZ5110ycg4pyobJxGTFWFCF.jpg", "logo": "https://image.tmdb.org/t/p/w500/9I6LgZ5110ycg4pyobJxGTFWFCF.jpg"}, {"title": "The Recruit", "language": "EN", "votes": "7.2", "date": "2022-12-16", "media_type": "Tv", "genre": ["Drama", "Crime"], "backdrop": "rey2eh6752C2UbGYRileKk1PVTo.jpg", "logo": "https://image.tmdb.org/t/p/w500/rey2eh6752C2UbGYRileKk1PVTo.jpg"}, {"title": "Black Adam", "language": "EN", "votes": "7.2", "date": "2022-10-19", "media_type": "Movie", "genre": ["Action", "Fantasy", "Sci-Fi"], "backdrop": "bQXAqRx2Fgc46uCVWgoPz5L5Dtr.jpg", "logo": "https://image.tmdb.org/t/p/w500/bQXAqRx2Fgc46uCVWgoPz5L5Dtr.jpg"}, {"title": "Nanny", "language": "EN", "votes": "5.4", "date": "2022-11-23", "media_type": "Movie", "genre": ["Horror", "Drama"], "backdrop": "nfuPlOK6ywGzKGb0yf7VJKyTFWb.jpg", "logo": "https://image.tmdb.org/t/p/w500/nfuPlOK6ywGzKGb0yf7VJKyTFWb.jpg"}, {"title": "Tom Clancys Jack Ryan", "language": "EN", "votes": "7.7", "date": "2018-08-30", "media_type": "Tv", "genre": ["Action & Adventure", "Drama", "War & Politics"], "backdrop": "6ovk8nrrSmN1ieT14zBAxcHbMU7.jpg", "logo": "https://image.tmdb.org/t/p/w500/6ovk8nrrSmN1ieT14zBAxcHbMU7.jpg"}, {"title": "High Heat", "language": "EN", "votes": "6.5", "date": "2022-12-16", "media_type": "Movie", "genre": ["Action", "Comedy", "Crime"], "backdrop": "gjNM0odqkq5F7V58OjfTxPJ9p9Z.jpg", "logo": "https://image.tmdb.org/t/p/w500/gjNM0odqkq5F7V58OjfTxPJ9p9Z.jpg"}, {"title": "A Not So Merry Christmas", "language": "ES", "votes": "4.8", "date": "2022-12-20", "media_type": "Movie", "genre": ["Comedy"], "backdrop": "8uyJzaiGbiezZ9K48Cy5wXeqnYw.jpg", "logo": "https://image.tmdb.org/t/p/w500/8uyJzaiGbiezZ9K48Cy5wXeqnYw.jpg"}, {"title": "Guillermo del Toros Pinocchio", "language": "EN", "votes": "8.5", "date": "2022-11-09", "media_type": "Movie", "genre": ["Animation", "Fantasy", "Drama"], "backdrop": "e782pDRAlu4BG0ahd777n8zfPzZ.jpg", "logo": "https://image.tmdb.org/t/p/w500/e782pDRAlu4BG0ahd777n8zfPzZ.jpg"}, {"title": "His Dark Materials", "language": "EN", "votes": "8.0", "date": "2019-11-03", "media_type": "Tv", "genre": ["Sci-Fi & Fantasy", "Drama"], "backdrop": "dGOhplPZTL0SKyb0ocTFBHIuKUC.jpg", "logo": "https://image.tmdb.org/t/p/w500/dGOhplPZTL0SKyb0ocTFBHIuKUC.jpg"}, {"title": "The Fabelmans", "language": "EN", "votes": "7.8", "date": "2022-11-11", "media_type": "Movie", "genre": ["Drama", "Comedy"], "backdrop": "6RCf9jzKxyjblYV4CseayK6bcJo.jpg", "logo": "https://image.tmdb.org/t/p/w500/6RCf9jzKxyjblYV4CseayK6bcJo.jpg"}, {"title": "The Seven Deadly Sins: Grudge of Edinburgh Part 1", "language": "JA", "votes": "7.8", "date": "2022-12-20", "media_type": "Movie", "genre": ["Animation", "Fantasy", "Adventure", "Action"], "backdrop": "24fe6ou97ammOg3O6ShCgaiolp4.jpg", "logo": "https://image.tmdb.org/t/p/w500/24fe6ou97ammOg3O6ShCgaiolp4.jpg"}, {"title": "Mindcage", "language": "EN", "votes": "7.6", "date": "2022-12-16", "media_type": "Movie", "genre": ["Mystery", "Thriller", "Crime", "Drama"], "backdrop": "An2M2gm0p8POaiGTcZvP1JnUItH.jpg", "logo": "https://image.tmdb.org/t/p/w500/An2M2gm0p8POaiGTcZvP1JnUItH.jpg"}, {"title": "Private Lesson", "language": "TR", "votes": "7.3", "date": "2022-12-16", "media_type": "Movie", "genre": ["Comedy", "Romance"], "backdrop": "uZtYhcnk3WWvUzQkJLqnNywMQpb.jpg", "logo": "https://image.tmdb.org/t/p/w500/uZtYhcnk3WWvUzQkJLqnNywMQpb.jpg"}, {"title": "Sonic Prime", "language": "EN", "votes": "8.7", "date": "2022-12-15", "media_type": "Tv", "genre": ["Animation", "Family"], "backdrop": "1Iiz2uLcZuLn4Khog2yiKpbl11.jpg", "logo": "https://image.tmdb.org/t/p/w500/1Iiz2uLcZuLn4Khog2yiKpbl11.jpg"}, {"title": "The Big 4", "language": "ID", "votes": "7.0", "date": "2022-12-19", "media_type": "Movie", "genre": ["Action", "Comedy", "Crime"], "backdrop": "clO1mWRYT24ogzN3o6LsqHjqrQu.jpg", "logo": "https://image.tmdb.org/t/p/w500/clO1mWRYT24ogzN3o6LsqHjqrQu.jpg"}]}
     
     current_settings['speed'] = input_settings['speed'].lower()
     current_settings['speed2'] = input_settings['speed2'].lower()
     current_settings['animation'] = input_settings['animation'].lower()
     current_settings['title'] = input_settings['title']
     current_settings['category'] = input_settings['category']
-        
  
-    f = open('csv/' + filename, 'w')
-    json.dump(current_settings, f)
-    f.close()
-    #api_caller.sendline('n')
+    with open('csv/' + filename, 'w') as f:
+        json.dump(current_settings, f)
+
     f = open('csv/last_updates.json', 'r')
     last_updates = json.load(f)
     f.close()
@@ -1214,19 +1264,21 @@ def save_movie_settings(input_settings):
 
 def save_ipo_settings(input_settings):
     filename = 'ipo_settings.json' 
-    f = open('csv/' + filename, 'r')
-    current_settings = json.load(f)
-    f.close()
+    try:
+        f = open('csv/' + filename, 'r')
+        current_settings = json.load(f)
+        f.close()
+    except:
+        current_settings = {"feature": "IPO", "speed": "medium", "speed2": "medium", "animation": "down", "title": True, "symbols": ["No Data"]}
     
     current_settings['speed'] = input_settings['speed'].lower()
     current_settings['speed2'] = input_settings['speed2'].lower()
     current_settings['animation'] = input_settings['animation'].lower()
     current_settings['title'] = input_settings['title']
- 
-    f = open('csv/' + filename, 'w')
-    json.dump(current_settings, f)
-    f.close()
-    #api_caller.sendline('n')
+
+    with open('csv/' + filename, 'w') as f:
+        json.dump(current_settings,f)
+
     f = open('csv/last_updates.json', 'r')
     last_updates = json.load(f)
     f.close()
@@ -1261,7 +1313,7 @@ def save_economic_settings(input_settings):
         f.close()
     except:
         with open('csv/economic_settings.json', 'w') as f:
-            json.dump(all_economic_settings, f)
+            json.dump(current_settings, f)
 	
     f = open('csv/last_updates.json', 'r')
     last_updates = json.load(f)
@@ -1291,9 +1343,19 @@ def save_sports_settings(input_settings):
         filename = 'league_tables.json'
         update_key = 'sports_t'
     
-    f = open('csv/' + filename, 'r')
-    current_settings = json.load(f)
-    f.close()
+    try:
+        f = open('csv/' + filename, 'r')
+        current_settings = json.load(f)
+        f.close()
+    except:
+        if feature == 'Sports (Upcoming Games)':
+            current_settings = {"feature": "Sports (Upcoming Games)", "speed": "medium", "speed2": "medium", "animation": "down", "title": True, "leagues": {"NFL": [{"date": "2021-11-22", "time": "01:20:00", "round": "11", "home_team": "Los Angeles Chargers", "home_score": "41", "away_team": "Pittsburgh Steelers", "away_score": "37"}]}}
+        elif feature == 'Sports (Past Games)':
+            current_settings = {"feature": "Sports (Past Games)", "speed2": "medium", "speed": "medium", "animation": "down", "title": True, "leagues": {}}
+        elif feature == 'Sports (Live Games)':
+            current_settings = {"feature": "Sports (Live Games)", "speed": "medium", "speed2": "medium", "animation": "down", "title": True, "leagues": {}}
+        elif feature == 'Sports (Team Stats)':
+            current_settings = {"feature": "Sports (Team Stats)", "speed": "medium", "speed2": "medium","animation": "down", "title": True, "top20": 20, "leagues": {}}
     
     current_settings['speed'] = input_settings['speed'].lower()
     current_settings['speed2'] = input_settings['speed2'].lower()
@@ -1303,23 +1365,21 @@ def save_sports_settings(input_settings):
     
     current_settings = combine_dict(current_settings, input_settings['leagues'], 'leagues')
     
-    f = open('csv/' + filename, 'w')
-    json.dump(current_settings, f)
-    f.close()
-    
-    #api_caller.sendline('S')
+    with open('csv/' + filename, 'w') as f:
+        json.dump(current_settings,f)
+
     f = open('csv/last_updates.json', 'r')
     last_updates = json.load(f)
     f.close()
     
     if any([current_settings['leagues'][k] == [] for k in input_settings['leagues']]):
-        
         last_updates[update_key]['force'] = True
         
     f = open('csv/last_updates.json', 'w')
     json.dump(last_updates, f)
     f.close()
     
+
 # for images and GIFs
 def save_image_settings(input_settings):
     filename = 'image_settings.json' if input_settings['feature'] == 'Custom Images' else 'GIF_settings.json' 
@@ -1330,34 +1390,33 @@ def save_image_settings(input_settings):
     current_settings['speed2'] = input_settings['speed2'].lower()
     current_settings['animation'] = input_settings['animation'].lower()
     
-    
     del current_settings['feature']
-    f = open('csv/' + filename, 'w')
-    json.dump(current_settings, f)
-    f.close()
+
+    with open('csv/' + filename, 'w') as f:
+        json.dump(current_settings,f)
+
     remove_old_uploads()
 
 
 def save_message_settings(input_settings):
-    
-    f = open('csv/message_settings.json', 'r')
-    current_settings = json.load(f)
-    f.close()
+    try:
+        f = open('csv/message_settings.json', 'r')
+        current_settings = json.load(f)
+        f.close()
+    except:
+        current_settings = {"feature": "Custom Messages", "speed": "medium", "speed2": "medium", "animation": "down", "title": False, "messages": [{"name": "welcome", "text": "Welcome to Fintic!", "text_colour": "White", "size": "Large", "background_colour": "Black"}, {"name": "get_started", "text": "To get started, connect your device to the \"Fintic Hotspot\" and access \"fintic.local:1024\" on your web browser. You can connect your ticker to Wi-Fi there.", "text_colour": "White", "size": "Small", "background_colour": "Black"}]}
+
     new_settings = copy.deepcopy(input_settings)
 
     for i,IS in enumerate(input_settings['messages']):
-        
         # check if this is in current_settings
         for CS in current_settings['messages']:
             if IS['name'] == CS['name']:
                 new_settings['messages'][i] = CS
-             
                 break
-                
-    f = open('csv/message_settings.json', 'w')
-    json.dump(new_settings, f)
-    f.close()
-    
+
+    with open('csv/message_settings.json', 'w') as f:
+        json.dump(new_settings,f)
 
 
 @app.route("/shutdown")

From 6793301249a6db95e12006b480b94dc123a9520d Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 4 Jul 2023 19:31:18 +0800
Subject: [PATCH 56/57] try except statements to prevent internal server errors

---
 database_caller.py | 220 +++++++++++++++++++++++----------------------
 1 file changed, 112 insertions(+), 108 deletions(-)

diff --git a/database_caller.py b/database_caller.py
index 8256ada..5013dd1 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -149,9 +149,13 @@ def getCookiesnCrumb():
 def updateStocks(api_key, logf):
    
     try:
-        f = open('csv/stocks_settings.json', 'r')
-        all_stocks_settings = json.load(f)
-        f.close()
+        try:
+            f = open('csv/stocks_settings.json', 'r')
+            all_stocks_settings = json.load(f)
+            f.close()
+        except:
+            all_stocks_settings = {"feature": "Stocks", "speed": "medium", "speed2": "medium", "animation": "down", "percent": False, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"AAPL": {"current": "164.02", "change": "-1.59", "percent_change": "-0.97"}, "MSFT": {"current": "288.29", "change": "-1.32", "percent_change": "-0.46"}, "GOOG": {"current": "2586.74", "change": "-34.01", "percent_change": "-1.31"}, "NFLX": {"current": "380.52", "change": "-7.59", "percent_change": "-1.99"}}, "prepost": False}
+
         stock_info = all_stocks_settings['symbols']
         symbols = list(stock_info.keys())
      
@@ -175,9 +179,8 @@ def updateStocks(api_key, logf):
                     stock_info[data[symbol]['quote']['symbol']] = {'current': data[symbol]['quote']['latestPrice'], 'change': data[symbol]['quote']['change'], 'percent_change':data[symbol]['quote']['changePercent'] * 100}
  
                 all_stocks_settings['symbols'] = stock_info
-                f = open('csv/stocks_settings.json', 'w+')
-                json.dump(all_stocks_settings, f)
-                f.close()
+                with open('csv/stocks_settings.json', 'w+') as f:
+                    json.dump(all_stocks_settings, f)
 
         elif 'query1.finance.yahoo.com/v7' in url:
             response = requests.get(url, headers=headers)
@@ -212,9 +215,8 @@ def updateStocks(api_key, logf):
                             stock_info[stock['symbol']] = {'current': stock['regularMarketPrice'], 'change': stock['regularMarketChange'], 'percent_change':stock['regularMarketChangePercent']}
 
                 all_stocks_settings['symbols'] = stock_info
-                f = open('csv/stocks_settings.json', 'w+')
-                json.dump(all_stocks_settings, f)
-                f.close()
+                with open('csv/stocks_settings.json', 'w+') as f:
+                    json.dump(all_stocks_settings, f)
     except:
         pass
         #logf = open('log.txt', "a")
@@ -311,10 +313,12 @@ def updateStocksPrePost(api_key, logf):
 def updateCommodities(api_key, logf):
  
     try:
-              
-        f = open('csv/commodities_settings.json', 'r')
-        all_commodities_settings = json.load(f)
-        f.close()
+        try:
+            f = open('csv/commodities_settings.json', 'r')
+            all_commodities_settings = json.load(f)
+            f.close()
+        except:
+            all_commodities_settings = {"feature": "Stocks", "speed": "fast", "speed2": "fast", "animation": "down", "percent": True, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"BRENTOIL": {"current": "123.053", "unit": "bbl", "24hr_change": "1.0150", "percent_change": "0.83"}, "WTIOIL": {"current": "121.588", "unit": "bbl", "24hr_change": "0.8902", "percent_change": "0.74"}, "XAU": {"current": "1821.205", "unit": "oz", "24hr_change": "4.0045", "percent_change": "0.22"}, "XAG": {"current": "21.1034", "unit": "oz", "24hr_change": "-0.0550", "percent_change": "-0.26"}, "XCU": {"current": "0.2633", "unit": "oz", "24hr_change": "-0.0006", "percent_change": "-0.22"}, "NG": {"current": "8.6595", "unit": "mmbtu", "24hr_change": "-0.0236", "percent_change": "-0.27"}, "WHEAT": {"current": "393.123", "unit": "ton", "24hr_change": "-1.2642", "percent_change": "-0.32"}, "COTTON": {"current": "1.4494", "unit": "lb", "24hr_change": "0.0004", "percent_change": "0.03"}, "RICE": {"current": "16.3849", "unit": "cwt", "24hr_change": "0.0093", "percent_change": "0.06"}, "SUGAR": {"current": "0.1866", "unit": "lb", "24hr_change": "-0.0007", "percent_change": "-0.40"}, "COCOA": {"current": "2374.074", "unit": "ton", "24hr_change": "2.5206", "percent_change": "0.11"}, "LUMBER": {"current": "527.842", "unit": "oz", "24hr_change": "0.2641", "percent_change": "0.05"}, "SOYBEAN": {"current": "17.1621", "unit": "bu", "24hr_change": "0.0270", "percent_change": "0.16"}}}
         
         commodity_info = all_commodities_settings['symbols']
         symbols = list(commodity_info.keys())        
@@ -337,9 +341,9 @@ def updateCommodities(api_key, logf):
                         commodity_info[commodity['symbol']] = {'current': commodity['price'], 'unit': commodity['unit'], '24hr_change': commodity['price_over_24hr'], 'percent_change': commodity['percent_over_24hr']}
                    
             all_commodities_settings['symbols'] = commodity_info
-            f = open('csv/commodities_settings.json', 'w+')
-            json.dump(all_commodities_settings, f)
-            f.close()
+
+            with open('csv/commodities_settings.json', 'w+') as f:
+                json.dump(all_commodities_settings, f)
         
     except:
         pass
@@ -366,10 +370,12 @@ def human_format(num):
     
 def updateMovies(api_key, logf):
 
-    f = open('csv/movie_settings.json', 'r')
-    all_settings = json.load(f)
-    f.close()
-
+    try:
+        f = open('csv/movie_settings.json', 'r')
+        all_settings = json.load(f)
+        f.close()
+    except:
+        all_settings = {"feature": "Movies", "speed": "fast", "speed2": "fast", "animation": "continuous", "category": "Popular All", "title": True, "movies": [{"title": "Avatar: The Way of Water", "language": "EN", "votes": "8.1", "date": "2022-12-14", "media_type": "Movie", "genre": ["Sci-Fi", "Action", "Adventure"], "backdrop": "198vrF8k7mfQ4FjDJsBmdQcaiyq.jpg", "logo": "https://image.tmdb.org/t/p/w500/198vrF8k7mfQ4FjDJsBmdQcaiyq.jpg"}, {"title": "Violent Night", "language": "EN", "votes": "7.3", "date": "2022-11-30", "media_type": "Movie", "genre": ["Action", "Comedy", "Crime", "Thriller"], "backdrop": "g9Kb3RaLjsybI1jpqHQ3QZTCYpB.jpg", "logo": "https://image.tmdb.org/t/p/w500/g9Kb3RaLjsybI1jpqHQ3QZTCYpB.jpg"}, {"title": "Avatar", "language": "EN", "votes": "7.5", "date": "2009-12-15", "media_type": "Movie", "genre": ["Action", "Adventure", "Fantasy", "Sci-Fi"], "backdrop": "Yc9q6QuWrMp9nuDm5R8ExNqbEq.jpg", "logo": "https://image.tmdb.org/t/p/w500/Yc9q6QuWrMp9nuDm5R8ExNqbEq.jpg"}, {"title": "The Banshees of Inisherin", "language": "EN", "votes": "7.7", "date": "2022-10-21", "media_type": "Movie", "genre": ["Drama", "Comedy"], "backdrop": "9Md4CqzUGDtK5oEkRRvozLkGc9d.jpg", "logo": "https://image.tmdb.org/t/p/w500/9Md4CqzUGDtK5oEkRRvozLkGc9d.jpg"}, {"title": "Wednesday", "language": "EN", "votes": "8.8", "date": "2022-11-23", "media_type": "Tv", "genre": ["Sci-Fi & Fantasy", "Mystery", "Comedy"], "backdrop": "iHSwvRVsRyxpX7FE7GbviaDvgGZ.jpg", "logo": "https://image.tmdb.org/t/p/w500/iHSwvRVsRyxpX7FE7GbviaDvgGZ.jpg"}, {"title": "1923", "language": "EN", "votes": "8.8", "date": "2022-12-18", "media_type": "Tv", "genre": ["Drama", "Western"], "backdrop": "9I6LgZ5110ycg4pyobJxGTFWFCF.jpg", "logo": "https://image.tmdb.org/t/p/w500/9I6LgZ5110ycg4pyobJxGTFWFCF.jpg"}, {"title": "The Recruit", "language": "EN", "votes": "7.2", "date": "2022-12-16", "media_type": "Tv", "genre": ["Drama", "Crime"], "backdrop": "rey2eh6752C2UbGYRileKk1PVTo.jpg", "logo": "https://image.tmdb.org/t/p/w500/rey2eh6752C2UbGYRileKk1PVTo.jpg"}, {"title": "Black Adam", "language": "EN", "votes": "7.2", "date": "2022-10-19", "media_type": "Movie", "genre": ["Action", "Fantasy", "Sci-Fi"], "backdrop": "bQXAqRx2Fgc46uCVWgoPz5L5Dtr.jpg", "logo": "https://image.tmdb.org/t/p/w500/bQXAqRx2Fgc46uCVWgoPz5L5Dtr.jpg"}, {"title": "Nanny", "language": "EN", "votes": "5.4", "date": "2022-11-23", "media_type": "Movie", "genre": ["Horror", "Drama"], "backdrop": "nfuPlOK6ywGzKGb0yf7VJKyTFWb.jpg", "logo": "https://image.tmdb.org/t/p/w500/nfuPlOK6ywGzKGb0yf7VJKyTFWb.jpg"}, {"title": "Tom Clancys Jack Ryan", "language": "EN", "votes": "7.7", "date": "2018-08-30", "media_type": "Tv", "genre": ["Action & Adventure", "Drama", "War & Politics"], "backdrop": "6ovk8nrrSmN1ieT14zBAxcHbMU7.jpg", "logo": "https://image.tmdb.org/t/p/w500/6ovk8nrrSmN1ieT14zBAxcHbMU7.jpg"}, {"title": "High Heat", "language": "EN", "votes": "6.5", "date": "2022-12-16", "media_type": "Movie", "genre": ["Action", "Comedy", "Crime"], "backdrop": "gjNM0odqkq5F7V58OjfTxPJ9p9Z.jpg", "logo": "https://image.tmdb.org/t/p/w500/gjNM0odqkq5F7V58OjfTxPJ9p9Z.jpg"}, {"title": "A Not So Merry Christmas", "language": "ES", "votes": "4.8", "date": "2022-12-20", "media_type": "Movie", "genre": ["Comedy"], "backdrop": "8uyJzaiGbiezZ9K48Cy5wXeqnYw.jpg", "logo": "https://image.tmdb.org/t/p/w500/8uyJzaiGbiezZ9K48Cy5wXeqnYw.jpg"}, {"title": "Guillermo del Toros Pinocchio", "language": "EN", "votes": "8.5", "date": "2022-11-09", "media_type": "Movie", "genre": ["Animation", "Fantasy", "Drama"], "backdrop": "e782pDRAlu4BG0ahd777n8zfPzZ.jpg", "logo": "https://image.tmdb.org/t/p/w500/e782pDRAlu4BG0ahd777n8zfPzZ.jpg"}, {"title": "His Dark Materials", "language": "EN", "votes": "8.0", "date": "2019-11-03", "media_type": "Tv", "genre": ["Sci-Fi & Fantasy", "Drama"], "backdrop": "dGOhplPZTL0SKyb0ocTFBHIuKUC.jpg", "logo": "https://image.tmdb.org/t/p/w500/dGOhplPZTL0SKyb0ocTFBHIuKUC.jpg"}, {"title": "The Fabelmans", "language": "EN", "votes": "7.8", "date": "2022-11-11", "media_type": "Movie", "genre": ["Drama", "Comedy"], "backdrop": "6RCf9jzKxyjblYV4CseayK6bcJo.jpg", "logo": "https://image.tmdb.org/t/p/w500/6RCf9jzKxyjblYV4CseayK6bcJo.jpg"}, {"title": "The Seven Deadly Sins: Grudge of Edinburgh Part 1", "language": "JA", "votes": "7.8", "date": "2022-12-20", "media_type": "Movie", "genre": ["Animation", "Fantasy", "Adventure", "Action"], "backdrop": "24fe6ou97ammOg3O6ShCgaiolp4.jpg", "logo": "https://image.tmdb.org/t/p/w500/24fe6ou97ammOg3O6ShCgaiolp4.jpg"}, {"title": "Mindcage", "language": "EN", "votes": "7.6", "date": "2022-12-16", "media_type": "Movie", "genre": ["Mystery", "Thriller", "Crime", "Drama"], "backdrop": "An2M2gm0p8POaiGTcZvP1JnUItH.jpg", "logo": "https://image.tmdb.org/t/p/w500/An2M2gm0p8POaiGTcZvP1JnUItH.jpg"}, {"title": "Private Lesson", "language": "TR", "votes": "7.3", "date": "2022-12-16", "media_type": "Movie", "genre": ["Comedy", "Romance"], "backdrop": "uZtYhcnk3WWvUzQkJLqnNywMQpb.jpg", "logo": "https://image.tmdb.org/t/p/w500/uZtYhcnk3WWvUzQkJLqnNywMQpb.jpg"}, {"title": "Sonic Prime", "language": "EN", "votes": "8.7", "date": "2022-12-15", "media_type": "Tv", "genre": ["Animation", "Family"], "backdrop": "1Iiz2uLcZuLn4Khog2yiKpbl11.jpg", "logo": "https://image.tmdb.org/t/p/w500/1Iiz2uLcZuLn4Khog2yiKpbl11.jpg"}, {"title": "The Big 4", "language": "ID", "votes": "7.0", "date": "2022-12-19", "media_type": "Movie", "genre": ["Action", "Comedy", "Crime"], "backdrop": "clO1mWRYT24ogzN3o6LsqHjqrQu.jpg", "logo": "https://image.tmdb.org/t/p/w500/clO1mWRYT24ogzN3o6LsqHjqrQu.jpg"}]}
 
     if all_settings['category'] == 'Popular Movies':
         url = 'https://api.themoviedb.org/3/trending/movie/day?'
@@ -483,9 +489,8 @@ def updateMovies(api_key, logf):
 
     all_settings['movies'] = this_out
 
-    f = open('csv/movie_settings.json', 'w+')
-    json.dump(all_settings, f)
-    f.close()
+    with open('csv/movie_settings.json', 'w+') as f:
+        json.dump(all_settings, f)
  
 
 def updateIpo(api_key, logf):
@@ -501,9 +506,12 @@ def updateIpo(api_key, logf):
 
     ipo_url = 'https://finnhub.io/api/v1/calendar/ipo?from='+start_date+'&to='+end_date+'&token='+api_key
 
-    f = open('csv/ipo_settings.json', 'r')
-    ipo_settings = json.load(f)
-    f.close()
+    try:
+        f = open('csv/ipo_settings.json', 'r')
+        ipo_settings = json.load(f)
+        f.close()
+    except:
+        ipo_settings = {"feature": "IPO", "speed": "medium", "speed2": "medium", "animation": "down", "title": True, "symbols": ["No Data"]}
 
     data = requests.get(ipo_url)
     all_ipo = data.json()
@@ -537,18 +545,19 @@ def updateIpo(api_key, logf):
         ipo_list = ['No Data']
             
     ipo_settings['symbols'] = ipo_list
-    f = open('csv/ipo_settings.json', 'w+')
-    json.dump(ipo_settings, f)
-    f.close()
+    with open('csv/ipo_settings.json', 'w+') as f:
+        json.dump(ipo_settings, f)
 
         
 def updateIndices(api_key, logf):
  
     try:
-              
-        f = open('csv/indices_settings.json', 'r')
-        all_indices_settings = json.load(f)
-        f.close()
+        try: 
+            f = open('csv/indices_settings.json', 'r')
+            all_indices_settings = json.load(f)
+            f.close()
+        except:
+            all_indices_settings = {"feature": "Stocks", "speed": "fast", "speed2": "slow", "animation": "up", "percent": True, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"^HSI": {"name": "HSI", "current": "18083.06", "point_change": "1003.55", "percent_change": "5.88"}, "^GSPC": {"name": "S&P 500", "current": "3790.93", "point_change": "112.50", "percent_change": "3.06"}, "^RUT": {"name": "RUSSELL 2000", "current": "1775.77", "point_change": "66.90", "percent_change": "3.91"}, "^GDAXI": {"name": "DAX", "current": "12648.95", "point_change": "-21.53", "percent_change": "-0.17"}, "^FTSE": {"name": "FTSE 100", "current": "7058.68", "point_change": "-27.82", "percent_change": "-0.39"}, "^FCHI": {"name": "CAC 40", "current": "6031.45", "point_change": "-8.24", "percent_change": "-0.14"}, "399001.SZ": {"name": "SZSE", "current": "10778.61", "point_change": "-140.83", "percent_change": "-1.29"}, "^STOXX50E": {"name": "STOXX 50", "current": "3476.55", "point_change": "-7.93", "percent_change": "-0.23"}, "^AXJO": {"name": "ASX 200", "current": "6815.70", "point_change": "116.40", "percent_change": "1.74"}, "^DJI": {"name": "DOW JONES", "current": "30316.32", "point_change": "825.43", "percent_change": "2.80"}, "^STOXX": {"name": "STOXX 600", "current": "402.33", "point_change": "-0.70", "percent_change": "-0.17"}}}
         
         index_info = all_indices_settings['symbols']
         symbols = list(index_info.keys())        
@@ -571,9 +580,8 @@ def updateIndices(api_key, logf):
                         index_info[index['symbol']] = {'name': index['name'], 'current': index['price'], 'point_change': index['change'], 'percent_change': index['percent_change']}
                    
             all_indices_settings['symbols'] = index_info
-            f = open('csv/indices_settings.json', 'w+')
-            json.dump(all_indices_settings, f)
-            f.close()
+            with open('csv/indices_settings.json', 'w+') as f:
+                json.dump(all_indices_settings, f)
         
     except:
         pass
@@ -593,9 +601,12 @@ def updateIndices(api_key, logf):
 def updateCrypto(api_key, logf):
 
     try:
-        f = open('csv/crypto_settings.json', 'r')
-        all_crypto_settings = json.load(f)
-        f.close()
+        try:
+            f = open('csv/crypto_settings.json', 'r')
+            all_crypto_settings = json.load(f)
+            f.close()
+        except:
+            all_crypto_settings = {"feature": "Stocks", "speed": "medium","speed2": "medium", "animation": "down", "percent": False, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"ETH,USD": {"current": "2629.32", "24hr_change": "-27.6432", "percent_change": "-1.04"}, "BTC,USD": {"current": "38161.00", "24hr_change": "-50.8386", "percent_change": "-0.13"}, "BNB,USD": {"current": "372.57", "24hr_change": "0.4140", "percent_change": "0.11"}, "ADA,BTC": {"current": "0.0000", "24hr_change": "-0.0000", "percent_change": "-3.74"}}}
         
         coin_info = all_crypto_settings['symbols']
         symbol_base = list(coin_info.keys())
@@ -627,9 +638,8 @@ def updateCrypto(api_key, logf):
                         coin_info[symbol.upper() + ',' + base.upper()] = {'current': d['price'], '24hr_change': d['price_over_24hr'], 'percent_change': d['percent_over_24hr']}
                    
             all_crypto_settings['symbols'] = coin_info
-            f = open('csv/crypto_settings.json', 'w+')
-            json.dump(all_crypto_settings, f)
-            f.close()
+            with open('csv/crypto_settings.json', 'w+') as f:
+                json.dump(all_crypto_settings, f)
         
     except:
         pass
@@ -646,9 +656,12 @@ def updateCrypto(api_key, logf):
 def updateForex(api_key, logf):
 
     try:
-        f = open('csv/forex_settings.json', 'r')
-        all_forex_settings = json.load(f)
-        f.close()
+        try:
+            f = open('csv/forex_settings.json', 'r')
+            all_forex_settings = json.load(f)
+            f.close()
+        except:
+            all_forex_settings = {"feature": "Stocks", "speed": "medium", "speed2": "medium", "animation": "down", "percent": False, "point": True, "logos": True, "chart": False, "title": True, "symbols": {"EUR,USD": {"current": "1.1334", "24hr_change": "-0.0003", "percent_change": "0.00"}, "USD,JPY": {"current": "114.960", "24hr_change": "0.1600", "percent_change": "0.14"}, "GBP,USD": {"current": "1.3577", "24hr_change": "-0.0031", "percent_change": "-0.23"}, "USD,CHF": {"current": "0.9198", "24hr_change": "0.0029", "percent_change": "0.32"}}}
         
         forex_info = all_forex_settings['symbols']
         symbol_base = list(forex_info.keys())
@@ -657,11 +670,8 @@ def updateForex(api_key, logf):
         bases = [sb.split(',')[1] for sb in symbol_base]
         unique_bases = list(set(bases))
         
-        
         targets = ','.join(symbols)
-        
         url = 'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/forex?symbols='
-
         for i,s in enumerate(symbols):
             url += s + '-' + bases[i] + ','
         url = url[:-1] #remove last comma
@@ -671,7 +681,6 @@ def updateForex(api_key, logf):
         data = response.json()
 
         if len(data) > 0:
-
             c_dict = {}
             for sb in symbol_base:
                 for d in data:
@@ -680,9 +689,8 @@ def updateForex(api_key, logf):
             
             all_forex_settings['symbols'] = c_dict
             
-            f = open( "csv/forex_settings.json", 'w+' )
-            json.dump(all_forex_settings,  f)
-            f.close()
+            with open('csv/forex_settings.json', 'w+') as f:
+                json.dump(all_forex_settings,  f)
     except:
         pass
         #logf = open('log.txt', "a")
@@ -798,9 +806,8 @@ def updateEconomic(api_key, logf):
         except:
             pass
         all_economic_settings['events'] = events
-        with open('csv/economic_settings.json', 'w') as f:
+        with open('csv/economic_settings.json', 'w+') as f:
             json.dump(all_economic_settings, f)
-
     except:
         pass
     
@@ -808,9 +815,12 @@ def updateEconomic(api_key, logf):
 
 def updateNews(api_key, logf):
     try:
-        f = open('csv/news_settings.json', 'r')
-        all_settings = json.load(f)
-        f.close()
+        try:
+            f = open('csv/news_settings.json', 'r')
+            all_settings = json.load(f)
+            f.close()
+        except:
+            all_settings = {"feature": "News", "speed": "medium", "speed2": "medium", "animation": "down", "country": "US", "category": "General", "title": True, "headlines": [], "use_category": True, "use_country": False, "num_headlines": "10"}
 
         if all_settings['use_country']:
             if all_settings['country'] == 'Worldwide':
@@ -839,15 +849,10 @@ def updateNews(api_key, logf):
     
             all_settings['headlines'] = headlines
             
-            f = open('csv/news_settings.json', 'w+')
-            json.dump(all_settings, f)
-            f.close()
-        
-            
-        
+            with open('csv/news_settings.json', 'w+') as f:
+                json.dump(all_settings, f)        
     except:
         pass
-        
         #logf = open('log.txt', "a")
         #exc_type, exc_obj, exc_tb = sys.exc_info()
         #fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1]
@@ -874,12 +879,18 @@ def updateWeather(api_key, logf):
             80: ['Rain', 'light intensity shower rain'], 81: ['Rain', 'shower rain'], 82: ['Rain', 'heavy intensity shower rain'],
             95: ['Thunderstorm', 'Slight or moderate'], 96: ['Thunderstorm', 'slight hail'], 99: ['Thunderstorm', 'heavy hail']
         }
-        f = open('csv/daily_weather.json', 'r')
-        all_daily_settings = json.load(f)
-        f.close()
-        f = open('csv/current_weather.json', 'r')
-        all_current_settings = json.load(f)
-        f.close()
+        try:
+            f = open('csv/daily_weather.json', 'r')
+            all_daily_settings = json.load(f)
+            f.close()
+        except:
+            all_daily_settings = {"feature": "Current Weather", "speed": "medium", "animation": "down", "temp": "celsius", "wind_speed": "miles/hour", "colour": "white", "city_colour": "yellow", "title": True, "locations": {"Hong Kong": [{"main_weather": "Thunderstorm", "description": "Slight or moderate", "min_temp": 28.2, "max_temp": 30.8, "temp": 30.4, "rain_chance": 17, "humidity": 77, "wind_speed": 11.1, "uv": 5.3, "clouds": 100, "wind_direction": 193, "visibility": 10000}, {"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 27.9, "max_temp": 32.3}, {"main_weather": "Thunderstorm", "description": "Slight or moderate", "min_temp": 27.7, "max_temp": 31.2}, {"main_weather": "Thunderstorm", "description": "Slight or moderate", "min_temp": 28.1, "max_temp": 31.5}, {"main_weather": "Rain", "description": "light intensity shower rain", "min_temp": 28.5, "max_temp": 31.1}, {"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 28.9, "max_temp": 31.5}, {"main_weather": "Clouds", "description": "scattered clouds", "min_temp": 29.0, "max_temp": 31.9}]}, "current_weather": False, "speed2": "medium"}
+        try:
+            f = open('csv/current_weather.json', 'r')
+            all_current_settings = json.load(f)
+            f.close()
+        except:
+            all_current_settings = {"feature": "Current Weather", "speed": "medium", "animation": "down", "temp": "celsius", "wind_speed": "miles/hour", "colour": "white", "city_colour": "yellow", "title": True, "locations": {"Hong Kong": {"main_weather": "Clouds", "description": "overcast clouds", "temp": 30.4, "min_temp": 28.2, "max_temp": 30.8, "feels_like": 36.0, "humidity": 77, "clouds": 100, "visibility": 10000, "uv": 5.3, "rain_chance": 17, "wind_speed": 11.1, "wind_direction": 193, "is_day": 1}}, "current_weather": True, "speed2": "medium"}
 
         current_locations = list(all_current_settings['locations'].keys())
         daily_locations = list(all_daily_settings['locations'].keys())
@@ -951,13 +962,12 @@ def updateWeather(api_key, logf):
 
         all_current_settings['locations'] = current_weathers
         all_daily_settings['locations'] = daily_weathers
-        f = open("csv/current_weather.json", 'w+')
-        json.dump(all_current_settings, f)
-        f.close()
 
-        f = open("csv/daily_weather.json", 'w+')
-        json.dump(all_daily_settings, f)
-        f.close()
+        with open('csv/current_weather.json', 'w+') as f:
+            json.dump(all_current_settings, f)
+
+        with open("csv/daily_weather.json", 'w+') as f:
+            json.dump(all_daily_settings, f)
 
     except:
         pass
@@ -969,7 +979,6 @@ def updateWeather(api_key, logf):
         #logf.write('. line: ' +  str(exc_tb.tb_lineno))
         #logf.write('. type: ' +  str(exc_type))
         #logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
-
         #logf.close()
 
         
@@ -977,10 +986,12 @@ def updateLeagueTables(api_key, logf):
 
     url = 'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/sports?stats='
     try:
-        f = open('csv/league_tables.json', 'r')
-        all_settings = json.load(f)
-
-        f.close()
+        try:
+            f = open('csv/league_tables.json', 'r')
+            all_settings = json.load(f)
+            f.close()
+        except:
+            all_settings = {"feature": "Sports (Team Stats)", "speed": "medium", "speed2": "medium","animation": "down", "title": True, "top20": 20, "leagues": {'NFL':[]}}
         
         leagues = all_settings['leagues'].keys()
         leagues_info = {}
@@ -1049,13 +1060,10 @@ def updateLeagueTables(api_key, logf):
             leagues_info[league.upper()] = teams
         
         all_settings['leagues'] = leagues_info
-        f = open( "csv/league_tables.json".format(league), 'w+' )
-        json.dump(all_settings,  f)
-        
-        f.close()
+        with open("csv/league_tables.json".format(league), 'w+') as f:
+            json.dump(all_settings, f)        
     except:
         pass
-        
         #logf = open('log.txt', "a")
         #exc_type, exc_obj, exc_tb = sys.exc_info()
         #fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1]
@@ -1090,18 +1098,24 @@ def updateLeagueEvents(api_key, time, logf):
 
     url = 'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/sports?{}='.format(time)
     
-    if time == 'past':
-        f = open('csv/past_games.json')
-    elif time == 'upcoming':
-        f = open('csv/upcoming_games.json')
-    elif time == 'livescore':
-        f = open('csv/live_games.json')
-    
-    
     try:
+        if time == 'past':
+            f = open('csv/past_games.json')
+        elif time == 'upcoming':
+            f = open('csv/upcoming_games.json')
+        elif time == 'livescore':
+            f = open('csv/live_games.json')
         all_settings = json.load(f)
         f.close()
+    except:
+        if time == 'past':
+            all_settings = {"feature": "Sports (Past Games)", "speed2": "medium", "speed": "medium", "animation": "down", "title": True, "leagues": {"NFL": []}}
+        elif time == 'upcoming':
+            all_settings = {"feature": "Sports (Upcoming Games)", "speed": "medium", "speed2": "medium", "animation": "down", "title": True, "leagues": {"NFL": [{"date": "2021-11-22", "time": "01:20:00", "round": "11", "home_team": "Los Angeles Chargers", "home_score": "41", "away_team": "Pittsburgh Steelers", "away_score": "37"}]}}
+        elif time == 'livescore':
+            all_settings = {"feature": "Sports (Live Games)", "speed": "medium", "speed2": "medium", "animation": "down", "title": True, "leagues": {}}
 
+    try:
         if time == 'livescore':
             try:
                 leagues_info = {}
@@ -1140,9 +1154,8 @@ def updateLeagueEvents(api_key, time, logf):
 
                 all_settings['leagues'] = leagues_info
 
-                f = open( "csv/live_games.json", 'w+' )
-                json.dump(all_settings,  f)
-                f.close()
+                with open('csv/live_games.json', 'w+') as f:
+                    json.dump(all_settings,  f)
             except:
                 pass
 
@@ -1396,9 +1409,8 @@ def updateLeagueEvents(api_key, time, logf):
                 leagues_info[league.upper()] = events
             all_settings['leagues'] = leagues_info
 
-            f = open( "csv/{}_games.json".format(time), 'w+' )
-            json.dump(all_settings,  f)
-            f.close()
+            with open("csv/{}_games.json".format(time), 'w+') as f:
+                json.dump(all_settings,  f)
     except:
         pass
 
@@ -1891,11 +1903,8 @@ if __name__ == '__main__':
         
             time.sleep(10)
        
-                
     except:
         pass
-       
-      
 #         logf = open('log.txt', "a")
 #         exc_type, exc_obj, exc_tb = sys.exc_info()
 #         fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1]
@@ -1905,8 +1914,3 @@ if __name__ == '__main__':
 #         logf.write('. type: ' +  str(exc_type))
 #         logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))
 #         logf.close()
-        
-        
-            
-     
-

From 1b27186078a470000243cce122058695e45ecc73 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 5 Jul 2023 22:21:28 +0800
Subject: [PATCH 57/57] replace / with space in economic calendar images

---
 stockTicker.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stockTicker.py b/stockTicker.py
index 05b01f1..c7d924a 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -5846,7 +5846,7 @@ class StockTicker():
                         period_img = None
                     flag_img = Image.open('logos/economic_logos/' + event['country'] + '.png')
                     circle_img = Image.open('logos/indicator.png')
-                    title_img = self.textImage((event['title'].upper()).replace("(", '').replace(")", ''), font, r = 255, g = 255, b = 255)
+                    title_img = self.textImage((event['title'].upper()).replace("(", '').replace(")", '').replace("/", " "), font, r = 255, g = 255, b = 255)
                     country_img = self.textImage(event['country'].upper(), font2, r= 255, g = 255, b = 0)
                     date_img = self.textImage(event['time'], small_font, r=0, g=150, b=255)
                     indicator_img = self.textImage(event['indicator'], font2, r=255, g=255, b=255)
@@ -5972,7 +5972,7 @@ class StockTicker():
                     width, height = flag_img.size
                     flag_img = flag_img.resize((int(width/2), int(height/2)))
                     circle_img = Image.open('logos/indicator.png')
-                    title_img = self.textImage((event['title'].upper()).replace("(", '').replace(")", ''), font, r = 255, g = 255, b = 255)
+                    title_img = self.textImage((event['title'].upper()).replace("(", '').replace(")", '').replace("/", " "), font, r = 255, g = 255, b = 255)
                     country_img = self.textImage(event['country'].upper(), small_font, r= 255, g = 255, b = 0)
                     date_img = self.textImage(event['time'].split(' ')[2], small_font, r=0, g=150, b=255)
                     indicator_img = self.textImage(event['indicator'], small_font, r=255, g=255, b=255)