From 3136739f4efd3d5988d39e36704465eb506cb4b9 Mon Sep 17 00:00:00 2001 From: bronku Date: Mon, 31 Mar 2025 07:32:17 +0200 Subject: [PATCH] labels --- TODO.md | 2 +- foo.db | Bin 73728 -> 73728 bytes internal/auth/templates/login.html | 8 +- internal/crypto/crypto.go | 2 +- internal/server/post.go | 2 +- internal/server/templates/cake.gohtml | 16 +- .../server/templates/layout/layout.gohtml | 3 +- internal/server/templates/order.gohtml | 178 ++++++----- internal/server/templates/orders.gohtml | 8 +- internal/store/order.go | 1 - internal/store/store_test.go | 6 +- out/production/iroon/.gitignore | 31 -- out/production/iroon/README.md | 3 - out/production/iroon/TODO.md | 138 --------- out/production/iroon/cmd/iroon/main.go | 26 -- out/production/iroon/foo.db | Bin 73728 -> 0 bytes out/production/iroon/go.mod | 12 - out/production/iroon/go.sum | 8 - out/production/iroon/internal/auth/auth.go | 48 --- .../iroon/internal/auth/credentials.go | 19 -- out/production/iroon/internal/auth/get.go | 17 - out/production/iroon/internal/auth/session.go | 52 ---- .../iroon/internal/auth/templates/login.html | 12 - out/production/iroon/internal/auth/token.go | 30 -- .../iroon/internal/crypto/crypto.go | 21 -- .../iroon/internal/logging/error.go | 13 - .../iroon/internal/logging/logger.go | 16 - out/production/iroon/internal/models/auth.go | 8 - out/production/iroon/internal/models/data.go | 33 -- out/production/iroon/internal/models/user.go | 6 - .../iroon/internal/server/fetcher.go | 5 - out/production/iroon/internal/server/get.go | 4 +- out/production/iroon/internal/server/http.go | 9 - out/production/iroon/internal/server/post.go | 81 ----- .../iroon/internal/server/server.go | 63 ---- .../iroon/internal/server/static/htmx2.04.js | 1 - .../iroon/internal/server/template.go | 43 --- .../iroon/internal/server/templates/cake.html | 30 -- .../internal/server/templates/cakes.html | 25 -- .../server/templates/confirmation.html | 8 - .../server/templates/layout/layout.html | 17 - .../internal/server/templates/layout/nav.html | 6 - .../internal/server/templates/order.html | 90 ------ .../internal/server/templates/orders.html | 51 --- out/production/iroon/internal/store/cake.go | 112 ------- .../iroon/internal/store/migrations.go | 49 --- .../iroon/internal/store/migrations/1.sql | 112 ------- out/production/iroon/internal/store/order.go | 153 --------- .../iroon/internal/store/session.go | 52 ---- out/production/iroon/internal/store/store.go | 43 --- .../iroon/internal/store/store_test.go | 293 ------------------ out/production/iroon/internal/store/user.go | 48 --- out/production/iroon/main.go | 7 - 53 files changed, 129 insertions(+), 1892 deletions(-) delete mode 100644 out/production/iroon/.gitignore delete mode 100644 out/production/iroon/README.md delete mode 100644 out/production/iroon/TODO.md delete mode 100644 out/production/iroon/cmd/iroon/main.go delete mode 100644 out/production/iroon/foo.db delete mode 100644 out/production/iroon/go.mod delete mode 100644 out/production/iroon/go.sum delete mode 100644 out/production/iroon/internal/auth/auth.go delete mode 100644 out/production/iroon/internal/auth/credentials.go delete mode 100644 out/production/iroon/internal/auth/get.go delete mode 100644 out/production/iroon/internal/auth/session.go delete mode 100644 out/production/iroon/internal/auth/templates/login.html delete mode 100644 out/production/iroon/internal/auth/token.go delete mode 100644 out/production/iroon/internal/crypto/crypto.go delete mode 100644 out/production/iroon/internal/logging/error.go delete mode 100644 out/production/iroon/internal/logging/logger.go delete mode 100644 out/production/iroon/internal/models/auth.go delete mode 100644 out/production/iroon/internal/models/data.go delete mode 100644 out/production/iroon/internal/models/user.go delete mode 100644 out/production/iroon/internal/server/fetcher.go delete mode 100644 out/production/iroon/internal/server/http.go delete mode 100644 out/production/iroon/internal/server/post.go delete mode 100644 out/production/iroon/internal/server/server.go delete mode 100644 out/production/iroon/internal/server/static/htmx2.04.js delete mode 100644 out/production/iroon/internal/server/template.go delete mode 100644 out/production/iroon/internal/server/templates/cake.html delete mode 100644 out/production/iroon/internal/server/templates/cakes.html delete mode 100644 out/production/iroon/internal/server/templates/confirmation.html delete mode 100644 out/production/iroon/internal/server/templates/layout/layout.html delete mode 100644 out/production/iroon/internal/server/templates/layout/nav.html delete mode 100644 out/production/iroon/internal/server/templates/order.html delete mode 100644 out/production/iroon/internal/server/templates/orders.html delete mode 100644 out/production/iroon/internal/store/cake.go delete mode 100644 out/production/iroon/internal/store/migrations.go delete mode 100644 out/production/iroon/internal/store/migrations/1.sql delete mode 100644 out/production/iroon/internal/store/order.go delete mode 100644 out/production/iroon/internal/store/session.go delete mode 100644 out/production/iroon/internal/store/store.go delete mode 100644 out/production/iroon/internal/store/store_test.go delete mode 100644 out/production/iroon/internal/store/user.go delete mode 100644 out/production/iroon/main.go diff --git a/TODO.md b/TODO.md index 39c79c9..5781858 100644 --- a/TODO.md +++ b/TODO.md @@ -28,7 +28,7 @@ ## Security - [x] Authentication System - - [x] Persistant logins accross server restarts + - [x] Persistent logins across server restarts - [x] User login - [ ] User logout - [ ] Role-based access (admin, staff) diff --git a/foo.db b/foo.db index f04266169c9971a42f6591a79313cf6dc5331f48..c5879bece89ed936c6f3676cea8d3ae4a8ade01b 100644 GIT binary patch delta 199 zcmZoTz|wGlWr8%L&qNt#MxTud*Znw*4HXOwt&EK)Pw;hm0Gt=a@_yBexi0tIM@hZancNhfuD;fCb^UvUa%-_l1$X_{GAVG|Yec;bz1i8oT3I(g&X?T)0Fu)ySO5S3 diff --git a/internal/auth/templates/login.html b/internal/auth/templates/login.html index 78977e5..b92c576 100644 --- a/internal/auth/templates/login.html +++ b/internal/auth/templates/login.html @@ -4,9 +4,13 @@
- + - +
diff --git a/internal/crypto/crypto.go b/internal/crypto/crypto.go index aaad767..8863c67 100644 --- a/internal/crypto/crypto.go +++ b/internal/crypto/crypto.go @@ -15,7 +15,7 @@ func PasswordHash(password, salt string) string { func GenerateKey() string { key := [32]byte{} if _, err := rand.Read(key[:]); err != nil { - log.Fatal("can't generate a vaild key", err) + log.Fatal("can't generate a valid key", err) } return base64.StdEncoding.EncodeToString(key[:]) } diff --git a/internal/server/post.go b/internal/server/post.go index 107a2f1..a0353d3 100644 --- a/internal/server/post.go +++ b/internal/server/post.go @@ -27,7 +27,7 @@ func (h *Server) postCake(r *http.Request) (any, int, error) { return nil, http.StatusBadRequest, err } n.Category = r.FormValue("category") - n.Availability = r.FormValue("availibility") + n.Availability = r.FormValue("availability") n.ID, err = h.s.SaveCake(n) fmt.Println(err) return n, http.StatusAccepted, err diff --git a/internal/server/templates/cake.gohtml b/internal/server/templates/cake.gohtml index d372762..95c4719 100644 --- a/internal/server/templates/cake.gohtml +++ b/internal/server/templates/cake.gohtml @@ -6,20 +6,26 @@ Cake {{.ID}}

Info

- + - + - + - - diff --git a/internal/server/templates/layout/layout.gohtml b/internal/server/templates/layout/layout.gohtml index 8e6b1c8..1c557cd 100644 --- a/internal/server/templates/layout/layout.gohtml +++ b/internal/server/templates/layout/layout.gohtml @@ -1,9 +1,10 @@ {{define "layout"}} - + {{template "title" .}} + diff --git a/internal/server/templates/order.gohtml b/internal/server/templates/order.gohtml index 11a2ae8..23033c3 100644 --- a/internal/server/templates/order.gohtml +++ b/internal/server/templates/order.gohtml @@ -2,89 +2,105 @@ Order {{.Order.ID}} {{end}} {{define "main"}} -
- - {{with .Order}} -
-

Info

- - - - - - - - - - - - - - - -
-
-

Basket

-
    -
-
- {{end}} - {{with .Catalogue}} -
-

Catalogue

-
    - {{range .}} -
  • - {{.Name}} {{.Price}} -
    • - {{end}} -
-
- {{end}} - - -
- + {{end}} + {{end}} diff --git a/internal/server/templates/orders.gohtml b/internal/server/templates/orders.gohtml index 574696e..740ce2d 100644 --- a/internal/server/templates/orders.gohtml +++ b/internal/server/templates/orders.gohtml @@ -4,13 +4,15 @@ {{end}} {{define "main"}}
-
- + + - +
Searching... diff --git a/internal/store/order.go b/internal/store/order.go index 38e5e68..3346ed2 100644 --- a/internal/store/order.go +++ b/internal/store/order.go @@ -48,7 +48,6 @@ func (s *Store) getOrdersFromQuery(query string, args ...any) ([]models.Order, e var out []models.Order rows, err := s.db.Query(query, args...) if err != nil { - fmt.Println("gofq", err) return out, err } defer rows.Close() diff --git a/internal/store/store_test.go b/internal/store/store_test.go index b36100a..a3a6512 100644 --- a/internal/store/store_test.go +++ b/internal/store/store_test.go @@ -63,7 +63,7 @@ func TestStore(t *testing.T) { updatedCake.ID = 10 _, err = s.SaveCake(updatedCake) if err == nil { - t.Error("did not return an error when attempted to update non existant cake") + t.Error("did not return an error when attempted to update non existent cake") } // get cakes @@ -105,7 +105,7 @@ func TestStore(t *testing.T) { selectedCake, err = s.GetCake(-1) if err == nil { - t.Error("no error getting a non-existant cake") + t.Error("no error getting a non-existent cake") } // create new order @@ -166,7 +166,7 @@ func TestStore(t *testing.T) { updatedOrder.ID = 10 _, err = s.SaveOrder(updatedOrder) if err == nil { - t.Error("did not return an error when attempted to update non existant cake") + t.Error("did not return an error when attempted to update non existent cake") } // get orders diff --git a/out/production/iroon/.gitignore b/out/production/iroon/.gitignore deleted file mode 100644 index 2405df8..0000000 --- a/out/production/iroon/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -# If you prefer the allow list template instead of the deny list, see community template: -# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore -# -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib -*.DS_Store - -# Test binary, built with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - -# Dependency directories (remove the comment below to include it) -# vendor/ - -# Go workspace file -go.work -go.work.sum - -# env file -.env -.idea - -tmp -tmp/main -foo.db.bak diff --git a/out/production/iroon/README.md b/out/production/iroon/README.md deleted file mode 100644 index bacf93c..0000000 --- a/out/production/iroon/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# order tracking app for a pastry shop - -I don't remember what iroon stood for diff --git a/out/production/iroon/TODO.md b/out/production/iroon/TODO.md deleted file mode 100644 index 39c79c9..0000000 --- a/out/production/iroon/TODO.md +++ /dev/null @@ -1,138 +0,0 @@ -# TODO List for Iroon Project - -## Critical Features - -- [x] Database Implementation - - - [x] Init mode to create a new db - - [x] Set up SQLite database - - [x] Create proper schemas - - [x] Implement data persistence - - [x] Add database migrations - - [x] Add database caching - -- [ ] Input Validation - - - [ ] Phone number format validation - - [ ] Required fields validation - - [ ] Date validation (no past dates) - - [ ] Cake amount limits - - [ ] Form validation feedback - -- [ ] Price Management - - [ ] Calculate order totals - - [x] Handle partial payments - - [ ] Add payment status tracking - - [ ] Implement payment validation - -## Security - -- [x] Authentication System - - [x] Persistant logins accross server restarts - - [x] User login - - [ ] User logout - - [ ] Role-based access (admin, staff) - - [x] Password hashing -- [ ] CSRF Protection -- [ ] Input Sanitization -- [x] Session Management - -## UI/UX Improvements - -- [ ] Add CSS Styling - - [ ] Responsive design - - [ ] Dark/Light theme - - [ ] Print-friendly styles -- [ ] Improve Navigation -- [ ] Add Loading States -- [x] Confirmation Dialogs -- [ ] Form Autosave -- [x] Success/Error Notifications - -## Order Management - -- [x] Order Status System -- [ ] Order Search & Filtering - - [ ] By date range - - [ ] By status - - [ ] By customer -- [ ] Order History -- [ ] Order Notes/Comments -- [ ] Bulk Order Operations - -## Inventory Management - -- [ ] Track Ingredients -- [ ] Low Stock Alerts -- [x] Cake Catalog Management - - [x] Add/Edit/Delete cakes - - [x] Cake categories - - [ ] Multiple categories for each cake - - [ ] Cake images -- [x] Seasonal Menu Items - -## Reporting & Analytics - -- [ ] Sales Reports -- [ ] Popular Items -- [ ] Customer Analytics -- [ ] Revenue Reports -- [ ] Export Data (CSV/PDF) - -## Customer Features - -- [ ] Customer Accounts -- [ ] Order History -- [ ] Favorite Items -- [ ] Loyalty Program -- [ ] Reviews & Ratings - -## Communication - -- [ ] Email Notifications - - [ ] Order confirmation - - [ ] Status updates - - [ ] Payment reminders -- [ ] SMS Notifications -- [ ] Print Order Slips - -## Additional Features - -- [ ] Calendar View - - [ ] Daily orders - - [ ] Capacity planning -- [ ] Delivery Management - - [ ] Delivery zones - - [ ] Delivery fees - - [ ] Driver assignments -- [ ] Special Requirements - - [ ] Allergies - - [ ] Custom decorations - - [ ] Special messages -- [ ] Multi-language Support -- [ ] Backup System - -## Technical Improvements - -- [ ] Error Handling - - [ ] Proper error logging - - [ ] User-friendly error messages - - [ ] A better way to handle the error page -- [ ] Performance Optimization -- [ ] API Documentation -- [ ] Unit Tests -- [ ] Integration Tests -- [x] File structure -- [x] Embed templates -- [x] Single init function for handler - -## Future Considerations - -- [ ] Mobile App -- [ ] Online Payment Integration -- [ ] Integration with POS Systems -- [ ] Customer Feedback System -- [ ] Marketing Tools - - [ ] Promotions - - [ ] Discount codes - - [ ] Gift cards diff --git a/out/production/iroon/cmd/iroon/main.go b/out/production/iroon/cmd/iroon/main.go deleted file mode 100644 index 606bf14..0000000 --- a/out/production/iroon/cmd/iroon/main.go +++ /dev/null @@ -1,26 +0,0 @@ -package iroon - -import ( - "fmt" - "log" - "net/http" - - "github.com/Bronku/iroon/internal/auth" - "github.com/Bronku/iroon/internal/logging" - "github.com/Bronku/iroon/internal/server" - "github.com/Bronku/iroon/internal/store" -) - -func Run() { - s := store.OpenStore("./foo.db") - s.AddUser("admin", "secret") - defer s.Close() - h := server.New(s) - defer h.Close() - - var handler http.Handler = h - handler = logging.Middleware(handler) - handler = auth.New(s).Middleware(handler) - fmt.Println("starting server") - log.Fatal(http.ListenAndServe(":8080", handler)) -} diff --git a/out/production/iroon/foo.db b/out/production/iroon/foo.db deleted file mode 100644 index 174578b97207418a2dc5b10caee4d582e0eeab4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73728 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 0 { - delete(a.sessions, c.Value) - err := a.s.CleanSessions() - if err != nil { - fmt.Println("error cleaning the sessions", err) - } - return models.Token{}, errors.New("session expired") - } - return session, nil -} - -func (a *Authenticator) login(w http.ResponseWriter, r *http.Request) { - err := r.ParseForm() - if err != nil { - http.Redirect(w, r, "/login", http.StatusSeeOther) - return - } - login := r.PostFormValue("login") - password := r.PostFormValue("password") - if a.verifyCredentials(login, password) != nil { - http.Redirect(w, r, "/login", http.StatusSeeOther) - return - } - cookie, err := a.newSession(login) - if err != nil { - w.Header().Set("content-type", "text/html") - fmt.Fprint(w, "internal server error") - return - } - http.SetCookie(w, &cookie) - http.Redirect(w, r, "/", http.StatusFound) -} diff --git a/out/production/iroon/internal/auth/templates/login.html b/out/production/iroon/internal/auth/templates/login.html deleted file mode 100644 index 78977e5..0000000 --- a/out/production/iroon/internal/auth/templates/login.html +++ /dev/null @@ -1,12 +0,0 @@ -
-

Login

-
-
- - - - - - - -
diff --git a/out/production/iroon/internal/auth/token.go b/out/production/iroon/internal/auth/token.go deleted file mode 100644 index 3ae52f4..0000000 --- a/out/production/iroon/internal/auth/token.go +++ /dev/null @@ -1,30 +0,0 @@ -package auth - -import ( - "net/http" - "time" - - "github.com/Bronku/iroon/internal/crypto" - "github.com/Bronku/iroon/internal/models" -) - -func (a *Authenticator) newSession(user string) (http.Cookie, error) { - key := crypto.GenerateKey() - var session models.Token - var cookie http.Cookie - session.User = user - session.Expiration = time.Now().Add(time.Hour * 24) - a.sessions[key] = session - err := a.s.AddSession(key, user, session.Expiration) - if err != nil { - return cookie, err - } - - cookie.Name = "token" - cookie.Value = key - cookie.HttpOnly = true - cookie.SameSite = http.SameSiteStrictMode - cookie.Path = "/" - //cookie.Secure = true - return cookie, nil -} diff --git a/out/production/iroon/internal/crypto/crypto.go b/out/production/iroon/internal/crypto/crypto.go deleted file mode 100644 index aaad767..0000000 --- a/out/production/iroon/internal/crypto/crypto.go +++ /dev/null @@ -1,21 +0,0 @@ -package crypto - -import ( - "crypto/rand" - "encoding/base64" - "log" - - "golang.org/x/crypto/argon2" -) - -func PasswordHash(password, salt string) string { - return string(argon2.Key([]byte(password), []byte(salt), 3, 32*1024, 4, 32)) -} - -func GenerateKey() string { - key := [32]byte{} - if _, err := rand.Read(key[:]); err != nil { - log.Fatal("can't generate a vaild key", err) - } - return base64.StdEncoding.EncodeToString(key[:]) -} diff --git a/out/production/iroon/internal/logging/error.go b/out/production/iroon/internal/logging/error.go deleted file mode 100644 index 48799e7..0000000 --- a/out/production/iroon/internal/logging/error.go +++ /dev/null @@ -1,13 +0,0 @@ -package logging - -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()) - } -} diff --git a/out/production/iroon/internal/logging/logger.go b/out/production/iroon/internal/logging/logger.go deleted file mode 100644 index a409d14..0000000 --- a/out/production/iroon/internal/logging/logger.go +++ /dev/null @@ -1,16 +0,0 @@ -package logging - -import ( - "fmt" - "net/http" - "time" -) - -func Middleware(in http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - start := time.Now() - fmt.Println(r.Method, r.URL.String()) - in.ServeHTTP(w, r) - fmt.Println(r.Method, "finished in", time.Since(start)) - }) -} diff --git a/out/production/iroon/internal/models/auth.go b/out/production/iroon/internal/models/auth.go deleted file mode 100644 index 0e584f1..0000000 --- a/out/production/iroon/internal/models/auth.go +++ /dev/null @@ -1,8 +0,0 @@ -package models - -import "time" - -type Token struct { - User string - Expiration time.Time -} diff --git a/out/production/iroon/internal/models/data.go b/out/production/iroon/internal/models/data.go deleted file mode 100644 index 9b400c7..0000000 --- a/out/production/iroon/internal/models/data.go +++ /dev/null @@ -1,33 +0,0 @@ -package models - -import "time" - -type Cake struct { - Name string - ID int - Price int - Amount int - Category string - Availability string -} - -type Order struct { - ID int - Name string - Surname string - Phone string - Location string - Date time.Time - Accepted time.Time - Status string - Paid int // increments of 0.01 - Cakes []Cake -} - -func (o *Order) Total() int { - out := o.Paid * (-1) - for _, e := range o.Cakes { - out += e.Price * e.Amount - } - return out -} diff --git a/out/production/iroon/internal/models/user.go b/out/production/iroon/internal/models/user.go deleted file mode 100644 index 8841f56..0000000 --- a/out/production/iroon/internal/models/user.go +++ /dev/null @@ -1,6 +0,0 @@ -package models - -type User struct { - Password string - Salt string -} diff --git a/out/production/iroon/internal/server/fetcher.go b/out/production/iroon/internal/server/fetcher.go deleted file mode 100644 index e30bd1a..0000000 --- a/out/production/iroon/internal/server/fetcher.go +++ /dev/null @@ -1,5 +0,0 @@ -package server - -import "net/http" - -type fetcher func(r *http.Request) (any, int, error) diff --git a/out/production/iroon/internal/server/get.go b/out/production/iroon/internal/server/get.go index 2d450d4..17dda3a 100644 --- a/out/production/iroon/internal/server/get.go +++ b/out/production/iroon/internal/server/get.go @@ -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 } diff --git a/out/production/iroon/internal/server/http.go b/out/production/iroon/internal/server/http.go deleted file mode 100644 index 365d675..0000000 --- a/out/production/iroon/internal/server/http.go +++ /dev/null @@ -1,9 +0,0 @@ -package server - -import "net/http" - -func (s *Server) redirect(path string, code int) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - http.Redirect(w, r, path, code) - } -} diff --git a/out/production/iroon/internal/server/post.go b/out/production/iroon/internal/server/post.go deleted file mode 100644 index 107a2f1..0000000 --- a/out/production/iroon/internal/server/post.go +++ /dev/null @@ -1,81 +0,0 @@ -package server - -import ( - "fmt" - "net/http" - "strconv" - "strings" - "time" - - "github.com/Bronku/iroon/internal/models" -) - -func (h *Server) postCake(r *http.Request) (any, int, error) { - err := r.ParseForm() - if err != nil { - return nil, http.StatusInternalServerError, err - } - - var n models.Cake - n.ID, err = strconv.Atoi(r.FormValue("id")) - if err != nil { - return nil, http.StatusBadRequest, err - } - n.Name = r.FormValue("name") - n.Price, err = strconv.Atoi(r.FormValue("price")) - if err != nil { - return nil, http.StatusBadRequest, err - } - n.Category = r.FormValue("category") - n.Availability = r.FormValue("availibility") - n.ID, err = h.s.SaveCake(n) - fmt.Println(err) - return n, http.StatusAccepted, err -} - -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() - fmt.Println(r.PostForm) - if err != nil { - return nil, http.StatusBadRequest, err - } - - var n models.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([]models.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) - fmt.Println(n) - return n, http.StatusAccepted, err -} diff --git a/out/production/iroon/internal/server/server.go b/out/production/iroon/internal/server/server.go deleted file mode 100644 index 61a6a86..0000000 --- a/out/production/iroon/internal/server/server.go +++ /dev/null @@ -1,63 +0,0 @@ -package server - -import ( - "embed" - "html/template" - "net/http" - - "github.com/Bronku/iroon/internal/store" -) - -type Server struct { - tmpl map[string]*template.Template - s *store.Store - routes map[string]route - http.Handler -} - -type route struct { - function fetcher - template string - templateEntry string -} - -func (h *Server) Close() { -} - -//go:embed static/* -var static embed.FS - -func (h *Server) loadHandler() { - mux := http.NewServeMux() - - for i, e := range h.routes { - mux.HandleFunc(i, h.render(e.function, e.template, e.templateEntry)) - } - - mux.HandleFunc("GET /", h.redirect("/orders", http.StatusSeeOther)) - - fs := http.FileServerFS(static) - mux.Handle("GET /static/", fs) - - h.Handler = mux -} - -func New(store *store.Store) *Server { - var server Server - - server.routes = map[string]route{ - "GET /order/": {server.order, "order", "layout"}, - "GET /orders": {server.orders, "orders", "layout"}, - "GET /orders/search/": {server.ordersSearch, "orders", "orders-table"}, - "GET /cake/": {server.cake, "cake", "layout"}, - "GET /cakes": {server.cakes, "cakes", "layout"}, - "POST /order/": {server.postOrder, "confirmation", "layout"}, - "POST /cake/": {server.postCake, "confirmation", "layout"}, - } - - server.loadTemplates() - server.s = store - server.loadHandler() - - return &server -} diff --git a/out/production/iroon/internal/server/static/htmx2.04.js b/out/production/iroon/internal/server/static/htmx2.04.js deleted file mode 100644 index 59937d7..0000000 --- a/out/production/iroon/internal/server/static/htmx2.04.js +++ /dev/null @@ -1 +0,0 @@ -var htmx=function(){"use strict";const Q={onLoad:null,process:null,on:null,off:null,trigger:null,ajax:null,find:null,findAll:null,closest:null,values:function(e,t){const n=cn(e,t||"post");return n.values},remove:null,addClass:null,removeClass:null,toggleClass:null,takeClass:null,swap:null,defineExtension:null,removeExtension:null,logAll:null,logNone:null,logger:null,config:{historyEnabled:true,historyCacheSize:10,refreshOnHistoryMiss:false,defaultSwapStyle:"innerHTML",defaultSwapDelay:0,defaultSettleDelay:20,includeIndicatorStyles:true,indicatorClass:"htmx-indicator",requestClass:"htmx-request",addedClass:"htmx-added",settlingClass:"htmx-settling",swappingClass:"htmx-swapping",allowEval:true,allowScriptTags:true,inlineScriptNonce:"",inlineStyleNonce:"",attributesToSettle:["class","style","width","height"],withCredentials:false,timeout:0,wsReconnectDelay:"full-jitter",wsBinaryType:"blob",disableSelector:"[hx-disable], [data-hx-disable]",scrollBehavior:"instant",defaultFocusScroll:false,getCacheBusterParam:false,globalViewTransitions:false,methodsThatUseUrlParams:["get","delete"],selfRequestsOnly:true,ignoreTitle:false,scrollIntoViewOnBoost:true,triggerSpecsCache:null,disableInheritance:false,responseHandling:[{code:"204",swap:false},{code:"[23]..",swap:true},{code:"[45]..",swap:false,error:true}],allowNestedOobSwaps:true},parseInterval:null,_:null,version:"2.0.4"};Q.onLoad=j;Q.process=kt;Q.on=ye;Q.off=be;Q.trigger=he;Q.ajax=Rn;Q.find=u;Q.findAll=x;Q.closest=g;Q.remove=z;Q.addClass=K;Q.removeClass=G;Q.toggleClass=W;Q.takeClass=Z;Q.swap=$e;Q.defineExtension=Fn;Q.removeExtension=Bn;Q.logAll=V;Q.logNone=_;Q.parseInterval=d;Q._=e;const n={addTriggerHandler:St,bodyContains:le,canAccessLocalStorage:B,findThisElement:Se,filterValues:hn,swap:$e,hasAttribute:s,getAttributeValue:te,getClosestAttributeValue:re,getClosestMatch:o,getExpressionVars:En,getHeaders:fn,getInputValues:cn,getInternalData:ie,getSwapSpecification:gn,getTriggerSpecs:st,getTarget:Ee,makeFragment:P,mergeObjects:ce,makeSettleInfo:xn,oobSwap:He,querySelectorExt:ae,settleImmediately:Kt,shouldCancel:ht,triggerEvent:he,triggerErrorEvent:fe,withExtensions:Ft};const r=["get","post","put","delete","patch"];const H=r.map(function(e){return"[hx-"+e+"], [data-hx-"+e+"]"}).join(", ");function d(e){if(e==undefined){return undefined}let t=NaN;if(e.slice(-2)=="ms"){t=parseFloat(e.slice(0,-2))}else if(e.slice(-1)=="s"){t=parseFloat(e.slice(0,-1))*1e3}else if(e.slice(-1)=="m"){t=parseFloat(e.slice(0,-1))*1e3*60}else{t=parseFloat(e)}return isNaN(t)?undefined:t}function ee(e,t){return e instanceof Element&&e.getAttribute(t)}function s(e,t){return!!e.hasAttribute&&(e.hasAttribute(t)||e.hasAttribute("data-"+t))}function te(e,t){return ee(e,t)||ee(e,"data-"+t)}function c(e){const t=e.parentElement;if(!t&&e.parentNode instanceof ShadowRoot)return e.parentNode;return t}function ne(){return document}function m(e,t){return e.getRootNode?e.getRootNode({composed:t}):ne()}function o(e,t){while(e&&!t(e)){e=c(e)}return e||null}function i(e,t,n){const r=te(t,n);const o=te(t,"hx-disinherit");var i=te(t,"hx-inherit");if(e!==t){if(Q.config.disableInheritance){if(i&&(i==="*"||i.split(" ").indexOf(n)>=0)){return r}else{return null}}if(o&&(o==="*"||o.split(" ").indexOf(n)>=0)){return"unset"}}return r}function re(t,n){let r=null;o(t,function(e){return!!(r=i(t,ue(e),n))});if(r!=="unset"){return r}}function h(e,t){const n=e instanceof Element&&(e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.webkitMatchesSelector||e.oMatchesSelector);return!!n&&n.call(e,t)}function T(e){const t=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i;const n=t.exec(e);if(n){return n[1].toLowerCase()}else{return""}}function q(e){const t=new DOMParser;return t.parseFromString(e,"text/html")}function L(e,t){while(t.childNodes.length>0){e.append(t.childNodes[0])}}function A(e){const t=ne().createElement("script");se(e.attributes,function(e){t.setAttribute(e.name,e.value)});t.textContent=e.textContent;t.async=false;if(Q.config.inlineScriptNonce){t.nonce=Q.config.inlineScriptNonce}return t}function N(e){return e.matches("script")&&(e.type==="text/javascript"||e.type==="module"||e.type==="")}function I(e){Array.from(e.querySelectorAll("script")).forEach(e=>{if(N(e)){const t=A(e);const n=e.parentNode;try{n.insertBefore(t,e)}catch(e){O(e)}finally{e.remove()}}})}function P(e){const t=e.replace(/]*)?>[\s\S]*?<\/head>/i,"");const n=T(t);let r;if(n==="html"){r=new DocumentFragment;const i=q(e);L(r,i.body);r.title=i.title}else if(n==="body"){r=new DocumentFragment;const i=q(t);L(r,i.body);r.title=i.title}else{const i=q('");r=i.querySelector("template").content;r.title=i.title;var o=r.querySelector("title");if(o&&o.parentNode===r){o.remove();r.title=o.innerText}}if(r){if(Q.config.allowScriptTags){I(r)}else{r.querySelectorAll("script").forEach(e=>e.remove())}}return r}function oe(e){if(e){e()}}function t(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"}function k(e){return typeof e==="function"}function D(e){return t(e,"Object")}function ie(e){const t="htmx-internal-data";let n=e[t];if(!n){n=e[t]={}}return n}function M(t){const n=[];if(t){for(let e=0;e=0}function le(e){return e.getRootNode({composed:true})===document}function F(e){return e.trim().split(/\s+/)}function ce(e,t){for(const n in t){if(t.hasOwnProperty(n)){e[n]=t[n]}}return e}function S(e){try{return JSON.parse(e)}catch(e){O(e);return null}}function B(){const e="htmx:localStorageTest";try{localStorage.setItem(e,e);localStorage.removeItem(e);return true}catch(e){return false}}function U(t){try{const e=new URL(t);if(e){t=e.pathname+e.search}if(!/^\/$/.test(t)){t=t.replace(/\/+$/,"")}return t}catch(e){return t}}function e(e){return vn(ne().body,function(){return eval(e)})}function j(t){const e=Q.on("htmx:load",function(e){t(e.detail.elt)});return e}function V(){Q.logger=function(e,t,n){if(console){console.log(t,e,n)}}}function _(){Q.logger=null}function u(e,t){if(typeof e!=="string"){return e.querySelector(t)}else{return u(ne(),e)}}function x(e,t){if(typeof e!=="string"){return e.querySelectorAll(t)}else{return x(ne(),e)}}function E(){return window}function z(e,t){e=y(e);if(t){E().setTimeout(function(){z(e);e=null},t)}else{c(e).removeChild(e)}}function ue(e){return e instanceof Element?e:null}function $(e){return e instanceof HTMLElement?e:null}function J(e){return typeof e==="string"?e:null}function f(e){return e instanceof Element||e instanceof Document||e instanceof DocumentFragment?e:null}function K(e,t,n){e=ue(y(e));if(!e){return}if(n){E().setTimeout(function(){K(e,t);e=null},n)}else{e.classList&&e.classList.add(t)}}function G(e,t,n){let r=ue(y(e));if(!r){return}if(n){E().setTimeout(function(){G(r,t);r=null},n)}else{if(r.classList){r.classList.remove(t);if(r.classList.length===0){r.removeAttribute("class")}}}}function W(e,t){e=y(e);e.classList.toggle(t)}function Z(e,t){e=y(e);se(e.parentElement.children,function(e){G(e,t)});K(ue(e),t)}function g(e,t){e=ue(y(e));if(e&&e.closest){return e.closest(t)}else{do{if(e==null||h(e,t)){return e}}while(e=e&&ue(c(e)));return null}}function l(e,t){return e.substring(0,t.length)===t}function Y(e,t){return e.substring(e.length-t.length)===t}function ge(e){const t=e.trim();if(l(t,"<")&&Y(t,"/>")){return t.substring(1,t.length-2)}else{return t}}function p(t,r,n){if(r.indexOf("global ")===0){return p(t,r.slice(7),true)}t=y(t);const o=[];{let t=0;let n=0;for(let e=0;e"){t--}}if(n0){const r=ge(o.shift());let e;if(r.indexOf("closest ")===0){e=g(ue(t),ge(r.substr(8)))}else if(r.indexOf("find ")===0){e=u(f(t),ge(r.substr(5)))}else if(r==="next"||r==="nextElementSibling"){e=ue(t).nextElementSibling}else if(r.indexOf("next ")===0){e=pe(t,ge(r.substr(5)),!!n)}else if(r==="previous"||r==="previousElementSibling"){e=ue(t).previousElementSibling}else if(r.indexOf("previous ")===0){e=me(t,ge(r.substr(9)),!!n)}else if(r==="document"){e=document}else if(r==="window"){e=window}else if(r==="body"){e=document.body}else if(r==="root"){e=m(t,!!n)}else if(r==="host"){e=t.getRootNode().host}else{s.push(r)}if(e){i.push(e)}}if(s.length>0){const e=s.join(",");const c=f(m(t,!!n));i.push(...M(c.querySelectorAll(e)))}return i}var pe=function(t,e,n){const r=f(m(t,n)).querySelectorAll(e);for(let e=0;e=0;e--){const o=r[e];if(o.compareDocumentPosition(t)===Node.DOCUMENT_POSITION_FOLLOWING){return o}}};function ae(e,t){if(typeof e!=="string"){return p(e,t)[0]}else{return p(ne().body,e)[0]}}function y(e,t){if(typeof e==="string"){return u(f(t)||document,e)}else{return e}}function xe(e,t,n,r){if(k(t)){return{target:ne().body,event:J(e),listener:t,options:n}}else{return{target:y(e),event:J(t),listener:n,options:r}}}function ye(t,n,r,o){Vn(function(){const e=xe(t,n,r,o);e.target.addEventListener(e.event,e.listener,e.options)});const e=k(n);return e?n:r}function be(t,n,r){Vn(function(){const e=xe(t,n,r);e.target.removeEventListener(e.event,e.listener)});return k(n)?n:r}const ve=ne().createElement("output");function we(e,t){const n=re(e,t);if(n){if(n==="this"){return[Se(e,t)]}else{const r=p(e,n);if(r.length===0){O('The selector "'+n+'" on '+t+" returned no matches!");return[ve]}else{return r}}}}function Se(e,t){return ue(o(e,function(e){return te(ue(e),t)!=null}))}function Ee(e){const t=re(e,"hx-target");if(t){if(t==="this"){return Se(e,"hx-target")}else{return ae(e,t)}}else{const n=ie(e);if(n.boosted){return ne().body}else{return e}}}function Ce(t){const n=Q.config.attributesToSettle;for(let e=0;e0){s=e.substring(0,e.indexOf(":"));n=e.substring(e.indexOf(":")+1)}else{s=e}o.removeAttribute("hx-swap-oob");o.removeAttribute("data-hx-swap-oob");const r=p(t,n,false);if(r){se(r,function(e){let t;const n=o.cloneNode(true);t=ne().createDocumentFragment();t.appendChild(n);if(!Re(s,e)){t=f(n)}const r={shouldSwap:true,target:e,fragment:t};if(!he(e,"htmx:oobBeforeSwap",r))return;e=r.target;if(r.shouldSwap){qe(t);_e(s,e,e,t,i);Te()}se(i.elts,function(e){he(e,"htmx:oobAfterSwap",r)})});o.parentNode.removeChild(o)}else{o.parentNode.removeChild(o);fe(ne().body,"htmx:oobErrorNoTarget",{content:o})}return e}function Te(){const e=u("#--htmx-preserve-pantry--");if(e){for(const t of[...e.children]){const n=u("#"+t.id);n.parentNode.moveBefore(t,n);n.remove()}e.remove()}}function qe(e){se(x(e,"[hx-preserve], [data-hx-preserve]"),function(e){const t=te(e,"id");const n=ne().getElementById(t);if(n!=null){if(e.moveBefore){let e=u("#--htmx-preserve-pantry--");if(e==null){ne().body.insertAdjacentHTML("afterend","
");e=u("#--htmx-preserve-pantry--")}e.moveBefore(n,null)}else{e.parentNode.replaceChild(n,e)}}})}function Le(l,e,c){se(e.querySelectorAll("[id]"),function(t){const n=ee(t,"id");if(n&&n.length>0){const r=n.replace("'","\\'");const o=t.tagName.replace(":","\\:");const e=f(l);const i=e&&e.querySelector(o+"[id='"+r+"']");if(i&&i!==e){const s=t.cloneNode();Oe(t,i);c.tasks.push(function(){Oe(t,s)})}}})}function Ae(e){return function(){G(e,Q.config.addedClass);kt(ue(e));Ne(f(e));he(e,"htmx:load")}}function Ne(e){const t="[autofocus]";const n=$(h(e,t)?e:e.querySelector(t));if(n!=null){n.focus()}}function a(e,t,n,r){Le(e,n,r);while(n.childNodes.length>0){const o=n.firstChild;K(ue(o),Q.config.addedClass);e.insertBefore(o,t);if(o.nodeType!==Node.TEXT_NODE&&o.nodeType!==Node.COMMENT_NODE){r.tasks.push(Ae(o))}}}function Ie(e,t){let n=0;while(n0}function $e(e,t,r,o){if(!o){o={}}e=y(e);const i=o.contextElement?m(o.contextElement,false):ne();const n=document.activeElement;let s={};try{s={elt:n,start:n?n.selectionStart:null,end:n?n.selectionEnd:null}}catch(e){}const l=xn(e);if(r.swapStyle==="textContent"){e.textContent=t}else{let n=P(t);l.title=n.title;if(o.selectOOB){const u=o.selectOOB.split(",");for(let t=0;t0){E().setTimeout(c,r.settleDelay)}else{c()}}function Je(e,t,n){const r=e.getResponseHeader(t);if(r.indexOf("{")===0){const o=S(r);for(const i in o){if(o.hasOwnProperty(i)){let e=o[i];if(D(e)){n=e.target!==undefined?e.target:n}else{e={value:e}}he(n,i,e)}}}else{const s=r.split(",");for(let e=0;e0){const s=o[0];if(s==="]"){e--;if(e===0){if(n===null){t=t+"true"}o.shift();t+=")})";try{const l=vn(r,function(){return Function(t)()},function(){return true});l.source=t;return l}catch(e){fe(ne().body,"htmx:syntax:error",{error:e,source:t});return null}}}else if(s==="["){e++}if(tt(s,n,i)){t+="(("+i+"."+s+") ? ("+i+"."+s+") : (window."+s+"))"}else{t=t+s}n=o.shift()}}}function C(e,t){let n="";while(e.length>0&&!t.test(e[0])){n+=e.shift()}return n}function rt(e){let t;if(e.length>0&&Ye.test(e[0])){e.shift();t=C(e,Qe).trim();e.shift()}else{t=C(e,v)}return t}const ot="input, textarea, select";function it(e,t,n){const r=[];const o=et(t);do{C(o,w);const l=o.length;const c=C(o,/[,\[\s]/);if(c!==""){if(c==="every"){const u={trigger:"every"};C(o,w);u.pollInterval=d(C(o,/[,\[\s]/));C(o,w);var i=nt(e,o,"event");if(i){u.eventFilter=i}r.push(u)}else{const a={trigger:c};var i=nt(e,o,"event");if(i){a.eventFilter=i}C(o,w);while(o.length>0&&o[0]!==","){const f=o.shift();if(f==="changed"){a.changed=true}else if(f==="once"){a.once=true}else if(f==="consume"){a.consume=true}else if(f==="delay"&&o[0]===":"){o.shift();a.delay=d(C(o,v))}else if(f==="from"&&o[0]===":"){o.shift();if(Ye.test(o[0])){var s=rt(o)}else{var s=C(o,v);if(s==="closest"||s==="find"||s==="next"||s==="previous"){o.shift();const h=rt(o);if(h.length>0){s+=" "+h}}}a.from=s}else if(f==="target"&&o[0]===":"){o.shift();a.target=rt(o)}else if(f==="throttle"&&o[0]===":"){o.shift();a.throttle=d(C(o,v))}else if(f==="queue"&&o[0]===":"){o.shift();a.queue=C(o,v)}else if(f==="root"&&o[0]===":"){o.shift();a[f]=rt(o)}else if(f==="threshold"&&o[0]===":"){o.shift();a[f]=C(o,v)}else{fe(e,"htmx:syntax:error",{token:o.shift()})}C(o,w)}r.push(a)}}if(o.length===l){fe(e,"htmx:syntax:error",{token:o.shift()})}C(o,w)}while(o[0]===","&&o.shift());if(n){n[t]=r}return r}function st(e){const t=te(e,"hx-trigger");let n=[];if(t){const r=Q.config.triggerSpecsCache;n=r&&r[t]||it(e,t,r)}if(n.length>0){return n}else if(h(e,"form")){return[{trigger:"submit"}]}else if(h(e,'input[type="button"], input[type="submit"]')){return[{trigger:"click"}]}else if(h(e,ot)){return[{trigger:"change"}]}else{return[{trigger:"click"}]}}function lt(e){ie(e).cancelled=true}function ct(e,t,n){const r=ie(e);r.timeout=E().setTimeout(function(){if(le(e)&&r.cancelled!==true){if(!gt(n,e,Mt("hx:poll:trigger",{triggerSpec:n,target:e}))){t(e)}ct(e,t,n)}},n.pollInterval)}function ut(e){return location.hostname===e.hostname&&ee(e,"href")&&ee(e,"href").indexOf("#")!==0}function at(e){return g(e,Q.config.disableSelector)}function ft(t,n,e){if(t instanceof HTMLAnchorElement&&ut(t)&&(t.target===""||t.target==="_self")||t.tagName==="FORM"&&String(ee(t,"method")).toLowerCase()!=="dialog"){n.boosted=true;let r,o;if(t.tagName==="A"){r="get";o=ee(t,"href")}else{const i=ee(t,"method");r=i?i.toLowerCase():"get";o=ee(t,"action");if(o==null||o===""){o=ne().location.href}if(r==="get"&&o.includes("?")){o=o.replace(/\?[^#]+/,"")}}e.forEach(function(e){pt(t,function(e,t){const n=ue(e);if(at(n)){b(n);return}de(r,o,n,t)},n,e,true)})}}function ht(e,t){const n=ue(t);if(!n){return false}if(e.type==="submit"||e.type==="click"){if(n.tagName==="FORM"){return true}if(h(n,'input[type="submit"], button')&&(h(n,"[form]")||g(n,"form")!==null)){return true}if(n instanceof HTMLAnchorElement&&n.href&&(n.getAttribute("href")==="#"||n.getAttribute("href").indexOf("#")!==0)){return true}}return false}function dt(e,t){return ie(e).boosted&&e instanceof HTMLAnchorElement&&t.type==="click"&&(t.ctrlKey||t.metaKey)}function gt(e,t,n){const r=e.eventFilter;if(r){try{return r.call(t,n)!==true}catch(e){const o=r.source;fe(ne().body,"htmx:eventFilter:error",{error:e,source:o});return true}}return false}function pt(l,c,e,u,a){const f=ie(l);let t;if(u.from){t=p(l,u.from)}else{t=[l]}if(u.changed){if(!("lastValue"in f)){f.lastValue=new WeakMap}t.forEach(function(e){if(!f.lastValue.has(u)){f.lastValue.set(u,new WeakMap)}f.lastValue.get(u).set(e,e.value)})}se(t,function(i){const s=function(e){if(!le(l)){i.removeEventListener(u.trigger,s);return}if(dt(l,e)){return}if(a||ht(e,l)){e.preventDefault()}if(gt(u,l,e)){return}const t=ie(e);t.triggerSpec=u;if(t.handledFor==null){t.handledFor=[]}if(t.handledFor.indexOf(l)<0){t.handledFor.push(l);if(u.consume){e.stopPropagation()}if(u.target&&e.target){if(!h(ue(e.target),u.target)){return}}if(u.once){if(f.triggeredOnce){return}else{f.triggeredOnce=true}}if(u.changed){const n=event.target;const r=n.value;const o=f.lastValue.get(u);if(o.has(n)&&o.get(n)===r){return}o.set(n,r)}if(f.delayed){clearTimeout(f.delayed)}if(f.throttle){return}if(u.throttle>0){if(!f.throttle){he(l,"htmx:trigger");c(l,e);f.throttle=E().setTimeout(function(){f.throttle=null},u.throttle)}}else if(u.delay>0){f.delayed=E().setTimeout(function(){he(l,"htmx:trigger");c(l,e)},u.delay)}else{he(l,"htmx:trigger");c(l,e)}}};if(e.listenerInfos==null){e.listenerInfos=[]}e.listenerInfos.push({trigger:u.trigger,listener:s,on:i});i.addEventListener(u.trigger,s)})}let mt=false;let xt=null;function yt(){if(!xt){xt=function(){mt=true};window.addEventListener("scroll",xt);window.addEventListener("resize",xt);setInterval(function(){if(mt){mt=false;se(ne().querySelectorAll("[hx-trigger*='revealed'],[data-hx-trigger*='revealed']"),function(e){bt(e)})}},200)}}function bt(e){if(!s(e,"data-hx-revealed")&&X(e)){e.setAttribute("data-hx-revealed","true");const t=ie(e);if(t.initHash){he(e,"revealed")}else{e.addEventListener("htmx:afterProcessNode",function(){he(e,"revealed")},{once:true})}}}function vt(e,t,n,r){const o=function(){if(!n.loaded){n.loaded=true;he(e,"htmx:trigger");t(e)}};if(r>0){E().setTimeout(o,r)}else{o()}}function wt(t,n,e){let i=false;se(r,function(r){if(s(t,"hx-"+r)){const o=te(t,"hx-"+r);i=true;n.path=o;n.verb=r;e.forEach(function(e){St(t,e,n,function(e,t){const n=ue(e);if(g(n,Q.config.disableSelector)){b(n);return}de(r,o,n,t)})})}});return i}function St(r,e,t,n){if(e.trigger==="revealed"){yt();pt(r,n,t,e);bt(ue(r))}else if(e.trigger==="intersect"){const o={};if(e.root){o.root=ae(r,e.root)}if(e.threshold){o.threshold=parseFloat(e.threshold)}const i=new IntersectionObserver(function(t){for(let e=0;e0){t.polling=true;ct(ue(r),n,e)}else{pt(r,n,t,e)}}function Et(e){const t=ue(e);if(!t){return false}const n=t.attributes;for(let e=0;e", "+e).join(""));return o}else{return[]}}function Tt(e){const t=g(ue(e.target),"button, input[type='submit']");const n=Lt(e);if(n){n.lastButtonClicked=t}}function qt(e){const t=Lt(e);if(t){t.lastButtonClicked=null}}function Lt(e){const t=g(ue(e.target),"button, input[type='submit']");if(!t){return}const n=y("#"+ee(t,"form"),t.getRootNode())||g(t,"form");if(!n){return}return ie(n)}function At(e){e.addEventListener("click",Tt);e.addEventListener("focusin",Tt);e.addEventListener("focusout",qt)}function Nt(t,e,n){const r=ie(t);if(!Array.isArray(r.onHandlers)){r.onHandlers=[]}let o;const i=function(e){vn(t,function(){if(at(t)){return}if(!o){o=new Function("event",n)}o.call(t,e)})};t.addEventListener(e,i);r.onHandlers.push({event:e,listener:i})}function It(t){ke(t);for(let e=0;eQ.config.historyCacheSize){i.shift()}while(i.length>0){try{localStorage.setItem("htmx-history-cache",JSON.stringify(i));break}catch(e){fe(ne().body,"htmx:historyCacheError",{cause:e,cache:i});i.shift()}}}function Vt(t){if(!B()){return null}t=U(t);const n=S(localStorage.getItem("htmx-history-cache"))||[];for(let e=0;e=200&&this.status<400){he(ne().body,"htmx:historyCacheMissLoad",i);const e=P(this.response);const t=e.querySelector("[hx-history-elt],[data-hx-history-elt]")||e;const n=Ut();const r=xn(n);kn(e.title);qe(e);Ve(n,t,r);Te();Kt(r.tasks);Bt=o;he(ne().body,"htmx:historyRestore",{path:o,cacheMiss:true,serverResponse:this.response})}else{fe(ne().body,"htmx:historyCacheMissLoadError",i)}};e.send()}function Wt(e){zt();e=e||location.pathname+location.search;const t=Vt(e);if(t){const n=P(t.content);const r=Ut();const o=xn(r);kn(t.title);qe(n);Ve(r,n,o);Te();Kt(o.tasks);E().setTimeout(function(){window.scrollTo(0,t.scroll)},0);Bt=e;he(ne().body,"htmx:historyRestore",{path:e,item:t})}else{if(Q.config.refreshOnHistoryMiss){window.location.reload(true)}else{Gt(e)}}}function Zt(e){let t=we(e,"hx-indicator");if(t==null){t=[e]}se(t,function(e){const t=ie(e);t.requestCount=(t.requestCount||0)+1;e.classList.add.call(e.classList,Q.config.requestClass)});return t}function Yt(e){let t=we(e,"hx-disabled-elt");if(t==null){t=[]}se(t,function(e){const t=ie(e);t.requestCount=(t.requestCount||0)+1;e.setAttribute("disabled","");e.setAttribute("data-disabled-by-htmx","")});return t}function Qt(e,t){se(e.concat(t),function(e){const t=ie(e);t.requestCount=(t.requestCount||1)-1});se(e,function(e){const t=ie(e);if(t.requestCount===0){e.classList.remove.call(e.classList,Q.config.requestClass)}});se(t,function(e){const t=ie(e);if(t.requestCount===0){e.removeAttribute("disabled");e.removeAttribute("data-disabled-by-htmx")}})}function en(t,n){for(let e=0;en.indexOf(e)<0)}else{e=e.filter(e=>e!==n)}r.delete(t);se(e,e=>r.append(t,e))}}function on(t,n,r,o,i){if(o==null||en(t,o)){return}else{t.push(o)}if(tn(o)){const s=ee(o,"name");let e=o.value;if(o instanceof HTMLSelectElement&&o.multiple){e=M(o.querySelectorAll("option:checked")).map(function(e){return e.value})}if(o instanceof HTMLInputElement&&o.files){e=M(o.files)}nn(s,e,n);if(i){sn(o,r)}}if(o instanceof HTMLFormElement){se(o.elements,function(e){if(t.indexOf(e)>=0){rn(e.name,e.value,n)}else{t.push(e)}if(i){sn(e,r)}});new FormData(o).forEach(function(e,t){if(e instanceof File&&e.name===""){return}nn(t,e,n)})}}function sn(e,t){const n=e;if(n.willValidate){he(n,"htmx:validation:validate");if(!n.checkValidity()){t.push({elt:n,message:n.validationMessage,validity:n.validity});he(n,"htmx:validation:failed",{message:n.validationMessage,validity:n.validity})}}}function ln(n,e){for(const t of e.keys()){n.delete(t)}e.forEach(function(e,t){n.append(t,e)});return n}function cn(e,t){const n=[];const r=new FormData;const o=new FormData;const i=[];const s=ie(e);if(s.lastButtonClicked&&!le(s.lastButtonClicked)){s.lastButtonClicked=null}let l=e instanceof HTMLFormElement&&e.noValidate!==true||te(e,"hx-validate")==="true";if(s.lastButtonClicked){l=l&&s.lastButtonClicked.formNoValidate!==true}if(t!=="get"){on(n,o,i,g(e,"form"),l)}on(n,r,i,e,l);if(s.lastButtonClicked||e.tagName==="BUTTON"||e.tagName==="INPUT"&&ee(e,"type")==="submit"){const u=s.lastButtonClicked||e;const a=ee(u,"name");nn(a,u.value,o)}const c=we(e,"hx-include");se(c,function(e){on(n,r,i,ue(e),l);if(!h(e,"form")){se(f(e).querySelectorAll(ot),function(e){on(n,r,i,e,l)})}});ln(r,o);return{errors:i,formData:r,values:An(r)}}function un(e,t,n){if(e!==""){e+="&"}if(String(n)==="[object Object]"){n=JSON.stringify(n)}const r=encodeURIComponent(n);e+=encodeURIComponent(t)+"="+r;return e}function an(e){e=qn(e);let n="";e.forEach(function(e,t){n=un(n,t,e)});return n}function fn(e,t,n){const r={"HX-Request":"true","HX-Trigger":ee(e,"id"),"HX-Trigger-Name":ee(e,"name"),"HX-Target":te(t,"id"),"HX-Current-URL":ne().location.href};bn(e,"hx-headers",false,r);if(n!==undefined){r["HX-Prompt"]=n}if(ie(e).boosted){r["HX-Boosted"]="true"}return r}function hn(n,e){const t=re(e,"hx-params");if(t){if(t==="none"){return new FormData}else if(t==="*"){return n}else if(t.indexOf("not ")===0){se(t.slice(4).split(","),function(e){e=e.trim();n.delete(e)});return n}else{const r=new FormData;se(t.split(","),function(t){t=t.trim();if(n.has(t)){n.getAll(t).forEach(function(e){r.append(t,e)})}});return r}}else{return n}}function dn(e){return!!ee(e,"href")&&ee(e,"href").indexOf("#")>=0}function gn(e,t){const n=t||re(e,"hx-swap");const r={swapStyle:ie(e).boosted?"innerHTML":Q.config.defaultSwapStyle,swapDelay:Q.config.defaultSwapDelay,settleDelay:Q.config.defaultSettleDelay};if(Q.config.scrollIntoViewOnBoost&&ie(e).boosted&&!dn(e)){r.show="top"}if(n){const s=F(n);if(s.length>0){for(let e=0;e0?o.join(":"):null;r.scroll=u;r.scrollTarget=i}else if(l.indexOf("show:")===0){const a=l.slice(5);var o=a.split(":");const f=o.pop();var i=o.length>0?o.join(":"):null;r.show=f;r.showTarget=i}else if(l.indexOf("focus-scroll:")===0){const h=l.slice("focus-scroll:".length);r.focusScroll=h=="true"}else if(e==0){r.swapStyle=l}else{O("Unknown modifier in hx-swap: "+l)}}}}return r}function pn(e){return re(e,"hx-encoding")==="multipart/form-data"||h(e,"form")&&ee(e,"enctype")==="multipart/form-data"}function mn(t,n,r){let o=null;Ft(n,function(e){if(o==null){o=e.encodeParameters(t,r,n)}});if(o!=null){return o}else{if(pn(n)){return ln(new FormData,qn(r))}else{return an(r)}}}function xn(e){return{tasks:[],elts:[e]}}function yn(e,t){const n=e[0];const r=e[e.length-1];if(t.scroll){var o=null;if(t.scrollTarget){o=ue(ae(n,t.scrollTarget))}if(t.scroll==="top"&&(n||o)){o=o||n;o.scrollTop=0}if(t.scroll==="bottom"&&(r||o)){o=o||r;o.scrollTop=o.scrollHeight}}if(t.show){var o=null;if(t.showTarget){let e=t.showTarget;if(t.showTarget==="window"){e="body"}o=ue(ae(n,e))}if(t.show==="top"&&(n||o)){o=o||n;o.scrollIntoView({block:"start",behavior:Q.config.scrollBehavior})}if(t.show==="bottom"&&(r||o)){o=o||r;o.scrollIntoView({block:"end",behavior:Q.config.scrollBehavior})}}}function bn(r,e,o,i){if(i==null){i={}}if(r==null){return i}const s=te(r,e);if(s){let e=s.trim();let t=o;if(e==="unset"){return null}if(e.indexOf("javascript:")===0){e=e.slice(11);t=true}else if(e.indexOf("js:")===0){e=e.slice(3);t=true}if(e.indexOf("{")!==0){e="{"+e+"}"}let n;if(t){n=vn(r,function(){return Function("return ("+e+")")()},{})}else{n=S(e)}for(const l in n){if(n.hasOwnProperty(l)){if(i[l]==null){i[l]=n[l]}}}}return bn(ue(c(r)),e,o,i)}function vn(e,t,n){if(Q.config.allowEval){return t()}else{fe(e,"htmx:evalDisallowedError");return n}}function wn(e,t){return bn(e,"hx-vars",true,t)}function Sn(e,t){return bn(e,"hx-vals",false,t)}function En(e){return ce(wn(e),Sn(e))}function Cn(t,n,r){if(r!==null){try{t.setRequestHeader(n,r)}catch(e){t.setRequestHeader(n,encodeURIComponent(r));t.setRequestHeader(n+"-URI-AutoEncoded","true")}}}function On(t){if(t.responseURL&&typeof URL!=="undefined"){try{const e=new URL(t.responseURL);return e.pathname+e.search}catch(e){fe(ne().body,"htmx:badResponseUrl",{url:t.responseURL})}}}function R(e,t){return t.test(e.getAllResponseHeaders())}function Rn(t,n,r){t=t.toLowerCase();if(r){if(r instanceof Element||typeof r==="string"){return de(t,n,null,null,{targetOverride:y(r)||ve,returnPromise:true})}else{let e=y(r.target);if(r.target&&!e||r.source&&!e&&!y(r.source)){e=ve}return de(t,n,y(r.source),r.event,{handler:r.handler,headers:r.headers,values:r.values,targetOverride:e,swapOverride:r.swap,select:r.select,returnPromise:true})}}else{return de(t,n,null,null,{returnPromise:true})}}function Hn(e){const t=[];while(e){t.push(e);e=e.parentElement}return t}function Tn(e,t,n){let r;let o;if(typeof URL==="function"){o=new URL(t,document.location.href);const i=document.location.origin;r=i===o.origin}else{o=t;r=l(t,document.location.origin)}if(Q.config.selfRequestsOnly){if(!r){return false}}return he(e,"htmx:validateUrl",ce({url:o,sameHost:r},n))}function qn(e){if(e instanceof FormData)return e;const t=new FormData;for(const n in e){if(e.hasOwnProperty(n)){if(e[n]&&typeof e[n].forEach==="function"){e[n].forEach(function(e){t.append(n,e)})}else if(typeof e[n]==="object"&&!(e[n]instanceof Blob)){t.append(n,JSON.stringify(e[n]))}else{t.append(n,e[n])}}}return t}function Ln(r,o,e){return new Proxy(e,{get:function(t,e){if(typeof e==="number")return t[e];if(e==="length")return t.length;if(e==="push"){return function(e){t.push(e);r.append(o,e)}}if(typeof t[e]==="function"){return function(){t[e].apply(t,arguments);r.delete(o);t.forEach(function(e){r.append(o,e)})}}if(t[e]&&t[e].length===1){return t[e][0]}else{return t[e]}},set:function(e,t,n){e[t]=n;r.delete(o);e.forEach(function(e){r.append(o,e)});return true}})}function An(o){return new Proxy(o,{get:function(e,t){if(typeof t==="symbol"){const r=Reflect.get(e,t);if(typeof r==="function"){return function(){return r.apply(o,arguments)}}else{return r}}if(t==="toJSON"){return()=>Object.fromEntries(o)}if(t in e){if(typeof e[t]==="function"){return function(){return o[t].apply(o,arguments)}}else{return e[t]}}const n=o.getAll(t);if(n.length===0){return undefined}else if(n.length===1){return n[0]}else{return Ln(e,t,n)}},set:function(t,n,e){if(typeof n!=="string"){return false}t.delete(n);if(e&&typeof e.forEach==="function"){e.forEach(function(e){t.append(n,e)})}else if(typeof e==="object"&&!(e instanceof Blob)){t.append(n,JSON.stringify(e))}else{t.append(n,e)}return true},deleteProperty:function(e,t){if(typeof t==="string"){e.delete(t)}return true},ownKeys:function(e){return Reflect.ownKeys(Object.fromEntries(e))},getOwnPropertyDescriptor:function(e,t){return Reflect.getOwnPropertyDescriptor(Object.fromEntries(e),t)}})}function de(t,n,r,o,i,D){let s=null;let l=null;i=i!=null?i:{};if(i.returnPromise&&typeof Promise!=="undefined"){var e=new Promise(function(e,t){s=e;l=t})}if(r==null){r=ne().body}const M=i.handler||Dn;const X=i.select||null;if(!le(r)){oe(s);return e}const c=i.targetOverride||ue(Ee(r));if(c==null||c==ve){fe(r,"htmx:targetError",{target:te(r,"hx-target")});oe(l);return e}let u=ie(r);const a=u.lastButtonClicked;if(a){const L=ee(a,"formaction");if(L!=null){n=L}const A=ee(a,"formmethod");if(A!=null){if(A.toLowerCase()!=="dialog"){t=A}}}const f=re(r,"hx-confirm");if(D===undefined){const K=function(e){return de(t,n,r,o,i,!!e)};const G={target:c,elt:r,path:n,verb:t,triggeringEvent:o,etc:i,issueRequest:K,question:f};if(he(r,"htmx:confirm",G)===false){oe(s);return e}}let h=r;let d=re(r,"hx-sync");let g=null;let F=false;if(d){const N=d.split(":");const I=N[0].trim();if(I==="this"){h=Se(r,"hx-sync")}else{h=ue(ae(r,I))}d=(N[1]||"drop").trim();u=ie(h);if(d==="drop"&&u.xhr&&u.abortable!==true){oe(s);return e}else if(d==="abort"){if(u.xhr){oe(s);return e}else{F=true}}else if(d==="replace"){he(h,"htmx:abort")}else if(d.indexOf("queue")===0){const W=d.split(" ");g=(W[1]||"last").trim()}}if(u.xhr){if(u.abortable){he(h,"htmx:abort")}else{if(g==null){if(o){const P=ie(o);if(P&&P.triggerSpec&&P.triggerSpec.queue){g=P.triggerSpec.queue}}if(g==null){g="last"}}if(u.queuedRequests==null){u.queuedRequests=[]}if(g==="first"&&u.queuedRequests.length===0){u.queuedRequests.push(function(){de(t,n,r,o,i)})}else if(g==="all"){u.queuedRequests.push(function(){de(t,n,r,o,i)})}else if(g==="last"){u.queuedRequests=[];u.queuedRequests.push(function(){de(t,n,r,o,i)})}oe(s);return e}}const p=new XMLHttpRequest;u.xhr=p;u.abortable=F;const m=function(){u.xhr=null;u.abortable=false;if(u.queuedRequests!=null&&u.queuedRequests.length>0){const e=u.queuedRequests.shift();e()}};const B=re(r,"hx-prompt");if(B){var x=prompt(B);if(x===null||!he(r,"htmx:prompt",{prompt:x,target:c})){oe(s);m();return e}}if(f&&!D){if(!confirm(f)){oe(s);m();return e}}let y=fn(r,c,x);if(t!=="get"&&!pn(r)){y["Content-Type"]="application/x-www-form-urlencoded"}if(i.headers){y=ce(y,i.headers)}const U=cn(r,t);let b=U.errors;const j=U.formData;if(i.values){ln(j,qn(i.values))}const V=qn(En(r));const v=ln(j,V);let w=hn(v,r);if(Q.config.getCacheBusterParam&&t==="get"){w.set("org.htmx.cache-buster",ee(c,"id")||"true")}if(n==null||n===""){n=ne().location.href}const S=bn(r,"hx-request");const _=ie(r).boosted;let E=Q.config.methodsThatUseUrlParams.indexOf(t)>=0;const C={boosted:_,useUrlParams:E,formData:w,parameters:An(w),unfilteredFormData:v,unfilteredParameters:An(v),headers:y,target:c,verb:t,errors:b,withCredentials:i.credentials||S.credentials||Q.config.withCredentials,timeout:i.timeout||S.timeout||Q.config.timeout,path:n,triggeringEvent:o};if(!he(r,"htmx:configRequest",C)){oe(s);m();return e}n=C.path;t=C.verb;y=C.headers;w=qn(C.parameters);b=C.errors;E=C.useUrlParams;if(b&&b.length>0){he(r,"htmx:validation:halted",C);oe(s);m();return e}const z=n.split("#");const $=z[0];const O=z[1];let R=n;if(E){R=$;const Z=!w.keys().next().done;if(Z){if(R.indexOf("?")<0){R+="?"}else{R+="&"}R+=an(w);if(O){R+="#"+O}}}if(!Tn(r,R,C)){fe(r,"htmx:invalidPath",C);oe(l);return e}p.open(t.toUpperCase(),R,true);p.overrideMimeType("text/html");p.withCredentials=C.withCredentials;p.timeout=C.timeout;if(S.noHeaders){}else{for(const k in y){if(y.hasOwnProperty(k)){const Y=y[k];Cn(p,k,Y)}}}const H={xhr:p,target:c,requestConfig:C,etc:i,boosted:_,select:X,pathInfo:{requestPath:n,finalRequestPath:R,responsePath:null,anchor:O}};p.onload=function(){try{const t=Hn(r);H.pathInfo.responsePath=On(p);M(r,H);if(H.keepIndicators!==true){Qt(T,q)}he(r,"htmx:afterRequest",H);he(r,"htmx:afterOnLoad",H);if(!le(r)){let e=null;while(t.length>0&&e==null){const n=t.shift();if(le(n)){e=n}}if(e){he(e,"htmx:afterRequest",H);he(e,"htmx:afterOnLoad",H)}}oe(s);m()}catch(e){fe(r,"htmx:onLoadError",ce({error:e},H));throw e}};p.onerror=function(){Qt(T,q);fe(r,"htmx:afterRequest",H);fe(r,"htmx:sendError",H);oe(l);m()};p.onabort=function(){Qt(T,q);fe(r,"htmx:afterRequest",H);fe(r,"htmx:sendAbort",H);oe(l);m()};p.ontimeout=function(){Qt(T,q);fe(r,"htmx:afterRequest",H);fe(r,"htmx:timeout",H);oe(l);m()};if(!he(r,"htmx:beforeRequest",H)){oe(s);m();return e}var T=Zt(r);var q=Yt(r);se(["loadstart","loadend","progress","abort"],function(t){se([p,p.upload],function(e){e.addEventListener(t,function(e){he(r,"htmx:xhr:"+t,{lengthComputable:e.lengthComputable,loaded:e.loaded,total:e.total})})})});he(r,"htmx:beforeSend",H);const J=E?null:mn(p,r,w);p.send(J);return e}function Nn(e,t){const n=t.xhr;let r=null;let o=null;if(R(n,/HX-Push:/i)){r=n.getResponseHeader("HX-Push");o="push"}else if(R(n,/HX-Push-Url:/i)){r=n.getResponseHeader("HX-Push-Url");o="push"}else if(R(n,/HX-Replace-Url:/i)){r=n.getResponseHeader("HX-Replace-Url");o="replace"}if(r){if(r==="false"){return{}}else{return{type:o,path:r}}}const i=t.pathInfo.finalRequestPath;const s=t.pathInfo.responsePath;const l=re(e,"hx-push-url");const c=re(e,"hx-replace-url");const u=ie(e).boosted;let a=null;let f=null;if(l){a="push";f=l}else if(c){a="replace";f=c}else if(u){a="push";f=s||i}if(f){if(f==="false"){return{}}if(f==="true"){f=s||i}if(t.pathInfo.anchor&&f.indexOf("#")===-1){f=f+"#"+t.pathInfo.anchor}return{type:a,path:f}}else{return{}}}function In(e,t){var n=new RegExp(e.code);return n.test(t.toString(10))}function Pn(e){for(var t=0;t0){E().setTimeout(e,x.swapDelay)}else{e()}}if(f){fe(o,"htmx:responseError",ce({error:"Response Status Error Code "+s.status+" from "+i.pathInfo.requestPath},i))}}const Mn={};function Xn(){return{init:function(e){return null},getSelectors:function(){return null},onEvent:function(e,t){return true},transformResponse:function(e,t,n){return e},isInlineSwap:function(e){return false},handleSwap:function(e,t,n,r){return false},encodeParameters:function(e,t,n){return null}}}function Fn(e,t){if(t.init){t.init(n)}Mn[e]=ce(Xn(),t)}function Bn(e){delete Mn[e]}function Un(e,n,r){if(n==undefined){n=[]}if(e==undefined){return n}if(r==undefined){r=[]}const t=te(e,"hx-ext");if(t){se(t.split(","),function(e){e=e.replace(/ /g,"");if(e.slice(0,7)=="ignore:"){r.push(e.slice(7));return}if(r.indexOf(e)<0){const t=Mn[e];if(t&&n.indexOf(t)<0){n.push(t)}}})}return Un(ue(c(e)),n,r)}var jn=false;ne().addEventListener("DOMContentLoaded",function(){jn=true});function Vn(e){if(jn||ne().readyState==="complete"){e()}else{ne().addEventListener("DOMContentLoaded",e)}}function _n(){if(Q.config.includeIndicatorStyles!==false){const e=Q.config.inlineStyleNonce?` nonce="${Q.config.inlineStyleNonce}"`:"";ne().head.insertAdjacentHTML("beforeend"," ."+Q.config.indicatorClass+"{opacity:0} ."+Q.config.requestClass+" ."+Q.config.indicatorClass+"{opacity:1; transition: opacity 200ms ease-in;} ."+Q.config.requestClass+"."+Q.config.indicatorClass+"{opacity:1; transition: opacity 200ms ease-in;} ")}}function zn(){const e=ne().querySelector('meta[name="htmx-config"]');if(e){return S(e.content)}else{return null}}function $n(){const e=zn();if(e){Q.config=ce(Q.config,e)}}Vn(function(){$n();_n();let e=ne().body;kt(e);const t=ne().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){const t=e.target;const n=ie(t);if(n&&n.xhr){n.xhr.abort()}});const n=window.onpopstate?window.onpopstate.bind(window):null;window.onpopstate=function(e){if(e.state&&e.state.htmx){Wt();se(t,function(e){he(e,"htmx:restored",{document:ne(),triggerEvent:he})})}else{if(n){n(e)}}};E().setTimeout(function(){he(e,"htmx:load",{});e=null},0)});return Q}(); \ No newline at end of file diff --git a/out/production/iroon/internal/server/template.go b/out/production/iroon/internal/server/template.go deleted file mode 100644 index e63edd7..0000000 --- a/out/production/iroon/internal/server/template.go +++ /dev/null @@ -1,43 +0,0 @@ -package server - -import ( - "embed" - "html/template" - "log" - "net/http" - - "github.com/Bronku/iroon/internal/logging" -) - -//go:embed templates/* -var templates embed.FS - -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", - ) - if err != nil { - log.Fatal(err) - } - h.tmpl[page.template] = tmpl - } -} - -func (s *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) - if err != nil { - logging.ErrorPage(err, http.StatusInternalServerError).ServeHTTP(w, r) - return - } - w.Header().Set("content-type", "text/html") - } -} diff --git a/out/production/iroon/internal/server/templates/cake.html b/out/production/iroon/internal/server/templates/cake.html deleted file mode 100644 index d372762..0000000 --- a/out/production/iroon/internal/server/templates/cake.html +++ /dev/null @@ -1,30 +0,0 @@ -{{define "title"}} -Cake {{.ID}} -{{end}} -{{define "main"}} -
-
-
-

Info

- - - - - - - - - -
- -
-
-{{end}} diff --git a/out/production/iroon/internal/server/templates/cakes.html b/out/production/iroon/internal/server/templates/cakes.html deleted file mode 100644 index 0e898c6..0000000 --- a/out/production/iroon/internal/server/templates/cakes.html +++ /dev/null @@ -1,25 +0,0 @@ -{{define "title"}} -Cakes -{{end}} -{{define "main"}} -
- - - - - - - - - {{range .}} - - - - - - - - {{end}} -
NamePriceCategoryAvailability
edit{{.Name}}{{.Price}}{{.Category}}{{.Availability}}
-
-{{end}} diff --git a/out/production/iroon/internal/server/templates/confirmation.html b/out/production/iroon/internal/server/templates/confirmation.html deleted file mode 100644 index 824fbc0..0000000 --- a/out/production/iroon/internal/server/templates/confirmation.html +++ /dev/null @@ -1,8 +0,0 @@ -{{define "title"}} -Confirmed -{{end}} -{{define "main"}} -
-

{{.ID}} confirmed

-
-{{end}} diff --git a/out/production/iroon/internal/server/templates/layout/layout.html b/out/production/iroon/internal/server/templates/layout/layout.html deleted file mode 100644 index 8e6b1c8..0000000 --- a/out/production/iroon/internal/server/templates/layout/layout.html +++ /dev/null @@ -1,17 +0,0 @@ -{{define "layout"}} - - - - - {{template "title" .}} - - - -
-

{{template "title" .}}

-
- - {{template "main" .}} - - -{{end}} diff --git a/out/production/iroon/internal/server/templates/layout/nav.html b/out/production/iroon/internal/server/templates/layout/nav.html deleted file mode 100644 index b6fd88d..0000000 --- a/out/production/iroon/internal/server/templates/layout/nav.html +++ /dev/null @@ -1,6 +0,0 @@ -{{define "nav"}} -All orders -New order -All Cakes -New Cake -{{end}} diff --git a/out/production/iroon/internal/server/templates/order.html b/out/production/iroon/internal/server/templates/order.html deleted file mode 100644 index 11a2ae8..0000000 --- a/out/production/iroon/internal/server/templates/order.html +++ /dev/null @@ -1,90 +0,0 @@ -{{define "title"}} - Order {{.Order.ID}} -{{end}} -{{define "main"}} -
-
- {{with .Order}} -
-

Info

- - - - - - - - - - - - - - - -
-
-

Basket

-
    -
-
- {{end}} - {{with .Catalogue}} -
-

Catalogue

-
    - {{range .}} -
  • - {{.Name}} {{.Price}} -
    • - {{end}} -
-
- {{end}} - -
-
- -{{end}} diff --git a/out/production/iroon/internal/server/templates/orders.html b/out/production/iroon/internal/server/templates/orders.html deleted file mode 100644 index 574696e..0000000 --- a/out/production/iroon/internal/server/templates/orders.html +++ /dev/null @@ -1,51 +0,0 @@ - -{{define "title"}} - Orders -{{end}} -{{define "main"}} -
-
- - - - - - - -
- Searching... -
- -
- {{template "orders-table" .Orders}} -
-
-
-{{end}} - -{{define "orders-table"}} - - - - - - - - - - - - {{range .}} - - - - - - - - - - - {{end}} -
NameSurnamePhoneLocationDateStatusTotal
edit{{.Name}}{{.Surname}}{{.Phone}}{{.Location}}{{.Date.Format "2006-01-02"}}{{.Status}}{{.Total}}
- {{end}} diff --git a/out/production/iroon/internal/store/cake.go b/out/production/iroon/internal/store/cake.go deleted file mode 100644 index dc53373..0000000 --- a/out/production/iroon/internal/store/cake.go +++ /dev/null @@ -1,112 +0,0 @@ -package store - -import ( - "errors" - "fmt" - - "github.com/Bronku/iroon/internal/models" -) - -func (s *Store) cakeCount() int { - out := 0 - rows, err := s.db.Query("select count(*) from cake;") - if err != nil { - return out - } - defer rows.Close() - _ = rows.Next() - _ = rows.Scan(&out) - return out -} - -func (s *Store) loadCakes() ([]models.Cake, error) { - out := make([]models.Cake, 0, s.cakeCount()) - - rows, err := s.db.Query("select id, name, price, category, availability from cake order by id asc;") - if err != nil { - return out, err - } - defer rows.Close() - - for rows.Next() { - var cake models.Cake - err = rows.Scan(&cake.ID, &cake.Name, &cake.Price, &cake.Category, &cake.Availability) - if err != nil { - continue - } - out = append(out, cake) - } - - return out, nil -} - -func (s *Store) searchCakes(id int) (int, error) { - for i, e := range s.cakes { - if e.ID != id { - continue - } - return i, nil - } - return 0, errors.New("cake not found") -} - -func (s *Store) GetCake(id int) (models.Cake, error) { - if id <= 0 { - return models.Cake{}, errors.New("Invalid cake id") - } - - i, err := s.searchCakes(id) - if err != nil { - return models.Cake{}, err - } - return s.cakes[i], err -} - -func (s *Store) GetCakes() ([]models.Cake, error) { - result := make([]models.Cake, len(s.cakes)) - copy(result, s.cakes) - return result, nil -} - -func (s *Store) updateCake(newCake models.Cake) error { - query := "update cake set name = ? , price = ?, category = ?, availability = ? where id = ?" - _, err := s.db.Exec(query, newCake.Name, newCake.Price, newCake.Category, newCake.Availability, newCake.ID) - if err != nil { - return err - } - - i, err := s.searchCakes(newCake.ID) - if err != nil { - return err - } - s.cakes[i] = newCake - 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) - } - fmt.Println("adding a new cake", newCake) - query := "insert into cake(name, price, category, availability) values (?, ?, ?, ?) returning id;" - rows, err := s.db.Query(query, newCake.Name, newCake.Price, newCake.Category, newCake.Availability) - if err != nil { - return 0, err - } - defer rows.Close() - if !rows.Next() { - return 0, errors.New("query didn't return the cake id") - } - err = rows.Scan(&newCake.ID) - if err != nil { - return 0, err - } - - s.cakes = append(s.cakes, newCake) - return newCake.ID, nil -} diff --git a/out/production/iroon/internal/store/migrations.go b/out/production/iroon/internal/store/migrations.go deleted file mode 100644 index 5f44f39..0000000 --- a/out/production/iroon/internal/store/migrations.go +++ /dev/null @@ -1,49 +0,0 @@ -package store - -import ( - "embed" - _ "embed" - "log" - "strconv" - "strings" -) - -//go:embed migrations/*.sql -var migrations embed.FS - -func (s *Store) loadFile(file string) { - filename := strings.Split(file, ".") - version, err := strconv.Atoi(filename[0]) - if err != nil { - log.Fatal("only allowed files in migrations directory are .txt") - } - if version <= s.version() { - return - } - - query, _ := migrations.ReadFile("migrations/" + file) - _, err = s.db.Exec(string(query)) - if err != nil { - log.Fatal("error executing migration: ", file, err) - } -} - -func (s *Store) loadMigrations() { - migration_files, _ := migrations.ReadDir("migrations") - - for _, e := range migration_files { - s.loadFile(e.Name()) - } -} - -func (s *Store) version() int { - out := -1 - row, err := s.db.Query("PRAGMA user_version;") - if err != nil { - return out - } - defer row.Close() - row.Next() - _ = row.Scan(&out) - return out -} diff --git a/out/production/iroon/internal/store/migrations/1.sql b/out/production/iroon/internal/store/migrations/1.sql deleted file mode 100644 index 1387f6b..0000000 --- a/out/production/iroon/internal/store/migrations/1.sql +++ /dev/null @@ -1,112 +0,0 @@ -CREATE TABLE cake -( - id integer primary key autoincrement, - name text not null unique, - price integer not null, - category text, - availability text -); - -CREATE TABLE customer_order -( - id integer primary key autoincrement, - name text, - surname text, - phone text, - location text, - order_date string not null, - delivery_date string not null, - status text, - paid integer -); - -CREATE TABLE ordered_cake -( - customer_order integer references customer_order (id) not null, - cake integer references cake (id) not null, - amount integer not null, - primary key (customer_order, cake) -); - -CREATE TABLE user -( - login text primary key, - password text, - role text, - salt text -); - -CREATE TABLE session -( - token text primary key, - user text, - expiration text -); - -create -virtual table order_fts using fts5 ( - id, - name, - surname, - phone, - location, - order_date, - delivery_date, - status, - paid, - content = 'customer_order' -); - -create trigger order_fts_insert - after insert - on customer_order -begin - insert into order_fts (id, - name, - surname, - phone, - location, - order_date, - delivery_date, - status, - paid) - values (new.id, - new.name, - new.surname, - new.phone, - new.location, - new.order_date, - new.delivery_date, - new.status, - new.paid); -end; - -create trigger order_fts_delete - after delete - on customer_order -begin - delete - from order_fts - where id = old.id; -end; - -create trigger order_fts_update - after - update - on customer_order -begin - update customer_order - set id = new.id, - name = new.name, - surname = new.surname, - phone = new.phone, - location = new.location, - order_date = new.order_date, - delivery_date = new.delivery_date, - status = new.status, - paid = new.paid - where id = old.id; -end; - -pragma -user_version = 1; diff --git a/out/production/iroon/internal/store/order.go b/out/production/iroon/internal/store/order.go deleted file mode 100644 index d4c4c37..0000000 --- a/out/production/iroon/internal/store/order.go +++ /dev/null @@ -1,153 +0,0 @@ -package store - -import ( - "database/sql" - "errors" - "fmt" - "strconv" - "time" - - "github.com/Bronku/iroon/internal/models" -) - -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) - 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.Cakes = make([]models.Cake, 0) - rows, err := s.db.Query("select cake, amount from ordered_cake where customer_order = ?;", out.ID) - if err != nil { - return out, err - } - defer rows.Close() - for rows.Next() { - var newCake models.Cake - err = rows.Scan(&newCake.ID, &newCake.Amount) - if err != nil { - return out, err - } - cakeData, err := s.GetCake(newCake.ID) - if err != nil { - continue - } - newCake.Name = cakeData.Name - newCake.Price = cakeData.Price - out.Cakes = append(out.Cakes, newCake) - } - - return out, nil -} - -func (s *Store) getOrdersFromQuery(query string, args ...any) ([]models.Order, error) { - var out []models.Order - rows, err := s.db.Query(query, args...) - if err != nil { - fmt.Println("gofq", err) - return out, err - } - defer rows.Close() - - for rows.Next() { - order, err := s.parseOrderRow(rows) - if err != nil { - fmt.Println(err) - continue - } - out = append(out, order) - } - - return out, nil -} - -func (s *Store) GetOrder(id int) (models.Order, error) { - query := "select * from customer_order where id = ?;" - out, err := s.getOrdersFromQuery(query, id) - if err != nil { - return models.Order{}, err - } - if len(out) < 1 { - return models.Order{}, errors.New("no output order") - } - return out[0], nil -} - -func (s *Store) GetFilteredOrder(filter string, from, to time.Time) ([]models.Order, error) { - if filter == "" { - return s.GetTopOrders(from, to) - } - start := from.Format("2006-01-02") + " 00:00" - end := to.Format("2006-01-02") + " 99:99" - if to.IsZero() { - end = "9999-99-99 99:99" - } - query := "select id, name, surname, phone, location, order_date, delivery_date, status, paid from order_fts(?) where delivery_date >= ? and delivery_date <= ? order by rank;" - return s.getOrdersFromQuery(query, filter, start, end) -} - -func (s *Store) GetTopOrders(from, to time.Time) ([]models.Order, error) { - start := from.Format("2006-01-02") + " 00:00" - end := to.Format("2006-01-02") + " 99:99" - if to.IsZero() { - end = "9999-99-99 99:99" - } - query := "select * from customer_order where status != 'done' and delivery_date >= ? and delivery_date <= ? ;" - return s.getOrdersFromQuery(query, start, end) -} - -func (s *Store) SaveOrder(newOrder models.Order) (int, error) { - query := "insert into customer_order(name, surname, phone, location, order_date, delivery_date, status, paid) values (?, ?, ?, ?, ?, ?, ?, ?) returning id;" - if newOrder.ID != 0 { - query = "update customer_order set name = ?, surname = ?, phone = ?, location = ?, order_date = ?, delivery_date = ?, status = ?, paid = ? where id = " - query += strconv.Itoa(newOrder.ID) + " returning id;" - } - tx, err := s.db.Begin() - if err != nil { - return 0, err - } - - accepted := newOrder.Accepted.Format("2006-01-02 15:04") - date := newOrder.Date.Format("2006-01-02 15:04") - row, err := tx.Query(query, newOrder.Name, newOrder.Surname, newOrder.Phone, newOrder.Location, accepted, date, newOrder.Status, newOrder.Paid) - if err != nil { - _ = tx.Rollback() - return 0, err - } - defer row.Close() - - if !row.Next() { - _ = tx.Rollback() - return 0, errors.New("The database didn't respond with an id") - } - err = row.Scan(&newOrder.ID) - if err != nil { - _ = tx.Rollback() - return newOrder.ID, err - } - - // remove all ordered_cakes associated with this order before inserting - query = "delete from ordered_cake where customer_order = ?;" - _, err = tx.Exec(query, newOrder.ID) - if err != nil { - _ = tx.Rollback() - return newOrder.ID, err - } - - // add all ordered_cakes for this order - query = "insert into ordered_cake(customer_order, cake, amount) values (?,?,?);" - for _, e := range newOrder.Cakes { - _, err := tx.Exec(query, newOrder.ID, e.ID, e.Amount) - if err != nil { - _ = tx.Rollback() - return newOrder.ID, err - } - } - - err = tx.Commit() - return newOrder.ID, err -} diff --git a/out/production/iroon/internal/store/session.go b/out/production/iroon/internal/store/session.go deleted file mode 100644 index b34c551..0000000 --- a/out/production/iroon/internal/store/session.go +++ /dev/null @@ -1,52 +0,0 @@ -package store - -import ( - "time" - - "github.com/Bronku/iroon/internal/models" -) - -func (s *Store) AddSession(token, userName string, expiration time.Time) error { - query := "insert into session (token, user, expiration) values(?, ?, ?)" - _, err := s.db.Exec(query, token, userName, expiration.Format("2006-01-02 15:04")) - return err -} - -func (s *Store) CleanSessions() error { - now := time.Now().Format("2006-01-02 15:04") - query := "delete from session where expiration < ?;" - _, err := s.db.Exec(query, now) - return err -} - -func (s *Store) GetSessions() (map[string]models.Token, error) { - out := make(map[string]models.Token) - err := s.CleanSessions() - if err != nil { - return out, err - } - query := "select token, user, expiration from session;" - rows, err := s.db.Query(query) - if err != nil { - return out, err - } - defer rows.Close() - for rows.Next() { - var current models.Token - var token string - var expiration string - err = rows.Scan(&token, ¤t.User, &expiration) - if err != nil { - continue - } - current.Expiration, err = time.Parse("2006-01-02 15:04", expiration) - if err != nil { - continue - } - if token == "" { - continue - } - out[token] = current - } - return out, nil -} diff --git a/out/production/iroon/internal/store/store.go b/out/production/iroon/internal/store/store.go deleted file mode 100644 index 2877676..0000000 --- a/out/production/iroon/internal/store/store.go +++ /dev/null @@ -1,43 +0,0 @@ -package store - -import ( - "database/sql" - "log" - - "github.com/Bronku/iroon/internal/models" - _ "github.com/knaka/go-sqlite3-fts5" - _ "github.com/mattn/go-sqlite3" -) - -type Store struct { - db *sql.DB - cakes []models.Cake - users map[string]models.User -} - -func OpenStore(filename string) *Store { - var out Store - var err error - - out.db, err = sql.Open("sqlite3", filename) - if err != nil { - log.Fatal("Can't open the database", filename, err) - } - - out.loadMigrations() - out.cakes, err = out.loadCakes() - if err != nil { - log.Fatal(err) - } - out.users, err = out.loadUsers() - if err != nil { - log.Fatal(err) - } - return &out -} - -func (s *Store) Close() { - if s.db != nil { - s.db.Close() - } -} diff --git a/out/production/iroon/internal/store/store_test.go b/out/production/iroon/internal/store/store_test.go deleted file mode 100644 index b36100a..0000000 --- a/out/production/iroon/internal/store/store_test.go +++ /dev/null @@ -1,293 +0,0 @@ -package store - -import ( - "testing" - "time" - - "github.com/Bronku/iroon/internal/models" -) - -func TestStore(t *testing.T) { - s := OpenStore("file:memdb1?mode=memory&cache=shared") - defer s.Close() - - // ensure db is empty - cakes, err := s.GetCakes() - if err != nil { - t.Errorf("Error getting cakes: %v", err) - } - if len(cakes) != 0 { - t.Errorf("Expected empty cakes list, got: %v", cakes) - } - orders, err := s.GetTopOrders(time.Now(), time.Now().Add(time.Hour*24)) - if err != nil { - t.Errorf("Error getting orders: %v", err) - } - if len(orders) != 0 { - t.Errorf("Expected empty orders list, got: %v", orders) - } - - // create new cake - newCake := models.Cake{Name: "Chocolate Cake", Price: 2500} - newCake.ID, err = s.SaveCake(newCake) - if err != nil { - t.Fatalf("Failed to save new cake: %v", err) - } - if newCake.ID <= 0 { - t.Errorf("Expected positive cake ID, got: %d", newCake.ID) - } - - // create another cake - anotherCake := models.Cake{Name: "Another Cake", Price: 3000} - anotherCake.ID, err = s.SaveCake(anotherCake) - if err != nil { - t.Fatalf("Failed to save new cake: %v", err) - } - if anotherCake.ID <= 0 { - t.Errorf("Expected positive cake ID, got: %d", anotherCake.ID) - } - - // Update Existing Cake - newCake.Name = "Updated Cake" - newCake.Price = 100 - newID, err := s.SaveCake(newCake) - if newID != newCake.ID { - t.Error("wrong id") - } - if err != nil { - t.Error("error updating cake", err) - } - - // Update Non-existing Cake - var updatedCake models.Cake - updatedCake.ID = 10 - _, err = s.SaveCake(updatedCake) - if err == nil { - t.Error("did not return an error when attempted to update non existant cake") - } - - // get cakes - cakes, err = s.GetCakes() - if err != nil { - t.Fatalf("Failed to get all cakes after creation: %v", err) - } - if len(cakes) != 2 { - t.Error("Expected two cakes returned, got ", len(cakes)) - } - for i, c := range cakes { - if c.ID == newCake.ID { - newCake.Amount = i - } - if c.ID == anotherCake.ID { - anotherCake.Amount = i - } - } - if newCake.Amount == -1 { - t.Error("not found newCake") - } - if cakes[newCake.Amount].ID != newCake.ID || cakes[newCake.Amount].Name != newCake.Name || cakes[newCake.Amount].Price != newCake.Price { - t.Errorf("Want %v\nGot %v", newCake, cakes[newCake.Amount]) - } - if anotherCake.Amount == -1 { - t.Error("not found anotherCake") - } - if cakes[anotherCake.Amount].ID != anotherCake.ID || cakes[anotherCake.Amount].Name != anotherCake.Name || cakes[anotherCake.Amount].Price != anotherCake.Price { - t.Errorf("Want %v\nGot %v", anotherCake, cakes) - } - - selectedCake, err := s.GetCake(newCake.ID) - if err != nil { - t.Error("error getting a cake", err) - } - if selectedCake.ID != newCake.ID || selectedCake.Name != newCake.Name || selectedCake.Price != newCake.Price { - t.Errorf("Want %v\nGot %v", newCake, selectedCake) - } - - selectedCake, err = s.GetCake(-1) - if err == nil { - t.Error("no error getting a non-existant cake") - } - - // create new order - now := time.Now() - newOrder := models.Order{ - Name: "John", - Surname: "Doe", - Phone: "123-456-7890", - Location: "Some Location", - Accepted: now, - Date: now.Add(time.Hour * 24), - Status: "Pending", - Paid: 1000, - Cakes: []models.Cake{{ID: newCake.ID, Amount: 2}, {ID: anotherCake.ID, Amount: 10}}, - } - newOrder.ID, err = s.SaveOrder(newOrder) - if err != nil { - t.Fatalf("Failed to save new order: %v", err) - } - if newOrder.ID <= 0 { - t.Errorf("Expected positive order ID, got: %d", newOrder.ID) - } - - // create another order - anotherOrder := models.Order{ - Name: "Jane", - Surname: "Doe", - Phone: "123-456-7890", - Location: "New Location", - Accepted: now, - Date: now.Add(time.Hour * 192), - Status: "Accepted", - Paid: 1500, - Cakes: []models.Cake{{ID: newCake.ID, Amount: 100}}, - } - anotherOrder.ID, err = s.SaveOrder(anotherOrder) - if err != nil { - t.Fatalf("Failed to save new order: %v", err) - } - if anotherOrder.ID <= 0 { - t.Errorf("Expected positive order ID, got: %d", anotherOrder.ID) - } - - // update existing order - newOrder.Name = "James" - newOrder.Status = "Done" - newOrder.Cakes = newOrder.Cakes[1:] - newID, err = s.SaveOrder(newOrder) - if newID != newOrder.ID { - t.Error("wrong id") - } - if err != nil { - t.Error("error updating order", err) - } - - // update non existing order - var updatedOrder models.Order - updatedOrder.ID = 10 - _, err = s.SaveOrder(updatedOrder) - if err == nil { - t.Error("did not return an error when attempted to update non existant cake") - } - - // get orders - orders, err = s.GetTopOrders(time.Time{}, time.Time{}) - if err != nil { - t.Fatalf("Failed to get all orders after creation: %v", err) - } - if len(orders) != 2 { - t.Error("Expected two orders returned, got ", len(orders)) - } - newOrderPos := -1 - anotherOrderPos := -1 - for i, o := range orders { - if o.ID == newOrder.ID { - newOrderPos = i - } - if o.ID == anotherOrder.ID { - anotherOrderPos = i - } - } - if newOrderPos == -1 { - t.Error("not found newOrder") - } - if newOrder.Name != orders[newOrderPos].Name || - newOrder.Surname != orders[newOrderPos].Surname || - newOrder.Phone != orders[newOrderPos].Phone || - newOrder.Status != orders[newOrderPos].Status || - newOrder.Location != orders[newOrderPos].Location || - newOrder.Accepted.Format("2006-01-02 15:04") != orders[newOrderPos].Accepted.Format("2006-01-02 15:04") || - newOrder.Date.Format("2006-01-02 15:04") != orders[newOrderPos].Date.Format("2006-01-02 15:04") { - t.Errorf("Want %v\nGot %v", newOrder, orders[newOrderPos]) - } - if !areCakeSlicesEqual(newOrder.Cakes, orders[newOrderPos].Cakes) { - t.Errorf("Want %v\nGot %v", newOrder.Cakes, orders[newOrderPos].Cakes) - } - - if anotherOrderPos == -1 { - t.Error("not found anotherOrder") - } - if anotherOrder.Name != orders[anotherOrderPos].Name || - anotherOrder.Surname != orders[anotherOrderPos].Surname || - anotherOrder.Phone != orders[anotherOrderPos].Phone || - anotherOrder.Status != orders[anotherOrderPos].Status || - anotherOrder.Location != orders[anotherOrderPos].Location || - anotherOrder.Accepted.Format("2006-01-02 15:04") != orders[anotherOrderPos].Accepted.Format("2006-01-02 15:04") || - anotherOrder.Date.Format("2006-01-02 15:04") != orders[anotherOrderPos].Date.Format("2006-01-02 15:04") { - t.Errorf("Want %v\nGot %v", anotherOrder, orders[anotherOrderPos]) - } - - if !areCakeSlicesEqual(anotherOrder.Cakes, orders[anotherOrderPos].Cakes) { - t.Errorf("Want %v\nGot %v", anotherOrder.Cakes, orders[anotherOrderPos].Cakes) - } - - selectedOrder, err := s.GetOrder(newOrder.ID) - if err != nil { - t.Error("error getting an order by id ", err) - } - if newOrder.Name != selectedOrder.Name || - newOrder.Surname != selectedOrder.Surname || - newOrder.Phone != selectedOrder.Phone || - newOrder.Status != selectedOrder.Status || - newOrder.Location != selectedOrder.Location || - newOrder.Accepted.Format("2006-01-02 15:04") != selectedOrder.Accepted.Format("2006-01-02 15:04") || - newOrder.Date.Format("2006-01-02 15:04") != selectedOrder.Date.Format("2006-01-02 15:04") { - t.Errorf("Want %v\nGot %v", newOrder, selectedOrder) - } - - if !areCakeSlicesEqual(newOrder.Cakes, selectedOrder.Cakes) { - t.Errorf("Want %v\nGot %v", newOrder.Cakes, selectedOrder.Cakes) - } - - _, err = s.GetOrder(-1) - if err == nil { - t.Error("no error getting invalid order") - } -} - -func TestSliceComparison(t *testing.T) { - a := []models.Cake{ - {Name: "ok", Price: 100, ID: 12, Amount: 10}, - {Name: "ok", Price: 11, ID: 13, Amount: 1}, - {Name: "ok", Price: 100, ID: 10, Amount: 11}, - } - - b := []models.Cake{ - {Name: "okas", Price: 110, ID: 12, Amount: 10}, - {Name: "oksa", Price: 11, ID: 13, Amount: 1}, - {Name: "oasdk", Price: 101, ID: 10, Amount: 11}, - } - if !areCakeSlicesEqual(a, b) { - t.Error("aren't equal") - } -} - -func areCakesEqual(a, b models.Cake) bool { - return a.ID == b.ID && a.Amount == b.Amount -} - -func areCakeSlicesEqual(a, b []models.Cake) bool { - if len(a) != len(b) { - return false - } - - matched := make([]bool, len(a)) - -mainLoop: - for _, e1 := range a { - for i, e2 := range b { - if matched[i] { - continue - } - if areCakesEqual(e1, e2) { - matched[i] = true - continue mainLoop - } - } - } - for _, e := range matched { - if e == false { - return false - } - } - return true -} diff --git a/out/production/iroon/internal/store/user.go b/out/production/iroon/internal/store/user.go deleted file mode 100644 index ef4e874..0000000 --- a/out/production/iroon/internal/store/user.go +++ /dev/null @@ -1,48 +0,0 @@ -package store - -import ( - "errors" - - "github.com/Bronku/iroon/internal/crypto" - "github.com/Bronku/iroon/internal/models" -) - -func (s *Store) AddUser(login, password string) error { - _, exists := s.GetUser(login) - if exists { - return errors.New("the user already exists") - } - query := "insert into user (login, password, salt) values(?, ?, ?)" - salt := crypto.GenerateKey() - hash := crypto.PasswordHash(password, salt) - _, err := s.db.Exec(query, login, hash, salt) - if err == nil { - s.users[login] = models.User{Password: hash, Salt: salt} - } - return err -} - -func (s *Store) loadUsers() (map[string]models.User, error) { - out := make(map[string]models.User) - query := "select login, password, salt from user;" - rows, err := s.db.Query(query) - if err != nil { - return out, err - } - defer rows.Close() - for rows.Next() { - var current models.User - var login string - err = rows.Scan(&login, ¤t.Password, ¤t.Salt) - if err != nil { - continue - } - out[login] = current - } - return out, nil -} - -func (s *Store) GetUser(login string) (models.User, bool) { - value, ok := s.users[login] - return value, ok -} diff --git a/out/production/iroon/main.go b/out/production/iroon/main.go deleted file mode 100644 index 5dffb9b..0000000 --- a/out/production/iroon/main.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "github.com/Bronku/iroon/cmd/iroon" - -func main() { - iroon.Run() -}