diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..8937f23 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +rsync -rv webpage django:/home/django/personalWebpage/ +ssh django "bash -s" < 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 = "???!";} """ \ No newline at end of file + comment = models.CharField(blank=True, max_length=500) \ No newline at end of file diff --git a/webpage/static/icons/banner/nft.gif b/webpage/static/icons/banner/nft.gif new file mode 100644 index 0000000..1a4caf0 Binary files /dev/null and b/webpage/static/icons/banner/nft.gif differ diff --git a/webpage/static/icons/banner/thiswebsiteisgay.gif b/webpage/static/icons/banner/thiswebsiteisgay.gif new file mode 100644 index 0000000..4546ff3 Binary files /dev/null and b/webpage/static/icons/banner/thiswebsiteisgay.gif differ diff --git a/webpage/static/icons/banner/transgender.png b/webpage/static/icons/banner/transgender.png old mode 100755 new mode 100644 index b778fc5..b27d303 Binary files a/webpage/static/icons/banner/transgender.png and b/webpage/static/icons/banner/transgender.png differ diff --git a/webpage/static/icons/banner/xenia.gif b/webpage/static/icons/banner/xenia.gif new file mode 100644 index 0000000..aa37d52 Binary files /dev/null and b/webpage/static/icons/banner/xenia.gif differ diff --git a/webpage/static/icons/gif/14690442-66aa-4720-b49e-235cc3bd173b b/webpage/static/icons/gif/14690442-66aa-4720-b49e-235cc3bd173b deleted file mode 100644 index 2b32cd7..0000000 Binary files a/webpage/static/icons/gif/14690442-66aa-4720-b49e-235cc3bd173b and /dev/null differ diff --git a/webpage/static/icons/gif/45ddd68a-20bd-47cf-beda-8244f17ba8fd b/webpage/static/icons/gif/45ddd68a-20bd-47cf-beda-8244f17ba8fd deleted file mode 100644 index 048c678..0000000 Binary files a/webpage/static/icons/gif/45ddd68a-20bd-47cf-beda-8244f17ba8fd and /dev/null differ diff --git a/webpage/static/icons/gif/4a54e121-3552-4c46-ad19-657ee91375b0 b/webpage/static/icons/gif/4a54e121-3552-4c46-ad19-657ee91375b0 deleted file mode 100644 index 07d891c..0000000 Binary files a/webpage/static/icons/gif/4a54e121-3552-4c46-ad19-657ee91375b0 and /dev/null differ diff --git a/webpage/static/icons/gif/4a5b8e4a-8cfb-415b-92d9-19438b815ea0 b/webpage/static/icons/gif/4a5b8e4a-8cfb-415b-92d9-19438b815ea0 deleted file mode 100644 index d017abd..0000000 Binary files a/webpage/static/icons/gif/4a5b8e4a-8cfb-415b-92d9-19438b815ea0 and /dev/null differ diff --git a/webpage/static/icons/gif/7464e43c-6263-42d3-83f6-c67714d7f14c b/webpage/static/icons/gif/7464e43c-6263-42d3-83f6-c67714d7f14c deleted file mode 100644 index 9009189..0000000 Binary files a/webpage/static/icons/gif/7464e43c-6263-42d3-83f6-c67714d7f14c and /dev/null differ diff --git a/webpage/static/icons/gif/be283934-1c73-4158-aec0-d21723b29263 b/webpage/static/icons/gif/be283934-1c73-4158-aec0-d21723b29263 deleted file mode 100644 index cf0fe45..0000000 Binary files a/webpage/static/icons/gif/be283934-1c73-4158-aec0-d21723b29263 and /dev/null differ diff --git a/webpage/static/icons/gif/dda55ea8-69f6-4785-8a06-cb1d23e96c3f b/webpage/static/icons/gif/dda55ea8-69f6-4785-8a06-cb1d23e96c3f deleted file mode 100644 index 416c72f..0000000 Binary files a/webpage/static/icons/gif/dda55ea8-69f6-4785-8a06-cb1d23e96c3f and /dev/null differ diff --git a/webpage/static/icons/gif/webpublic-895a097c-fafd-412d-8428-162845805804 b/webpage/static/icons/gif/webpublic-895a097c-fafd-412d-8428-162845805804 deleted file mode 100644 index 7f1d3b3..0000000 Binary files a/webpage/static/icons/gif/webpublic-895a097c-fafd-412d-8428-162845805804 and /dev/null differ diff --git a/webpage/static/icons/gif/yippee-flip.gif b/webpage/static/icons/gif/yippee-flip.gif new file mode 100644 index 0000000..1f76477 Binary files /dev/null and b/webpage/static/icons/gif/yippee-flip.gif differ diff --git a/webpage/templates/about.html b/webpage/templates/about.html index 3fc7a2b..6b4b78d 100755 --- a/webpage/templates/about.html +++ b/webpage/templates/about.html @@ -79,35 +79,36 @@ What i am

+ A silly colection of bytes

Where to contact me

- - XMPP - - - Personal Mail - - - Pleroma - -
+ {# djlint: ignore D018 #} + XMPP + + + Personal Mail + + + Pleroma + - IDK return back - + IDK return back + + diff --git a/webpage/templates/index.html b/webpage/templates/index.html index 28c36ae..20abbcf 100755 --- a/webpage/templates/index.html +++ b/webpage/templates/index.html @@ -14,7 +14,7 @@

@@ -22,7 +22,7 @@

{% for gif in banger_list %} - {{ gif.url }} + {{ gif.url }} {% endfor %}

@@ -30,7 +30,7 @@

{% for gif in gif_list %} - {{ gif.url }} + {{ gif.url }} {% endfor %}

@@ -39,16 +39,19 @@
{% for banner in banner_list %} - {{ banner.url }} + {{ banner.url }} {% endfor %}

- -Me in other places: + -Another banner that is unused:

- - cronut.cafe/~bizcochito + + cronut.cafe/~bizcochito

@@ -56,13 +59,16 @@

- yari.fai.st + yari.fai.st
- + ad
diff --git a/webpage/views.py b/webpage/views.py index 3d16b24..b845611 100755 --- a/webpage/views.py +++ b/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",