LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Julian Müller (ChaoticByte)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

LICENSE.md

@@ -0,0 +1,363 @@
+```
+MIT License
+
+Copyright (c) 2021 Julian Müller (ChaoticByte)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+```
+
+# Additional licenses for included Software and Assets
+
+## Simple Keyboard
+
+Source: https://github.com/hodgef/simple-keyboard
+
+```
+MIT License
+
+Copyright (c) 2019 Francisco Hodge and project contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+```
+
+## Inter (Font)
+
+Source: https://github.com/rsms/inter/
+
+```
+Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION AND CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+```
+
+## Material Design Icons
+
+Source: https://github.com/google/material-design-icons  
+Files:
+- `./app/static/material-icons/*`
+- `./data/profilepictures/default.svg`
+
+```
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+```

app/admin.py

@@ -43,20 +43,24 @@ class CustomUserAdmin(UserAdmin):
 
     fieldsets_ = list((*UserAdmin.fieldsets,))
     fieldsets_.insert(1, (
+        "Visibility",
+        {"fields": ("hide_from_userlist",)},
+    ))
+    fieldsets_.insert(2, (
         "Balance",
         {"fields": ("balance", "allow_order_with_negative_balance")},
     ))
-    fieldsets_.insert(2, (
+    fieldsets_.insert(3, (
         "Supply",
         {"fields": ("allowed_to_supply",)},
     ))
-    fieldsets_.insert(3, (
+    fieldsets_.insert(4, (
         "Profile Picture",
         {"fields": ("profile_picture_filename",)},
     ))
     fieldsets = tuple(fieldsets_)
 
-    list_display = ["username", "balance", "is_active", "allow_order_with_negative_balance"]
+    list_display = ["username", "balance", "allow_order_with_negative_balance", "is_active", "hide_from_userlist"]
 
     def get_actions(self, request): # remove the "delete_selected" action because it breaks some functionality
         actions = super().get_actions(request)
@@ -91,9 +95,7 @@ class CustomRegisterAdmin(admin.ModelAdmin):
         return actions
     
     def delete_selected_new(self, request, queryset):
-        #print(queryset)
         for supply in queryset:
-            #print(order)
             supply.delete()
         if queryset.count() < 2:
             self.message_user(request, f"Revoked {queryset.count()} supply.")
@@ -117,9 +119,7 @@ class CustomOrderAdmin(admin.ModelAdmin):
         return actions
 
     def delete_selected_new(self, request, queryset):
-        #print(queryset)
         for order in queryset:
-            #print(order)
             order.delete()
         self.message_user(request, f"Revoked {queryset.count()} order(s).")
     delete_selected_new.short_description = "Revoke selected orders"

app/db_queries.py

@@ -2,6 +2,7 @@
 
 from django.conf import settings
 from django.db import connection
+from django.utils.translation import gettext
 
 
 COMBINE_ALPHABET = "abcdefghijklmnopqrstuvwxyz"
@@ -44,10 +45,13 @@ def select_history(user, language_code="en") -> list:
     user_id = user.pk
     result = _db_select(f"""
     select
+        price_sum as "sum",
         concat(
-        product_name, ' (',
+            product_name,
-        content_litres::real, -- converting to real removes trailing zeros
+            ' (',
-        'l) x ', amount, ' - ', price_sum, '{settings.CURRENCY_SUFFIX}') as "text",
+            content_litres::real, -- converting to real removes trailing zeros
+            'l) x ', amount
+        ) as "text",
         datetime
     from app_order
     where user_id = {user_id}
@@ -55,18 +59,25 @@ def select_history(user, language_code="en") -> list:
     union
 
     select
-        concat('Deposit: +', transaction_sum, '{settings.CURRENCY_SUFFIX}') as "text",
+        transaction_sum as "sum",
+        '{gettext("Deposit")}' as "text",
         datetime
     from app_userdeposits_view
     where user_id = {user_id}
 
+    union
+
+    select
+        transaction_sum as "sum",
+        comment as "text",
+        datetime
+    from app_registertransaction
+    where user_id = {user_id} and is_transfer = true
+
     order by datetime desc
     fetch first 30 rows only;
     """)
     result = [list(row) for row in result]
-    if language_code == "de": # reformat for german translation
-        for row in result:
-            row[0] = row[0].replace(".", ",")
     return result
 
 

app/locales/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-17 22:11+0100\n"
+"POT-Creation-Date: 2023-04-14 23:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Julian Müller (ChaoticByte)\n"
 "Language: DE\n"
@@ -33,20 +33,21 @@ msgstr "Ein Fehler ist aufgetreten. Bitte ab- und wieder anmelden."
 msgid "Drinks - Deposit"
 msgstr "Getränke - Einzahlen"
 
-#: app/templates/deposit.html:17 app/templates/userpanel.html:23
+#: app/templates/deposit.html:17 app/templates/userpanel.html:18
 msgid "Deposit"
 msgstr "Einzahlen"
 
-#: app/templates/deposit.html:19
+#: app/templates/deposit.html:19 app/templates/transfer.html:43
 msgid "Amount"
 msgstr "Summe"
 
 #: app/templates/deposit.html:30 app/templates/order.html:54
 #: app/templates/registration/login.html:28 app/templates/supply.html:29
+#: app/templates/transfer.html:54
 msgid "cancel"
 msgstr "Abbrechen"
 
-#: app/templates/deposit.html:31
+#: app/templates/deposit.html:31 app/templates/transfer.html:55
 msgid "confirm"
 msgstr "Bestätigen"
 
@@ -54,7 +55,7 @@ msgstr "Bestätigen"
 msgid "Drinks - History"
 msgstr "Getränke - Verlauf"
 
-#: app/templates/history.html:10 app/templates/userpanel.html:30
+#: app/templates/history.html:10 app/templates/userpanel.html:25
 msgid "History"
 msgstr "Verlauf"
 
@@ -164,7 +165,7 @@ msgstr "Wähle deinen Account"
 msgid "Drinks - Statistics"
 msgstr "Getränke - Statistiken"
 
-#: app/templates/statistics.html:10 app/templates/userpanel.html:31
+#: app/templates/statistics.html:10 app/templates/userpanel.html:26
 msgid "Statistics"
 msgstr "Statistiken"
 
@@ -206,7 +207,7 @@ msgstr "Tag"
 msgid "Drinks - Supply"
 msgstr "Getränke - Beschaffung"
 
-#: app/templates/supply.html:14 app/templates/userpanel.html:36
+#: app/templates/supply.html:14 app/templates/userpanel.html:32
 msgid "Supply"
 msgstr "Beschaffung"
 
@@ -226,23 +227,32 @@ msgstr "Senden"
 msgid "You are not allowed to view this site."
 msgstr "Dir fehlt die Berechtigung, diese Seite anzuzeigen."
 
-#: app/templates/userpanel.html:9 app/templates/userpanel.html:11
+#: app/templates/transfer.html:6
-msgid "User"
+#| msgid "Drinks - Order"
-msgstr "Benutzer"
+msgid "Drinks - Transfer"
+msgstr "Getränke - Geld senden"
 
-#: app/templates/userpanel.html:15 app/templates/userpanel.html:17
+#: app/templates/transfer.html:17
+msgid "Transfer Money"
+msgstr "Geld senden"
+
+#: app/templates/transfer.html:19
+msgid "Recipient"
+msgstr "Empfänger"
+
+#: app/templates/userpanel.html:10 app/templates/userpanel.html:12
 msgid "Balance"
 msgstr "Saldo"
 
-#: app/templates/userpanel.html:24
+#: app/templates/userpanel.html:19
 msgid "Logout"
 msgstr "Abmelden"
 
-#: app/templates/userpanel.html:27
+#: app/templates/userpanel.html:30
-msgid "Account"
+msgid "Transfer"
-msgstr "Account"
+msgstr "Geld senden"
 
-#: app/templates/userpanel.html:38
+#: app/templates/userpanel.html:34
 msgid "Change Password"
 msgstr "Passwort ändern"
 

app/migrations/0003_user_hide_from_userlist.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.1.6 on 2023-04-13 19:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("app", "0002_setup"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="hide_from_userlist",
+            field=models.BooleanField(default=False),
+        ),
+    ]

app/migrations/0004_registertransaction_is_transfer.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.1.6 on 2023-04-14 20:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("app", "0003_user_hide_from_userlist"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="registertransaction",
+            name="is_transfer",
+            field=models.BooleanField(default=False),
+        ),
+    ]

app/models.py

@@ -13,6 +13,7 @@ class User(AbstractUser):
     allow_order_with_negative_balance = models.BooleanField(default=False)
     profile_picture_filename = models.CharField(default="default.svg", max_length=25)
     allowed_to_supply = models.BooleanField(default=False)
+    hide_from_userlist = models.BooleanField(default=False)
 
     def delete(self, *args, **kwargs):
         self.balance = 0
@@ -43,7 +44,7 @@ class Drink(models.Model):
         super().save()
 
     def __str__(self):
-        return f"{self.product_name} ({float(self.content_litres):.2f}l) - {self.price}{settings.CURRENCY_SUFFIX}"
+        return f"{self.product_name} ({float(self.content_litres):.2f}l) - {self.price} {settings.CURRENCY_SUFFIX}"
 
 
 class RegisterTransaction(models.Model):
@@ -58,35 +59,34 @@ class RegisterTransaction(models.Model):
     old_transaction_sum = models.DecimalField(max_digits=6, decimal_places=2, default=0.00)
     datetime = models.DateTimeField(default=timezone.now)
     is_user_deposit = models.BooleanField(default=False)
+    is_transfer = models.BooleanField(default=False)
     comment = models.TextField(default=" ")
     user = models.ForeignKey(User, on_delete=models.CASCADE)
 
     def save(self, *args, **kwargs):
         if self._state.adding:
-            if self.is_user_deposit == True: # update user balance
+            if self.is_user_deposit or self.is_transfer: # update user balance
                 self.user.balance += self.transaction_sum
                 self.user.save()
             self.old_transaction_sum = self.transaction_sum
             super().save(*args, **kwargs)
         else:
-            # update register transaction
-            sum_diff = self.transaction_sum - self.old_transaction_sum
             # update user balance
-            if self.is_user_deposit == True:
+            if self.is_user_deposit or self.is_transfer:
-                ub_sum_diff = self.transaction_sum - self.old_transaction_sum
+                self.user.balance += self.transaction_sum - self.old_transaction_sum
-                self.user.balance += ub_sum_diff
                 self.user.save()
+            # update register transaction
             self.old_transaction_sum = self.transaction_sum
             super().save(*args, **kwargs)
     
     def delete(self, *args, **kwargs):
         # update user deposit
-        if self.is_user_deposit:
+        if self.is_user_deposit or self.is_transfer:
             self.user.balance -= self.transaction_sum
             self.user.save()
         super().delete(*args, kwargs)
 
-    def __str__(self): return f"{self.transaction_sum}{settings.CURRENCY_SUFFIX} by {self.user}"
+    def __str__(self): return f"{self.transaction_sum} {settings.CURRENCY_SUFFIX} by {self.user}"
 
 
 class Order(models.Model):
@@ -134,7 +134,7 @@ class Order(models.Model):
             drink.save()
         super().delete(*args, **kwargs)
 
-    def __str__(self): return f"{self.drink.product_name} ({float(self.drink.content_litres):.2f}l) x {self.amount} - {self.price_sum}{settings.CURRENCY_SUFFIX}"
+    def __str__(self): return f"{self.drink.product_name} ({float(self.drink.content_litres):.2f}l) x {self.amount} - {self.price_sum} {settings.CURRENCY_SUFFIX}"
 
 
 class Global(models.Model):

app/static/css/main.css

@@ -1,7 +1,22 @@
+/* Font */
+
+@font-face {
+    font-family: "Inter";
+    src: url('/static/fonts/Inter-Regular.ttf');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: "Inter";
+    src: url('/static/fonts/Inter-Bold.ttf');
+    font-weight: bold;
+    font-style: normal;
+}
+
 /* Variables */
 
 :root {
-    --font-family: 'Liberation Sans', sans-serif;
+    --font-family: "Inter";
     --color: #fafafa;
     --color-error: #ff682c;
     --bg-page-color: #222222;
@@ -50,7 +65,7 @@ input[type="number"]::-webkit-inner-spin-button {
     display: none;
 }
 
-input[type="text"], input[type="password"], input[type="number"] {
+input[type="text"], input[type="password"], input[type="number"], select {
     padding: .6rem .8rem;
     text-align: center;
     font-size: 1rem;
@@ -60,6 +75,19 @@ input[type="text"], input[type="password"], input[type="number"] {
     border-bottom: 1px solid var(--border-color);
     border-radius: var(--border-radius);
     background: var(--bg-color);
+    font-family: "Inter";
+}
+
+select {
+    appearance: none;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    height: 2.5rem;
+    background-image: url("/static/material-icons/arrow-drop-down.svg");
+    background-repeat: no-repeat;
+    background-position: right;
+    background-size: 1.5rem;
+    padding-right: 1.8rem;
 }
 
 table {
@@ -127,7 +155,6 @@ th {
 
 .globalmessage > div {
     width: 96%;
-    text-align: center;
     word-break: keep-all;
     word-wrap: break-word;
     box-sizing: border-box;
@@ -141,7 +168,7 @@ th {
 }
 
 .userinfo {
-    text-align: center;
+    font-size: 1.05rem;
 }
 
 .userinfo > span {
@@ -159,6 +186,10 @@ th {
     gap: .5rem;
 }
 
+.userpanel-buttons > .button, .userpanel-buttons button {
+    height: 1.2rem;
+}
+
 .userbalancewarn {
     color: var(--color-error);
     font-weight: bold;
@@ -232,6 +263,14 @@ main {
     flex-wrap: wrap;
 }
 
+.text-align-right {
+    text-align: right;
+}
+
+.text-align-center {
+    text-align: center;
+}
+
 .gap-1rem {
     gap: 1rem;
 }
@@ -317,10 +356,12 @@ main {
 }
 
 .dropdownbutton {
-    width: fit-content;
     z-index: 190;
-    text-align: center;
+}
-    justify-content: center;
+
+.dropdownbutton > img {
+    width: auto;
+    height: 100%;
 }
 
 .dropdownlist {
@@ -333,6 +374,7 @@ main {
     margin-top: 3.2rem;
     opacity: 0%;
     transition: opacity 100ms;
+    box-shadow: 0 .25rem 1rem #00000090;
 }
 
 .dropdownchoice {
@@ -366,7 +408,7 @@ main {
 }
 
 .customnumberinput {
-    height: 2.2rem;
+    height: 2.5rem;
 }
 
 .customnumberinput button {
@@ -504,4 +546,9 @@ main {
     .drinks-list {
         width: 90%;
     }
+    .dropdownlist {
+        width: 14rem;
+        right: calc(50vw - 7rem);
+        left: auto;
+    }
 }

app/static/css/simple-keyboard_dark.css

@@ -5,6 +5,7 @@
     width: 50rem;
     max-width: 100%;
     background: transparent;
+    font-family: "Inter";
 }
 .simple-keyboard.darkTheme .hg-button {
     height: 50px;

app/static/js/custom_form.js

@@ -1,15 +1,15 @@
 document.addEventListener("DOMContentLoaded", () => {
     // elements
-    let depositForm = document.getElementById("depositform");
+    let customForm = document.getElementById("customform");
     let statusInfo = document.getElementById("statusinfo");
-    let depositSubmitButton = document.getElementById("depositsubmitbtn");
+    let submitButton = document.getElementById("submitbtn");
     // event listener for deposit form
     // this implements a custom submit method
-    depositForm.addEventListener("submit", (event) => {
+    customForm.addEventListener("submit", (event) => {
-        depositSubmitButton.disabled = true;
+        submitButton.disabled = true;
         event.preventDefault(); // Don't do the default submit action!
         let xhr = new XMLHttpRequest();
-        let formData = new FormData(depositForm);
+        let formData = new FormData(customForm);
         xhr.addEventListener("load", (event) => {
             status_ = event.target.status;
             response_ = event.target.responseText;
@@ -28,7 +28,7 @@ document.addEventListener("DOMContentLoaded", () => {
             statusInfo.innerText = "An error occured. Redirecting in 5 seconds...";
             window.setTimeout(() => { window.location.replace("/") }, 5000);
         })
-        xhr.open("POST", "/api/deposit");
+        xhr.open("POST", customForm.action);
         xhr.send(formData);
     });
 });

app/static/js/supply.js

@@ -1,39 +0,0 @@
-document.addEventListener("DOMContentLoaded", () => {
-    // elements
-    let supplyDescriptionElement = document.getElementById("supplydescription");
-    let supplyPriceElement = document.getElementById("supplyprice");
-    let supplyFormElement = document.getElementById("supplyform");
-    let statusInfoElement = document.getElementById("statusinfo");
-    let supplySubmitButton = document.getElementById("supplysubmitbtn");
-    // custom submit method
-    supplyFormElement.addEventListener("submit", (event) => {
-        supplySubmitButton.disabled = true;
-        event.preventDefault(); // Don't do the default submit action!
-        if (isNaN(parseFloat(supplyPriceElement.value)) || supplyDescriptionElement.value == "") {
-            statusInfoElement.innerText = "Please enter a description and price."
-            supplySubmitButton.disabled = false;
-        }
-        let xhr = new XMLHttpRequest();
-        let formData = new FormData(supplyFormElement);
-        xhr.addEventListener("load", (event) => {
-            status_ = event.target.status;
-            response_ = event.target.responseText;
-            if (status_ == 200 && response_ == "success") {
-                statusInfoElement.innerText = "Success.";
-                window.location.replace("/");
-            }
-            else {
-                statusInfoElement.classList.add("errortext");
-                statusInfoElement.innerText = "An error occured.";
-                window.setTimeout(() => { window.location.reload() }, 5000);
-            }
-        })
-        xhr.addEventListener("error", (event) => {
-            statusInfoElement.classList.add("errortext");
-            statusInfoElement.innerText = "An error occured.";
-            window.setTimeout(() => { window.location.reload() }, 5000);
-        })
-        xhr.open("POST", "/api/supply");
-        xhr.send(formData);
-    });
-});

app/static/material-icons/arrow-drop-down.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="#fff" height="48" viewBox="0 96 960 960" width="48"><path d="M480 696 280 497h400L480 696Z"/></svg>

app/static/material-icons/menu.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="#fff" height="48" viewBox="0 96 960 960" width="48"><path d="M115.935 822.696v-68.131h728.13v68.131h-728.13Zm0-212.631v-68.13h728.13v68.13h-728.13Zm0-212.63v-68.37h728.13v68.37h-728.13Z"/></svg>

app/templates/deposit.html

@@ -12,13 +12,13 @@
 {% endblock %}
 
 {% block content %}
-<form id="depositform" class="flex flex-column flex-center appform gap-1rem">
+<form id="customform" class="flex flex-column flex-center appform gap-1rem" action="/api/deposit">
     {% csrf_token %}
     <h1 class="formheading">{% translate "Deposit" %}</h1>
     <div class="flex forminput">
         <span>{% translate "Amount" %} {{ currency_suffix }}:</span>
         <span>
-            <input type="number" name="depositamount" id="depositamount" class="keyboard-input" max="9999.99" min="1.00" step="0.01" autofocus>
+            <input type="number" name="depositamount" class="keyboard-input" max="9999.99" min="1.00" step="0.01" autofocus required>
         </span>
     </div>
     <div id="statusinfo"></div>
@@ -28,9 +28,9 @@
     <script src="/static/js/simple-keyboard_configure.js"></script>
     <div class="flex-center buttons">
         <a href="/" class="button">{% translate "cancel" %}</a>
-        <input type="submit" id="depositsubmitbtn" class="button" value='{% translate "confirm" %}'>
+        <input type="submit" id="submitbtn" class="button" value='{% translate "confirm" %}'>
     </div>
 </form>
-<script src="/static/js/deposit.js"></script>
+<script src="/static/js/custom_form.js"></script>
 <script src="/static/js/autoreload.js"></script>
 {% endblock %}

app/templates/globalmessage.html

@@ -1,5 +1,5 @@
 {% if global_message != "" %}
-<div class="flex flex-center globalmessage">
+<div class="flex flex-center globalmessage text-align-center">
     <div>{{ global_message }}</div>
 </div>
 {% endif %}

app/templates/history.html

@@ -11,13 +11,13 @@
 {% if history %}
 <table class="history">
     <tr>
-        <th>{% translate "last 30 actions" %}</th>
+        <th colspan="3">{% translate "last 30 actions" %}</th>
-        <th></th>
     </tr>
     {% for h in history %}
     <tr>
-        <td>{{ h.0 }}</td>
+        <td class="text-align-right">{{ h.0 }} {{ currency_suffix }}</td>
-        <td class="historydate">{{ h.1 }}</td>
+        <td>{{ h.1 }}</td>
+        <td>{{ h.2 }}</td>
     </tr>
     {% endfor %}
 </table>

app/templates/registration/login.html

@@ -48,6 +48,8 @@
                 {{ user_.last_name }},
                 {% endif %}
                 {{ user_.first_name }}
+            {% elif user_.last_name %}
+                {{ user_.last_name }}
             {% else %}
                 {{ user_.username }}
             {% endif %}

app/templates/supply.html

@@ -9,28 +9,28 @@
 
 {% block content %}
 {% if user.is_superuser or user.allowed_to_supply %}
-<form id="supplyform" class="flex flex-column flex-center appform gap-1rem">
+<form id="customform" class="flex flex-column flex-center appform gap-1rem" action="/api/supply">
     {% csrf_token %}
     <h1 class="formheading">{% translate "Supply" %}</h1>
     <div class="flex forminput">
         <span>{% translate "Description" %}:</span>
         <span>
-            <input type="text" name="supplydescription" id="supplydescription" autofocus>
+            <input type="text" name="supplydescription" autofocus required>
         </span>
     </div>
     <div class="flex forminput">
         <span>{% translate "Price" %} ({{ currency_suffix }}):</span>
         <span>
-            <input type="number" name="supplyprice" id="supplyprice" max="9999.99" min="1.00" step="0.01">
+            <input type="number" name="supplyprice" max="9999.99" min="1.00" step="0.01" required>
         </span>
     </div>
     <div id="statusinfo"></div>
     <div class="buttons">
         <a href="/" class="button">{% translate "cancel" %}</a>
-        <input type="submit" id="supplysubmitbtn" class="button" value='{% translate "submit" %}'>
+        <input type="submit" id="submitbtn" class="button" value='{% translate "submit" %}'>
     </div>
 </form>
-<script src="/static/js/supply.js"></script>
+<script src="/static/js/custom_form.js"></script>
 <script src="/static/js/custom_number_input.js"></script>
 {% else %}
 <div class="flex flex-center">

app/templates/transfer.html

@@ -0,0 +1,60 @@
+{% extends "baselayout.html" %}
+
+{% load i18n %}
+
+{% block title %}
+{% translate "Drinks - Transfer" %}
+{% endblock %}
+
+{% block headAdditional %}
+<link rel="stylesheet" href="/static/css/simple-keyboard.css">
+<link rel="stylesheet" href="/static/css/simple-keyboard_dark.css">
+{% endblock %}
+
+{% block content %}
+<form id="customform" class="flex flex-column flex-center appform gap-1rem" action="/api/transfer">
+    {% csrf_token %}
+    <h1 class="formheading">{% translate "Transfer Money" %}</h1>
+    <div class="flex forminput">
+        <span>{% translate "Recipient" %}:</span>
+        <span>
+            <select name="recipientuser" required>
+                <option></option>
+                {% for user_ in user_list %}
+                {% if user_.id != user.id %}
+                <option value="{{user_.id}}">
+                {% if user_.first_name %}
+                    {% if user_.last_name %}
+                    {{ user_.last_name }},
+                    {% endif %}
+                    {{ user_.first_name }}
+                {% elif user_.last_name %}
+                    {{ user_.last_name }}
+                {% else %}
+                    {{ user_.username }}
+                {% endif %}
+                {% endif %}
+                </option>
+                {% endfor %}
+            </select>
+        </span>
+    </div>
+    <div class="flex forminput">
+        <span>{% translate "Amount" %} {{ currency_suffix }}:</span>
+        <span>
+            <input type="number" name="transferamount" class="keyboard-input" max="{{ user.balance }}" min="0.01" step="0.01" autofocus required>
+        </span>
+    </div>
+    <div id="statusinfo"></div>
+    <!-- Virtual Keyboard -->
+    <div id="keyboard" class="simple-keyboard" data-layout="numeric"></div>
+    <script src="/static/js/simple-keyboard.js"></script>
+    <script src="/static/js/simple-keyboard_configure.js"></script>
+    <div class="flex-center buttons">
+        <a href="/" class="button">{% translate "cancel" %}</a>
+        <input type="submit" id="submitbtn" class="button" value='{% translate "confirm" %}'>
+    </div>
+</form>
+<script src="/static/js/custom_form.js"></script>
+<script src="/static/js/autoreload.js"></script>
+{% endblock %}

app/templates/userpanel.html

@@ -2,19 +2,14 @@
 {% load static %}
 
 <div class="flex flex-center userpanel">
-    <div class="userinfo">
+    <div class="userinfo text-align-center">
-        <img src="/profilepictures/{{ user.profile_picture_filename|urlencode }}">
+        <img src="/profilepictures/{{ user.profile_picture_filename|urlencode }}"><span>{% if user.first_name != "" %}
-        <span>
+            {{ user.first_name }} {{ user.last_name }} ({{ user.username }}){% else %}{{ user.username }}{% endif %}
-            {% if user.first_name != "" %}
-            {% translate "User" %}: {{ user.first_name }} {{ user.last_name }} ({{ user.username }})
-            {% else %}
-            {% translate "User" %}: {{ user.username }}
-            {% endif %}
             &nbsp;-&nbsp;
             {% if user.balance < 0.01 %}
-            <span class="userbalancewarn">{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
+            <span class="userbalancewarn">{% translate "Balance" %}: {{ user.balance }} {{ currency_suffix }}</span>
             {% else %}
-            <span>{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
+            <span>{% translate "Balance" %}: {{ user.balance }} {{ currency_suffix }}</span>
             {% endif %}
         </span>
     </div>
@@ -23,15 +18,14 @@
         <a class="button" href="/deposit">{% translate "Deposit" %}</a>
         <a class="button" href="/accounts/logout">{% translate "Logout" %}</a>
         <div class="dropdownmenu" id="dropdownmenu">
-            <button class="dropdownbutton" id="dropdownmenu-button">
+            <button class="dropdownbutton" id="dropdownmenu-button"><img src="/static/material-icons/menu.svg"></button>
-                <div>{% translate "Account" %}</div>
-            </button>
             <div class="dropdownlist">
                 <a class="button dropdownchoice" href="/history">{% translate "History" %}</a>
                 <a class="button dropdownchoice" href="/statistics">{% translate "Statistics" %}</a>
                 {% if user.is_superuser or user.is_staff %}
                 <a class="button dropdownchoice" href="/admin/">Admin Panel</a>
                 {% endif %}
+                <a class="button dropdownchoice" href="/transfer/">{% translate "Transfer" %}</a>
                 {% if user.is_superuser or user.allowed_to_supply %}
                 <a class="button dropdownchoice" href="/supply/">{% translate "Supply" %}</a>
                 {% endif %}

app/urls.py

@@ -10,6 +10,7 @@ urlpatterns = [
     path('history/', views.history),
     path('deposit/', views.deposit),
     path('statistics/', views.statistics),
+    path('transfer/', views.transfer),
     path('supply/', views.supply),
     path('accounts/login/', views.login_page, name="login"),
     path('accounts/logout/', auth_views.LogoutView.as_view(), name='logout'),
@@ -19,5 +20,6 @@ urlpatterns = [
     # API #
     path('api/order-drink', views.api_order_drink),
     path('api/deposit', views.api_deposit),
+    path('api/transfer', views.api_transfer),
     path('api/supply', views.api_supply)
 ]

app/views.py

@@ -25,7 +25,7 @@ from .models import RegisterTransaction
 
 
 def login_page(request):
-    userlist = get_user_model().objects.filter(is_superuser=False).filter(is_active=True).order_by("username")
+    userlist = get_user_model().objects.filter(hide_from_userlist=False).filter(is_active=True).order_by("username")
     if request.method == "POST":
         form = AuthenticationForm(request.POST)
         username = request.POST['username']
@@ -50,7 +50,6 @@ def login_page(request):
         "user_list": userlist
     })
 
-
 @login_required
 def index(request):
     context = {
@@ -58,7 +57,6 @@ def index(request):
     }
     return render(request, "index.html", context)
 
-
 @login_required
 def history(request):
     context = {
@@ -66,7 +64,6 @@ def history(request):
     }
     return render(request, "history.html", context)
 
-
 @login_required
 def order(request, drinkid):
     try:
@@ -76,7 +73,6 @@ def order(request, drinkid):
     except Drink.DoesNotExist:
         return HttpResponseRedirect("/")
 
-
 @login_required
 def deposit(request):
     return render(request, "deposit.html", {})
@@ -91,17 +87,19 @@ def statistics(request):
     }
     return render(request, "statistics.html", context)
 
+@login_required
+def transfer(request):
+    userlist = get_user_model().objects.filter(hide_from_userlist=False).filter(is_active=True).order_by("username")
+    return render(request, "transfer.html", {"user_list": userlist})
 
 @login_required
 def supply(request):
     return render(request, "supply.html")
 
-
 @login_required
 def redirect_home(request):
     return HttpResponseRedirect("/")
 
-
 # API for XHR requests #
 
 @login_required
@@ -123,7 +121,6 @@ def api_order_drink(request):
         print(f"An exception occured while processing an order: User: {user.username} - Exception: {e}", file=sys.stderr)
         return HttpResponse(b"", status=500)
 
-
 @login_required
 def api_deposit(request):
     # check request -> deposit
@@ -140,9 +137,35 @@ def api_deposit(request):
             return HttpResponse("success", status=200)
         else: raise Exception("Deposit amount too big or small.")
     except Exception as e:
-        print(f"An exception occured while processing a transaction: User: {user.username} - Exception: {e}", file=sys.stderr)
+        print(f"An exception occured while processing a deposit transaction: User: {user.username} - Exception: {e}", file=sys.stderr)
         return HttpResponse(b"", status=500)
 
+@login_required
+def api_transfer(request):
+    # check request -> transfer
+    user = request.user
+    try:
+        recipient = get_user_model().objects.get(id=int(request.POST["recipientuser"]))
+        if recipient.id == user.id:
+            raise Exception(f"User {user.username} tried to transfer to themself.")
+        amount = decimal.Decimal(request.POST["transferamount"])
+        if 0.00 < amount <= user.balance:
+            # create transaction
+            RegisterTransaction.objects.create(
+                transaction_sum=-amount,
+                comment=f"Transfer to {recipient.username}",
+                is_transfer=True,
+                user=user)
+            RegisterTransaction.objects.create(
+                transaction_sum=amount,
+                comment=f"Transfer from {user.username}",
+                is_transfer=True,
+                user=recipient)
+            return HttpResponse("success", status=200)
+        else: raise Exception("Transfer amount too big or small.")
+    except Exception as e:
+        print(f"An exception occured while processing a transfer transaction: User: {user.username} - Exception: {e}", file=sys.stderr)
+        return HttpResponse(b"", status=500)
 
 @login_required
 def api_supply(request):

data/profilepictures/default.svg

@@ -1,28 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" fill="#fff" height="48" viewBox="0 96 960 960" width="48"><path d="M222 801q63-40 124.5-60.5T480 720q72 0 134 20.5T739 801q44-54 62.5-109T820 576q0-145-97.5-242.5T480 236q-145 0-242.5 97.5T140 576q0 61 19 116t63 109Zm257.814-195Q422 606 382.5 566.314q-39.5-39.686-39.5-97.5t39.686-97.314q39.686-39.5 97.5-39.5t97.314 39.686q39.5 39.686 39.5 97.5T577.314 566.5q-39.686 39.5-97.5 39.5Zm-.219 370q-83.146 0-156.275-31.5t-127.225-86Q142 804 111 731.159 80 658.319 80 575.5q0-82.819 31.5-155.659Q143 347 197.5 293t127.341-85.5Q397.681 176 480.5 176q82.819 0 155.659 31.5Q709 239 763 293t85.5 127Q880 493 880 575.734q0 82.734-31.5 155.5T763 858.5q-54 54.5-127.129 86T479.595 976Z"/></svg>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   version="1.1"
-   id="svg5"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs2" />
-  <g
-     id="layer1">
-    <circle
-       style="fill:#808080;fill-opacity:1;stroke:#fffcfe;stroke-opacity:1"
-       id="path848"
-       cx="8"
-       cy="4.5"
-       r="2.5" />
-    <path
-       style="fill:#7f7f7f;fill-opacity:1;stroke:#fffcff;stroke-opacity:1"
-       id="path3433"
-       d="m -3,-13.499699 a 5,5 0 0 1 -2.5,4.3301274 5,5 0 0 1 -5,0 5,5 0 0 1 -2.5,-4.3301274 h 5 z"
-       transform="scale(-1)" />
-  </g>
-</svg>

scripts/_bootstrap.py

@@ -14,6 +14,17 @@ from time import sleep
 from yaml import safe_load
 
 
+banner = """ ___        _        _
+|   \  _ _ (_) _ _  | |__ ___  ___
+| |) || '_|| || ' \ | / /(_-< |___|
+|___/ |_|  |_||_||_||_\_\/__/
+ __  __                        Version {version}
+|  \/  | __ _  _ _   __ _  __ _  ___  _ _
+| |\/| |/ _` || ' \ / _` |/ _` |/ -_)| '_|
+|_|  |_|\__,_||_||_|\__,_|\__, |\___||_|
+                          |___/
+"""
+
 base_directory = Path(__file__).parent.parent
 data_directory = base_directory / "data"
 logfile_directory = data_directory / "logs"
@@ -79,27 +90,29 @@ def cleanup_procs(processes):
 
 
 def start_and_monitor(monitored_subprocesses: list):
+    # display banner
+    print(banner.format(version=os.environ["APP_VERSION"]))
     # start processes
-        for p in monitored_subprocesses:
+    for p in monitored_subprocesses:
-            p.try_start()
+        p.try_start()
-        register_exithandler(cleanup_procs, monitored_subprocesses)
+    register_exithandler(cleanup_procs, monitored_subprocesses)
-        # monitor processes
+    # monitor processes
-        try:
+    try:
-            while True:
+        while True:
-                sleep(1)
+            sleep(1)
-                for p in monitored_subprocesses:
+            for p in monitored_subprocesses:
-                    returncode = p.s.poll()
+                returncode = p.s.poll()
-                    if returncode is None:
+                if returncode is None:
-                        continue
+                    continue
-                    else:
+                else:
-                        print(f"{p.name} stopped with exit code {returncode}.")
+                    print(f"{p.name} stopped with exit code {returncode}.")
-                        if p.try_start() is False:
+                    if p.try_start() is False:
-                            # stop everything if the process
+                        # stop everything if the process
-                            # has exceeded max. tries
+                        # has exceeded max. tries
-                            exit()
+                        exit()
-        except KeyboardInterrupt:
+    except KeyboardInterrupt:
-            print("Received KeyboardInterrupt, exiting...")
+        print("Received KeyboardInterrupt, exiting...")
-            exit()
+        exit()
 
 
 if __name__ == "__main__":

start.sh

@@ -11,6 +11,6 @@ chmod -c -R g-w,o-rwx .gitignore
 
 export PYTHONPATH="$basedir"
 export DJANGO_SETTINGS_MODULE="project.settings"
-export APP_VERSION="15"
+export APP_VERSION="16"
 
 exec ./scripts/_bootstrap.py "$@"