clean routing and move .html to ./public/

main
Bel LaPointe 2023-10-27 20:59:42 -06:00
parent 4858286bd6
commit e36f08deba
2 changed files with 30 additions and 19 deletions

View File

@ -9,7 +9,6 @@ import (
"maps" "maps"
"net/http" "net/http"
"os" "os"
"path"
"slices" "slices"
"sort" "sort"
"strconv" "strconv"
@ -43,12 +42,6 @@ func main() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
deltas, err := f.Deltas()
if err != nil {
panic(err)
}
deltas = deltas.Group(ledger.GroupName(*groupName), ledger.GroupDate(*groupDate))
bpis := make(ledger.BPIs) bpis := make(ledger.BPIs)
if *bpiPath != "" { if *bpiPath != "" {
@ -58,28 +51,41 @@ func main() {
} }
} }
like := ledger.Likes{ledger.LikeName(*likeName)}
if *httpOutput != "" { if *httpOutput != "" {
like = append(like, ledger.LikeBefore(*likeBefore))
like = append(like, ledger.LikeAfter(*likeAfter))
foo := func(w http.ResponseWriter, r *http.Request) { foo := func(w http.ResponseWriter, r *http.Request) {
switch path.Dir(r.URL.Path) { if strings.HasPrefix(r.URL.Path, "/api") {
case "/api": } else if strings.HasPrefix(r.URL.Path, "/transactions") {
case "/": f, err := os.Open("./public/transactions.html")
f, err := os.Open("./index.html")
if err != nil { if err != nil {
panic(err) panic(err)
} }
defer f.Close() defer f.Close()
io.Copy(w, f) io.Copy(w, f)
return return
default: } else if strings.HasPrefix(r.URL.Path, "/graph") || r.URL.Path == "/" {
f, err := os.Open("./public/index.html")
if err != nil {
panic(err)
}
defer f.Close()
io.Copy(w, f)
return
} else {
http.NotFound(w, r) http.NotFound(w, r)
return return
} }
deltas, err := f.Deltas()
if err != nil {
panic(err)
}
deltas = deltas.Group(ledger.GroupName(*groupName), ledger.GroupDate(*groupDate))
like := ledger.Likes{
ledger.LikeName(*likeName),
ledger.LikeBefore(*likeBefore),
ledger.LikeAfter(*likeAfter),
}
foolike := make(ledger.Likes, 0) foolike := make(ledger.Likes, 0)
for _, v := range r.URL.Query()["likeName"] { for _, v := range r.URL.Query()["likeName"] {
foolike = append(foolike, ledger.LikeName(v)) foolike = append(foolike, ledger.LikeName(v))
@ -93,8 +99,7 @@ func main() {
if len(foolike) == 0 { if len(foolike) == 0 {
foolike = like foolike = like
} }
deltas = deltas.Like(foolike...)
deltas := deltas.Like(foolike...)
// MODIFIERS // MODIFIERS
for i, whatIf := range r.URL.Query()["whatIf"] { for i, whatIf := range r.URL.Query()["whatIf"] {
@ -299,6 +304,12 @@ func main() {
panic(err) panic(err)
} }
} else { } else {
deltas, err := f.Deltas()
if err != nil {
panic(err)
}
deltas = deltas.Group(ledger.GroupName(*groupName), ledger.GroupDate(*groupDate))
like := ledger.Likes{ledger.LikeName(*likeName)}
if *likeLedger { if *likeLedger {
like = append(like, ledger.LikeBefore(*likeBefore)) like = append(like, ledger.LikeBefore(*likeBefore))
like = append(like, ledger.LikeAfter(*likeAfter)) like = append(like, ledger.LikeAfter(*likeAfter))