mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-02-07 15:12:22 +00:00
Code Issues Projects Releases Wiki Activity

enable new polymer user interface

Browse source
This commit is contained in:
Brad Rydzewski 2017-07-16 12:27:01 -04:00
parent 587b07c69b
commit b078f1abc9
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/template/files/index_polymer.html
View file

@ -5,6 +5,9 @@
<meta name="author" content="bradrydzewski"> <meta name="author" content="bradrydzewski">
<meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes"> <meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
<link rel="shortcut icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="shortcut icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<title></title> <title></title>
<script> <script>
window.ENV = {}; window.ENV = {};

3
server/template/template_gen.go
View file

@ -94,6 +94,9 @@ var indexpolymer = `<!DOCTYPE html>
<meta name="author" content="bradrydzewski"> <meta name="author" content="bradrydzewski">
<meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes"> <meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
<link rel="shortcut icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="shortcut icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<title></title> <title></title>
<script> <script>
window.ENV = {}; window.ENV = {};

18
server/ui.go
View file

@ -23,12 +23,13 @@ type website struct {
// NewWebsite returns a new website loader. // NewWebsite returns a new website loader.
func NewWebsite() Website { func NewWebsite() Website {
// TODO change to DRONE_WEB_PATH and add DRONE_WEB_PROXY
path := os.Getenv("DRONE_WWW") path := os.Getenv("DRONE_WWW")
if path != "" { if path != "" {
return NewLocalWebsite(path) return NewLocalWebsite(path)
} }
return &website{ return &website{
fs: http.FileServer(dist.AssetFS()), fs: http.FileServer(dist.New()),
} }
} }
@ -38,14 +39,9 @@ func (w *website) Page(rw http.ResponseWriter, r *http.Request, u *model.User) {
path := r.URL.Path path := r.URL.Path
switch path { switch path {
case "/login/form":
params := map[string]interface{}{}
template.T.ExecuteTemplate(rw, "login.html", params)
case "/login": case "/login":
if err := r.FormValue("error"); err != "" { if err := r.FormValue("error"); err != "" {
params := map[string]interface{}{"error": err} // TODO login error
template.T.ExecuteTemplate(rw, "error.html", params)
} else { } else {
http.Redirect(rw, r, "/authorize", 303) http.Redirect(rw, r, "/authorize", 303)
} }
@ -62,7 +58,8 @@ func (w *website) Page(rw http.ResponseWriter, r *http.Request, u *model.User) {
"user": u, "user": u,
"csrf": csrf, "csrf": csrf,
} }
template.T.ExecuteTemplate(rw, "index.html", params)
template.T.ExecuteTemplate(rw, "index_polymer.html", params)
} }
} }
@ -73,6 +70,9 @@ func (w *website) File(rw http.ResponseWriter, r *http.Request) {
func (w *website) Routes() []string { func (w *website) Routes() []string {
return []string{ return []string{
"/static/*filepath", "/favicon-32x32.png",
"/favicon-16x16.png",
"/src/*filepath",
"/bower_components/*filepath",
} }
} }