diff --git a/src/TODO.md b/src/TODO.md index c956af0..2ada0ba 100644 --- a/src/TODO.md +++ b/src/TODO.md @@ -2,3 +2,4 @@ - [ ] On the categories page, add a column of how many times a given category is used - [ ] Make all the other items update/create page be like expenses +- [ ] Make working with the DB better, yo diff --git a/src/assets/htmx/category.html b/src/assets/htmx/category.html index 0a3e48d..f551539 100644 --- a/src/assets/htmx/category.html +++ b/src/assets/htmx/category.html @@ -1,12 +1,40 @@ {{ define "category" }} - - - - - - - - - -
ID:{{ .category.CategoryID }}
Name:{{ .category.CategoryName }}
+
+
+
+ CATEGORY FORM +

+ +
+ + +
+
+ +
+ + {{ if eq .method "put" }} + + {{ end }} +
+
+{{ template "deleteModal" }} {{ end }} diff --git a/src/assets/htmx/categoryNew.html b/src/assets/htmx/categoryNew.html deleted file mode 100644 index f5e9377..0000000 --- a/src/assets/htmx/categoryNew.html +++ /dev/null @@ -1,23 +0,0 @@ -{{ define "categoryNew" }} -
-
-
- CATEGORY FORM -
-

- - -

