scout_ante/dashboard-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix various issues

Browse Source
This commit is contained in:
rxdn 2021-02-13 14:33:31 +00:00
parent e0ceebc02e
commit cf00739074
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/http/endpoints/api/guilds.go
View File

@ -8,6 +8,7 @@ import (
"github.com/TicketsBot/common/permission" "github.com/TicketsBot/common/permission"
syncutils "github.com/TicketsBot/common/utils" syncutils "github.com/TicketsBot/common/utils"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/jackc/pgx/v4"
"github.com/rxdn/gdl/objects/guild" "github.com/rxdn/gdl/objects/guild"
"github.com/rxdn/gdl/rest/request" "github.com/rxdn/gdl/rest/request"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
@ -44,9 +45,12 @@ func GetGuilds(ctx *gin.Context) {
defer wg.Done() defer wg.Done()
// verify bot is in guild // verify bot is in guild
_, ok := cache.Instance.GetGuild(g.GuildId, false) if err := cache.Instance.QueryRow(context.Background(), `SELECT 1 from guilds WHERE "guild_id" = $1`, g.GuildId).Scan(nil); err != nil {
if !ok { if err == pgx.ErrNoRows {
return nil return nil
} else {
return err
}
} }
fakeGuild := guild.Guild{ fakeGuild := guild.Guild{

2
go.mod
View File

@ -21,7 +21,7 @@ require (
github.com/jackc/pgx/v4 v4.7.1 github.com/jackc/pgx/v4 v4.7.1
github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/rxdn/gdl v0.0.0-20210209203918-0eb7209c47db github.com/rxdn/gdl v0.0.0-20210213141842-c1449108cf9b
github.com/sirupsen/logrus v1.5.0 github.com/sirupsen/logrus v1.5.0
github.com/ulule/limiter/v3 v3.5.0 github.com/ulule/limiter/v3 v3.5.0
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a

3
public/static/css/style.css
View File

@ -40,7 +40,6 @@ html > ::-webkit-scrollbar {
.sidebar-element { .sidebar-element {
display: flex; display: flex;
align-items: center; align-items: center;
flex-basis: 100%;
width: 100%; width: 100%;
cursor: pointer; cursor: pointer;
padding: 5px 0 5px 0; padding: 5px 0 5px 0;
@ -62,7 +61,7 @@ html > ::-webkit-scrollbar {
width: 100%; width: 100%;
color: white !important; color: white !important;
font-size: 18px; font-size: 18px;
margin-left: 2%; margin-left: 4%;
} }
.sidebar-text { .sidebar-text {

2
public/static/js/utils.js
View File

@ -28,7 +28,7 @@ function appendTd(tr, content) {
function appendButton(tr, content, onclick) { function appendButton(tr, content, onclick) {
const tdRemove = document.createElement('td'); const tdRemove = document.createElement('td');
const removeButton = document.createElement('button'); const removeButton = document.createElement('a');
removeButton.type = 'submit'; removeButton.type = 'submit';
removeButton.classList.add('btn', 'btn-primary', 'btn-fill', 'mx-auto'); removeButton.classList.add('btn', 'btn-primary', 'btn-fill', 'mx-auto');
removeButton.appendChild(document.createTextNode(content)); removeButton.appendChild(document.createTextNode(content));

1
public/templates/includes/head.tmpl
View File

@ -21,7 +21,6 @@
display: block; display: block;
background-size: cover; background-size: cover;
border-radius: 50%; border-radius: 50%;
float: right;
} }
</style> </style>

6
public/templates/includes/sidebar.tmpl
View File

@ -3,13 +3,13 @@
<div class="sidebar-container" id="sidebar-nav"> <div class="sidebar-container" id="sidebar-nav">
<div class="sidebar-element"> <div class="sidebar-element">
<a href="/"> <a href="/">
<i class="fas fa-server"></i> <i class="fas fa-server sidebar-icon"></i>
<span class="sidebar-text">Servers</span> <span class="sidebar-text">Servers</span>
</a> </a>
</div> </div>
<div class="sidebar-element"> <div class="sidebar-element">
<a href="/whitelabel"> <a href="/whitelabel">
<i class="fas fa-robot"></i> <i class="fas fa-edit sidebar-icon"></i>
<span class="sidebar-text">Whitelabel</span> <span class="sidebar-text">Whitelabel</span>
</a> </a>
</div> </div>
@ -25,7 +25,7 @@
<div class="sidebar-container" style="margin-bottom: 2%"> <div class="sidebar-container" style="margin-bottom: 2%">
<div class="sidebar-element"> <div class="sidebar-element">
<a href="/logout" onclick="clearLocalStorage();"> <a href="/logout" onclick="clearLocalStorage();">
<i class="sidebar-icon fas fa-sign-out-alt"></i> <i class="sidebar-icon fas fa-sign-out-alt sidebar-icon"></i>
<span class="sidebar-text">Logout</span> <span class="sidebar-text">Logout</span>
</a> </a>
</div> </div>