From 2043bfbf1399600b851376f3b6e5a8dbd92b9ece Mon Sep 17 00:00:00 2001
From: Dooho Yi
Date: Fri, 21 Jan 2022 00:44:48 +0900
Subject: [PATCH] add preview + update
---
public/default.css | 14 ++
server.js | 32 +++-
src/pages/entry.en.html | 11 +-
src/pages/entry.html | 10 +-
src/pages/parade.html | 10 +-
src/pages/preview.html | 375 ++++++++++++++++++++++++++++++++++++++++
6 files changed, 436 insertions(+), 16 deletions(-)
create mode 100644 src/pages/preview.html
diff --git a/public/default.css b/public/default.css
index 050f72b..debf6e0 100644
--- a/public/default.css
+++ b/public/default.css
@@ -340,12 +340,26 @@ summary {
.delete {
position: absolute;
+ display: inline-block;
right: 0;
padding: 0;
cursor: pointer;
padding: 2px;
+ vertical-align: top;
}
+.preview {
+ position: absolute;
+ display: inline-block;
+ left: 0;
+ padding: 0;
+ cursor: pointer;
+ padding: 2px;
+ vertical-align: top;
+ margin-top: 15px;
+}
+
+
.intro {
top: 40%;
transform: translate(-50%);
diff --git a/server.js b/server.js
index 60b285a..27bed1b 100644
--- a/server.js
+++ b/server.js
@@ -57,6 +57,13 @@ fastify.get("/", function (request, reply) {
reply.view("/src/pages/parade.html", {});
});
+//get '/preview/:foldername'
+fastify.get("/preview/:foldername", function (request, reply) {
+ //
+ //request.params.foldername
+ reply.view("/src/pages/preview.html", {});
+});
+
//get '/entry', '/entry/', '/en/entry', '/en/entry/'
["/entry", "/entry/", "/en/entry", "/en/entry/"].forEach(function(item) {
fastify.get(item, async function (request, reply) {
@@ -105,7 +112,30 @@ fastify.get("/entries", async function (request, reply) {
//get list
let list = await fs.readdir('/media/storage/public/sound-parade/');
- reply.send({ list: list });
+ reply.send(list);
+});
+
+//get '/fields'
+fastify.get("/fields", async function (request, reply) {
+
+ //get list
+ let list = await fs.readdir('/media/storage/public/sound-parade/');
+ //list.reverse();
+
+ // console.log(list);
+
+ let folders = [];
+ for (const item of list) {
+ var fields = JSON.parse((await fs.readFile('/media/storage/public/sound-parade/' + item + '/fields.json')).toString('utf8'));
+ folders.push({
+ foldername: item,
+ group: fields.group,
+ title: fields.title,
+ comment: fields.comment,
+ });
+ }
+
+ reply.send(folders);
});
//get '/delete'
diff --git a/src/pages/entry.en.html b/src/pages/entry.en.html
index 4f7198d..7c9410f 100644
--- a/src/pages/entry.en.html
+++ b/src/pages/entry.en.html
@@ -19,7 +19,6 @@
max-width: 500px;
}
-
@@ -59,14 +58,15 @@
Place
walkingtowardstheflow.xyz, France en Corée - YouTube channel
+
+ artists
+ diana band X Choong-geun Yoon (Inquiry: wonjung24@gmail.com)
+
Parade Composition
Flock0 promises — Flock1 flags — Flock2 bodies — Flock3 objects — Flock4 someone
-
- Inquiry
- wonjung24@gmail.com
-
+
@@ -148,6 +148,7 @@
Title | {{this.title}}
Desc. |
+
diff --git a/src/pages/entry.html b/src/pages/entry.html
index b8cc172..a9a2aa7 100644
--- a/src/pages/entry.html
+++ b/src/pages/entry.html
@@ -19,7 +19,6 @@
max-width: 500px;
}
-
@@ -61,12 +60,12 @@
walkingtowardstheflow.xyz
주한프랑스대사관 문화과 유튜브 채널
- 퍼레이드 구성
- 무리0 약속들 — 무리1 깃발들 — 무리2 신체들 — 무리3 사물들 — 무리4 누구들
+ 작가
+ 다이애나밴드 X 윤충근 (문의: wonjung24@gmail.com)
- 문의
- wonjung24@gmail.com
+ 퍼레이드 구성
+ 무리0 약속들 — 무리1 깃발들 — 무리2 신체들 — 무리3 사물들 — 무리4 누구들
@@ -150,6 +149,7 @@
제목 | {{this.title}}
묘사 |
+
diff --git a/src/pages/parade.html b/src/pages/parade.html
index e2517f7..4471c22 100644
--- a/src/pages/parade.html
+++ b/src/pages/parade.html
@@ -83,7 +83,7 @@
var roomsel = createDiv();
roomsel.class("roomsel");
var b = createButton("시작하기 Start!", 1);
- var d = createDiv("흐름을 향하여 걷는 Walking towards the Flow");
+ var d = createDiv("흐름을 향하여 걷는 Walking towards the Flow");
d.class("title");
b.mouseClicked(function() {
silence.start();
@@ -136,17 +136,17 @@
socket.on("post", async function(post) {
console.log(post);
- var resp = await new Promise((resolve, reject) => {
+ var list = await new Promise((resolve, reject) => {
loadJSON("/entries", (json) => resolve(json));
})
- console.log(resp.list);
+ console.log(list);
// var object = post.object;
var object = {
"id": 1,
"type": "abc",
- "src": "https://p.dianaband.info/public/sound-parade/" + resp.list[post] + "/pixels.png",
- "audio": "https://p.dianaband.info/public/sound-parade/" + resp.list[post] + "/audio.mp3",
+ "src": "https://p.dianaband.info/public/sound-parade/" + list[post] + "/pixels.png",
+ "audio": "https://p.dianaband.info/public/sound-parade/" + list[post] + "/audio.mp3",
"alt": "알트",
"size": {
"base": 40,
diff --git a/src/pages/preview.html b/src/pages/preview.html
new file mode 100644
index 0000000..f43f471
--- /dev/null
+++ b/src/pages/preview.html
@@ -0,0 +1,375 @@
+
+
+
+
+
+
+ 흐름을 향하여 걷는
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+