From b525bc2cc034547b1c9c5193767e9c9f0db0d48e Mon Sep 17 00:00:00 2001 From: Zergling_man Date: Sun, 2 Jan 2022 22:04:47 +1100 Subject: [PATCH] Touchups and prep for migrating more pages to DB --- main/models.py | 7 ++++- main/pages/contacts | 62 --------------------------------------------- main/pages/index | 2 +- main/urls.py | 1 + main/views.py | 6 ++++- 5 files changed, 13 insertions(+), 65 deletions(-) delete mode 100644 main/pages/contacts diff --git a/main/models.py b/main/models.py index 8ff3b51..6ac6132 100644 --- a/main/models.py +++ b/main/models.py @@ -8,6 +8,7 @@ class Page(models.Model): title=models.CharField(max_length=100) contents=models.TextField() last_edited=models.DateField(auto_now=True) + renders=models.BooleanField(default=True) def __str__(self): return self.title @@ -34,4 +35,8 @@ class Contact(models.Model): class Update(models.Model): page=models.CharField(max_length=100) - date=models.DateField() \ No newline at end of file + date=models.DateField() + +class Redirect(models.Model): + match=models.CharField(max_length=200) + output=models.CharField(max_length=500) \ No newline at end of file diff --git a/main/pages/contacts b/main/pages/contacts deleted file mode 100644 index 693b67d..0000000 --- a/main/pages/contacts +++ /dev/null @@ -1,62 +0,0 @@ -Preferred: -zergling@rakka.tk,Email,mailto:zergling@rakka.tk,TODO -zergling_man@disroot.org,Email,mailto:zergling_man@disroot.org,Pending approval -Zergling_man@pod.rakka.tk,Diaspora,,No idea what I'm doing with this yet. -Zergling_man@rakka.tk,XMPP,xmpp:Zergling_man@rakka.tk,Not federating for some reason -@Zergling_man@birds.garden,Pleroma/fediverse,,Migrated from linuxbox -@Zergling_man@mastodon.linuxbox.ninja,Mastodon/fediverse - -Suitable: -zerglingman@fedora.email,Email,mailto:zerglingman@fedora.email -zergling@email.go.brr.rakka.tk,Email,mailto:zergling@email.go.brr.rakka.tk,Backup account. Save this! -My comment box,Web,/comment,TODO -Zergling_man@irc.libera.chat,IRC -Zergling_man@irc.rizon.net,IRC -zerglingman,Steam,https://steamcommunity.com/id/zerglingman -@Zerglingman@freespeechextremist.com,Pleroma/fediverse,https://freespeechextremist.com/Zerglingman -@zergling.man:matrix.perthchat.org,Matrix,https://matrix.to/#/@zergling.man:matrix.perthchat.org,I kinda get it -@Zergling_man@mastodon.linuxbox.ninja,Mastodon/fediverse,,To be repurposed - -Discouraged: -Zergling_man#9849,Discord -zergling.man42@gmail.com,Email,mailto:zergling.man42@gmail.com -Zergling_man@hotmail.com,Email,mailto:Zergling_man@hotmail.com -Zergling_man@irc.chat.twitch.tv,IRC,,yes, IRC -Wisknort@irc.mibbit.net,IRC -Zergling_man@irc.freenode.net,IRC -lazy to put,Codingame,,XMPP -Zergling_man,Mangadex,https://mangadex.org/user/419664/zergling_man -Wisknort,Favorite Words,https://favoritewords.com/public/7909804378 -Wisknort,Disqus,https://disqus.com/by/wisknort/ -@Zergling_man@pawoo.net,Mastodon/fediverse,,Mostly porn -@zergling_man@peertube.linuxrocks.online,Peertube/fediverse,https://peertube.linuxrocks.online/accounts/zergling_man/ -zergling-man,Gitlab,https://gitlab.com/zergling-man -Curtis Smith,Patreon,https://www.patreon.com/user/creators?u=688598,I don't actually create anything -zergling-man,Github,https://github.com/zergling-man -zergling_man,Bandcamp,https://bandcamp.com/zergling_man -zerglingman,Facebook message,https://facebook.com/zerglingman - -Ignored: -Zergling_man,Kickstarter,https://www.kickstarter.com/profile/zerglingman -04 7892 6251,Phone,tel:+61478926251 -04 7320 1329,Phone,tel:+61473201329 -Zerguch,Exhentai,,Don't search it if you don't know it -zerglingman,Facebook,https://facebook.com/zerglingman -@Zergling_man,Twitter,https://twitter.com/zergling_man -Wisknort@useast.battle.net,Battlenet 1.0,,probably dead -Wisknort@irc.gamesurge.net,IRC -Zergling_man@irc.quakenet.org,IRC -Zergling_man@irc.irchighway.net,IRC -zergling.man42@gmail.com,Hangouts -naknak210,Neopets -zergling_man,Gelbooru,https://gelbooru.com/index.php?page=account&s=profile&id=286243,Content warning for site, not for kids -Zergling_man,XDA,https://forum.xda-developers.com/member.php?u=5421902, -@zergling_man,Ello,https://ello.co/zergling_man -zergling_man@hotmail.com,Skype -Curtis Smith,Linkedin,https://www.linkedin.com/in/curtis-smith-615538205/ - -Discontinued: -@Zergling_man@openweb.social,Mastodon/fediverse,,Instance died -Zerglingman,Xfire,,Rip btw -@Zergling_man@social.quodverum.com,Mastodon/fediverse,,Banned, no reason given. Quods is weird. -e1ff7b086b591c3bdc7cf74ffc46c38a023721c8386e46cf63ed3d7998020c6240d786bfa8a8,Tox \ No newline at end of file diff --git a/main/pages/index b/main/pages/index index d255852..ace9429 100644 --- a/main/pages/index +++ b/main/pages/index @@ -5,6 +5,6 @@

