From 7f70594aaf684dd2f4670d228d9fe3e0c27f4835 Mon Sep 17 00:00:00 2001 From: Neythen Date: Thu, 16 Sep 2021 20:23:04 +0100 Subject: [PATCH] settings data sent to python --- csv/crypto.csv | 6 +- csv/currency.json | 2 +- csv/current_weather.json | 2 +- csv/daily_weather.json | 2 +- csv/display_settings.json | 2 +- csv/news.csv | 40 +++--- csv/sports/premier_league/future_games.json | 2 +- csv/sports/premier_league/past_games.json | 2 +- csv/tickers.csv | 6 +- display_images/Crypto Prof.ppm | Bin 40334 -> 40910 bytes display_images/Crypto.ppm | Bin 61358 -> 62318 bytes display_images/Forex Prof.ppm | Bin 90062 -> 90062 bytes display_images/Forex.ppm | Bin 143247 -> 143247 bytes display_images/Stocks Prof.ppm | Bin 38702 -> 39278 bytes display_images/Stocks.ppm | Bin 81710 -> 80750 bytes server.py | 9 ++ static/app.js | 140 +++++++++++++++++++- templates/index.html | 104 +++++++-------- 18 files changed, 230 insertions(+), 87 deletions(-) diff --git a/csv/crypto.csv b/csv/crypto.csv index 9328c09..90847b3 100644 --- a/csv/crypto.csv +++ b/csv/crypto.csv @@ -1,4 +1,4 @@ symbol,name,base,current,24hr change -BTC,bitcoin,usd,44853,-1.3387863974192384 -ETH,ethereum,gbp,2200.08,-3.096695901831838 -DOGE,dogecoin,usd,0.299933,-4.44177217118751 +BTC,bitcoin,usd,47722,-0.7326547346313347 +ETH,ethereum,gbp,2598.0,1.1392072549969245 +DOGE,dogecoin,usd,0.240296,-2.648548292305624 diff --git a/csv/currency.json b/csv/currency.json index d6cdeae..f93dfdb 100644 --- a/csv/currency.json +++ b/csv/currency.json @@ -1 +1 @@ -["USD", {"AUD": [1.3793, 1.3715], "CAD": [1.2619, 1.261], "CHF": [0.91495, 0.91043], "EUR": [0.85302, 0.84983], "GBP": [0.72663, 0.7251], "JPY": [109.76, 109.26], "NZD": [1.4484, 1.4433]}] \ No newline at end of file +["USD", {"AUD": [1.3667, 1.3661], "CAD": [1.2635, 1.2689], "CHF": [0.92544, 0.9172], "EUR": [0.85012, 0.84574], "GBP": [0.72282, 0.72319], "JPY": [109.39, 109.19], "NZD": [1.4068, 1.4095]}] \ No newline at end of file diff --git a/csv/current_weather.json b/csv/current_weather.json index 9dd5263..b133401 100644 --- a/csv/current_weather.json +++ b/csv/current_weather.json @@ -1 +1 @@ -[{"main_weather": "Clouds", "description": "broken clouds", "temp": 27.85, "min_temp": 27.43, "max_temp": 29.18, "feels_like": 32.32, "humidity": 84, "clouds": 71, "wind_speed": 0.45, "wind_direction": 22, "visibility": 10000, "uv": 0, "rain_chance": 0.39}, {"main_weather": "Clouds", "description": "overcast clouds", "temp": 19.09, "min_temp": 15.63, "max_temp": 20.92, "feels_like": 18.93, "humidity": 72, "clouds": 90, "wind_speed": 6.17, "wind_direction": 240, "visibility": 10000, "uv": 0, "rain_chance": 0}] \ No newline at end of file +[{"main_weather": "Clouds", "description": "broken clouds", "temp": 28.17, "min_temp": 28.16, "max_temp": 30.46, "feels_like": 32.2, "humidity": 78, "clouds": 70, "wind_speed": 1.94, "wind_direction": 281, "visibility": 10000, "uv": 0, "rain_chance": 0.01}, {"main_weather": "Clouds", "description": "overcast clouds", "temp": 18.07, "min_temp": 14.53, "max_temp": 22.82, "feels_like": 18.02, "humidity": 80, "clouds": 100, "wind_speed": 3.19, "wind_direction": 209, "visibility": 10000, "uv": 0, "rain_chance": 0}] \ No newline at end of file diff --git a/csv/daily_weather.json b/csv/daily_weather.json index f7c1676..01a164f 100644 --- a/csv/daily_weather.json +++ b/csv/daily_weather.json @@ -1 +1 @@ -[[{"main_weather": "Rain", "description": "moderate rain", "min_temp": 27.43, "max_temp": 29.18}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.34, "max_temp": 29.15}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.34, "max_temp": 29.2}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.37, "max_temp": 29.2}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.4, "max_temp": 29.18}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.23, "max_temp": 28.96}, {"main_weather": "Rain", "description": "light rain", "min_temp": 26.9, "max_temp": 29.16}, {"main_weather": "Rain", "description": "light rain", "min_temp": 26.98, "max_temp": 29}], [{"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 15.63, "max_temp": 20.92}, {"main_weather": "Rain", "description": "light rain", "min_temp": 13.31, "max_temp": 21.54}, {"main_weather": "Clouds", "description": "few clouds", "min_temp": 13.65, "max_temp": 24.72}, {"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 16.1, "max_temp": 25.02}, {"main_weather": "Rain", "description": "light rain", "min_temp": 15.67, "max_temp": 23.79}, {"main_weather": "Rain", "description": "light rain", "min_temp": 16.75, "max_temp": 22.96}, {"main_weather": "Clouds", "description": "scattered clouds", "min_temp": 14.97, "max_temp": 23.48}, {"main_weather": "Clouds", "description": "broken clouds", "min_temp": 14.44, "max_temp": 22.67}]] \ No newline at end of file +[[{"main_weather": "Rain", "description": "moderate rain", "min_temp": 28.16, "max_temp": 30.46}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 27.66, "max_temp": 29.22}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.51, "max_temp": 29.01}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 27.63, "max_temp": 29.33}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.52, "max_temp": 29.44}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.63, "max_temp": 29.15}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.02, "max_temp": 28.59}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 26.86, "max_temp": 27.62}], [{"main_weather": "Clouds", "description": "scattered clouds", "min_temp": 14.53, "max_temp": 22.82}, {"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 13.83, "max_temp": 21.66}, {"main_weather": "Clouds", "description": "broken clouds", "min_temp": 14.97, "max_temp": 23.29}, {"main_weather": "Rain", "description": "light rain", "min_temp": 15.9, "max_temp": 20.96}, {"main_weather": "Clouds", "description": "scattered clouds", "min_temp": 13.74, "max_temp": 19.77}, {"main_weather": "Clear", "description": "clear sky", "min_temp": 10.61, "max_temp": 19.19}, {"main_weather": "Rain", "description": "light rain", "min_temp": 13.09, "max_temp": 19.06}, {"main_weather": "Rain", "description": "light rain", "min_temp": 11.51, "max_temp": 16.53}]] \ No newline at end of file diff --git a/csv/display_settings.json b/csv/display_settings.json index c4b1d7f..02623e2 100755 --- a/csv/display_settings.json +++ b/csv/display_settings.json @@ -1 +1 @@ -["Crypto Prof", "Forex Prof", "Stocks Prof"] \ No newline at end of file +["Stocks", "Crypto", "Forex"] \ No newline at end of file diff --git a/csv/news.csv b/csv/news.csv index f43683d..3a584ba 100644 --- a/csv/news.csv +++ b/csv/news.csv @@ -1,21 +1,21 @@ headline,source,date,time -US recommends Pfizer and Moderna Covid vaccine boosters – live - The Guardian,The Guardian,2021-08-18,18:32:47Z -Surprising health benefits of turmeric you should know about - Times of India,The Times of India,2021-08-18,18:30:00Z -Vaccine stockpiling by nations could lead to increase in COVID-19 cases^ novel variant emergence - Princeton University,Princeton University,2021-08-18,18:21:30Z -Covid-19 Live: New mask rules in place as NZ wakes to day two of lockdown - Stuff.co.nz,Stuff.co.nz,2021-08-18,18:20:00Z -'Shadow waveguide' casts complex acoustic patterns to control particles - Phys.org,Phys.Org,2021-08-18,18:00:15Z -Mystery of the seadragon solved - Phys.org,Phys.Org,2021-08-18,18:00:07Z -Deaths of serving policeman and his three year old son investigated as a murder-suicide - Daily Mail,Daily Mail,2021-08-18,17:53:56Z -Healthcare workers in the third wave: 'We are living in the shadows of death' | Health24 - News24,News24,2021-08-18,17:53:52Z -Sleep deprivation impacting Irish surgeons at work^ study finds - The Irish Times,The Irish Times,2021-08-18,17:51:04Z -Porter Airlines^ other companies to require COVID-19 vaccine or negative test for all staff - CBC.ca,CBC News,2021-08-18,17:45:48Z -40 million T-Mobile customers hit by US data breach - BBC News,BBC News,2021-08-18,17:44:59Z -For the Afghans who make it through Taliban checkpoints^ Kabul airport is a gateway to a new world - CNN,CNN,2021-08-18,17:39:00Z -Estudiante desaparecido en el nevado del Tolima fue encontrado sin vida - El Tiempo,Google News,2021-08-18,17:26:27Z -Founder of homeless charity dies in tragic circumstances - Irish Examiner,Irish Examiner,2021-08-18,17:26:00Z -ENG vs IND: Virat Kohli "The Most Foul Mouthed Individual"^ Says Nick Compton; Gets Hammered On Twitter | Cricket News - NDTVSports.com,NDTV News,2021-08-18,17:25:00Z -Lonely flies^ like many humans^ eat more and sleep less - Science Daily,Science Daily,2021-08-18,17:23:37Z -Garth Brooks cancels stadium tour in Baltimore due to Delta variant surge - WBAL TV Baltimore,WBAL TV Baltimore,2021-08-18,17:15:00Z -Vaccines’ protection against virus infection is waning^ C.D.C. studies suggest. - The New York Times,New York Times,2021-08-18,17:13:34Z -Red Sox's epic collapse is 'frustrating' Alex Cora - New York Post ,New York Post,2021-08-18,17:11:17Z -Irish banker earned more than €16m in 2019 - The Irish Times,The Irish Times,2021-08-18,17:07:14Z +Michael Gove faces calls to return £100k in donations from property developer - The Guardian,The Guardian,2021-09-16,18:36:00Z +Fake Covid vaccination card market booms - NBC News,NBC News,2021-09-16,18:25:41Z +Labour fears Dominic Raab will target rights act in new justice post - The Guardian,The Guardian,2021-09-16,18:17:00Z +New bodycam video shows emotional Gabby Petito after reported fight with fiancé in Utah - NBC News,NBC News,2021-09-16,18:16:13Z +Brexit triumph as Crown Stamp returns to pint glasses after bonfire of EU rules - Telegraph.co.uk,Telegraph.co.uk,2021-09-16,18:08:00Z +Plants evolved complexity in two bursts—with a 250-million-year hiatus - Phys.org,Phys.Org,2021-09-16,18:00:07Z +Apple's next big technology was absent at the iPhone 13 launch^ but Tim Cook says he's still a fan - CNBC,CNBC,2021-09-16,17:58:12Z +The Impact Of Cyber Attackers Exploiting New iPhone Software Vulnerability - Newstalk,Newstalk,2021-09-16,17:51:26Z +Government did not advise President Higgins against attending service^ it says - The Irish Times,The Irish Times,2021-09-16,17:48:47Z +More than half of Manitoba's new COVID-19 cases unvaccinated - CTV News Winnipeg,Ctvnews.ca,2021-09-16,17:42:21Z +Several Rockets Strike Kabul City District: Report - NDTV,NDTV News,2021-09-16,17:38:00Z +Freddie Combs dead: X Factor star dies aged 49 from kidney failure - The Mirror,Mirror Online,2021-09-16,17:36:42Z +Canada must 'learn from' the pandemic crisis in parts of the West^ Tam says - CBC.ca,CBC News,2021-09-16,17:36:08Z +Duque confirmó las fechas para los tres días sin IVA - El Tiempo,Google News,2021-09-16,17:33:15Z +Police Arrested The South Carolina Lawyer Who They Said Planned His Own Killing For An Insurance Payout - BuzzFeed News,BuzzFeed News,2021-09-16,17:32:00Z +Love triangle ends in bloodshed as taxi owner shoots lover and her alleged boyfriend - IOL,IOL,2021-09-16,17:31:20Z +BBNaija S6: Nini^ Saga receive strikes for flouting house rules - Punch Newspapers,The Punch,2021-09-16,17:24:54Z +Alberta reverses hands-off approach to Covid to tackle ‘crisis of unvaccinated’ - The Guardian,The Guardian,2021-09-16,17:24:00Z +House Democrats’ tax plan would increase marriage penalty for wealthy couples - CNBC,CNBC,2021-09-16,17:21:55Z +First Looks: Canon EOS R3 - Geek Culture,Geek Culture,2021-09-16,17:19:16Z diff --git a/csv/sports/premier_league/future_games.json b/csv/sports/premier_league/future_games.json index 9201c71..81f7220 100644 --- a/csv/sports/premier_league/future_games.json +++ b/csv/sports/premier_league/future_games.json @@ -1 +1 @@ -[{"date": "2021-08-21", "time": "14:00:00", "round": "2", "home_team": "Aston Villa", "home_score": null, "away_team": "Newcastle", "away_score": null}, {"date": "2021-08-21", "time": "16:30:00", "round": "2", "home_team": "Brighton", "home_score": null, "away_team": "Watford", "away_score": null}, {"date": "2021-08-21", "time": "14:00:00", "round": "2", "home_team": "Crystal Palace", "home_score": null, "away_team": "Brentford", "away_score": null}, {"date": "2021-08-21", "time": "14:00:00", "round": "2", "home_team": "Leeds", "home_score": null, "away_team": "Everton", "away_score": null}, {"date": "2021-08-21", "time": "11:30:00", "round": "2", "home_team": "Liverpool", "home_score": null, "away_team": "Burnley", "away_score": null}, {"date": "2021-08-21", "time": "14:00:00", "round": "2", "home_team": "Man City", "home_score": null, "away_team": "Norwich", "away_score": null}, {"date": "2021-08-22", "time": "15:30:00", "round": "2", "home_team": "Arsenal", "home_score": null, "away_team": "Chelsea", "away_score": null}, {"date": "2021-08-22", "time": "13:00:00", "round": "2", "home_team": "Southampton", "home_score": null, "away_team": "Man United", "away_score": null}, {"date": "2021-08-22", "time": "13:00:00", "round": "2", "home_team": "Wolves", "home_score": null, "away_team": "Tottenham", "away_score": null}, {"date": "2021-08-23", "time": "19:00:00", "round": "2", "home_team": "West Ham", "home_score": null, "away_team": "Leicester", "away_score": null}, {"date": "2021-08-28", "time": "14:00:00", "round": "3", "home_team": "Aston Villa", "home_score": null, "away_team": "Brentford", "away_score": null}, {"date": "2021-08-28", "time": "14:00:00", "round": "3", "home_team": "Brighton", "home_score": null, "away_team": "Everton", "away_score": null}, {"date": "2021-08-28", "time": "16:30:00", "round": "3", "home_team": "Liverpool", "home_score": null, "away_team": "Chelsea", "away_score": null}, {"date": "2021-08-28", "time": "11:30:00", "round": "3", "home_team": "Man City", "home_score": null, "away_team": "Arsenal", "away_score": null}, {"date": "2021-08-28", "time": "14:00:00", "round": "3", "home_team": "Newcastle", "home_score": null, "away_team": "Southampton", "away_score": null}] \ No newline at end of file +[{"date": "2021-09-17", "time": "19:00:00", "round": "5", "home_team": "Newcastle", "home_score": null, "away_team": "Leeds", "away_score": null}, {"date": "2021-09-18", "time": "16:30:00", "round": "5", "home_team": "Aston Villa", "home_score": null, "away_team": "Everton", "away_score": null}, {"date": "2021-09-18", "time": "14:00:00", "round": "5", "home_team": "Burnley", "home_score": null, "away_team": "Arsenal", "away_score": null}, {"date": "2021-09-18", "time": "14:00:00", "round": "5", "home_team": "Liverpool", "home_score": null, "away_team": "Crystal Palace", "away_score": null}, {"date": "2021-09-18", "time": "14:00:00", "round": "5", "home_team": "Man City", "home_score": null, "away_team": "Southampton", "away_score": null}, {"date": "2021-09-18", "time": "14:00:00", "round": "5", "home_team": "Norwich", "home_score": null, "away_team": "Watford", "away_score": null}, {"date": "2021-09-18", "time": "11:30:00", "round": "5", "home_team": "Wolves", "home_score": null, "away_team": "Brentford", "away_score": null}, {"date": "2021-09-19", "time": "13:00:00", "round": "5", "home_team": "Brighton", "home_score": null, "away_team": "Leicester", "away_score": null}, {"date": "2021-09-19", "time": "15:30:00", "round": "5", "home_team": "Tottenham", "home_score": null, "away_team": "Chelsea", "away_score": null}, {"date": "2021-09-19", "time": "13:00:00", "round": "5", "home_team": "West Ham", "home_score": null, "away_team": "Man United", "away_score": null}, {"date": "2021-09-25", "time": "16:30:00", "round": "6", "home_team": "Brentford", "home_score": null, "away_team": "Liverpool", "away_score": null}, {"date": "2021-09-25", "time": "11:30:00", "round": "6", "home_team": "Chelsea", "home_score": null, "away_team": "Man City", "away_score": null}, {"date": "2021-09-25", "time": "14:00:00", "round": "6", "home_team": "Everton", "home_score": null, "away_team": "Norwich", "away_score": null}, {"date": "2021-09-25", "time": "14:00:00", "round": "6", "home_team": "Leeds", "home_score": null, "away_team": "West Ham", "away_score": null}, {"date": "2021-09-25", "time": "14:00:00", "round": "6", "home_team": "Leicester", "home_score": null, "away_team": "Burnley", "away_score": null}] \ No newline at end of file diff --git a/csv/sports/premier_league/past_games.json b/csv/sports/premier_league/past_games.json index 4b11adc..4652c4d 100644 --- a/csv/sports/premier_league/past_games.json +++ b/csv/sports/premier_league/past_games.json @@ -1 +1 @@ -[{"date": "2021-08-15", "time": "15:30:00", "round": "1", "home_team": "Tottenham", "home_score": "1", "away_team": "Man City", "away_score": "0"}, {"date": "2021-08-15", "time": "13:00:00", "round": "1", "home_team": "Newcastle", "home_score": "2", "away_team": "West Ham", "away_score": "4"}, {"date": "2021-08-14", "time": "14:00:00", "round": "1", "home_team": "Watford", "home_score": "3", "away_team": "Aston Villa", "away_score": "2"}, {"date": "2021-08-14", "time": "16:30:00", "round": "1", "home_team": "Norwich", "home_score": "0", "away_team": "Liverpool", "away_score": "3"}, {"date": "2021-08-14", "time": "11:30:00", "round": "1", "home_team": "Man United", "home_score": "5", "away_team": "Leeds", "away_score": "1"}, {"date": "2021-08-14", "time": "14:00:00", "round": "1", "home_team": "Leicester", "home_score": "1", "away_team": "Wolves", "away_score": "0"}, {"date": "2021-08-14", "time": "14:00:00", "round": "1", "home_team": "Everton", "home_score": "3", "away_team": "Southampton", "away_score": "1"}, {"date": "2021-08-14", "time": "14:00:00", "round": "1", "home_team": "Chelsea", "home_score": "3", "away_team": "Crystal Palace", "away_score": "0"}, {"date": "2021-08-14", "time": "14:00:00", "round": "1", "home_team": "Burnley", "home_score": "1", "away_team": "Brighton", "away_score": "2"}, {"date": "2021-08-13", "time": "19:00:00", "round": "1", "home_team": "Brentford", "home_score": "2", "away_team": "Arsenal", "away_score": "0"}, {"date": "2021-05-23", "time": "15:00:00", "round": "38", "home_team": "Wolves", "home_score": "1", "away_team": "Man United", "away_score": "2"}, {"date": "2021-05-23", "time": "15:00:00", "round": "38", "home_team": "West Ham", "home_score": "3", "away_team": "Southampton", "away_score": "0"}, {"date": "2021-05-23", "time": "15:00:00", "round": "38", "home_team": "Sheffield United", "home_score": "1", "away_team": "Burnley", "away_score": "0"}, {"date": "2021-05-23", "time": "15:00:00", "round": "38", "home_team": "Man City", "home_score": "5", "away_team": "Everton", "away_score": "0"}, {"date": "2021-05-23", "time": "15:00:00", "round": "38", "home_team": "Liverpool", "home_score": "2", "away_team": "Crystal Palace", "away_score": "0"}] \ No newline at end of file +[{"date": "2021-09-13", "time": "19:00:00", "round": "4", "home_team": "Everton", "home_score": "3", "away_team": "Burnley", "away_score": "1"}, {"date": "2021-09-12", "time": "15:30:00", "round": "4", "home_team": "Leeds", "home_score": "0", "away_team": "Liverpool", "away_score": "3"}, {"date": "2021-09-11", "time": "14:00:00", "round": "4", "home_team": "Watford", "home_score": "0", "away_team": "Wolves", "away_score": "2"}, {"date": "2021-09-11", "time": "14:00:00", "round": "4", "home_team": "Southampton", "home_score": "0", "away_team": "West Ham", "away_score": "0"}, {"date": "2021-09-11", "time": "14:00:00", "round": "4", "home_team": "Man United", "home_score": "4", "away_team": "Newcastle", "away_score": "1"}, {"date": "2021-09-11", "time": "14:00:00", "round": "4", "home_team": "Leicester", "home_score": "0", "away_team": "Man City", "away_score": "1"}, {"date": "2021-09-11", "time": "11:30:00", "round": "4", "home_team": "Crystal Palace", "home_score": "3", "away_team": "Tottenham", "away_score": "0"}, {"date": "2021-09-11", "time": "16:30:00", "round": "4", "home_team": "Chelsea", "home_score": "3", "away_team": "Aston Villa", "away_score": "0"}, {"date": "2021-09-11", "time": "14:00:00", "round": "4", "home_team": "Brentford", "home_score": "0", "away_team": "Brighton", "away_score": "1"}, {"date": "2021-09-11", "time": "14:00:00", "round": "4", "home_team": "Arsenal", "home_score": "1", "away_team": "Norwich", "away_score": "0"}, {"date": "2021-08-29", "time": "15:30:00", "round": "3", "home_team": "Wolves", "home_score": "0", "away_team": "Man United", "away_score": "1"}, {"date": "2021-08-29", "time": "13:00:00", "round": "3", "home_team": "Tottenham", "home_score": "1", "away_team": "Watford", "away_score": "0"}, {"date": "2021-08-29", "time": "13:00:00", "round": "3", "home_team": "Burnley", "home_score": "1", "away_team": "Leeds", "away_score": "1"}, {"date": "2021-08-28", "time": "14:00:00", "round": "3", "home_team": "West Ham", "home_score": "2", "away_team": "Crystal Palace", "away_score": "2"}, {"date": "2021-08-28", "time": "14:00:00", "round": "3", "home_team": "Norwich", "home_score": "1", "away_team": "Leicester", "away_score": "2"}] \ No newline at end of file diff --git a/csv/tickers.csv b/csv/tickers.csv index 49d7b43..aa2dc22 100644 --- a/csv/tickers.csv +++ b/csv/tickers.csv @@ -1,4 +1,4 @@ name,current,opening -MSFT,292.24,291.83 -NFLX,523.04,519.94 -GOOG,2748.74,2742.12 +MSFT,304.21,303.88 +NFLX,586.72,583.95 +GOOG,2895.85,2902.95 diff --git a/display_images/Crypto Prof.ppm b/display_images/Crypto Prof.ppm index 9328491f34b0a0d86636e3caf91b52f3badbce95..179da1c312cf852351b9ece19a93605d189c4e62 100644 GIT binary patch delta 2353 zcmeHIO-~zF6wL%YFlJ!vu?;38j1gZA3fM8&;KVVQZv=^qRH;(C@urKc@TO9wF6tjp zHMY;HQq|C`x}kMsWkuDJMHf}1LRQ@*s-;R*t9F69>nc6>&6q+{{y`R_uO;u zJ@4bgt3P~uwXc}*&!sZ)*_1z(PW$nEa->$&@ue?{#-s@=Y@!%5>s;cNj;hbD6|Gv_ zsx=JtVAhJpk%^IJwz0Uhqwn zdd5%=88{8bQ0-geZ*MoB_I}|WPXFgn^gSHj)cEhPQ0Q@7bt^Y&520XzflTurr4JEgg-diM>@F4;LK# zv~Hc9DQ}si)ra3_rij^z<3xmK4Q#DMxW_;;VJf_%4Tl)hubn+j=y7SvxW6%L;FDAYrHvSpc^iQ_laVJN#dtY8f}zzxR2D@6TVc3Z zwx?p7eUxV-2;3au8bu{XFsg%3x!nYf`#wvuTp^T$-?2hh2w%C891322CQRt#P_V@%Cin=Rv4w( zf%=BY@H))=7?#!}+AAE)k5YtdOwhpb!X#n+ur_R*>{wjMVorpJVrbbSw0RD$G1Kiy zHDjn*#`}WZ4cwXGvyaIO%65;Q$(4-51u9Ho&CoqYf%oKRz1l zMkQwA#INIp{|)4F36C&SVrt*aOZ7}#BU#aEi?2RTy;p$fkjbkIuq)tDUQ3{Mx1iW;41C3RrVEyZcd>^UDpgfFl9@P5HU z;$95W>c?#JC-aWd{jYphsa0Gy@lZABKlm)=1*}^3mJ~3~DNwrTG#I*%K^M}|JIL;p z7Lm@GJQLIv5JxvMJkyE&un(;@PV{;&W(wCCTBcP;iS%afNZC!?XBT}YJ6i0 zCokBpHb^RwI`;~r!+G zQi7hpPwy88YVE#9mA+%vbg=-rXd%Y1crS3SXa*O(ojyHddtGF(b2tch-TTCSruVa6 z)x7iv{YfxF6LJZXXS@5{UU2Uoi6Q$Vo_o`=v-Ez)uLkL1iY_@T@!I<)$!`GP-Y}j6qOTaqOm3&GwGB`O&wb@O=@sF#Idp6BzA454I%zeREcGc5E2rIT8IT3 zgnt1^b5?AUKv^KMsKYD}0ts)~Q182mXc`rXMZ_N{=gy3icmY3v#rQqXyYJk4?#G$m ze;xbs=dnwzTxe<0j%5}@i`i@l@6N{`v=sCwER^T92YU*7DFX*H+TrI5W7x01;ii{v2#n_ zX&B6y?mm`M-2{8@i9NH0=Zo+AJ~f0_#Wy)+4D^bE6`_B=tH}RFbgI)A{>S}$Vn65l zVeas7DUNGJ=7jnAjW~lmi%KlP=@nJfS5(BRI=)zqp_`dRtf?bbPWV_Rea_)HTk`Ga za9YsuIFsAuQYuLLB^({?oQ-fO4xu!d*SU|7VwCiRvQBCidI=S?A<_zkaU8vjXK%iD zA^c$|Oi59}eWqII_EwTeR~5{%MC%m|-36YllYUvsIi#TBL(=G%;?geowvcpFK1@}A zE%C27om#@j5r0YiQCvo+mPBho^HXDv_5@oQVY;oxJ8&T*5vraEO)^e3gs3Y205O zcI0Sxi0whv!rrFI?v?ITaE^E0(cP-yrpD{)>%2H9F8)!w;v=nsR+!88~?n?CQkwi`k_#pd>gMTYj?8ypzd zy~5@aTXq#G4F}4zu~}Vjm=5l6SZX@@8Fp5_^xs%FWpFG$DIC{wZgoW%POGtzdyn$O z%qOt3CaI45G*zFbGkg0+z)jt0A>s~Tzha@oIJ{vr8LRFJOMhNrDI#Y)dPNZygB@j% zXU^445iYwSVlo_N^4N%;4P&XmF28^$Z6f(QFGCQ|-lAB!6CigbXY!~V^2piUFmojS z4>sbs$H}qpenf6hpx+21y<&2I+2!PksOAeHg{{tVyMmbFxrf(kS|j54i1D;@8Dc2> zGKh`TQ|fIJM+A_5eKBn{IT5RTY9_WRMk27D=!!3W*S*Tm$5s-5Qn!cK&UKmTTQWVt t@gWCvIn?0R){jm*a7pST@wELF{@U=@PyBURR_CbsOW^`~&1k)4~7% diff --git a/display_images/Crypto.ppm b/display_images/Crypto.ppm index 766bc8b9806aa60eea614be8f21a152b9dfeb2ea..87a03b27ca3d1d3a9282e8164da68539d1fcf329 100644 GIT binary patch delta 2639 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 delta 3208 zcmeHJPiPc(7-bL6cIeRAj83{`%DSNo3!%Y*wH8515CYQBHiv@6VjVDv#*MlfW0G}4 zR#Vqv#BAq5tVv4N#u}3t6U@b%3qAE>_gWB|YYU}&5_)Ri_nXaT1MRIx56iGKzxRFb z`}e-zi|4yuJm0l`wg;O_8rGJNqnbX5?(cPE{1)UNYk1kKqqJrsKH^}#-^SJ6HhAe6 zinBT@y)kqzbrI7E?~#S}3F0nW_<5?u59{jqZ+&t+<@cHmmXdsRL?JG$+I;HtWHzFX zoe`9)jtH?|do9G91lEb_P!##11ush{!ikpZe01b`qKHpwsLb#)Po0ZFHvJ2&qu3FiF6mhaklJ16^=0=@`FZC~WtWgT$VI*O%C+oclI}$U+R6XRbeN zq1bQv!wGn+jQobKJj-+Qtch~g6qh(W=pdI#2B#f=xD}D*);czY(iOVC8b#%viTJ19L;Ncf>n1<#Ha0p&_eo()d@;rZ zX9sA=Bo)n{Fc^Fk<(Q6>UrYU2b5oAj zcpyIR;O}7@rA3$V*NwR1& z7KZ$4JY+n}G#H^)o zks?Ya;<=-k@6+p<2r5#84%BHYZ4$SFXhqw!f%QQq|00#HKufB@b~t=DBjdS6T%H!H z(;Qt@Vs`6pj=`HI);=`8$xC(R71gUn_nY{4#(}xdU;{K`eY6SXsUOh @|(@Cu^a z7E2qb%pX&?Xk7*^Xj{>Km&5GcW|K&lrwtOe_;XY5^eW5C^02oU#r>|0j3@C z0aN+dTvBZ#4fg!8ExF!8x_#}GXGi6_(c3H781FGLdZ$&**4BB6+s$q%iN-NEsS>8Y zXi&wvI4rU&D1#3EqOgxYv_t@^QywRuxUTUvCE_h++X!UUZ$Pwq+r>q}yd4q2vLkIhSl&FUw1ASu&>yueUYgNuyNjn&b`bdp=% z;_o0)DTX29>jrAbR+5Xs2<4^$;;jY?(_3kD7(h$QZevGQhuExjp23nA6;*qQlUH{r zHz^5I(#$)6OcS-J^6&ulSdP~qW<4@n#V#sXnc*-r(32V~0E^(QaA&Zt+nE$M!39aK uC(LFY$pHFzJz9!wlplN$^21&H#_h?Ak34?*-~T-gcZOd7Ugy9MfBX+1SIrp! diff --git a/display_images/Forex.ppm b/display_images/Forex.ppm index d0540e760ca9f0cd071f20996cba025bb3000969..250921652eaec5643e3d4200936fc19b6305239c 100644 GIT binary patch delta 5304 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 delta 4784 zcmZu#ZERa-71p_IS+j-OHDrXEn(N7$!8Dacm_^j8vC5)WYwI{PZJ=wZOGMOkiIP_I zYh%Hs5>qOw#`WgIfURKy_Q6;aQMgh>iOZm0Q*#e_Lh+c=t9!zDyymEVEkFgJPw()9C%r4&V0M6y|a- zh1B!p32I?D5h>W4>g{!Mb%?s$Cvo5ZxHJ4!`ZaO+RfvfhSm=(J>n4p1su0i9IyS z^RH0|qWvybE#hvs0M*Ksl~$C~-=)oR{E&M<9SCr44)9E#paf($)yuA9+qNP+za8M@ z9;S5#yH&*3@GArK8%_>Us$eJU1yY<|gfrC_I-zNSJGX0jNOSD)dLeY90P z3rm^6K)d+r`V;(!wMi0a1X|c$Y4wZAsQW}!e9rmZetKPz4=d=3#hoK$!jO!#mWC+l zS4Y9VvtHwX6z3q2jw#Yb``oZo8KpB+oZ1qS0&L^-VLHo`y#nEgsfsXHinO_4H}mKb zl;8&kQ4)d?J ziqr$RcrpFGcya1Xgn?UYaq)>rF>pO3Xa<}IkJC4ALb4w*!<%M4J0Z4QBu}5B7bM%7 zf1nX@0Mi}B_Bl#O)8qZ9yi~CmR~H1i!-&6zX6}a+Eo~E!1k5D@nws1M#eEAgBx#m& z4*)NPR+`_3_QRy}XX~Ux4Fz&R+=v>GfmxRW`40ecKg9)P{PlCOn`E2)@~(&Wk~Au+ zJqAD%PVNl7L#2JNrqF90O#Okz#XF6^&Cp8jF^WQlcmEjJ0LYyZc~T6u)=B2iQ3=W- zF83tm_!uXftmV?z?VNrRm0RA{U=1=SH9!yXs4E?5lbQ80Ay7^2g( zdU64ijGD>d@6jx_BcSh*^k={<4N)G~p5@>oxL*T)mkNigLG`Gl~FMd`OF?Sd8mmZ4645nn~~o3hYVXG5b=2xum2Il_if6LCA* z6j2e(3QuQruEKS^dXs0U>mF=hMdU1)X#Lpx^|XxKq2PLuCE z9*xuy5*i^Xdr_BESjgz{Q7-L+YAD27zepPk_U)puCVfaqOq!WhK{6i z8loHL{0zdz%xE&6LNZsdXPpQBL2CgOSk~-!h%X`w*H77g7Qe=>;Dy1qgI{?EWv;8B znG>~r1~;BJDPH;)UEs;*0LIvB)LyVvVuUMOV6@st_ZXs2{~aBx7WAl21>^)9XGAQx z=PN&;9cGf^09J0_BXz61%Gz0Xcz%KI6)sK)%caa=P>L=KwSBwW58$ZMnXUk;I5_}b zF;T|-L%J?DsMrfE^!)T2GUj!6d)ImMJ=%!doUFr0p*u)*GhcxUMS<(&#{Ewg7h|N8 zGq+nq0*A73)Qm>lk-|>;27MOVwD@k3WBUz$Ifw4%@*P%E_E$_5nHkjuglM*M%NiA4 za&H*;C8V}_sr;nyqyi3S+%+rsHlo6!g5eOG)$FV&(K1)vRjok7r896K~F zrKyq|wBc#NS+AxTYjO+2t!JjrPWl++bx9Ij8svvcr>F}ttgC|xzM%^)!quMJsHHgn z-zE-zU1Gi|gaOX|1;?g$QtFq}u>-_c!oVB3i%Njlo!or{Zt1-*Vcy}c)-PU!%~d|X z+yd)wSSqYtCTtA%^ezhgR$2$;axyB72V47j`csxIk5l?sTnuw|xz*us;~io;AyuLL zEcwbbis~wW-j{W<@;@3_>LW_dyDcW_BoQDcqA)?FfF7zoPeHDJ(i-IK8>pGF!!n!n zTZ0O@sK8U~T1&7f>A=k0YTZ|`n;KE*<=i)fjqpXny>luEz2<@pc0E30f1bFf9d;37 zjMH~nSjM+w%YrG5OmFVmolQb*E`x%XE~$hAiPg$X;3K_0q(t3r8B=jziT7@uu_8lP z$ZVa2=w60UcxnKt?5fis#pHbr(MuJ+5y+>T;2NmNXVA6kx2I9P^}fz@*6Gn4qkO$o zq#EV$$zVHn8?WzcfOv}4RsHhQU=P!27kJXhb<_a~xlCPNbnxTG=mwq=cmVV+8u&jh COt@zN diff --git a/display_images/Stocks Prof.ppm b/display_images/Stocks Prof.ppm index 27d417c258d24b3f47f356be373c5b030893ca42..2999c0a643014a9c6720fabc69c5e7d54438e703 100644 GIT binary patch literal 39278 zcmeHOL2g`C5cCEiEV1AQTmT7$7>O-W_DGz8qi_*6AkM&^GjIjg>{yr{SEi=i)$h&o zeB;cFd-U~FU0vO;Us-95Bjty0Z{L3X-Iw3IxqWkYcYCw{+*cnYtIUDhH`x7oVE0I~ ziud_Pe?kCC#U=l!QUWgo^VMIY%#6Q(|EWJw@YAowGi&ska`!i%b2B~C*!1PHw|Y;r+hWtGKEc_U!IyJ{d-MloAm5bzDAOnDJn#O!Gd%dZT$8q81bq(XB^+bbeomm%JhySH&lcB zDx>(E-6&_%tyN;L()$9R#(3weVZspgWPYzw46dC6{hdK}#B1$2Y>AWq{{Q+4h>qxIR8BmnxMd$!?leOhE!k zlfn>#iFYbY;bdh^QmM(tRfcXpDj4TS`ZU#E)pid2fX!a&Opz%iZ2Lbm0_E$ zk4-lM0OO4gN10vCvA;6w!z1~}fOW|U3hE#Wh+GQ9<` zGCJglSIs%&C#|x$$jA-%K^ev8?1s(OUIaL8mErm@gx91$Phu#(VnAn-W4v<7mtO z)Stz(^{i{D=k7}XTy`z@+j@_aSJ~EsUu8X4M7llr6_Oe)QA|MsssWC7(s+1O87)R# zCaGeN#b#SuWoWC1t}y9pECE24WD>80QG4{G8lDAkv^E4QtIXT3Fn+pMg@&Z-=giSU z3IOyhGV>!MJ6dHddcCAR8=0WV#TF6NY^-1)?$^t{q4tiNGN0DeT-M@s^)XiyRs(Ixtpx*fu8tBhy)(Ie(?^aIikoE9WQZN(IT zc2m9LxkmepsI0_~s`yUgQOGTkK&gkOOa+-bM7XY`cyt7L0Dq6pD*54LNqy=noAmcoVl;H@ zjE)>xJW3LyRy#zh3`r8Wl5G=MS!HEgCDGHFG=>U*l}Ur4HUy_DGz8qi_*6AkM&^1t;JNtl6<>vM2h5<3(nb ztL>S_?#`#D=g7#&tg5h`a*yWwuW#Rc_4cIRIr5I${#8MWPYeAzaV=Po<#x|@h%z9(a z8CaoQex$cuU3j=YxZ)sT0(`(zkCqwe`Bd>0VGJ(J zuJvuxjR3%SqQg<dkqQs&2oa_o36O<%1npI4J0o4GT3VlJTPkR~%&IM)pA&#h2_x-Wvy(rM~&;AG=kc=LJ5E(Vou$hY5C-hl0jZ zB}t8D6;ogU8hx4op$b;omQ6k!8Czm=V(ytophf}pN?sA>--h^Wk)a+z&j_pxl)>l~ zWQ1&@nB-M}(*_rg4?}oN`tvA;;%5WsgZaY)mV8N;C37W8pwTB=WuUUaS#U1%^W9Cp z;~Vrxai6=^bE)T~vVZ1!F6TS<948O1a~FOA^&ALxR`4q%HCm#W0t2c6j;CpIcvKlJ zMqMVUVrs=4TO3^ItE;Xs#o69%UHd?jnOvKh#VV6onA-}oG`OOn-Y6$yA$VEBVF>b7 zl37NEtDmskW7ZlCE^dT>Fp_xy+#zCydBeIN%DmkcQ!wwd$&bJ0KDov;+(TAAlF!## zmI%2zxTNGB>Jo|}%M8nrGC_pKP`?5uwYf9Ilal?47+i0D{UPps<{_#Fm-bhTB4q+I zBnX+}a$(bGpOHTEk6k4%ntMKmDd)h1EN2V!Oj%fN2O3RfMzh2#GJ7j5WUB)>d2k(C zY#$iDq2;Q~YN26j02rF=&yQ~6&X?*Ho6?$FXyPj5;EJUFwYbx=ZMhR8E!0MuA_icn z`oJT9C>s@qAa_==Vs=XaBa2VVb7}>!)FHHmGz2C?5XFiQy#%QMSQ!xxJsjz^cCMLc zwNHgd6J|6VO8q*iTgXe4eY7O-iUuWN47?$*R=e=b!DVYO#13pjyM^}w3xj4Yfok!s zEWewoSFGja36Ql=OA;;zS4^;-FdDKaK`4|*L1wg()uICnRS7)thgI4$cL+uWBU~14 zB&XI045wBsrz@f%nGCSovTEDR;Wd|&If%B&KlzN!mqX92$&4X5DEz-3%Za2q5pm%7r zL@~<=G^OxFqK-n>nzy4s#x=AYZxmDSuR7Netqb11aRhSwrmw6hN zQ#gWrNN~QftAU7(5&K6u9S!Ds6X0v zg!9HG8-RHH9L=t}LbpUkNk*1Dfs%%E7z{2g59Ymis6By|*;ek?|HpxNFZ9MHz;Ht< z2&|eMT5X7_*-DpQtqN_8)aDcbEUmF7VrR%1>Ov&hGBc41GG8T`Wy<8{#xMk6ZG<2C zDwiIut2_(2!;)cEf%Z{;g3IP0S!EiACZoQ=RX7lD-&0;syxjRmd*Tg0@p9+;v(n*- z5B0>$tvJw{cAy<-2ik#lpdDxj+JSbU9cTyIfp(xBXb0MXcAy<-2ik#lpdDxj+JSbU z9cTyIfp(xBXb0MXcAy<-2ik#lpdDxj+JSbU9cTyIfp(xBXb0MXcAy<-2ik#lpdDxj f+JSbU9cTyIfp(xBXb0MXcAy<-2ik#lU~}L+Kby{UQt!SZWme{m1q2X3S zipEBt(6mYu6}C^8tML#1W7DMkv6;TAsFS)m+X_f5#Lyxop_2^@sg^kH#ACrLwD*2 z&ufTl;iK~cRj$C@W*=D>BTYP+A0g37z?{Kb1~|s5}Z%#s(?4|5eJp<#T@i z(tI14k6~lvem~ZDTD1D`!^05wO+?eyxk&988 z9}t>6xkdz>SAM;#g{c2A!3w$ z88TgZ7{UWvhRB|XGk}OfQ7}V`N!}|Yb5wV%i?6lFdYp00sW&XjRHKxeMIIX2H6NY6 z1f9)wBS$}_FF!%nuuf-w2(Lfw=9KcUN2xS%WBpIE!s=FSK>&s?=z zC@>X3;4s5hID_@D%=m?mD%W~|2D+Gzay^PO17uBqjpX4QHDFUnbtXk66MFcNLP@9k{2e(M&g%C>z1fMr3Q|rb?j4D%c zr7`o14>_lE-F@&~00lSm09}x&P2>Sph9HJ}|wQGa2(IFD5 zCRS|^rT%pI|G)|GGT#XSy8uF5M!3>3_5zrBhEuxr)GDN@c?N?r_$f%=X4%|M$kL}p zY9&q9u;FADMuoKFyw$@Dx~jkn#~1nRqW(L_J$W#N-O3&`1!Q9fQd>@>EVYS*8@GHj zSun5D_de2`OygPfOa3e)J4SE=gT zy7E$=fD|t4OKux?LT<`^IhJ*7>_`U1HGj}|nBvFqscWQE>Tp7)& z{a>Eo3G6?YZ53Z=QIyzK&DFa*Ns>G~6yt8rZ77P$nWvIfQZHb|E(CXv;Kr=*I(U;Q%ju-GXNc8EU2hH})<^aG}krsg83nHqoINZG&z zjZpBc%7V&iwarl{qB9omD)~ouE=v9iwC>vuj1%BWU?J zT9)Jw)cuDlPlTzoJx-0;HfSu#k-SdmTw)8}R7)nCB8wvACiz)i9AYDb$}=fxu7ZN_ zr??R2T>S1x%f77iko0O2@IWoF#E@w-rGklC&wuxP?iVL3BkJBR}mrpnUosp z?rF31qO5KdI**Hj>80@1PsD9-!-3iJhO~Bxz38qUUU?RHBT8Y}kE7?lxk-FU$lylI z;@qsFN_8ewpcs!gR~0U-cF4{yaex6qK{J@-4L=P{C)x2~UR7lA>8xI0)pbKE$ApV= zL?{^|D^*FE?}HmIx!0Qm1rvZP5%pZ^6_|54xPq59En>Dh|1Pa<;#*X?s~4{s*yCwo zxEwCsZ5X#oq=|d2T$d307-6(Iz-46@qSq%!5R^ACb%7eih)Z)&>^*Dl_D~-XOPEZt zgL739Gw8^?x?oB>B|-&r$fX55!v4#+*XM<742a!LfSH216+7-7$eh3(cqPV8Y3xLu gJd5VtE4dWBS3IQJ)xEPluRt%NL8fs`F|_r60mvH?4*&oF delta 3218 zcmaJ@eQaA-71zxgH%`4i*R7S;xO;t0ow)Im)`>}$h|stlg+d^4#l)(@glW;(l%Tjn zjEeAKX#&B7G~1`$6%uroCba#*hvA`ykEwCj1hre#xDACdg63pWM^RY=TL*O0%J1Cw zUgCBWe~m|yjXY8u*SQ8%Zpa~z)NZrA9=lj*HUv{svPi9`Y{jXc6luSh;0P( zR^`B)GMJhR()f&*GQW!!KI^6Gn2(lCH5N|z)X&U!!@R>v9ge9J@$8VAPyH}J%ZI%5 z)Jy_LLX;i5o6PC;)|bDuq`b$oKUVYRgDq4%(PRyORn1%R>|b2ZmihQO=i5uAp$Mh3 zV^sN(hpxTkLDX8_^e7OeA)WkFKC5!<#tN{~ka7EV%AUTHmWS6_xfA+|+02M$m7iI0 zQ)mlOX)H*^NAIWNy&h}pFNf6D(moyL9?zTbw8Lk`pZiW7TpH56OC)5vOK9YOK0vQL z-;+1*kwvdaa6p**C>6gQrRv0RVRt8`exOtC<3}+@D0BK4hws|Rn{j1}lE)g6rccnO zGhdr(%w~Lu3aUsx5)_)XcRyN?!KLOp6Fp zYJN~w8$>@<7Xmae8D)2JPMCNp(@{KcMq=k3^0IB{^xAp zge<$kYha!J{*(jeu>cBX(7NC6Bj3w9{d#+s9N8+qMrkWx-ErZtpwwbqfvyBlA_kl{ zy&Qm#%=y@p9U_GM0bU%?Hvsb)QJ9HR`ck4W6Lz17jovb zT5?wo@K5g0AeJ@mRPv7mG3TYr7;qer z`Q~n_UjKk%>g^_`7Q#HgAF2JIgO?>p14oduM}oBt?sV)11@>DbQHY6>EGzeFsg7&f zOT{Y&(4~bzv2Ku%tU=T6Ia)>E_kNpv*Oi`|@TL&FQhe@sH6uw}TQKQKz%h zL&h6Gep$n4Fa$%z0%ee;h!~XRCNY>d8{GI&tnHNC-9hCe1C;z56yjfB$eWtX><|YX zDl3ZHR=5)l$}aX7W;tZ`)j^+sa{{O~0~I<`&AI+-V+zQ3RlK6x^E|jF!yM`1 zy!nihpvtiTrJuuEHDKlc-BHKK(w8Fgi3U`MyCQD}(Fq!jUk}pqI}yfg=U?SVq5%CX zb!+=SxIc!|QI1Gf46%oOkajM3t2td3*Fs&At&r!^X>{3n4~@@u(7?M#oyzL4q8Da8 z7&1jP z?iW5MogPjX2Op|2rEwzEX{emqvEODxYP4B4H;8fEEse-Wh>}ZT#hlX37`J}myi#}D zaV_Tf^04FZZ9vtPOjJF%h{n3TG8q(IlThCac)uubF-F0G?N`!Yo!-C!?Qvsq#+|4y z#9o82^`eB^kl>SJl&)`fl%%wC|s*ah~nw!hJ|? z+#=dsX!iZ(luik-LmZW9TRbAJ0|n~kNq{<3CzDa=y1KWVcR@@hTf{?ny(m=7Chje` z?E#nsr6wYiH(SII-mUf(Cd(UPLA4fNXqgv7tLB&&{J>0KjXG8X@>i|m0fgPkX3?z) znQaq$ahGUJ`UhC(26*pYD>WJei$V%^l2}VUAEP_u+PO!;^SB zza@XtDZXgGMsVb8m<6TZ)~h}4Z)i}5_!O=}d3>k1pVO$|;*sMxm{$$$!~-7@TK?}4 z9_*un1NxJo; { @@ -620,6 +631,8 @@ dispFormatButton.addEventListener("click", () => { }); }); + +// saves the feature specific settings function saveSettings() { let featureSelector = document.getElementById("drop"); feature = getSelected(featureSelector); @@ -630,17 +643,138 @@ function saveSettings() { let page = document.getElementById(pageSelector); + + // these common to all settings let speed = getSelected(page.querySelectorAll(".speed-select")[0]); let animation = getSelected(page.querySelectorAll(".animation-select")[0]); - console.log(speed); - console.log(animation); + var settings = {'feature': feature, 'speed':speed, 'animation':animation}; // general settings + + var s; + //function specific settings + switch(pageNum){ + case 1: case 2: case 3: + s = getTradingSettings(page); + break; + case 4: case 5: + s = getWeatherSettings(page); + break; + case 6: + s = getNewsSettings(page); + break; + case 7: case 8: case 9: case 10: + s = getSportsSettings(page); + break; + case 11: case 12: + s = getImageSettings(page); + break; + case 13: + s = getMessageSettings(page); + break; + + } + + settings = {...settings, ...s}; // merge both sets of settings + + console.log(settings); + fetch("/feature_settings", { + method:"PUT", + body:JSON.stringify(settings) + }); } let saveSettingsButtons = document.querySelectorAll(".save-btn-div").forEach(button => button.addEventListener("click", saveSettings) ) + +// gets the stock, crypto or forex specific settings +function getTradingSettings(page) { + + // get all the tick boxes + let percent = page.querySelectorAll(".percent-select")[0].checked; + let point = page.querySelectorAll(".point-select")[0].checked; + let no_logos = page.querySelectorAll(".logo-select")[0].checked; + let chart = page.querySelectorAll(".chart-select")[0].checked; + let title = page.querySelectorAll(".title-select")[0].checked; + + let symbols_el = page.querySelectorAll(".symbol-list")[0]; + let symbols = getListItems(symbols_el); + + let settings = {'percent': percent, 'point':point, 'no_logos':no_logos, 'chart':chart, 'title': title, 'symbols': symbols} + + return settings; +} + +// gets the current wether and forecast settings +function getWeatherSettings(page) { + let temp = getSelected(page.querySelectorAll(".temp-select")[0]); + let speed = getSelected(page.querySelectorAll(".wind-speed-select")[0]); + let colour = getSelected(page.querySelectorAll(".colour-select")[0]); + let city_colour = getSelected(page.querySelectorAll(".city-colour-select")[0]); + let title = page.querySelectorAll(".title-select")[0].checked; + + settings = {'temp':temp, 'speed': speed, 'colour':colour, 'city_colour':city_colour, 'title': title} + + + //only for daily weather + try { + current_weather = page.querySelectorAll(".current-weather-select")[0].checked; + console.log(current_weather); + settings['current_weather'] = current_weather; + } catch { + + } + + + let cities_el = page.querySelectorAll(".city-list")[0]; + let cities = getListItems(cities_el); + settings['cities'] = cities; + + return settings; +} + + +function getNewsSettings(page){ + + let country = getSelected(page.querySelectorAll(".country-select")[0]); + let category = getSelected(page.querySelectorAll(".category-select")[0]); + let title = page.querySelectorAll(".title-select")[0].checked; + + let sources_el = page.querySelectorAll(".sources-list")[0]; + let sources = getListItems(sources_el); + settings = {'country':country, 'category': category, 'title':title, 'sources': sources}; + return settings; +} + + +function getSportsSettings(page){ + let title = page.querySelectorAll(".title-select")[0].checked; + let leagues_el = page.querySelectorAll(".league-list")[0]; + leagues = getListItems(leagues_el); + + settings = {'title':title, 'leagues':leagues}; + return settings; +} + +//images and GIFs +function getImageSettings(page){ + let pause = page.querySelectorAll(".pause-select")[0].value; + let title = page.querySelectorAll(".title-select")[0].checked; + + + let images_el = page.querySelectorAll(".image-list")[0]; + images = getListItems(images_el); + + settings = {'title':title, 'pause':pause, 'images':images}; + return settings; +} + +function getMessageSettings(page) { + +} + + diff --git a/templates/index.html b/templates/index.html index 00b023f..464cd76 100644 --- a/templates/index.html +++ b/templates/index.html @@ -15,7 +15,7 @@ @@ -324,7 +324,7 @@
-
-
  • APL
  • FB
    • @@ -530,7 +530,7 @@
  • NEO,USD
  • BTC,USD
    • @@ -732,7 +732,7 @@
  • NZD,USD
  • CAD,USD
    • @@ -932,7 +932,7 @@
- @@ -947,7 +947,7 @@
- @@ -963,7 +963,7 @@
- @@ -978,7 +978,7 @@
- @@ -994,7 +994,7 @@
  • Hong Kong
  • Boston
    • @@ -1128,7 +1128,7 @@
- @@ -1143,7 +1143,7 @@
- @@ -1160,7 +1160,7 @@
- @@ -1175,7 +1175,7 @@
- @@ -1191,7 +1191,7 @@
  • Moscow
  • Tokyo
    • @@ -1323,7 +1323,7 @@
- @@ -1338,7 +1338,7 @@
- @@ -1389,7 +1389,7 @@
  • Bloomberg
  • ABC News
    • @@ -1522,7 +1522,7 @@
  • NFL
  • NBA
    • @@ -1649,7 +1649,7 @@
  • NFL
  • NBA
    • @@ -1776,7 +1776,7 @@
  • NFL
  • NBA
    • @@ -1902,7 +1902,7 @@
  • NFL
  • NBA
    • @@ -2030,7 +2030,7 @@
@@ -2053,7 +2053,7 @@
  • asdf.png
  • image.png
    • @@ -2193,7 +2193,7 @@
@@ -2216,7 +2216,7 @@
  • asdf.gif
  • image.gif