aboutsummaryrefslogtreecommitdiff
path: root/motto
diff options
context:
space:
mode:
Diffstat (limited to 'motto')
-rw-r--r--motto/.eslintrc.js14
-rw-r--r--motto/.gitignore3
-rw-r--r--motto/index.js122
-rw-r--r--motto/package.json19
-rw-r--r--motto/public/script.js16
-rw-r--r--motto/public/style.css4
6 files changed, 62 insertions, 116 deletions
diff --git a/motto/.eslintrc.js b/motto/.eslintrc.js
deleted file mode 100644
index 4d11b96..0000000
--- a/motto/.eslintrc.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = {
- "env": {
- "browser": true,
- "commonjs": true,
- "es2020": true,
- "node": true
- },
- "extends": "eslint:recommended",
- "parserOptions": {
- "ecmaVersion": 11
- },
- "rules": {
- }
-};
diff --git a/motto/.gitignore b/motto/.gitignore
deleted file mode 100644
index 89b0631..0000000
--- a/motto/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.db
-*lock*
-node_*
diff --git a/motto/index.js b/motto/index.js
index ec14a33..26d70bd 100644
--- a/motto/index.js
+++ b/motto/index.js
@@ -1,8 +1,9 @@
const express = require("express");
-const sqlite3 = require("sqlite3");
const rateLimit = require("express-rate-limit");
-const app = express();
-// const fs = require("fs");
+const db = require("../db");
+const app = express.Router();
+
+const fs = require("fs");
const apiLimiter = rateLimit({
windowMs: 10 * 60 * 1000,
@@ -10,95 +11,68 @@ const apiLimiter = rateLimit({
message: "Access overflow!",
});
-app.use(express.urlencoded({ extended: true }));
-app.use(express.json());
-
-let db;
-function create_db() {
- if (db) db.close();
-
- db = new sqlite3.Database("db.db", sqlite3.OPEN_READWRITE, (err) => {
- if (err) console.error(err.message);
- console.log("Connected to the database");
- });
-
- db.run(
- "CREATE TABLE IF NOT EXISTS theme(id INTEGER PRIMARY KEY AUTOINCREMENT, main TEXT NOT NULL, description TEXT NOT NULL, votes INTEGER DEFAULT 0, hidden BOOL DEFAULT 0 UNIQUE(main, description))",
- (err) => {
- if (err) console.error(err.message);
- }
- );
-}
-
-function insert(main, description, votes) {
- db.run(`INSERT INTO theme(main, description, votes) VALUES(?, ?, ?)`, [main, description, votes], (err) => {
+app.get("/sync", (req, res) => {
+ fs.readFile(__dirname + "/list.txt", "utf8", (err, data) => {
if (err) {
- console.error(err.message);
- return;
+ console.error(err);
+ return res.send("error");
}
+ const lines = data.split("\n");
+ lines.forEach(async (line) => {
+ const split = line.split(" - ");
+ try {
+ if (split.length >= 2)
+ await db.query("INSERT INTO theme (main, description) VALUES (?, ?)", split.slice(0, 2));
+ else console.log(line);
+ } catch (e) {
+ console.error(e);
+ } finally {
+ res.send("ok");
+ }
+ });
});
-}
-
-// app.get("/sync", (req, res) => {
-// fs.unlinkSync("db.db");
-// fs.closeSync(fs.openSync("db.db", "w"));
-// create_db();
-// fs.readFile("list.txt", "utf8", (err, data) => {
-// if (err) return;
-// const lines = data.split("\n");
-// lines.forEach((line) => {
-// const split = line.split(" - ");
-// if (split[0] && split[1]) insert(split[0], split[1], 0);
-// else console.log(line);
-// });
-// });
-// res.send("ok");
-// });
+});
app.use("/", express.static(__dirname + "/public"));
app.use("/api/", apiLimiter);
-app.get("/api/list", (req, res) => {
- db.all("SELECT * FROM theme WHERE hidden = 0 ORDER BY votes DESC", (err, all) => {
- if (err) {
- res.send("error");
- console.error(err.message);
- return;
- }
- res.send(all);
- });
+app.get("/api/list", async (req, res) => {
+ try {
+ const themes = await db.query("SELECT * FROM theme" /* WHERE hidden = FALSE ORDER BY votes DESC"*/);
+ res.json(themes);
+ } catch (e) {
+ console.error(e);
+ res.send("error");
+ }
});
-app.post("/api/add", (req, res) => {
+app.post("/api/add", async (req, res) => {
console.log(req.body.main, req.body.description);
- if (!req.body.main || !req.body.description) res.send("error");
- insert(req.body.main, req.body.description, 1);
- res.send("ok");
+ if (!req.body.main || !req.body.description) return res.send("error");
+ try {
+ await db.query("INSERT INTO theme (main, description) VALUES (?, ?)", [req.body.main, req.body.description]);
+ res.send("ok");
+ } catch (e) {
+ console.error(e);
+ res.send("error");
+ }
});
-app.post("/api/vote", (req, res) => {
+app.post("/api/vote", async (req, res) => {
console.log(req.body.id, req.body.vote);
if (req.body.vote < -1 || req.body.vote > 1) {
res.send("error");
return;
}
- db.all("UPDATE theme SET votes = votes + ? WHERE id = ?", [req.body.vote, req.body.id], (err) => {
- if (err) {
- res.send("error");
- console.error(err.message);
- return;
- }
- });
- res.send("ok");
-});
-
-app.on("close", () => {
- console.log("CLOSE");
- db.close();
+ try {
+ await db.query("UPDATE theme SET votes = votes + ? WHERE id = ?", [req.body.vote, req.body.id]);
+ res.send("ok");
+ } catch (e) {
+ console.error(e);
+ res.send("error");
+ }
});
-create_db();
-console.log("Listening on port 5005");
-app.listen(5005);
+module.exports = app;
diff --git a/motto/package.json b/motto/package.json
deleted file mode 100644
index 01f2bc6..0000000
--- a/motto/package.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "motto",
- "version": "1.0.0",
- "description": "",
- "main": "index.js",
- "scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
- },
- "author": "",
- "license": "MIT",
- "dependencies": {
- "express": "^4.17.1",
- "express-rate-limit": "^5.1.3",
- "sqlite3": "^5.0.0"
- },
- "devDependencies": {
- "eslint": "^7.8.0"
- }
-}
diff --git a/motto/public/script.js b/motto/public/script.js
index 7b27ce0..a4e75e9 100644
--- a/motto/public/script.js
+++ b/motto/public/script.js
@@ -4,7 +4,7 @@ document.querySelector(".wrapper").style.opacity = 1;
function send(id, vote) {
var xhp = new XMLHttpRequest();
- xhp.open("POST", "/api/vote");
+ xhp.open("POST", "api/vote");
xhp.setRequestHeader("Content-type", "application/json");
xhp.onreadystatechange = () => {
if (xhp.readyState == 4 && xhp.status == 200) console.log(xhp.responseText);
@@ -16,7 +16,7 @@ function send(id, vote) {
function add(main, description) {
var xhp = new XMLHttpRequest();
- xhp.open("POST", "/api/add");
+ xhp.open("POST", "api/add");
xhp.setRequestHeader("Content-type", "application/json");
xhp.onreadystatechange = () => {
if (xhp.readyState == 4 && xhp.status == 200) console.log(xhp.responseText);
@@ -141,7 +141,7 @@ function createButtonListener(yay) {
}
var xhp = new XMLHttpRequest();
-xhp.open("GET", "/api/list");
+xhp.open("GET", "api/list");
xhp.onreadystatechange = () => {
if (xhp.readyState == 4 && xhp.status == 200) {
let list = JSON.parse(xhp.responseText);
@@ -207,6 +207,10 @@ document.getElementById("aah").addEventListener("click", () => {
document.getElementById("all").addEventListener("click", toggleOverview);
document.getElementById("go").addEventListener("click", toggleOverview);
-addEventListener("load", () => {
- window.scrollTo(1, 0);
-}, false);
+addEventListener(
+ "load",
+ () => {
+ window.scrollTo(1, 0);
+ },
+ false,
+);
diff --git a/motto/public/style.css b/motto/public/style.css
index 143f2db..22532da 100644
--- a/motto/public/style.css
+++ b/motto/public/style.css
@@ -124,6 +124,10 @@ body {
vertical-align: middle;
}
+.top_button img {
+ cursor: pointer;
+}
+
@media only screen and (max-width: 600px) {
.fab button {
margin: 10px;