mirror
/
wakapi
mirror of https://github.com/muety/wakapi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: use query param for leaderboard controls

This commit is contained in:
Ferdinand Mütsch 2022-10-03 20:38:19 +02:00
parent b3fa032bde
commit 1d7ff4bc2a
4 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
models/view/leaderboard.go
View File

@ -3,12 +3,12 @@ package view
import "github.com/muety/wakapi/models"
type LeaderboardViewModel struct {
User *models.User
Items []*models.LeaderboardItem
ItemsByLanguage []*models.LeaderboardItem
ApiKey string
Success string
Error string
User *models.User
By string
Items []*models.LeaderboardItem
ApiKey string
Success string
Error string
}
func (s *LeaderboardViewModel) WithSuccess(m string) *LeaderboardViewModel {

47
routes/leaderboard.go
View File

@ -1,6 +1,7 @@
package routes
import (
"fmt"
"github.com/gorilla/mux"
conf "github.com/muety/wakapi/config"
"github.com/muety/wakapi/middlewares"
@ -8,6 +9,7 @@ import (
"github.com/muety/wakapi/models/view"
"github.com/muety/wakapi/services"
"net/http"
"strings"
)
type LeaderboardHandler struct {
@ -16,6 +18,10 @@ type LeaderboardHandler struct {
leaderboardService services.ILeaderboardService
}
var allowedAggregations = map[string]uint8{
"language": models.SummaryLanguage,
}
func NewLeaderboardHandler(userService services.IUserService, leaderboardService services.ILeaderboardService) *LeaderboardHandler {
return &LeaderboardHandler{
config: conf.Get(),
@ -44,18 +50,27 @@ func (h *LeaderboardHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
func (h *LeaderboardHandler) buildViewModel(r *http.Request) *view.LeaderboardViewModel {
user := middlewares.GetPrincipal(r)
byParam := strings.ToLower(r.URL.Query().Get("by"))
itemsGeneral, err := h.leaderboardService.GetByInterval(models.IntervalPast7Days)
if err != nil {
conf.Log().Request(r).Error("error while fetching general leaderboard items - %v", err)
return &view.LeaderboardViewModel{Error: criticalError}
}
var err error
var items []*models.LeaderboardItem
by := models.SummaryLanguage
itemsByLanguage, err := h.leaderboardService.GetAggregatedByInterval(models.IntervalPast7Days, &by)
if err != nil {
conf.Log().Request(r).Error("error while fetching general leaderboard items - %v", err)
return &view.LeaderboardViewModel{Error: criticalError}
if byParam == "" {
items, err = h.leaderboardService.GetByInterval(models.IntervalPast7Days)
if err != nil {
conf.Log().Request(r).Error("error while fetching general leaderboard items - %v", err)
return &view.LeaderboardViewModel{Error: criticalError}
}
} else {
if by, ok := allowedAggregations[byParam]; ok {
items, err = h.leaderboardService.GetAggregatedByInterval(models.IntervalPast7Days, &by)
if err != nil {
conf.Log().Request(r).Error("error while fetching general leaderboard items - %v", err)
return &view.LeaderboardViewModel{Error: criticalError}
}
} else {
return &view.LeaderboardViewModel{Error: fmt.Sprintf("unsupported aggregation '%s'", byParam)}
}
}
var apiKey string
@ -64,11 +79,11 @@ func (h *LeaderboardHandler) buildViewModel(r *http.Request) *view.LeaderboardVi
}
return &view.LeaderboardViewModel{
User: user,
Items: itemsGeneral,
ItemsByLanguage: itemsByLanguage,
ApiKey: apiKey,
Success: r.URL.Query().Get("success"),
Error: r.URL.Query().Get("error"),
User: user,
By: byParam,
Items: items,
ApiKey: apiKey,
Success: r.URL.Query().Get("success"),
Error: r.URL.Query().Get("error"),
}
}

14
static/assets/js/components/leaderboard.js
View File

@ -1,14 +0,0 @@
PetiteVue.createApp({
//$delimiters: ['${', '}'], // https://github.com/vuejs/petite-vue/pull/100
activeTab: defaultTab,
isActive(tab) {
return this.activeTab === tab
},
updateTab() {
this.activeTab = window.location.hash.slice(1) || defaultTab
},
mounted() {
this.updateTab()
window.addEventListener('hashchange', () => this.updateTab())
}
}).mount('#leaderboard-page')

21
views/leaderboard.tpl.html
View File

@ -6,7 +6,6 @@
<script>
const defaultTab = 'total'
</script>
<script type="module" src="assets/js/components/leaderboard.js"></script>
<body class="relative bg-gray-900 text-gray-700 p-4 pt-10 flex flex-col min-h-screen {{ if .User }} max-w-screen-xl {{ else }} max-w-screen-lg {{end}} mx-auto justify-center">
@ -19,34 +18,26 @@
{{ template "login-btn.tpl.html" . }}
{{ end }}
<main class="mt-10 flex-grow flex justify-center w-full" v-scope @vue:mounted="mounted" id="leaderboard-page">
<main class="mt-10 flex-grow flex justify-center w-full" id="leaderboard-page">
<div class="flex flex-col flex-grow mt-10">
<h1 class="font-semibold text-3xl text-white m-0 mb-4">Leaderboard</h1>
<ul class="flex space-x-4 mb-16 text-gray-600">
<li class="font-semibold text-2xl" v-bind:class="{ 'text-gray-300': isActive('total'), 'hover:text-gray-500': !isActive('total') }">
<a href="leaderboard#total" @click="updateTab">Total</a>
<li class="font-semibold text-2xl {{ if eq .By "" }} text-gray-300 {{ else }} hover:text-gray-500 {{ end }}">
<a href="leaderboard">Total</a>
</li>
<li class="font-semibold text-2xl" v-bind:class="{ 'text-gray-300': isActive('language'), 'hover:text-gray-500': !isActive('language') }">
<a href="leaderboard#language" @click="updateTab">By Language</a>
<li class="font-semibold text-2xl {{ if eq .By "language" }} text-gray-300 {{ else }} hover:text-gray-500 {{ end }}">
<a href="leaderboard?by=language">By Language</a>
</li>
</ul>
<div v-cloak id="total" class="tab flex flex-col space-y-4" v-if="isActive('total')">
<div id="total" class="tab flex flex-col space-y-4">
<ol>
{{ range $i, $item := .Items }}
<li>{{ $item.Rank }} - {{ $item.UserID }} - {{ $item.Total | duration }}</li>
{{ end }}
</ol>
</div>
<div v-cloak id="language" class="tab flex flex-col space-y-4" v-if="isActive('language')">
<ol>
{{ range $i, $item := .ItemsByLanguage }}
<li>{{ $item.Rank }} - {{ $item.UserID }} - {{ $item.Total | duration }}</li>
{{ end }}
</ol>
</div>
</div>
</main>