diff --git a/src/events/ready.js b/src/events/ready.js index 5d31e76..8159037 100644 --- a/src/events/ready.js +++ b/src/events/ready.js @@ -1,9 +1,9 @@ const chalk = require("chalk"); const config = require("../config/config.json") -const discord = require("../bot"); +require("../bot"); module.exports = client => { - console.clear(); + // console.clear(); console.log(chalk.bold.green("Launched Successfully...\n")); console.log(chalk.magenta("Version:"), chalk.cyan("-")); @@ -15,4 +15,4 @@ module.exports = client => { } console.log(chalk.green("website:", chalk.underline(`http://localhost:${config.port}`))); -}; \ No newline at end of file +}; diff --git a/src/index.js b/src/index.js index 7e81d12..ff9f2b7 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,6 @@ const discord = require("./bot"); const express = require("express"); +const engine = require("ejs-blocks"); const session = require("express-session"); const flash = require("connect-flash"); const fileUpload = require("express-fileupload"); @@ -13,6 +14,7 @@ port = config.port; app.use(express.static("./public")); app.use(express.static("./themes")); +app.engine("ejs", engine); app.set("view engine", "ejs"); app.use(express.urlencoded({ extended: true, limit: "5mb" })); app.use(fileUpload()); @@ -33,7 +35,7 @@ app.use((req, res, next) => { next(); }); -// app.use("/", require("./routes/home.js")); +app.use("/", require("./routes/home.js")); http.listen(port); diff --git a/src/package.json b/src/package.json index 0ed94a4..2ab6ab6 100644 --- a/src/package.json +++ b/src/package.json @@ -11,16 +11,23 @@ "type": "commonjs", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "start": "node index.js", + "dev": "nodemon index.js" }, "dependencies": { "connect-flash": "^0.1.1", "discord.js": "^14.17.3", "ejs": "^3.1.10", + "ejs-blocks": "^0.1.4", "express": "^4.21.2", "express-fileupload": "^1.5.1", "express-session": "^1.18.1", "lolcatjs": "^2.4.3", "socket.io": "^4.8.1" + }, + "devDependencies": { + "eslint": "^9.18.0", + "nodemon": "^3.1.9" } } diff --git a/src/routes/home.js b/src/routes/home.js index e69de29..041d70a 100644 --- a/src/routes/home.js +++ b/src/routes/home.js @@ -0,0 +1,14 @@ +const express = require("express"); +const router = express.Router(); + +router.get("/", (request, response) => { + response.redirect("/home"); +}); + +router.get("/home", (request, response) => { + response.render("home/home", { + title: "pyrss-ng ยท home", + }); +}); + +module.exports = router; diff --git a/src/views/home/home.ejs b/src/views/home/home.ejs index e69de29..bf2b811 100644 --- a/src/views/home/home.ejs +++ b/src/views/home/home.ejs @@ -0,0 +1,2 @@ +<%- layout("../layout") %> +hello world \ No newline at end of file diff --git a/src/views/layout.ejs b/src/views/layout.ejs new file mode 100644 index 0000000..f111e17 --- /dev/null +++ b/src/views/layout.ejs @@ -0,0 +1,12 @@ + + +
+ +