From d4fb27de5a23e052f7d526dcaa6fc45f77518f6a Mon Sep 17 00:00:00 2001 From: Alie Date: Wed, 7 Jun 2023 19:21:42 +0200 Subject: [PATCH] deleted old stuff, made better css and added about --- personalWebpage/personalWebpage/urls.py | 2 +- personalWebpage/webpage/static/style.css | 67 +++++++------- personalWebpage/webpage/templates/about.html | 91 +++++++++++-------- .../webpage/templates/fediring.html | 24 +++++ personalWebpage/webpage/templates/funni.html | 25 ----- personalWebpage/webpage/templates/head.html | 10 ++ personalWebpage/webpage/templates/index.html | 58 +++--------- personalWebpage/webpage/urls.py | 1 + personalWebpage/webpage/views.py | 6 +- 9 files changed, 138 insertions(+), 146 deletions(-) create mode 100644 personalWebpage/webpage/templates/fediring.html delete mode 100755 personalWebpage/webpage/templates/funni.html create mode 100644 personalWebpage/webpage/templates/head.html diff --git a/personalWebpage/personalWebpage/urls.py b/personalWebpage/personalWebpage/urls.py index fb72c48..5a166c8 100644 --- a/personalWebpage/personalWebpage/urls.py +++ b/personalWebpage/personalWebpage/urls.py @@ -4,5 +4,5 @@ from django.urls import path, include app_name = "personalWebsite" urlpatterns = [ path('admin/', admin.site.urls), - path("webpage/", include("webpage.urls")) + path("", include("webpage.urls")) ] \ No newline at end of file diff --git a/personalWebpage/webpage/static/style.css b/personalWebpage/webpage/static/style.css index 76776e3..00d4f11 100755 --- a/personalWebpage/webpage/static/style.css +++ b/personalWebpage/webpage/static/style.css @@ -1,88 +1,83 @@ -@media screen and (min-aspect-ratio: 1) { - .centercubeplease{ +@media screen and (min-aspect-ratio: 2) { + .centercubeplease { width: 50%; } } -body{ - background-color: #FFFFFF; +body { + background-color: #ffffff; color: #000000; font-size: 16px; } -#index{ - background-image: url("background/index.png"); +#index { + background-image: url("background/index.png"); background-size: cover; background-attachment: fixed; } -#index .centercubeplease{ - background-color: #5F8E76; - border: 3px solid #527C46; +#index .centercubeplease { + background-color: #5f8e76; + border: 3px solid #527c46; margin: auto; padding: 10px; } -#index a{ - color: #F0F0F0; +#index a { + color: #f0f0f0; } -.centercubeplease img{ +.centercubeplease img { max-width: 95%; } -#about{ +#about { background-image: url("background/about.png"); background-size: cover; background-attachment: fixed; } -#about a{ - color: #FFF0F0; +#about a { + color: #fff0f0; } -#about .centercubeplease{ - color: #FFF0F0; +#about .centercubeplease { + color: #fff0f0; background-color: #990033; - border: 3px solid #cc0066; + border: 3px solid #c9c8c8; margin: auto; padding: 10px; } -h1, #about h2, #about h3{ +h1{ text-align: center; } -h1, h2, h3{ +ul{ + text-align: left; +} + +h1, +h2, +h3 { margin-bottom: 0; } -p{ - margin-top: 0; -} - -.centerade{ +.centerade { width: 50%; margin: auto; margin-top: 10px; text-align: center; } -.centerade img{ +.centerade img { width: 99%; } -.centercubeplease a{ +.centercubeplease a { color: #449494; } -.pointless{ - list-style-type: none; - margin: 0; - padding: 0; -} - -.hightlightpurple{ - background-color:#C00066; - color:#FFFFFF +.disclosure-closed { + list-style: disclosure-closed; } diff --git a/personalWebpage/webpage/templates/about.html b/personalWebpage/webpage/templates/about.html index 2f4f8f4..fc65975 100755 --- a/personalWebpage/webpage/templates/about.html +++ b/personalWebpage/webpage/templates/about.html @@ -1,66 +1,79 @@ - - - - About Bizcochito - - - +{% include "head.html" %}

So hey, you want to know more about me. Here u have!

-
-

A thing i need to say is that this page one day could be deprecated bc of me just not remembering to change anything.

- +
+

+ A thing i need to say is that this page one day could be deprecated bc + of me just not remembering to change anything. +

+

Index

-
    + - +

    How to adress me

    - So first of all if you are not gonna adress me directly or you don't know me yet just call me Bizcochito!
    + So first of all if you are not gonna adress me directly or you don't + know me yet just call me Bizcochito!

    You can call me:

    -
      +
      • Yari
      • Alicia
      • Maria
      • Bizcochito
      - -

      Also if you are gonna "pronoun" me, please think before if u can just use the name "Yari" that is literaly like "They" long.

      -

      If you insist in using pronouns you can use this(in order of preference):

      -
        -
      • My names
        • -
      • It
        • -
      • They
        • -
      • *neoponouns*
        • -
      • She
        • -
      - -

      Who i am

      +

      - + Also if you are gonna "pronoun" me, please think before if u can just + use the name "Yari" that is literaly like "They" long.

      - -

      What i am

      -

      - -

      - -

      Where to contact me

      -
        -
      • XMPP
        • -
      • Personal MailPGP key
        • -
      • Pleroma
        • -
      • IDK return back
        • +

        + If you insist in using pronouns you can use this + (in order of preference) : +

        +
          +
        • My names
          • +
        • Literally anything but he
        + +

        Who i am

        +

        Existential question i have yet not answered

        + +

        What i am

        +

        + +

        Where to contact me

        +
        + + XMPP + + + Personal Mail + + + Pleroma +
        +
+ + IDK return back
diff --git a/personalWebpage/webpage/templates/fediring.html b/personalWebpage/webpage/templates/fediring.html new file mode 100644 index 0000000..a5034a8 --- /dev/null +++ b/personalWebpage/webpage/templates/fediring.html @@ -0,0 +1,24 @@ +{% load static %} +
+
+ + LAST + + + FEDIRING + + + NEXT + +
+

Fediring links

+
\ No newline at end of file diff --git a/personalWebpage/webpage/templates/funni.html b/personalWebpage/webpage/templates/funni.html deleted file mode 100755 index d34ddae..0000000 --- a/personalWebpage/webpage/templates/funni.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - THE INDEX - - - - -
- Funni gifs
- Dancing banana - Hat kid - Dancing blobcat - Cute Cassette - Dancing parrot - Pumpum being patted - XD - Im, not a robot - Milk gal -
- Enby to death -
- - diff --git a/personalWebpage/webpage/templates/head.html b/personalWebpage/webpage/templates/head.html new file mode 100644 index 0000000..f0fba82 --- /dev/null +++ b/personalWebpage/webpage/templates/head.html @@ -0,0 +1,10 @@ +{% load static %} + + + + {{ title }} + diff --git a/personalWebpage/webpage/templates/index.html b/personalWebpage/webpage/templates/index.html index 507faa2..0363bcd 100755 --- a/personalWebpage/webpage/templates/index.html +++ b/personalWebpage/webpage/templates/index.html @@ -1,47 +1,19 @@ +{% load static %} - - {% load static %} - - THE INDEX - - +{% include "head.html" %} -
- LAST - FEDIRING - NEXT -
Fediring links -
+ {% include "fediring.html" %}

I'm bizcochito, hey!

-Pages:

-

- -About me
- -Gifs
-

-

-Extra stuf

-

- -Signbook -

+

-Funni gifs

-

+

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

+

-Frens:

-

+

{% for banner in banner_list %} {{banner.url}} {% endfor %} -

+

-Me in other places:

-

+

cronut.cafe/~bizcochito -

+

-NEW BANNER:

-

+

yari.fai.st -

+
diff --git a/personalWebpage/webpage/urls.py b/personalWebpage/webpage/urls.py index 82c0b8f..e3b497e 100644 --- a/personalWebpage/webpage/urls.py +++ b/personalWebpage/webpage/urls.py @@ -4,5 +4,6 @@ from . import views app_name = "webpage" urlpatterns = [ + path("about/", views.about, name="about"), path("", views.index, name="index"), ] \ No newline at end of file diff --git a/personalWebpage/webpage/views.py b/personalWebpage/webpage/views.py index 9d4a2db..6882006 100644 --- a/personalWebpage/webpage/views.py +++ b/personalWebpage/webpage/views.py @@ -1,8 +1,6 @@ -from typing import Dict, Tuple from django.http import HttpResponseNotFound from django.shortcuts import render import os, random -from django.template import Context def image_dict_from_name_list(name_list: list[str]): dict_list = [] @@ -29,9 +27,13 @@ def index(request): return HttpResponseNotFound() else: context = { + "title": "THE INDEX", "ad": ad, "banner_list": banner_list, "gif_list": gif_list } return render(request, "index.html", context) + +def about(request): + return render(request, "about.html", {"title": "About Me"})