From 7bb5409b472365801be8af919adad43efdffb906 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 1 Jun 2019 22:26:20 +0200 Subject: [PATCH] some changes --- index.html | 26 +++--------- pride.css | 5 +++ res/pride.png | Bin 0 -> 2569 bytes res/{projects/itch.png => social/itch.io.png} | Bin .../itch_dark.png => social/itch.io_dark.png} | Bin res/{support => social}/patreon.png | Bin scripts/about.js | 10 ++--- scripts/blog.js | 1 + scripts/main.js | 6 ++- scripts/projects.js | 37 +++++------------- scripts/social.js | 36 ++++++----------- scripts/support.js | 35 ----------------- 12 files changed, 43 insertions(+), 113 deletions(-) create mode 100644 pride.css create mode 100644 res/pride.png rename res/{projects/itch.png => social/itch.io.png} (100%) rename res/{projects/itch_dark.png => social/itch.io_dark.png} (100%) rename res/{support => social}/patreon.png (100%) delete mode 100644 scripts/support.js diff --git a/index.html b/index.html index ce63913..4f7547e 100644 --- a/index.html +++ b/index.html @@ -51,7 +51,6 @@ Social About Blog - Support Me
@@ -89,10 +88,10 @@

Projects

- Here is a list of some of my projects. Check them out if you want!
For a full list of my programming projects, you can check out my GitHub page linked below. + Here is a list of some of the things that you might know me from. If you want to have a more in-depth look at everything I do, check out some of the sites linked in the Social section.

- + The content that should be here is dynamically generated. Please enable JavaScript if you see this.
@@ -102,10 +101,10 @@

Social

- This is a list of the websites and social media platforms that I regularly use. I'm usually most active on my Discord server and on Twitter, but if it's a more serious inquiry, you can also send me an email. + These are other websites where you can find me and the things I do, including the pages where I publish my code and games and where I sometimes stream and upload videos. This list also includes a lot of ways to reach me.

- + The content that should be here is dynamically generated. Please enable JavaScript if you see this.
@@ -118,7 +117,7 @@ Sometimes, some people ask me some questions about myself or my projects, so I decided to compile a list of some of the answers in a Q&A-like fashion so that I don't have to keep repeating them. If you're curious about me, this might be interesting to you!

- + The content that should be here is dynamically generated. Please enable JavaScript if you see this.
@@ -131,23 +130,10 @@ Occasionally I enjoy writing stuff. So here's some of the stuff I've written. Just click on any of the headers to expand the post.

- + The content that should be here is dynamically generated. Please enable JavaScript if you see this.
- - - -
-

Support Me

-

- If you're interested, here are some ways that you can use to throw some of your precious money my way without actually having me work for you. Keep in mind that doing this is, of course, optional. -

