diff --git a/models/bot.js b/models/bot.js new file mode 100644 index 0000000..12cf7b0 --- /dev/null +++ b/models/bot.js @@ -0,0 +1,13 @@ +const mongoose = require("mongoose"); +let hm = new mongoose.Schema({ + id: String, + name: String, + avatar: String, + verified: Boolean, + description: String, + owner: String, + long_description: String, + banner: String, +}); + +module.exports = mongoose.model("bots", hm); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 8ef6b36..141435e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "license": "MIT", "dependencies": { "autoprefixer": "^10.4.8", + "body-parser": "^1.20.0", "discord.js": "^14.1.1", "ejs": "^3.1.8", "express": "^4.18.1", @@ -18,6 +19,7 @@ "mongoose": "^6.5.0", "passport": "^0.6.0", "passport-discord": "^0.1.4", + "showdown": "^2.1.0", "tailwindcss": "^3.1.7" } }, @@ -525,6 +527,14 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "node_modules/commander": { + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", + "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==", + "engines": { + "node": "^12.20.0 || >=14" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1964,6 +1974,21 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, + "node_modules/showdown": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/showdown/-/showdown-2.1.0.tgz", + "integrity": "sha512-/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ==", + "dependencies": { + "commander": "^9.0.0" + }, + "bin": { + "showdown": "bin/showdown.js" + }, + "funding": { + "type": "individual", + "url": "https://www.paypal.me/tiviesantos" + } + }, "node_modules/side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", @@ -2657,6 +2682,11 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "commander": { + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", + "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -3657,6 +3687,14 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, + "showdown": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/showdown/-/showdown-2.1.0.tgz", + "integrity": "sha512-/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ==", + "requires": { + "commander": "^9.0.0" + } + }, "side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", diff --git a/package.json b/package.json index c1ac675..5f10cc0 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "homepage": "https://github.com/CorwinDev/BotsCord#readme", "dependencies": { "autoprefixer": "^10.4.8", + "body-parser": "^1.20.0", "discord.js": "^14.1.1", "ejs": "^3.1.8", "express": "^4.18.1", @@ -35,6 +36,7 @@ "mongoose": "^6.5.0", "passport": "^0.6.0", "passport-discord": "^0.1.4", + "showdown": "^2.1.0", "tailwindcss": "^3.1.7" } } diff --git a/website/index.js b/website/index.js index 6777093..2e2167e 100644 --- a/website/index.js +++ b/website/index.js @@ -7,10 +7,18 @@ const session = require('express-session'); const passport = require('passport'); var DiscordStrategy = require('passport-discord').Strategy; const MemoryStore = require("memorystore")(session); +const bodyParser = require('body-parser'); +var showdown = require('showdown'), + converter = new showdown.Converter(); var bot = require('./routers/bot'); var admin = require('./routers/admin'); var auth = require('./routers/auth'); - +passport.serializeUser(function (user, done) { + done(null, user); +}); +passport.deserializeUser(function (obj, done) { + done(null, obj); +}); //import models const Banned = require('../models/site-ban'); @@ -22,12 +30,11 @@ app.use(session({ resave: false, saveUninitialized: false, })); +app.use(passport.initialize()); +app.use(passport.session()); // set up view engine app.set('view engine', 'ejs'); app.set('views', path.join(__dirname, '/views')); -// use passport for authentication -app.use(passport.initialize()); -app.use(passport.session()); // set up static files app.use(express.static(path.join(__dirname, 'public'))); // Import routers @@ -36,26 +43,26 @@ app.use('/admin', admin); app.use('/auth', auth); var scopes = ['identify', 'email', 'guilds', 'guilds.join']; +var prompt = 'consent' passport.use(new DiscordStrategy({ clientID: '934087523649609768', clientSecret: 'nPKjKvOCOyyhDaQM64qcJYbd6CdhCxLh', callbackURL: 'http://localhost:3000/auth/callback', - scope: scopes + scope: scopes, + prompt: prompt }, - function (accessToken, refreshToken, profile, cb) { - console.log(profile); + function (accessToken, refreshToken, profile, done) { Banned.findOne({ user: profile.id }, function (err, user) { if (err) { console.log(err); - return cb(err); + return done(err); } if (user) { console.log('User is banned'); - return cb(err, false); + return done(err, false); } else { - console.log('User is not banned'); - return cb(err, user); + return done(null, profile); } }); })); @@ -63,12 +70,27 @@ passport.use(new DiscordStrategy({ app.get('/', (req, res) => { var message = req.session.message; req.session.message = null; + var error = req.session.error; + req.session.error = null; if (message) { res.render('index', { - message: message + message: message, + user: req.user, + markdown: converter, + }); + return + } + if(error){ + res.render('index', { + error: error, + user: req.user, + markdown: converter, + }); + }else{ + res.render('index.ejs',{ + user: req.user, + markdown: converter, }); - } else { - res.render('index.ejs'); } }); diff --git a/website/public/css/style.css b/website/public/css/style.css index 03e4d56..8dee340 100644 --- a/website/public/css/style.css +++ b/website/public/css/style.css @@ -586,9 +586,21 @@ video { .bottom-0 { bottom: 0px; } +.top-0 { + top: 0px; +} .order-3 { order: 3; } +.col-auto { + grid-column: auto; +} +.m-8 { + margin: 2rem; +} +.m-20 { + margin: 5rem; +} .mx-auto { margin-left: auto; margin-right: auto; @@ -635,18 +647,33 @@ video { .mb-0 { margin-bottom: 0px; } +.mb-4 { + margin-bottom: 1rem; +} +.ml-3 { + margin-left: 0.75rem; +} .block { display: block; } .inline-block { display: inline-block; } +.inline { + display: inline; +} .flex { display: flex; } +.inline-flex { + display: inline-flex; +} .table { display: table; } +.grid { + display: grid; +} .contents { display: contents; } @@ -685,6 +712,9 @@ video { height: -moz-fit-content; height: fit-content; } +.h-screen { + height: 100vh; +} .w-full { width: 100%; } @@ -718,6 +748,14 @@ video { .w-3 { width: 0.75rem; } +.w-fit { + width: -webkit-fit-content; + width: -moz-fit-content; + width: fit-content; +} +.w-40 { + width: 10rem; +} .w-3\/6 { width: 50%; } @@ -754,6 +792,9 @@ video { .grow { flex-grow: 1; } +.basis-1 { + flex-basis: 0.25rem; +} .border-collapse { border-collapse: collapse; } @@ -768,24 +809,81 @@ video { -moz-appearance: none; appearance: none; } +.grid-flow-col { + grid-auto-flow: column; +} .grid-cols-3 { grid-template-columns: repeat(3, minmax(0, 1fr)); } +.grid-cols-1 { + grid-template-columns: repeat(1, minmax(0, 1fr)); +} +.grid-cols-2 { + grid-template-columns: repeat(2, minmax(0, 1fr)); +} +.grid-cols-none { + grid-template-columns: none; +} +.grid-cols-6 { + grid-template-columns: repeat(6, minmax(0, 1fr)); +} +.grid-cols-5 { + grid-template-columns: repeat(5, minmax(0, 1fr)); +} +.grid-cols-4 { + grid-template-columns: repeat(4, minmax(0, 1fr)); +} +.flex-row { + flex-direction: row; +} .flex-col { flex-direction: column; } .flex-wrap { flex-wrap: wrap; } +.place-items-center { + place-items: center; +} +.content-center { + align-content: center; +} +.content-evenly { + align-content: space-evenly; +} +.items-end { + align-items: flex-end; +} .items-center { align-items: center; } +.justify-end { + justify-content: flex-end; +} .justify-center { justify-content: center; } .justify-between { justify-content: space-between; } +.gap-0 { + gap: 0px; +} +.gap-4 { + gap: 1rem; +} +.gap-x-0 { + -moz-column-gap: 0px; + column-gap: 0px; +} +.gap-y-0 { + row-gap: 0px; +} +.space-x-8 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(2rem * var(--tw-space-x-reverse)); + margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse))); +} .overflow-hidden { overflow: hidden; } @@ -801,10 +899,16 @@ video { .rounded-full { border-radius: 9999px; } +.rounded-xl { + border-radius: 0.75rem; +} .rounded-t-lg { border-top-left-radius: 0.5rem; border-top-right-radius: 0.5rem; } +.rounded-bl-full { + border-bottom-left-radius: 9999px; +} .border { border-width: 1px; } @@ -814,6 +918,9 @@ video { .border-2 { border-width: 2px; } +.border-0 { + border-width: 0px; +} .border-b { border-bottom-width: 1px; } @@ -853,6 +960,22 @@ video { --tw-border-opacity: 1; border-color: rgb(24 25 28 / var(--tw-border-opacity)); } +.border-gray-700 { + --tw-border-opacity: 1; + border-color: rgb(55 65 81 / var(--tw-border-opacity)); +} +.border-red-400 { + --tw-border-opacity: 1; + border-color: rgb(248 113 113 / var(--tw-border-opacity)); +} +.border-blue-400 { + --tw-border-opacity: 1; + border-color: rgb(96 165 250 / var(--tw-border-opacity)); +} +.border-red-500 { + --tw-border-opacity: 1; + border-color: rgb(239 68 68 / var(--tw-border-opacity)); +} .bg-transparent { background-color: transparent; } @@ -902,12 +1025,27 @@ video { --tw-bg-opacity: 1; background-color: rgb(229 231 235 / var(--tw-bg-opacity)); } +.bg-secondary-color { + --tw-bg-opacity: 1; + background-color: rgb(245 245 245 / var(--tw-bg-opacity)); +} +.bg-gray-800 { + --tw-bg-opacity: 1; + background-color: rgb(31 41 55 / var(--tw-bg-opacity)); +} +.bg-red-100 { + --tw-bg-opacity: 1; + background-color: rgb(254 226 226 / var(--tw-bg-opacity)); +} .bg-fixed { background-attachment: fixed; } .bg-right-top { background-position: right top; } +.fill-current { + fill: currentColor; +} .p-6 { padding: 1.5rem; } @@ -920,12 +1058,15 @@ video { .p-1 { padding: 0.25rem; } -.p-2\.5 { - padding: 0.625rem; -} .p-10 { padding: 2.5rem; } +.p-8 { + padding: 2rem; +} +.p-2\.5 { + padding: 0.625rem; +} .px-3 { padding-left: 0.75rem; padding-right: 0.75rem; @@ -992,6 +1133,18 @@ video { .pr-10 { padding-right: 2.5rem; } +.pl-6 { + padding-left: 1.5rem; +} +.pr-6 { + padding-right: 1.5rem; +} +.pl-5 { + padding-left: 1.25rem; +} +.pr-5 { + padding-right: 1.25rem; +} .text-center { text-align: center; } @@ -1086,6 +1239,22 @@ video { --tw-text-opacity: 1; color: rgb(0 0 0 / var(--tw-text-opacity)); } +.text-red-700 { + --tw-text-opacity: 1; + color: rgb(185 28 28 / var(--tw-text-opacity)); +} +.text-red-500 { + --tw-text-opacity: 1; + color: rgb(239 68 68 / var(--tw-text-opacity)); +} +.text-blue-700 { + --tw-text-opacity: 1; + color: rgb(29 78 216 / var(--tw-text-opacity)); +} +.text-blue-400 { + --tw-text-opacity: 1; + color: rgb(96 165 250 / var(--tw-text-opacity)); +} .underline { -webkit-text-decoration-line: underline; text-decoration-line: underline; @@ -1108,6 +1277,24 @@ video { --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color); box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } +.shadow-none { + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); +} +.shadow-2xl { + --tw-shadow: 0 25px 50px -12px rgb(0 0 0 / 0.25); + --tw-shadow-colored: 0 25px 50px -12px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); +} +.shadow-white { + --tw-shadow-color: #fff; + --tw-shadow: var(--tw-shadow-colored); +} +.shadow-indigo-500 { + --tw-shadow-color: #6366f1; + --tw-shadow: var(--tw-shadow-colored); +} .outline-none { outline: 2px solid transparent; outline-offset: 2px; @@ -1145,6 +1332,21 @@ video { transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); transition-duration: 150ms; } +.transition-shadow { + transition-property: box-shadow; + transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); + transition-duration: 150ms; +} +.duration-300 { + transition-duration: 300ms; +} +.ease-in-out { + transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); +} +.content-none { + --tw-content: none; + content: var(--tw-content); +} @import url('https://fonts.googleapis.com/css2?family=Quicksand&display=swap'); body { font-family: 'Quicksand', sans-serif; @@ -1260,11 +1462,26 @@ body { color: rgb(20 184 166 / var(--tw-text-opacity)); } +.hover\:text-yellow-100:hover { + --tw-text-opacity: 1; + color: rgb(254 249 195 / var(--tw-text-opacity)); +} + +.hover\:text-blue-color:hover { + --tw-text-opacity: 1; + color: rgb(24 25 28 / var(--tw-text-opacity)); +} + .hover\:no-underline:hover { -webkit-text-decoration-line: none; text-decoration-line: none; } +.hover\:shadow-blue-900:hover { + --tw-shadow-color: #1e3a8a; + --tw-shadow: var(--tw-shadow-colored); +} + .focus\:border-blue-500:focus { --tw-border-opacity: 1; border-color: rgb(59 130 246 / var(--tw-border-opacity)); @@ -1281,6 +1498,12 @@ body { box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000); } +.focus\:ring-2:focus { + --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color); + --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color); + box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000); +} + .focus\:ring-blue-500:focus { --tw-ring-opacity: 1; --tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity)); @@ -1315,6 +1538,11 @@ body { color: rgb(255 255 255 / var(--tw-text-opacity)); } + .dark\:text-gray-400 { + --tw-text-opacity: 1; + color: rgb(156 163 175 / var(--tw-text-opacity)); + } + .dark\:placeholder-gray-400::-moz-placeholder { --tw-placeholder-opacity: 1; color: rgb(156 163 175 / var(--tw-placeholder-opacity)); @@ -1329,6 +1557,11 @@ body { background-color: 5865F2; } + .dark\:hover\:text-white:hover { + --tw-text-opacity: 1; + color: rgb(255 255 255 / var(--tw-text-opacity)); + } + .dark\:focus\:border-blue-500:focus { --tw-border-opacity: 1; border-color: rgb(59 130 246 / var(--tw-border-opacity)); @@ -1347,6 +1580,29 @@ body { .dark\:focus\:ring-button-primary:focus { --tw-ring-color: 5865F2; } + + .dark\:focus\:ring-gray-500:focus { + --tw-ring-opacity: 1; + --tw-ring-color: rgb(107 114 128 / var(--tw-ring-opacity)); + } +} + +@media (min-width: 640px) { + + .sm\:inline { + display: inline; + } + + .sm\:grid-cols-1 { + grid-template-columns: repeat(1, minmax(0, 1fr)); + } +} + +@media (min-width: 768px) { + + .md\:grid-cols-2 { + grid-template-columns: repeat(2, minmax(0, 1fr)); + } } @media (min-width: 1024px) { @@ -1355,12 +1611,16 @@ body { margin-top: 0px; } + .lg\:block { + display: block; + } + .lg\:inline-block { display: inline-block; } - .lg\:flex { - display: flex; + .lg\:hidden { + display: none; } .lg\:w-1\/2 { @@ -1375,7 +1635,18 @@ body { flex-grow: 1; } + .lg\:grid-cols-4 { + grid-template-columns: repeat(4, minmax(0, 1fr)); + } + .lg\:items-center { align-items: center; } +} + +@media (min-width: 1280px) { + + .xl\:grid-cols-5 { + grid-template-columns: repeat(5, minmax(0, 1fr)); + } } \ No newline at end of file diff --git a/website/routers/auth/index.js b/website/routers/auth/index.js index 96a19b0..ba65bd5 100644 --- a/website/routers/auth/index.js +++ b/website/routers/auth/index.js @@ -7,7 +7,7 @@ router.get('/', passport.authenticate('discord')); router.get('/callback', passport.authenticate('discord', { failureRedirect: '/' }), function (req, res) { - res.redirect('/secretstuff') // Successful auth + res.redirect('/'); }); router.get('/logout', function (req, res) { req.logout(function (err) { diff --git a/website/routers/bot/index.js b/website/routers/bot/index.js index d13fc53..fe9cdae 100644 --- a/website/routers/bot/index.js +++ b/website/routers/bot/index.js @@ -1,7 +1,58 @@ var express = require('express'), router = express.Router(); - +var bots = require('../../../models/bot'); +const client = require('../../index'); router.get('/', function () { }) +router.get('/add', function (req, res) { + if (req.user) { + res.render('bot/add'); + return + } else { + res.redirect('/auth'); + } +}); +router.post('/add', function (req, res) { + if (req.user) { + var bot = new bots({ + id: req.body.id, + name: req.body.name, + avatar: req.body.avatar, + verified: false, + description: req.body.description, + owner: req.user.userid, + long_description: req.body.long_description, + banner: req.body.banner, + }); + bot.save(function (err) { + if (err) { + console.log(err); + req.session.error = "Something went wrong"; + res.redirect('/'); + } else { + req.session.message = "Bot added"; + res.redirect('/'); + } + }); + } + else { + req.session.error = "You aren't logged in"; + res.redirect('/'); + } +}); + +router.get('/:botID', function (req, res) { + bots.findOne({ id: req.params.botID }, function (err, bot) { + if (err) { + console.log(err); + return res.redirect('/'); + } + if (!bot) { + req.session.error = "No bot found"; + return res.redirect('/'); + } + res.render('bot/index', { bot: bot }); + }) +}) module.exports = router; \ No newline at end of file diff --git a/website/views/bot/add.ejs b/website/views/bot/add.ejs new file mode 100644 index 0000000..2037144 --- /dev/null +++ b/website/views/bot/add.ejs @@ -0,0 +1,2 @@ + +<%- include('../includes/header.ejs', {title: 'Add Bot'}) %> \ No newline at end of file diff --git a/website/views/includes/footer.ejs b/website/views/includes/footer.ejs index 772c505..87e7e48 100644 --- a/website/views/includes/footer.ejs +++ b/website/views/includes/footer.ejs @@ -10,28 +10,16 @@

Social

@@ -40,7 +28,8 @@

- © 2021 - 2022 BotsCord. All rights reserved. + © 2021 - 2022 BotsCord. All rights reserved.
+ Made with by Corwin.

\ No newline at end of file diff --git a/website/views/includes/header.ejs b/website/views/includes/header.ejs index 91b4b22..7fe241f 100644 --- a/website/views/includes/header.ejs +++ b/website/views/includes/header.ejs @@ -4,15 +4,21 @@ - BotsCord + BotsCord | + <% if (typeof title != "undefined") { %> + <%= title %> + <% } else { %> + Home + <% } %> + -
+
-
+ \ No newline at end of file diff --git a/website/views/index.ejs b/website/views/index.ejs index 90dcc27..c536d25 100644 --- a/website/views/index.ejs +++ b/website/views/index.ejs @@ -1,13 +1,12 @@ -<%- include("./includes/header.ejs") %> - +<%- include("./includes/header.ejs", { user:user }) %>
-

-
+
-
- - -
-

Promoted Bots

-

These bots are featured on BotsCord!

+
+
+

Promoted Bots

+

These bots are featured on BotsCord!

-
-
+
+
Sunset in the mountains
The Coldest Sunset
-

+

Description

@@ -55,11 +54,11 @@ #winter
-
+
Sunset in the mountains
The Coldest Sunset
-

+

Description

@@ -68,11 +67,11 @@ #winter
-
+
Sunset in the mountains
The Coldest Sunset
-

+

Description