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

ref: embed files, bump to go 1.16 (#167)

Browse Source 
* ref: embed portion of files
* fix: readd pkger
* ref: embed version.txt
* fix: wrong mail template import path
* refactor: get rid of sql-migrate
refactor: get rid of pkger in favor of go embed (resolve #164)
* chore: remove unused var [ci-skip]

Co-authored-by: Ferdinand Mütsch <ferdinand@muetsch.io>
This commit is contained in:
Steven Tang
2021-04-11 10:42:43 +00:00
committed by GitHub
parent 2a9fbfdfd7
commit 6256c8e10a
18 changed files with 136 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
routes/routes.go
View File

@ -2,15 +2,17 @@ package routes
import (
"fmt"
"github.com/markbates/pkger"
"github.com/muety/wakapi/config"
"github.com/muety/wakapi/models"
"github.com/muety/wakapi/utils"
"html/template"
"io/fs"
"io/ioutil"
"net/http"
"path"
"strings"
"github.com/muety/wakapi/config"
"github.com/muety/wakapi/models"
"github.com/muety/wakapi/utils"
"github.com/muety/wakapi/views"
)
func Init() {
@ -53,12 +55,7 @@ func loadTemplates() {
})
templates = make(map[string]*template.Template)
dir, err := pkger.Open(tplPath)
if err != nil {
panic(err)
}
defer dir.Close()
files, err := dir.Readdir(0)
files, err := fs.ReadDir(views.TemplateFiles, ".")
if err != nil {
panic(err)
}
@ -69,7 +66,7 @@ func loadTemplates() {
continue
}
templateFile, err := pkger.Open(fmt.Sprintf("%s/%s", tplPath, tplName))
templateFile, err := views.TemplateFiles.Open(tplName)
if err != nil {
panic(err)
}