diff --git a/Dashboard/assets/css/widget.css b/Dashboard/assets/css/widget.css deleted file mode 100644 index 0b89afe..0000000 --- a/Dashboard/assets/css/widget.css +++ /dev/null @@ -1,36 +0,0 @@ -@import url("https://fonts.googleapis.com/css?family=Montserrat&display=swap"); -.center { - position: absolute; - top: 40%; - left: 50%; - -webkit-transform: translate(-50%, -50%); - transform: translate(-50%, -50%); -} - -body { - font-family: 'Montserrat', sans-serif; - background: #252525; - color: white; -} - -ul { - list-style: none; -} - -a { - text-decoration: none; -} - -.lists { - position: absolute; - top: 40%; - left: 50%; - -webkit-transform: translate(-50%, -50%); - transform: translate(-50%, -50%); -} - -.lists .topgg, -.lists .botlistspace { - padding: 1vh 2vw; -} -/*# sourceMappingURL=widget.css.map */ \ No newline at end of file diff --git a/Dashboard/assets/css/widget.css.map b/Dashboard/assets/css/widget.css.map deleted file mode 100644 index 38fa2ce..0000000 --- a/Dashboard/assets/css/widget.css.map +++ /dev/null @@ -1,9 +0,0 @@ -{ - "version": 3, - "mappings": "AAuCA,OAAO,CAAC,sEAAI;AAEZ,AAAA,OAAO,CAAC;EAxCJ,QAAQ,EAAE,QAAQ;EAGd,GAAG,EAAE,GAAG;EACR,IAAI,EAAE,GAAG;EACT,SAAS,EAAE,qBAAqB;CAqCvC;;AAED,AAAA,IAAI,CAAC;EACD,WAAW,EAAE,wBAAwB;EACrC,UAAU,EAAE,OAAO;EACnB,KAAK,EAAE,KAAK;CACf;;AAED,AAAA,EAAE,CAAC;EACC,UAAU,EAAE,IAAI;CACnB;;AAED,AAAA,CAAC,CAAC;EACE,eAAe,EAAE,IAAI;CACxB;;AAED,AAAA,MAAM,CAAC;EA1DH,QAAQ,EAAE,QAAQ;EAGd,GAAG,EAAE,GAAG;EACR,IAAI,EAAE,GAAG;EACT,SAAS,EAAE,qBAAqB;CA6DvC;;AARD,AAII,MAJE,CAIF,MAAM;AAJV,MAAM,CAKF,aAAa,CAAC;EACV,OAAO,EAAE,OACb;CAAC", - "sources": [ - "widget.scss" - ], - "names": [], - "file": "widget.css" -} \ No newline at end of file diff --git a/Dashboard/assets/css/widget.scss b/Dashboard/assets/css/widget.scss deleted file mode 100644 index f8dcf90..0000000 --- a/Dashboard/assets/css/widget.scss +++ /dev/null @@ -1,68 +0,0 @@ -@mixin centerer($horizontal: true, $vertical: true) { - position: absolute; - - @if ($horizontal and $vertical) { - top: 40%; - left: 50%; - transform: translate(-50%, -50%); - } - - @else if ($horizontal) { - left: 50%; - transform: translate(-50%, 0); - } - - @else if ($vertical) { - top: 50%; - transform: translate(0, -50%); - } -} - -@mixin Buttons { - font-family: 'Montserrat', sans-serif; - background-color: #ffffff; - /* Green */ - border: none; - /* border-radius: 1vh; */ - font-size: 3vw; - margin: .5vw; - text-align: center; - text-decoration: none; - display: inline-block; - font-weight: bold; - text-transform: uppercase; - - a { - color: rgb(0, 0, 0); - } -} - -@import url('https://fonts.googleapis.com/css?family=Montserrat&display=swap'); - -.center { - @include centerer; -} - -body { - font-family: 'Montserrat', sans-serif; - background: #252525; - color: white; -} - -ul { - list-style: none; -} - -a { - text-decoration: none; -} - -.lists { - - @include centerer(); - - .topgg, - .botlistspace { - padding: 1vh 2vw - } -} \ No newline at end of file diff --git a/Dashboard/server.js b/Dashboard/server.js index 9084b41..457adf8 100755 --- a/Dashboard/server.js +++ b/Dashboard/server.js @@ -1,12 +1,5 @@ const express = require('express'); -const { - hostname, - port, - authorization, - source, - invite, - type -} = require('../config'); +const { hostname, port, authorization, source, invite, type } = require('../config'); const db = require('quick.db'); const Backend = new db.table('backend'); const chalk = require('chalk'); @@ -85,9 +78,13 @@ module.exports = (client) => { }); app.get('/widgets', async (req, res) => { res.status(200).render('widgets', { - layout: 'widgets', - title: 'Widgets', - subtitle: 'Thaldrin' + layout: 'main', + lists: { + topgg: ` + Thaldrin + `, + x: 'Not a real List' + } }); }); /* app.get('/this', async (req, res) => { @@ -114,4 +111,4 @@ module.exports = (client) => { console.log(`Listening on ${port}`); }, 1000 * 3); }); -}; \ No newline at end of file +}; diff --git a/DiscordEvents/ready.js b/DiscordEvents/ready.js index f8cf4d1..bbc3cdb 100755 --- a/DiscordEvents/ready.js +++ b/DiscordEvents/ready.js @@ -1,12 +1,50 @@ -const { - log, - status -} = require('../utils'); +const { log } = require('../utils'); const config = require('../config'); const blapi = require('blapi'); //blapi.setLogging(true); - +function randomStatus(client) { + const States = [ + { + activity: { + name: 'server fans whirr 💨', + type: 'LISTENING' + }, + status: 'online' + }, + { + activity: { + name: 'True Damage - GIANTS', + type: 'LISTENING' + }, + status: 'online' + }, + { + activity: { + name: `${client.guilds.size} Servers -w-`, + type: 'WATCHING' + }, + status: 'online' + }, + { + activity: { + name: 'Δ & ♫', + type: 'LISTENING' + }, + status: 'online' + }, + { + activity: { + name: `'help | thaldr.in`, + type: 'WATCHING' + }, + status: 'online' + } + // { game: { name: `over ${thal.users.get('318044130796109825').username}~`, type: 'WATCHING' }, status: 'dnd' } + ]; + let status = States[~~(Math.random() * States.length)]; + return client.user.setPresence(status); +} module.exports = { name: 'ready', @@ -15,9 +53,9 @@ module.exports = { blapi.handle(client, config.apis); } log.hasStarted(); - status.randomStatus(client) + randomStatus(client); setInterval(() => { - status.randomStatus(client); + randomStatus(client); }, 60000); } -}; \ No newline at end of file +}; diff --git a/utils/src/statuses.js b/utils/src/statuses.js index 0df113a..a713cac 100755 --- a/utils/src/statuses.js +++ b/utils/src/statuses.js @@ -1,121 +1,6 @@ -function randomStatus(client) { - const States = [{ - activity: { - name: 'server fans whirr 💨', - type: 'LISTENING' - }, - status: 'online' - }, - { - activity: { - name: 'True Damage - GIANTS', - type: 'LISTENING' - }, - status: 'online' - }, - { - activity: { - name: `${client.guilds.size} Servers -w-`, - type: 'WATCHING' - }, - status: 'online' - }, - { - activity: { - name: 'Δ & ♫', - type: 'LISTENING' - }, - status: 'online' - }, - { - activity: { - name: `'help | thaldr.in`, - type: 'WATCHING' - }, - status: 'online' - }, - { - activity: { - name: `Linux Servers`, - type: 'WATCHING' - }, - status: 'online' - }, - { - activity: { - name: `e621 Videos`, - type: 'WATCHING' - }, - status: 'online' - }, - { - activity: { - name: `WannaCry`, - type: 'WATCHING' - }, - status: 'online' - }, - { - activity: { - name: `the Blockchain!`, - type: 'WATCHING' - }, - status: 'online' - }, - { - activity: { - name: `something... ;3`, - type: 'WATCHING' - }, - status: 'online' - }, - { - activity: { - name: `Skynet`, - type: 'WATCHING' - }, - status: 'online' - }, - { - activity: { - name: `Half Life`, - type: 'PLAYING' - }, - status: 'online' - }, - { - activity: { - name: `Half Life 2`, - type: 'PLAYING' - }, - status: 'online' - }, - { - activity: { - name: `Portal`, - type: 'PLAYING' - }, - status: 'online' - }, - { - activity: { - name: `Portal 2`, - type: 'PLAYING' - }, - status: 'online' - } - // { game: { name: `over ${thal.users.get('318044130796109825').username}~`, type: 'WATCHING' }, status: 'dnd' } - ]; - let status = States[~~(Math.random() * States.length)]; - return client.user.setPresence(status); -} - - - module.exports = { playing: "PLAYING", watching: "WATCHING", listening: "LISTENING", - streaming: "STREAMING", - randomStatus -}; \ No newline at end of file + streaming: "STREAMING" +}; diff --git a/views/layouts/main.hbs b/views/layouts/main.hbs index 31794fb..7845956 100644 --- a/views/layouts/main.hbs +++ b/views/layouts/main.hbs @@ -5,19 +5,31 @@ {{title}} | {{subtitle}} - {{!-- --}} + {{!-- --}} + + + {{!-- + + --}} + + - +{{!-- + --}} - - - + + + diff --git a/views/layouts/widgets.hbs b/views/layouts/widgets.hbs deleted file mode 100644 index 8a92037..0000000 --- a/views/layouts/widgets.hbs +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - {{title}} | {{subtitle}} - {{!-- --}} - - - - - - - - - - - - - - - - - - - {{{body}}} - - - - \ No newline at end of file diff --git a/views/widgets.hbs b/views/widgets.hbs index 58b7d8d..e69de29 100644 --- a/views/widgets.hbs +++ b/views/widgets.hbs @@ -1,14 +0,0 @@ - -
-
- - Thaldrin -
-
- - - -
-
- \ No newline at end of file