Merge branch 'release/v1.0.0'

deploy.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+rsync -rv webpage django:/home/django/personalWebpage/
+ssh django "bash -s" <<EOF
+cd /home/django/personalWebpage/
+python3 manage.py collectstatic --noinput
+python3 manage.py makemigrations
+python3 manage.py migrate
+EOF

webpage/models.py

@@ -5,11 +5,4 @@ class Booksigner(models.Model):
     name = models.CharField(max_length=50)
     website = models.CharField(blank=True, max_length=200)
     email = models.EmailField(blank=True, )
-    comment = models.CharField(blank=True, max_length=500)
-    hosting = models.CharField(max_length=10)
-"""     def __str__(self) -> str:
-        return self.name """
-"""     if(strpos($_SERVER["HTTP_HOST"], ".onion")){ $hosting = "tor!";}
-        elseif(strpos($_SERVER["HTTP_HOST"], ".i2p")){ $hosting = "i2p!";}
-        elseif(strpos($_SERVER["HTTP_HOST"], ".fai")){ $hosting = "fai!";}
-        else{$hosting = "???!";} """
+    comment = models.CharField(blank=True, max_length=500)

webpage/templates/about.html

@@ -79,35 +79,36 @@
           What i am
         </h2>
         <p>
+          A silly colection of bytes
         </p>
         <h2 id="where">
           Where to contact me
         </h2>
         <div class="centerade">
-          <a href="xmpp:bizcochito@fai.st">
-            <img style="border: 0px;
-                        height: 36px;
-                        width: auto"
-                 src="https://xmpp.org/images/logos/xmpp-logo.svg"
-                 alt="XMPP" />
-          </a>
-          <a href="mailto:bizcochito@anartist.org">
-            <img style="border: 0px;
-                        height: 36px;
-                        width: auto"
-                 src="https://upload.wikimedia.org/wikipedia/commons/thumb/e/ee/%28at%29.svg/170px-%28at%29.svg.png"
-                 alt="Personal Mail" />
-          </a>
-          <a href="https://awoo.fai.st/MeDueleLaTeta">
-            <img style="border: 0px;
-                        height: 36px;
-                        width: auto"
-                 src="https://upload.wikimedia.org/wikipedia/commons/9/93/Fediverse_logo_proposal.svg"
-                 alt="Pleroma" />
-          </a>
-        </div>
+          {# djlint: ignore D018 #}<a href="xmpp:bizcochito@fai.st">
+          <img style="border: 0px;
+                      height: 36px;
+                      width: auto"
+               src="https://xmpp.org/images/logos/xmpp-logo.svg"
+               alt="XMPP" />
+        </a>
+        <a href="mailto:bizcochito@anartist.org">
+          <img style="border: 0px;
+                      height: 36px;
+                      width: auto"
+               src="https://upload.wikimedia.org/wikipedia/commons/thumb/e/ee/%28at%29.svg/170px-%28at%29.svg.png"
+               alt="Personal Mail" />
+        </a>
+        <a href="https://awoo.fai.st/MeDueleLaTeta">
+          <img style="border: 0px;
+                      height: 36px;
+                      width: auto"
+               src="https://upload.wikimedia.org/wikipedia/commons/9/93/Fediverse_logo_proposal.svg"
+               alt="Pleroma" />
+        </a>
       </div>
-      <a href="/">IDK return back</a>
     </div>
-  </body>
+    <a href="{% url "webpage:index" %}">IDK return back</a>
+  </div>
+</body>
 </html>

webpage/templates/index.html

@@ -14,7 +14,7 @@
         </h2>
         <ul class="disclosure-closed">
           <li>
-            <a href="signbook/">Signbook</a>
+            <a href=" {% url 'webpage:signbook' %} ">Signbook</a>
           </li>
         </ul>
         <h2>
@@ -22,7 +22,7 @@
         </h2>
         <div class="img">
           {% for gif in banger_list %}
-            <img style="max-height: 50px; width: auto" src="{% static "icons/banner/" %}{{ gif.name }}" alt="{{ gif.url }}" />
+            <img style="max-height:50px;width:auto" src="{% static "icons/banner/" %}{{ gif.name }}" alt="{{ gif.url }}" />
           {% endfor %}
         </div>
         <h2>
@@ -30,7 +30,7 @@
         </h2>
         <div class="img">
           {% for gif in gif_list %}
-            <img style="max-height: 50px; width: auto" src="{% static "icons/gif/" %}{{ gif.name }}" alt="{{ gif.url }}" />
+            <img style="max-height:50px;width:auto" src="{% static "icons/gif/" %}{{ gif.name }}" alt="{{ gif.url }}" />
           {% endfor %}
         </div>
         <h2>
@@ -39,16 +39,19 @@
         <div class="img">
           {% for banner in banner_list %}
             <a href="https://{{ banner.url }}">
-              <img style="height: 31px; width: auto" src="{% static "icons/88x31/" %}{{ banner.name }}" alt="{{ banner.url }}" />
+              <img style="height:31px; width:81px" src="{% static "icons/88x31/" %}{{ banner.name }}" alt="{{ banner.url }}" />
             </a>
           {% endfor %}
         </div>
         <h2>
-          -Me in other places:
+          -Another banner that is unused:
         </h2>
         <div class="img">
-          <a href="http://cronut.cafe/~bizcochito">
-            <img src="{% static 'icons/coconut.png' %}" alt="cronut.cafe/~bizcochito" />
+          <a href="">
+            <img style="height:33px;
+                        width:81px"
+                 src="{% static 'icons/coconut.png' %}"
+                 alt="cronut.cafe/~bizcochito" />
           </a>
         </div>
         <h2>
@@ -56,13 +59,16 @@
         </h2>
         <div class="img">
           <a href="https://yari.fai.st">
-            <img src="{% static 'icons/bizcochito.gif' %}" alt="yari.fai.st" />
+            <img style="height:33px;
+                        width:81px"
+                 src="{% static 'icons/bizcochito.gif' %}"
+                 alt="yari.fai.st" />
           </a>
         </div>
       </div>
       <div class="centerade">
         <a>
-          <img src="{% static "ads/hor/" %}{{ ad }}" />
+          <img src="{% static "ads/hor/" %}{{ ad }}" alt="ad" />
         </a>
       </div>
     </div>

webpage/views.py

@@ -1,7 +1,9 @@
+import os
+import random
+
 from django.forms import ValidationError
-from django.http import HttpResponseNotFound, HttpResponseRedirect
+from django.http import HttpResponseNotFound
 from django.shortcuts import render
-import os, random
 
 from .models import Booksigner
 from .forms import SignbookForm
@@ -55,15 +57,6 @@ def signbook(request):
                 newsigner["website"] = form.cleaned_data['website']
                 newsigner["email"] = form.cleaned_data['email']
                 newsigner["comment"] = form.cleaned_data['comment']
-                host = request.META["SERVER_NAME"]
-                print(host)
-                match host:
-                    case "localhost":
-                        newsigner["hosting"] = "Local"
-                    case r".*\.fai.st":
-                        newsigner["hosting"] = "fai"
-                    case _:
-                        newsigner["hosting"] = "???"
 
                 signer_list = Booksigner.objects.all()
                 if newsigner:
@@ -72,7 +65,6 @@ def signbook(request):
                         email=newsigner["email"],
                         website=newsigner["website"],
                         comment=newsigner["comment"],
-                        hosting=newsigner["hosting"],
                         )
                 context = {
                     "title": "THE GUESTBOOK",