Merge branch 'develop' into dist/ubuntu/bionic/develop
This commit is contained in:
commit
ef4d5efd02
11
Makefile
11
Makefile
|
|
@ -16,17 +16,16 @@ docker-image:
|
|||
docker-run:
|
||||
docker run \
|
||||
--rm -it \
|
||||
-p 8080:8080 \
|
||||
-p 2525:2525 \
|
||||
-p 3000:3000 \
|
||||
--tmpfs /app/data \
|
||||
fake-sms:latest
|
||||
|
||||
docker-release:
|
||||
docker tag fake-sms:latest bornholm/fake-sms:latest
|
||||
docker tag fake-sms:latest bornholm/fake-sms:$(DOCKER_DATE_TAG)
|
||||
docker tag fake-sms:latest cadoles/fake-sms:latest
|
||||
docker tag fake-sms:latest cadoles/fake-sms:$(DOCKER_DATE_TAG)
|
||||
docker login
|
||||
docker push bornholm/fake-sms:latest
|
||||
docker push bornholm/fake-sms:$(DOCKER_DATE_TAG)
|
||||
docker push cadoles/fake-sms:latest
|
||||
docker push cadoles/fake-sms:$(DOCKER_DATE_TAG)
|
||||
|
||||
test:
|
||||
go test -v -race ./...
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ Serveur d'envoi de SMS factice pour le développement avec interface web.
|
|||
### Avec Docker
|
||||
|
||||
```bash
|
||||
docker run -it --rm -p 3000:3000 bornholm/fake-sms
|
||||
docker run -it --rm -p 3000:3000 cadoles/fake-sms
|
||||
```
|
||||
|
||||
L'interface Web sera accessible à l'adresse http://localhost:3000/.
|
||||
|
|
|
|||
|
|
@ -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,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}}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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}}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
Loading…
Reference in New Issue