widget page

forgot a status.
more playing statuses and moving playing stats to a util
2020-01-09 19:10:20 +01:00 · 2020-01-09 18:41:29 +01:00 · 2020-01-09 18:38:31 +01:00
9 changed files with 300 additions and 74 deletions
--- a/Dashboard/assets/css/widget.css
+++ b/Dashboard/assets/css/widget.css
@ -0,0 +1,36 @@
+@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 */
--- a/Dashboard/assets/css/widget.css.map
+++ b/Dashboard/assets/css/widget.css.map
@ -0,0 +1,9 @@
+{
+    "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"
+}
--- a/Dashboard/assets/css/widget.scss
+++ b/Dashboard/assets/css/widget.scss
@ -0,0 +1,68 @@
+@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
+    }
+}
--- a/Dashboard/server.js
+++ b/Dashboard/server.js
@ -1,5 +1,12 @@
 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');
@ -78,13 +85,9 @@ module.exports = (client) => {
 	});
 	app.get('/widgets', async (req, res) => {
 		res.status(200).render('widgets', {
-			layout: 'main',
-			lists: {
-				topgg: `<a href="https://top.gg/bot/434662676547764244" >
-			<img src="https://top.gg/api/widget/434662676547764244.svg" alt="Thaldrin" />
-		  </a>`,
-				x: 'Not a real List'
-			}
+			layout: 'widgets',
+			title: 'Widgets',
+			subtitle: 'Thaldrin'
 		});
 	});
 	/* app.get('/this', async (req, res) => {
--- a/DiscordEvents/ready.js
+++ b/DiscordEvents/ready.js
@ -1,50 +1,12 @@
-const { log } = require('../utils');
+const {
+	log,
+	status
+} = 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',
@ -53,9 +15,9 @@ module.exports = {
 			blapi.handle(client, config.apis);
 		}
 		log.hasStarted();
-		randomStatus(client);
+		status.randomStatus(client)
 		setInterval(() => {
-			randomStatus(client);
+			status.randomStatus(client);
 		}, 60000);
 	}
 };
--- a/utils/src/statuses.js
+++ b/utils/src/statuses.js
@ -1,6 +1,121 @@
+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"
+  streaming: "STREAMING",
+  randomStatus
 };
--- a/views/layouts/main.hbs
+++ b/views/layouts/main.hbs
@ -7,29 +7,17 @@
  <title>{{title}} | {{subtitle}}</title>
  {{!--  <script src="../assets/js/main.js" async defer></script> --}}
  <link rel="stylesheet" type="text/css" href="./assets/css/main.css" />
-  <link href="https://afeld.github.io/emoji-css/emoji.css" rel="stylesheet">
-
-  {{!--  
-  <link rel="manifest" href="./assets/json/manifest.json">
-  <script type="text/javascript" src="./assets/js/dropdown.js"></script> --}}
-
-

  <meta name="theme-color" content="#ff995d">
  <meta property="og:title" content="Thaldrin">
  <meta property="og:type" content="website">
  <meta property="og:url" content="https://thaldr.in">
-{{!--   <meta property="og:image"
-    content="https://raw.githubusercontent.com/EndlessHosting/assets/master/images/PFPs/code.png">
- --}}  <meta property="og:description" content="Home of Thaldrin">
+  <meta property="og:description" content="Home of Thaldrin">


-  <link rel="icon" type="image/png"
-    href="/assets/images/icon.png" sizes="32x32">
-  <link rel="icon" type="image/png"
-    href="/assets/images/icon.png" sizes="96x96">
-  <link rel="apple-touch-icon" sizes="180x180"
-    href="/assets/images/icon.png">
+  <link rel="icon" type="image/png" href="/assets/images/icon.png" sizes="32x32">
+  <link rel="icon" type="image/png" href="/assets/images/icon.png" sizes="96x96">
+  <link rel="apple-touch-icon" sizes="180x180" href="/assets/images/icon.png">
  <meta name="msapplication-TileColor" content="#ffffff">
  <meta name="msapplication-TileImage" content="/mstile-144x144.png">
  <meta name="apple-mobile-web-app-capable" content="yes">
--- a/views/layouts/widgets.hbs
+++ b/views/layouts/widgets.hbs
@ -0,0 +1,31 @@
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible">
+    <title>{{title}} | {{subtitle}}</title>
+    {{!--  <script src="../assets/js/main.js" async defer></script> --}}
+    <link rel="stylesheet" type="text/css" href="./assets/css/widget.css" />
+
+    <meta name="theme-color" content="#ff995d">
+    <meta property="og:title" content="Thaldrin">
+    <meta property="og:type" content="website">
+    <meta property="og:url" content="https://thaldr.in">
+    <meta property="og:description" content="Home of Thaldrin">
+
+
+    <link rel="icon" type="image/png" href="/assets/images/icon.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/assets/images/icon.png" sizes="96x96">
+    <link rel="apple-touch-icon" sizes="180x180" href="/assets/images/icon.png">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="msapplication-TileImage" content="/mstile-144x144.png">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+</head>
+
+<body>
+    {{{body}}}
+</body>
+
+
+</html>
--- a/views/widgets.hbs
+++ b/views/widgets.hbs
@ -0,0 +1,14 @@
+<body>
+    <div class="lists">
+        <div class="topgg">
+            <a href="https://top.gg/bot/434662676547764244">
+                <img src="https://top.gg/api/widget/434662676547764244.svg" alt="Thaldrin" /></a>
+        </div>
+        <div class="botlistspace">
+            <a
+                href="https://botlist.space/bot/434662676547764244?utm_source=bls&utm_medium=widget&utm_campaign=434662676547764244">
+                <img src="https://api.botlist.space/widget/434662676547764244/6">
+            </a>
+        </div>
+    </div>
+</body>
Author	SHA1	Message	Date
ry	5eb34f8a86	widget page	2020-01-09 19:10:20 +01:00
ry	9500bc3a45	forgot a status.	2020-01-09 18:41:29 +01:00
ry	0ddc8e064f	more playing statuses and moving playing stats to a util	2020-01-09 18:38:31 +01:00