couple of web fixes, not for pushing to live just yet

feinwarusoftware · Nov 9, 2018 · 19e9ed1 · 19e9ed1
1 parent 6dff649
commit 19e9ed1
Show file tree

Hide file tree

Showing 31 changed files with 539 additions and 676 deletions.
diff --git a/src/bot/commands/binding.js b/src/bot/commands/binding.js
@@ -7,7 +7,7 @@ const schemas = require("../../db");
 const binding = new Command({
 
     name: "Script Bindings",
-    description: "Legacy version of the new script system. It is advised to not use unless you know what you are doing",
+    description: "Quick and Dirty Commands\n-bind <name> <action> <args> // \nname: anything, action: text | file | embed, args: some text | file url | --embedProperty embedValue",
     thumbnail: "https://cdn.discordapp.com/attachments/394504208222650369/509099656270184459/bind.png",
     marketplace_enabled: true,
 

diff --git a/src/bot/commands/card.js b/src/bot/commands/card.js
@@ -212,7 +212,7 @@ const getLevelStats = (currentCard, level) => {
 
 const card = new Command({
 
-    name: "card",
+    name: "Phone Destroyer Cards",
     description: "View any card from phone destroyer, rendered in real time with full stats!",
     thumbnail: "https://cdn.discordapp.com/attachments/394504208222650369/509099660711821312/card.png",
     marketplace_enabled: true,

diff --git a/src/web/index.js b/src/web/index.js
@@ -50,7 +50,7 @@ app.use(cookieParser(config.rawrxd));
 app.use(i18n({
     defaultLang: "en",
     translationsPath: path.join(__dirname, 'translations'),
-    siteLangs: ["en","de"],
+    siteLangs: ["en","de","pt"],
     paramLangName: "hl",
     textsVarName: 'trans'
 }));

diff --git a/src/web/routes/index.js b/src/web/routes/index.js
@@ -168,48 +168,63 @@ router.get("/api/v3/patrons", (req, res) => {
 
     const patrons = [
         {
+            discord_id: "99626024181968896",
             username: "Airborn56",
             avatar: "https://cdn.discordapp.com/attachments/379432139856412682/508434629422874624/e0e22d84ce70e350376c8c78756d94a3.png",
             date: "2018-04-27T21:32:11.928165+00:00",
             amount: 10
         },
         {
+            discord_id: "430503118262894614",
             username: "timmys9inchjimmy",
             avatar: "https://cdn.discordapp.com/attachments/379432139856412682/508434624666664961/c016210777c0eed529c6ae9b3a3c7a37.png",
             date: "2018-06-07T20:54:53.048475+00:00",
             amount: 5
         },
         {
+            discord_id: "",
             username: "Kamui",
             avatar: "https://cdn.discordapp.com/attachments/379432139856412682/508019481642270740/a_ecc5cdc51043b5b3810c923e8075411e.gif",
             date: "2018-01-03T01:39:37.152671+00:00",
             amount: 1
         },
         {
+            discord_id: "",
             username: "KlausHeissler",
             avatar: "https://cdn.discordapp.com/attachments/379432139856412682/508434630559662139/429937e230deb16a5bc87ca5b0fabb75.png",
             date: "2018-03-03T02:20:43.132314+00:00",
             amount: 1
         },
         {
+            discord_id: "328837258788601857",
             username: "lonelychef",
             avatar: "https://cdn.discordapp.com/attachments/379432139856412682/508434619297824768/92706e9f3a5342dee38c5279863bf500.png",
             date: "2018-05-27T10:59:42.665346+00:00",
             amount: 10
         },
         {
+            discord_id: "393620893835984896",
             username: "Savagekiller115",
             avatar: "https://cdn.discordapp.com/attachments/379432139856412682/508434615296327691/3b1333657ff839838d281bfb02abbec8.png",
             date: "2018-05-24T00:56:22.462165+00:00",
             amount: 10
         },
         {
+            discord_id: "",
             username: "Tweeno",
             avatar: "https://cdn.discordapp.com/attachments/379432139856412682/508434634200186880/555bd89923fd4c08b37c540ba1e75ba7.png",
             date: "2018-06-16T00:00:00.000000+00:00",
             amount: 1
         },
         {
+            discord_id: "465037877269626880",
+            username: "☠smokeout☠",
+            avatar: "https://cdn.discordapp.com/attachments/379432139856412682/510200581093326869/e1af142f16a4d981f70def032c5fa851.png",
+            date: "2018-10-05T00:00:00.000000+00:00",
+            amount: 5
+        },
+        {
+            discord_id: "489164789516337154",
             username: "Dr. Normal",
             avatar: "https://cdn.discordapp.com/attachments/379432139856412682/508435598223212575/a_58812516bac2ed8a503ef3ac02600f53.png",
             date: "2018-11-02T00:00:00.000000+00:00",

diff --git a/src/web/templates/401.ejs b/src/web/templates/401.ejs
@@ -2,28 +2,8 @@
 <html>
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <%- include partials/headers.ejs %>
     <title>AWESOM-O // <%= trans.HOME %></title>
-
-    <link rel="icon" type="image/png" href="/img/favicon.png" />
-    <link rel="shortcut icon" type="image/png" href="/img/favicon.png" />
-    <meta name="theme-color" content="#ff594f">
-
-    <link rel="alternate" href="/" hreflang="x-default" />
-    <link rel="alternate" href="/?hl=en" hreflang="en" />
-    <link rel="alternate" href="/?hl=ie" hreflang="ie" />
-    <link rel="alternate" href="/?hl=pt" hreflang="pt" />
-
-    <!-- Font Awesome -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
-    <!-- Bootstrap core CSS -->
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Material Design Bootstrap -->
-    <link href="/css/mdb.min.css" rel="stylesheet">
-
-    <link href="/css/style.css" rel="stylesheet">
 
 <style>
 

diff --git a/src/web/templates/404.ejs b/src/web/templates/404.ejs
@@ -2,28 +2,9 @@
 <html>
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        <%- include partials/headers.ejs %>
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>AWESOM-O // <%= trans.HOME %></title>
-
-    <link rel="icon" type="image/png" href="/img/favicon.png" />
-    <link rel="shortcut icon" type="image/png" href="/img/favicon.png" />
-    <meta name="theme-color" content="#ff594f">
-
-    <link rel="alternate" href="/" hreflang="x-default" />
-    <link rel="alternate" href="/?hl=en" hreflang="en" />
-    <link rel="alternate" href="/?hl=ie" hreflang="ie" />
-    <link rel="alternate" href="/?hl=pt" hreflang="pt" />
-
-    <!-- Font Awesome -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
-    <!-- Bootstrap core CSS -->
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Material Design Bootstrap -->
-    <link href="/css/mdb.min.css" rel="stylesheet">
-
-    <link href="/css/style.css" rel="stylesheet">
 
 <style>
 

diff --git a/src/web/templates/credits.ejs b/src/web/templates/credits.ejs
@@ -2,31 +2,11 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <%- include partials/headers.ejs %>
     <title>AWESOM-O //
         <%= trans.CREDITS %>
     </title>
 
-    <link rel="icon" type="image/png" href="/img/favicon.png" />
-    <link rel="shortcut icon" type="image/png" href="/img/favicon.png" />
-    <meta name="theme-color" content="#ff594f">
-
-    <link rel="alternate" href="/" hreflang="x-default" />
-    <link rel="alternate" href="/?hl=en" hreflang="en" />
-    <link rel="alternate" href="/?hl=ie" hreflang="ie" />
-    <link rel="alternate" href="/?hl=pt" hreflang="pt" />
-
-    <!-- Font Awesome -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
-    <!-- Bootstrap core CSS -->
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Material Design Bootstrap -->
-    <link href="/css/mdb.min.css" rel="stylesheet">
-
-    <link href="/css/style.css" rel="stylesheet">
-
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/atom-one-dark.min.css">
 
     <style>

diff --git a/src/web/templates/dashboard/commands.ejs b/src/web/templates/dashboard/commands.ejs
@@ -2,33 +2,11 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <%- include ../partials/headers.ejs %>
     <title>AWESOM-O //
         <%= trans.COMMANDS %>
     </title>
 
-    <link rel="icon" type="image/png" href="/img/favicon.png" />
-    <link rel="shortcut icon" type="image/png" href="/img/favicon.png" />
-    <meta name="theme-color" content="#ff594f">
-
-    <link rel="alternate" href="/" hreflang="x-default" />
-    <link rel="alternate" href="/?hl=en" hreflang="en" />
-    <link rel="alternate" href="/?hl=ie" hreflang="ie" />
-    <link rel="alternate" href="/?hl=pt" hreflang="pt" />
-
-    <!-- Font Awesome -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ"
-        crossorigin="anonymous">
-    <!-- Bootstrap core CSS -->
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Material Design Bootstrap -->
-    <link href="/css/mdb.min.css" rel="stylesheet">
-
-    <link href="/css/style.css" rel="stylesheet">
-
     <style>
         .switch.round label .lever {
             width: 54px;

diff --git a/src/web/templates/dashboard/editor.ejs b/src/web/templates/dashboard/editor.ejs
@@ -2,30 +2,11 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <%- include ../partials/headers.ejs %>
     <title>AWESOM-O //
         <%= trans.COMMAND_CREATOR %>
     </title>
 
-    <link rel="icon" type="image/png" href="/img/favicon.png" />
-    <link rel="shortcut icon" type="image/png" href="/img/favicon.png" />
-    <meta name="theme-color" content="#ff594f">
-
-    <link rel="alternate" href="/" hreflang="x-default" />
-    <link rel="alternate" href="/?hl=en" hreflang="en" />
-    <link rel="alternate" href="/?hl=ie" hreflang="ie" />
-    <link rel="alternate" href="/?hl=pt" hreflang="pt" />
-
-    <!-- Font Awesome -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
-    <!-- Bootstrap core CSS -->
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Material Design Bootstrap -->
-    <link href="/css/mdb.min.css" rel="stylesheet">
-
-    <link href="/css/style.css" rel="stylesheet">
 
     <style>
         html,

diff --git a/src/web/templates/dashboard/leaderboards.ejs b/src/web/templates/dashboard/leaderboards.ejs
@@ -2,31 +2,11 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <%- include ../partials/headers.ejs %>
     <title>AWESOM-O //
         <%= trans.DASHBOARD %>
     </title>
 
-    <link rel="icon" type="image/png" href="/img/favicon.png" />
-    <link rel="shortcut icon" type="image/png" href="/img/favicon.png" />
-    <meta name="theme-color" content="#ff594f">
-
-    <link rel="alternate" href="/" hreflang="x-default" />
-    <link rel="alternate" href="/?hl=en" hreflang="en" />
-    <link rel="alternate" href="/?hl=ie" hreflang="ie" />
-    <link rel="alternate" href="/?hl=pt" hreflang="pt" />
-
-    <!-- Font Awesome -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
-    <!-- Bootstrap core CSS -->
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Material Design Bootstrap -->
-    <link href="/css/mdb.min.css" rel="stylesheet">
-
-    <link href="/css/style.css" rel="stylesheet">
-
     <style>
         .table-wrapper-2 {
             display: block;

diff --git a/src/web/templates/dashboard/legacy-leaderboards-2.ejs b/src/web/templates/dashboard/legacy-leaderboards-2.ejs
@@ -2,33 +2,11 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <%- include ../partials/headers.ejs %>
     <title>AWESOM-O //
         <%= trans.LEGACY_LEADERBOARDS %>
     </title>
 
-    <link rel="icon" type="image/png" href="/img/favicon.png" />
-    <link rel="shortcut icon" type="image/png" href="/img/favicon.png" />
-    <meta name="theme-color" content="#ff594f">
-
-    <link rel="alternate" href="/" hreflang="x-default" />
-    <link rel="alternate" href="/?hl=en" hreflang="en" />
-    <link rel="alternate" href="/?hl=ie" hreflang="ie" />
-    <link rel="alternate" href="/?hl=pt" hreflang="pt" />
-
-    <!-- Font Awesome -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ"
-        crossorigin="anonymous">
-    <!-- Bootstrap core CSS -->
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Material Design Bootstrap -->
-    <link href="/css/mdb.min.css" rel="stylesheet">
-
-    <link href="/css/style.css" rel="stylesheet">
-
     <style>
         .table-wrapper-2 {
             display: block;

diff --git a/src/web/templates/dashboard/legacy-leaderboards.ejs b/src/web/templates/dashboard/legacy-leaderboards.ejs
@@ -2,33 +2,11 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <%- include ../partials/headers.ejs %>
     <title>AWESOM-O //
         <%= trans.LEGACY_LEADERBOARDS %>
     </title>
 
-    <link rel="icon" type="image/png" href="/img/favicon.png" />
-    <link rel="shortcut icon" type="image/png" href="/img/favicon.png" />
-    <meta name="theme-color" content="#ff594f">
-
-    <link rel="alternate" href="/" hreflang="x-default" />
-    <link rel="alternate" href="/?hl=en" hreflang="en" />
-    <link rel="alternate" href="/?hl=ie" hreflang="ie" />
-    <link rel="alternate" href="/?hl=pt" hreflang="pt" />
-
-    <!-- Font Awesome -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ"
-        crossorigin="anonymous">
-    <!-- Bootstrap core CSS -->
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Material Design Bootstrap -->
-    <link href="/css/mdb.min.css" rel="stylesheet">
-
-    <link href="/css/style.css" rel="stylesheet">
-
     <style>
         .table-wrapper-2 {
             display: block;

diff --git a/src/web/templates/dashboard/main.ejs b/src/web/templates/dashboard/main.ejs
@@ -2,33 +2,11 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <%- include ../partials/headers.ejs %>
     <title>AWESOM-O //
         <%= trans.DASHBOARD %>
     </title>
 
-    <link rel="icon" type="image/png" href="/img/favicon.png" />
-    <link rel="shortcut icon" type="image/png" href="/img/favicon.png" />
-    <meta name="theme-color" content="#ff594f">
-
-    <link rel="alternate" href="/" hreflang="x-default" />
-    <link rel="alternate" href="/?hl=en" hreflang="en" />
-    <link rel="alternate" href="/?hl=ie" hreflang="ie" />
-    <link rel="alternate" href="/?hl=pt" hreflang="pt" />
-
-    <!-- Font Awesome -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ"
-        crossorigin="anonymous">
-    <!-- Bootstrap core CSS -->
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <!-- Material Design Bootstrap -->
-    <link href="/css/mdb.min.css" rel="stylesheet">
-
-    <link href="/css/style.css" rel="stylesheet">
-
     <style>
         .top-shits{
             height: 100%;