Add config page, and configuration for the base URL, so the bookmarklet will work on remote machines.

This commit is contained in:
2022-05-26 12:19:29 +09:30
parent 0fc2a597cd
commit cbe455b566
9 changed files with 106 additions and 10 deletions

View File

@@ -21,11 +21,12 @@
<li>
<a href="#">Admin</a>
<ul class="menu vertical">
<li><a href="/config">Configuration</a></li>
<li><a href="/manage">Manage links</a></li>
<li><a href="/export">Export all URLs</a></li>
</ul>
</li>
<li><a href="javascript:void(window.open('http://localhost:8080/bookmarklet?url=' +encodeURIComponent(window.location), 'windowName', 'width=640,height=480'))">Bookmarklet</a></li>
<li><a href="javascript:void(window.open('{{ .config.BaseURL }}/bookmarklet?url=' +encodeURIComponent(window.location), 'windowName', 'width=640,height=480'))">Bookmarklet</a></li>
</ul>
</div>
@@ -50,6 +51,8 @@
{{ template "bookmarklet.html" . }}
{{ else if eq .page "manage" }}
{{ template "manage.html" . }}
{{ else if eq .page "config" }}
{{ template "config.html" . }}
{{ end }}
{{/* template "foundation_sample.html" . */}}
</div>

View File

@@ -0,0 +1,7 @@
<div class="grid-x grid-padding-x">
<div class="large-12 cell">
<h5>Configuration</h5>
{{ template "config_form.html" . }}
</div>
</div>

View File

@@ -0,0 +1,12 @@
<form onsubmit="false;" id="config-form" hx-target="#config-form">
<table>
<tr>
<th>Base URL</th>
<td>
<input type="text" name="baseurl" value="{{ .config.BaseURL }}">
</td>
</tr>
</table>
<p><a class="button" hx-post="/config">save</a></p>
</form>

View File

@@ -42,7 +42,7 @@ type Server struct {
}
// Create creates a new web server instance and sets up routing.
func Create(bmm *db.BookmarkManager) *Server {
func Create(bmm *db.BookmarkManager, cmm *db.ConfigManager) *Server {
// setup routes for the static assets (vendor includes)
staticFS, err := fs.Sub(staticFiles, "static")
@@ -53,6 +53,11 @@ func Create(bmm *db.BookmarkManager) *Server {
// templ := template.Must(template.New("").Funcs(template.FuncMap{"dict": dictHelper}).ParseFS(templateFiles, "templates/*.html"))
templ := template.Must(template.New("").Funcs(template.FuncMap{"nicetime": niceTime, "niceURL": niceURL, "join": strings.Join, "version": version.Is}).ParseFS(templateFiles, "templates/*.html"))
config, err := cmm.LoadConfig()
if err != nil {
log.Fatalf("could not start server - failed to load config: %s", err)
}
r := gin.Default()
server := &Server{
@@ -67,7 +72,7 @@ func Create(bmm *db.BookmarkManager) *Server {
r.StaticFS("/assets", http.FS(staticFS))
r.GET("/", func(c *gin.Context) {
meta := gin.H{"page": "root"}
meta := gin.H{"page": "root", "config": config}
c.HTML(http.StatusOK,
"_layout.html", meta,
)
@@ -75,12 +80,27 @@ func Create(bmm *db.BookmarkManager) *Server {
r.GET("/manage", func(c *gin.Context) {
allBookmarks, _ := bmm.ListBookmarks()
meta := gin.H{"page": "manage", "bookmarks": allBookmarks}
meta := gin.H{"page": "manage", "config": config, "bookmarks": allBookmarks}
c.HTML(http.StatusOK,
"_layout.html", meta,
)
})
r.GET("/config", func(c *gin.Context) {
meta := gin.H{"page": "config", "config": config}
c.HTML(http.StatusOK,
"_layout.html", meta,
)
})
r.POST("/config", func(c *gin.Context) {
config.BaseURL = c.PostForm("baseurl")
cmm.SaveConfig(&config)
meta := gin.H{"config": config}
c.HTML(http.StatusOK, "config_form.html", meta)
})
r.POST("/search", func(c *gin.Context) {
query := c.PostForm("query")
@@ -152,8 +172,6 @@ func Create(bmm *db.BookmarkManager) *Server {
r.POST("/tags", func(c *gin.Context) {
log.Printf("POST: tag '%s' tags_hidden '%s'", c.PostForm("tag"), c.PostForm("tags_hidden"))
newTag := c.PostForm("tag")
oldTags := strings.Split(c.PostForm("tags_hidden"), "|")
@@ -203,7 +221,7 @@ func Create(bmm *db.BookmarkManager) *Server {
r.GET("/bookmarklet", func(c *gin.Context) {
url := c.Query("url")
log.Printf(url)
meta := gin.H{"page": "bookmarklet_click", "url": url}
meta := gin.H{"page": "bookmarklet_click", "config": config, "url": url}
c.HTML(http.StatusOK,
"_layout.html", meta,
)