Added error messages, styled cards, add bot/add

This commit is contained in:
CorwinDev committed 2022-08-02 10:40:06 +02:00
1 parent 0e9c13914b
commit f788e4de59
11 files changed
+501 -81

No files matched your search

+13
View File
@@ -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);
+38
View File
@@ -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",
+2
View File
@@ -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"
}
}
+36 -14
View File
@@ -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');
}
});
+276 -5
View File
@@ -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));
}
}
+1 -1
View File
@@ -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) {
+52 -1
View File
@@ -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;
+2
View File
@@ -0,0 +1,2 @@
<!-- add bots for the website -->
<%- include('../includes/header.ejs', {title: 'Add Bot'}) %>
+5 -16
View File
@@ -10,28 +10,16 @@
<div class="w-full lg:w-1/2 px-4">
<h3 class="text-white font-bold text-xl mb-2">Social</h3>
<ul class="list-reset items-center text-center">
<li class="inline-block mr-2">
<a href="https://twitter.com/BotsCord" class="text-white hover:text-gray-900">
<span class="sr-only">Twitter</span>
<svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24">
<path fill-rule="evenodd" d="M24 4.557c-.883.392-1.832.656-2.828.775 1.4-.693 2.5-1.717 3.032-3.038-.951.564-2.005.979-3.127 1.068-.897-.957-2.178-1.555-3.594-1.555-3.179 0-5.515 2.966-4.797 6.045-4.091-.205-7.719-2.165-10.148-5.144-1.29 2.213-.669 5.108 1.523 6.574-.806-.026-1.542-.261-2.233-.616-.054 2.281 1.581 4.415 3.949 4.89-.693.188-1.452.232-2.224.084.626 1.956 2.444 3.379 4.6 3.419-2.07 1.623-4.678 2.348-7.29 2.04 2.179 1.397 4.768 2.209 7.548 2.209 9.142 0 14.307-7.721 13.995-14.646.962-.695 1.797-1.562 2.457-2.549z" clip-rule="evenodd" />
</svg>
</a>
</li>
<li class="inline-block mr-2">
<a href="https://discord.gg/BotsCord" class="text-white hover:text-gray-900">
<span class="sr-only">Discord</span>
<svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24">
<path fill-rule="evenodd" d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5.1-4.71-.71-6-2.3-.64-.84-1.08-1.89-1.08-3.14 0-2.13 1.65-4.03 4.2-4.2 1.78 0 3.13 1.3 3.72 2.8H14.9c-.68-1.78-2.56-3.2-4.9-3.2-3.44 0-6 2.56-6 6 0 1.65.61 3.17 1.6 4.2.91 1 2.22 1.65 3.63 1.65 3.42 0 5.65-2.37 6-5.8h-2.07z" clip-rule="evenodd" />
</svg>
<i class="fab fa-discord fa-2x"></i>
</a>
</li>
<li class="inline-block mr-2">
<a href="" class="text-white hover:text-gray-900">
<a href="https://github.com/CorwinDev/BotsCord" class="text-white hover:text-gray-900">
<span class="sr-only">GitHub</span>
<svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24">
<path fill-rule="evenodd" d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5.1-4.71-.71-6-2.3-.64-.84-1.08-1.89-1.08-3.14 0-2.13 1.65-4.03 4.2-4.2 1.78 0 3.13 1.3 3.72 2.8h-1.9c-.68-1.78-2.56-3.2-4.9-3.2-3.44 0-6 2.56-6 6 0 1.65.61 3.17 1.6 4.2.91 1 2.22 1.65 3.63 1.65 3.42 0 5.65-2.37 6-5.8h-2.07c-.05.33-.08.66-.08 1 0 1.66 1.34 3 3 3s3-1.34 3-3-1.34-3-3-3z" clip-rule="evenodd" />
</svg>
<i class="fab fa-github fa-2x"></i>
</a>
</li>
</ul>
@@ -40,7 +28,8 @@
</div>
<div class="text-white text-center">
<p>
© 2021 - 2022 BotsCord. All rights reserved.
© 2021 - 2022 BotsCord. All rights reserved. <br>
Made with <i class="fas fa-heart text-red-500"></i> by <a href="https://corwin.dev" class="text-blue-400 hover:text-white">Corwin</a>.
</p>
</div>
</footer>
+57 -24
View File
@@ -4,15 +4,21 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=, initial-scale=1.0">
<title>BotsCord</title>
<title>BotsCord |
<% if (typeof title != "undefined") { %>
<%= title %>
<% } else { %>
Home
<% } %>
</title>
<link href="/css/style.css" rel="stylesheet">
<link href=https://pro.fontawesome.com/releases/v5.13.1/css/all.css rel=stylesheet>
</head>
<body class="bg-primary-color">
<div class="p-2 pl-4 pr-4 bg-blue-color">
<div class="p-2 pl-5 pr-5 bg-blue-color">
<!-- navbar in tailwind with login buttons -->
<nav class="flex items-center justify-between flex-wrap p-6 bg-blue-color">
<nav class="flex items-center flex-wrap p-6 bg-blue-color">
<div class="flex items-center flex-shrink-0 text-white mr-6">
<!-- logo -->
<a href="/">
@@ -20,29 +26,56 @@
</a>
<span class="font-semibold text-xl tracking-tight">&nbsp;BotsCord</span>
</div>
<div class="w-full block flex-grow lg:flex lg:items-center lg:w-auto">
<div class="text-sm lg:flex-grow">
<a href="/bots" class="block mt-4 lg:inline-block lg:mt-0 text-white hover:text-white mr-4">
Bots
</a>
<a href="/servers" class="block mt-4 lg:inline-block lg:mt-0 text-white hover:text-white mr-4">
Servers
</a>
</div>
<div>
<% if (typeof user == "undefined") { %>
<a href="/login" class="inline-block text-sm px-4 py-2 leading-none border rounded text-white border-white hover:border-transparent hover:text-teal-500 hover:bg-white mt-4 lg:mt-0">Login</a>
<% }else { %>
<a href="/profile" class="inline-block text-sm px-4 py-2 leading-none border rounded text-white border-white hover:border-transparent hover:text-teal-500 hover:bg-white mt-4 lg:mt-0">Profile</a>
<% } %>
<button data-collapse-toggle="navbar-solid-bg" type="button" class="inline-flex justify-end items-end ml-3 text-gray-400 rounded-lg lg:hidden hover:text-gray-900 focus:outline-none focus:ring-2 focus:ring-blue-300 dark:text-gray-400 dark:hover:text-white dark:focus:ring-gray-500" aria-controls="navbar-solid-bg" aria-expanded="false" id="trigger">
<span class="sr-only">Open main menu</span>
<svg class="w-6 h-6" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" d="M3 5a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 10a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 15a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1z" clip-rule="evenodd"></path>
</svg>
</button>
<div class="w-full hidden lg:block flex-grow lg:items-center lg:w-auto" id="navbar-solid-bg">
<div class="flex">
<div class="text-sm lg:flex-grow">
<a href="/bots" class="block lg:inline-block lg:mt-0 text-white hover:text-white mr-4">
Bots
</a>
<a href="/servers" class="block lg:inline-block lg:mt-0 text-white hover:text-white mr-4">
Servers
</a>
</div>
<div>
<% if (typeof user == "undefined") { %>
<a href="/auth" class="inline-block text-sm px-4 py-2 leading-none border rounded text-white border-white hover:border-transparent hover:text-blue-color hover:bg-white mt-4 lg:mt-0">Login</a>
<% }else { %>
<a href="/profile" class="inline-block text-sm px-4 py-2 leading-none border rounded text-white border-white hover:border-transparent hover:text-blue-color hover:bg-white mt-4 lg:mt-0">Profile</a>
<a href="/auth/logout" class="inline-block text-sm px-4 py-2 leading-none border rounded text-white border-red-500 hover:border-transparent hover:text-blue-color hover:bg-white mt-4 lg:mt-0">Logout</a>
<% } %>
</div>
</div>
</div>
</nav>
<!-- end navbar in tailwind -->
<!-- show alert if variable message is available -->
<% if (typeof message != "undefined") { %>
<div class="alert alert-success" role="alert">
<%= message %>
<% if (typeof error != "undefined") { %>
<div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative" role="alert">
<strong class="font-bold">Holy Cows!</strong>
<span class="block sm:inline"><br><%= error %></span>
</div>
<% } %>
</div>
<% if (typeof message != "undefined") { %>
<div class="bg-white border border-blue-400 text-blue-700 px-4 py-3 rounded relative" role="alert">
<strong class="font-bold">Alert!</strong>
<span class="block sm:inline"><br><%= message %></span>
</div>
<% } %>
</div>
<script>
const targetEl = document.getElementById("navbar-solid-bg");
const triggerEl = document.getElementById("trigger");
triggerEl.addEventListener("click", function() {
if (targetEl.classList.contains("hidden")) {
targetEl.classList.remove("hidden");
} else {
targetEl.classList.add("hidden");
}
});
</script>
+19 -20
View File
@@ -1,13 +1,12 @@
<%- include("./includes/header.ejs") %>
<%- include("./includes/header.ejs", { user:user }) %>
<div class="bg-blue-color bg-primary-color p-2 pl-10 pr-10" style="position: relative; top: 0px;">
<br><br>
<div class="container-sm mx-auto px-3 mb-5 mt-1 h-fit p-1">
<div class="container-sm mx-auto px-3 mb-5 mt-1 h-fit p-1">
<div class="mb-3 mx-auto h-fit">
<span style="margin-top: -5%;float: right; margin-right: 10%;" class="logo">
<img draggable="false" style="z-index: -1!important;" title="botscord.site" src="../img/logo.png" width="320" alt="Discord Bots | Discord Bot List">
<span style="float: right; margin-right: 10%;" class="logo">
<img draggable="false" title="botscord.site" src="/img/logo.png" width="320" alt="Discord Bots | Discord Bot List">
</span>
<h1 class=" text-xl" translate="no" style="font-weight:800;color:#fff">BotsCord</h1>
<br><br>
<h1 class="text-xl" style="font-weight:800;color:#fff">BotsCord</h1>
<p class="content" style="opacity:.6;color:#fff">Find the best Discord Bots for your server with BotsCord!</p>
<br>
<form class="flex items-center ">
@@ -30,23 +29,23 @@
<a title="BotsCord" href="/tag/Moderation" class="text-white bg-button-primary hover:bg-button-primary focus:ring-4 focus:ring-blue-300 font-bold rounded-lg text-sm px-2 py-2 mb-2 dark:bg-button-primary dark:hover:bg-button-primary focus:outline-none dark:focus:ring-button-primary underline hover:no-underline"><i class="fad fa-magic"></i>&nbsp;Moderation</a>
<a title="BotsCord" href="/tag/Fun" class="text-white bg-button-primary hover:bg-button-primary focus:ring-4 focus:ring-blue-300 font-bold rounded-lg text-sm px-2 py-2 mb-2 dark:bg-button-primary dark:hover:bg-button-primary focus:outline-none dark:focus:ring-button-primary underline hover:no-underline"><i class="fad fa-smile"></i>&nbsp;Fun</a>
<a title="BotsCord" href="/tag/Moderation" class="text-white bg-button-primary hover:bg-button-primary focus:ring-4 focus:ring-blue-300 font-bold rounded-lg text-sm px-2 py-2 mb-2 dark:bg-button-primary dark:hover:bg-button-primary focus:outline-none dark:focus:ring-button-primary underline hover:no-underline"><i class="fad fa-file"></i></i>&nbsp;Logging</a>
<a title="BotsCord" href="/tag/Moderation" class="text-white bg-button-primary hover:bg-button-primary focus:ring-4 focus:ring-blue-300 font-bold rounded-lg text-sm px-2 py-2 mb-2 dark:bg-button-primary dark:hover:bg-button-primary focus:outline-none dark:focus:ring-button-primary underline hover:no-underline"><i class="fad fa-file"></i>&nbsp;Logging</a>
<a title="BotsCord" href="/tag/Utility" class="text-white bg-button-primary hover:bg-button-primary focus:ring-4 focus:ring-blue-300 font-bold rounded-lg text-sm px-2 py-2 mb-2 dark:bg-button-primary dark:hover:bg-button-primary focus:outline-none dark:focus:ring-button-primary underline hover:no-underline"><i class="fad fa-cogs"></i>&nbsp;Utility</a>
<br><br><br><br>
</div>
</div>
</div>
<!-- Bots card with bot info -->
<!-- header with Title Promoted Bots -->
<div class="mb-3 mx-auto text-center">
<h2 class="text-xl text-white" translate="no">Promoted Bots</h2>
<p class="content text-white" style="opacity:.6">These bots are featured on BotsCord!</p>
<div class=" mx-auto text-center">
<br>
<h2 class="text-xl text-white text-center"><i class="fa fa-bullhorn" aria-hidden="true"></i> Promoted Bots</h2>
<p class="content text-white text-center" style="opacity:.6">These bots are featured on BotsCord!</p>
</div>
<div class="flex flex-wrap grid-cols-3 items-center container-sm">
<div class="max-w-sm rounded overflow-hidden shadow-lg flex-none">
<div class="grid columns items-center content-center justify-center grid-cols-1 gap-4 col-auto sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-4 xl:grid-cols-5 m-8">
<div class="transition-shadow ease-in-out duration-300 hover:shadow-blue-900 shadow-2xl rounded-lg max-w-sm bg-blue-color">
<img class="w-full rounded-full" src="https://cdn.discordapp.com/avatars/860390761307439114/2845a42b0c7868c3db29ea1996e84320.webp" alt="Sunset in the mountains">
<div class="px-6 py-4">
<div class="font-bold text-xl mb-2 text-white">The Coldest Sunset</div>
<p class="text-white text-base">
<p class="text-white text-base">Description
</p>
</div>
<div class="px-6 pt-4 pb-2">
@@ -55,11 +54,11 @@
<span class="inline-block bg-button-primary rounded-full px-3 py-1 text-sm font-semibold text-white mr-2 mb-2">#winter</span>
</div>
</div>
<div class="max-w-sm rounded overflow-hidden shadow-lg flex-none">
<div class="transition-shadow ease-in-out duration-300 hover:shadow-blue-900 shadow-2xl rounded-lg max-w-sm bg-blue-color">
<img class="w-full rounded-full" src="https://cdn.discordapp.com/avatars/860390761307439114/2845a42b0c7868c3db29ea1996e84320.webp" alt="Sunset in the mountains">
<div class="px-6 py-4">
<div class="font-bold text-xl mb-2 text-white">The Coldest Sunset</div>
<p class="text-white text-base">
<p class="text-white text-base">Description
</p>
</div>
<div class="px-6 pt-4 pb-2">
@@ -68,11 +67,11 @@
<span class="inline-block bg-button-primary rounded-full px-3 py-1 text-sm font-semibold text-white mr-2 mb-2">#winter</span>
</div>
</div>
<div class="max-w-sm rounded overflow-hidden shadow-lg flex-none">
<div class="transition-shadow ease-in-out duration-300 hover:shadow-blue-900 shadow-2xl rounded-lg max-w-sm bg-blue-color">
<img class="w-full rounded-full" src="https://cdn.discordapp.com/avatars/860390761307439114/2845a42b0c7868c3db29ea1996e84320.webp" alt="Sunset in the mountains">
<div class="px-6 py-4">
<div class="font-bold text-xl mb-2 text-white">The Coldest Sunset</div>
<p class="text-white text-base">
<p class="text-white text-base">Description
</p>
</div>
<div class="px-6 pt-4 pb-2">