Add the mock-up form for new campsite type
It does nothing, but i need it to discuss with Oriol. Now there are more than a single package that requires shiftPath, so i moved it to http and an exported function, ShiftPath. Part of #25.
This commit is contained in:
parent
ab0cfb4100
commit
cfa330bce4
|
@ -7,27 +7,18 @@ package app
|
|||
|
||||
import (
|
||||
"net/http"
|
||||
"path"
|
||||
"strings"
|
||||
|
||||
"golang.org/x/text/language"
|
||||
|
||||
"dev.tandem.ws/tandem/camper/pkg/auth"
|
||||
"dev.tandem.ws/tandem/camper/pkg/campsite"
|
||||
"dev.tandem.ws/tandem/camper/pkg/database"
|
||||
httplib "dev.tandem.ws/tandem/camper/pkg/http"
|
||||
"dev.tandem.ws/tandem/camper/pkg/locale"
|
||||
"dev.tandem.ws/tandem/camper/pkg/template"
|
||||
)
|
||||
|
||||
func shiftPath(p string) (head, tail string) {
|
||||
p = path.Clean("/" + p)
|
||||
if i := strings.IndexByte(p[1:], '/') + 1; i <= 0 {
|
||||
return p[1:], "/"
|
||||
} else {
|
||||
return p[1:i], p[i:]
|
||||
}
|
||||
}
|
||||
|
||||
func methodNotAllowed(w http.ResponseWriter, _ *http.Request, allowed ...string) {
|
||||
w.Header().Set("Allow", strings.Join(allowed, ", "))
|
||||
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
|
||||
|
@ -37,6 +28,7 @@ type App struct {
|
|||
db *database.DB
|
||||
fileHandler http.Handler
|
||||
profile *profileHandler
|
||||
campsite *campsite.Handler
|
||||
locales locale.Locales
|
||||
defaultLocale *locale.Locale
|
||||
languageMatcher language.Matcher
|
||||
|
@ -53,6 +45,7 @@ func New(db *database.DB, avatarsDir string) (http.Handler, error) {
|
|||
db: db,
|
||||
fileHandler: static,
|
||||
profile: profile,
|
||||
campsite: campsite.NewHandler(),
|
||||
locales: locales,
|
||||
defaultLocale: locales[language.Catalan],
|
||||
languageMatcher: language.NewMatcher(locales.Tags()),
|
||||
|
@ -67,7 +60,7 @@ func New(db *database.DB, avatarsDir string) (http.Handler, error) {
|
|||
func (h *App) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
requestPath := r.URL.Path
|
||||
var head string
|
||||
head, r.URL.Path = shiftPath(r.URL.Path)
|
||||
head, r.URL.Path = httplib.ShiftPath(r.URL.Path)
|
||||
switch head {
|
||||
case "static":
|
||||
h.fileHandler.ServeHTTP(w, r)
|
||||
|
@ -105,6 +98,8 @@ func (h *App) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||
switch head {
|
||||
case "me":
|
||||
h.profile.Handler(user, conn).ServeHTTP(w, r)
|
||||
case "campsites":
|
||||
h.campsite.Handler(user, conn).ServeHTTP(w, r)
|
||||
case "":
|
||||
switch r.Method {
|
||||
case http.MethodGet:
|
||||
|
|
|
@ -83,7 +83,7 @@ func newProfileHandler(static http.Handler, avatarsDir string) (*profileHandler,
|
|||
func (h *profileHandler) Handler(user *auth.User, conn *database.Conn) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var head string
|
||||
head, r.URL.Path = shiftPath(r.URL.Path)
|
||||
head, r.URL.Path = httplib.ShiftPath(r.URL.Path)
|
||||
|
||||
switch head {
|
||||
case "avatar":
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2023 jordi fita mas <jfita@peritasoft.com>
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
||||
package campsite
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"dev.tandem.ws/tandem/camper/pkg/auth"
|
||||
"dev.tandem.ws/tandem/camper/pkg/database"
|
||||
httplib "dev.tandem.ws/tandem/camper/pkg/http"
|
||||
)
|
||||
|
||||
type Handler struct {
|
||||
types *typeHandler
|
||||
}
|
||||
|
||||
func NewHandler() *Handler {
|
||||
return &Handler{
|
||||
types: &typeHandler{},
|
||||
}
|
||||
}
|
||||
|
||||
func (h *Handler) Handler(user *auth.User, conn *database.Conn) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var head string
|
||||
head, r.URL.Path = httplib.ShiftPath(r.URL.Path)
|
||||
|
||||
switch head {
|
||||
case "types":
|
||||
h.types.Handler(user, conn).ServeHTTP(w, r)
|
||||
default:
|
||||
http.NotFound(w, r)
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,32 @@
|
|||
/*
|
||||
* SPDX-FileCopyrightText: 2023 jordi fita mas <jfita@peritasoft.com>
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
||||
package campsite
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"dev.tandem.ws/tandem/camper/pkg/auth"
|
||||
"dev.tandem.ws/tandem/camper/pkg/database"
|
||||
httplib "dev.tandem.ws/tandem/camper/pkg/http"
|
||||
"dev.tandem.ws/tandem/camper/pkg/template"
|
||||
)
|
||||
|
||||
type typeHandler struct {
|
||||
}
|
||||
|
||||
func (h *typeHandler) Handler(user *auth.User, conn *database.Conn) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var head string
|
||||
head, r.URL.Path = httplib.ShiftPath(r.URL.Path)
|
||||
|
||||
switch head {
|
||||
case "new":
|
||||
template.MustRender(w, r, user, "campsite/type/new.gohtml", nil)
|
||||
default:
|
||||
http.NotFound(w, r)
|
||||
}
|
||||
}
|
||||
}
|
|
@ -8,6 +8,7 @@ package http
|
|||
import (
|
||||
"net"
|
||||
"net/http"
|
||||
"path"
|
||||
"strings"
|
||||
)
|
||||
|
||||
|
@ -27,3 +28,12 @@ func RemoteAddr(r *http.Request) string {
|
|||
}
|
||||
return forwarded
|
||||
}
|
||||
|
||||
func ShiftPath(p string) (head, tail string) {
|
||||
p = path.Clean("/" + p)
|
||||
if i := strings.IndexByte(p[1:], '/') + 1; i <= 0 {
|
||||
return p[1:], "/"
|
||||
} else {
|
||||
return p[1:i], p[i:]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
<!--
|
||||
SPDX-FileCopyrightText: 2023 jordi fita mas <jordi@tandem.blog>
|
||||
SPDX-License-Identifier: AGPL-3.0-only
|
||||
-->
|
||||
{{ define "title" -}}
|
||||
{{( pgettext "New Campsite Type" "title" )}}
|
||||
{{- end }}
|
||||
|
||||
{{ define "content" -}}
|
||||
<form method="post">
|
||||
<h2>{{( pgettext "New Campsite Type" "title" )}}</h2>
|
||||
{{ CSRFInput }}
|
||||
<fieldset>
|
||||
<label>{{( pgettext "Name" "input")}}<br>
|
||||
<input type="text"><br>
|
||||
</label>
|
||||
<label>{{( pgettext "Description" "input")}}<br>
|
||||
<textarea></textarea><br>
|
||||
</label>
|
||||
<label>{{( pgettext "Rules" "input")}}<br>
|
||||
<textarea></textarea><br>
|
||||
</label>
|
||||
<label>{{( pgettext "Booking Terms and Conditions" "input")}}<br>
|
||||
<textarea></textarea><br>
|
||||
</label>
|
||||
</fieldset>
|
||||
<footer>
|
||||
<button type="submit">{{( pgettext "Add" "action" )}}</button>
|
||||
</footer>
|
||||
</form>
|
||||
{{- end }}
|
Loading…
Reference in New Issue