Reorganize project structure and fix SQLite usage
This commit is contained in:
bronku
parent
0e762841a3
commit
e2dda0ade7
20 changed files with 76 additions and 46 deletions
|
|
@ -1,13 +0,0 @@
|
|||
package server
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func errorPage(err error, status int) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(status)
|
||||
fmt.Fprint(w, err.Error())
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
package server
|
||||
|
||||
import "net/http"
|
||||
|
||||
type fetcher func(r *http.Request) (any, int, error)
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
package server
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/Bronku/iroon/store"
|
||||
)
|
||||
|
||||
func (h *Server) index(r *http.Request) (any, int, error) {
|
||||
data, err := h.s.GetOrders()
|
||||
return data, http.StatusOK, err
|
||||
}
|
||||
|
||||
func (h *Server) getOrder(r *http.Request) (any, int, error) {
|
||||
type formData struct {
|
||||
Order store.Order
|
||||
Catalogue []store.Cake
|
||||
}
|
||||
var err error
|
||||
var data formData
|
||||
|
||||
data.Catalogue, err = h.s.GetCakes()
|
||||
if err != nil {
|
||||
return nil, http.StatusInternalServerError, err
|
||||
}
|
||||
|
||||
url := strings.Split(r.URL.String(), "/")
|
||||
if len(url) < 3 || url[2] == "" {
|
||||
return data, http.StatusOK, nil
|
||||
}
|
||||
|
||||
id, err := strconv.Atoi(url[2])
|
||||
if err != nil {
|
||||
return nil, http.StatusBadRequest, err
|
||||
}
|
||||
|
||||
data.Order, err = h.s.GetOrder(id)
|
||||
if err != nil {
|
||||
return nil, http.StatusNotFound, err
|
||||
}
|
||||
|
||||
return data, http.StatusOK, nil
|
||||
}
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
package server
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/Bronku/iroon/store"
|
||||
)
|
||||
|
||||
func (h *Server) postOrder(r *http.Request) (any, int, error) {
|
||||
cakes, err := h.s.GetCakes()
|
||||
if err != nil {
|
||||
return nil, http.StatusInternalServerError, err
|
||||
}
|
||||
|
||||
err = r.ParseForm()
|
||||
if err != nil {
|
||||
return nil, http.StatusBadRequest, err
|
||||
}
|
||||
|
||||
var n store.Order
|
||||
n.ID, err = strconv.Atoi(r.FormValue("id"))
|
||||
if err != nil {
|
||||
return nil, http.StatusBadRequest, err
|
||||
}
|
||||
n.Paid, err = strconv.Atoi(r.FormValue("paid"))
|
||||
if err != nil {
|
||||
return nil, http.StatusBadRequest, err
|
||||
}
|
||||
n.Date, err = time.Parse("2006-01-02", r.FormValue("date"))
|
||||
if err != nil {
|
||||
return nil, http.StatusBadRequest, err
|
||||
}
|
||||
|
||||
n.Cakes = make([]store.Cake, 0)
|
||||
for _, e := range cakes {
|
||||
e.Amount, err = strconv.Atoi(r.FormValue(fmt.Sprintf("cake[%d]", e.ID)))
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
n.Cakes = append(n.Cakes, e)
|
||||
}
|
||||
|
||||
n.Accepted = time.Now()
|
||||
n.Name = strings.TrimSpace(r.FormValue("name"))
|
||||
n.Surname = strings.TrimSpace(r.FormValue("surname"))
|
||||
n.Phone = strings.TrimSpace(r.FormValue("phone"))
|
||||
n.Location = strings.TrimSpace(r.FormValue("location"))
|
||||
n.Status = strings.TrimSpace(r.FormValue("status"))
|
||||
|
||||
n.ID, err = h.s.SaveOrder(n)
|
||||
return n, http.StatusAccepted, err
|
||||
}
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
package server
|
||||
|
||||
import (
|
||||
"html/template"
|
||||
"net/http"
|
||||
|
||||
"github.com/Bronku/iroon/store"
|
||||
)
|
||||
|
||||
type Server struct {
|
||||
tmpl *template.Template
|
||||
s *store.Store
|
||||
http.Handler
|
||||
}
|
||||
|
||||
func (h *Server) Close() {
|
||||
if h.s != nil {
|
||||
h.s.Close()
|
||||
}
|
||||
}
|
||||
|
||||
func (h *Server) openStore() error {
|
||||
var err error
|
||||
h.s, err = store.OpenStore("./foo.db")
|
||||
if err != nil {
|
||||
h.s.Close()
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (h *Server) loadHandler() {
|
||||
mux := http.NewServeMux()
|
||||
|
||||
mux.HandleFunc("GET /order/", h.render(h.getOrder, "order.html"))
|
||||
mux.HandleFunc("GET /", h.render(h.index, "index.html"))
|
||||
mux.HandleFunc("POST /order/", h.render(h.postOrder, "confirmation.html"))
|
||||
|
||||
h.Handler = mux
|
||||
}
|
||||
|
||||
func New() (*Server, error) {
|
||||
var server Server
|
||||
var err error
|
||||
|
||||
err = server.loadTemplates()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
err = server.openStore()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
server.loadHandler()
|
||||
|
||||
return &server, nil
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
package server
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"html/template"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
//go:embed templates/*
|
||||
var templates embed.FS
|
||||
|
||||
func (h *Server) loadTemplates() error {
|
||||
var err error
|
||||
h.tmpl, err = template.ParseFS(templates, "templates/*")
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *Server) render(fetch fetcher, templateName string) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("content-type", "text/html")
|
||||
data, code, err := fetch(r)
|
||||
if err != nil {
|
||||
errorPage(err, code).ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
err = s.tmpl.ExecuteTemplate(w, templateName, data)
|
||||
if err != nil {
|
||||
errorPage(err, http.StatusInternalServerError).ServeHTTP(w, r)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<header>
|
||||
<h1>Confirmation</h1>
|
||||
</header>
|
||||
<nav>
|
||||
<a href="/">index</a>
|
||||
</nav>
|
||||
<main>
|
||||
<h2>Order {{.ID}} for {{.Name}} {{.Surname}} confirmed</h2>
|
||||
</main>
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
<header>
|
||||
<h1>Kill me please</h1>
|
||||
</header>
|
||||
<nav>
|
||||
<a href="order">New</a>
|
||||
</nav>
|
||||
<main>
|
||||
<table>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>Name</th>
|
||||
<th>Surname</th>
|
||||
<th>Phone</th>
|
||||
<th>Location</th>
|
||||
<th>Date</th>
|
||||
<th>Accepted</th>
|
||||
<th>Status</th>
|
||||
<th>Paid</th>
|
||||
<th>Cakes</th>
|
||||
</tr>
|
||||
{{range .}}
|
||||
<tr>
|
||||
<th><a href="/order/{{.ID}}">edit</a></th>
|
||||
<th>{{.Name}}</th>
|
||||
<th>{{.Surname}}</th>
|
||||
<th>{{.Phone}}</th>
|
||||
<th>{{.Location}}</th>
|
||||
<th>{{.Date.Format "2006-01-02"}}</th>
|
||||
<th>{{.Accepted.Format "2006-01-02"}}</th>
|
||||
<th>{{.Status}}</th>
|
||||
<th>{{.Paid}}</th>
|
||||
<th>{{range .Cakes}} {{.Name}} {{.Amount}} {{end}}</th>
|
||||
</tr>
|
||||
{{end}}
|
||||
</table>
|
||||
</main>
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
<header>
|
||||
<h1>New Order</h1>
|
||||
</header>
|
||||
<nav>
|
||||
<a href="/">back</a>
|
||||
</nav>
|
||||
<main>
|
||||
<form method="post">
|
||||
{{with .Order}}
|
||||
<div>
|
||||
<h2>Info</h2>
|
||||
<input hidden="true" name="id" value="{{.ID}}">
|
||||
<label>name</label>
|
||||
<input type="text" name="name" value="{{.Name}}">
|
||||
<label>surname</label>
|
||||
<input type="text" name="surname" value="{{.Surname}}">
|
||||
<label>phone</label>
|
||||
<input type="tel" name="phone" value="{{.Phone}}">
|
||||
<label>location</label>
|
||||
<select name="location">
|
||||
<option {{ if eq .Location "Kartuzy" }}selected{{ end }} value="Kartuzy">Kartuzy</option>
|
||||
<option {{ if eq .Location "Somonino" }}selected{{ end }} value="Somonino">Somonino</option>
|
||||
</select>
|
||||
<label>date</label>
|
||||
<input type="date" name="date" value="{{.Date.Format "2006-01-02"}}">
|
||||
<label>status</label>
|
||||
<select name="status" id="status" >
|
||||
<option {{ if eq .Status "accepted" }}selected{{ end }} value="accepted">accepted</option>
|
||||
<option {{ if eq .Status "done" }}selected{{ end }} value="done">done</option>
|
||||
</select>
|
||||
<label>paid</label>
|
||||
<input type="number" name="paid" min="0" value="{{.Paid}}">
|
||||
</div>
|
||||
<div>
|
||||
<h2>Basket</h2>
|
||||
<ul id="basket">
|
||||
</ul>
|
||||
</div>
|
||||
{{end}}
|
||||
{{with .Catalogue}}
|
||||
<div>
|
||||
<h2>Catalogue</h2>
|
||||
<ul>
|
||||
{{range .}}
|
||||
<li>
|
||||
{{.Name}} {{.Price}} <button type=button onClick="addCake({{.ID}},'{{.Name}} {{.Price}}', 1)">add</button>
|
||||
</li>
|
||||
{{end}}
|
||||
</ul>
|
||||
</div>
|
||||
{{end}}
|
||||
<button type="submit">submit</button>
|
||||
</form>
|
||||
</main>
|
||||
<script>
|
||||
function addCake(id, name, amount){
|
||||
var cake = document.getElementById("cake["+id+"]")
|
||||
if (cake != null){
|
||||
var value = Number(cake.getAttribute("value"))
|
||||
cake.setAttribute("value", value+1)
|
||||
return;
|
||||
}
|
||||
var label = document.createElement("label")
|
||||
label.innerText = name
|
||||
var input = document.createElement("input")
|
||||
input.setAttribute("id","cake["+id+"]")
|
||||
input.setAttribute("type", "number")
|
||||
input.setAttribute("min", "0")
|
||||
input.setAttribute("name", "cake["+id+"]")
|
||||
input.setAttribute("value", amount)
|
||||
var button = document.createElement("button")
|
||||
button.setAttribute("type", "button")
|
||||
button.setAttribute("onClick", "removeCake("+id+")")
|
||||
button.innerText= "delete"
|
||||
var li = document.createElement("li")
|
||||
li.appendChild(label)
|
||||
li.appendChild(input)
|
||||
li.appendChild(button)
|
||||
li.setAttribute("id", "li["+id+"]")
|
||||
var ul = document.getElementById("basket")
|
||||
ul.appendChild(li)
|
||||
}
|
||||
|
||||
function removeCake(id){
|
||||
document.getElementById("li["+id+"]").remove()
|
||||
}
|
||||
|
||||
{{range .Order.Cakes}}
|
||||
addCake({{.ID}}, '{{.Name}} {{.Price}}', {{.Amount}})
|
||||
{{end}}
|
||||
</script>
|
||||
Loading…
Add table
Add a link
Reference in a new issue