-
- -
- -
diff --git a/pride.css b/pride.css new file mode 100644 index 0000000..4554777 --- /dev/null +++ b/pride.css @@ -0,0 +1,5 @@ +.jumbotron { + background-image: url("res/pride.png"); + background-size: auto 100%; + color: black; +} \ No newline at end of file diff --git a/res/pride.png b/res/pride.png new file mode 100644 index 0000000000000000000000000000000000000000..5848cb9a0522304cf756b61a81609074fd956a34 GIT binary patch literal 2569 zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxU|Gb%3=~<$@G=xgv7|ftIx;Y9?C1WI$O_~u zBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpoC(8Pl)RiX6CmB zO#gcr{-0&|{}!lPjUhjm!S}zP{Q6S%_W%F?3vJxG0jQWU$=lt9E91hKFd&D$#M9T6 z{V}tQfP$6ZQGRI#29BqmE{-7;x87d9DA2$l;&L(6L$OsP2uz&V_FwLx*>ib_HiIzRJb2Bj_BDLL#k%Fyz($N}iEBhj zN@7W>RdP`(kYX@0FtpS)FxEA)2r)FXGB&a@wa_*&ure^ literal 0 HcmV?d00001 diff --git a/res/projects/itch.png b/res/social/itch.io.png similarity index 100% rename from res/projects/itch.png rename to res/social/itch.io.png diff --git a/res/projects/itch_dark.png b/res/social/itch.io_dark.png similarity index 100% rename from res/projects/itch_dark.png rename to res/social/itch.io_dark.png diff --git a/res/support/patreon.png b/res/social/patreon.png similarity index 100% rename from res/support/patreon.png rename to res/social/patreon.png diff --git a/scripts/about.js b/scripts/about.js index 9c6f1e6..e421b3b 100644 --- a/scripts/about.js +++ b/scripts/about.js @@ -22,6 +22,10 @@ const questions = [{ 'q': 'What languages do you speak?', 'a': 'German, English, Java, JavaScript, C# and a bit of C, HTML and CSS.' }, + { + "q": "How do you make games?", + "a": "I recently fell in love with the game engine Unity. It's so great and so fun to use." + }, { 'q': 'What\'s your favorite programming language?', 'a': 'It varies between C# and Java, based on the language that I currently use more.' @@ -41,10 +45,6 @@ const questions = [{ { 'q': 'How did you make this site?', 'a': 'I made this page using Bootstrap. The content is dynamically generated using JavaScript based on a bunch of JSON data. If you\'re curious about the (probably pretty messy) code, then you can check out the GitHub repository.' - }, - { - 'q': 'What\'s the deal with life?', - 'a': 'Man, if I knew.' } ]; @@ -58,7 +58,7 @@ for (question of questions) { $('#about-list').html(a); function getAge() { - let birthdayMillis = Date.UTC(1999, 05, 21); + let birthdayMillis = Date.UTC(1999, 4, 21); let todayMillis = Date.now(); let ageSinceStart = new Date(todayMillis - birthdayMillis); return ageSinceStart.getUTCFullYear() - 1970; diff --git a/scripts/blog.js b/scripts/blog.js index e7dc41a..5482363 100644 --- a/scripts/blog.js +++ b/scripts/blog.js @@ -8,6 +8,7 @@ $.ajax({ cache: false, success: function (json) { let list = $('#blog-list'); + list.html(""); for (let i = json.length - 1; i >= 0; i--) { var obj = json[i]; let id = obj["id"]; diff --git a/scripts/main.js b/scripts/main.js index 44ed4ce..6e02ee0 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -1,9 +1,11 @@ let dark = getCookie("dark") === "true"; let cookieNotification = getCookie("notification") !== "true"; +let pride = new Date().getMonth() == 5; -if (dark) { +if (dark) document.write('') -} +if (pride) + document.write('') $(function () { let openModals = function (hash) { diff --git a/scripts/projects.js b/scripts/projects.js index 87ed6cd..0289466 100644 --- a/scripts/projects.js +++ b/scripts/projects.js @@ -1,4 +1,14 @@ const projects = [{ + 'name': 'Actually Additions', + 'desc': 'Actually Additions is a rather popular Minecraft mod that I used to work on. It\'s become widely known in the modding community and has reached over 10 million downloads by now, which is crazy. I don\'t work on it anymore myself, but it\'s being maintained for current versions by someone else.', + 'links': { + 'CurseForge page': 'https://www.ellpeck.de/actadd', + 'Online manual': 'https://www.ellpeck.de/actaddmanual/' + }, + 'status': 'Handed off', + 'icon': 'aa' + }, + { 'name': "Nature's Aura", 'desc': "Nature's Aura is a new Minecraft mod about collecting, using and replenishing the Aura naturally present in the world to create useful devices and unique mechanics.", 'status': 'In development', @@ -7,15 +17,6 @@ const projects = [{ }, 'icon': 'na' }, - { - "name": "Foe Frenzy", - "desc": "Foe Frenzy is a fast-paced fighting game where you battle up to three of your friends with random, short-lasting items in an attempt to be the last survivor. I explained my development process for the game in a blog post. Development is currently on hold, but I plan on continuing it soon.", - "status": "On hold", - "links": { - "Read the post": "https://ellpeck.de/#blog-small_projects" - }, - "icon": "foefrenzy" - }, { "name": "Tetro", "desc": "Tetro is a Tetris clone I wrote in an afternoon and a bit. You can play it in the browser. It also features multiple game piece designs and some custom game modes. It was pretty fun to make, and it's pretty fun to play.", @@ -26,16 +27,6 @@ const projects = [{ }, "icon": "tetro" }, - { - 'name': 'Actually Additions', - 'desc': 'Actually Additions is a rather popular Minecraft mod that I used to work on. It\'s become widely known in the modding community and has reached over 10 million downloads by now, which is crazy. I don\'t work on it anymore myself, but it\'s being maintained for current versions by someone else.', - 'links': { - 'CurseForge page': 'https://www.ellpeck.de/actadd', - 'Online manual': 'https://www.ellpeck.de/actaddmanual/' - }, - 'status': 'Handed off', - 'icon': 'aa' - }, { 'name': 'Rock Bottom', 'desc': 'Rock Bottom is a game I\'ve been working on for a little more than a year now. It\'s a 2D-sidescrolling sandbox game with a storyline that has multiplayer support, a modding API and a lot more fun stuff. It\'s currently still in early development, but I\'m kind of taking a break from it for a while.', @@ -45,14 +36,6 @@ const projects = [{ }, 'status': 'On hold', 'icon': 'rb' - }, - { - 'name': 'Small Games', - 'desc': 'Sometimes, I take part in a game jam or set myself the goal to work on a game over a small period of time to flex my creative muscles. Usually, I publish what I created on itch.io for everyone to check out.', - 'links': { - 'My profile': 'https://ellpeck.itch.io/' - }, - 'icon': dark ? 'itch_dark' : 'itch' } ]; diff --git a/scripts/social.js b/scripts/social.js index b7241d5..d4a49d9 100644 --- a/scripts/social.js +++ b/scripts/social.js @@ -1,9 +1,4 @@ const socials = [{ - 'name': 'Email', - 'link': 'mailto:me@ellpeck.de', - 'darkIcon': true - }, - { 'name': 'Discord', 'link': 'https://www.ellpeck.de/discord', }, @@ -16,38 +11,31 @@ const socials = [{ 'link': 'https://github.com/Ellpeck/', 'darkIcon': true }, - { - 'name': 'YouTube', - 'link': 'https://www.youtube.com/c/ellpeck' - }, { 'name': 'Twitch', 'link': 'http://twitch.tv/ellpeck' }, { - 'name': 'Reddit', - 'link': 'https://www.reddit.com/user/Ellpeck/', - 'darkIcon': true + 'name': 'YouTube', + 'link': 'https://www.youtube.com/c/ellpeck' + }, + { + 'name': "itch.io", + "link": "https://ellpeck.itch.io/", + "darkIcon": true }, { 'name': 'Instagram', 'link': 'https://instagram.com/Ellopecko' }, { - 'name': 'Spotify', - 'link': 'https://open.spotify.com/user/ellpeck' + 'name': 'Patreon', + 'link': 'https://patreon.com/ellpeck' }, { - 'name': 'Last.fm', - 'link': 'https://www.last.fm/user/Ellpeck' - }, - { - 'name': 'Steam', - 'link': 'http://steamcommunity.com/id/ellpeck/' - }, - { - 'name': 'Facebook', - 'link': 'https://www.facebook.com/Ellpeck' + 'name': 'Email', + 'link': 'mailto:me@ellpeck.de', + 'darkIcon': true } ]; diff --git a/scripts/support.js b/scripts/support.js deleted file mode 100644 index 7565b3e..0000000 --- a/scripts/support.js +++ /dev/null @@ -1,35 +0,0 @@ -const support = [{ - 'name': 'Support me on Patreon', - 'desc': 'Patreon is a great way of giving me money regularly. You automatically give me a set amount each month, and in return, you can get cool rewards like visual fanciness for your Minecraft character when using my mods.', - 'link': 'https://patreon.com/Ellpeck', - 'icon': 'patreon' - }, - { - 'name': 'Donate with PayPal', - 'desc': 'If you prefer the idea of giving me some money as a one-time payment, using PayPal is probably your best bet. It\'s quick and easy, and it helps me out just the same way.', - 'link': 'https://paypal.me/Ellpeck', - 'icon': 'paypal' - }, - { - 'name': 'Send me a gift', - 'desc': 'If you want to make a nice surprise, then you can get me something from my Amazon wishlist. I update it fairly regularly and items I want most are generally closer to the top. Keep in mind that the link goes to the German Amazon page, but for most products, you can just change the link a bit and it\'ll come up with the same. Please don\'t get me anything too expensive, though.', - 'link': 'https://ellpeck.de/wishlist', - 'icon': dark ? 'amazon_dark' : 'amazon' - } -]; - -let sp = ''; -for (way of support) { - sp += '
'; - - sp += '
'; - sp += '' + way['name'] + ''; - sp += '
'; - - sp += '
'; - sp += way['desc']; - sp += '
'; - - sp += '
'; -} -$('#support-list').html(sp); \ No newline at end of file