Merge branch 'main' into Dev-branch

This commit is contained in:
newtbot
2024-01-19 03:23:13 +08:00
72 changed files with 3135 additions and 3223 deletions

View File

@ -1,9 +1,9 @@
const { getUser, addUser } = require("../functions/apiDatabase.js");
const { hashPassword } = require("../functions/bcrypt.js");
const express = require("express");
const router = express.Router();
//get all users
router.get("/", async (req, res, next) => {
try {
const location = await getUser();
@ -14,12 +14,12 @@ router.get("/", async (req, res, next) => {
}
});
// /user/register
router.post("/register", async (req, res, next) => {
try {
console.log(req.body);
//await addUser(req.body);
//res.sendStatus(200);
res.sendStatus(200);
} catch (error) {
console.error(error);
next(error);