chore: version bump

tabarra · Feb 22, 2022 · 3044eeb · 3044eeb
1 parent b8687e3
commit 3044eeb
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 6 deletions.
diff --git a/dev_notes.md b/dev_notes.md
@@ -60,10 +60,6 @@ end)
 
 
 
-> If you're in no-clip you should be put in god mode. NPCs still know you're there and shoot you.
-The code to set godmode is there, but not working
-
-
 
 Pro debug da playerlist:
 - comando pra printar: [primeiro,ultimo,count,sum]

diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -5,7 +5,7 @@
 author 'Tabarra'
 description 'Remotely Manage & Monitor your GTA5 FiveM Server'
 repository 'https://github.com/tabarra/txAdmin'
-version '4.12.1'
+version '4.13.0'
 ui_label 'txAdmin'
 
 rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'

diff --git a/src/index.js b/src/index.js
@@ -204,7 +204,7 @@ if (verbose) dir({isZapHosting, forceInterface, forceFXServerPort, txAdminPort,
 //NOTE: Only valid if its being very actively maintained.
 //          Use 30d for patch 0, or 45~60d otherwise
 //      Objective is to update every 2~3 weeks, always on monday ~15:00
-const txVerBBLastUpdate = 1643646592;
+const txVerBBLastUpdate = 1645555555;
 const txVerBBDelta = 21 + ((isZapHosting) ? 10 : 0);
 const txAdminVersionBestBy = txVerBBLastUpdate + (txVerBBDelta * 86400);
 // dir({

diff --git a/src/webroutes/dashboard.js b/src/webroutes/dashboard.js
@@ -24,6 +24,17 @@ module.exports = async function Dashboard(ctx) {
     //Preparing render data
     const renderData = {
         versionData: getVersionData(),
+        discordEvent: false,
+        // discordEvent: {
+        //     timestamp: 1645512230000,
+        //     time: '45 minutes',
+        //     isLive: false,
+        //     time: '15 minutes ago',
+        //     isLive: true,
+        //     description: 'Release of txAdmin v4.14.0 - What\'s New - How to Update - Feature Voting - Giveaway',
+        //     joinLink: 'https://discord.gg/2KpVQX665M',
+        //     imgSrc: 'https://discordapp.com/api/guilds/577993482761928734/widget.png?style=shield',
+        // },
         perms: {
             commandMessage: getPermDisable('players.message'),
             commandKick: getPermDisable('players.kick'),

diff --git a/web/dashboard.html b/web/dashboard.html
@@ -1,6 +1,32 @@
 <%- await include("basic/header.html", locals) %>
 
 <style>
+    /* Discord Live Event stuff */
+    .event-time {
+        background-color: rgba(0, 0, 0, 0.075);
+        padding: 0px 6px;
+        border-radius: 4px;
+    }
+    .event-footer {
+        font-weight: 700;
+        vertical-align: text-bottom;
+    }
+    .event-footer img {
+        vertical-align: middle;
+    }
+
+    .alert-success.event-live-glow {
+        animation: alertGlow 1s infinite alternate;
+    }
+    @keyframes alertGlow {
+        from {
+            box-shadow: 0 0 8px 0px rgb(34, 128, 25);
+        }
+        to {
+            box-shadow: 0 0 8px 4px rgb(34, 128, 25);
+        }
+    }
+
     /* Chart stuff */
     #d3-container {
         height: 340px;
@@ -96,6 +122,28 @@ <h5 class="text-muted">
     <% } %>
 </div>
 
+<% if (discordEvent) { %>
+    <div class="row justify-content-md-center">
+        <div class="col-md-6 text-center">
+            <div class="alert <%= (discordEvent.isLive ? 'alert-success border-success' : 'alert-warning border-warning') %> event-live-glow" role="alert">
+                <h5 style="margin-bottom: 0px;">
+                    <svg class="c-iconx" width="24" height="24">
+                        <use href="img/coreui_icons.svg#cil-discord-event"></use>
+                    </svg>
+                    <%= (discordEvent.isLive ? 'The Discord Live Event started' : 'A Discord Live Event will start in') %>:
+                    <span class="event-time" title="<%= (new Date(discordEvent.timestamp)).toString() %>"><%= discordEvent.time %></span>
+                </h5>
+                <i><%= discordEvent.description %></i>
+                <div class="event-footer">
+                    Join now:
+                    <a href="<%= discordEvent.joinLink %>" target="_blank" >
+                        <img src="<%= discordEvent.imgSrc %>"></img>
+                    </a>
+                </div>
+            </div>
+        </div>
+    </div>
+<% } %>
 
 <!-- Chart stuff -->
 <div class="row justify-content-center">

diff --git a/web/public/img/coreui_icons.svg b/web/public/img/coreui_icons.svg