Who can't figure out how SSL works. I'm working on it. got SSL working, I guess. is figuring this SSL thing out, properly.

Haha I'm way too lazy for webhosting

Cool games: Fantasy Strike (gone free! Go play it now!), Din's Curse (dirt cheap!), Mechwarrior Online (free!), Wurm Online (free!), Portable Puzzle Collection (free and open source! Also on android!)

-

Cool bands: Van Canto [bandcamp] (who this site is a shrine to), Theocracy [label's bandcamp] (Christian prog metal!), Teramaze [bandcamp] (Australian Christian prog metal!) +

Cool bands: Van Canto [bandcamp] (Who this site is a shrine to!), Theocracy [label's bandcamp] (Christian prog metal!), Teramaze [bandcamp] (Australian Christian prog metal! Always releasing!), Takamachi Walk [bandcamp] (Touhou metal! New album out NYE 2021!)

Wisknort. Whisker snot. They changed their website and now it sucks.

By the way, my site's now open source, so you can see exactly how shit I am at this.

\ No newline at end of file diff --git a/main/urls.py b/main/urls.py index fb092f7..45fe464 100644 --- a/main/urls.py +++ b/main/urls.py @@ -4,6 +4,7 @@ from . import views urlpatterns=[ path('',views.index,name='idex'), path('contact',views.contact,name='contact'), + path('comment',views.comment,name='shoutbox'), path('specs',views.specs,name='specs'), path('songs',views.songs,name='songs'), path('nerdshope',views.nerdshope,name='shop'), diff --git a/main/views.py b/main/views.py index 5e78b5f..0f5fddc 100644 --- a/main/views.py +++ b/main/views.py @@ -85,6 +85,10 @@ def specs(req): with open('main/pages/specs') as b: return HttpResponse(b.read(), content_type="text/plain") +@rerender +def comment(): + return {'title':'Comment box','content':"TODO",'date':'2021/12/24'} + @rerender def songs(): with open('main/utils/song-ids') as b: @@ -95,7 +99,7 @@ def songs(): @rerender def nerdshope(): - return {'title':'Nerds\' Hope','content':"Store stuff. TODO. Will include inventory and budget. FB
Address is 21 Kensington St, Glenorchy
Off dates 2021: 24th Sept, 29th Oct, 26th Nov
Will be late on the 1st of Oct
Not sure about 31st of Dec. Depends what other plans are made. I might host a NYE party that night.",'date':'2021/09/05'} + return {'title':'Nerds\' Hope','content':"Store stuff. TODO. Will include inventory and budget. FB
Address is 21 Kensington St, Glenorchy
Off dates 2022:Dunno yet.
NYE party 31st Dec.",'date':'2021/12/24'} def teapot(req): return HttpResponse("You're probably missing the joke.",status=418)