Merge branch 'master' of https://github.com/Ellpeck/Web
All checks were successful
Web/pipeline/head This commit looks good

This commit is contained in:
Ellpeck 2020-08-19 04:40:10 +02:00
commit c8d0ed3c78
4 changed files with 18 additions and 9 deletions

View file

@ -19,7 +19,7 @@ RewriteRule ^minecraft-stuff/?$ "https://ellpeck.de/projects" [R=301,L]
RewriteRule ^yt/?$ "https://www.youtube.com/c/ellpeck" [R=301,L]
RewriteRule ^wishlist/?$ "https://www.amazon.de/hz/wishlist/ls/LZO9Y2Z3VJ5Q?&sort=default" [R=301,L]
RewriteRule ^commissions/?$ "https://ellpeck.de/#commissions" [NE,R=301,L]
RewriteRule ^fftranslate/?$ "https://poeditor.com/join/project/ElzC23ecB6" [NE,R=301,L]
RewriteRule ^fftranslate/?$ "https://poeditor.com/join/project/ElzC23ecB6" [R=301,L]
ErrorDocument 404 /404.html

View file

@ -482,9 +482,9 @@
}
},
"lodash": {
"version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
"version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
},
"lodash.sortby": {
"version": "4.7.0",

BIN
res/projects/tt.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

View file

@ -1,11 +1,11 @@
const projects = [{
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.",
name: 'Touchy Tickets',
desc: "Touchy Tickets is a fun idle game for Android that has you selling tickets with various theme park attractions. It'll probably be released for iOS at some point, too.",
links: {
"Check it out": "/foefrenzy"
'Google Play': "https://play.google.com/store/apps/details?id=de.ellpeck.touchytickets"
},
status: "Released",
icon: "ff"
status: "In development",
icon: 'tt'
},
{
name: 'Actually Additions',
@ -44,6 +44,15 @@ const projects = [{
},
status: "Side project",
icon: "mlem"
},
{
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.",
links: {
"Check it out": "/foefrenzy"
},
status: "Released",
icon: "ff"
}
];