major improvements

added expenses and donations
replaced some icons with svgs

src/_includes/donations-current.html

@@ -0,0 +1,34 @@
+<table class="table">
+    <thead>
+    <tr>
+        <th>{{strings.date[locale]}}</th>
+        <th>{{strings.via[locale]}}</th>
+        <th>{{strings.from[locale]}}</th>
+        <th>{{strings.amount[locale]}}</th>
+    </tr>
+    </thead>
+    <tbody>
+    {% for donation in donations[0].donations %}
+    <tr>
+        <td>{{donation.date}}</td>
+        {% if donation.via == 'opencollective' %}
+        <td><a href="https://opencollective.com/sp-codes" rel="nofollow">Open Collective</a></td>
+        {% else %}
+        <td>{{strings[donation.via][locale]}}</td>
+        {% endif %}
+        {% if donation.from %}
+        <td>{{donation.from}}</td>
+        {% else %}
+        <td>***</td>
+        {% endif %}
+        <td>{{donation.amount | amount(locale)}} €</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+    <tfoot>
+    <tr>
+        <th colspan="3">{{strings.total[locale]}}</th>
+        <th>{{donations[0].donations | sum | amount(locale)}} €</th>
+    </tr>
+    </tfoot>
+</table>

src/_includes/donations.html

@@ -0,0 +1,38 @@
+{% for year in donations %}
+<h2>{{year.year}}</h2>
+
+<table class="table">
+    <thead>
+    <tr>
+        <th>{{strings.date[locale]}}</th>
+        <th>{{strings.via[locale]}}</th>
+        <th>{{strings.from[locale]}}</th>
+        <th>{{strings.amount[locale]}}</th>
+    </tr>
+    </thead>
+    <tbody>
+    {% for donation in year.donations %}
+    <tr>
+        <td>{{donation.date}}</td>
+        {% if donation.via == 'opencollective' %}
+        <td><a href="https://opencollective.com/sp-codes" rel="nofollow">Open Collective</a></td>
+        {% else %}
+        <td>{{strings[donation.via][locale]}}</td>
+        {% endif %}
+        {% if donation.from %}
+        <td>{{donation.from}}</td>
+        {% else %}
+        <td>***</td>
+        {% endif %}
+        <td>{{donation.amount | amount(locale)}} €</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+    <tfoot>
+    <tr>
+        <th colspan="3">{{strings.total[locale]}}</th>
+        <th>{{year.donations | sum | amount(locale)}} €</th>
+    </tr>
+    </tfoot>
+</table>
+{% endfor %}

src/_includes/expenses-current.html

@@ -0,0 +1,33 @@
+<table class="table">
+    <thead>
+    <tr>
+        <th>{{strings.name[locale]}}</th>
+        <th>{{strings.type[locale]}}</th>
+        <th>{{strings.provider[locale]}}</th>
+        <th>{{strings.amount[locale]}} / {{strings.month[locale]}}</th>
+        <th>{{strings.amount[locale]}} / {{strings.year[locale]}}</th>
+    </tr>
+    </thead>
+    <tbody>
+    {% for expense in expenses %}
+    <tr>
+        {% if expense.name[locale] %}
+        <td>{{expense.name[locale]}}</td>
+        {% else %}
+        <td>{{expense.name}}</td>
+        {% endif %}
+        <td>{{expense.type}}</td>
+        <td>{{expense.provider}}</td>
+        <td>{{expense.amount | amount(locale)}} €</td>
+        <td>{{expense.amount | year | amount(locale)}} €</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+    <tfoot>
+    <tr>
+        <th colspan="3">{{strings.total[locale]}}</th>
+        <th>{{expenses | sum | amount(locale)}} €</th>
+        <th>{{expenses | sum | year | amount(locale)}} €</th>
+    </tr>
+    </tfoot>
+</table>

src/_includes/layouts/services.njk

@@ -6,5 +6,5 @@ layout: base.njk
 {{ content | safe }}
 
 <div class="row justify-content-center">
