mirror/wakapi
1
0
Fork 0
mirror of https://github.com/muety/wakapi.git synced 2023-08-10 21:12:56 +03:00
Code Issues Projects Releases Wiki Activity

chore: enable templates to consist of partials

Browse Source
This commit is contained in:
Ferdinand Mütsch 2020-05-24 10:37:31 +02:00
parent bbd2c24f9a
commit d3ab54f6dc
5 changed files with 53 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
routes/summary.go
View File

@ -2,7 +2,9 @@ package routes
import ( import (
"errors" "errors"
"fmt"
"html/template" "html/template"
"io/ioutil"
"net/http" "net/http"
"path" "path"
"time" "time"
@ -22,9 +24,9 @@ const (
) )
type SummaryHandler struct { type SummaryHandler struct {
SummarySrvc *services.SummaryService SummarySrvc *services.SummaryService
Initialized bool Initialized bool
indexTemplate *template.Template templates map[string]*template.Template
} }
func (m *SummaryHandler) Init() { func (m *SummaryHandler) Init() {
@ -33,15 +35,31 @@ func (m *SummaryHandler) Init() {
} }
func (m *SummaryHandler) loadTemplates() { func (m *SummaryHandler) loadTemplates() {
indexTplPath := "views/index.tpl.html" tplPath := "views"
indexTpl, err := template.New(path.Base(indexTplPath)).Funcs(template.FuncMap{ templates := template.New("").Funcs(template.FuncMap{
"json": utils.Json, "json": utils.Json,
"date": utils.FormatDateHuman, "date": utils.FormatDateHuman,
}).ParseFiles(indexTplPath) })
m.templates = make(map[string]*template.Template)
files, err := ioutil.ReadDir(tplPath)
if err != nil { if err != nil {
panic(err) panic(err)
} }
m.indexTemplate = indexTpl
for _, file := range files {
tplName := file.Name()
if file.IsDir() || path.Ext(tplName) != ".html" {
continue
}
tpl, err := templates.New(tplName).ParseFiles(fmt.Sprintf("%s/%s", tplPath, tplName))
if err != nil {
panic(err)
}
m.templates[tplName] = tpl
}
} }
func (h *SummaryHandler) ApiGet(w http.ResponseWriter, r *http.Request) { func (h *SummaryHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
@ -96,7 +114,7 @@ func (h *SummaryHandler) Index(w http.ResponseWriter, r *http.Request) {
LanguageColors: utils.FilterLanguageColors(h.SummarySrvc.Config.LanguageColors, summary), LanguageColors: utils.FilterLanguageColors(h.SummarySrvc.Config.LanguageColors, summary),
} }
h.indexTemplate.Execute(w, vm) h.templates["index.tpl.html"].Execute(w, vm)
} }
func loadUserSummary(r *http.Request, summaryService *services.SummaryService) (*models.Summary, error, int) { func loadUserSummary(r *http.Request, summaryService *services.SummaryService) (*models.Summary, error, int) {

12
views/foot.tpl.html Normal file
View File

@ -0,0 +1,12 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/seedrandom/2.4.4/seedrandom.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.3/Chart.bundle.min.js"></script>
<script>
let wakapiData = {}
let languageColors = {{ .LanguageColors | json }}
wakapiData.projects = {{ .Projects | json }}
wakapiData.operatingSystems = {{ .OperatingSystems | json }}
wakapiData.editors = {{ .Editors | json }}
wakapiData.languages = {{ .Languages | json }}
</script>
<script src="assets/app.js"></script>

3
views/footer.tpl.html Normal file
View File

@ -0,0 +1,3 @@
<footer class="w-full text-center text-gray-300 text-xs mt-12">
Made by <a href="https://muetsch.io" class="border-b border-green-700">Ferdinand Mütsch</a> as <a href="https://github.com/muety/wakapi" class="border-b border-green-700">open-source</a>.
</footer>

9
views/head.tpl.html Normal file
View File

@ -0,0 +1,9 @@
<head>
<title>Wakapi – Coding Statistics</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
<link rel="icon" data-emoji="📊" type="image/png">
<link href="https://fonts.googleapis.com/css?family=Roboto&display=swap" rel="stylesheet">
<link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet">
<link href="assets/app.css" rel="stylesheet">
</head>

26
views/index.tpl.html
View File

@ -1,14 +1,6 @@
<html> <html>
<head> {{ template "head.tpl.html" . }}
<title>Wakapi – Coding Statistics</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
<link rel="icon" data-emoji="📊" type="image/png">
<link href="https://fonts.googleapis.com/css?family=Roboto&display=swap" rel="stylesheet">
<link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet">
<link href="assets/app.css" rel="stylesheet">
</head>
<body class="bg-gray-800 text-gray-700 p-4 pt-10 flex flex-col min-h-screen max-w-screen-xl mx-auto justify-center"> <body class="bg-gray-800 text-gray-700 p-4 pt-10 flex flex-col min-h-screen max-w-screen-xl mx-auto justify-center">
<div class="flex items-center justify-center"> <div class="flex items-center justify-center">
@ -55,22 +47,10 @@
</div> </div>
</div> </div>
</main> </main>
<footer class="w-full text-center text-gray-300 text-xs mt-12">
Made by <a href="https://muetsch.io" class="border-b border-green-700">Ferdinand Mütsch</a> as <a href="https://github.com/muety/wakapi" class="border-b border-green-700">open-source</a>.
</footer>
<script src="https://cdnjs.cloudflare.com/ajax/libs/seedrandom/2.4.4/seedrandom.min.js"></script> {{ template "footer.tpl.html" . }}
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.3/Chart.bundle.min.js"></script>
<script> {{ template "foot.tpl.html" . }}
let wakapiData = {}
let languageColors = {{ .LanguageColors | json }}
wakapiData.projects = {{ .Projects | json }}
wakapiData.operatingSystems = {{ .OperatingSystems | json }}
wakapiData.editors = {{ .Editors | json }}
wakapiData.languages = {{ .Languages | json }}
</script>
<script src="assets/app.js"></script>
</body> </body>
</html> </html>