- - -
-
-
-
-
-{{ end }} diff --git a/src/assets/htmx/deleteModal.html b/src/assets/htmx/deleteModal.html new file mode 100644 index 0000000..c8a1b84 --- /dev/null +++ b/src/assets/htmx/deleteModal.html @@ -0,0 +1,11 @@ +{{ define "deleteModal" }} + + + +{{ end }} diff --git a/src/assets/htmx/expense.html b/src/assets/htmx/expense.html index 54d8919..06ba69e 100644 --- a/src/assets/htmx/expense.html +++ b/src/assets/htmx/expense.html @@ -91,15 +91,7 @@ {{ end }} - - - + {{ template "deleteModal" }} @@ -110,34 +102,5 @@ row.remove(); } } - let modal = document.getElementById("confirm-modal"); - let confirmButton = document.getElementById("modal-confirm"); - let cancelButton = document.getElementById("modal-cancel"); - - let pendingDeleteUrl = null; - let deleteTarget = null; - - function confirmDelete(button) { - pendingDeleteUrl = button.getAttribute("data-delete-url"); - deleteTarget = button.closest("tr"); - modal.showModal(); - } - - confirmButton.addEventListener("click", function () { - if (pendingDeleteUrl) { - // Use HTMX to send the DELETE - htmx.ajax('DELETE', pendingDeleteUrl, { - target: deleteTarget, - swap: 'outerHTML' - }); - } - modal.close(); - }); - - cancelButton.addEventListener("click", function () { - modal.close(); - pendingDeleteUrl = null; - deleteTarget = null; - }); {{ end }} diff --git a/src/assets/htmx/terminal.html b/src/assets/htmx/terminal.html index 8707e11..72cd98c 100644 --- a/src/assets/htmx/terminal.html +++ b/src/assets/htmx/terminal.html @@ -10,6 +10,7 @@ + @@ -60,8 +61,8 @@ {{ template "categories" . }} {{ else if eq .content "category" }} {{ template "category" . }} - {{ else if eq .content "categoryNew" }} - {{ template "categoryNew" . }} + {{ else if eq .content "category" }} + {{ template "category" . }} {{ else if eq .content "overview" }} {{ template "overview" . }} {{ else if eq .content "stores" }} diff --git a/src/assets/js/modals.js b/src/assets/js/modals.js new file mode 100644 index 0000000..f47001d --- /dev/null +++ b/src/assets/js/modals.js @@ -0,0 +1,39 @@ +let pendingDeleteUrl = null; +let deleteTarget = null; + +function confirmDelete(button) { + let modal = document.getElementById("confirm-modal"); + pendingDeleteUrl = button.getAttribute("data-delete-url"); + deleteTarget = button.closest("tr"); + modal.showModal(); +} + +document.addEventListener("DOMContentLoaded", function() { + document.body.addEventListener("click", function(evt) { + const modalCancelBtn = evt.target.closest("#modal-cancel"); + if (!modalCancelBtn) { + return; + } + + let modal = document.getElementById("confirm-modal"); + modal.close(); + pendingDeleteUrl = null; + deleteTarget = null; + }); + + document.body.addEventListener("click", function(evt) { + const modalConfirmBtn = evt.target.closest("#modal-confirm"); + if (!modalConfirmBtn) { + return; + } + + let modal = document.getElementById("confirm-modal"); + if (pendingDeleteUrl) { + htmx.ajax('DELETE', pendingDeleteUrl, { + target: deleteTarget, + swap: 'outerHTML' + }); + } + modal.close(); + }); +}); diff --git a/src/config.yaml b/src/config.yaml index 18af0ee..ec6e56d 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -1 +1,2 @@ assets: "./assets/" +port: 8081 diff --git a/src/config/config.go b/src/config/config.go index a1fec30..4e84c40 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -9,6 +9,7 @@ import ( type Configuration struct { AssetsDir string `yaml:"assets"` + Port string `yaml:"port"` } var ( diff --git a/src/expenses/categories.go b/src/expenses/categories.go index 6f1932f..e2dc9f4 100644 --- a/src/expenses/categories.go +++ b/src/expenses/categories.go @@ -4,7 +4,6 @@ import ( "database/sql" "fmt" "log" - "strconv" _ "github.com/mattn/go-sqlite3" ) @@ -62,12 +61,12 @@ func GetCategory(catID int) (Category, error) { query := "SELECT CategoryID,CategoryName " + "FROM categories " + - "WHERE CategoryID = " + strconv.Itoa(catID) + "WHERE CategoryID = ?" - var cat Category - err = db.QueryRow(query).Scan(&cat.CategoryID, &cat.CategoryName) + cat := Category{CategoryID: -1} + err = db.QueryRow(query, catID).Scan(&cat.CategoryID, &cat.CategoryName) if err != nil { - return Category{}, nil + return Category{CategoryID: -1}, nil } return cat, nil @@ -123,3 +122,31 @@ func (cat *Category) Delete() error { return nil } + +func (cat *Category) Update() error { + db, err := sql.Open("sqlite3", "./data/data.db") + if err != nil { + return err + } + defer db.Close() + + _, err = db.Exec("PRAGMA foreign_keys = ON") + if err != nil { + return err + } + + query := "UPDATE categories SET CategoryName = ? WHERE CategoryID = ?" + res, err := db.Exec(query, cat.CategoryName, cat.CategoryID) + if err != nil { + return err + } + + rowsAffected, err := res.RowsAffected() + if err != nil { + return err + } else if rowsAffected == 0 { + return ErrNotFound + } + + return nil +} diff --git a/src/main.go b/src/main.go index 075db9d..1e23b63 100644 --- a/src/main.go +++ b/src/main.go @@ -50,11 +50,10 @@ func main() { pages.RouteTypes(router) pages.RoutePayments(router) pages.RouteOverview(router) - pages.RouteNotFound(router) pages.RouteServerError(router) - err := router.Run(":8081") + err := router.Run(":" + cfg.Port) if err != nil { log.Printf("Failed to launch application: \n %s\n", err) } diff --git a/src/pages/categories.go b/src/pages/categories.go index 79e9946..c1c9f65 100644 --- a/src/pages/categories.go +++ b/src/pages/categories.go @@ -3,6 +3,7 @@ package pages import ( "expenses/expenses" + "encoding/json" "fmt" "net/http" "strconv" @@ -41,20 +42,26 @@ func categoryPage(c *gin.Context) { ServerErrorView(c, "The server too makes mistakes") return } + if category.CategoryID == -1 { + NotFoundView(c, fmt.Sprintf("Could not find category `%d`", categoryID)) + return + } c.HTML(http.StatusOK, "terminal", gin.H{ "page": "category", "renderNavBar": false, "content": "category", "category": category, + "method": "put", }) } func newCategoryPage(c *gin.Context) { c.HTML(http.StatusOK, "terminal", gin.H{ - "page": "expenseNew", + "page": "categoryNew", "renderNavBar": false, - "content": "categoryNew", + "content": "category", + "method": "post", }) } @@ -73,6 +80,29 @@ func createCategory(c *gin.Context) { c.Header("HX-Trigger", "{\"formState\":\"Success\"}") } +func updateCategory(c *gin.Context) { + categoryID, err := strconv.Atoi(c.Param("id")) + if err != nil { + NotFoundView(c, "No such category") + return + } + + categoryName := c.PostForm("category-name") + category := expenses.Category{ + CategoryID: categoryID, + CategoryName: categoryName, + } + + err = category.Update() + if err != nil { + errMsg, _ := json.Marshal(err.Error()) + c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":%s}", errMsg)) + return + } + + c.Header("HX-Trigger", "{\"formState\":\"Success\"}") +} + func deleteCategory(c *gin.Context) { categoryID, err := strconv.Atoi(c.Param("id")) if err != nil { @@ -91,7 +121,8 @@ func deleteCategory(c *gin.Context) { } if err != nil { - errMsg := fmt.Sprintf("error deleting category %d", categoryID) + errMsg := fmt.Sprintf("error deleting category %d: %+v", categoryID, + err.Error()) c.String(http.StatusInternalServerError, errMsg) return } @@ -107,4 +138,5 @@ func RouteCategories(router *gin.Engine) { router.GET(CategoriesPath+"/new", newCategoryPage) router.POST(CategoriesPath+"/new", createCategory) router.DELETE(CategoriesPath+"/:id", deleteCategory) + router.PUT(CategoriesPath+"/:id", updateCategory) }