-  {% include 'services-extended.html' %}
+  {% include "services-extended.html" %}
 </div>

src/_includes/profiles.html

@@ -1,18 +1,28 @@
 <div class="d-flex justify-content-center flex-wrap my-3 contact-links">
-    <div class="m-2"><a href="mailto:mail@sp-codes.de"><span
-            class="fas fa-fw fa-4x fa-envelope"></span></a></div>
+    <div class="m-2"><a href="mailto:mail@sp-codes.de">
+        <span class="d-none d-md-block fas fa-fw fa-4x fa-envelope"></span>
+        <span class="d-block d-md-none fas fa-fw fa-2x fa-envelope"></span>
+    </a></div>
     <div class="m-2"><a href="https://matrix.to/#/@samuel-p:matrix.sp-codes.de">
-        <span class="si si-matrix"></span>
+        <span class="d-none d-md-block si si-matrix si-4x"></span>
+        <span class="d-block d-md-none si si-matrix si-2x"></span>
+    </a></div>
+    <div class="m-2"><a rel="me" href="https://social.sp-codes.de/@samuel_p">
+        <span class="d-none d-md-block si si-mastodon si-4x"></span>
+        <span class="d-block d-md-none si si-mastodon si-2x"></span>
+    </a></div>
+    <div class="m-2"><a href="https://stackoverflow.com/users/9662601/samuel-p">
+        <span class="d-none d-md-block fab fa-fw fa-4x fa-stack-overflow"></span>
+        <span class="d-block d-md-none fab fa-fw fa-2x fa-stack-overflow"></span>
     </a></div>
-    <div class="m-2"><a rel="me" href="https://social.sp-codes.de/@samuel_p"><span
-            class="fab fa-fw fa-4x fa-mastodon"></span></a></div>
-    <div class="m-2"><a href="https://stackoverflow.com/users/9662601/samuel-p"><span
-            class="fab fa-fw fa-4x fa-stack-overflow"></span></a></div>
     <div class="m-2"><a href="https://git.sp-codes.de/samuel-p">
-        <span class="si si-gitea"></span>
+        <span class="d-none d-md-block si si-gitea si-4x"></span>
+        <span class="d-block d-md-none si si-gitea si-2x"></span>
+    </a></div>
+    <div class="m-2"><a href="https://github.com/samuel-p">
+        <span class="d-none d-md-block fab fa-fw fa-4x fa-github"></span>
+        <span class="d-block d-md-none fab fa-fw fa-2x fa-github"></span>
     </a></div>
-    <div class="m-2"><a href="https://github.com/samuel-p"><span
-            class="fab fa-fw fa-4x fa-github"></span></a></div>
 </div>
 <div class="d-flex justify-content-center mb-3">
     <div class="lead text-center">

src/_includes/services-extended.html

@@ -6,7 +6,11 @@
         <div class="beta">TEST-PHASE</div>
         {% endif %}
         <div class="inner">
+            {% if service.si %}
+            <i class="si si-{{service.si}} fa-4x"></i>
+            {% else %}
             <i class="{{service.icon}} fa-4x"></i>
+            {% endif %}
             <h2 class="mt-2 mb-1">{{service.name}}{% if service.url %} <a href="{{service.url}}" target="_blank"><i
                     class="fas fa-external-link-alt"></i></a>{% endif %}</h2>
             {% if service.status %}

src/_includes/services-simple.html

@@ -6,7 +6,11 @@
             {% if service.beta == true %}
             <div class="beta">TEST-PHASE</div>
             {% endif %}
+            {% if service.si %}
+            <i class="si si-{{service.si}} fa-2x"></i>
+            {% else %}
             <i class="{{service.icon}} fa-fw fa-2x"></i>
+            {% endif %}
             <h2 class="mt-2">{{service.name}}{% if service.url %} <a href="{{service.url}}" target="_blank"><i
                     class="fas fa-external-link-alt"></i></a>{% endif %}</h2>
         </div>