Cadoles/fake-sms
Cadoles
/
fake-sms
19
0
Fork 0
Code Issues 2 Pull Requests 3 Releases Wiki Activity

Add BaseURL config parameter

This commit is contained in:
wpetit 2021-01-15 16:28:45 +01:00
parent be2febf0fe
commit 067569e0c3
6 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/fake-sms/template/blocks/base.html.tmpl
View File

@ -6,10 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{block "title" . -}}{{- end}}</title>
{{- block "head_style" . -}}
<link rel="stylesheet" href="/css/main.css" />
<link rel="stylesheet" href="{{ .BaseURL }}/css/main.css" />
{{end}}
{{- block "head_script" . -}}
<script type="text/javascript" src="/main.js"></script>
<script type="text/javascript" src="{{ .BaseURL }}/main.js"></script>
{{end}}
</head>
<body>

2
cmd/fake-sms/template/blocks/header.html.tmpl
View File

@ -2,7 +2,7 @@
<div class="columns is-mobile">
<div class="column is-narrow">
<h1 class="is-size-3 title">
<a href="/" rel="Inbox" class="has-text-grey-dark">
<a href="{{ .BaseURL }}" rel="Inbox" class="has-text-grey-dark">
{{if or .Messages .SMS}}
📳
{{else}}

6
cmd/fake-sms/template/layouts/outbox.html.tmpl
View File

@ -2,7 +2,7 @@
{{define "header_buttons"}}
<button
data-controller="restful"
data-restful-endpoint="/sms"
data-restful-endpoint="{{ .BaseURL }}/sms"
data-restful-method="DELETE"
class="button is-danger">
🗑️ Clear
@ -26,7 +26,7 @@
{{range .Messages}}
<tr data-controller="inbox-entry"
data-action="click->outbox-entry#onClick"
data-inbox-entry-link="./sms/{{ .ID }}">
data-inbox-entry-link="{{ .BaseURL }}/sms/{{ .ID }}">
<td class="sms-from">
<span class="is-size-7">{{ .From }}</span>
</td>
@ -38,7 +38,7 @@
</td>
<td class="sms-actions">
<div class="buttons is-right">
<a href="./sms/{{ .ID }}" class="button is-small is-link">👁️ See</a>
<a href="{{ .BaseURL }}/sms/{{ .ID }}" class="button is-small is-link">👁️ See</a>
</div>
</td>
</tr>

4
cmd/fake-sms/template/layouts/sms.html.tmpl
View File

@ -2,9 +2,9 @@
{{define "header_buttons"}}
<button class="button is-danger"
data-controller="restful"
data-restful-endpoint="./{{ .SMS.ID }}"
data-restful-endpoint="{{ .BaseURL }}/{{ .SMS.ID }}"
data-restful-method="DELETE"
data-restful-redirect="../">
data-restful-redirect="{{ .BaseURL }}">
🗑️ Delete
</button>
{{end}}

1
internal/config/config.go
View File

@ -20,6 +20,7 @@ type HTTPConfig struct {
Address string `yaml:"address" env:"FAKESMS_HTTP_ADDRESS"`
TemplateDir string `yaml:"templateDir" env:"FAKESMS_HTTP_TEMPLATEDIR"`
PublicDir string `yaml:"publicDir" env:"FAKESMS_HTTP_PUBLICDIR"`
BaseURL string `yaml:"baseUrl" env:"FAKESMS_HTTP_BASEURL"`
}
type DataConfig struct {

16
internal/route/helper.go
View File

@ -5,9 +5,11 @@ import (
"strconv"
"time"
"forge.cadoles.com/Cadoles/fake-sms/internal/config"
"forge.cadoles.com/Cadoles/fake-sms/internal/query"
"github.com/pkg/errors"
"gitlab.com/wpetit/goweb/middleware/container"
"gitlab.com/wpetit/goweb/service"
"gitlab.com/wpetit/goweb/service/template"
)
@ -15,6 +17,7 @@ func extendTemplateData(w http.ResponseWriter, r *http.Request, data template.Da
ctn := container.Must(r.Context())
data, err := template.Extend(data,
template.WithBuildInfo(w, r, ctn),
withBaseURL(ctn),
)
if err != nil {
@ -24,6 +27,19 @@ func extendTemplateData(w http.ResponseWriter, r *http.Request, data template.Da
return data
}
func withBaseURL(ctn *service.Container) template.DataExtFunc {
return func(data template.Data) (template.Data, error) {
conf, err := config.From(ctn)
if err != nil {
return nil, errors.WithStack(err)
}
data["BaseURL"] = conf.HTTP.BaseURL
return data, nil
}
}
func createOutboxQueryFromRequest(r *http.Request) (*query.GetOutboxRequest, error) {
orderBy := r.URL.Query().Get("orderBy")
reverse := r.URL.Query().Get("reverse")