para/puzzle
1
1
Fork 0
Code Issues 8 Pull requests Releases Wiki Activity

add layers for new image and new game

Browse source
This commit is contained in:
Zutatensuppe 2021-05-21 00:43:02 +02:00
parent e9b209edf1
commit bdd061dd1a
18 changed files with 551 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build/public/assets/index.421011a7.css
View file

@ -1 +0,0 @@
:root{--main-color:#c1b19f;--link-color:#808db0;--link-hover-color:#c5cfeb;--highlight-color:#dd7e7e;--input-bg-color:#262523;--bg-color:rgba(0,0,0,.7)}body,html{margin:0;background:#2b2b2b;color:var(--main-color);height:100%}*{font-family:monospace;font-size:15px}h1,h2,h3,h4{font-size:20px}a{color:var(--link-color);text-decoration:none}a:hover{color:var(--link-hover-color)}td,th{vertical-align:top}.btn{display:inline-block;background:var(--input-bg-color);color:var(--link-color);border:solid 1px #000;padding:5px 10px;box-shadow:1px 1px 2px rgba(0,0,0,.5),0 0 1px rgba(150,150,150,.4) inset;border-radius:4px;user-select:none}.btn:hover{background:#2f2e2c;color:var(--link-hover-color);border:solid 1px #111;box-shadow:0 0 1px rgba(150,150,150,.4) inset;cursor:pointer}.btn:disabled{background:#2f2e2c;color:#8c4747!important;border:solid 1px #111;box-shadow:0 0 1px rgba(150,150,150,.4) inset;cursor:not-allowed}input{background:#333230;border-radius:4px;color:var(--main-color);padding:6px 10px;border:solid 1px #000;box-shadow:0 0 3px rgba(0,0,0,.3) inset}input:focus{border:solid 1px #686767;background:var(--input-bg-color)}.scores{position:absolute;right:0;top:0;background:var(--bg-color);padding:5px;border:solid 1px #000;box-shadow:0 0 10px 0 rgba(0,0,0,.7)}.timer{position:absolute;left:0;top:0;background:var(--bg-color);padding:5px;border:solid 1px #000;box-shadow:0 0 10px 0 rgba(0,0,0,.7)}.menu{position:absolute;top:0;left:50%;transform:translateX(-50%);background:var(--bg-color);padding:5px;border:solid 1px #000;box-shadow:0 0 10px 0 rgba(0,0,0,.7);z-index:2}.closed{display:none}.overlay{position:absolute;top:0;left:0;right:0;bottom:0;z-index:10;background:var(--bg-color)}.overlay.transparent{background:0 0}.overlay-content{position:absolute;left:50%;top:50%;transform:translate(-50%,-50%);background:var(--bg-color);padding:5px;border:solid 1px #000;box-shadow:0 0 10px 0 rgba(0,0,0,.7);z-index:1}.connection-lost .overlay-content{padding:20px;text-align:center}.preview{position:absolute;top:20px;left:20px;bottom:20px;right:20px}.preview .img{height:100%;width:100%;position:absolute;background-repeat:no-repeat;background-position:center;background-size:contain}.menu .opener{display:inline-block;margin-right:10px;color:var(--link-color)}.menu .opener:last-child{margin-right:0}.menu .opener:hover{color:var(--link-hover-color);cursor:pointer}canvas.loaded{cursor:none}kbd{background-color:#eee;border-radius:3px;border:1px solid #b4b4b4;box-shadow:0 1px 1px rgba(0,0,0,.2),0 2px 0 0 rgba(255,255,255,.7) inset;color:#333;display:inline-block;font-size:.85em;font-weight:700;line-height:1;padding:2px 4px;white-space:nowrap}.nav{list-style:none;padding:0}.nav li{display:inline-block;margin-right:1em}.image-list{overflow:scroll}.image-list-inner{white-space:nowrap}.imageteaser{width:150px;height:100px;display:inline-block;margin:5px;background-size:contain;background-position:center;background-repeat:no-repeat;background-color:#222;cursor:pointer}.game-teaser-wrap{display:inline-block;width:20%;padding:5px;box-sizing:border-box}.game-teaser{display:block;background-repeat:no-repeat;background-position:center;background-size:contain;position:relative;padding-top:56.25%;width:100%;background-color:#222}.game-info{position:absolute;top:0;left:0;right:0;bottom:0;width:100%;height:100%}.game-info-text{position:absolute;top:0;background:var(--bg-color);padding:5px}.game-replay{position:absolute;top:0;right:0}html.view-game{overflow:hidden}html.view-game body{overflow:hidden}html.view-replay{overflow:hidden}html.view-replay body{overflow:hidden}html.view-replay canvas{cursor:grab}

1
build/public/assets/index.6c4f6859.css Normal file
View file

File diff suppressed because one or more lines are too long

1
build/public/assets/index.85898c1b.js
View file

File diff suppressed because one or more lines are too long

1
build/public/assets/index.b49dadca.js Normal file
View file

File diff suppressed because one or more lines are too long

6
build/public/assets/vendor.00b608ff.js
View file

File diff suppressed because one or more lines are too long

6
build/public/assets/vendor.8616a479.js Normal file
View file

File diff suppressed because one or more lines are too long

6
build/public/index.html
View file

@ -3,9 +3,9 @@
<head>
<title>🧩 jigsaw.hyottoko.club</title>
<script type="module" crossorigin src="/assets/index.85898c1b.js"></script>
<link rel="modulepreload" href="/assets/vendor.00b608ff.js">
<link rel="stylesheet" href="/assets/index.421011a7.css">
<script type="module" crossorigin src="/assets/index.b49dadca.js"></script>
<link rel="modulepreload" href="/assets/vendor.8616a479.js">
<link rel="stylesheet" href="/assets/index.6c4f6859.css">
</head>
<body>
<div id="app"></div>

57
build/server/main.js
View file

@ -181,6 +181,17 @@ const hash = (str) => {
}
return hash;
};
function asQueryArgs(data) {
const q = [];
for (let k in data) {
const pair = [k, data[k]].map(encodeURIComponent);
q.push(pair.join('='));
}
if (q.length === 0) {
return '';
}
return `?${q.join('&')}`;
}
var Util = {
hash,
uniqId,
@ -193,6 +204,7 @@ var Util = {
encodeGame,
decodeGame,
coordByTileIdx,
asQueryArgs,
};
const log$4 = logger('WebSocketServer.js');
@ -1236,18 +1248,40 @@ async function getExifOrientation(imagePath) {
});
});
}
const allImages = () => {
const images = fs.readdirSync(UPLOAD_DIR)
const allImages = (sort) => {
let images = fs.readdirSync(UPLOAD_DIR)
.filter(f => f.toLowerCase().match(/\.(jpe?g|webp|png)$/))
.map(f => ({
filename: f,
file: `${UPLOAD_DIR}/${f}`,
url: `${UPLOAD_URL}/${encodeURIComponent(f)}`,
}))
.sort((a, b) => {
return fs.statSync(b.file).mtime.getTime() -
fs.statSync(a.file).mtime.getTime();
});
title: '',
category: '',
ts: fs.statSync(`${UPLOAD_DIR}/${f}`).mtime.getTime(),
}));
switch (sort) {
case 'alpha_asc':
images = images.sort((a, b) => {
return a.file > b.file ? 1 : -1;
});
break;
case 'alpha_desc':
images = images.sort((a, b) => {
return a.file < b.file ? 1 : -1;
});
break;
case 'date_asc':
images = images.sort((a, b) => {
return a.ts > b.ts ? 1 : -1;
});
break;
case 'date_desc':
default:
images = images.sort((a, b) => {
return a.ts < b.ts ? 1 : -1;
});
break;
}
return images;
};
async function getDimensions(imagePath) {
@ -1650,8 +1684,10 @@ app.get('/api/conf', (req, res) => {
});
});
app.get('/api/newgame-data', (req, res) => {
const q = req.query;
res.send({
images: Images.allImages(),
images: Images.allImages(q.sort),
categories: [],
});
});
app.get('/api/index-data', (req, res) => {
@ -1695,11 +1731,12 @@ app.post('/upload', (req, res) => {
});
});
app.post('/newgame', bodyParser.json(), async (req, res) => {
log.log(req.body.tiles, req.body.image);
const gameSettings = req.body;
log.log(gameSettings);
const gameId = Util.uniqId();
if (!Game.exists(gameId)) {
const ts = Time.timestamp();
await Game.createGame(gameId, req.body.tiles, req.body.image, ts, req.body.scoreMode);
await Game.createGame(gameId, gameSettings.tiles, gameSettings.image, ts, gameSettings.scoreMode);
}
res.send({ id: gameId });
});