diff --git a/.gitignore b/.gitignore index b8fb0eb..fa40a2e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ __pycache__/ *.py[cod] *$py.class - # C extensions *.so @@ -28,6 +27,7 @@ share/python-wheels/ .installed.cfg *.egg MANIFEST +*DS_STORE # PyInstaller # Usually these files are written by a python script from a template @@ -139,6 +139,9 @@ venv.bak/ # VS Code .vscode +# JetBrains +.idea/* + # Rope project settings .ropeproject @@ -160,4 +163,4 @@ dmypy.json cython_debug/ # Precommit hooks: ruff cache -.ruff_cache \ No newline at end of file +.ruff_cache diff --git a/app/css/style.css b/app/css/style.css index 0db5dee..729f379 100644 --- a/app/css/style.css +++ b/app/css/style.css @@ -55,7 +55,7 @@ } .world_map { - background-image: url("../../images/world_map.png"); + background-image: url("../../images/world_map.jpg"); -webkit-text-fill-color:#FFFFFF; padding-left:10%; padding-top:5%; @@ -226,7 +226,7 @@ padding-top:0%; padding-right:10%; padding-bottom:5%; - + } .buttonsection { @@ -259,4 +259,4 @@ padding-right: 30px; padding-bottom: 50px; padding-left: 80px; -} \ No newline at end of file +} diff --git a/app/images/Arrow 1.png b/app/images/Arrow 1.png index 6db72e6..33ec168 100644 Binary files a/app/images/Arrow 1.png and b/app/images/Arrow 1.png differ diff --git a/app/images/Arrow_ 1 .png b/app/images/Arrow_ 1 .png index 99659a5..a9e7ab9 100644 Binary files a/app/images/Arrow_ 1 .png and b/app/images/Arrow_ 1 .png differ diff --git a/app/images/Vector.svg b/app/images/Vector.svg index a961475..8947e23 100644 --- a/app/images/Vector.svg +++ b/app/images/Vector.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/images/bahamas.png b/app/images/bahamas.png index 503a058..b9297c4 100644 Binary files a/app/images/bahamas.png and b/app/images/bahamas.png differ diff --git a/app/images/data4good-logo.svg b/app/images/data4good-logo.svg index 28a5128..4350782 100644 --- a/app/images/data4good-logo.svg +++ b/app/images/data4good-logo.svg @@ -1,9 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/app/images/eutax-logo.svg b/app/images/eutax-logo.svg index a2fb664..f3b7956 100644 --- a/app/images/eutax-logo.svg +++ b/app/images/eutax-logo.svg @@ -1,9 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/app/images/linkedin-logo.svg b/app/images/linkedin-logo.svg index 3ea83b0..8f2049f 100644 --- a/app/images/linkedin-logo.svg +++ b/app/images/linkedin-logo.svg @@ -1,9 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/app/images/logo.png b/app/images/logo.png index 596cdb5..198778a 100644 Binary files a/app/images/logo.png and b/app/images/logo.png differ diff --git a/app/images/pexels-ingo-joseph-1880351.jpg b/app/images/pexels-ingo-joseph-1880351.jpg new file mode 100644 index 0000000..088d7c1 Binary files /dev/null and b/app/images/pexels-ingo-joseph-1880351.jpg differ diff --git a/app/images/pexels-ingo-joseph-1880351.png b/app/images/pexels-ingo-joseph-1880351.png deleted file mode 100644 index 4ce8e5c..0000000 Binary files a/app/images/pexels-ingo-joseph-1880351.png and /dev/null differ diff --git a/app/images/tag_cloud.png b/app/images/tag_cloud.png index 069c4e9..ffa62a1 100644 Binary files a/app/images/tag_cloud.png and b/app/images/tag_cloud.png differ diff --git a/app/images/taxplorer-logo.svg b/app/images/taxplorer-logo.svg index 0499969..c5c4cc1 100644 --- a/app/images/taxplorer-logo.svg +++ b/app/images/taxplorer-logo.svg @@ -1,21 +1 @@ - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/app/images/twitter-logo.svg b/app/images/twitter-logo.svg index 950c7b1..14c89e9 100644 --- a/app/images/twitter-logo.svg +++ b/app/images/twitter-logo.svg @@ -1,9 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/app/images/viz.png b/app/images/viz.png index 81bd2dc..3f30f49 100644 Binary files a/app/images/viz.png and b/app/images/viz.png differ diff --git a/app/images/website-logo.svg b/app/images/website-logo.svg index be90a16..6a233fc 100644 --- a/app/images/website-logo.svg +++ b/app/images/website-logo.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/images/world_map.jpg b/app/images/world_map.jpg new file mode 100644 index 0000000..4dee175 Binary files /dev/null and b/app/images/world_map.jpg differ diff --git a/app/images/world_map.png b/app/images/world_map.png deleted file mode 100644 index 51b92f1..0000000 Binary files a/app/images/world_map.png and /dev/null differ diff --git a/app/pages/company/company.py b/app/pages/company/company.py index 156892a..265dd50 100644 --- a/app/pages/company/company.py +++ b/app/pages/company/company.py @@ -8,7 +8,7 @@ import algo # from dataviz import algo from data.data import data #from dataviz.data.data import data -header_right_image_path = 'images/pexels-ingo-joseph-1880351.png' +header_right_image_path = 'images/pexels-ingo-joseph-1880351.jpg' download_icon_path = 'images/Vector.svg' # selected_company = 'ACCIONA' diff --git a/app/pages/country/country.py b/app/pages/country/country.py index cbbbbe8..87c407c 100644 --- a/app/pages/country/country.py +++ b/app/pages/country/country.py @@ -8,7 +8,7 @@ import io -header_right_image_path = 'images/pexels-ingo-joseph-1880351.png' +header_right_image_path = 'images/pexels-ingo-joseph-1880351.jpg' download_icon_path = 'images/Vector.svg' selected_country = 'Mauritius' @@ -17,7 +17,7 @@ colname_country = 'jur_name' selector_country = list(np.sort(data[colname_country].astype(str).unique())) -df_selected_country = data[data["jur_name"]==selected_country] +df_selected_country = data[data["jur_name"]==selected_country] df_count_country = algo.number_of_tracked_reports_over_time_country(df_selected_country) colname_sector = 'sector' @@ -41,11 +41,11 @@ def on_change_country(state): # state contains all the Gui variables and this is through this state variable # that we can update the Gui # state.selected_country, state.data_country_date, ... - # update data_country_date with the right country + # update data_country_date with the right country # (use initialize_case_evolution) print("Chosen country: ", state.selected_country) - state.df_selected_country = data[data["jur_name"]==state.selected_country] - + state.df_selected_country = data[data["jur_name"]==state.selected_country] + # state.pie_chart = pd.DataFrame({"labels": ["Deaths", "Recovered", "Confirmed"], # "values": [state.data_country_date.iloc[-1, 6], state.data_country_date.iloc[-1, 5], state.data_country_date.iloc[-1, 4]]}) state.df_count_country = algo.number_of_tracked_reports_over_time_country(state.df_selected_country)