Compare commits

...

5 Commits

Author SHA1 Message Date
Alie 8631a0259e reorganize files 2023-07-14 20:09:47 +02:00
Alie d2e922e595 fmt 2023-07-14 20:05:38 +02:00
Alie 4d7b82ecb0 fix error in views 2023-07-14 20:03:52 +02:00
Alie 4e0aa95347 Good changes i didnt commit 2023-07-14 20:01:13 +02:00
Alie 8c699e94bd import good changes and comment prod only changes 2023-07-14 19:53:52 +02:00
71 changed files with 148 additions and 131 deletions

View File

@ -22,12 +22,16 @@ BASE_DIR = Path(__file__).resolve().parent.parent
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'django-insecure-&az@!wa-x@+y6cs#q(0ak6ju+3t$46o#5u)i4dn%t9ftn5@dx%'
# SECURITY WARNING: don't run with debug turned on in production!
""" Prod
with open("/home/django/secret_key.txt") as f:
SECRET_KEY = f.read().strip()
"""
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
ALLOWED_HOSTS = []
ALLOWED_HOSTS = ["yari.fai.st", "127.0.0.1"]
CSRF_COOKIE_SECURE = True
SESSION_COOKIE_SECURE = True
# Application definition
INSTALLED_APPS = [
@ -116,9 +120,17 @@ USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.2/howto/static-files/
STATIC_URL = 'static/'
STATIC_URL = "static/"
STATIC_ROOT = "static/"
# Default primary key field type
# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
# CSRF stuff
CSRF_TRUSTED_ORIGINS = [
'http://localhost:8000',
"https://yari.fai.st"
]

View File

@ -1,24 +0,0 @@
{% load static %}
<div class="centerade">
<div>
<a href="https://fediring.net/previous?host=yari.fai.st">
<img
style="height: 30px; width: auto"
src="{% static 'icons/last.png' %}"
alt="LAST" />
</a>
<a href="https://fediring.net/">
<img
style="height: 30px; width: auto"
src="{% static 'icons/fediring.png' %}"
alt="FEDIRING" />
</a>
<a href="https://fediring.net/next?host=yari.fai.st">
<img
style="height: 30px; width: auto"
src="{% static 'icons/next.png' %}"
alt="NEXT" />
</a>
</div>
<p>Fediring links</p>
</div>

View File

@ -1,10 +0,0 @@
{% load static %}
<head>
<link
rel="stylesheet"
href="{% static 'style.css' %}" />
<link
rel="icon"
href="{% static 'icon.png' %}" />
<title>{{ title }}</title>
</head>

View File

@ -1,74 +0,0 @@
{% load static %}
<!DOCTYPE html>
<html lang="en">
{% include "head.html" %}
<body id="index">
{% include "fediring.html" %}
<div id="noscript">
<div class="centercubeplease">
<h1>I'm bizcochito, hey!</h1>
<h2>-Pages:</h2>
<ul class="disclosure-closed">
<li><a href="signbook/">Signbook</a></li>
</ul>
<h2>-Banners</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}}"
/>
{% endfor %}
</div>
<h2>-Funni gifs</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}}"
/>
{% endfor %}
</div>
<h2>-Frens:</h2>
<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}}"
/></a>
{% endfor %}
</div>
<h2>-Me in other places:</h2>
<div class="img">
<a href="http://cronut.cafe/~bizcochito"
><img
src="{% static 'icons/coconut.png' %}"
alt="cronut.cafe/~bizcochito"
/></a>
</div>
<h2>-NEW BANNER:</h2>
<div class="img">
<a href="https://yari.fai.st"
><img src="{% static 'icons/bizcochito.gif' %}" alt="yari.fai.st"
/></a>
</div>
</div>
<div class="centerade">
<a><img src="{% static "ads/hor/" %}{{ad}}" /></a>
</div>
</div>
<script>
function nojs() {
document.getElementById("noscript").style.display = "block";
document.getElementById("nojs").style.display = "none";
}
document.getElementById("noscript").style.display = "none";
document.write(
'<div id="nojs" class="centercubeplease"><p>To see the website please disable JS</p><p><a href="#" onclick="nojs()">I cant do that, daddy google does not LET me :(</a></p></div>'
);
</script>
</body>
</html>

View File

