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