Merge pull request #13 from Tanq16/relnew

code quality, remove cli client, logging, curr/categ edit funcs

Author: Tanq16

README.md

@@ -22,11 +22,9 @@
 
 # Why Create This?
 
-There are a ton of amazing projects for expense tracking across GitHub ([Actual](https://github.com/actualbudget/actual), [Firefly III](https://github.com/firefly-iii/firefly-iii), etc.). They're all incredible, but they aren't the *fastest* when trying to add expenses and offer many features I don't use. Some use varying formats of data or complex APIs. *Don't get me wrong*, they're great when needed, but I wanted something dead simple that only gives me a monthly pie chart and a tabular representation. NOTHING else!
+There are a ton of amazing projects for expense tracking across GitHub ([Actual](https://github.com/actualbudget/actual), [Firefly III](https://github.com/firefly-iii/firefly-iii), etc.). They're all incredible, but they aren't the *fastest* when trying to add expenses and offer many features I don't use. Some use varying formats of data or complex budgeting or complex APIs. *Don't get me wrong*, they're incredible when fully utilized, but I wanted something dead simple that only gives me a monthly pie chart and a tabular representation. NOTHING else!
 
-Hence, I created this project, which I use in my home lab to track my expenses. The data is just JSON, so I can do whatever I want with it, including using `jq` to convert to CSV. The UI is elegant and mobile-friendly.
-
-This app's intention is to track spending across your categories in a simplistic manner. There is no complicated searching or editing - just add, delete, and view! This intention will not change throughout the project's lifecycle. This is not an app for budgeting; it's for tracking.
+So, I created this project, which I use in my home lab to track my expenses. This app's intention is to track spending across your categories (custom or pre-defined) in a simplistic manner. There is no complicated searching or editing - just `add`, `delete`, and `view`! This intention will not change throughout the project's lifecycle. This is *not* an app for budgeting; it's for straightforward tracking.
 
 # Features
 
@@ -39,7 +37,6 @@ This app's intention is to track spending across your categories in a simplistic
 - REST API for expense management
 - Single-user focused (mainly for a home lab deployment)
 - CSV export of all expense data from the UI
-- CLI for both server and client (if needed) operations
 - Custom categories via environment variable (`EXPENSE_CATEGORIES`) with sensible defaults
 - Custom currency symbol in the frontend via environment variable (`CURRENCY`)
 
@@ -68,9 +65,9 @@ I reiterate that you should use this to add expenses quickly. The default name f
 
 In the ideal case, `enter the amount and choose the category` - that's it!
 
-For a bit more involved case, `enter the amount and name, choose the category, and select the date` - still very simple!
+For a bit more involved case, `enter the name, choose the category, enter the amount, and select the date` - still very simple!
 
-The application only allows addition and deletion; there's no need for editing. There are no tags, wallet info, budgeting, or anything else! Plain and simple for the win.
+The application only allows addition and deletion; there's no need for editing (if needed, just delete and re-add). There are no tags, wallet info, budgeting, or anything else! Plain and simple for the win.
 
 # Screenshots
 
@@ -148,30 +145,20 @@ Ideally, once deployed, use the web interface and you're good to go. Access the
 
 If command-line automations are required for use with the REST API, read on!
 
-### CLI Mode
-
-The application binary can run in either server or client mode:
+### Executable
 
-Server Mode (Default):
+The application binary can be run directly within CLI for any common OS and architecture:
 
 ```bash
 ./expenseowl
-# or explicitly
-./expenseowl -serve
 # or from a custom directory
 ./expenseowl -data /custom/path
 ```
 
-Client Mode:
-
-```bash
-./expenseowl -client -addr localhost:8080
-```
-
-In client mode, you'll be prompted to enter the expense name, category (select from a list), amount, and date (in YYYY-MM-DD; optional, sets to the current date when not provided).
-
 ### REST API
 
+ExpenseOwl provides an API to allow adding expenses via automations or simply via cURL, Siri Shortcuts, or other automations.
+
 Add Expense:
 
 ```bash

cmd/expenseowl/main.go

@@ -1,37 +1,28 @@
 package main
 
 import (
-	"bufio"
-	"bytes"
-	"encoding/json"
 	"flag"
-	"fmt"
 	"log"
 	"net/http"
-	"os"
 	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
 
 	"github.com/tanq16/expenseowl/internal/api"
 	"github.com/tanq16/expenseowl/internal/config"
-	"github.com/tanq16/expenseowl/internal/storage/jsonfile"
+	"github.com/tanq16/expenseowl/internal/storage"
 	"github.com/tanq16/expenseowl/internal/web"
 )
 
 func runServer(dataPath string) {
 	cfg := config.NewConfig(dataPath)
-	if err := os.MkdirAll(cfg.StoragePath, 0755); err != nil {
-		log.Fatalf("Failed to create data directory: %v", err)
-	}
-	storage, err := jsonfile.New(filepath.Join(cfg.StoragePath, "expenses.json"))
+	storage, err := storage.New(filepath.Join(cfg.StoragePath, "expenses.json"))
 	if err != nil {
 		log.Fatalf("Failed to initialize storage: %v", err)
 	}
 
 	handler := api.NewHandler(storage, cfg)
 	http.HandleFunc("/categories", handler.GetCategories)
+	http.HandleFunc("/categories/edit", handler.EditCategories)
+	http.HandleFunc("/currency", handler.EditCurrency)
 	http.HandleFunc("/expense", handler.AddExpense)
 	http.HandleFunc("/expenses", handler.GetExpenses)
 	http.HandleFunc("/table", handler.ServeTableView)
@@ -49,123 +40,19 @@ func runServer(dataPath string) {
 		}
 		w.Header().Set("Content-Type", "text/html")
 		if err := web.ServeTemplate(w, "index.html"); err != nil {
+			log.Printf("HTTP ERROR: Failed to serve template: %v", err)
 			http.Error(w, "Failed to serve template", http.StatusInternalServerError)
 			return
 		}
 	})
-	log.Printf("Starting server on port %s...", cfg.ServerPort)
+	log.Printf("Starting server on port %s...\n", cfg.ServerPort)
 	if err := http.ListenAndServe(":"+cfg.ServerPort, nil); err != nil {
 		log.Fatalf("Server failed to start: %v", err)
 	}
 }
 
-func readNonEmptyInput(prompt string) string {
-	reader := bufio.NewReader(os.Stdin)
-	for {
-		fmt.Print(prompt)
-		input, _ := reader.ReadString('\n')
-		input = strings.TrimSpace(input)
-		if input != "" {
-			return input
-		}
-		fmt.Println("This field is required. Please try again.")
-	}
-}
-
-func getCategory(cfg *config.Config) string {
-	fmt.Println("\nAvailable categories:")
-	for i, category := range cfg.Categories {
-		fmt.Printf("%d. %s\n", i+1, category)
-	}
-	for {
-		fmt.Print("\nSelect category: ")
-		reader := bufio.NewReader(os.Stdin)
-		input, _ := reader.ReadString('\n')
-		input = strings.TrimSpace(input)
-		if num, err := strconv.Atoi(input); err == nil && num >= 1 && num <= len(cfg.Categories) {
-			return cfg.Categories[num-1]
-		}
-		fmt.Println("Invalid selection. Please try again.")
-	}
-}
-
-func getAmount() float64 {
-	for {
-		input := readNonEmptyInput("Enter amount: ")
-		amount, err := strconv.ParseFloat(input, 64)
-		if err == nil && amount > 0 {
-			return amount
-		}
-		fmt.Println("Invalid amount. Please enter a positive number.")
-	}
-}
-
-func getDate() time.Time {
-	reader := bufio.NewReader(os.Stdin)
-	fmt.Print("Enter date (YYYY-MM-DD, press Enter for today): ")
-	input, _ := reader.ReadString('\n')
-	input = strings.TrimSpace(input)
-	if input == "" {
-		return time.Now()
-	}
-	currTime := time.Now()
-	if date, err := time.ParseInLocation("2006-01-02", input, time.Local); err == nil {
-		return time.Date(
-			date.Year(), date.Month(), date.Day(),
-			currTime.Hour(), currTime.Minute(), currTime.Second(), currTime.Nanosecond(),
-			time.Local,
-		)
-	}
-	fmt.Println("Invalid date format, using current time.")
-	return time.Now()
-}
-
-func runClient(serverAddr string) {
-	cfg := config.NewConfig("data") // Default data path hardcoded for client
-	name := readNonEmptyInput("Enter expense name: ")
-	category := getCategory(cfg)
-	amount := getAmount()
-	date := getDate()
-	expense := api.ExpenseRequest{
-		Name:     name,
-		Category: category,
-		Amount:   amount,
-		Date:     date,
-	}
-
-	jsonData, err := json.Marshal(expense)
-	if err != nil {
-		log.Fatalf("Failed to marshal expense data: %v", err)
-	}
-	url := fmt.Sprintf("http://%s/expense", serverAddr)
-	resp, err := http.NewRequest(http.MethodPut, url, bytes.NewBuffer(jsonData))
-	if err != nil {
-		log.Fatalf("Failed to create request: %v", err)
-	}
-	resp.Header.Set("Content-Type", "application/json")
-
-	client := &http.Client{}
-	response, err := client.Do(resp)
-	if err != nil {
-		log.Fatalf("Failed to send request: %v", err)
-	}
-	defer response.Body.Close()
-	if response.StatusCode != http.StatusOK {
-		log.Fatalf("Server returned error: %s", response.Status)
-	}
-	fmt.Println("Expense added successfully!")
-}
-
 func main() {
-	isServer := flag.Bool("serve", true, "Run as server (default true)")
-	isClient := flag.Bool("client", false, "Run as client")
-	serverAddr := flag.String("addr", "localhost:8080", "Server address (for client mode)")
 	dataPath := flag.String("data", "data", "Path to data directory")
 	flag.Parse()
-	// If both flags are provided, prefer client mode
-	if *isClient {
-		runClient(*serverAddr)
-	} else if *isServer {
-		runServer(*dataPath)
-	}
+	runServer(*dataPath)
 }