FIX: warnings
This commit is contained in:
parent
67807992bc
commit
c32ecbff8f
57 changed files with 1898 additions and 21 deletions
|
|
@ -10,7 +10,7 @@ import (
|
|||
//go:embed templates/login.html
|
||||
var loginHTML string
|
||||
|
||||
func getLogin(w http.ResponseWriter, r *http.Request) {
|
||||
func getLogin(w http.ResponseWriter, _ *http.Request) {
|
||||
w.Header().Set("content-type", "text/html")
|
||||
fmt.Fprint(w, loginHTML)
|
||||
return
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import (
|
|||
"github.com/Bronku/iroon/internal/models"
|
||||
)
|
||||
|
||||
func (h *Server) orders(r *http.Request) (any, int, error) {
|
||||
func (h *Server) orders(_ *http.Request) (any, int, error) {
|
||||
//r.URL.Query().Get()
|
||||
orders, err := h.s.GetTopOrders(time.Now(), time.Now().Add(time.Hour*24))
|
||||
data := struct {
|
||||
|
|
@ -35,7 +35,7 @@ func (h *Server) ordersSearch(r *http.Request) (any, int, error) {
|
|||
return data, http.StatusOK, err
|
||||
}
|
||||
|
||||
func (h *Server) cakes(r *http.Request) (any, int, error) {
|
||||
func (h *Server) cakes(_ *http.Request) (any, int, error) {
|
||||
data, err := h.s.GetCakes()
|
||||
return data, http.StatusOK, err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package server
|
|||
|
||||
import "net/http"
|
||||
|
||||
func (s *Server) redirect(path string, code int) http.HandlerFunc {
|
||||
func (h *Server) redirect(path string, code int) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
http.Redirect(w, r, path, code)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ func (h *Server) loadTemplates() {
|
|||
h.tmpl = make(map[string]*template.Template)
|
||||
for _, page := range h.routes {
|
||||
tmpl, err := template.ParseFS(templates,
|
||||
"templates/layout/*.html",
|
||||
"templates/"+page.template+".html",
|
||||
"templates/layout/*.gohtml",
|
||||
"templates/"+page.template+".gohtml",
|
||||
)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
|
|
@ -26,14 +26,14 @@ func (h *Server) loadTemplates() {
|
|||
}
|
||||
}
|
||||
|
||||
func (s *Server) render(fetch fetcher, templateFile string, templateEntry string) http.HandlerFunc {
|
||||
func (h *Server) render(fetch fetcher, templateFile string, templateEntry string) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
data, code, err := fetch(r)
|
||||
if err != nil {
|
||||
logging.ErrorPage(err, code).ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
err = s.tmpl[templateFile].ExecuteTemplate(w, templateEntry, data)
|
||||
err = h.tmpl[templateFile].ExecuteTemplate(w, templateEntry, data)
|
||||
if err != nil {
|
||||
logging.ErrorPage(err, http.StatusInternalServerError).ServeHTTP(w, r)
|
||||
return
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ func (s *Store) searchCakes(id int) (int, error) {
|
|||
|
||||
func (s *Store) GetCake(id int) (models.Cake, error) {
|
||||
if id <= 0 {
|
||||
return models.Cake{}, errors.New("Invalid cake id")
|
||||
return models.Cake{}, errors.New("invalid cake id")
|
||||
}
|
||||
|
||||
i, err := s.searchCakes(id)
|
||||
|
|
@ -83,11 +83,6 @@ func (s *Store) updateCake(newCake models.Cake) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
// #todo: implement
|
||||
func (s *Store) SyncCakes() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Store) SaveCake(newCake models.Cake) (int, error) {
|
||||
if newCake.ID != 0 {
|
||||
return newCake.ID, s.updateCake(newCake)
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@ func (s *Store) loadFile(file string) {
|
|||
}
|
||||
|
||||
func (s *Store) loadMigrations() {
|
||||
migration_files, _ := migrations.ReadDir("migrations")
|
||||
migrationFiles, _ := migrations.ReadDir("migrations")
|
||||
|
||||
for _, e := range migration_files {
|
||||
for _, e := range migrationFiles {
|
||||
s.loadFile(e.Name())
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ import (
|
|||
|
||||
func (s *Store) parseOrderRow(row *sql.Rows) (models.Order, error) {
|
||||
var out models.Order
|
||||
var order_date, delivery_date string
|
||||
err := row.Scan(&out.ID, &out.Name, &out.Surname, &out.Phone, &out.Location, &order_date, &delivery_date, &out.Status, &out.Paid)
|
||||
var orderDate, deliveryDate string
|
||||
err := row.Scan(&out.ID, &out.Name, &out.Surname, &out.Phone, &out.Location, &orderDate, &deliveryDate, &out.Status, &out.Paid)
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
out.Accepted, _ = time.Parse("2006-01-02 15:04", order_date)
|
||||
out.Date, _ = time.Parse("2006-01-02 15:04", delivery_date)
|
||||
out.Accepted, _ = time.Parse("2006-01-02 15:04", orderDate)
|
||||
out.Date, _ = time.Parse("2006-01-02 15:04", deliveryDate)
|
||||
|
||||
out.Cakes = make([]models.Cake, 0)
|
||||
rows, err := s.db.Query("select cake, amount from ordered_cake where customer_order = ?;", out.ID)
|
||||
|
|
@ -122,7 +122,7 @@ func (s *Store) SaveOrder(newOrder models.Order) (int, error) {
|
|||
|
||||
if !row.Next() {
|
||||
_ = tx.Rollback()
|
||||
return 0, errors.New("The database didn't respond with an id")
|
||||
return 0, errors.New("the database didn't respond with an id")
|
||||
}
|
||||
err = row.Scan(&newOrder.ID)
|
||||
if err != nil {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue