diff --git a/models/bot.js b/models/bot.js index 12cf7b0..ca75201 100644 --- a/models/bot.js +++ b/models/bot.js @@ -8,6 +8,9 @@ let hm = new mongoose.Schema({ owner: String, long_description: String, banner: String, + style: String, + tags: [String], + premium: Boolean, }); module.exports = mongoose.model("bots", hm); \ No newline at end of file diff --git a/website/index.js b/website/index.js index 58e5ee6..863d385 100644 --- a/website/index.js +++ b/website/index.js @@ -23,6 +23,7 @@ passport.deserializeUser(function (obj, done) { //import models const Banned = require('../models/site-ban'); +const bots = require('../models/bot'); // set up session app.use(session({ @@ -70,16 +71,19 @@ passport.use(new DiscordStrategy({ }); })); // set up routes -app.get('/', (req, res) => { +app.get('/',async (req, res) => { var message = req.session.message; req.session.message = null; var error = req.session.error; req.session.error = null; + var robots = await bots.find({verified: true}); + if (message) { res.render('index', { message: message, user: req.user, markdown: converter, + bots: robots, }); return } @@ -88,11 +92,13 @@ app.get('/', (req, res) => { error: error, user: req.user, markdown: converter, + bots: robots, }); }else{ res.render('index.ejs',{ user: req.user, markdown: converter, + bots: robots, }); } }); diff --git a/website/public/css/style.css b/website/public/css/style.css index 477fa7e..8de4bfa 100644 --- a/website/public/css/style.css +++ b/website/public/css/style.css @@ -775,12 +775,12 @@ video { .w-40 { width: 10rem; } -.w-3\/6 { - width: 50%; -} .w-56 { width: 14rem; } +.w-3\/6 { + width: 50%; +} .max-w-7xl { max-width: 80rem; } @@ -820,12 +820,12 @@ video { .border-collapse { border-collapse: collapse; } -.origin-\[0\] { - transform-origin: 0; -} .origin-top-right { transform-origin: top right; } +.origin-\[0\] { + transform-origin: 0; +} .-translate-y-6 { --tw-translate-y: -1.5rem; transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); @@ -1113,6 +1113,10 @@ video { --tw-bg-opacity: 1; background-color: rgb(254 226 226 / var(--tw-bg-opacity)); } +.bg-gray-300 { + --tw-bg-opacity: 1; + background-color: rgb(209 213 219 / var(--tw-bg-opacity)); +} .bg-fixed { background-attachment: fixed; } @@ -1179,14 +1183,14 @@ video { padding-left: 1.5rem; padding-right: 1.5rem; } -.py-2\.5 { - padding-top: 0.625rem; - padding-bottom: 0.625rem; -} .px-0 { padding-left: 0px; padding-right: 0px; } +.py-2\.5 { + padding-top: 0.625rem; + padding-bottom: 0.625rem; +} .pt-2 { padding-top: 0.5rem; } @@ -1567,6 +1571,10 @@ body { --tooltip-text: #fff; }*/ +.empty\:hidden:empty { + display: none; +} + .hover\:border-transparent:hover { border-color: transparent; } @@ -1575,19 +1583,19 @@ body { background-color: 5865F2; } -.hover\:bg-white:hover { - --tw-bg-opacity: 1; - background-color: rgb(255 255 255 / var(--tw-bg-opacity)); -} - .hover\:bg-blue-800:hover { --tw-bg-opacity: 1; background-color: rgb(30 64 175 / var(--tw-bg-opacity)); } -.hover\:bg-gray-50:hover { +.hover\:bg-white:hover { --tw-bg-opacity: 1; - background-color: rgb(249 250 251 / var(--tw-bg-opacity)); + background-color: rgb(255 255 255 / var(--tw-bg-opacity)); +} + +.hover\:bg-gray-400:hover { + --tw-bg-opacity: 1; + background-color: rgb(156 163 175 / var(--tw-bg-opacity)); } .hover\:text-gray-900:hover { @@ -1600,16 +1608,6 @@ body { color: rgb(255 255 255 / var(--tw-text-opacity)); } -.hover\:text-teal-500:hover { - --tw-text-opacity: 1; - 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)); @@ -1630,21 +1628,11 @@ body { border-color: rgb(59 130 246 / var(--tw-border-opacity)); } -.focus\:border-gray-500:focus { - --tw-border-opacity: 1; - border-color: rgb(107 114 128 / var(--tw-border-opacity)); -} - .focus\:border-blue-600:focus { --tw-border-opacity: 1; border-color: rgb(37 99 235 / var(--tw-border-opacity)); } -.focus\:bg-white:focus { - --tw-bg-opacity: 1; - background-color: rgb(255 255 255 / var(--tw-bg-opacity)); -} - .focus\:outline-none:focus { outline: 2px solid transparent; outline-offset: 2px; @@ -1656,18 +1644,18 @@ 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-0: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(0px + 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-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)); @@ -1678,19 +1666,6 @@ body { --tw-ring-color: rgb(147 197 253 / var(--tw-ring-opacity)); } -.focus\:ring-indigo-500:focus { - --tw-ring-opacity: 1; - --tw-ring-color: rgb(99 102 241 / var(--tw-ring-opacity)); -} - -.focus\:ring-offset-2:focus { - --tw-ring-offset-width: 2px; -} - -.focus\:ring-offset-gray-100:focus { - --tw-ring-offset-color: #f3f4f6; -} - .peer:-moz-placeholder-shown ~ .peer-placeholder-shown\:translate-y-0 { --tw-translate-y: 0px; transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); @@ -1757,6 +1732,11 @@ body { background-color: rgb(37 99 235 / var(--tw-bg-opacity)); } + .dark\:bg-gray-700 { + --tw-bg-opacity: 1; + background-color: rgb(55 65 81 / var(--tw-bg-opacity)); + } + .dark\:text-primary-color { color: #1E2023;; } @@ -1842,18 +1822,6 @@ body { @media (min-width: 768px) { - .md\:mb-0 { - margin-bottom: 0px; - } - - .md\:w-1\/2 { - width: 50%; - } - - .md\:w-1\/3 { - width: 33.333333%; - } - .md\:grid-cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); } diff --git a/website/routers/bot/index.js b/website/routers/bot/index.js index b0e6176..3948cef 100644 --- a/website/routers/bot/index.js +++ b/website/routers/bot/index.js @@ -6,7 +6,7 @@ router.get('/', function () { }) router.get('/add', function (req, res) { if (req.user) { - res.render('bot/add'); + res.render('bot/add', {user: req.user}); return } else { res.redirect('/auth'); @@ -15,14 +15,18 @@ router.get('/add', function (req, res) { router.post('/add', function (req, res) { if (req.user) { - console.log(req.body) var bot = new bots({ id: req.body.bot_id, name: req.body.bot_name, verified: false, long_description: req.body.bot_description, owner: req.user.userid, + style: req.body.style, + description: req.body.bot_short, + tags: req.body.tags, + }); + bot.save(function (err) { if (err) { console.log(err); @@ -33,8 +37,7 @@ router.post('/add', function (req, res) { res.redirect('/'); } }); - } - else { + }else { req.session.error = "You aren't logged in"; res.redirect('/'); } diff --git a/website/views/bot/add.ejs b/website/views/bot/add.ejs index acf85fc..9aa0445 100644 --- a/website/views/bot/add.ejs +++ b/website/views/bot/add.ejs @@ -17,6 +17,29 @@ +
+ + +
+ +
+ +
+ +
+ +
\ No newline at end of file diff --git a/website/views/index.ejs b/website/views/index.ejs index c536d25..312972b 100644 --- a/website/views/index.ejs +++ b/website/views/index.ejs @@ -35,50 +35,30 @@ -
+

Promoted Bots

These bots are featured on BotsCord!

-
- Sunset in the mountains + <% bots.slice(-5).forEach(bot=>{ %> + <% if(bot.premium == true) { %> +
+ <%= bot.name %>
-
The Coldest Sunset
-

Description +

<%= bot.name %>
+

<%= bot.description %>

+ <% if(bot.tags) {%>
- #photography - #travel - #winter -
-
-
- Sunset in the mountains -
-
The Coldest Sunset
-

Description -

-
-
- #photography - #travel - #winter -
-
-
- Sunset in the mountains -
-
The Coldest Sunset
-

Description -

-
-
- #photography - #travel - #winter + <% bot.tags.forEach(tag=>{ %> + #<%= tag %> + <% }) %>
+ <% } %> + <% } %>
+ <% }) %>
<%- include("./includes/footer.ejs") %> \ No newline at end of file