Added types and some other pages
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<div id="operation-state" class="warning"></div><br>
|
||||
<div id="operation-state" class="warning"> </div><br>
|
||||
<table>
|
||||
<tr>
|
||||
<th></th>
|
||||
@@ -11,7 +11,7 @@
|
||||
<a class="category-delete-button"
|
||||
hx-delete="/categories/{{ .CategoryID }}"
|
||||
hx-on::after-request="handleDeleteResponse(event)"
|
||||
> X </a>
|
||||
> X </a>
|
||||
</th>
|
||||
<th><a href="/categories/{{ .CategoryID }}">{{ .CategoryID }}</a></th>
|
||||
<th spellcheck="false" contenteditable>{{ .CategoryName }}</th>
|
||||
|
||||
@@ -8,11 +8,6 @@
|
||||
<label class="fullwidth-label" for="category-name">NAME</label>
|
||||
<input class="tui-input underline fullwidth" type="text" name="category-name" id="category-name"><br><br>
|
||||
|
||||
<!-- <label for="category-description">DESCRIPTION</label> -->
|
||||
<!-- <input -->
|
||||
<!-- class="tui-input underline fullwidth" type="text" name="category-description" -->
|
||||
<!-- id="category-description"><br><br> -->
|
||||
|
||||
<button
|
||||
class="subbutton"
|
||||
hx-post="/categories/new"
|
||||
|
||||
+109
-24
@@ -1,26 +1,111 @@
|
||||
<table>
|
||||
<tr>
|
||||
<td>ID:</td>
|
||||
<td>{{ .expense.ExpID }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Description:</td>
|
||||
<td>{{ .expense.Description }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Date:</td>
|
||||
<td>{{ formatDate .expense.ExpDate }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Category:</td>
|
||||
<td>
|
||||
<select name="newexp-cat-dropdown" id="newexp-cat-dropdown">
|
||||
{{ range .categories }}
|
||||
<option value="{{ .CategoryID }}">{{ .CategoryName }}</option>
|
||||
{{ end}}
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div>
|
||||
<form id="expense-form" action="submit">
|
||||
<fieldset id="form-box-boundaries">
|
||||
<legend>EXPENSE FORM</legend>
|
||||
<div class="form-container form-table">
|
||||
<div id="form-state" class="warning"></div><br>
|
||||
|
||||
<p>
|
||||
<label class="" for="expense-desc">Description:</label>
|
||||
<input
|
||||
class="tui-input underline fullwidth" type="text" name="expense-name"
|
||||
id="expense-name"><br><br>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<label for="expense-date">Date:</label>
|
||||
<input
|
||||
class="tui-input underline fullwidth" type="text" name="expense-description"
|
||||
id="expense-description"><br><br>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<label for="expense-date">Value:</label>
|
||||
<input
|
||||
class="tui-input underline fullwidth" type="text" name="expense-date"
|
||||
id="expense-date"><br><br>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<label for="newexp-type-dropdown">Type:</label>
|
||||
<select name="newexp-type-dropdown" id="newexp-type-dropdown">
|
||||
{{ range .types }}
|
||||
<option value="{{ .TypeID}}">{{ .TypeName }}</option>
|
||||
{{ end}}
|
||||
</select>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<label for="newexp-cat-dropdown">Category:</label>
|
||||
<select name="newexp-cat-dropdown" id="newexp-cat-dropdown">
|
||||
{{ range .categories }}
|
||||
<option value="{{ .CategoryID}}">{{ .CategoryName }}</option>
|
||||
{{ end}}
|
||||
</select>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<label for="newexp-store-dropdown">Store:</label>
|
||||
<select name="newexp-store-dropdown" id="newexp-store-dropdown">
|
||||
{{ range .stores }}
|
||||
<option value="{{ .StoreID}}">{{ .StoreName }}</option>
|
||||
{{ end}}
|
||||
</select>
|
||||
</p>
|
||||
<br><br>
|
||||
|
||||
<button
|
||||
class="subbutton"
|
||||
hx-post="/expenses/new"
|
||||
hx-swap="none"
|
||||
type="submit"
|
||||
id="expense-submit-button">CREATE</button>
|
||||
<br>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.form-container.form-table {
|
||||
text-align: left;
|
||||
display: table;
|
||||
width: 100%;
|
||||
}
|
||||
.form-container p {
|
||||
display: table-row;
|
||||
}
|
||||
.form-container label {
|
||||
display: table-cell;
|
||||
padding-right: 1em;
|
||||
white-space: nowrap;
|
||||
width: 10%;
|
||||
}
|
||||
.form-container .input.tui-input {
|
||||
display: table-cell;
|
||||
width: 100%;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script>
|
||||
document.body.addEventListener("formState", function(evt) {
|
||||
var messageDiv = document.getElementById("form-state")
|
||||
messageDiv.innerHTML = evt.detail.value
|
||||
|
||||
setTimeout(() => {
|
||||
messageDiv.innerHTML = ""
|
||||
}, 3000);
|
||||
});
|
||||
|
||||
// Add the spinner
|
||||
var btn = document.getElementById("expense-submit-button");
|
||||
btn.addEventListener('htmx:beforeRequest', function (evt) {
|
||||
btn.classList.add("loading");
|
||||
spinner(btn)
|
||||
});
|
||||
|
||||
btn.addEventListener('htmx:afterRequest', function (evt) {
|
||||
btn.classList.remove("loading");
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
<div>
|
||||
<form id="store-form" action="submit">
|
||||
<fieldset id="form-box-boundaries">
|
||||
<legend>CATEGORY FORM</legend>
|
||||
<div class="form-container form-left">
|
||||
<div id="form-state" class="warning"></div><br>
|
||||
|
||||
<label class="fullwidth-label" for="store-name">NAME</label>
|
||||
<input class="tui-input underline fullwidth" type="text" name="store-name" id="store-name"><br><br>
|
||||
|
||||
<!-- <label for="store-description">DESCRIPTION</label> -->
|
||||
<!-- <input -->
|
||||
<!-- class="tui-input underline fullwidth" type="text" name="store-description" -->
|
||||
<!-- id="store-description"><br><br> -->
|
||||
|
||||
<button
|
||||
class="subbutton"
|
||||
hx-post="/stores/new"
|
||||
hx-swap="none"
|
||||
type="submit"
|
||||
id="store-submit-button">CREATE</button>
|
||||
<br>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
document.body.addEventListener("formState", function(evt) {
|
||||
var messageDiv = document.getElementById("form-state")
|
||||
messageDiv.innerHTML = evt.detail.value
|
||||
|
||||
setTimeout(() => {
|
||||
messageDiv.innerHTML = ""
|
||||
}, 3000);
|
||||
});
|
||||
|
||||
// Add the spinner
|
||||
var btn = document.getElementById("store-submit-button");
|
||||
btn.addEventListener('htmx:beforeRequest', function (evt) {
|
||||
btn.classList.add("loading");
|
||||
spinner(btn)
|
||||
});
|
||||
|
||||
btn.addEventListener('htmx:afterRequest', function (evt) {
|
||||
btn.classList.remove("loading");
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
<div id="operation-state" class="warning"> </div><br>
|
||||
<table>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>ID</th>
|
||||
<th>Name</th>
|
||||
</tr>
|
||||
{{ range .stores }}
|
||||
<tr>
|
||||
<th>
|
||||
<a class="store-delete-button"
|
||||
hx-delete="/stores/{{ .StoreID }}"
|
||||
hx-on::after-request="handleDeleteResponse(event)"
|
||||
> X </a>
|
||||
</th>
|
||||
<th><a href="/stores/{{ .StoreID }}">{{ .StoreID }}</a></th>
|
||||
<th spellcheck="false" contenteditable>{{ .StoreName }}</th>
|
||||
</tr>
|
||||
{{ end }}
|
||||
</table>
|
||||
|
||||
<script>
|
||||
function handleDeleteResponse(evt) {
|
||||
const status = evt.detail.xhr.status;
|
||||
const messageDiv = document.getElementById("operation-state")
|
||||
|
||||
if (status >= 400) {
|
||||
messageDiv.textContent = evt.detail.xhr.responseText || "Delete failed";
|
||||
|
||||
setTimeout(() => {
|
||||
messageDiv.textContent = "";
|
||||
}, 5000);
|
||||
}
|
||||
|
||||
if (status == 204) {
|
||||
const tr = evt.target.closest('tr');
|
||||
tr.remove();
|
||||
}
|
||||
}
|
||||
|
||||
document.querySelectorAll(".store-delete-button").forEach(btn => {
|
||||
// Add the spinner
|
||||
btn.addEventListener('htmx:beforeRequest', function () {
|
||||
btn.classList.add("loading");
|
||||
})
|
||||
|
||||
// Remove the spinner
|
||||
btn.addEventListener('htmx:afterRequest', function (evt) {
|
||||
btn.classList.remove("loading");
|
||||
});
|
||||
})
|
||||
</script>
|
||||
@@ -0,0 +1,10 @@
|
||||
<table>
|
||||
<tr>
|
||||
<td>ID:</td>
|
||||
<td>{{ .type.TypeID }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Name:</td>
|
||||
<td>{{ .type.TypeName }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -0,0 +1,44 @@
|
||||
<div>
|
||||
<form id="type-form" action="submit">
|
||||
<fieldset id="form-box-boundaries">
|
||||
<legend>TYPE FORM</legend>
|
||||
<div class="form-container form-left">
|
||||
<div id="form-state" class="warning"></div><br>
|
||||
|
||||
<label class="fullwidth-label" for="type-name">NAME</label>
|
||||
<input class="tui-input underline fullwidth" type="text" name="type-name" id="type-name"><br><br>
|
||||
|
||||
<button
|
||||
class="subbutton"
|
||||
hx-post="/types/new"
|
||||
hx-swap="none"
|
||||
type="submit"
|
||||
id="type-submit-button">CREATE</button>
|
||||
<br>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
document.body.addEventListener("formState", function(evt) {
|
||||
var messageDiv = document.getElementById("form-state")
|
||||
messageDiv.innerHTML = evt.detail.value
|
||||
|
||||
setTimeout(() => {
|
||||
messageDiv.innerHTML = ""
|
||||
}, 3000);
|
||||
});
|
||||
|
||||
// Add the spinner
|
||||
var btn = document.getElementById("type-submit-button");
|
||||
btn.addEventListener('htmx:beforeRequest', function (evt) {
|
||||
btn.classList.add("loading");
|
||||
spinner(btn)
|
||||
});
|
||||
|
||||
btn.addEventListener('htmx:afterRequest', function (evt) {
|
||||
btn.classList.remove("loading");
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
<div id="operation-state" class="warning"> </div><br>
|
||||
<table>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th>ID</th>
|
||||
<th>Name</th>
|
||||
</tr>
|
||||
{{ range .types }}
|
||||
<tr>
|
||||
<th>
|
||||
<a class="type-delete-button"
|
||||
hx-delete="/types/{{ .TypeID }}"
|
||||
hx-on::after-request="handleDeleteResponse(event)"
|
||||
> X </a>
|
||||
</th>
|
||||
<th><a href="/types/{{ .TypeID }}">{{ .TypeID }}</a></th>
|
||||
<th spellcheck="false" contenteditable>{{ .TypeName }}</th>
|
||||
</tr>
|
||||
{{ end }}
|
||||
</table>
|
||||
|
||||
<script>
|
||||
function handleDeleteResponse(evt) {
|
||||
const status = evt.detail.xhr.status;
|
||||
const messageDiv = document.getElementById("operation-state")
|
||||
|
||||
if (status >= 400) {
|
||||
messageDiv.textContent = evt.detail.xhr.responseText || "Delete failed";
|
||||
|
||||
setTimeout(() => {
|
||||
messageDiv.textContent = "";
|
||||
}, 5000);
|
||||
}
|
||||
|
||||
if (status == 204) {
|
||||
const tr = evt.target.closest('tr');
|
||||
tr.remove();
|
||||
}
|
||||
}
|
||||
|
||||
document.querySelectorAll(".type-delete-button").forEach(btn => {
|
||||
// Add the spinner
|
||||
btn.addEventListener('htmx:beforeRequest', function () {
|
||||
btn.classList.add("loading");
|
||||
})
|
||||
|
||||
// Remove the spinner
|
||||
btn.addEventListener('htmx:afterRequest', function (evt) {
|
||||
btn.classList.remove("loading");
|
||||
});
|
||||
})
|
||||
</script>
|
||||
+6
-5
@@ -6,12 +6,13 @@ CREATE TABLE expenses (
|
||||
StoreID int NOT NULL DEFAULT 0,
|
||||
CategoryID int NOT NULL DEFAULT 0,
|
||||
OwnerUserID int NOT NULL DEFAULT 0,
|
||||
ExpTypeID int NOT NULL DEFAULT 0,
|
||||
TypeID int NOT NULL DEFAULT 0,
|
||||
ExpDate int NOT NULL DEFAULT -1,
|
||||
CreationDate int NOT NULL DEFAULT -1,
|
||||
FOREIGN KEY(StoreID) REFERENCES stores(StoreID) ON DELETE RESTRICT,
|
||||
FOREIGN KEY(CategoryID) REFERENCES categories(CategoryID) ON DELETE RESTRICT,
|
||||
FOREIGN KEY(OwnerUserID) REFERENCES users(UserID) ON DELETE RESTRICT
|
||||
FOREIGN KEY(OwnerUserID) REFERENCES users(UserID) ON DELETE RESTRICT,
|
||||
FOREIGN KEY(TypeID) REFERENCES expenseTypes(TypeID) ON DELETE RESTRICT
|
||||
);
|
||||
|
||||
DROP TABLE IF EXISTS stores;
|
||||
@@ -32,11 +33,11 @@ INSERT INTO categories (CategoryID, CategoryName) VALUES(0, 'No Category');
|
||||
|
||||
DROP TABLE IF EXISTS expenseTypes;
|
||||
CREATE TABLE expenseTypes(
|
||||
ExpTypeID integer PRIMARY KEY AUTOINCREMENT,
|
||||
ExpTypeName text NOT NULL
|
||||
TypeID integer PRIMARY KEY AUTOINCREMENT,
|
||||
TypeName text NOT NULL
|
||||
);
|
||||
-- Create a default category for NoCategory
|
||||
INSERT INTO expenseTypes (ExpTypeID, ExpTypeName) VALUES(0, 'expense');
|
||||
INSERT INTO expenseTypes (TypeID, TypeName) VALUES(0, 'expense');
|
||||
|
||||
DROP TABLE IF EXISTS users;
|
||||
CREATE TABLE users(
|
||||
|
||||
@@ -45,7 +45,8 @@ func GetAllExpenses() ([]Expense, error) {
|
||||
"Users.UserID,Users.UserName," +
|
||||
"ExpDate,CreationDate " +
|
||||
"FROM expenses " +
|
||||
"JOIN Stores, Categories " +
|
||||
"JOIN Stores ON stores.StoreID = expenses.StoreID " +
|
||||
"JOIN Categories ON categories.CategoryID = expenses.CategoryID " +
|
||||
"JOIN Users ON UserID = OwnerUserId"
|
||||
|
||||
var expList []Expense
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
package expenses
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"log"
|
||||
"strconv"
|
||||
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
|
||||
type Store struct {
|
||||
StoreID int
|
||||
StoreName string
|
||||
@@ -11,3 +20,102 @@ func NewStore() Store {
|
||||
StoreName: "",
|
||||
}
|
||||
}
|
||||
|
||||
func GetAllStores() ([]Store, error) {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "SELECT StoreID,StoreName " +
|
||||
"FROM stores"
|
||||
|
||||
var storeList []Store
|
||||
rows, err := db.Query(query)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for rows.Next() {
|
||||
store := &Store{}
|
||||
err := rows.Scan(&store.StoreID, &store.StoreName)
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to parse data from db: %v", err)
|
||||
}
|
||||
storeList = append(storeList, *store)
|
||||
}
|
||||
|
||||
return storeList, nil
|
||||
}
|
||||
|
||||
func GetStore(storeID int) (Store, error) {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return Store{}, err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "SELECT StoreID,StoreName " +
|
||||
"FROM stores " +
|
||||
"WHERE StoreID = " + strconv.Itoa(storeID)
|
||||
|
||||
var store Store
|
||||
err = db.QueryRow(query).Scan(&store.StoreID, &store.StoreName)
|
||||
if err != nil {
|
||||
return Store{}, nil
|
||||
}
|
||||
|
||||
return store, nil
|
||||
}
|
||||
|
||||
func (cat *Store) Insert() error {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "INSERT INTO stores(StoreName) VALUES(?)"
|
||||
res, err := db.Exec(query, cat.StoreName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
rowsAffected, err := res.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
} else if rowsAffected == 0 {
|
||||
return fmt.Errorf("no rows were created")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (cat *Store) Delete() 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 := "DELETE FROM stores WHERE StoreID = ?"
|
||||
res, err := db.Exec(query, cat.StoreID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
rowsAffected, err := res.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
} else if rowsAffected == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -0,0 +1,121 @@
|
||||
package expenses
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"log"
|
||||
"strconv"
|
||||
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
|
||||
type Type struct {
|
||||
TypeID int
|
||||
TypeName string
|
||||
}
|
||||
|
||||
func NewType() Type {
|
||||
return Type{
|
||||
TypeID: -1,
|
||||
TypeName: "",
|
||||
}
|
||||
}
|
||||
|
||||
func GetAllTypes() ([]Type, error) {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "SELECT TypeID,TypeName " +
|
||||
"FROM expenseTypes"
|
||||
|
||||
var typeList []Type
|
||||
rows, err := db.Query(query)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for rows.Next() {
|
||||
nType := &Type{}
|
||||
err := rows.Scan(&nType.TypeID, &nType.TypeName)
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to parse data from db: %v", err)
|
||||
}
|
||||
typeList = append(typeList, *nType)
|
||||
}
|
||||
|
||||
return typeList, nil
|
||||
}
|
||||
|
||||
func GetType(storeID int) (Type, error) {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return Type{}, err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "SELECT TypeID,TypeName " +
|
||||
"FROM expenseTypes " +
|
||||
"WHERE TypeID = " + strconv.Itoa(storeID)
|
||||
|
||||
var nType Type
|
||||
err = db.QueryRow(query).Scan(&nType.TypeID, &nType.TypeName)
|
||||
if err != nil {
|
||||
return Type{}, nil
|
||||
}
|
||||
|
||||
return nType, nil
|
||||
}
|
||||
|
||||
func (typ *Type) Insert() error {
|
||||
db, err := sql.Open("sqlite3", "./data/data.db")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
query := "INSERT INTO expenseTypes(TypeName) VALUES(?)"
|
||||
res, err := db.Exec(query, typ.TypeName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
rowsAffected, err := res.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
} else if rowsAffected == 0 {
|
||||
return fmt.Errorf("no rows were created")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (typ *Type) Delete() 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 := "DELETE FROM expenseTypes WHERE TypeID = ?"
|
||||
res, err := db.Exec(query, typ.TypeID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
rowsAffected, err := res.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
} else if rowsAffected == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -24,6 +24,8 @@ func main() {
|
||||
pages.RouteHome(router)
|
||||
pages.RouteExpenses(router)
|
||||
pages.RouteCategories(router)
|
||||
pages.RouteStores(router)
|
||||
pages.RouteTypes(router)
|
||||
pages.RouteNotFound(router)
|
||||
pages.RouteServerError(router)
|
||||
|
||||
|
||||
@@ -4,9 +4,8 @@ import (
|
||||
"expenses/config"
|
||||
"expenses/expenses"
|
||||
"expenses/templating"
|
||||
"fmt"
|
||||
"log"
|
||||
|
||||
"fmt"
|
||||
"net/http"
|
||||
fp "path/filepath"
|
||||
"strconv"
|
||||
@@ -111,12 +110,9 @@ func deleteCategory(c *gin.Context) {
|
||||
c.Redirect(404, "/404")
|
||||
}
|
||||
|
||||
log.Println("Delete requested for category: ", categoryID)
|
||||
|
||||
category := expenses.Category{
|
||||
CategoryID: categoryID,
|
||||
}
|
||||
log.Println("here1")
|
||||
err = category.Delete()
|
||||
if err == expenses.ErrNotFound {
|
||||
errMsg := fmt.Sprintf("category %d not found", categoryID)
|
||||
|
||||
+47
-1
@@ -32,6 +32,22 @@ func expensesContent() (map[string]any, error) {
|
||||
return data, nil
|
||||
}
|
||||
|
||||
func expensesPartial(c *gin.Context) {
|
||||
cfg := config.GetInstance()
|
||||
|
||||
expenses, err := expensesContent()
|
||||
if err != nil {
|
||||
c.Header("HX-Redirect", "/500")
|
||||
return
|
||||
}
|
||||
content := templating.HtmlTemplate(
|
||||
fp.Join(cfg.AssetsDir, "htmx/expenses.html"),
|
||||
expenses,
|
||||
)
|
||||
|
||||
c.String(http.StatusOK, string(content))
|
||||
}
|
||||
|
||||
func ExpensesGlobalPage(c *gin.Context) {
|
||||
cfg := config.GetInstance()
|
||||
|
||||
@@ -89,10 +105,24 @@ func newExpensePage(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
stores, err := expenses.GetAllStores()
|
||||
if err != nil {
|
||||
ServerErrorView(c, "failed to fetch stores")
|
||||
return
|
||||
}
|
||||
|
||||
types, err := expenses.GetAllTypes()
|
||||
if err != nil {
|
||||
ServerErrorView(c, "failed to fetch types")
|
||||
return
|
||||
}
|
||||
|
||||
content := templating.HtmlTemplate(
|
||||
fp.Join(cfg.AssetsDir, "/htmx/expenseNew.html"), map[string]any{
|
||||
"expense": expenses.NewExpense(),
|
||||
"categories": categories,
|
||||
"stores": stores,
|
||||
"types": types,
|
||||
},
|
||||
)
|
||||
|
||||
@@ -103,10 +133,26 @@ func newExpensePage(c *gin.Context) {
|
||||
})
|
||||
}
|
||||
|
||||
func createExpense(c *gin.Context) {
|
||||
// newCatName := c.PostForm("category-name")
|
||||
|
||||
// newExp := expenses.Expense{
|
||||
// CategoryName: newCatName,
|
||||
// }
|
||||
//
|
||||
// err := newExp.Insert()
|
||||
// if err != nil {
|
||||
// c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error()))
|
||||
// }
|
||||
|
||||
c.Header("HX-Trigger", "{\"formState\":\"Success\"}")
|
||||
}
|
||||
|
||||
func RouteExpenses(router *gin.Engine) {
|
||||
router.GET(ExpensesPath, ExpensesGlobalPage)
|
||||
router.GET(ExpensesPath+"/:id", expensePage)
|
||||
router.POST(ExpensesPath, ExpensesGlobalPage)
|
||||
router.POST(ExpensesPath, expensesPartial)
|
||||
|
||||
router.GET(ExpensesPath+"/new", newExpensePage)
|
||||
router.POST(ExpensesPath+"/new", createExpense)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,140 @@
|
||||
package pages
|
||||
|
||||
import (
|
||||
"expenses/config"
|
||||
"expenses/expenses"
|
||||
"expenses/templating"
|
||||
"fmt"
|
||||
|
||||
"net/http"
|
||||
fp "path/filepath"
|
||||
"strconv"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
const (
|
||||
StoresPath = "/stores"
|
||||
)
|
||||
|
||||
func storesContent() (map[string]any, error) {
|
||||
stores, err := expenses.GetAllStores()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
data := map[string]any{
|
||||
"size": len(stores) - 1,
|
||||
"stores": stores,
|
||||
"resource": "stores",
|
||||
}
|
||||
|
||||
return data, nil
|
||||
}
|
||||
|
||||
func storesGlobalPage(c *gin.Context) {
|
||||
cfg := config.GetInstance()
|
||||
|
||||
stores, err := storesContent()
|
||||
if err != nil {
|
||||
c.Header("HX-Redirect", "/500")
|
||||
return
|
||||
}
|
||||
content := templating.HtmlTemplate(
|
||||
fp.Join(cfg.AssetsDir, "htmx/stores.html"),
|
||||
stores,
|
||||
)
|
||||
|
||||
c.HTML(http.StatusOK, "terminal.gotempl", gin.H{
|
||||
"page": "stores",
|
||||
"renderNavBar": true,
|
||||
"content": content,
|
||||
})
|
||||
}
|
||||
|
||||
func storePage(c *gin.Context) {
|
||||
cfg := config.GetInstance()
|
||||
|
||||
storeID, err := strconv.Atoi(c.Param("id"))
|
||||
if err != nil {
|
||||
c.Redirect(404, "/404")
|
||||
}
|
||||
|
||||
store, err := expenses.GetCategory(storeID)
|
||||
content := templating.HtmlTemplate(
|
||||
fp.Join(cfg.AssetsDir, "/htmx/category.html"),
|
||||
map[string]any{
|
||||
"store": store,
|
||||
},
|
||||
)
|
||||
|
||||
c.HTML(http.StatusOK, "terminal.gotempl", gin.H{
|
||||
"page": "store",
|
||||
"renderNavBar": false,
|
||||
"content": content,
|
||||
})
|
||||
}
|
||||
|
||||
func newStorePage(c *gin.Context) {
|
||||
cfg := config.GetInstance()
|
||||
|
||||
content := templating.HtmlTemplate(
|
||||
fp.Join(cfg.AssetsDir, "/htmx/storeNew.html"), map[string]any{},
|
||||
)
|
||||
|
||||
c.HTML(http.StatusOK, "terminal.gotempl", gin.H{
|
||||
"page": "storeNew",
|
||||
"renderNavBar": false,
|
||||
"content": content,
|
||||
})
|
||||
}
|
||||
|
||||
func createStore(c *gin.Context) {
|
||||
newStoreName := c.PostForm("store-name")
|
||||
|
||||
newStore := expenses.Store{
|
||||
StoreName: newStoreName,
|
||||
}
|
||||
|
||||
err := newStore.Insert()
|
||||
if err != nil {
|
||||
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error()))
|
||||
}
|
||||
|
||||
c.Header("HX-Trigger", "{\"formState\":\"Success\"}")
|
||||
}
|
||||
|
||||
func deleteStore(c *gin.Context) {
|
||||
storeID, err := strconv.Atoi(c.Param("id"))
|
||||
if err != nil {
|
||||
c.Redirect(404, "/404")
|
||||
}
|
||||
|
||||
store := expenses.Store{
|
||||
StoreID: storeID,
|
||||
}
|
||||
err = store.Delete()
|
||||
if err == expenses.ErrNotFound {
|
||||
errMsg := fmt.Sprintf("category %d not found", storeID)
|
||||
c.String(http.StatusNotFound, errMsg)
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
errMsg := fmt.Sprintf("error deleting category %d", storeID)
|
||||
c.String(http.StatusInternalServerError, errMsg)
|
||||
return
|
||||
}
|
||||
|
||||
c.Status(http.StatusNoContent)
|
||||
}
|
||||
|
||||
func RouteStores(router *gin.Engine) {
|
||||
router.GET(StoresPath, storesGlobalPage)
|
||||
router.GET(StoresPath+"/:id", storePage)
|
||||
router.POST(StoresPath, storesGlobalPage)
|
||||
|
||||
router.GET(StoresPath+"/new", newStorePage)
|
||||
router.POST(StoresPath+"/new", createStore)
|
||||
router.DELETE(StoresPath+"/:id", deleteStore)
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
package pages
|
||||
|
||||
import (
|
||||
"expenses/config"
|
||||
"expenses/expenses"
|
||||
"expenses/templating"
|
||||
|
||||
"fmt"
|
||||
"net/http"
|
||||
fp "path/filepath"
|
||||
"strconv"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
const (
|
||||
TypesPath = "/types"
|
||||
)
|
||||
|
||||
func typesContent() (map[string]any, error) {
|
||||
types, err := expenses.GetAllTypes()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
data := map[string]any{
|
||||
"size": len(types) - 1,
|
||||
"types": types,
|
||||
"resource": "types",
|
||||
}
|
||||
|
||||
return data, nil
|
||||
}
|
||||
|
||||
func typesGlobalPage(c *gin.Context) {
|
||||
cfg := config.GetInstance()
|
||||
|
||||
types, err := typesContent()
|
||||
if err != nil {
|
||||
c.Header("HX-Redirect", "/500")
|
||||
return
|
||||
}
|
||||
content := templating.HtmlTemplate(
|
||||
fp.Join(cfg.AssetsDir, "htmx/types.html"),
|
||||
types,
|
||||
)
|
||||
|
||||
c.HTML(http.StatusOK, "terminal.gotempl", gin.H{
|
||||
"page": "types",
|
||||
"renderNavBar": true,
|
||||
"content": content,
|
||||
})
|
||||
}
|
||||
|
||||
func typePage(c *gin.Context) {
|
||||
cfg := config.GetInstance()
|
||||
|
||||
typeID, err := strconv.Atoi(c.Param("id"))
|
||||
if err != nil {
|
||||
c.Redirect(404, "/404")
|
||||
}
|
||||
|
||||
typ, err := expenses.GetCategory(typeID)
|
||||
content := templating.HtmlTemplate(
|
||||
fp.Join(cfg.AssetsDir, "/htmx/type.html"),
|
||||
map[string]any{
|
||||
"category": typ,
|
||||
},
|
||||
)
|
||||
|
||||
c.HTML(http.StatusOK, "terminal.gotempl", gin.H{
|
||||
"page": "type",
|
||||
"renderNavBar": false,
|
||||
"content": content,
|
||||
})
|
||||
}
|
||||
|
||||
func newTypePage(c *gin.Context) {
|
||||
cfg := config.GetInstance()
|
||||
|
||||
content := templating.HtmlTemplate(
|
||||
fp.Join(cfg.AssetsDir, "/htmx/typeNew.html"), map[string]any{},
|
||||
)
|
||||
|
||||
c.HTML(http.StatusOK, "terminal.gotempl", gin.H{
|
||||
"page": "typeNew",
|
||||
"renderNavBar": false,
|
||||
"content": content,
|
||||
})
|
||||
}
|
||||
|
||||
func createType(c *gin.Context) {
|
||||
newTypName := c.PostForm("type-name")
|
||||
|
||||
newTyp := expenses.Type{
|
||||
TypeName: newTypName,
|
||||
}
|
||||
|
||||
err := newTyp.Insert()
|
||||
if err != nil {
|
||||
c.Header("HX-Trigger", fmt.Sprintf("{\"formState\":\"%s\"}", err.Error()))
|
||||
}
|
||||
|
||||
c.Header("HX-Trigger", "{\"formState\":\"Success\"}")
|
||||
}
|
||||
|
||||
func deleteType(c *gin.Context) {
|
||||
typeID, err := strconv.Atoi(c.Param("id"))
|
||||
if err != nil {
|
||||
c.Redirect(404, "/404")
|
||||
}
|
||||
|
||||
typ := expenses.Type{
|
||||
TypeID: typeID,
|
||||
}
|
||||
err = typ.Delete()
|
||||
if err == expenses.ErrNotFound {
|
||||
errMsg := fmt.Sprintf("category %d not found", typeID)
|
||||
c.String(http.StatusNotFound, errMsg)
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
errMsg := fmt.Sprintf("error deleting category %d", typeID)
|
||||
c.String(http.StatusInternalServerError, errMsg)
|
||||
return
|
||||
}
|
||||
|
||||
c.Status(http.StatusNoContent)
|
||||
}
|
||||
|
||||
func RouteTypes(router *gin.Engine) {
|
||||
router.GET(TypesPath, typesGlobalPage)
|
||||
router.GET(TypesPath+"/:id", typePage)
|
||||
router.POST(TypesPath, typesGlobalPage)
|
||||
|
||||
router.GET(TypesPath+"/new", newTypePage)
|
||||
router.POST(TypesPath+"/new", createType)
|
||||
router.DELETE(TypesPath+"/:id", deleteType)
|
||||
}
|
||||
Reference in New Issue
Block a user