diff --git a/.gitignore b/.gitignore
index 4456f41..422a1d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,3 @@
-app.wasm
-app.wat
-png2c
-penger.c
-hand.c
-index.html
-museum.c
-pengers.h
node_modules/
-coin.c
+out/*
+!out/.gitkeep
\ No newline at end of file
diff --git a/app.c b/app.c
index c56558c..3f6689d 100644
--- a/app.c
+++ b/app.c
@@ -1,6 +1,6 @@
-#include "pengers.h"
-#include "hand.c"
-#include "coin.c"
+#include "out/pengers.h"
+#include "out/hand.c"
+#include "out/coin.c"
#define GREEN 0xff00ff00
#define RED 0xff0000ff
diff --git a/build.sh b/build.sh
index a911b33..0429e9a 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,8 @@
#!/bin/bash
if [[ "$1" == "clear" ]]; then
- rm -vfr museum.c pengers.h hand.c app.wasm png2c app.wat index.html
+ rm -vfr out/*
+ touch out/.gitkeep
exit
fi;
@@ -21,39 +22,39 @@ fi
#set -xe
-clang png2c.c -o png2c -lm
-mkdir -p museum.c
-rm -f museum.c/*
+clang png2c.c -o out/png2c -lm
+mkdir -p out/museum.c
+rm -f out/museum.c/*
pengers_html=$'\n'
pengers_include=$'\n'
id=0
-for p in $(ls museum); do
+for p in $(ls static/museum/); do
file=$(echo $p | sed "s/\.png$//g")
- ./png2c "museum/"$p $id > museum.c/$file.c
- pengers_html+=$' \n'
+ ./out/png2c "static/museum/"$p $id > out/museum.c/$file.c
+ pengers_html+=$'
\n'
pengers_include+='#include "museum.c/'$file$'.c"\n'
((id=id+1))
done
-echo "int pengers_height[$id];" > pengers.h
-echo "int pengers_width[$id];" >> pengers.h
-echo "unsigned int *pengers_img[$id];" >> pengers.h
-echo "$pengers_include" >> pengers.h
-echo "void pengers_init(void) {" >> pengers.h
+echo "int pengers_height[$id];" > out/pengers.h
+echo "int pengers_width[$id];" >> out/pengers.h
+echo "unsigned int *pengers_img[$id];" >> out/pengers.h
+echo "$pengers_include" >> out/pengers.h
+echo "void pengers_init(void) {" >> out/pengers.h
((id=id-1))
for i in $(seq 0 $id); do
- echo " penger_init_$i();" >> pengers.h;
+ echo " penger_init_$i();" >> out/pengers.h;
done
-echo "}" >> pengers.h
+echo "}" >> out/pengers.h
echo -e "$pengers_html" > pengers_image.html.temp
-sed -e '//rpengers_image.html.temp' index.html.template > index.html
+sed -e '//rpengers_image.html.temp' templates/index.html.template > out/index.html
rm pengers_image.html.temp
-./png2c "hand.png" > hand.c
-./png2c "coin.png" > coin.c
+./out/png2c "static/assets/hand.png" > out/hand.c
+./out/png2c "static/assets/coin.png" > out/coin.c
-clang -O3 --target=wasm32 -fno-builtin -nostdlib --no-standard-libraries -Wl,--no-entry $export_cmd -Wl,--allow-undefined -o $f.wasm $a
+clang -O3 --target=wasm32 -fno-builtin -nostdlib --no-standard-libraries -Wl,--no-entry $export_cmd -Wl,--allow-undefined -o out/$f.wasm $a
-wasm2wat $f.wasm > $f.wat
+wasm2wat out/$f.wasm > out/$f.wat
diff --git a/docker-compose.yml b/docker-compose.yml
index cbe21a6..edb3864 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3"
-
services:
penger-party:
container_name: "penger-party"
diff --git a/load.js b/load.js
index 96c3ecf..60cb23d 100644
--- a/load.js
+++ b/load.js
@@ -175,7 +175,7 @@ function make_environment(...envs) {
});
}
-const { instance } = await WebAssembly.instantiateStreaming(fetch("./app.wasm"), {
+const { instance } = await WebAssembly.instantiateStreaming(fetch("./out/app.wasm"), {
"env": make_environment({
// importer les fonctions dans le wasm
'random': Math.random,
diff --git a/out/.gitkeep b/out/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/png2c.c b/png2c.c
index fa9dbdb..4ed4f19 100644
--- a/png2c.c
+++ b/png2c.c
@@ -20,11 +20,23 @@ int main(int argc, const char *argv[])
}
if (argc < 3) { // no id provided
- int file_name_len = strlen(img_path) - strlen(".png");
+ char *last_slash = strrchr(img_path, '/');
+ char extracted[50];
- printf("int %.*s_height = %d;\n", file_name_len, img_path, height);
- printf("int %.*s_width = %d;\n", file_name_len, img_path, width);
- printf("unsigned int %.*s_img[%d][%d] = {\n", file_name_len, img_path, height, width);
+ if (last_slash != NULL) {
+ // Extract the part after the last '/'
+ strcpy(extracted, last_slash + 1);
+
+ // Remove the '.png' extension
+ char *dot = strrchr(extracted, '.');
+ if (dot != NULL) {
+ *dot = '\0'; // Null-terminate the string at the '.'
+ }
+ }
+
+ printf("int %s_height = %d;\n", extracted, height);
+ printf("int %s_width = %d;\n", extracted, width);
+ printf("unsigned int %s_img[%d][%d] = {\n", extracted, height, width);
for (int y = 0; y < height; y++) {
printf(" ");
diff --git a/server.js b/server.js
index b6ebc23..6865e0e 100644
--- a/server.js
+++ b/server.js
@@ -46,6 +46,7 @@ function send_new_map()
});
setTimeout(send_new_map, map_every_ms);
}
+
setTimeout(send_new_map, map_every_ms);
function send_map(socket)
{
@@ -55,14 +56,14 @@ function send_map(socket)
const requestListener = function (req, res) {
var url = req.url;
- if (url == "/" || url == "/index.html") {
+ if (url == "/") {
res.setHeader("Content-Type", "text/html");
res.writeHead(200);
- res.end(fs.readFileSync("./index.html"));
+ res.end(fs.readFileSync("./out/index.html"));
return;
}
- if (url == "/app.wasm") {
+ if (url == "/out/app.wasm") {
res.setHeader("Content-Type", "application/wasm");
res.writeHead(200);
res.end(fs.readFileSync("." + url));
@@ -76,12 +77,20 @@ const requestListener = function (req, res) {
return;
}
- if (url.startsWith("/museum/")) {
+ if (url.startsWith("/static/museum/")) {
res.setHeader("Content-Type", "image/png");
res.writeHead(200);
res.end(fs.readFileSync("." + url));
return;
}
+
+ if (url.startsWith("/static/css/")) {
+ res.setHeader("Content-Type", "text/css");
+ res.writeHead(200);
+ res.end(fs.readFileSync("." + url));
+ return;
+ }
+
if (url == "/create-map") {
res.setHeader("Content-Type", "text/html");
res.writeHead(200);
diff --git a/coin.png b/static/assets/coin.png
similarity index 100%
rename from coin.png
rename to static/assets/coin.png
diff --git a/hand.png b/static/assets/hand.png
similarity index 100%
rename from hand.png
rename to static/assets/hand.png
diff --git a/static/css/.gitkeep b/static/css/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/static/css/base.css b/static/css/base.css
new file mode 100644
index 0000000..89e5b43
--- /dev/null
+++ b/static/css/base.css
@@ -0,0 +1,55 @@
+#demo-canvas:hover {
+ cursor: none
+}
+.penger-img {
+ width: 64px;
+ height: 64px;
+ image-rendering: pixelated;
+ object-fit: contain;
+ transition: transform 0.2s;
+}
+.penger-img:hover {
+ cursor: pointer;
+ transform: scale(1.1);
+}
+.players-img {
+ margin-right: 10px;
+}
+h1 {
+ text-align: center;
+ font-size: 3.5em;
+ margin: 0px;
+ margin-bottom: 20px;
+ font-family: "Comic Sans MS", "Comic Sans", cursive;
+}
+h3 {
+ margin-top: 7px;
+}
+.info {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+}
+.info > * {
+ margin-right: 1rem;
+}
+#chat {
+ width: 69%;
+}
+@media screen and (min-width: calc(800px + calc(64px * 4))) {
+ #css-bullshit {
+ content: "";
+ display: table;
+ clear: both;
+ }
+ #left {
+ float: left;
+ width: 50%;
+ }
+ #right {
+ float: right;
+ width: calc(100% - 800px - 25px);
+ position: absolute;
+ right: 0px;
+ }
+}
\ No newline at end of file
diff --git a/static/css/rainbow.css b/static/css/rainbow.css
new file mode 100644
index 0000000..3b7a4d6
--- /dev/null
+++ b/static/css/rainbow.css
@@ -0,0 +1,46 @@
+.rainbow{
+ animation: rainbow 2.5s linear;
+ animation-iteration-count: infinite;
+}
+@keyframes rainbow{
+ 100%,0%{
+ color: rgb(255,0,0);
+ }
+ 8%{
+ color: rgb(255,127,0);
+ }
+ 16%{
+ color: rgb(255,255,0);
+ }
+ 25%{
+ color: rgb(127,255,0);
+ }
+ 33%{
+ color: rgb(0,255,0);
+ }
+ 41%{
+ color: rgb(0,255,127);
+ }
+ 50%{
+ color: rgb(0,255,255);
+ }
+ 58%{
+ color: rgb(0,127,255);
+ }
+ 66%{
+ color: rgb(0,0,255);
+ }
+ 75%{
+ color: rgb(127,0,255);
+ }
+ 83%{
+ color: rgb(255,0,255);
+ }
+ 91%{
+ color: rgb(255,0,127);
+ }
+}
+
+
+
+
diff --git a/museum/18Plusger.png b/static/museum/18Plusger.png
similarity index 100%
rename from museum/18Plusger.png
rename to static/museum/18Plusger.png
diff --git a/museum/Adelieger.png b/static/museum/Adelieger.png
similarity index 100%
rename from museum/Adelieger.png
rename to static/museum/Adelieger.png
diff --git a/museum/Baldger.png b/static/museum/Baldger.png
similarity index 100%
rename from museum/Baldger.png
rename to static/museum/Baldger.png
diff --git a/museum/Blenger.png b/static/museum/Blenger.png
similarity index 100%
rename from museum/Blenger.png
rename to static/museum/Blenger.png
diff --git a/museum/BlueWolologer.png b/static/museum/BlueWolologer.png
similarity index 100%
rename from museum/BlueWolologer.png
rename to static/museum/BlueWolologer.png
diff --git a/museum/Camelger.png b/static/museum/Camelger.png
similarity index 100%
rename from museum/Camelger.png
rename to static/museum/Camelger.png
diff --git a/museum/Camellow.png b/static/museum/Camellow.png
similarity index 100%
rename from museum/Camellow.png
rename to static/museum/Camellow.png
diff --git a/museum/Capger.png b/static/museum/Capger.png
similarity index 100%
rename from museum/Capger.png
rename to static/museum/Capger.png
diff --git a/museum/CapgerSaysTransRights.png b/static/museum/CapgerSaysTransRights.png
similarity index 100%
rename from museum/CapgerSaysTransRights.png
rename to static/museum/CapgerSaysTransRights.png
diff --git a/museum/CephonPenger.png b/static/museum/CephonPenger.png
similarity index 100%
rename from museum/CephonPenger.png
rename to static/museum/CephonPenger.png
diff --git a/museum/Clipenger.png b/static/museum/Clipenger.png
similarity index 100%
rename from museum/Clipenger.png
rename to static/museum/Clipenger.png
diff --git a/museum/Clownger.png b/static/museum/Clownger.png
similarity index 100%
rename from museum/Clownger.png
rename to static/museum/Clownger.png
diff --git a/museum/Coffeeger.png b/static/museum/Coffeeger.png
similarity index 100%
rename from museum/Coffeeger.png
rename to static/museum/Coffeeger.png
diff --git a/museum/Cookger.png b/static/museum/Cookger.png
similarity index 100%
rename from museum/Cookger.png
rename to static/museum/Cookger.png
diff --git a/museum/Copeger.png b/static/museum/Copeger.png
similarity index 100%
rename from museum/Copeger.png
rename to static/museum/Copeger.png
diff --git a/museum/Criminalger.png b/static/museum/Criminalger.png
similarity index 100%
rename from museum/Criminalger.png
rename to static/museum/Criminalger.png
diff --git a/museum/Cryger.png b/static/museum/Cryger.png
similarity index 100%
rename from museum/Cryger.png
rename to static/museum/Cryger.png
diff --git a/museum/CrygerBlood.png b/static/museum/CrygerBlood.png
similarity index 100%
rename from museum/CrygerBlood.png
rename to static/museum/CrygerBlood.png
diff --git a/museum/CrygerChernobyl.png b/static/museum/CrygerChernobyl.png
similarity index 100%
rename from museum/CrygerChernobyl.png
rename to static/museum/CrygerChernobyl.png
diff --git a/museum/Cyberger.png b/static/museum/Cyberger.png
similarity index 100%
rename from museum/Cyberger.png
rename to static/museum/Cyberger.png
diff --git a/museum/DarthPenger.png b/static/museum/DarthPenger.png
similarity index 100%
rename from museum/DarthPenger.png
rename to static/museum/DarthPenger.png
diff --git a/museum/Deadger.png b/static/museum/Deadger.png
similarity index 100%
rename from museum/Deadger.png
rename to static/museum/Deadger.png
diff --git a/museum/Demureger.png b/static/museum/Demureger.png
similarity index 100%
rename from museum/Demureger.png
rename to static/museum/Demureger.png
diff --git a/museum/Disger.png b/static/museum/Disger.png
similarity index 100%
rename from museum/Disger.png
rename to static/museum/Disger.png
diff --git a/museum/DoctorPenger.png b/static/museum/DoctorPenger.png
similarity index 100%
rename from museum/DoctorPenger.png
rename to static/museum/DoctorPenger.png
diff --git a/museum/Doomger.png b/static/museum/Doomger.png
similarity index 100%
rename from museum/Doomger.png
rename to static/museum/Doomger.png
diff --git a/museum/EvilCyberger.png b/static/museum/EvilCyberger.png
similarity index 100%
rename from museum/EvilCyberger.png
rename to static/museum/EvilCyberger.png
diff --git a/museum/Factoryger.png b/static/museum/Factoryger.png
similarity index 100%
rename from museum/Factoryger.png
rename to static/museum/Factoryger.png
diff --git a/museum/Fatger.png b/static/museum/Fatger.png
similarity index 100%
rename from museum/Fatger.png
rename to static/museum/Fatger.png
diff --git a/museum/Ferrisger.png b/static/museum/Ferrisger.png
similarity index 100%
rename from museum/Ferrisger.png
rename to static/museum/Ferrisger.png
diff --git a/museum/Fesh.png b/static/museum/Fesh.png
similarity index 100%
rename from museum/Fesh.png
rename to static/museum/Fesh.png
diff --git a/museum/Feshger.png b/static/museum/Feshger.png
similarity index 100%
rename from museum/Feshger.png
rename to static/museum/Feshger.png
diff --git a/museum/Frankenpenger.png b/static/museum/Frankenpenger.png
similarity index 100%
rename from museum/Frankenpenger.png
rename to static/museum/Frankenpenger.png
diff --git a/museum/FullCookger.png b/static/museum/FullCookger.png
similarity index 100%
rename from museum/FullCookger.png
rename to static/museum/FullCookger.png
diff --git a/museum/GNUPenger.png b/static/museum/GNUPenger.png
similarity index 100%
rename from museum/GNUPenger.png
rename to static/museum/GNUPenger.png
diff --git a/museum/Geniusger.png b/static/museum/Geniusger.png
similarity index 100%
rename from museum/Geniusger.png
rename to static/museum/Geniusger.png
diff --git a/museum/Ghostger.png b/static/museum/Ghostger.png
similarity index 100%
rename from museum/Ghostger.png
rename to static/museum/Ghostger.png
diff --git a/museum/Ghostyger.png b/static/museum/Ghostyger.png
similarity index 100%
rename from museum/Ghostyger.png
rename to static/museum/Ghostyger.png
diff --git a/museum/Githubger.png b/static/museum/Githubger.png
similarity index 100%
rename from museum/Githubger.png
rename to static/museum/Githubger.png
diff --git a/museum/Goldger.png b/static/museum/Goldger.png
similarity index 100%
rename from museum/Goldger.png
rename to static/museum/Goldger.png
diff --git a/museum/Gonger.png b/static/museum/Gonger.png
similarity index 100%
rename from museum/Gonger.png
rename to static/museum/Gonger.png
diff --git a/museum/Gopnikger.png b/static/museum/Gopnikger.png
similarity index 100%
rename from museum/Gopnikger.png
rename to static/museum/Gopnikger.png
diff --git a/museum/Grubenger.png b/static/museum/Grubenger.png
similarity index 100%
rename from museum/Grubenger.png
rename to static/museum/Grubenger.png
diff --git a/museum/Gunger.png b/static/museum/Gunger.png
similarity index 100%
rename from museum/Gunger.png
rename to static/museum/Gunger.png
diff --git a/museum/HDPenger.png b/static/museum/HDPenger.png
similarity index 100%
rename from museum/HDPenger.png
rename to static/museum/HDPenger.png
diff --git a/museum/Hackger.png b/static/museum/Hackger.png
similarity index 100%
rename from museum/Hackger.png
rename to static/museum/Hackger.png
diff --git a/museum/Heisenberger.png b/static/museum/Heisenberger.png
similarity index 100%
rename from museum/Heisenberger.png
rename to static/museum/Heisenberger.png
diff --git a/museum/HolyCPenger.png b/static/museum/HolyCPenger.png
similarity index 100%
rename from museum/HolyCPenger.png
rename to static/museum/HolyCPenger.png
diff --git a/museum/Holyger.png b/static/museum/Holyger.png
similarity index 100%
rename from museum/Holyger.png
rename to static/museum/Holyger.png
diff --git a/museum/Hoodger.png b/static/museum/Hoodger.png
similarity index 100%
rename from museum/Hoodger.png
rename to static/museum/Hoodger.png
diff --git a/museum/Howdyger.png b/static/museum/Howdyger.png
similarity index 100%
rename from museum/Howdyger.png
rename to static/museum/Howdyger.png
diff --git a/museum/Ideager.png b/static/museum/Ideager.png
similarity index 100%
rename from museum/Ideager.png
rename to static/museum/Ideager.png
diff --git a/museum/JPenger.png b/static/museum/JPenger.png
similarity index 100%
rename from museum/JPenger.png
rename to static/museum/JPenger.png
diff --git a/museum/Jonkger.png b/static/museum/Jonkger.png
similarity index 100%
rename from museum/Jonkger.png
rename to static/museum/Jonkger.png
diff --git a/museum/Kidger.png b/static/museum/Kidger.png
similarity index 100%
rename from museum/Kidger.png
rename to static/museum/Kidger.png
diff --git a/museum/Knightger.png b/static/museum/Knightger.png
similarity index 100%
rename from museum/Knightger.png
rename to static/museum/Knightger.png
diff --git a/museum/Laptopger.png b/static/museum/Laptopger.png
similarity index 100%
rename from museum/Laptopger.png
rename to static/museum/Laptopger.png
diff --git a/museum/Luigiger.png b/static/museum/Luigiger.png
similarity index 100%
rename from museum/Luigiger.png
rename to static/museum/Luigiger.png
diff --git a/museum/Macger.png b/static/museum/Macger.png
similarity index 100%
rename from museum/Macger.png
rename to static/museum/Macger.png
diff --git a/museum/Madger.png b/static/museum/Madger.png
similarity index 100%
rename from museum/Madger.png
rename to static/museum/Madger.png
diff --git a/museum/Malger.png b/static/museum/Malger.png
similarity index 100%
rename from museum/Malger.png
rename to static/museum/Malger.png
diff --git a/museum/Marioger.png b/static/museum/Marioger.png
similarity index 100%
rename from museum/Marioger.png
rename to static/museum/Marioger.png
diff --git a/museum/Michaelger.png b/static/museum/Michaelger.png
similarity index 100%
rename from museum/Michaelger.png
rename to static/museum/Michaelger.png
diff --git a/museum/Millhouseger.png b/static/museum/Millhouseger.png
similarity index 100%
rename from museum/Millhouseger.png
rename to static/museum/Millhouseger.png
diff --git a/museum/Mineger.png b/static/museum/Mineger.png
similarity index 100%
rename from museum/Mineger.png
rename to static/museum/Mineger.png
diff --git a/museum/Momger.png b/static/museum/Momger.png
similarity index 100%
rename from museum/Momger.png
rename to static/museum/Momger.png
diff --git a/museum/MonkeyGer.png b/static/museum/MonkeyGer.png
similarity index 100%
rename from museum/MonkeyGer.png
rename to static/museum/MonkeyGer.png
diff --git a/museum/Moustacheger.png b/static/museum/Moustacheger.png
similarity index 100%
rename from museum/Moustacheger.png
rename to static/museum/Moustacheger.png
diff --git a/museum/Nerdger.png b/static/museum/Nerdger.png
similarity index 100%
rename from museum/Nerdger.png
rename to static/museum/Nerdger.png
diff --git a/museum/NinjaPenger.png b/static/museum/NinjaPenger.png
similarity index 100%
rename from museum/NinjaPenger.png
rename to static/museum/NinjaPenger.png
diff --git a/museum/Oldger.png b/static/museum/Oldger.png
similarity index 100%
rename from museum/Oldger.png
rename to static/museum/Oldger.png
diff --git a/museum/Paintger.png b/static/museum/Paintger.png
similarity index 100%
rename from museum/Paintger.png
rename to static/museum/Paintger.png
diff --git a/museum/Partyger.png b/static/museum/Partyger.png
similarity index 100%
rename from museum/Partyger.png
rename to static/museum/Partyger.png
diff --git a/museum/Peng.png b/static/museum/Peng.png
similarity index 100%
rename from museum/Peng.png
rename to static/museum/Peng.png
diff --git a/museum/PengKisser.png b/static/museum/PengKisser.png
similarity index 100%
rename from museum/PengKisser.png
rename to static/museum/PengKisser.png
diff --git a/museum/Pengachu.png b/static/museum/Pengachu.png
similarity index 100%
rename from museum/Pengachu.png
rename to static/museum/Pengachu.png
diff --git a/museum/Penganger.png b/static/museum/Penganger.png
similarity index 100%
rename from museum/Penganger.png
rename to static/museum/Penganger.png
diff --git a/museum/Pengcoder.png b/static/museum/Pengcoder.png
similarity index 100%
rename from museum/Pengcoder.png
rename to static/museum/Pengcoder.png
diff --git a/museum/Penger.png b/static/museum/Penger.png
similarity index 100%
rename from museum/Penger.png
rename to static/museum/Penger.png
diff --git a/museum/PengerClose.png b/static/museum/PengerClose.png
similarity index 100%
rename from museum/PengerClose.png
rename to static/museum/PengerClose.png
diff --git a/museum/PengerFront.png b/static/museum/PengerFront.png
similarity index 100%
rename from museum/PengerFront.png
rename to static/museum/PengerFront.png
diff --git a/museum/PengerGiga.png b/static/museum/PengerGiga.png
similarity index 100%
rename from museum/PengerGiga.png
rename to static/museum/PengerGiga.png
diff --git a/museum/PengerH.png b/static/museum/PengerH.png
similarity index 100%
rename from museum/PengerH.png
rename to static/museum/PengerH.png
diff --git a/museum/PengerHeart.png b/static/museum/PengerHeart.png
similarity index 100%
rename from museum/PengerHeart.png
rename to static/museum/PengerHeart.png
diff --git a/museum/PengerNote.png b/static/museum/PengerNote.png
similarity index 100%
rename from museum/PengerNote.png
rename to static/museum/PengerNote.png
diff --git a/museum/PengerNumberOne.png b/static/museum/PengerNumberOne.png
similarity index 100%
rename from museum/PengerNumberOne.png
rename to static/museum/PengerNumberOne.png
diff --git a/museum/PengerRidingCamellow.png b/static/museum/PengerRidingCamellow.png
similarity index 100%
rename from museum/PengerRidingCamellow.png
rename to static/museum/PengerRidingCamellow.png
diff --git a/museum/PengerSeller.png b/static/museum/PengerSeller.png
similarity index 100%
rename from museum/PengerSeller.png
rename to static/museum/PengerSeller.png
diff --git a/museum/PengerSilverfoot.png b/static/museum/PengerSilverfoot.png
similarity index 100%
rename from museum/PengerSilverfoot.png
rename to static/museum/PengerSilverfoot.png
diff --git a/museum/PengerStatue.png b/static/museum/PengerStatue.png
similarity index 100%
rename from museum/PengerStatue.png
rename to static/museum/PengerStatue.png
diff --git a/museum/PengerStream.png b/static/museum/PengerStream.png
similarity index 100%
rename from museum/PengerStream.png
rename to static/museum/PengerStream.png
diff --git a/museum/PengerTPose.png b/static/museum/PengerTPose.png
similarity index 100%
rename from museum/PengerTPose.png
rename to static/museum/PengerTPose.png
diff --git a/museum/PengerThumbsUp.png b/static/museum/PengerThumbsUp.png
similarity index 100%
rename from museum/PengerThumbsUp.png
rename to static/museum/PengerThumbsUp.png
diff --git a/museum/Pengerberry.png b/static/museum/Pengerberry.png
similarity index 100%
rename from museum/Pengerberry.png
rename to static/museum/Pengerberry.png
diff --git a/museum/Penghost.png b/static/museum/Penghost.png
similarity index 100%
rename from museum/Penghost.png
rename to static/museum/Penghost.png
diff --git a/museum/Penglup.png b/static/museum/Penglup.png
similarity index 100%
rename from museum/Penglup.png
rename to static/museum/Penglup.png
diff --git a/museum/Pinker.png b/static/museum/Pinker.png
similarity index 100%
rename from museum/Pinker.png
rename to static/museum/Pinker.png
diff --git a/museum/Pipimiger.png b/static/museum/Pipimiger.png
similarity index 100%
rename from museum/Pipimiger.png
rename to static/museum/Pipimiger.png
diff --git a/museum/Policeger.png b/static/museum/Policeger.png
similarity index 100%
rename from museum/Policeger.png
rename to static/museum/Policeger.png
diff --git a/museum/PongarTheBarbarian.png b/static/museum/PongarTheBarbarian.png
similarity index 100%
rename from museum/PongarTheBarbarian.png
rename to static/museum/PongarTheBarbarian.png
diff --git a/museum/Ponger.png b/static/museum/Ponger.png
similarity index 100%
rename from museum/Ponger.png
rename to static/museum/Ponger.png
diff --git a/museum/PongerWizard.png b/static/museum/PongerWizard.png
similarity index 100%
rename from museum/PongerWizard.png
rename to static/museum/PongerWizard.png
diff --git a/museum/Poopenger.png b/static/museum/Poopenger.png
similarity index 100%
rename from museum/Poopenger.png
rename to static/museum/Poopenger.png
diff --git a/museum/Popukoger.png b/static/museum/Popukoger.png
similarity index 100%
rename from museum/Popukoger.png
rename to static/museum/Popukoger.png
diff --git a/museum/PowerPenger.png b/static/museum/PowerPenger.png
similarity index 100%
rename from museum/PowerPenger.png
rename to static/museum/PowerPenger.png
diff --git a/museum/Presentger.png b/static/museum/Presentger.png
similarity index 100%
rename from museum/Presentger.png
rename to static/museum/Presentger.png
diff --git a/museum/PrincessPeachger.png b/static/museum/PrincessPeachger.png
similarity index 100%
rename from museum/PrincessPeachger.png
rename to static/museum/PrincessPeachger.png
diff --git a/museum/Queenger.png b/static/museum/Queenger.png
similarity index 100%
rename from museum/Queenger.png
rename to static/museum/Queenger.png
diff --git a/museum/RedWolologer.png b/static/museum/RedWolologer.png
similarity index 100%
rename from museum/RedWolologer.png
rename to static/museum/RedWolologer.png
diff --git a/museum/Redger.png b/static/museum/Redger.png
similarity index 100%
rename from museum/Redger.png
rename to static/museum/Redger.png
diff --git a/museum/Richger.png b/static/museum/Richger.png
similarity index 100%
rename from museum/Richger.png
rename to static/museum/Richger.png
diff --git a/museum/Rockhopger.png b/static/museum/Rockhopger.png
similarity index 100%
rename from museum/Rockhopger.png
rename to static/museum/Rockhopger.png
diff --git a/museum/Rubyger.png b/static/museum/Rubyger.png
similarity index 100%
rename from museum/Rubyger.png
rename to static/museum/Rubyger.png
diff --git a/museum/SailorMoonger.png b/static/museum/SailorMoonger.png
similarity index 100%
rename from museum/SailorMoonger.png
rename to static/museum/SailorMoonger.png
diff --git a/museum/Saluteger.png b/static/museum/Saluteger.png
similarity index 100%
rename from museum/Saluteger.png
rename to static/museum/Saluteger.png
diff --git a/museum/Samiger.png b/static/museum/Samiger.png
similarity index 100%
rename from museum/Samiger.png
rename to static/museum/Samiger.png
diff --git a/museum/ScientistPenger.png b/static/museum/ScientistPenger.png
similarity index 100%
rename from museum/ScientistPenger.png
rename to static/museum/ScientistPenger.png
diff --git a/museum/ScientistPengerFlask.png b/static/museum/ScientistPengerFlask.png
similarity index 100%
rename from museum/ScientistPengerFlask.png
rename to static/museum/ScientistPengerFlask.png
diff --git a/museum/Seniorger.png b/static/museum/Seniorger.png
similarity index 100%
rename from museum/Seniorger.png
rename to static/museum/Seniorger.png
diff --git a/museum/Skeleger.png b/static/museum/Skeleger.png
similarity index 100%
rename from museum/Skeleger.png
rename to static/museum/Skeleger.png
diff --git a/museum/SkiFreeger.png b/static/museum/SkiFreeger.png
similarity index 100%
rename from museum/SkiFreeger.png
rename to static/museum/SkiFreeger.png
diff --git a/museum/Sleepger.png b/static/museum/Sleepger.png
similarity index 100%
rename from museum/Sleepger.png
rename to static/museum/Sleepger.png
diff --git a/museum/Sonarqubeger.png b/static/museum/Sonarqubeger.png
similarity index 100%
rename from museum/Sonarqubeger.png
rename to static/museum/Sonarqubeger.png
diff --git a/museum/Soupger.png b/static/museum/Soupger.png
similarity index 100%
rename from museum/Soupger.png
rename to static/museum/Soupger.png
diff --git a/museum/Spainger.png b/static/museum/Spainger.png
similarity index 100%
rename from museum/Spainger.png
rename to static/museum/Spainger.png
diff --git a/museum/Spillger.png b/static/museum/Spillger.png
similarity index 100%
rename from museum/Spillger.png
rename to static/museum/Spillger.png
diff --git a/museum/Sponger.png b/static/museum/Sponger.png
similarity index 100%
rename from museum/Sponger.png
rename to static/museum/Sponger.png
diff --git a/museum/Startleger.png b/static/museum/Startleger.png
similarity index 100%
rename from museum/Startleger.png
rename to static/museum/Startleger.png
diff --git a/museum/Stronger.png b/static/museum/Stronger.png
similarity index 100%
rename from museum/Stronger.png
rename to static/museum/Stronger.png
diff --git a/museum/Suitger.png b/static/museum/Suitger.png
similarity index 100%
rename from museum/Suitger.png
rename to static/museum/Suitger.png
diff --git a/museum/SuperPenger.png b/static/museum/SuperPenger.png
similarity index 100%
rename from museum/SuperPenger.png
rename to static/museum/SuperPenger.png
diff --git a/museum/Surfger.png b/static/museum/Surfger.png
similarity index 100%
rename from museum/Surfger.png
rename to static/museum/Surfger.png
diff --git a/museum/Susger.png b/static/museum/Susger.png
similarity index 100%
rename from museum/Susger.png
rename to static/museum/Susger.png
diff --git a/museum/Swagger.png b/static/museum/Swagger.png
similarity index 100%
rename from museum/Swagger.png
rename to static/museum/Swagger.png
diff --git a/museum/Swenger.png b/static/museum/Swenger.png
similarity index 100%
rename from museum/Swenger.png
rename to static/museum/Swenger.png
diff --git a/museum/TakeoutCoffeeger.png b/static/museum/TakeoutCoffeeger.png
similarity index 100%
rename from museum/TakeoutCoffeeger.png
rename to static/museum/TakeoutCoffeeger.png
diff --git a/museum/Toadger.png b/static/museum/Toadger.png
similarity index 100%
rename from museum/Toadger.png
rename to static/museum/Toadger.png
diff --git a/museum/Transparencenger.png b/static/museum/Transparencenger.png
similarity index 100%
rename from museum/Transparencenger.png
rename to static/museum/Transparencenger.png
diff --git a/museum/Tuxger.png b/static/museum/Tuxger.png
similarity index 100%
rename from museum/Tuxger.png
rename to static/museum/Tuxger.png
diff --git a/museum/TwitchPenger.png b/static/museum/TwitchPenger.png
similarity index 100%
rename from museum/TwitchPenger.png
rename to static/museum/TwitchPenger.png
diff --git a/museum/USAger.png b/static/museum/USAger.png
similarity index 100%
rename from museum/USAger.png
rename to static/museum/USAger.png
diff --git a/museum/Urinalger.png b/static/museum/Urinalger.png
similarity index 100%
rename from museum/Urinalger.png
rename to static/museum/Urinalger.png
diff --git a/museum/Waitinger.png b/static/museum/Waitinger.png
similarity index 100%
rename from museum/Waitinger.png
rename to static/museum/Waitinger.png
diff --git a/museum/Weezger.png b/static/museum/Weezger.png
similarity index 100%
rename from museum/Weezger.png
rename to static/museum/Weezger.png
diff --git a/museum/Wrightger.png b/static/museum/Wrightger.png
similarity index 100%
rename from museum/Wrightger.png
rename to static/museum/Wrightger.png
diff --git a/museum/Younger.png b/static/museum/Younger.png
similarity index 100%
rename from museum/Younger.png
rename to static/museum/Younger.png
diff --git a/museum/Zombieger.png b/static/museum/Zombieger.png
similarity index 100%
rename from museum/Zombieger.png
rename to static/museum/Zombieger.png
diff --git a/index.html.template b/templates/index.html.template
similarity index 59%
rename from index.html.template
rename to templates/index.html.template
index 0511899..50d4ef7 100644
--- a/index.html.template
+++ b/templates/index.html.template
@@ -3,57 +3,11 @@