changes i made on the laptop, don't push to live

feinwarusoftware · Nov 11, 2018 · 97f3dba · 97f3dba
1 parent 19e9ed1
commit 97f3dba
Show file tree

Hide file tree

Showing 19 changed files with 1,004 additions and 317 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/web/index.js b/src/web/index.js
@@ -48,9 +48,9 @@ app.use(express.json());
 app.use(cookieParser(config.rawrxd));
 
 app.use(i18n({
-    defaultLang: "en",
+    defaultLang: "en-gb",
     translationsPath: path.join(__dirname, 'translations'),
-    siteLangs: ["en","de","pt"],
+    siteLangs: ["en-gb","de","pt", "pl", "en-ni", "en-us"],
     paramLangName: "hl",
     textsVarName: 'trans'
 }));

diff --git a/src/web/routes/json/credits.json b/src/web/routes/json/credits.json
@@ -190,7 +190,7 @@
     "translators": [{
         "id": "215982178046181376",
         "name": "Tweeno",
-        "role": "PORTUGESE_TRANSLATION",
+        "role": "PORTUGUESE_TRANSLATION",
         "image": "https://cdn.discordapp.com/attachments/379432139856412682/462950191595782154/unknown.png",
         "caption": "Eletrónica e Jogos são a minha vida. Não hesites em mandar uma mensagem!",
         "socials": [{

diff --git a/src/web/static/img/headerphone.png b/src/web/static/img/headerphone.png
diff --git a/src/web/templates/credits.ejs b/src/web/templates/credits.ejs
@@ -307,7 +307,7 @@
                 $("#MARKETPLACE_ART").text("<%= trans.MARKETPLACE_ART %>");
                 $("#BOT_ART").text("<%= trans.BOT_ART %>");
                 
-                $("#PORTUGESE_TRANSLATION").text("<%= trans.PORTUGESE_TRANSLATION %>");
+                $("#PORTUGUESE_TRANSLATION").text("<%= trans.PORTUGUESE_TRANSLATION %>");
                 $("#CHINESE_TRANSLATION").text("<%= trans.CHINESE_TRANSLATION %>");
                 $("#ROMANIAN_TRANSLATION").text("<%= trans.ROMANIAN_TRANSLATION %>");
                 $("#POLISH_TRANSLATION").text("<%= trans.POLISH_TRANSLATION %>");

diff --git a/src/web/templates/dashboard/main.ejs b/src/web/templates/dashboard/main.ejs
@@ -216,7 +216,7 @@
                 <!-- Fourth column -->
                 <div class="col-xl-3 col-md-6 mb-4">
                     <!-- Card -->
-                    <a href="/help/dashboard/">
+                    <a href="https://github.com/feinwarusoftware/awesomobot/wiki/help">
                         <div class="card card-image mb-4 top-shits" style="background-image: url(/img/mackey.png);">
                             <div class="text-white text-center top-shits d-flex align-items-center rgba-brown-strong waves-effect py-5 px-4">
                                 <div class="mx-auto mt-1">

diff --git a/src/web/templates/index.ejs b/src/web/templates/index.ejs
@@ -125,7 +125,7 @@
 
                         <div id="feature3" class="row">
                             <div class="col-2">
-                                <i class="fa fa-line-chart feinwaru-text fa-2x"></i>
+                                <i class="fa fa-chart-line feinwaru-text fa-2x"></i>
                             </div>
                             <div class="col-10 mb-2">
                                 <h5 class="font-weight-bold title">

diff --git a/src/web/templates/partials/d-navbar.ejs b/src/web/templates/partials/d-navbar.ejs
@@ -56,7 +56,7 @@
                         <i class="fa fa-chart-bar"></i>
                         <%= trans.LEADERBOARDS %>
                     </a>
-                    <div class="ml-4 pl-3">
+                    <div class="ml-3">
                         <ul>
                             <li>
                                 <a href="/dashboard/leaderboards<%= trans.LANG %>" class="waves-effect">
@@ -76,7 +76,7 @@
                 <!-- future update
                                 
                                 <li><a class=" waves-effect"><i class="fa fa-share-alt"></i> Integrations</a>
-                                <div class="ml-4 pl-3">
+                                <div class="ml-3">
                                     <ul>
                                         <li><a href="#" class="waves-effect"><i class="fa fa-lastfm"></i> last.fm</a>
                                         </li>
@@ -91,7 +91,7 @@
                         <i class="fa fa-gavel"></i>
                         <%= trans.MODERATION %>
                     </a>
-                    <div class="ml-4 pl-3">
+                    <div class="ml-3">
                         <ul>
                             <li>
                                 <a href="#" class="waves-effect pl-4">
@@ -112,7 +112,7 @@
                 <li>
                     <a class=" waves-effect">
                         <i class="fa fa-code"></i><%= trans.SCRIPTS %></a>
-                    <div class="ml-4 pl-2">
+                    <div class="ml-3">
                         <ul>
                             <li>
                                 <a class="waves-effect" href="/dashboard/commands<%= trans.LANG %>">
@@ -159,7 +159,7 @@
                         <i class="fa fa-database"></i>
                         <%= trans.AWESOMO_LEGACY_FEATURES %>
                     </a>
-                    <div class="ml-4 pl-3">
+                    <div class="ml-3 pl-4">
                         <ul>
 
                             <li>

diff --git a/src/web/templates/partials/headers.ejs b/src/web/templates/partials/headers.ejs
@@ -16,7 +16,7 @@
 <link rel="shortcut icon" type="image/png" href="/img/favicon.png" />
 
 <!-- Font Awesome -->
-<link href="/css/fa-all.css" rel="stylesheet">
+<link href="https://pro.fontawesome.com/releases/v5.1.0/css/all.css" rel="stylesheet">
 <!-- Bootstrap core CSS -->
 <link href="/css/bootstrap.min.css" rel="stylesheet">
 <!-- Material Design Bootstrap -->

diff --git a/src/web/templates/partials/langpicker.ejs b/src/web/templates/partials/langpicker.ejs
@@ -37,10 +37,10 @@
                 </a>
                 <a href="?hl=ni" class="list-group-item list-group-item-action waves-effect" style="display: none;">
                     <img src="https://upload.wikimedia.org/wikipedia/commons/f/f6/Flag_of_Northern_Ireland.svg" width="10%"> Norn Irish
-                </a>
+                </a>-->
                 <a href="?hl=pl" class="list-group-item list-group-item-action waves-effect">
                     <img src="https://upload.wikimedia.org/wikipedia/en/1/12/Flag_of_Poland.svg" width="10%"> Polski
-                </a>-->
+                </a>
                 <a href="?hl=pt" class="list-group-item list-group-item-action waves-effect">
                     <img src="https://upload.wikimedia.org/wikipedia/commons/5/5c/Flag_of_Portugal.svg" width="10%"> Português
                 </a><!--

diff --git a/src/web/templates/partials/navbar.ejs b/src/web/templates/partials/navbar.ejs
@@ -76,7 +76,7 @@
                         <% } %>-->
                 <li class="nav-item">
                     <a class="nav-link waves-effect waves-light" data-toggle="modal" data-target="#LangModal">
-                        <i class="fas fa-globe-africa"></i> <b>
+                        <i class="far fa-globe"></i> <b>
                             <%= trans.INITIALS %></b>
                     </a>
                 </li>

diff --git a/src/web/translations/de.json b/src/web/translations/de.json
@@ -106,7 +106,7 @@
     "BOT_ART": "Bot Kunst Credits Kunst",
 
     "TRANSLATORS": "Übersetzer",
-    "PORTUGESE_TRANSLATION": "Portugiesische Übersetzung",
+    "PORTUGUESE_TRANSLATION": "Portugiesische Übersetzung",
     "CHINESE_TRANSLATION": "Chinesische Übersetzung",
     "ROMANIAN_TRANSLATION": "Rumänische Übersetzung",
     "POLISH_TRANSLATION": "Polnische Übersetzung",

diff --git a/src/web/translations/en.json → src/web/translations/en-gb.json b/src/web/translations/en.json → src/web/translations/en-gb.json
@@ -115,7 +115,7 @@
     "BOT_ART": "Bot Art and Credits Art",
 
     "TRANSLATORS": "Translators",
-    "PORTUGESE_TRANSLATION": "Portugese Translation",
+    "PORTUGUESE_TRANSLATION": "Portuguese Translation",
     "CHINESE_TRANSLATION": "Chinese Translation",
     "ROMANIAN_TRANSLATION": "Romanian Translation",
     "POLISH_TRANSLATION": "Polish Translation",