Merge 4db6ef807b into 794f26f767

Co-Authored-By: qurbanov <10328930+qurbanov@users.noreply.github.com>

.isort.cfg

@@ -5,6 +5,7 @@ include_trailing_comma=True
 force_grid_wrap=0
 line_length=88
 combine_as_imports=True
+profile = "black"
 
 # If set, imports will be sorted within their section independent to the import_type.
 force_sort_within_sections=True

docs/contributing.md

@@ -78,6 +78,15 @@ Thanks again!
 (setup-dev-environment)=
 ## Set up a dev environment
 
+### Requirements
+
+In addition to general {ref}`requirements<system-requirements>`, you will need
+**uv**. It recommended to install uv [system
+wide](https://docs.astral.sh/uv/getting-started/installation/#standalone-installer)
+as it is a kind of replacement for pip.
+
+### Getting the sources
+
 You must develop on top of the Git master branch:
 
     git clone https://github.com/spiral-project/ihatemoney.git

ihatemoney/default_settings.py

@@ -15,6 +15,7 @@ APPLICATION_ROOT = "/"
 ENABLE_CAPTCHA = False
 LEGAL_LINK = ""
 SUPPORTED_LANGUAGES = [
+    "az",
     "ca",
     "cs",
     "de",
@@ -47,3 +48,4 @@ SUPPORTED_LANGUAGES = [
     "uk",
     "zh_Hans",
 ]
+SHOWCASE_LANGUAGES = ["en", "fr"]

ihatemoney/history.py

@@ -38,6 +38,9 @@ def history_sort_key(history_item_dict):
 
 def describe_version(version_obj):
     """Use the base model str() function to describe a version object"""
+    if not version_obj:
+        return ""
+    else:
         return parent_class(type(version_obj)).__str__(version_obj)
 
 

ihatemoney/templates/home.html

@@ -1,100 +1,91 @@
 {% extends "layout.html" %}
-
 {% block body %}
-<header id="header" class="row">
+  <header id="header" class="row">
     <div class="col-xs-12 col-sm-5 offset-md-2">
-    <h2>{{ _("Manage your shared <br />expenses, easily") }}</h2>
+      <h2>
+        {{ _("Manage your shared <br />expenses, easily") }}
+      </h2>
       {% if is_demo_project_activated %}
-        <a href="{{ url_for('.demo') }}" class="tryout btn">
+        <a href="{{ url_for(".demo") }}" class="tryout btn">{{ _("Try out the demo") }}</a>
-            {{ _("Try out the demo") }}
-        </a>
       {% endif %}
-    {% if g.lang == 'fr' %}
+      {% if g.lang == 'fr' or g.lang == 'en' %}
-        ou
+        {{ _("or") }}
         <span class="side-to-side">
-          <a class="showcase btn" onclick="javascript:showGallery(); return false;">Voir la BD explicative</a>
+          <a class="showcase btn"
-          <img class="showcaseimg" src="{{ url_for("static", filename='images/indicate.svg') }}" />
+             onclick="javascript:showGallery(); return false;">{{ _("See the explicative comics") }}</a>
+          <img class="showcaseimg"
+               src="{{ url_for("static", filename='images/indicate.svg') }}" />
         </span>
       {% endif %}
     </div>
     <div class="col-xs-12 col-sm-4">
-    <table class="additional-content"><tr>
+      <table class="additional-content">
+        <tr>
           <td>
-        {{ _("You're sharing a house?") }}<br />
+            {{ _("You're sharing a house?") }}
-        {{ _("Going on holidays with friends?") }}<br />
+            <br />
-        {{ _("Simply sharing money with others?") }} <br />
+            {{ _("Going on holidays with friends?") }}
+            <br />
+            {{ _("Simply sharing money with others?") }}
+            <br />
             <strong>{{ _("We can help!") }}</strong>
           </td>
           <td>
-        <img class="shareimg" src="{{ url_for("static", filename='images/share.svg') }}" />
+            <img class="shareimg"
+                 src="{{ url_for("static", filename='images/share.svg') }}" />
           </td>
-    </tr></table>
+        </tr>
+      </table>
     </div>
-</header>
+  </header>
-<main class="row home">
+  <main class="row home">
     <div class="card-deck ml-auto mr-auto">
       <div class="card">
-      <div class="card-header">
+        <div class="card-header">{{ _("Log in to an existing project") }}</div>
-        {{ _("Log in to an existing project") }}
-      </div>
         <div class="card-body">
-        <form
+          <form id="authentication-form"
-          id="authentication-form"
                 class="form-horizontal"
-          action="{{ url_for('.authenticate') }}"
+                action="{{ url_for(".authenticate") }}"
                 method="post">
             <fieldset class="form-group">
               <legend></legend>
               {{ forms.authenticate(auth_form, home=True) }}
             </fieldset>
             <div class="controls">
-            <button class="btn btn-primary btn-block" type="submit">
+              <button class="btn btn-primary btn-block" type="submit">{{ _("Log in") }}</button>
-              {{ _("Log in") }}
+              <a class="password-reminder btn btn-link"
-            </button>
+                 href="{{ url_for(".remind_password") }}">{{ _("can't remember your password?") }}</a>
-            <a
-              class="password-reminder btn btn-link"
-              href="{{ url_for('.remind_password') }}"
-              >{{ _("can't remember your password?") }}</a
-            >
             </div>
           </form>
         </div>
       </div>
       <div class="card">
-      <div class="card-header">
+        <div class="card-header">{{ _("Create a new project") }}</div>
-        {{ _("Create a new project") }}
-      </div>
         <div class="card-body">
           {% if is_public_project_creation_allowed %}
-            <form
+            <form id="creation-form"
-            id="creation-form"
                   class="form-horizontal"
-            action="{{ url_for('.create_project') }}"
+                  action="{{ url_for(".create_project") }}"
-            method="post"
+                  method="post">
-            >
               <fieldset class="form-group">
                 {{ forms.create_project(project_form, home=True) }}
               </fieldset>
               <div class="controls">
-                <button class="btn btn-primary btn-block" type="submit">
+                <button class="btn btn-primary btn-block" type="submit">{{ _("Create") }}</button>
-                {{ _("Create") }}
-                </button>
               </div>
             </form>
           {% else %}
-            <a href="{{ url_for('.create_project') }}">
+            <a href="{{ url_for(".create_project") }}">{{ _("Create a new project") }}</a>
-                {{ _("Create a new project") }}
-            </a>
           {% endif %}
         </div>
       </div>
     </div>
-</main>
+  </main>
 {% endblock %}
 {% block js %}
-$('#creation-form #password').tooltip({
+  $('#creation-form #password').tooltip({
   title: "{{ _("Don\\'t reuse a personal password. Choose a private code and send it to your friends") }}",
   trigger: 'focus',
   placement: 'right'
-});
+  });
 {% endblock %}

ihatemoney/templates/layout.html

@@ -46,7 +46,7 @@
     </script>
 </head>
 <body class="d-flex flex-column h-100">
-  {% if g.lang == 'fr' %}{% include "showcase.html" %}{% endif %}
+  {% if display_showcase %}{% include "showcase.html" %}{% endif %}
   <nav class="navbar navbar-expand-lg fixed-top navbar-dark bg-dark">
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggler" aria-controls="navbarToggler" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>

ihatemoney/templates/showcase.html

@@ -1,4 +1,8 @@
-<div id="pswp" class="hiddenpswp" tabindex="-1" role="dialog" aria-hidden="true">
+<div id="pswp"
+     class="hiddenpswp"
+     tabindex="-1"
+     role="dialog"
+     aria-hidden="true">
   <div class="pswp__bg"></div>
   <div class="pswp__scroll-wrap">
     <div class="pswp__container">
@@ -18,13 +22,10 @@
           </div>
         </div>
       </div>
-
+      <button class="pswp__button pswp__button--arrow--left"
-            <button class="pswp__button pswp__button--arrow--left" title="Suivant (flèche droite)">
+              title="Suivant (flèche droite)"></button>
-            </button>
+      <button class="pswp__button pswp__button--arrow--right"
-
+              title="Précédent (flèche gauche)"></button>
-            <button class="pswp__button pswp__button--arrow--right" title="Précédent (flèche gauche)">
-            </button>
-
       <div class="pswp__caption">
         <div class="pswp__caption__center"></div>
       </div>
@@ -32,18 +33,26 @@
   </div>
 </div>
 <script type="text/javascript">
-var pswpElement = document.getElementById('pswp');
+var pswpElement = document.getElementById("pswp");
-var items = JSON.parse('[{"h": 2450, "src": "{{ url_for("static", filename="showcase/1.webp") }}", "w": 2450}, {"h": 2509, "src": "{{ url_for("static", filename="showcase/2.webp") }}", "w": 2221}, {"h": 2536, "src": "{{ url_for("static", filename="showcase/3.webp") }}", "w": 2101}, {"h": 2722, "src": "{{ url_for("static", filename="showcase/4.webp") }}", "w": 2348}, {"h": 2745, "src": "{{ url_for("static", filename="showcase/5.webp") }}", "w": 1804}, {"h": 3307, "src": "{{ url_for("static", filename="showcase/6.webp") }}", "w": 2897}, {"h": 2321, "src": "{{ url_for("static", filename="showcase/7.webp") }}", "w": 2239}, {"h": 2470, "src": "{{ url_for("static", filename="showcase/8.webp") }}", "w": 2419}, {"h": 3307, "src": "{{ url_for("static", filename="showcase/9.webp") }}", "w": 2602}]');
 var options = {
   index: 0,
   loop: false,
 };
 
 function showGallery(){
+  let items = [
+    {"h": 2450, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/1.webp') }}", "w": 2450},
+    {"h": 2509, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/2.webp') }}", "w": 2221},
+    {"h": 2536, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/3.webp') }}", "w": 2101},
+    {"h": 2722, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/4.webp') }}", "w": 2348},
+    {"h": 2745, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/5.webp') }}", "w": 1804},
+    {"h": 3307, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/6.webp') }}", "w": 2897},
+    {"h": 2321, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/7.webp') }}", "w": 2239},
+    {"h": 2470, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/8.webp') }}", "w": 2419},
+    {"h": 3307, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/9.webp') }}", "w": 2602}
+  ];
 
-   /* the CSS and JS for photoswipe is loaded dynamically
+  // CSS and JS are loaded dynamically when the gallery opens
-    * so that they are not loaded if the gallery is not open */
-
   $('head').append('<link rel="stylesheet" type="text/css" href="{{ url_for("static", filename="photoswipe/default-skin/default-skin.css") }}">');
   $('head').append('<link rel="stylesheet" type="text/css" href="{{ url_for("static", filename="photoswipe/photoswipe.css") }}">');
 
@@ -63,5 +72,4 @@ function showGallery(){
   };
   document.body.appendChild(script);
 }
-
 </script>

ihatemoney/web.py

@@ -302,12 +302,14 @@ def home():
     is_public_project_creation_allowed = current_app.config[
         "ALLOW_PUBLIC_PROJECT_CREATION"
     ]
+    display_showcase = g.lang in current_app.config["SHOWCASE_LANGUAGES"]
 
     return render_template(
         "home.html",
         project_form=project_form,
         is_demo_project_activated=is_demo_project_activated,
         is_public_project_creation_allowed=is_public_project_creation_allowed,
+        display_showcase=display_showcase,
         auth_form=auth_form,
         session=session,
     )
@@ -684,6 +686,7 @@ def list_bills():
         csrf_form=csrf_form,
         add_bill=request.values.get("add_bill", False),
         current_view="list_bills",
+        display_showcase=g.lang in current_app.config["SHOWCASE_LANGUAGES"],
     )
 
 

pyproject.toml

@@ -58,7 +58,6 @@ database = [
 ]
 dev = [
     "ruff==0.8.4",
-    "flake8==5.0.4",
     "isort==5.11.5",
     "vermin==1.6.0",
     "pytest>=6.2.5",

uv.lock

@@ -439,20 +439,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/02/cc/b7e31358aac6ed1ef2bb790a9746ac2c69bcb3c8588b41616914eb106eaf/exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b", size = 16453 },
 ]
 
-[[package]]
-name = "flake8"
-version = "5.0.4"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "mccabe" },
-    { name = "pycodestyle" },
-    { name = "pyflakes" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/ad/00/9808c62b2d529cefc69ce4e4a1ea42c0f855effa55817b7327ec5b75e60a/flake8-5.0.4.tar.gz", hash = "sha256:6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db", size = 145862 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/cf/a0/b881b63a17a59d9d07f5c0cc91a29182c8e8a9aa2bde5b3b2b16519c02f4/flake8-5.0.4-py2.py3-none-any.whl", hash = "sha256:7a1cf6b73744f5806ab95e526f6f0d8c01c66d7bbe349562d22dfca20610b248", size = 61897 },
-]
-
 [[package]]
 name = "flask"
 version = "2.3.3"
@@ -708,7 +694,6 @@ database = [
     { name = "pymysql" },
 ]
 dev = [
-    { name = "flake8" },
     { name = "isort" },
     { name = "pytest" },
     { name = "pytest-flask" },
@@ -729,8 +714,7 @@ requires-dist = [
     { name = "debts", specifier = ">=0.5,<1" },
     { name = "docutils", marker = "extra == 'doc'", specifier = "==0.20.1" },
     { name = "email-validator", specifier = ">=1.0,<3" },
-    { name = "flake8", marker = "extra == 'dev'", specifier = "==5.0.4" },
+    { name = "flask", specifier = ">=2,<4" },
-    { name = "flask", specifier = ">=2,<3" },
     { name = "flask-babel", specifier = ">=1.0,<4" },
     { name = "flask-cors", specifier = ">=3.0.8,<4" },
     { name = "flask-limiter", specifier = ">=2.6,<3" },
@@ -743,21 +727,21 @@ requires-dist = [
     { name = "isort", marker = "extra == 'dev'", specifier = "==5.11.5" },
     { name = "itsdangerous", specifier = ">=2,<3" },
     { name = "jinja2", specifier = ">=3,<4" },
-    { name = "myst-parser", marker = "extra == 'doc'", specifier = ">=2,<3" },
+    { name = "myst-parser", marker = "extra == 'doc'", specifier = ">=2,<5" },
     { name = "psycopg2-binary", marker = "extra == 'database'", specifier = ">=2.9.2,<2.9.9" },
-    { name = "pymysql", marker = "extra == 'database'", specifier = ">=0.9,<1.1" },
+    { name = "pymysql", marker = "extra == 'database'", specifier = ">=0.9,<1.2" },
     { name = "pytest", marker = "extra == 'dev'", specifier = ">=6.2.5" },
     { name = "pytest-flask", marker = "extra == 'dev'", specifier = ">=1.2.0" },
     { name = "python-dateutil" },
     { name = "qrcode", specifier = ">=7.1,<8" },
     { name = "requests", specifier = ">=2.25,<3" },
     { name = "ruff", marker = "extra == 'dev'", specifier = "==0.6.8" },
-    { name = "sphinx", marker = "extra == 'doc'", specifier = ">=7.0.1,<8" },
+    { name = "sphinx", marker = "extra == 'doc'", specifier = ">=7.0.1,<9" },
     { name = "sqlalchemy", specifier = ">=1.3.0,<1.5" },
     { name = "sqlalchemy-continuum", specifier = ">=1.3.12,<2" },
-    { name = "vermin", marker = "extra == 'dev'", specifier = "==1.5.2" },
+    { name = "vermin", marker = "extra == 'dev'", specifier = "==1.6.0" },
     { name = "werkzeug", specifier = ">=2,<3" },
-    { name = "wtforms", specifier = ">=2.3.3,<3.2" },
+    { name = "wtforms", specifier = ">=2.3.3,<3.3" },
     { name = "zest-releaser", marker = "extra == 'dev'", specifier = ">=6.20.1" },
 ]
 
@@ -994,15 +978,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/f6/f8/4da07de16f10551ca1f640c92b5f316f9394088b183c6a57183df6de5ae4/MarkupSafe-2.1.5-cp39-cp39-win_amd64.whl", hash = "sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5", size = 17211 },
 ]
 
-[[package]]
-name = "mccabe"
-version = "0.7.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/e7/ff/0ffefdcac38932a54d2b5eed4e0ba8a408f215002cd178ad1df0f2806ff8/mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", size = 9658 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e", size = 7350 },
-]
-
 [[package]]
 name = "mdit-py-plugins"
 version = "0.4.2"
@@ -1165,15 +1140,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/e7/56/39189b7bf61744a627c18f3a919647f7eac78d849de1f8b2ad1a5c11f824/psycopg2_binary-2.9.8-cp39-cp39-win_amd64.whl", hash = "sha256:1f279ba74f0d6b374526e5976c626d2ac3b8333b6a7b08755c513f4d380d3add", size = 1177351 },
 ]
 
-[[package]]
-name = "pycodestyle"
-version = "2.9.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/b6/83/5bcaedba1f47200f0665ceb07bcb00e2be123192742ee0edfb66b600e5fd/pycodestyle-2.9.1.tar.gz", hash = "sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785", size = 102127 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/67/e4/fc77f1039c34b3612c4867b69cbb2b8a4e569720b1f19b0637002ee03aff/pycodestyle-2.9.1-py2.py3-none-any.whl", hash = "sha256:d1735fc58b418fd7c5f658d28d943854f8a849b01a5d0a1e6f3f3fdd0166804b", size = 41493 },
-]
-
 [[package]]
 name = "pycparser"
 version = "2.22"
@@ -1183,15 +1149,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/13/a3/a812df4e2dd5696d1f351d58b8fe16a405b234ad2886a0dab9183fb78109/pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc", size = 117552 },
 ]
 
-[[package]]
-name = "pyflakes"
-version = "2.5.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/07/92/f0cb5381f752e89a598dd2850941e7f570ac3cb8ea4a344854de486db152/pyflakes-2.5.0.tar.gz", hash = "sha256:491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3", size = 66388 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/dc/13/63178f59f74e53acc2165aee4b002619a3cfa7eeaeac989a9eb41edf364e/pyflakes-2.5.0-py2.py3-none-any.whl", hash = "sha256:4579f67d887f804e67edb544428f264b7b24f435b263c4614f384135cea553d2", size = 66116 },
-]
-
 [[package]]
 name = "pygments"
 version = "2.18.0"
@@ -1695,10 +1652,11 @@ wheels = [
 
 [[package]]
 name = "vermin"
-version = "1.5.2"
+version = "1.6.0"
 source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/3d/26/7b871396c33006c445c25ef7da605ecbd6cef830d577b496d2b73a554f9d/vermin-1.6.0.tar.gz", hash = "sha256:6266ca02f55d1c2aa189a610017c132eb2d1934f09e72a955b1eb3820ee6d4ef", size = 93181 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/46/ed/420955392d9c2743c93e0418928927e34aba355c716a70c6bdba209b930f/vermin-1.5.2-py2.py3-none-any.whl", hash = "sha256:c1566ad4e1c8e1b0e98cf5f7d69b691d44a578e2ce9c5aa1d418736bc4944b32", size = 89266 },
+    { url = "https://files.pythonhosted.org/packages/2e/98/1a2ca43e6d646421eea16ec19977e2e6d1ea9079bd9d873bfae513d43f1c/vermin-1.6.0-py2.py3-none-any.whl", hash = "sha256:f1fa9ee40f59983dc40e0477eb2b1fa8061a3df4c3b2bcf349add462a5610efb", size = 90845 },
 ]
 
 [[package]]