@ -1,6 +1,4 @@
from django.apps import AppConfig
class ConfigWebpage(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'webpage'

View File

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View File

Before

Width:  |  Height:  |  Size: 125 KiB

After

Width:  |  Height:  |  Size: 125 KiB

View File

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB

View File

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View File

Before

Width:  |  Height:  |  Size: 246 KiB

After

Width:  |  Height:  |  Size: 246 KiB

View File

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 104 KiB

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 696 KiB

After

Width:  |  Height:  |  Size: 696 KiB

View File

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

View File

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 126 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

View File

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 616 B

After

Width:  |  Height:  |  Size: 616 B

View File

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 346 B

View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 107 KiB

View File

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

View File

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

View File

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

View File

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

View File

Before

Width:  |  Height:  |  Size: 7.2 MiB

After

Width:  |  Height:  |  Size: 7.2 MiB

View File

Before

Width:  |  Height:  |  Size: 438 KiB

After

Width:  |  Height:  |  Size: 438 KiB

View File

Before

Width:  |  Height:  |  Size: 272 KiB

After

Width:  |  Height:  |  Size: 272 KiB

View File

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

@ -46,10 +46,17 @@
<li>
Alicia
</li>
<li>
Maria
</li>
<li>
Bizcochito
</li>
</ul>
<p>
Also if you are gonna "pronoun" me, please think before if u can just
use the name "Yari" that is literaly like "They" long.
</p>
<h3>
If you insist in using pronouns you can use this
<b> (in order of preference) </b> :
@ -58,12 +65,6 @@
<li>
<b>My names</b>
</li>
<li>
Neutral
</li>
<li>
Femenine
</li>
<li>
Literally anything but he
</li>
@ -91,15 +92,15 @@
alt="XMPP" />
</a>
<a href="mailto:bizcochito@anartist.org">
<img height="36px"
style="border: 0px;
<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 height="36px"
style="border: 0px;
<img style="border: 0px;
height: 36px;
width: auto"
src="https://upload.wikimedia.org/wikipedia/commons/9/93/Fediverse_logo_proposal.svg"
alt="Pleroma" />

View File

@ -0,0 +1,26 @@
{% load static %}
<div class="centerade">
<div>
<a href="https://fediring.net/previous?host=yari.fai.st">
<img style="height: 30px;
width: auto"
src="{% static 'icons/last.png' %}"
alt="LAST" />
</a>
<a href="https://fediring.net/">
<img style="height: 30px;
width: auto"
src="{% static 'icons/fediring.png' %}"
alt="FEDIRING" />
</a>
<a href="https://fediring.net/next?host=yari.fai.st">
<img style="height: 30px;
width: auto"
src="{% static 'icons/next.png' %}"
alt="NEXT" />
</a>
</div>
<p>
Fediring links
</p>
</div>

View File

@ -0,0 +1,6 @@
{% load static %}
<head>
<link rel="stylesheet" href="{% static 'style.css' %}" />
<link rel="icon" href="{% static 'icon.png' %}" />
<title>{{ title }}</title>
</head>

80
webpage/templates/index.html Executable file
View File

@ -0,0 +1,80 @@
{% load static %}
<!DOCTYPE html>
<html lang="en">
{% include "head.html" %}
<body id="index">
{% include "fediring.html" %}
<div id="noscript">
<div class="centercubeplease">
<h1>
I'm bizcochito, hey!
</h1>
<h2>
-Pages:
</h2>
<ul class="disclosure-closed">
<li>
<a href="signbook/">Signbook</a>
</li>
</ul>
<h2>
-Banners
</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 }}" />
{% endfor %}
</div>
<h2>
-Funni gifs
</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 }}" />
{% endfor %}
</div>
<h2>
-Frens:
</h2>
<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 }}" />
</a>
{% endfor %}
</div>
<h2>
-Me in other places:
</h2>
<div class="img">
<a href="http://cronut.cafe/~bizcochito">
<img src="{% static 'icons/coconut.png' %}" alt="cronut.cafe/~bizcochito" />
</a>
</div>
<h2>
-NEW BANNER:
</h2>
<div class="img">
<a href="https://yari.fai.st">
<img src="{% static 'icons/bizcochito.gif' %}" alt="yari.fai.st" />
</a>
</div>
</div>
<div class="centerade">
<a>
<img src="{% static "ads/hor/" %}{{ ad }}" />
</a>
</div>
</div>
<script>
function nojs() {
document.getElementById("noscript").style.display = "block";
document.getElementById("nojs").style.display = "none";
}
document.getElementById("noscript").style.display = "none";
document.write(
'<div id="nojs" class="centercubeplease"><p>To see the website please disable JS</p><p><a href="#" onclick="nojs()">I cant do that, daddy google does not LET me :(</a></p></div>'
);
</script>
</body>
</html>

View File

@ -11,8 +11,7 @@
<ul>
{% for signer in signer_list %}
<li>
{{ signer.hosting }}*
<a href="{{ signer.website }}">
<a href="https://{{ signer.website }}">
<b>
{{ signer.name }}
</b>
@ -42,7 +41,11 @@
<p>
<form method="post" action="">
{% csrf_token %}
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
{% if error_message %}
<p>
<strong>{{ error_message }}</strong>
</p>
{% endif %}
<table>
{{ form.as_table }}
</table>

5
personalWebpage/webpage/views.py → webpage/views.py Normal file → Executable file
View File

@ -38,8 +38,7 @@ def index(request):
"gif_list": gif_list,
"banger_list": banger_list,
}
return render(request,
"index.html", context)
return render(request,"index.html", context)
def about(request):
return render(request, "about.html", {"title": "About Me"})
@ -48,7 +47,7 @@ def signbook(request):
signer_list = Booksigner.objects.all()
if request.method == 'POST':
form = SignbookForm(request.POST)
if form.is_valid():
if form.is_valid() and form.validate_capcha():
newsigner = {}
newsigner["name"] = form.cleaned_data['name']
newsigner["website"] = form.cleaned_data['website']