Ignore some environment

.gitignore

@@ -78,9 +78,13 @@ celerybeat-schedule
 # dotenv
 .env
 
+# direnv
+.envrc
+
 # virtualenv
 venv/
 ENV/
+.venv
 
 # Spyder project settings
 .spyderproject
@@ -94,6 +98,9 @@ ENV/
 # vim
 *.swp
 
+# Zed editor
+.zed
+
 # digimarks
 static/favicons
 tags

README.rst

@@ -125,7 +125,7 @@ Attributions
 'M' favicon by `Freepik`_.
 
 
-.. _digimarks: https://github.com/aquatix/digimarks
+.. _digimarks: https://codeberg.org/diginaut/digimarks
 .. |PyPI version| image:: https://img.shields.io/pypi/v/digimarks.svg
    :target: https://pypi.python.org/pypi/digimarks/
 .. |PyPI license| image:: https://img.shields.io/github/license/aquatix/digimarks.svg
@@ -136,11 +136,11 @@ Attributions
 .. |Codacy| image:: https://api.codacy.com/project/badge/Grade/9a34319d917b43219a29e59e9ac75e3b
    :alt: Codacy Badge
    :target: https://app.codacy.com/app/aquatix/digimarks?utm_source=github.com&utm_medium=referral&utm_content=aquatix/digimarks&utm_campaign=badger
-.. _hook settings: https://github.com/aquatix/digimarks/blob/master/example_config/examples.yaml
-.. _vhost for Apache2.4: https://github.com/aquatix/digimarks/blob/master/example_config/apache_vhost.conf
-.. _uwsgi.ini: https://github.com/aquatix/digimarks/blob/master/example_config/uwsgi.ini
-.. _Changelog: https://github.com/aquatix/digimarks/blob/master/CHANGELOG.md
+.. _hook settings: https://codeberg.org/diginaut/digimarks/blob/master/example_config/examples.yaml
+.. _vhost for Apache2.4: https://codeberg.org/diginaut/digimarks/blob/master/example_config/apache_vhost.conf
+.. _uwsgi.ini: https://codeberg.org/diginaut/digimarks/blob/master/example_config/uwsgi.ini
+.. _Changelog: https://codeberg.org/diginaut/digimarks/blob/master/CHANGELOG.md
 .. _Freepik: http://www.flaticon.com/free-icon/letter-m_2041
-.. _systemd for digimarks API: https://github.com/aquatix/digimarks/blob/master/example_config/systemd/digimarks.service
-.. _gunicorn config: https://github.com/aquatix/digimarks/blob/master/example_config/gunicorn_digimarks_conf.py
-.. _more config: https://github.com/aquatix/digimarks/tree/master/example_config
+.. _systemd for digimarks API: https://codeberg.org/diginaut/digimarks/blob/master/example_config/systemd/digimarks.service
+.. _gunicorn config: https://codeberg.org/diginaut/digimarks/src/branch/master/example_config/uwsgi.ini
+.. _more config: https://codeberg.org/diginaut/digimarks/src/branch/master/example_config

pyproject.toml

@@ -30,6 +30,11 @@ dependencies = [
     "feedgen",
 ]
 
+[project.optional-dependencies]
+server = [
+    "uvicorn",
+]
+
 [dependency-groups]
 dev = [
     { include-group = "lint" },

requirements-server.in

@@ -1,3 +1,3 @@
 -r requirements.in
 
-gunicorn
+uvicorn

src/digimarks/main.py

@@ -36,8 +36,8 @@ class Settings(BaseSettings):
     # inside the codebase
     # static_dir: DirectoryPath = Path('digimarks/static')
     # template_dir: DirectoryPath = Path('digimarks/templates')
-    static_dir: DirectoryPath = 'digimarks/static'
-    template_dir: DirectoryPath = 'digimarks/templates'
+    static_dir: DirectoryPath = DirectoryPath('digimarks/static')
+    template_dir: DirectoryPath = DirectoryPath('digimarks/templates')
 
     media_url: str = '/static/'
 
@@ -127,7 +127,7 @@ def index(request: Request):
 
 
 @app.get('/api/v1/admin/{system_key}/users/{user_id}', response_model=User)
-async def get_user(session: SessionDep, system_key: str, user_id: int) -> type[User]:
+async def get_user(session: SessionDep, system_key: str, user_id: int) -> User:
     """Show user information."""
     logger.info('User %d requested', user_id)
     if system_key != settings.system_key:

src/digimarks/static/css/digui.css

@@ -3,7 +3,7 @@
  * v0.0.2
  *
  * Created by: Michiel Scholten
- * Source: https://github.com/aquatix/digui
+ * Source: https://codeberg.org/diginaut/digui
  */
 
 /** Colours and themes */

src/digimarks/templates/index.html

@@ -9,7 +9,7 @@
                 <ul>
                     <li><h1>digimarks</h1></li>
                     <li>
-                        <a class="button" href="https://github.com/aquatix/digimarks">digimarks project page</a>
+                        <a class="button" href="https://codeberg.org/diginaut/digimarks">digimarks project page</a>
                     </li>
                 </ul>
             </nav>
@@ -18,7 +18,7 @@
         <main>
             <h1>Welcome to digimarks, your online bookmarking and notes tool</h1>
 
-            <p>Please visit your personal url, or <a href="https://github.com/aquatix/digimarks">see the digimarks
+            <p>Please visit your personal url, or <a href="https://codeberg.org/diginaut/digimarks">see the digimarks
                 project page</a>.</p>
 
             <p>If you forgot/lost your personal url, contact your digimarks