Compare commits
No commits in common. "1cc2908933a911133c36cfe4d9ea4b679d3f1192" and "07ba96295df7fa9d5d1708ed9a6b7f3e0c44874d" have entirely different histories.
1cc2908933
...
07ba96295d
BIN
database.sqlite3
BIN
database.sqlite3
Binary file not shown.
13
index.js
13
index.js
@ -180,10 +180,7 @@ app.get("/api/logout", authorized(), (req, res) => {
|
||||
});
|
||||
|
||||
app.post("/api/upload-video", authorized(), fileUpload({ limits: { fileSize: 2 ** 26 }, useTempFiles: true }), async (req, res) => {
|
||||
const { title, description } = req.body;
|
||||
if (!title) {
|
||||
return res.status(400).json({ ok: false, error: "bad request" });
|
||||
}
|
||||
const { title } = req.body;
|
||||
|
||||
if (!req.files || !req.files.video) {
|
||||
return res.status(400).json({ ok: false, error: "bad request" });
|
||||
@ -209,7 +206,6 @@ app.post("/api/upload-video", authorized(), fileUpload({ limits: { fileSize: 2 *
|
||||
const queueItem = {
|
||||
videoId: id,
|
||||
userId,
|
||||
title,
|
||||
errors: [],
|
||||
progress: 0,
|
||||
duration,
|
||||
@ -229,10 +225,7 @@ app.post("/api/upload-video", authorized(), fileUpload({ limits: { fileSize: 2 *
|
||||
return;
|
||||
}
|
||||
|
||||
dbRun(
|
||||
"INSERT INTO videos (id, user_id, title, description, created_at) VALUES (?, ?, ?, ?, ?)",
|
||||
id, userId, title, description ?? "", new Date().toISOString()
|
||||
);
|
||||
dbRun("INSERT INTO videos (id, user_id, title) VALUES (?, ?, ?)", id, userId, title);
|
||||
|
||||
const index = videoQueue.indexOf(item => item.videoId === queueItem.videoId)
|
||||
videoQueue.splice(index, 1);
|
||||
@ -253,7 +246,7 @@ app.get("/api/video-info", async (req, res) => {
|
||||
const id = req.query["id"];
|
||||
|
||||
const video = await dbGet(`
|
||||
SELECT videos.id, videos.title, videos.description, videos.created_at, users.username AS author
|
||||
SELECT videos.id, videos.title, users.username AS author
|
||||
FROM videos
|
||||
JOIN users ON users.id = videos.user_id
|
||||
WHERE videos.id = ?
|
||||
|
||||
@ -8,8 +8,6 @@ CREATE TABLE videos (
|
||||
id TEXT PRIMARY KEY NOT NULL,
|
||||
user_id INTEGER,
|
||||
title TEXT NOT NULL,
|
||||
description TEXT NOT NULL,
|
||||
created_at TEXT NOT NULL,
|
||||
FOREIGN KEY(user_id) REFERENCES users(id)
|
||||
);
|
||||
|
||||
|
||||
@ -36,11 +36,11 @@ async function main() {
|
||||
<li>
|
||||
<div class="video-item">
|
||||
<div class="video-image">
|
||||
<img class="shadow" src="/videos/${vid.videoId}.png" alt="">
|
||||
<img class="non-shadow" src="/videos/${vid.videoId}.png" alt="">
|
||||
<img class="shadow" src="/videos/${vid.id}.png" alt="">
|
||||
<img class="non-shadow" src="/videos/${vid.id}.png" alt="">
|
||||
</div>
|
||||
<span class="video-info">
|
||||
<b>${vid.title}</b>
|
||||
${vid.title}
|
||||
<br>
|
||||
<p>Uploaded ${uploadedTime} of ${totalTime} (${percentage}%)</p>
|
||||
<progress max="${vid.duration}" value="${vid.progress}">${percentage}%</progress>
|
||||
|
||||
@ -1,39 +1,20 @@
|
||||
*, *::before, *::after {
|
||||
box-sizing: border-box;
|
||||
appearance: none;
|
||||
}
|
||||
|
||||
:root {
|
||||
color-scheme: light dark;
|
||||
|
||||
--red: #c51e0e;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
:root {
|
||||
--red: #F4511E;
|
||||
}
|
||||
}
|
||||
|
||||
*, *::before, *::after {
|
||||
box-sizing: border-box;
|
||||
appearance: none;
|
||||
}
|
||||
|
||||
*:focus {
|
||||
outline: 2px solid var(--red);
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0 auto;
|
||||
padding: 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
a {
|
||||
color: var(--red);
|
||||
}
|
||||
|
||||
textarea, input {
|
||||
font-family: sans-serif;
|
||||
font-size: 0.8em;
|
||||
}
|
||||
|
||||
nav {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
@ -154,3 +135,7 @@ input::file-selector-button {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
a {
|
||||
color: var(--red);
|
||||
}
|
||||
|
||||
|
||||
@ -4,36 +4,19 @@
|
||||
<meta charset="utf-8">
|
||||
<title>MaoTube</title>
|
||||
<link rel="stylesheet" href="/style.css">
|
||||
<script defer src="/header.js"></script>
|
||||
<script defer src="/helpers.js"></script>
|
||||
<script defer src="script.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<h1>MaoTube</h1>
|
||||
<form id="upload-form" method="POST" action="/api/upload-video" enctype="multipart/form-data">
|
||||
<label for="title"><p>Title</p></label>
|
||||
<input type="text" name="title" id="title" required autofocus>
|
||||
<label for="description"><p>Description</p></label>
|
||||
<textarea name="description" id="description"></textarea>
|
||||
<label for="video"><p>Video</p></label>
|
||||
<input type="file" name="video" id="video" required>
|
||||
<br><br>
|
||||
<form action="/api/upload-video" method="POST" enctype="multipart/form-data">
|
||||
<label for="username"><p>Title</p></label>
|
||||
<input type="text" name="title" autofocus>
|
||||
<label for="password"><p>Video</p></label>
|
||||
<input type="file" name="video">
|
||||
<br>
|
||||
<br>
|
||||
<input type="submit" id="submit" value="Upload">
|
||||
<br><br>
|
||||
<a href="/queue">View upload queue</a>
|
||||
</form>
|
||||
|
||||
<noscript>
|
||||
<div class="mao-error">
|
||||
<p>javascript not enabled</p>
|
||||
<p>bottom text</p>
|
||||
</div>
|
||||
</noscript>
|
||||
|
||||
<div id="mao-error" class="mao-error hidden">
|
||||
<p id="mao-error-message"></p>
|
||||
<p>bottom text</p>
|
||||
</div>
|
||||
<script src="/header.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
document.getElementById("upload-form").addEventListener("submit", event => {
|
||||
event.preventDefault();
|
||||
|
||||
const data = new FormData(event.target);
|
||||
|
||||
fetch("/api/upload-video", {
|
||||
method: "POST",
|
||||
body: data,
|
||||
})
|
||||
.then(response => response.json())
|
||||
.then(response => {
|
||||
if (!response.ok) {
|
||||
error(response.error);
|
||||
return;
|
||||
}
|
||||
|
||||
location.href = "/queue";
|
||||
})
|
||||
.catch(err => {
|
||||
error("failed to upload video");
|
||||
});
|
||||
});
|
||||
@ -4,8 +4,6 @@
|
||||
<meta charset="utf-8">
|
||||
<title>MaoTube</title>
|
||||
<link rel="stylesheet" href="/style.css">
|
||||
<script defer src="script.js"></script>
|
||||
<script defer src="/header.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<h1>MaoTube</h1>
|
||||
@ -14,11 +12,7 @@
|
||||
<div id="video-result">
|
||||
<video id="video-player"></video>
|
||||
<h1 id="video-title"></h1>
|
||||
<p id="video-author"></p>
|
||||
<br>
|
||||
<hr>
|
||||
<br>
|
||||
<p id="video-description"></p>
|
||||
<span id="video-author"></span>
|
||||
</div>
|
||||
|
||||
<noscript>
|
||||
@ -33,6 +27,8 @@
|
||||
<p>bottom text</p>
|
||||
</div>
|
||||
</div>
|
||||
<script src="script.js"></script>
|
||||
<script src="/header.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
@ -41,8 +41,7 @@ async function main() {
|
||||
}
|
||||
|
||||
document.getElementById("video-title").innerText = video.title;
|
||||
document.getElementById("video-author").innerText = "by " + video.author + " - published " + new Date(video.created_at).toLocaleDateString();
|
||||
document.getElementById("video-description").innerText = video.description;
|
||||
document.getElementById("video-author").innerText = "by " + video.author;
|
||||
|
||||
document.getElementById("video-result").style.display = "block";
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user