From 41ca4bbf0472bab88cf5f5555a7aa87763874ddf Mon Sep 17 00:00:00 2001
From: rxdn
Date: Wed, 8 Jul 2020 13:34:15 +0100
Subject: [PATCH] make index page pretty
---
app/http/endpoints/api/guilds.go | 2 +
app/http/endpoints/root/callback.go | 1 +
go.mod | 2 +-
public/static/css/style.css | 36 ++++++++++++-
public/templates/views/index.tmpl | 84 +++++++++++++++++++----------
5 files changed, 96 insertions(+), 29 deletions(-)
diff --git a/app/http/endpoints/api/guilds.go b/app/http/endpoints/api/guilds.go
index caa0630..e0152c9 100644
--- a/app/http/endpoints/api/guilds.go
+++ b/app/http/endpoints/api/guilds.go
@@ -15,6 +15,7 @@ import (
type wrappedGuild struct {
Id uint64 `json:"id,string"`
Name string `json:"name"`
+ Icon string `json:"icon"`
}
func GetGuilds(ctx *gin.Context) {
@@ -53,6 +54,7 @@ func GetGuilds(ctx *gin.Context) {
adminGuilds = append(adminGuilds, wrappedGuild{
Id: g.GuildId,
Name: g.Name,
+ Icon: g.Icon,
})
lock.Unlock()
}
diff --git a/app/http/endpoints/root/callback.go b/app/http/endpoints/root/callback.go
index dfc7f2a..b8ada98 100644
--- a/app/http/endpoints/root/callback.go
+++ b/app/http/endpoints/root/callback.go
@@ -105,6 +105,7 @@ func CallbackHandler(ctx *gin.Context) {
Name: guild.Name,
Owner: guild.Owner,
UserPermissions: int32(guild.Permissions),
+ Icon: guild.Icon,
})
}
diff --git a/go.mod b/go.mod
index 4eb0d43..ad5909b 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
github.com/BurntSushi/toml v0.3.1
github.com/TicketsBot/archiverclient v0.0.0-20200704164621-09d42dd941e0
github.com/TicketsBot/common v0.0.0-20200702195837-7afe5e77d1df
- github.com/TicketsBot/database v0.0.0-20200620140717-f747a0bb4238
+ github.com/TicketsBot/database v0.0.0-20200708121851-08f2e7582b28
github.com/TicketsBot/logarchiver v0.0.0-20200425163447-199b93429026 // indirect
github.com/apex/log v1.1.2
github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect
diff --git a/public/static/css/style.css b/public/static/css/style.css
index 8d699fa..c5c258e 100644
--- a/public/static/css/style.css
+++ b/public/static/css/style.css
@@ -205,4 +205,38 @@ html > ::-webkit-scrollbar {
.wrapper {
z-index: 1000 !important;
-}
\ No newline at end of file
+}
+
+.guild {
+ width: 100%;
+ background-color: #121212;
+ height: 100px;
+ margin-bottom: 10px;
+ border-radius: 25px;
+ display: flex;
+ cursor: pointer;
+}
+
+.guild-icon {
+ height: 80px;
+ background-color: #272727;
+ border-radius: 50%;
+ margin-left: 10px;
+}
+
+.guild-icon-fa {
+ background-color: #272727;
+ border-radius: 50%;
+ margin-left: 10px;
+ color: white;
+ font-size: 60px !important;
+ width: 80px;
+ height: 80px;
+ text-align: center;
+ padding-top: 10px;
+}
+
+.guild-name {
+ color: white !important;
+ padding-left: 10px;
+}
diff --git a/public/templates/views/index.tmpl b/public/templates/views/index.tmpl
index bbc1ba8..ab01911 100644
--- a/public/templates/views/index.tmpl
+++ b/public/templates/views/index.tmpl
@@ -14,13 +14,18 @@
-
+
+
+
+
+
+
+ Invite to your server
+
+
+
+
+
@@ -30,8 +35,8 @@
{{end}}
\ No newline at end of file