Fix linter issues

Reviewed-on: #55

.drone.yml

@@ -4,6 +4,11 @@ type: docker
 name: budgeteer
 
 steps:
+- name: submodules
+  image: alpine/git
+  commands:
+  - git submodule update --recursive --init
+
 - name: Taskfile.dev PR
   image: hub.javil.eu/budgeteer:dev
   commands:
@@ -18,9 +23,10 @@ steps:
   commands:
     - task ci
   when:
+    branch:
+    - master
     event:
-      exclude:
+    - push
-      - pull_request
 
 - name: docker  
   image: plugins/docker
@@ -32,7 +38,7 @@ steps:
       from_secret: docker_password
     repo: hub.javil.eu/budgeteer
     context: build
-    dockerfile: build/Dockerfile
+    dockerfile: docker/Dockerfile
     tags: 
       - latest
   when:
@@ -51,11 +57,19 @@ steps:
       from_secret: docker_password
     repo: hub.javil.eu/budgeteer
     context: build
-    dockerfile: build/Dockerfile
+    dockerfile: docker/Dockerfile
     auto_tag: true
   when:
     event:
     - tag
 
+services:
+- name: db
+  image: postgres:alpine
+  environment:
+    POSTGRES_USER: budgeteer
+    POSTGRES_PASSWORD: budgeteer
+    POSTGRES_DB: budgeteer_test
+
 image_pull_secrets:
 - hub.javil.eu 

.earthignore

@@ -1,10 +0,0 @@
-build/
-.git/
-docker-compose.yml
-README.md
-Earthfile
-config.example.json
-.gitignore
-.vscode/
-budgeteer
-budgeteer.exe

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "testdata"]
+	path = testdata
+	url = https://git.javil.eu/jacob1123/budgeteer-testdata.git

.vscode/settings.json

@@ -1,9 +1,15 @@
 {
         "files.exclude": {
                 "**/node_modules": true,
-                "**/vendor": true
+                "**/vendor": true,
+                "**/*.sql.go": true,
+                ".task/": true,
+                "build/": true,
+                "web/dist/": true
         },
         "gopls": {
                 "formatting.gofumpt": true,
-        }
+        },
+        "editor.detectIndentation": false,
+        "editor.tabSize": 2
 }

.woodpecker.yml

@@ -1,23 +0,0 @@
-pipeline:
-  build:
-    name: Taskfile.dev
-    image: hub.javil.eu/budgeteer:dev
-    pull: true
-    commands:
-      - task ci
-
-  docker:
-    image: plugins/docker
-    secrets: [ docker_username, docker_password ]
-    settings:
-      registry: hub.javil.eu
-      repo: hub.javil.eu/budgeteer
-      context: build
-      dockerfile: build/Dockerfile
-      tags: 
-        - latest
-    when:
-      event: [push, tag, deployment]
-
-image_pull_secrets:
-- hub.javil.eu 

Earthfile

@@ -1,21 +0,0 @@
-FROM golang:1.17
-WORKDIR /src
-
-build:
-	COPY go.mod go.sum .
-	RUN go mod download
-	COPY . .
-	RUN --mount=type=cache,target=/root/.cache/go-build go build -o build/budgeteer ./cmd/budgeteer
-	SAVE ARTIFACT build/budgeteer /budgeteer AS LOCAL build/budgeteer
-
-docker:
-	WORKDIR /app
-	COPY +build/budgeteer .
-	ENTRYPOINT ["/app/budgeteer"]
-	SAVE IMAGE hub.javil.eu/budgeteer:latest
-
-run:
-	LOCALLY
-	WITH DOCKER --load=+docker
-		RUN docker-compose up -d
-	END

README.md

@@ -1,20 +1,18 @@
 # Budgeteer
 
-Budgeting Web-Application
+Budgeting Web-Application written in Go and inspired by [YNAB](https://youneedabudget.com).
 
-## Data structure
+## Getting started
 
-1 User
+The fastest way to get up and running quickly, is using docker-compose. Just download the [docker-compose.yml](https://git.javil.eu/jacob1123/budgeteer/src/branch/master/docker/docker-compose.yml) to some empty directory and run `docker-compose up -d`. This starts budgeteer, a postgres database and an adminer instance. The latter is optional and can be removed from the docker-compose.yml.
-N Budgets
-        AccountID[]
-        CategoryID[]
-        PayeeID[]
 
-N Accounts
+## Known issues
-        TransactionID[]
-N Categories
-        AssignmentID[]
-N Payees
 
-N Transactions
+Currently the application is usable when importing from YNAB via their CSV export. All balances should match the balances from YNAB. There are even unit-tests that confirm that using my personal budget.
-N Assignments
+
+For people wishing to start fresh in Budgeteer, there currently are some blockers though:
+- The ability to create new accounts and categories is missing (#59)
+
+## Contributing
+
+If you're willing to help, please check the issues for [help-wanted labels](https://git.javil.eu/jacob1123/budgeteer/issues?labels=4). Just using Budgeteer and reporting any issues is although very helpful. 

Taskfile.yml

@@ -5,30 +5,31 @@ vars:
 
 tasks:
   default:
+    desc: Build budgeteer in production mode
+    deps: [frontend, go-mod, go-sqlc]
     cmds:
-      - task: build-prod
+      - task: backend
 
-  sqlc:
+  run:
-    desc: sqlc code generation
+    desc: Start budgeteer
-    sources:
+    deps: [backend, go-mod, go-sqlc]
-      - ./sqlc.yaml
-      - ./postgres/schema/*
-      - ./postgres/queries/*
-    generates:
-      - ./postgres/*.sql.go
     cmds:
-      - sqlc generate
+      - ./build/budgeteer{{exeExt}}
 
-  gomod:
+  dev:
-    desc: Go modules
+    desc: Build budgeteer in dev mode (without frontend)
-    sources:
+    deps: [go-mod, go-sqlc]
-      - ./go.mod
-      - ./go.sum
-    method: checksum
     cmds:
-      - go mod download
+      - task: backend
 
-  build:
+  ci:
+    desc: Run CI build
+    deps: [default, static]
+
+  static:
+    deps: [go-lint, go-vet, go-fmt, js-tsc, js-lint, cover]
+
+  backend:
     desc: Build budgeteer
     sources:
       - ./go.mod
@@ -43,70 +44,99 @@ tasks:
     cmds:
       - go build -o ./build/budgeteer{{exeExt}} ./cmd/budgeteer
 
-  build-dev:
+  go-vet:
-    desc: Build budgeteer in dev mode
-    deps: [gomod, sqlc]
     cmds:
       - go vet
-      - go fmt
-      - golangci-lint run
-      - task: build
 
-  build-prod:
+  go-fmt:
-    desc: Build budgeteer in prod mode
-    deps: [gomod, sqlc, frontend]
     cmds:
-      - go vet
       - go fmt
-      - golangci-lint run
-      - task: build
 
-  ci:
+  go-lint:
-    desc: Run CI build
     cmds:
-      - task: build-prod
+      - golangci-lint run
-      - go test ./...
+
+  go-sqlc:
+    desc: sqlc code generation
+    sources:
+      - ./sqlc.yaml
+      - ./postgres/schema/*
+      - ./postgres/queries/*
+    generates:
+      - ./postgres/*.sql.go
+    cmds:
+      - sqlc generate
+
+  go-mod:
+    desc: Go modules
+    sources:
+      - ./go.mod
+      - ./go.sum
+    method: checksum
+    cmds:
+      - go mod download
+
+  cover:
+    desc: Run test and analyze coverage
+    cmds:
+      - go test ./... -coverprofile=coverage.out -covermode=atomic
+      - go tool cover -html=coverage.out -o=coverage.html 
 
   frontend:
     desc: Build vue frontend
-    dir: web
+    deps: [js-build]
     sources:
       - web/src/**/*
     generates:
       - web/dist/**/*
+
+  frontend-dev:
+    desc: Run dev-server for frontend
+    dir: web
+    cmds:
+      - yarn run dev
+
+  js-build:
+    dir: web
+    deps: [js-mod]
+    cmds:
+      - yarn build
+
+  js-mod:
+    run: once
+    sources:
+      - web/src/package.json
+      - web/src/yarn.lock
+    generates:
+      - web/node_modules/**/*
+    dir: web
     cmds:
       - yarn
-      - yarn build
+  
+  js-tsc:
+    dir: web
+    deps: [js-mod]
+    cmds:
       - yarn run vue-tsc --noEmit
 
-  docker:
+  js-lint:
-    desc: Build budgeeter:latest
+    dir: web
-    deps: [build-prod]
+    deps: [js-mod]
-    sources:
-      - ./build/budgeteer{{exeExt}}
-      - ./build/Dockerfile
     cmds:
-      - docker build -t {{.IMAGE_NAME}}:latest ./build
+      - yarn run eslint "./src/**"
-      - docker push {{.IMAGE_NAME}}:latest
 
   dev-docker:
     desc: Build budgeeter:dev
     sources:
-      - ./docker/Dockerfile
+      - ./docker/Dockerfile.dev
-      - ./docker/build.sh
       - ./web/package.json
+      - ./web/yarn.lock
     cmds:
-      - docker build -t {{.IMAGE_NAME}}:dev . -f docker/Dockerfile
+    - docker build -t {{.IMAGE_NAME}}:dev . -f docker/Dockerfile.dev
     - docker push {{.IMAGE_NAME}}:dev
   
-  run:
+  run-dev:
-    desc: Start budgeteer
+    desc: Run dev environment in docker
-    deps: [build-dev]
+    deps: [dev-docker]
     cmds:
-      - ./build/budgeteer{{exeExt}}
+      - docker-compose -f docker/docker-compose.dev.yml -p budgeteer up -d
-
-  rundocker:
-    desc: Start docker-compose
-    deps: [docker]
-    cmds:
-      - docker-compose up -d

build/Dockerfile

@@ -1,3 +0,0 @@
-FROM scratch
-COPY ./budgeteer /app/budgeteer
-ENTRYPOINT ["/app/budgeteer"]

cmd/budgeteer/main.go

@@ -17,22 +17,22 @@ import (
 func main() {
 	cfg, err := config.LoadConfig()
 	if err != nil {
-		log.Fatalf("Could not load config: %v", err)
+		log.Fatalf("load config: %v", err)
 	}
 
 	queries, err := postgres.Connect("pgx", cfg.DatabaseConnection)
 	if err != nil {
-		log.Fatalf("Failed connecting to DB: %v", err)
+		log.Fatalf("connect to database: %v", err)
 	}
 
 	static, err := fs.Sub(web.Static, "dist")
 	if err != nil {
-		panic("couldn't open static files")
+		panic("open static files")
 	}
 
 	tokenVerifier, err := jwt.NewTokenVerifier(cfg.SessionSecret)
 	if err != nil {
-		panic(fmt.Errorf("couldn't create token verifier: %w", err))
+		panic(fmt.Errorf("create token verifier: %w", err))
 	}
 
 	handler := &server.Handler{

config.example.json

@@ -1,6 +0,0 @@
-{
-	"DatabaseHost": "localhost", 
-	"DatabaseUser": "user", 
-	"DatabasePassword": "thisismypassword", 
-	"DatabaseName": "budgeteer"
-}

docker/Dockerfile

@@ -1,17 +1,3 @@
-FROM alpine as godeps
+FROM scratch
-RUN apk --no-cache add go
+COPY ./budgeteer /app/budgeteer
-RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
+ENTRYPOINT ["/app/budgeteer"]
-RUN go install github.com/go-task/task/v3/cmd/task@latest
-RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
-
-FROM alpine
-RUN apk --no-cache add go nodejs yarn bash curl git git-perl tmux
-ADD docker/build.sh /
-RUN yarn global add @vue/cli
-ENV PATH="/root/.yarn/bin/:${PATH}"
-WORKDIR /src/web
-ADD web/package.json web/yarn.lock /src/web/
-RUN yarn
-WORKDIR /src
-COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/
-CMD /build.sh

docker/Dockerfile.dev

@@ -0,0 +1,15 @@
+FROM alpine as godeps
+RUN apk --no-cache add go
+RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
+RUN go install github.com/go-task/task/v3/cmd/task@latest
+RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+
+FROM alpine
+RUN apk --no-cache add go nodejs yarn bash curl git git-perl
+ENV PATH="/root/.yarn/bin/:${PATH}"
+WORKDIR /src/web
+ADD web/package.json web/yarn.lock /src/web/
+WORKDIR /src
+VOLUME /go
+VOLUME /.cache
+COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/

docker/docker-compose.dev.yml

@@ -1,26 +1,31 @@
 version: '3.7'
 
 services:
-        app:
+        backend:
                 image: hub.javil.eu/budgeteer:dev
-                container_name: budgeteer
+                command: task -w run
-                stdin_open: true # docker run -i
-                tty: true        # docker run -t
                 ports:
                         - 1323:1323
-                        - 3000:3000
-                user: '1000' 
                 volumes:
                         - ~/budgeteer:/src
-                        - ~/.gitconfig:/.gitconfig
+                        - go-cache:/go
-                        - ~/.go:/go
+                        - yarn-cache:/.cache
-                        - ~/.cache:/.cache
                 environment:
                         BUDGETEER_DB: postgres://budgeteer:budgeteer@db:5432/budgeteer
                         BUDGETEER_SESSION_SECRET: random string for JWT authorization
                 depends_on:
                         - db
 
+        frontend:
+                image: hub.javil.eu/budgeteer:dev
+                command: task frontend-dev
+                ports:
+                        - 3000:3000
+                volumes:
+                        - ~/budgeteer:/src
+                depends_on:
+                        - backend
+
         db:
                 image: postgres:14
                 ports:
@@ -41,3 +46,5 @@ services:
                 
 volumes:
         db:
+        go-cache:
+        yarn-cache:

go.mod

@@ -4,21 +4,28 @@ go 1.17
 
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/gin-gonic/gin v1.7.4
 	github.com/google/uuid v1.3.0
 	github.com/jackc/pgx/v4 v4.13.0
 	github.com/pressly/goose/v3 v3.3.1
 	golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa
 )
 
-require github.com/DATA-DOG/go-txdb v0.1.5 // indirect
+require (
+	github.com/DATA-DOG/go-txdb v0.1.5
+	github.com/labstack/echo/v4 v4.8.0
+)
+
+require (
+	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
+	github.com/labstack/gommon v0.3.1 // indirect
+	github.com/mattn/go-colorable v0.1.11 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasttemplate v1.2.1 // indirect
+	golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
+	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
+)
 
 require (
-	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-playground/locales v0.13.0 // indirect
-	github.com/go-playground/universal-translator v0.17.0 // indirect
-	github.com/go-playground/validator/v10 v10.4.1 // indirect
-	github.com/golang/protobuf v1.5.0 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.10.0 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
@@ -26,16 +33,9 @@ require (
 	github.com/jackc/pgproto3/v2 v2.1.1 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
 	github.com/jackc/pgtype v1.8.1 // direct
-	github.com/json-iterator/go v1.1.9 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/leodido/go-urn v1.2.0 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
-	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/ugorji/go/codec v1.1.7 // indirect
+	golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect
-	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
+	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/text v0.3.6 // indirect
-	google.golang.org/protobuf v1.26.0 // indirect
-	gopkg.in/yaml.v2 v2.3.0 // indirect
 )

go.sum

@@ -56,24 +56,13 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.7.4 h1:QmUZXrvJ9qZ3GfWvQ+2wnW/1ePrTEJqPKMYEU3lD/DM=
-github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
-github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -82,13 +71,14 @@ github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
+github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -96,7 +86,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -104,9 +93,7 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
@@ -167,8 +154,6 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -177,14 +162,14 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
+github.com/labstack/echo/v4 v4.8.0 h1:wdc6yKVaHxkNOEdz4cRZs1pQkwSXPiRjq69yWP4QQS8=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/labstack/echo/v4 v4.8.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
+github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o=
+github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
 github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -197,10 +182,13 @@ github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
+github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU=
 github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
@@ -210,10 +198,6 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
 github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -282,11 +266,11 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
-github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
+github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -321,6 +305,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa h1:idItI2DDfCokpg0N51B2VtiLdJ4vAuXC9fnCb2gACo4=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -342,6 +327,7 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -375,17 +361,23 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211103235746-7861aae1554b h1:1VkfZQv42XQlA/jchYumAnv1UPo6RgF9rJFkTgZIxO4=
+golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -405,7 +397,6 @@ golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -418,11 +409,9 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
@@ -430,11 +419,10 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

jwt/token-verifier.go

@@ -12,10 +12,11 @@ import (
 
 // TokenVerifier verifies Tokens.
 type TokenVerifier struct {
+	Expiration time.Duration
 	secret     string
 }
 
-var ErrEmptySecret = fmt.Errorf("secret is required")
+const DefaultExpiration = time.Hour * time.Duration(72)
 
 func NewTokenVerifier(secret string) (*TokenVerifier, error) {
 	if secret == "" {
@@ -23,20 +24,16 @@ func NewTokenVerifier(secret string) (*TokenVerifier, error) {
 	}
 
 	return &TokenVerifier{
+		Expiration: DefaultExpiration,
 		secret:     secret,
 	}, nil
 }
 
-// Token contains everything to authenticate a user.
+var (
-type Token struct {
+	ErrUnexpectedSigningMethod = fmt.Errorf("unexpected signing method")
-	username string
+	ErrInvalidToken            = fmt.Errorf("token is invalid")
-	name     string
+	ErrTokenExpired            = fmt.Errorf("token has expired")
-	expiry   float64
+	ErrEmptySecret             = fmt.Errorf("secret is required")
-	id       uuid.UUID
-}
-
-const (
-	expiration = 72
 )
 
 // CreateToken creates a new token from username and name.
@@ -48,7 +45,7 @@ func (tv *TokenVerifier) CreateToken(user *postgres.User) (string, error) {
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
 		"usr":  user.Email,
 		"name": user.Name,
-		"exp":  time.Now().Add(time.Hour * expiration).Unix(),
+		"exp":  time.Now().Add(tv.Expiration).Unix(),
 		"id":   user.ID,
 	})
 
@@ -61,13 +58,7 @@ func (tv *TokenVerifier) CreateToken(user *postgres.User) (string, error) {
 	return t, nil
 }
 
-var (
+// VerifyToken verifies a given string-token.
-	ErrUnexpectedSigningMethod = fmt.Errorf("unexpected signing method")
-	ErrInvalidToken            = fmt.Errorf("token is invalid")
-	ErrTokenExpired            = fmt.Errorf("token has expired")
-)
-
-// VerifyToken verifys a given string-token.
 func (tv *TokenVerifier) VerifyToken(tokenString string) (budgeteer.Token, error) { //nolint:ireturn
 	if tv.secret == "" {
 		return nil, ErrEmptySecret
@@ -96,36 +87,3 @@ func (tv *TokenVerifier) VerifyToken(tokenString string) (budgeteer.Token, error
 	}
 	return tkn, nil
 }
-
-func verifyToken(token *jwt.Token) (jwt.MapClaims, error) {
-	if !token.Valid {
-		return nil, ErrInvalidToken
-	}
-
-	claims, ok := token.Claims.(jwt.MapClaims)
-	if !ok {
-		return nil, ErrInvalidToken
-	}
-
-	if !claims.VerifyExpiresAt(time.Now().Unix(), true) {
-		return nil, ErrTokenExpired
-	}
-
-	return claims, nil
-}
-
-func (t *Token) GetName() string {
-	return t.name
-}
-
-func (t *Token) GetUsername() string {
-	return t.username
-}
-
-func (t *Token) GetExpiry() float64 {
-	return t.expiry
-}
-
-func (t *Token) GetID() uuid.UUID {
-	return t.id
-}

jwt/token.go

@@ -0,0 +1,49 @@
+package jwt
+
+import (
+	"time"
+
+	"github.com/dgrijalva/jwt-go"
+	"github.com/google/uuid"
+)
+
+// Token contains everything to authenticate a user.
+type Token struct {
+	username string
+	name     string
+	expiry   float64
+	id       uuid.UUID
+}
+
+func verifyToken(token *jwt.Token) (jwt.MapClaims, error) {
+	if !token.Valid {
+		return nil, ErrInvalidToken
+	}
+
+	claims, ok := token.Claims.(jwt.MapClaims)
+	if !ok {
+		return nil, ErrInvalidToken
+	}
+
+	if !claims.VerifyExpiresAt(time.Now().Unix(), true) {
+		return nil, ErrTokenExpired
+	}
+
+	return claims, nil
+}
+
+func (t *Token) GetName() string {
+	return t.name
+}
+
+func (t *Token) GetUsername() string {
+	return t.username
+}
+
+func (t *Token) GetExpiry() float64 {
+	return t.expiry
+}
+
+func (t *Token) GetID() uuid.UUID {
+	return t.id
+}

postgres/accounts.sql.go

@@ -1,11 +1,13 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: accounts.sql
 
 package postgres
 
 import (
 	"context"
-	"time"
+	"database/sql"
 
 	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
 	"github.com/google/uuid"
@@ -15,7 +17,7 @@ const createAccount = `-- name: CreateAccount :one
 INSERT INTO accounts
 (name, budget_id)
 VALUES ($1, $2)
-RETURNING id, budget_id, name, on_budget
+RETURNING id, budget_id, name, on_budget, is_open, last_reconciled
 `
 
 type CreateAccountParams struct {
@@ -31,12 +33,14 @@ func (q *Queries) CreateAccount(ctx context.Context, arg CreateAccountParams) (A
 		&i.BudgetID,
 		&i.Name,
 		&i.OnBudget,
+		&i.IsOpen,
+		&i.LastReconciled,
 	)
 	return i, err
 }
 
 const getAccount = `-- name: GetAccount :one
-SELECT accounts.id, accounts.budget_id, accounts.name, accounts.on_budget FROM accounts
+SELECT accounts.id, accounts.budget_id, accounts.name, accounts.on_budget, accounts.is_open, accounts.last_reconciled FROM accounts
 WHERE accounts.id = $1
 `
 
@@ -48,13 +52,16 @@ func (q *Queries) GetAccount(ctx context.Context, id uuid.UUID) (Account, error)
 		&i.BudgetID,
 		&i.Name,
 		&i.OnBudget,
+		&i.IsOpen,
+		&i.LastReconciled,
 	)
 	return i, err
 }
 
 const getAccounts = `-- name: GetAccounts :many
-SELECT accounts.id, accounts.budget_id, accounts.name, accounts.on_budget FROM accounts
+SELECT accounts.id, accounts.budget_id, accounts.name, accounts.on_budget, accounts.is_open, accounts.last_reconciled FROM accounts
 WHERE accounts.budget_id = $1
+AND accounts.is_open = TRUE
 ORDER BY accounts.name
 `
 
@@ -72,6 +79,8 @@ func (q *Queries) GetAccounts(ctx context.Context, budgetID uuid.UUID) ([]Accoun
 			&i.BudgetID,
 			&i.Name,
 			&i.OnBudget,
+			&i.IsOpen,
+			&i.LastReconciled,
 		); err != nil {
 			return nil, err
 		}
@@ -87,13 +96,13 @@ func (q *Queries) GetAccounts(ctx context.Context, budgetID uuid.UUID) ([]Accoun
 }
 
 const getAccountsWithBalance = `-- name: GetAccountsWithBalance :many
-SELECT accounts.id, accounts.name, accounts.on_budget, 
+SELECT accounts.id, accounts.name, accounts.on_budget, accounts.is_open, accounts.last_reconciled,
-        (SELECT MAX(transactions.date) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.status = 'Reconciled')::date as last_reconciled,
         (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW())::decimal(12,2) as working_balance,
         (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status IN ('Cleared', 'Reconciled'))::decimal(12,2) as cleared_balance,
         (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status = 'Reconciled')::decimal(12,2) as reconciled_balance
 FROM accounts
 WHERE accounts.budget_id = $1
+AND accounts.is_open = TRUE
 ORDER BY accounts.name
 `
 
@@ -101,7 +110,8 @@ type GetAccountsWithBalanceRow struct {
 	ID                uuid.UUID
 	Name              string
 	OnBudget          bool
-	LastReconciled    time.Time
+	IsOpen            bool
+	LastReconciled    sql.NullTime
 	WorkingBalance    numeric.Numeric
 	ClearedBalance    numeric.Numeric
 	ReconciledBalance numeric.Numeric
@@ -120,6 +130,7 @@ func (q *Queries) GetAccountsWithBalance(ctx context.Context, budgetID uuid.UUID
 			&i.ID,
 			&i.Name,
 			&i.OnBudget,
+			&i.IsOpen,
 			&i.LastReconciled,
 			&i.WorkingBalance,
 			&i.ClearedBalance,
@@ -141,7 +152,8 @@ func (q *Queries) GetAccountsWithBalance(ctx context.Context, budgetID uuid.UUID
 const searchAccounts = `-- name: SearchAccounts :many
 SELECT accounts.id, accounts.budget_id, accounts.name, 'account' as type FROM accounts
 WHERE accounts.budget_id = $1
-AND accounts.name LIKE $2
+AND accounts.is_open = TRUE
+AND accounts.name ILIKE $2
 ORDER BY accounts.name
 `
 
@@ -185,28 +197,48 @@ func (q *Queries) SearchAccounts(ctx context.Context, arg SearchAccountsParams)
 	return items, nil
 }
 
+const setLastReconciled = `-- name: SetLastReconciled :exec
+UPDATE accounts
+SET last_reconciled = NOW()
+WHERE accounts.id = $1
+`
+
+func (q *Queries) SetLastReconciled(ctx context.Context, id uuid.UUID) error {
+	_, err := q.db.ExecContext(ctx, setLastReconciled, id)
+	return err
+}
+
 const updateAccount = `-- name: UpdateAccount :one
 UPDATE accounts
 SET name = $1,
-    on_budget = $2
+    on_budget = $2,
-WHERE accounts.id = $3
+    is_open = $3
-RETURNING id, budget_id, name, on_budget
+WHERE accounts.id = $4
+RETURNING id, budget_id, name, on_budget, is_open, last_reconciled
 `
 
 type UpdateAccountParams struct {
 	Name     string
 	OnBudget bool
+	IsOpen   bool
 	ID       uuid.UUID
 }
 
 func (q *Queries) UpdateAccount(ctx context.Context, arg UpdateAccountParams) (Account, error) {
-	row := q.db.QueryRowContext(ctx, updateAccount, arg.Name, arg.OnBudget, arg.ID)
+	row := q.db.QueryRowContext(ctx, updateAccount,
+		arg.Name,
+		arg.OnBudget,
+		arg.IsOpen,
+		arg.ID,
+	)
 	var i Account
 	err := row.Scan(
 		&i.ID,
 		&i.BudgetID,
 		&i.Name,
 		&i.OnBudget,
+		&i.IsOpen,
+		&i.LastReconciled,
 	)
 	return i, err
 }

postgres/assignments.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: assignments.sql
 
 package postgres
@@ -17,7 +19,7 @@ INSERT INTO assignments (
 ) VALUES (
         $1, $2, $3
 )
-RETURNING id, category_id, date, memo, amount
+RETURNING category_id, date, memo, amount
 `
 
 type CreateAssignmentParams struct {
@@ -30,7 +32,6 @@ func (q *Queries) CreateAssignment(ctx context.Context, arg CreateAssignmentPara
 	row := q.db.QueryRowContext(ctx, createAssignment, arg.Date, arg.Amount, arg.CategoryID)
 	var i Assignment
 	err := row.Scan(
-		&i.ID,
 		&i.CategoryID,
 		&i.Date,
 		&i.Memo,
@@ -130,3 +131,41 @@ func (q *Queries) GetAssignmentsByMonthAndCategory(ctx context.Context, budgetID
 	}
 	return items, nil
 }
+
+const updateAssignment = `-- name: UpdateAssignment :exec
+INSERT INTO assignments (category_id, date, amount)
+VALUES($1, $2, $3) 
+ON CONFLICT (category_id, date) 
+DO 
+   UPDATE SET amount = $3
+`
+
+type UpdateAssignmentParams struct {
+	CategoryID uuid.UUID
+	Date       time.Time
+	Amount     numeric.Numeric
+}
+
+func (q *Queries) UpdateAssignment(ctx context.Context, arg UpdateAssignmentParams) error {
+	_, err := q.db.ExecContext(ctx, updateAssignment, arg.CategoryID, arg.Date, arg.Amount)
+	return err
+}
+
+const updateAssignmentWithDifference = `-- name: UpdateAssignmentWithDifference :exec
+INSERT INTO assignments (category_id, date, amount)
+VALUES($1, $2, $3) 
+ON CONFLICT (category_id, date) 
+DO 
+   UPDATE SET amount = assignments.amount + $3
+`
+
+type UpdateAssignmentWithDifferenceParams struct {
+	CategoryID uuid.UUID
+	Date       time.Time
+	Amount     numeric.Numeric
+}
+
+func (q *Queries) UpdateAssignmentWithDifference(ctx context.Context, arg UpdateAssignmentWithDifferenceParams) error {
+	_, err := q.db.ExecContext(ctx, updateAssignmentWithDifference, arg.CategoryID, arg.Date, arg.Amount)
+	return err
+}

postgres/budgets.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: budgets.sql
 
 package postgres

postgres/budgetservice.go

@@ -59,5 +59,6 @@ func (s *Database) NewBudget(context context.Context, name string, userID uuid.U
 		return nil, fmt.Errorf("commit: %w", err)
 	}
 
+	budget.IncomeCategoryID = cat.ID
 	return &budget, nil
 }

postgres/categories.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: categories.sql
 
 package postgres
@@ -122,7 +124,8 @@ SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.
 FROM categories
 INNER JOIN category_groups ON categories.category_group_id = category_groups.id
 WHERE category_groups.budget_id = $1
-AND categories.name LIKE $2
+AND categories.name ILIKE $2
+AND category_groups.name != 'Hidden Categories'
 ORDER BY category_groups.name, categories.name
 `
 

postgres/cumultative-balances.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: cumultative-balances.sql
 
 package postgres
@@ -13,21 +15,19 @@ import (
 
 const getCumultativeBalances = `-- name: GetCumultativeBalances :many
 SELECT COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id),
-       COALESCE(ass.amount, 0)::decimal(12,2) as assignments, SUM(ass.amount) OVER (PARTITION BY ass.category_id ORDER BY ass.date)::decimal(12,2) as assignments_cum,
+       COALESCE(ass.amount, 0)::decimal(12,2) as assignments,
-       COALESCE(tra.amount, 0)::decimal(12,2) as transactions, SUM(tra.amount) OVER (PARTITION BY tra.category_id ORDER BY tra.date)::decimal(12,2) as transactions_cum
+       COALESCE(tra.amount, 0)::decimal(12,2) as transactions
 FROM assignments_by_month as ass
 FULL OUTER JOIN transactions_by_month as tra ON ass.date = tra.date AND ass.category_id = tra.category_id
-WHERE (ass.budget_id IS NULL OR ass.budget_id = $1) AND (tra.budget_id IS NULL OR tra.budget_id = $1)
+WHERE COALESCE(ass.budget_id, tra.budget_id) = $1
-ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id)
+ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.amount, tra.amount)
 `
 
 type GetCumultativeBalancesRow struct {
 	Date         time.Time
 	CategoryID   uuid.UUID
 	Assignments  numeric.Numeric
-	AssignmentsCum  numeric.Numeric
 	Transactions numeric.Numeric
-	TransactionsCum numeric.Numeric
 }
 
 func (q *Queries) GetCumultativeBalances(ctx context.Context, budgetID uuid.UUID) ([]GetCumultativeBalancesRow, error) {
@@ -43,9 +43,7 @@ func (q *Queries) GetCumultativeBalances(ctx context.Context, budgetID uuid.UUID
 			&i.Date,
 			&i.CategoryID,
 			&i.Assignments,
-			&i.AssignmentsCum,
 			&i.Transactions,
-			&i.TransactionsCum,
 		); err != nil {
 			return nil, err
 		}

postgres/db.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 
 package postgres
 

postgres/models.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 
 package postgres
 
@@ -36,10 +38,11 @@ type Account struct {
 	BudgetID       uuid.UUID
 	Name           string
 	OnBudget       bool
+	IsOpen         bool
+	LastReconciled sql.NullTime
 }
 
 type Assignment struct {
-	ID         uuid.UUID
 	CategoryID uuid.UUID
 	Date       time.Time
 	Memo       sql.NullString

postgres/numeric/numeric.go

@@ -25,6 +25,13 @@ func FromInt64WithExp(value int64, exp int32) Numeric {
 	return Numeric{Numeric: pgtype.Numeric{Int: big.NewInt(value), Exp: exp, Status: pgtype.Present}}
 }
 
+func (n *Numeric) SetZero() {
+	n.Exp = 0
+	n.Int = big.NewInt(0)
+	n.Status = pgtype.Present
+	n.NaN = false
+}
+
 func (n Numeric) GetFloat64() float64 {
 	if n.Status != pgtype.Present {
 		return 0
@@ -53,6 +60,13 @@ func (n Numeric) IsZero() bool {
 	return float == 0
 }
 
+func (n *Numeric) MatchExpI(exp int32) {
+	diffExp := n.Exp - exp
+	factor := big.NewInt(0).Exp(big.NewInt(10), big.NewInt(int64(diffExp)), nil) //nolint:gomnd
+	n.Exp = exp
+	n.Int = big.NewInt(0).Mul(n.Int, factor)
+}
+
 func (n Numeric) MatchExp(exp int32) Numeric {
 	diffExp := n.Exp - exp
 	factor := big.NewInt(0).Exp(big.NewInt(10), big.NewInt(int64(diffExp)), nil) //nolint:gomnd
@@ -64,6 +78,22 @@ func (n Numeric) MatchExp(exp int32) Numeric {
 	}}
 }
 
+func (n *Numeric) SubI(other Numeric) *Numeric {
+	right := other
+	if n.Exp < other.Exp {
+		right = other.MatchExp(n.Exp)
+	} else if n.Exp > other.Exp {
+		n.MatchExpI(other.Exp)
+	}
+
+	if n.Exp == right.Exp {
+		n.Int = big.NewInt(0).Sub(n.Int, right.Int)
+		return n
+	}
+
+	panic("Cannot subtract with different exponents")
+}
+
 func (n Numeric) Sub(other Numeric) Numeric {
 	left := n
 	right := other
@@ -106,6 +136,22 @@ func (n Numeric) Add(other Numeric) Numeric {
 	panic("Cannot add with different exponents")
 }
 
+func (n *Numeric) AddI(other Numeric) *Numeric {
+	right := other
+	if n.Exp < other.Exp {
+		right = other.MatchExp(n.Exp)
+	} else if n.Exp > other.Exp {
+		n.MatchExpI(other.Exp)
+	}
+
+	if n.Exp == right.Exp {
+		n.Int = big.NewInt(0).Add(n.Int, right.Int)
+		return n
+	}
+
+	panic("Cannot add with different exponents")
+}
+
 func (n Numeric) String() string {
 	if n.Int == nil || n.Int.Int64() == 0 {
 		return "0"

postgres/payees.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: payees.sql
 
 package postgres
@@ -60,7 +62,7 @@ func (q *Queries) GetPayees(ctx context.Context, budgetID uuid.UUID) ([]Payee, e
 const searchPayees = `-- name: SearchPayees :many
 SELECT payees.id, payees.budget_id, payees.name, 'payee' as type FROM payees 
 WHERE payees.budget_id = $1
-AND payees.name LIKE $2
+AND payees.name ILIKE $2
 ORDER BY payees.name
 `
 

postgres/queries/accounts.sql

@@ -11,27 +11,35 @@ WHERE accounts.id = $1;
 -- name: GetAccounts :many
 SELECT accounts.* FROM accounts
 WHERE accounts.budget_id = $1
+AND accounts.is_open = TRUE
 ORDER BY accounts.name;
 
 -- name: GetAccountsWithBalance :many
-SELECT accounts.id, accounts.name, accounts.on_budget, 
+SELECT accounts.id, accounts.name, accounts.on_budget, accounts.is_open, accounts.last_reconciled,
-        (SELECT MAX(transactions.date) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.status = 'Reconciled')::date as last_reconciled,
         (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW())::decimal(12,2) as working_balance,
         (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status IN ('Cleared', 'Reconciled'))::decimal(12,2) as cleared_balance,
         (SELECT SUM(transactions.amount) FROM transactions WHERE transactions.account_id = accounts.id AND transactions.date < NOW() AND transactions.status = 'Reconciled')::decimal(12,2) as reconciled_balance
 FROM accounts
 WHERE accounts.budget_id = $1
+AND accounts.is_open = TRUE
 ORDER BY accounts.name;
 
 -- name: SearchAccounts :many
 SELECT accounts.id, accounts.budget_id, accounts.name, 'account' as type FROM accounts
 WHERE accounts.budget_id = @budget_id
-AND accounts.name LIKE @search
+AND accounts.is_open = TRUE
+AND accounts.name ILIKE @search
 ORDER BY accounts.name;
 
 -- name: UpdateAccount :one
 UPDATE accounts
 SET name = $1,
-    on_budget = $2
+    on_budget = $2,
-WHERE accounts.id = $3
+    is_open = $3
+WHERE accounts.id = $4
 RETURNING *;
+
+-- name: SetLastReconciled :exec
+UPDATE accounts
+SET last_reconciled = NOW()
+WHERE accounts.id = $1;

postgres/queries/assignments.sql

@@ -23,3 +23,17 @@ FROM assignments
 INNER JOIN categories ON categories.id = assignments.category_id
 INNER JOIN category_groups ON categories.category_group_id = category_groups.id
 WHERE category_groups.budget_id = @budget_id;
+
+-- name: UpdateAssignment :exec
+INSERT INTO assignments (category_id, date, amount)
+VALUES($1, $2, $3) 
+ON CONFLICT (category_id, date) 
+DO 
+   UPDATE SET amount = $3;
+
+-- name: UpdateAssignmentWithDifference :exec
+INSERT INTO assignments (category_id, date, amount)
+VALUES($1, $2, $3) 
+ON CONFLICT (category_id, date) 
+DO 
+   UPDATE SET amount = assignments.amount + $3;

postgres/queries/categories.sql

@@ -25,6 +25,7 @@ SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.
 FROM categories
 INNER JOIN category_groups ON categories.category_group_id = category_groups.id
 WHERE category_groups.budget_id = @budget_id
-AND categories.name LIKE @search
+AND categories.name ILIKE @search
+AND category_groups.name != 'Hidden Categories'
 ORDER BY category_groups.name, categories.name;
 --ORDER BY levenshtein(payees.name, $2);

postgres/queries/cumultative-balances.sql

@@ -1,8 +1,8 @@
 -- name: GetCumultativeBalances :many
 SELECT COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id),
-       COALESCE(ass.amount, 0)::decimal(12,2) as assignments, SUM(ass.amount) OVER (PARTITION BY ass.category_id ORDER BY ass.date)::decimal(12,2) as assignments_cum,
+       COALESCE(ass.amount, 0)::decimal(12,2) as assignments,
-       COALESCE(tra.amount, 0)::decimal(12,2) as transactions, SUM(tra.amount) OVER (PARTITION BY tra.category_id ORDER BY tra.date)::decimal(12,2) as transactions_cum
+       COALESCE(tra.amount, 0)::decimal(12,2) as transactions
 FROM assignments_by_month as ass
 FULL OUTER JOIN transactions_by_month as tra ON ass.date = tra.date AND ass.category_id = tra.category_id
-WHERE (ass.budget_id IS NULL OR ass.budget_id = @budget_id) AND (tra.budget_id IS NULL OR tra.budget_id = @budget_id)
+WHERE COALESCE(ass.budget_id, tra.budget_id) = @budget_id
-ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.category_id, tra.category_id);
+ORDER BY COALESCE(ass.date, tra.date), COALESCE(ass.amount, tra.amount);

postgres/queries/payees.sql

@@ -12,6 +12,6 @@ ORDER BY name;
 -- name: SearchPayees :many
 SELECT payees.*, 'payee' as type FROM payees 
 WHERE payees.budget_id = @budget_id
-AND payees.name LIKE @search
+AND payees.name ILIKE @search
 ORDER BY payees.name;
 --ORDER BY levenshtein(payees.name, $2);

postgres/queries/transactions.sql

@@ -34,8 +34,7 @@ WHERE t.budget_id = $1;
 -- name: GetTransactionsForAccount :many
 SELECT  t.*
 FROM display_transactions AS t
-WHERE t.account_id = $1
+WHERE t.account_id = $1;
-LIMIT 200;
 
 -- name: DeleteAllTransactions :execrows
 DELETE FROM transactions
@@ -47,3 +46,28 @@ AND accounts.id = transactions.account_id;
 SELECT *
 FROM transactions_by_month
 WHERE transactions_by_month.budget_id = @budget_id;
+
+-- name: GetProblematicTransactions :many
+SELECT transactions.*
+FROM display_transactions AS transactions
+LEFT JOIN accounts 
+        ON transactions.account_id = accounts.id
+LEFT JOIN transactions AS otherGroupTransaction 
+        ON transactions.group_id = otherGroupTransaction.group_id 
+        AND transactions.id != otherGroupTransaction.id 
+        AND transactions.account_id != otherGroupTransaction.account_id
+LEFT JOIn accounts AS otherGroupAccount 
+        ON otherGroupTransaction.account_id = otherGroupAccount.id
+WHERE transactions.category_id IS NULL
+AND accounts.on_budget
+AND (otherGroupAccount.id IS NULL OR NOT otherGroupAccount.on_budget)
+AND accounts.budget_id = $1;
+
+-- name: GetFilteredTransactions :many
+SELECT transactions.*
+FROM display_transactions AS transactions
+WHERE (NOT @filter_category::boolean OR transactions.category_id = @category_id) 
+AND (NOT @filter_account::boolean OR transactions.account_id = @account_id) 
+AND (NOT @filter_payee::boolean OR transactions.payee_id = @payee_id)
+AND transactions.date BETWEEN @from_date AND @to_date
+AND transactions.budget_id = @budget_id;

postgres/schema/0016_closed-accounts.sql

@@ -0,0 +1,5 @@
+-- +goose Up
+ALTER TABLE accounts ADD COLUMN is_open BOOLEAN NOT NULL DEFAULT TRUE;
+
+-- +goose Down
+ALTER TABLE accounts DROP COLUMN is_open;

postgres/schema/0017_natural-key-assignments.sql

@@ -0,0 +1,6 @@
+-- +goose Up
+ALTER TABLE assignments DROP id;
+ALTER TABLE assignments ADD PRIMARY KEY (category_id, date);
+
+-- +goose Down
+ALTER TABLE assignments ADD COLUMN id uuid DEFAULT uuid_generate_v4() PRIMARY KEY;

postgres/schema/0018_reconciled-on.sql

@@ -0,0 +1,12 @@
+-- +goose Up
+ALTER TABLE accounts ADD COLUMN last_reconciled date NULL;
+UPDATE accounts
+SET last_reconciled = (
+    SELECT MAX(transactions.date)
+    FROM transactions
+    WHERE transactions.account_id = accounts.id
+    AND transactions.status = 'Reconciled'
+);
+
+-- +goose Down
+ALTER TABLE accounts DROP COLUMN last_reconciled;

postgres/schema/0019_ignore-off-budget-in-transactions-by-month.sql

@@ -0,0 +1,13 @@
+-- +goose Up
+CREATE OR REPLACE VIEW transactions_by_month AS 
+        SELECT date_trunc('month', transactions.date)::date as date, transactions.category_id, accounts.budget_id, SUM(amount) as amount
+        FROM transactions
+        INNER JOIN accounts ON accounts.id = transactions.account_id AND accounts.on_budget
+        GROUP BY date_trunc('month', transactions.date), transactions.category_id, accounts.budget_id;
+
+-- +goose Down
+CREATE OR REPLACE VIEW transactions_by_month AS 
+        SELECT date_trunc('month', transactions.date)::date as date, transactions.category_id, accounts.budget_id, SUM(amount) as amount
+        FROM transactions
+        INNER JOIN accounts ON accounts.id = transactions.account_id
+        GROUP BY date_trunc('month', transactions.date), transactions.category_id, accounts.budget_id;

postgres/transactions.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: transactions.sql
 
 package postgres
@@ -115,6 +117,133 @@ func (q *Queries) GetAllTransactionsForBudget(ctx context.Context, budgetID uuid
 	return items, nil
 }
 
+const getFilteredTransactions = `-- name: GetFilteredTransactions :many
+SELECT transactions.id, transactions.date, transactions.memo, transactions.amount, transactions.group_id, transactions.status, transactions.account, transactions.payee_id, transactions.category_id, transactions.payee, transactions.category_group, transactions.category, transactions.transfer_account, transactions.budget_id, transactions.account_id
+FROM display_transactions AS transactions
+WHERE (NOT $1::boolean OR transactions.category_id = $2) 
+AND (NOT $3::boolean OR transactions.account_id = $4) 
+AND (NOT $5::boolean OR transactions.payee_id = $6)
+AND transactions.date BETWEEN $7 AND $8
+AND transactions.budget_id = $9
+`
+
+type GetFilteredTransactionsParams struct {
+	FilterCategory bool
+	CategoryID     uuid.NullUUID
+	FilterAccount  bool
+	AccountID      uuid.UUID
+	FilterPayee    bool
+	PayeeID        uuid.NullUUID
+	FromDate       time.Time
+	ToDate         time.Time
+	BudgetID       uuid.UUID
+}
+
+func (q *Queries) GetFilteredTransactions(ctx context.Context, arg GetFilteredTransactionsParams) ([]DisplayTransaction, error) {
+	rows, err := q.db.QueryContext(ctx, getFilteredTransactions,
+		arg.FilterCategory,
+		arg.CategoryID,
+		arg.FilterAccount,
+		arg.AccountID,
+		arg.FilterPayee,
+		arg.PayeeID,
+		arg.FromDate,
+		arg.ToDate,
+		arg.BudgetID,
+	)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []DisplayTransaction
+	for rows.Next() {
+		var i DisplayTransaction
+		if err := rows.Scan(
+			&i.ID,
+			&i.Date,
+			&i.Memo,
+			&i.Amount,
+			&i.GroupID,
+			&i.Status,
+			&i.Account,
+			&i.PayeeID,
+			&i.CategoryID,
+			&i.Payee,
+			&i.CategoryGroup,
+			&i.Category,
+			&i.TransferAccount,
+			&i.BudgetID,
+			&i.AccountID,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const getProblematicTransactions = `-- name: GetProblematicTransactions :many
+SELECT transactions.id, transactions.date, transactions.memo, transactions.amount, transactions.group_id, transactions.status, transactions.account, transactions.payee_id, transactions.category_id, transactions.payee, transactions.category_group, transactions.category, transactions.transfer_account, transactions.budget_id, transactions.account_id
+FROM display_transactions AS transactions
+LEFT JOIN accounts 
+        ON transactions.account_id = accounts.id
+LEFT JOIN transactions AS otherGroupTransaction 
+        ON transactions.group_id = otherGroupTransaction.group_id 
+        AND transactions.id != otherGroupTransaction.id 
+        AND transactions.account_id != otherGroupTransaction.account_id
+LEFT JOIn accounts AS otherGroupAccount 
+        ON otherGroupTransaction.account_id = otherGroupAccount.id
+WHERE transactions.category_id IS NULL
+AND accounts.on_budget
+AND (otherGroupAccount.id IS NULL OR NOT otherGroupAccount.on_budget)
+AND accounts.budget_id = $1
+`
+
+func (q *Queries) GetProblematicTransactions(ctx context.Context, budgetID uuid.UUID) ([]DisplayTransaction, error) {
+	rows, err := q.db.QueryContext(ctx, getProblematicTransactions, budgetID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []DisplayTransaction
+	for rows.Next() {
+		var i DisplayTransaction
+		if err := rows.Scan(
+			&i.ID,
+			&i.Date,
+			&i.Memo,
+			&i.Amount,
+			&i.GroupID,
+			&i.Status,
+			&i.Account,
+			&i.PayeeID,
+			&i.CategoryID,
+			&i.Payee,
+			&i.CategoryGroup,
+			&i.Category,
+			&i.TransferAccount,
+			&i.BudgetID,
+			&i.AccountID,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const getTransaction = `-- name: GetTransaction :one
 SELECT id, date, memo, amount, group_id, status, account, payee_id, category_id, payee, category_group, category, transfer_account, budget_id, account_id FROM display_transactions
 WHERE id = $1
@@ -181,7 +310,6 @@ const getTransactionsForAccount = `-- name: GetTransactionsForAccount :many
 SELECT  t.id, t.date, t.memo, t.amount, t.group_id, t.status, t.account, t.payee_id, t.category_id, t.payee, t.category_group, t.category, t.transfer_account, t.budget_id, t.account_id
 FROM display_transactions AS t
 WHERE t.account_id = $1
-LIMIT 200
 `
 
 func (q *Queries) GetTransactionsForAccount(ctx context.Context, accountID uuid.UUID) ([]DisplayTransaction, error) {

postgres/user_budgets.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: user_budgets.sql
 
 package postgres

postgres/users.sql.go

@@ -1,4 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.13.0
 // source: users.sql
 
 package postgres

postgres/ynab-import.go

@@ -91,12 +91,12 @@ func (ynab *YNABImport) ImportAssignments(context context.Context, r io.Reader)
 			continue
 		}
 
-		assignment := CreateAssignmentParams{
+		assignment := UpdateAssignmentWithDifferenceParams{
 			Date:       date,
 			CategoryID: category.UUID,
 			Amount:     amount,
 		}
-		_, err = ynab.queries.CreateAssignment(context, assignment)
+		err = ynab.queries.UpdateAssignmentWithDifference(context, assignment)
 		if err != nil {
 			return fmt.Errorf("save assignment %v: %w", assignment, err)
 		}
@@ -226,7 +226,8 @@ func (ynab *YNABImport) GetTransaction(context context.Context, record []string)
 }
 
 func (ynab *YNABImport) ImportRegularTransaction(context context.Context, payeeName string,
-	transaction CreateTransactionParams) error {
+	transaction CreateTransactionParams,
+) error {
 	payeeID, err := ynab.GetPayee(context, payeeName)
 	if err != nil {
 		return fmt.Errorf("get payee %s: %w", payeeName, err)
@@ -242,7 +243,8 @@ func (ynab *YNABImport) ImportRegularTransaction(context context.Context, payeeN
 
 func (ynab *YNABImport) ImportTransferTransaction(context context.Context, payeeName string,
 	transaction CreateTransactionParams, openTransfers *[]Transfer,
-	account *Account, amount numeric.Numeric) error {
+	account *Account, amount numeric.Numeric,
+) error {
 	transferToAccountName := payeeName[11:]
 	transferToAccount, err := ynab.GetAccount(context, transferToAccountName)
 	if err != nil {

server/account.go

@@ -2,70 +2,134 @@ package server
 
 import (
 	"net/http"
+	"time"
 
 	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
 )
 
-func (h *Handler) transactionsForAccount(c *gin.Context) {
+type FilterTransactionsRequest struct {
+	CategoryID string    `json:"categoryId"`
+	PayeeID    string    `json:"payeeId"`
+	AccountID  string    `json:"accountId"`
+	FromDate   time.Time `json:"fromDate"`
+	ToDate     time.Time `json:"toDate"`
+}
+
+func (h *Handler) filteredTransactions(c echo.Context) error {
+	budgetID := c.Param("budgetid")
+	budgetUUID, err := uuid.Parse(budgetID)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, err)
+	}
+
+	var request FilterTransactionsRequest
+	err = c.Bind(&request)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, err)
+	}
+
+	params := postgres.GetFilteredTransactionsParams{
+		BudgetID: budgetUUID,
+		FromDate: request.FromDate,
+		ToDate:   request.ToDate,
+	}
+	params.CategoryID, params.FilterCategory = parseEmptyUUID(request.CategoryID)
+	accountID, filterAccount := parseEmptyUUID(request.AccountID)
+	params.AccountID, params.FilterAccount = accountID.UUID, filterAccount
+	params.PayeeID, params.FilterPayee = parseEmptyUUID(request.PayeeID)
+
+	transactions, err := h.Service.GetFilteredTransactions(c.Request().Context(), params)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusInternalServerError, err)
+	}
+
+	return c.JSON(http.StatusOK, TransactionsResponse{nil, transactions})
+}
+
+func parseEmptyUUID(value string) (uuid.NullUUID, bool) {
+	if value == "" {
+		return uuid.NullUUID{}, false
+	}
+
+	val, err := uuid.Parse(value)
+	if err != nil {
+		return uuid.NullUUID{}, false
+	}
+
+	return uuid.NullUUID{UUID: val, Valid: true}, true
+}
+
+func (h *Handler) problematicTransactions(c echo.Context) error {
+	budgetID := c.Param("budgetid")
+	budgetUUID, err := uuid.Parse(budgetID)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, err)
+	}
+
+	transactions, err := h.Service.GetProblematicTransactions(c.Request().Context(), budgetUUID)
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(http.StatusOK, TransactionsResponse{nil, transactions})
+}
+
+func (h *Handler) transactionsForAccount(c echo.Context) error {
 	accountID := c.Param("accountid")
 	accountUUID, err := uuid.Parse(accountID)
 	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, err)
+		return echo.NewHTTPError(http.StatusBadRequest, err)
-		return
 	}
 
-	account, err := h.Service.GetAccount(c.Request.Context(), accountUUID)
+	account, err := h.Service.GetAccount(c.Request().Context(), accountUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusNotFound, err)
+		return echo.NewHTTPError(http.StatusNotFound, err)
-		return
 	}
 
-	transactions, err := h.Service.GetTransactionsForAccount(c.Request.Context(), accountUUID)
+	transactions, err := h.Service.GetTransactionsForAccount(c.Request().Context(), accountUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusNotFound, err)
+		return echo.NewHTTPError(http.StatusNotFound, err)
-		return
 	}
 
-	c.JSON(http.StatusOK, TransactionsResponse{account, transactions})
+	return c.JSON(http.StatusOK, TransactionsResponse{&account, transactions})
 }
 
 type TransactionsResponse struct {
-	Account      postgres.Account
+	Account      *postgres.Account
 	Transactions []postgres.DisplayTransaction
 }
 
 type EditAccountRequest struct {
 	Name     string `json:"name"`
 	OnBudget bool   `json:"onBudget"`
+	IsOpen   bool   `json:"isOpen"`
 }
 
-func (h *Handler) editAccount(c *gin.Context) {
+func (h *Handler) editAccount(c echo.Context) error {
 	accountID := c.Param("accountid")
 	accountUUID, err := uuid.Parse(accountID)
 	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, err)
+		return echo.NewHTTPError(http.StatusBadRequest, err)
-		return
 	}
 
 	var request EditAccountRequest
-	err = c.BindJSON(&request)
+	err = c.Bind(&request)
 	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, err)
+		return echo.NewHTTPError(http.StatusBadRequest, err)
-		return
 	}
 
 	updateParams := postgres.UpdateAccountParams{
 		Name:     request.Name,
 		OnBudget: request.OnBudget,
+		IsOpen:   request.IsOpen,
 		ID:       accountUUID,
 	}
-	account, err := h.Service.UpdateAccount(c.Request.Context(), updateParams)
+	account, err := h.Service.UpdateAccount(c.Request().Context(), updateParams)
 	if err != nil {
-		c.AbortWithError(http.StatusNotFound, err)
+		return echo.NewHTTPError(http.StatusNotFound, err)
-		return
 	}
 
-	h.returnBudgetingData(c, account.BudgetID)
+	return h.getBudget(c, account.BudgetID)
 }

server/account_test.go

@@ -2,7 +2,6 @@ package server
 
 import (
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -11,24 +10,19 @@ import (
 	"git.javil.eu/jacob1123/budgeteer/bcrypt"
 	"git.javil.eu/jacob1123/budgeteer/jwt"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
-	txdb "github.com/DATA-DOG/go-txdb"
+
-	"github.com/gin-gonic/gin"
+	"github.com/labstack/echo/v4"
 )
 
-func init() { //nolint:gochecknoinits
+func TestRegisterUser(t *testing.T) {
-	txdb.Register("pgtx", "pgx", "postgres://budgeteer_test:budgeteer_test@localhost:5432/budgeteer_test")
-}
-
-func TestRegisterUser(t *testing.T) { //nolint:funlen
 	t.Parallel()
-	database, err := postgres.Connect("pgtx", "example")
+	database, err := postgres.Connect("pgtx", cfg.DatabaseConnection)
 	if err != nil {
-		fmt.Printf("could not connect to db: %s\n", err)
+		t.Errorf("connect to DB: %v", err)
-		t.Skip()
 		return
 	}
 
-	tokenVerifier, _ := jwt.NewTokenVerifier("this_is_my_demo_secret_for_unit_tests")
+	tokenVerifier, _ := jwt.NewTokenVerifier(cfg.SessionSecret)
 	h := Handler{
 		Service:             database,
 		TokenVerifier:       tokenVerifier,
@@ -36,15 +30,16 @@ func TestRegisterUser(t *testing.T) { //nolint:funlen
 	}
 
 	recorder := httptest.NewRecorder()
-	context, engine := gin.CreateTestContext(recorder)
+	engine := echo.New()
 	h.LoadRoutes(engine)
 
 	t.Run("RegisterUser", func(t *testing.T) {
 		t.Parallel()
-		context.Request, err = http.NewRequest(
+		request, err := http.NewRequest(
 			http.MethodPost,
 			"/api/v1/user/register",
 			strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`))
+		context := engine.NewContext(request, recorder)
 		if err != nil {
 			t.Errorf("error creating request: %s", err)
 			return
@@ -66,22 +61,4 @@ func TestRegisterUser(t *testing.T) { //nolint:funlen
 			t.Error("Did not get a token")
 		}
 	})
-
-	t.Run("GetTransactions", func(t *testing.T) {
-		t.Parallel()
-		context.Request, err = http.NewRequest(http.MethodGet, "/account/accountid/transactions", nil)
-		if recorder.Code != http.StatusOK {
-			t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)
-		}
-
-		var response TransactionsResponse
-		err = json.NewDecoder(recorder.Body).Decode(&response)
-		if err != nil {
-			t.Error(err.Error())
-			t.Error("Error retreiving list of transactions.")
-		}
-		if len(response.Transactions) == 0 {
-			t.Error("Did not get any transactions.")
-		}
-	})
 }

server/admin.go

@@ -4,109 +4,66 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
 	"github.com/pressly/goose/v3"
 )
 
-func (h *Handler) clearDatabase(c *gin.Context) {
+func (h *Handler) clearDatabase(c echo.Context) error {
 	if err := goose.Reset(h.Service.DB, "schema"); err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return echo.NewHTTPError(http.StatusInternalServerError, err)
 	}
 
 	if err := goose.Up(h.Service.DB, "schema"); err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return echo.NewHTTPError(http.StatusInternalServerError, err)
-	}
 	}
 
-func (h *Handler) deleteBudget(c *gin.Context) {
+	return nil
+}
+
+func (h *Handler) deleteBudget(c echo.Context) error {
 	budgetID := c.Param("budgetid")
 	budgetUUID, err := uuid.Parse(budgetID)
 	if err != nil {
-		c.AbortWithStatus(http.StatusBadRequest)
+		return echo.NewHTTPError(http.StatusBadRequest, err)
-		return
 	}
 
-	h.clearBudgetData(c, budgetUUID)
+	err = h.clearBudgetData(c, budgetUUID)
-
-	err = h.Service.DeleteBudget(c.Request.Context(), budgetUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
-	}
 	}
 
-func (h *Handler) clearBudgetData(c *gin.Context, budgetUUID uuid.UUID) {
+	err = h.Service.DeleteBudget(c.Request().Context(), budgetUUID)
-	rows, err := h.Service.DeleteAllAssignments(c.Request.Context(), budgetUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
+	}
+
+	return nil
+}
+
+func (h *Handler) clearBudgetData(c echo.Context, budgetUUID uuid.UUID) error {
+	rows, err := h.Service.DeleteAllAssignments(c.Request().Context(), budgetUUID)
+	if err != nil {
+		return err
 	}
 
 	fmt.Printf("Deleted %d assignments\n", rows)
 
-	rows, err = h.Service.DeleteAllTransactions(c.Request.Context(), budgetUUID)
+	rows, err = h.Service.DeleteAllTransactions(c.Request().Context(), budgetUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
 	}
 
 	fmt.Printf("Deleted %d transactions\n", rows)
+	return nil
 }
 
-func (h *Handler) clearBudget(c *gin.Context) {
+func (h *Handler) clearBudget(c echo.Context) error {
 	budgetID := c.Param("budgetid")
 	budgetUUID, err := uuid.Parse(budgetID)
 	if err != nil {
-		c.AbortWithStatus(http.StatusBadRequest)
+		return echo.NewHTTPError(http.StatusBadRequest, err)
-		return
 	}
 
-	h.clearBudgetData(c, budgetUUID)
+	return h.clearBudgetData(c, budgetUUID)
-}
-
-func (h *Handler) cleanNegativeBudget(c *gin.Context) {
-	/*budgetID := c.Param("budgetid")
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		c.Redirect(http.StatusTemporaryRedirect, "/login")
-		return
-	}*/
-
-	/*min_date, err := h.Service.GetFirstActivity(c.Request.Context(), budgetUUID)
-	date := getFirstOfMonthTime(min_date)
-	for {
-		nextDate := date.AddDate(0, 1, 0)
-		params := postgres.GetCategoriesWithBalanceParams{
-			BudgetID: budgetUUID,
-			ToDate:   nextDate,
-			FromDate: date,
-		}
-		categories, err := h.Service.GetCategoriesWithBalance(c.Request.Context(), params)
-		if err != nil {
-			c.AbortWithError(http.StatusInternalServerError, err)
-			return
-		}
-
-		for _, category := range categories {
-			available := category.Available.GetFloat64()
-			if available >= 0 {
-				continue
-			}
-			var negativeAvailable postgres.Numeric
-			negativeAvailable.Set(-available)
-			createAssignment := postgres.CreateAssignmentParams{
-				Date:       nextDate.AddDate(0, 0, -1),
-				Amount:     negativeAvailable,
-				CategoryID: category.ID,
-			}
-			h.Service.CreateAssignment(c.Request.Context(), createAssignment)
-		}
-
-		if nextDate.Before(time.Now()) {
-			date = nextDate
-		} else {
-			break
-		}
-	}*/
 }

server/autocomplete.go

@@ -5,41 +5,58 @@ import (
 	"strings"
 
 	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
 )
 
-func (h *Handler) autocompleteCategories(c *gin.Context) {
+func (h *Handler) autocompleteAccounts(c echo.Context) error {
 	budgetID := c.Param("budgetid")
 	budgetUUID, err := uuid.Parse(budgetID)
 	if err != nil {
-		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budgetid missing from URL"})
+		return echo.NewHTTPError(http.StatusBadRequest, "budgetid missing from URL")
-		return
 	}
 
-	query := c.Request.URL.Query().Get("s")
+	query := c.Request().URL.Query().Get("s")
+	searchParams := postgres.SearchAccountsParams{
+		BudgetID: budgetUUID,
+		Search:   "%" + query + "%",
+	}
+	categories, err := h.Service.SearchAccounts(c.Request().Context(), searchParams)
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(http.StatusOK, categories)
+}
+
+func (h *Handler) autocompleteCategories(c echo.Context) error {
+	budgetID := c.Param("budgetid")
+	budgetUUID, err := uuid.Parse(budgetID)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, "budgetid missing from URL")
+	}
+
+	query := c.Request().URL.Query().Get("s")
 	searchParams := postgres.SearchCategoriesParams{
 		BudgetID: budgetUUID,
 		Search:   "%" + query + "%",
 	}
-	categories, err := h.Service.SearchCategories(c.Request.Context(), searchParams)
+	categories, err := h.Service.SearchCategories(c.Request().Context(), searchParams)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return echo.NewHTTPError(http.StatusInternalServerError, err)
-		return
 	}
 
-	c.JSON(http.StatusOK, categories)
+	return c.JSON(http.StatusOK, categories)
 }
 
-func (h *Handler) autocompletePayee(c *gin.Context) {
+func (h *Handler) autocompletePayee(c echo.Context) error {
 	budgetID := c.Param("budgetid")
 	budgetUUID, err := uuid.Parse(budgetID)
 	if err != nil {
-		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budgetid missing from URL"})
+		return echo.NewHTTPError(http.StatusBadRequest, "budgetid missing from URL")
-		return
 	}
 
-	query := c.Request.URL.Query().Get("s")
+	query := c.Request().URL.Query().Get("s")
 
 	transferPrefix := "Transfer"
 	if strings.HasPrefix(query, transferPrefix) {
@@ -48,25 +65,23 @@ func (h *Handler) autocompletePayee(c *gin.Context) {
 			Search:   "%" + strings.Trim(query[len(transferPrefix):], " \t\n:") + "%",
 		}
 
-		accounts, err := h.Service.SearchAccounts(c.Request.Context(), searchParams)
+		accounts, err := h.Service.SearchAccounts(c.Request().Context(), searchParams)
 		if err != nil {
-			c.AbortWithError(http.StatusInternalServerError, err)
+			return err
-			return
+		}
+
+		return c.JSON(http.StatusOK, accounts)
 	}
 
-		c.JSON(http.StatusOK, accounts)
-	} else {
 	searchParams := postgres.SearchPayeesParams{
 		BudgetID: budgetUUID,
 		Search:   query + "%",
 	}
 
-		payees, err := h.Service.SearchPayees(c.Request.Context(), searchParams)
+	payees, err := h.Service.SearchPayees(c.Request().Context(), searchParams)
 	if err != nil {
-			c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-			return
 	}
 
-		c.JSON(http.StatusOK, payees)
+	return c.JSON(http.StatusOK, payees)
-	}
 }

server/budget.go

@@ -3,31 +3,28 @@ package server
 import (
 	"net/http"
 
-	"github.com/gin-gonic/gin"
+	"github.com/labstack/echo/v4"
 )
 
 type newBudgetInformation struct {
 	Name string `json:"name"`
 }
 
-func (h *Handler) newBudget(c *gin.Context) {
+func (h *Handler) newBudget(c echo.Context) error {
 	var newBudget newBudgetInformation
-	if err := c.BindJSON(&newBudget); err != nil {
+	if err := c.Bind(&newBudget); err != nil {
-		c.AbortWithError(http.StatusNotAcceptable, err)
+		return echo.NewHTTPError(http.StatusNotAcceptable, err)
-		return
 	}
 
 	if newBudget.Name == "" {
-		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budget name is required"})
+		return echo.NewHTTPError(http.StatusBadRequest, "budget name is required")
-		return
 	}
 
 	userID := MustGetToken(c).GetID()
-	budget, err := h.Service.NewBudget(c.Request.Context(), newBudget.Name, userID)
+	budget, err := h.Service.NewBudget(c.Request().Context(), newBudget.Name, userID)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
 	}
 
-	c.JSON(http.StatusOK, budget)
+	return c.JSON(http.StatusOK, budget)
 }

server/budgeting.go

@@ -1,31 +1,18 @@
 package server
 
 import (
+	"context"
 	"fmt"
 	"net/http"
-	"strconv"
-	"time"
 
 	"git.javil.eu/jacob1123/budgeteer/postgres"
 	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
-	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
 )
 
-func getFirstOfMonth(year, month int, location *time.Location) time.Time {
-	return time.Date(year, time.Month(month), 1, 0, 0, 0, 0, location)
-}
-
-func getFirstOfMonthTime(date time.Time) time.Time {
-	var monthM time.Month
-	year, monthM, _ := date.Date()
-	month := int(monthM)
-	return getFirstOfMonth(year, month, date.Location())
-}
-
 type CategoryWithBalance struct {
 	*postgres.GetCategoriesRow
-	Available          numeric.Numeric
 	AvailableLastMonth numeric.Numeric
 	Activity           numeric.Numeric
 	Assigned           numeric.Numeric
@@ -34,101 +21,79 @@ type CategoryWithBalance struct {
 func NewCategoryWithBalance(category *postgres.GetCategoriesRow) CategoryWithBalance {
 	return CategoryWithBalance{
 		GetCategoriesRow:   category,
-		Available:          numeric.Zero(),
 		AvailableLastMonth: numeric.Zero(),
 		Activity:           numeric.Zero(),
 		Assigned:           numeric.Zero(),
 	}
 }
 
-func getDate(c *gin.Context) (time.Time, error) {
+func (h *Handler) budgetingForMonth(c echo.Context) error {
-	var year, month int
-	yearString := c.Param("year")
-	monthString := c.Param("month")
-	if yearString == "" && monthString == "" {
-		return getFirstOfMonthTime(time.Now()), nil
-	}
-
-	year, err := strconv.Atoi(yearString)
-	if err != nil {
-		return time.Time{}, fmt.Errorf("parse year: %w", err)
-	}
-
-	month, err = strconv.Atoi(monthString)
-	if err != nil {
-		return time.Time{}, fmt.Errorf("parse month: %w", err)
-	}
-
-	return getFirstOfMonth(year, month, time.Now().Location()), nil
-}
-
-func (h *Handler) budgetingForMonth(c *gin.Context) {
 	budgetID := c.Param("budgetid")
 	budgetUUID, err := uuid.Parse(budgetID)
 	if err != nil {
-		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budgetid missing from URL"})
+		return echo.NewHTTPError(http.StatusBadRequest, "budgetid missing from URL")
-		return
 	}
 
-	budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID)
+	budget, err := h.Service.GetBudget(c.Request().Context(), budgetUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, err)
+		return echo.NewHTTPError(http.StatusBadRequest, err)
-		return
 	}
 
-	firstOfMonth, err := getDate(c)
+	month, err := getDate(c)
 	if err != nil {
-		c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budgetUUID.String())
+		c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budget.ID.String())
-		return
 	}
 
-	categories, err := h.Service.GetCategories(c.Request.Context(), budgetUUID)
+	data, err := h.getBudgetingViewForMonth(c.Request().Context(), budget, month)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
 	}
 
-	firstOfNextMonth := firstOfMonth.AddDate(0, 1, 0)
+	return c.JSON(http.StatusOK, data)
-	cumultativeBalances, err := h.Service.GetCumultativeBalances(c.Request.Context(), budgetUUID)
+}
+
+func (h *Handler) getBudgetingViewForMonth(ctx context.Context, budget postgres.Budget, month Month) (BudgetingForMonthResponse, error) {
+	categories, err := h.Service.GetCategories(ctx, budget.ID)
 	if err != nil {
-		c.AbortWithStatusJSON(http.StatusInternalServerError, ErrorResponse{fmt.Sprintf("error loading balances: %s", err)})
+		return BudgetingForMonthResponse{}, fmt.Errorf("error loading categories: %w", err)
-		return
 	}
 
-	categoriesWithBalance, moneyUsed := h.calculateBalances(
+	cumultativeBalances, err := h.Service.GetCumultativeBalances(ctx, budget.ID)
-		budget, firstOfNextMonth, firstOfMonth, categories, cumultativeBalances)
+	if err != nil {
+		return BudgetingForMonthResponse{}, fmt.Errorf("error loading balances: %w", err)
+	}
 
-	availableBalance := h.getAvailableBalance(categories, budget, moneyUsed, cumultativeBalances, firstOfNextMonth)
+	categoriesWithBalance, moneyUsed, overspentLastMonth := h.calculateBalances(budget, month, categories, cumultativeBalances)
+	availableBalance := h.getAvailableBalance(budget, month, moneyUsed, cumultativeBalances)
 
-	data := struct {
+	data := BudgetingForMonthResponse{categoriesWithBalance, availableBalance, overspentLastMonth}
+	return data, nil
+}
+
+type BudgetingForMonthResponse struct {
 	Categories         []CategoryWithBalance
 	AvailableBalance   numeric.Numeric
-	}{categoriesWithBalance, availableBalance}
+	OverspentLastMonth numeric.Numeric
-	c.JSON(http.StatusOK, data)
 }
 
-func (*Handler) getAvailableBalance(categories []postgres.GetCategoriesRow, budget postgres.Budget,
+func (*Handler) getAvailableBalance(budget postgres.Budget, month Month,
 	moneyUsed numeric.Numeric, cumultativeBalances []postgres.GetCumultativeBalancesRow,
-	firstOfNextMonth time.Time) numeric.Numeric {
+) numeric.Numeric {
-	availableBalance := numeric.Zero()
+	availableBalance := moneyUsed
-	for _, cat := range categories {
-		if cat.ID != budget.IncomeCategoryID {
-			continue
-		}
-		availableBalance = moneyUsed
 
 	for _, bal := range cumultativeBalances {
-			if bal.CategoryID != cat.ID {
+		if bal.CategoryID != budget.IncomeCategoryID {
 			continue
 		}
 
-			if !bal.Date.Before(firstOfNextMonth) {
+		if month.InFuture(bal.Date) {
 			continue
 		}
 
-			availableBalance = availableBalance.Add(bal.Transactions)
+		availableBalance.AddI(bal.Transactions)
-		}
+		availableBalance.AddI(bal.Assignments) // should be zero, but who knows
 	}
+
 	return availableBalance
 }
 
@@ -137,60 +102,50 @@ type BudgetingResponse struct {
 	Budget   postgres.Budget
 }
 
-func (h *Handler) budgeting(c *gin.Context) {
+func (h *Handler) budget(c echo.Context) error {
 	budgetID := c.Param("budgetid")
 	budgetUUID, err := uuid.Parse(budgetID)
 	if err != nil {
-		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budgetid missing from URL"})
+		return echo.NewHTTPError(http.StatusBadRequest, "budgetid missing from URL")
-		return
 	}
 
-	h.returnBudgetingData(c, budgetUUID)
+	return h.getBudget(c, budgetUUID)
 }
 
-func (h *Handler) returnBudgetingData(c *gin.Context, budgetUUID uuid.UUID) {
+func (h *Handler) getBudget(c echo.Context, budgetUUID uuid.UUID) error {
-	budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID)
+	budget, err := h.Service.GetBudget(c.Request().Context(), budgetUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusNotFound, err)
+		return echo.NewHTTPError(http.StatusNotFound, err)
-		return
 	}
 
-	accounts, err := h.Service.GetAccountsWithBalance(c.Request.Context(), budgetUUID)
+	accounts, err := h.Service.GetAccountsWithBalance(c.Request().Context(), budgetUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
 	}
 
 	data := BudgetingResponse{accounts, budget}
 
-	c.JSON(http.StatusOK, data)
+	return c.JSON(http.StatusOK, data)
 }
 
-func (h *Handler) calculateBalances(budget postgres.Budget,
+func (h *Handler) calculateBalances(budget postgres.Budget, month Month,
-	firstOfNextMonth time.Time, firstOfMonth time.Time, categories []postgres.GetCategoriesRow,
+	categories []postgres.GetCategoriesRow, cumultativeBalances []postgres.GetCumultativeBalancesRow,
-	cumultativeBalances []postgres.GetCumultativeBalancesRow) ([]CategoryWithBalance, numeric.Numeric) {
+) ([]CategoryWithBalance, numeric.Numeric, numeric.Numeric) {
 	categoriesWithBalance := []CategoryWithBalance{}
 
 	moneyUsed := numeric.Zero()
+	overspentLastMonth := numeric.Zero()
+	categories = append(categories, postgres.GetCategoriesRow{
+		Group: "Income",
+		Name:  "No Category",
+		ID:    uuid.UUID{},
+	})
 	for i := range categories {
 		cat := &categories[i]
-		// do not show hidden categories
-		categoryWithBalance := h.CalculateCategoryBalances(cat, cumultativeBalances,
-			firstOfNextMonth, &moneyUsed, firstOfMonth, budget)
-
 		if cat.ID == budget.IncomeCategoryID {
 			continue
 		}
 
-		categoriesWithBalance = append(categoriesWithBalance, categoryWithBalance)
-	}
-
-	return categoriesWithBalance, moneyUsed
-}
-
-func (*Handler) CalculateCategoryBalances(cat *postgres.GetCategoriesRow,
-	cumultativeBalances []postgres.GetCumultativeBalancesRow, firstOfNextMonth time.Time,
-	moneyUsed *numeric.Numeric, firstOfMonth time.Time, budget postgres.Budget) CategoryWithBalance {
 		categoryWithBalance := NewCategoryWithBalance(cat)
 		for _, bal := range cumultativeBalances {
 			if bal.CategoryID != cat.ID {
@@ -198,25 +153,30 @@ func (*Handler) CalculateCategoryBalances(cat *postgres.GetCategoriesRow,
 			}
 
 			// skip everything in the future
-		if !bal.Date.Before(firstOfNextMonth) {
+			if month.InFuture(bal.Date) {
 				continue
 			}
 
-		*moneyUsed = moneyUsed.Sub(bal.Assignments)
+			moneyUsed.SubI(bal.Assignments)
-		categoryWithBalance.Available = categoryWithBalance.Available.Add(bal.Assignments)
+			if month.InPresent(bal.Date) {
-		categoryWithBalance.Available = categoryWithBalance.Available.Add(bal.Transactions)
-		if !categoryWithBalance.Available.IsPositive() && bal.Date.Before(firstOfMonth) {
-			*moneyUsed = moneyUsed.Add(categoryWithBalance.Available)
-			categoryWithBalance.Available = numeric.Zero()
-		}
-
-		if bal.Date.Before(firstOfMonth) {
-			categoryWithBalance.AvailableLastMonth = categoryWithBalance.Available
-		} else if bal.Date.Before(firstOfNextMonth) {
 				categoryWithBalance.Activity = bal.Transactions
 				categoryWithBalance.Assigned = bal.Assignments
+				continue
+			}
+
+			categoryWithBalance.AvailableLastMonth.AddI(bal.Assignments)
+			categoryWithBalance.AvailableLastMonth.AddI(bal.Transactions)
+			if !categoryWithBalance.AvailableLastMonth.IsPositive() {
+				moneyUsed.AddI(categoryWithBalance.AvailableLastMonth)
+				if month.Previous().InPresent(bal.Date) {
+					overspentLastMonth.AddI(categoryWithBalance.AvailableLastMonth)
+				}
+				categoryWithBalance.AvailableLastMonth = numeric.Zero()
 			}
 		}
 
-	return categoryWithBalance
+		categoriesWithBalance = append(categoriesWithBalance, categoryWithBalance)
+	}
+
+	return categoriesWithBalance, moneyUsed, overspentLastMonth
 }

server/category.go

@@ -0,0 +1,52 @@
+package server
+
+import (
+	"fmt"
+	"net/http"
+
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
+	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
+)
+
+type SetCategoryAssignmentRequest struct {
+	Assigned float64
+}
+
+func (h *Handler) setCategoryAssignment(c echo.Context) error {
+	categoryID := c.Param("categoryid")
+	categoryUUID, err := uuid.Parse(categoryID)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, "categoryid missing from URL")
+	}
+
+	var request SetCategoryAssignmentRequest
+	err = c.Bind(&request)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("invalid payload: %w", err))
+	}
+
+	date, err := getDate(c)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("date invalid: %w", err))
+	}
+
+	var amount numeric.Numeric
+	err = amount.Set(request.Assigned)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("parse amount: %w", err))
+	}
+
+	updateArgs := postgres.UpdateAssignmentParams{
+		CategoryID: categoryUUID,
+		Date:       date.FirstOfMonth(),
+		Amount:     amount,
+	}
+	err = h.Service.UpdateAssignment(c.Request().Context(), updateArgs)
+	if err != nil {
+		return fmt.Errorf("update assignment: %w", err)
+	}
+
+	return nil
+}

server/dashboard.go

@@ -1,25 +0,0 @@
-package server
-
-import (
-	"net/http"
-
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
-)
-
-func (h *Handler) dashboard(c *gin.Context) {
-	userID := MustGetToken(c).GetID()
-	budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), userID)
-	if err != nil {
-		return
-	}
-
-	d := DashboardData{
-		Budgets: budgets,
-	}
-	c.JSON(http.StatusOK, d)
-}
-
-type DashboardData struct {
-	Budgets []postgres.Budget
-}

server/http.go

@@ -11,7 +11,9 @@ import (
 	"git.javil.eu/jacob1123/budgeteer"
 	"git.javil.eu/jacob1123/budgeteer/bcrypt"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
+
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 )
 
 // Handler handles incoming requests.
@@ -24,37 +26,31 @@ type Handler struct {
 
 // Serve starts the http server.
 func (h *Handler) Serve() {
-	router := gin.Default()
+	router := echo.New()
 	h.LoadRoutes(router)
 
-	if err := router.Run(":1323"); err != nil {
+	if err := router.Start(":1323"); err != nil {
 		panic(err)
 	}
 }
 
-type ErrorResponse struct {
-	Message string
-}
-
-type SuccessResponse struct {
-	Message string
-}
-
 // LoadRoutes initializes all the routes.
-func (h *Handler) LoadRoutes(router *gin.Engine) {
+func (h *Handler) LoadRoutes(router *echo.Echo) {
 	router.Use(enableCachingForStaticFiles())
-	router.NoRoute(h.ServeStatic)
+	router.Use(middleware.StaticWithConfig(middleware.StaticConfig{
+		Filesystem: h.StaticFS,
+		HTML5:      true,
+	}))
 
 	api := router.Group("/api/v1")
 
 	anonymous := api.Group("/user")
-	anonymous.GET("/login", func(c *gin.Context) { c.Redirect(http.StatusPermanentRedirect, "/login") })
 	anonymous.POST("/login", h.loginPost)
 	anonymous.POST("/register", h.registerPost)
 
 	authenticated := api.Group("")
+	{
 		authenticated.Use(h.verifyLoginWithForbidden)
-	authenticated.GET("/dashboard", h.dashboard)
 		authenticated.GET("/account/:accountid/transactions", h.transactionsForAccount)
 		authenticated.POST("/account/:accountid/reconcile", h.reconcileTransactions)
 		authenticated.POST("/account/:accountid", h.editAccount)
@@ -62,27 +58,34 @@ func (h *Handler) LoadRoutes(router *gin.Engine) {
 
 		budget := authenticated.Group("/budget")
 		budget.POST("/new", h.newBudget)
-	budget.GET("/:budgetid", h.budgeting)
+		budget.GET("/:budgetid", h.budget)
 		budget.GET("/:budgetid/:year/:month", h.budgetingForMonth)
+		budget.POST("/:budgetid/category/:categoryid/:year/:month", h.setCategoryAssignment)
 		budget.GET("/:budgetid/autocomplete/payees", h.autocompletePayee)
+		budget.GET("/:budgetid/autocomplete/accounts", h.autocompleteAccounts)
 		budget.GET("/:budgetid/autocomplete/categories", h.autocompleteCategories)
+		budget.GET("/:budgetid/problematic-transactions", h.problematicTransactions)
+		budget.POST("/:budgetid/filtered-transactions", h.filteredTransactions)
 		budget.DELETE("/:budgetid", h.deleteBudget)
 		budget.POST("/:budgetid/import/ynab", h.importYNAB)
 		budget.POST("/:budgetid/export/ynab/transactions", h.exportYNABTransactions)
 		budget.POST("/:budgetid/export/ynab/assignments", h.exportYNABAssignments)
 		budget.POST("/:budgetid/settings/clear", h.clearBudget)
-	budget.POST("/:budgetid/settings/clean-negative", h.cleanNegativeBudget)
 
 		transaction := authenticated.Group("/transaction")
 		transaction.POST("/new", h.newTransaction)
-	transaction.POST("/:transactionid", h.newTransaction)
+		transaction.POST("/:transactionid", h.updateTransaction)
+	}
 }
 
-func (h *Handler) ServeStatic(c *gin.Context) {
+func (h *Handler) ServeStatic(next echo.HandlerFunc) echo.HandlerFunc {
-	h.ServeStaticFile(c, c.Request.URL.Path)
+	return func(c echo.Context) error {
+		h.ServeStaticFile(c, c.Path())
+		return nil
+	}
 }
 
-func (h *Handler) ServeStaticFile(c *gin.Context, fullPath string) {
+func (h *Handler) ServeStaticFile(c echo.Context, fullPath string) {
 	file, err := h.StaticFS.Open(fullPath)
 	if errors.Is(err, fs.ErrNotExist) {
 		h.ServeStaticFile(c, path.Join("/", "/index.html"))
@@ -90,13 +93,13 @@ func (h *Handler) ServeStaticFile(c *gin.Context, fullPath string) {
 	}
 
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		c.Error(err)
 		return
 	}
 
 	stat, err := file.Stat()
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		c.Error(err)
 		return
 	}
 
@@ -106,16 +109,20 @@ func (h *Handler) ServeStaticFile(c *gin.Context, fullPath string) {
 	}
 
 	if file, ok := file.(io.ReadSeeker); ok {
-		http.ServeContent(c.Writer, c.Request, stat.Name(), stat.ModTime(), file)
+		http.ServeContent(c.Response().Writer, c.Request(), stat.Name(), stat.ModTime(), file)
 	} else {
 		panic("File does not implement ReadSeeker")
 	}
 }
 
-func enableCachingForStaticFiles() gin.HandlerFunc {
+func enableCachingForStaticFiles() echo.MiddlewareFunc {
-	return func(c *gin.Context) {
+	return func(next echo.HandlerFunc) echo.HandlerFunc {
-		if strings.HasPrefix(c.Request.RequestURI, "/static/") {
+		return func(c echo.Context) error {
-			c.Header("Cache-Control", "max-age=86400")
+			if strings.HasPrefix(c.Path(), "/static/") {
+				c.Response().Header().Set("Cache-Control", "max-age=86400")
+			}
+
+			return next(c)
 		}
 	}
 }

server/main_test.go

@@ -0,0 +1,305 @@
+package server
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io/fs"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"testing"
+	"time"
+
+	"git.javil.eu/jacob1123/budgeteer/bcrypt"
+	"git.javil.eu/jacob1123/budgeteer/config"
+	"git.javil.eu/jacob1123/budgeteer/jwt"
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"git.javil.eu/jacob1123/budgeteer/web"
+
+	txdb "github.com/DATA-DOG/go-txdb"
+)
+
+var cfg = config.Config{ //nolint:gochecknoglobals
+	DatabaseConnection: "postgres://budgeteer:budgeteer@db:5432/budgeteer_test",
+	SessionSecret:      "this_is_my_demo_secret_for_unit_tests",
+}
+
+func init() { //nolint:gochecknoinits
+	_, err := postgres.Connect("pgx", cfg.DatabaseConnection)
+	if err != nil {
+		panic("failed connecting to DB for migrations: " + err.Error())
+	}
+
+	txdb.Register("pgtx", "pgx", cfg.DatabaseConnection)
+}
+
+func TestMain(t *testing.T) {
+	t.Parallel()
+
+	queries, err := postgres.Connect("pgtx", cfg.DatabaseConnection)
+	if err != nil {
+		t.Errorf("connect to DB: %v", err)
+	}
+
+	static, err := fs.Sub(web.Static, "dist")
+	if err != nil {
+		panic("couldn't open static files")
+	}
+
+	tokenVerifier, err := jwt.NewTokenVerifier(cfg.SessionSecret)
+	if err != nil {
+		panic(fmt.Errorf("couldn't create token verifier: %w", err))
+	}
+
+	handler := &Handler{
+		Service:             queries,
+		TokenVerifier:       tokenVerifier,
+		CredentialsVerifier: &bcrypt.Verifier{},
+		StaticFS:            http.FS(static),
+	}
+
+	ctx := context.Background()
+
+	createUserParams := postgres.CreateUserParams{
+		Email:    "test@example.com",
+		Name:     "test@example.com",
+		Password: "this is my dumb password",
+	}
+	user, err := handler.Service.CreateUser(ctx, createUserParams)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+
+	budget, err := handler.Service.NewBudget(ctx, "My nice Budget", user.ID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+
+	handler.DoYNABImport(ctx, t, budget)
+
+	loc := time.Now().Location()
+
+	AssertCategoriesAndAvailableEqual(ctx, t, loc, handler, budget)
+
+	AssertAccountsEqual(ctx, t, handler, budget)
+}
+
+func AssertAccountsEqual(ctx context.Context, t *testing.T, handler *Handler, budget *postgres.Budget) {
+	t.Helper()
+
+	t.Run("account balances", func(t *testing.T) {
+		t.Parallel()
+		resultDir := "../testdata/production-export/results"
+		files, err := os.ReadDir(resultDir)
+		if err != nil {
+			t.Errorf("could not load results: %s", err)
+			return
+		}
+
+		for _, file := range files {
+			if file.IsDir() {
+				continue
+			}
+
+			name := file.Name()[0 : len(file.Name())-5]
+			if name != "accounts" {
+				continue
+			}
+
+			testCaseFile := filepath.Join(resultDir, file.Name())
+			handler.CheckAccountBalance(ctx, t, testCaseFile, budget)
+		}
+	})
+}
+
+func (h Handler) CheckAccountBalance(ctx context.Context, t *testing.T, testCaseFile string, budget *postgres.Budget) {
+	t.Helper()
+
+	accounts, err := h.Service.GetAccountsWithBalance(ctx, budget.ID)
+	if err != nil {
+		t.Errorf("get accounts: %s", err)
+		return
+	}
+
+	testDataFile, err := os.Open(testCaseFile)
+	if err != nil {
+		t.Errorf("could not load category test data: %s", err)
+		return
+	}
+
+	var testData map[string]float64
+	dec := json.NewDecoder(testDataFile)
+	err = dec.Decode(&testData)
+	if err != nil {
+		t.Errorf("could not decode category test data: %s", err)
+		return
+	}
+
+	for accountName, accountBalance := range testData {
+		found := false
+		for _, account := range accounts {
+			if account.Name == accountName {
+				assertEqual(t, accountBalance, account.WorkingBalance.GetFloat64(), "balance for "+accountName)
+				found = true
+			}
+		}
+
+		if !found {
+			t.Errorf("account " + accountName + " was not found in result")
+		}
+	}
+}
+
+func AssertCategoriesAndAvailableEqual(ctx context.Context, t *testing.T, loc *time.Location, handler *Handler, budget *postgres.Budget) {
+	t.Helper()
+
+	t.Run("Categories and available balance", func(t *testing.T) {
+		t.Parallel()
+		resultDir := "../testdata/production-export/results"
+		files, err := os.ReadDir(resultDir)
+		if err != nil {
+			t.Errorf("could not load results: %s", err)
+			return
+		}
+
+		for _, file := range files {
+			if file.IsDir() {
+				continue
+			}
+
+			name := file.Name()[0 : len(file.Name())-5]
+			parts := strings.Split(name, "-")
+			if len(parts) != 2 {
+				continue
+			}
+			year, _ := strconv.Atoi(parts[0])
+			month, _ := strconv.Atoi(parts[1])
+			testCaseFile := filepath.Join(resultDir, file.Name())
+			handler.CheckAvailableBalance(ctx, t, testCaseFile, budget, Month{year, month})
+		}
+	})
+}
+
+type TestData struct {
+	AvailableBalance float64
+	Categories       map[string]CategoryTestData
+}
+
+type CategoryTestData struct {
+	Available float64
+	Activity  float64
+	Assigned  float64
+}
+
+func (h Handler) CheckAvailableBalance(ctx context.Context, t *testing.T, testCaseFile string, budget *postgres.Budget, month Month) {
+	t.Helper()
+
+	t.Run(month.String(), func(t *testing.T) {
+		t.Parallel()
+		data, err := h.getBudgetingViewForMonth(ctx, *budget, month)
+		if err != nil {
+			t.Errorf("prepare budgeting: %s", err)
+			return
+		}
+
+		testDataFile, err := os.Open(testCaseFile)
+		if err != nil {
+			t.Errorf("could not load category test data: %s", err)
+			return
+		}
+
+		var testData TestData
+		dec := json.NewDecoder(testDataFile)
+		err = dec.Decode(&testData)
+		if err != nil {
+			t.Errorf("could not decode category test data: %s", err)
+			return
+		}
+
+		assertEqual(t, testData.AvailableBalance, data.AvailableBalance.GetFloat64(), "available balance")
+
+		for categoryName, categoryTestData := range testData.Categories {
+			found := false
+			for _, category := range data.Categories {
+				name := category.Group + " : " + category.Name
+
+				if name == categoryName {
+					assertEqual(t, categoryTestData.Activity, category.Activity.GetFloat64(), "activity for "+categoryName)
+					assertEqual(t, categoryTestData.Assigned, category.Assigned.GetFloat64(), "assigned for "+categoryName)
+					available := category.AvailableLastMonth
+					available.AddI(category.Activity).AddI(category.Assigned)
+					assertEqual(t, categoryTestData.Available, available.GetFloat64(), "available for "+categoryName)
+					found = true
+				}
+			}
+
+			if !found {
+				t.Errorf("category " + categoryName + " was not found in result")
+			}
+		}
+	})
+}
+
+func AssertEqualBool(t *testing.T, expected, actual bool, message string) {
+	t.Helper()
+	if expected == actual {
+		return
+	}
+
+	t.Errorf("%s: expected %v, got %v", message, expected, actual)
+}
+
+func assertEqual(t *testing.T, expected, actual float64, message string) {
+	t.Helper()
+	if expected == actual {
+		return
+	}
+
+	t.Errorf("%s: expected %f, got %f", message, expected, actual)
+}
+
+func (h Handler) DoYNABImport(ctx context.Context, t *testing.T, budget *postgres.Budget) {
+	t.Helper()
+	budgetID := budget.ID
+	ynab, err := postgres.NewYNABImport(ctx, h.Service.Queries, budgetID)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+
+	transactions, err := os.Open("../testdata/production-export/Register.tsv")
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+
+	assignments, err := os.Open("../testdata/production-export/Budget.tsv")
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+
+	err = ynab.ImportTransactions(ctx, transactions)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+
+	err = ynab.ImportAssignments(ctx, assignments)
+	if err != nil {
+		fmt.Println(err)
+		t.Fail()
+		return
+	}
+}

server/month.go

@@ -0,0 +1,71 @@
+package server
+
+import (
+	"fmt"
+	"time"
+)
+
+type Month struct {
+	Year  int
+	Month int
+}
+
+func NewFromTime(date time.Time) Month {
+	return Month{date.Year(), int(date.Month())}
+}
+
+func (m Month) String() string {
+	return fmt.Sprintf("%d-%d", m.Year, m.Month)
+}
+
+func (m Month) FirstOfMonth() time.Time {
+	return time.Date(m.Year, time.Month(m.Month), 1, 0, 0, 0, 0, time.Now().Location())
+}
+
+func (m Month) Previous() Month {
+	if m.Month == int(time.January) {
+		return Month{Year: m.Year - 1, Month: int(time.December)}
+	}
+
+	return Month{Year: m.Year, Month: m.Month - 1}
+}
+
+func (m Month) Next() Month {
+	if m.Month == int(time.December) {
+		return Month{Year: m.Year + 1, Month: int(time.January)}
+	}
+
+	return Month{Year: m.Year, Month: m.Month + 1}
+}
+
+func (m Month) InFuture(date time.Time) bool {
+	if m.Year < date.Year() {
+		return true
+	}
+
+	if m.Year > date.Year() {
+		return false
+	}
+
+	return time.Month(m.Month) < date.Month()
+}
+
+func (m Month) InPast(date time.Time) bool {
+	if m.Year > date.Year() {
+		return true
+	}
+
+	if m.Year < date.Year() {
+		return false
+	}
+
+	return time.Month(m.Month) > date.Month()
+}
+
+func (m Month) InPresent(date time.Time) bool {
+	if date.Year() != m.Year {
+		return false
+	}
+
+	return date.Month() == time.Month(m.Month)
+}

server/month_test.go

@@ -0,0 +1,46 @@
+package server_test
+
+import (
+	"testing"
+	"time"
+
+	"git.javil.eu/jacob1123/budgeteer/server"
+)
+
+type TestCaseCompare struct {
+	Value     server.Month
+	Date      time.Time
+	InPast    bool
+	InPresent bool
+	InFuture  bool
+}
+
+func TestComparisons(t *testing.T) {
+	t.Parallel()
+
+	loc := time.Now().Location()
+	tests := []TestCaseCompare{
+		{server.Month{2022, 2}, time.Date(2022, 3, 1, 0, 0, 0, 0, loc), false, false, true},
+		{server.Month{2022, 3}, time.Date(2022, 3, 1, 0, 0, 0, 0, loc), false, true, false},
+		{server.Month{2022, 4}, time.Date(2022, 3, 1, 0, 0, 0, 0, loc), true, false, false},
+		{server.Month{2022, 2}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), false, false, true},
+		{server.Month{2022, 3}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), false, true, false},
+		{server.Month{2022, 4}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), true, false, false},
+		{server.Month{2021, 2}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), false, false, true},
+		{server.Month{2021, 3}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), false, false, true},
+		{server.Month{2021, 4}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), false, false, true},
+		{server.Month{2023, 2}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), true, false, false},
+		{server.Month{2023, 3}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), true, false, false},
+		{server.Month{2023, 4}, time.Date(2022, 3, 31, 0, 0, 0, 0, loc), true, false, false},
+		{server.Month{2021, 11}, time.Date(2021, 12, 1, 0, 0, 0, 0, loc), false, false, true},
+	}
+	for i := range tests { //nolint:paralleltest
+		test := tests[i]
+		t.Run(test.Date.Format("2006-01-02")+" is in of "+test.Value.String(), func(t *testing.T) {
+			t.Parallel()
+			server.AssertEqualBool(t, test.InPast, test.Value.InPast(test.Date), "in past")
+			server.AssertEqualBool(t, test.InPresent, test.Value.InPresent(test.Date), "in present")
+			server.AssertEqualBool(t, test.InFuture, test.Value.InFuture(test.Date), "in future")
+		})
+	}
+}

server/reconcile.go

@@ -8,8 +8,8 @@ import (
 
 	"git.javil.eu/jacob1123/budgeteer/postgres"
 	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
-	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
 )
 
 type ReconcileTransactionsRequest struct {
@@ -22,62 +22,60 @@ type ReconcileTransactionsResponse struct {
 	ReconciliationTransaction *postgres.DisplayTransaction
 }
 
-func (h *Handler) reconcileTransactions(c *gin.Context) {
+func (h *Handler) reconcileTransactions(c echo.Context) error {
 	accountID := c.Param("accountid")
 	accountUUID, err := uuid.Parse(accountID)
 	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, err)
+		return echo.NewHTTPError(http.StatusBadRequest, err)
-		return
 	}
 
 	var request ReconcileTransactionsRequest
-	err = c.BindJSON(&request)
+	err = c.Bind(&request)
 	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("parse request: %w", err))
+		return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("parse request: %w", err))
-		return
 	}
 
 	var amount numeric.Numeric
 	err = amount.Set(request.ReconcilationTransactionAmount)
 	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("parse request: %w", err))
+		return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("parse request: %w", err))
-		return
 	}
 
-	tx, err := h.Service.BeginTx(c.Request.Context(), &sql.TxOptions{})
+	tx, err := h.Service.BeginTx(c.Request().Context(), &sql.TxOptions{})
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("begin tx: %w", err))
+		return fmt.Errorf("begin tx: %w", err)
-		return
 	}
 
 	db := h.Service.WithTx(tx)
 	for _, transactionID := range request.TransactionIDs {
-		err := db.SetTransactionReconciled(c.Request.Context(), transactionID)
+		err := db.SetTransactionReconciled(c.Request().Context(), transactionID)
 		if err != nil {
-			c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("update transaction: %w", err))
+			return fmt.Errorf("update transaction: %w", err)
-			return
 		}
 	}
 
 	reconciliationTransaction, err := h.CreateReconcilationTransaction(amount, accountUUID, db, c)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("insert new transaction: %w", err))
+		return fmt.Errorf("insert new transaction: %w", err)
-		return
+	}
+
+	err = h.Service.SetLastReconciled(c.Request().Context(), accountUUID)
+	if err != nil {
+		return fmt.Errorf("set last reconciled: %w", err)
 	}
 
 	err = tx.Commit()
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("commit: %w", err))
+		return fmt.Errorf("commit: %w", err)
-		return
 	}
 
-	c.JSON(http.StatusOK, ReconcileTransactionsResponse{
+	return c.JSON(http.StatusOK, ReconcileTransactionsResponse{
 		Message:                   fmt.Sprintf("Set status for %d transactions", len(request.TransactionIDs)),
 		ReconciliationTransaction: reconciliationTransaction,
 	})
 }
 
-func (*Handler) CreateReconcilationTransaction(amount numeric.Numeric, accountUUID uuid.UUID, db *postgres.Queries, c *gin.Context) (*postgres.DisplayTransaction, error) {
+func (*Handler) CreateReconcilationTransaction(amount numeric.Numeric, accountUUID uuid.UUID, db *postgres.Queries, c echo.Context) (*postgres.DisplayTransaction, error) {
 	if amount.IsZero() {
 		return nil, nil //nolint: nilnil
 	}
@@ -89,12 +87,12 @@ func (*Handler) CreateReconcilationTransaction(amount numeric.Numeric, accountUU
 		AccountID: accountUUID,
 		Status:    "Reconciled",
 	}
-	transactionUUID, err := db.CreateTransaction(c.Request.Context(), createTransaction)
+	transactionUUID, err := db.CreateTransaction(c.Request().Context(), createTransaction)
 	if err != nil {
 		return nil, fmt.Errorf("insert new transaction: %w", err)
 	}
 
-	transaction, err := db.GetTransaction(c.Request.Context(), transactionUUID)
+	transaction, err := db.GetTransaction(c.Request().Context(), transactionUUID)
 	if err != nil {
 		return nil, fmt.Errorf("get created transaction: %w", err)
 	}

server/session.go

@@ -7,8 +7,8 @@ import (
 
 	"git.javil.eu/jacob1123/budgeteer"
 	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
 )
 
 const (
@@ -17,8 +17,8 @@ const (
 	ParamName  = "token"
 )
 
-func MustGetToken(c *gin.Context) budgeteer.Token { //nolint:ireturn
+func MustGetToken(c echo.Context) budgeteer.Token { //nolint:ireturn
-	token := c.MustGet(ParamName)
+	token := c.Get(ParamName)
 	if token, ok := token.(budgeteer.Token); ok {
 		return token
 	}
@@ -26,31 +26,32 @@ func MustGetToken(c *gin.Context) budgeteer.Token { //nolint:ireturn
 	panic("Token is not a valid Token")
 }
 
-func (h *Handler) verifyLogin(c *gin.Context) (budgeteer.Token, *ErrorResponse) { //nolint:ireturn
+func (h *Handler) verifyLogin(c echo.Context) (budgeteer.Token, error) { //nolint:ireturn
-	tokenString := c.GetHeader(HeaderName)
+	tokenString := c.Request().Header.Get(HeaderName)
 	if len(tokenString) <= len(Bearer) {
-		return nil, &ErrorResponse{"no authorization header supplied"}
+		return nil, echo.NewHTTPError(http.StatusUnauthorized, "no authorization header supplied")
 	}
 
 	tokenString = tokenString[7:]
 	token, err := h.TokenVerifier.VerifyToken(tokenString)
 	if err != nil {
-		return nil, &ErrorResponse{fmt.Sprintf("verify token '%s': %s", tokenString, err)}
+		return nil, fmt.Errorf("verify token '%s': %s", tokenString, err)
 	}
 
 	return token, nil
 }
 
-func (h *Handler) verifyLoginWithForbidden(c *gin.Context) {
+func (h *Handler) verifyLoginWithForbidden(next echo.HandlerFunc) echo.HandlerFunc {
+	return func(c echo.Context) error {
 		token, err := h.verifyLogin(c)
 		if err != nil {
 			// c.Header("WWW-Authenticate", "Bearer")
-		c.AbortWithStatusJSON(http.StatusForbidden, err)
+			return echo.NewHTTPError(http.StatusForbidden, err)
-		return
 		}
 
 		c.Set(ParamName, token)
-	c.Next()
+		return next(c)
+	}
 }
 
 type loginInformation struct {
@@ -58,37 +59,35 @@ type loginInformation struct {
 	User     string `json:"user"`
 }
 
-func (h *Handler) loginPost(c *gin.Context) {
+func (h *Handler) loginPost(c echo.Context) error {
 	var login loginInformation
-	err := c.BindJSON(&login)
+	err := c.Bind(&login)
 	if err != nil {
-		return
+		return err
 	}
 
-	user, err := h.Service.GetUserByUsername(c.Request.Context(), login.User)
+	user, err := h.Service.GetUserByUsername(c.Request().Context(), login.User)
 	if err != nil {
-		c.AbortWithError(http.StatusUnauthorized, err)
+		return err
-		return
 	}
 
 	if err = h.CredentialsVerifier.Verify(login.Password, user.Password); err != nil {
-		c.AbortWithError(http.StatusUnauthorized, err)
+		return err
-		return
 	}
 
 	token, err := h.TokenVerifier.CreateToken(&user)
 	if err != nil {
-		c.AbortWithError(http.StatusUnauthorized, err)
+		return err
 	}
 
 	go h.UpdateLastLogin(user.ID)
 
-	budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), user.ID)
+	budgets, err := h.Service.GetBudgetsForUser(c.Request().Context(), user.ID)
 	if err != nil {
-		return
+		return err
 	}
 
-	c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
+	return c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
 }
 
 type LoginResponse struct {
@@ -103,29 +102,25 @@ type registerInformation struct {
 	Name     string `json:"name"`
 }
 
-func (h *Handler) registerPost(c *gin.Context) {
+func (h *Handler) registerPost(c echo.Context) error {
 	var register registerInformation
-	err := c.BindJSON(&register)
+	err := c.Bind(&register)
 	if err != nil {
-		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"error parsing body"})
+		return echo.NewHTTPError(http.StatusBadRequest, "error parsing body")
-		return
 	}
 
 	if register.Email == "" || register.Password == "" || register.Name == "" {
-		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"e-mail, password and name are required"})
+		return echo.NewHTTPError(http.StatusBadRequest, "e-mail, password and name are required")
-		return
 	}
 
-	_, err = h.Service.GetUserByUsername(c.Request.Context(), register.Email)
+	_, err = h.Service.GetUserByUsername(c.Request().Context(), register.Email)
 	if err == nil {
-		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"email is already taken"})
+		return echo.NewHTTPError(http.StatusBadRequest, "email is already taken")
-		return
 	}
 
 	hash, err := h.CredentialsVerifier.Hash(register.Password)
 	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, err)
+		return err
-		return
 	}
 
 	createUser := postgres.CreateUserParams{
@@ -133,24 +128,24 @@ func (h *Handler) registerPost(c *gin.Context) {
 		Password: hash,
 		Email:    register.Email,
 	}
-	user, err := h.Service.CreateUser(c.Request.Context(), createUser)
+	user, err := h.Service.CreateUser(c.Request().Context(), createUser)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
 	}
 
 	token, err := h.TokenVerifier.CreateToken(&user)
 	if err != nil {
-		c.AbortWithError(http.StatusUnauthorized, err)
+		return err
 	}
 
 	go h.UpdateLastLogin(user.ID)
 
-	budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), user.ID)
+	budgets, err := h.Service.GetBudgetsForUser(c.Request().Context(), user.ID)
 	if err != nil {
-		return
+		return err
 	}
 
-	c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
+	return c.JSON(http.StatusOK, LoginResponse{token, user, budgets})
 }
 
 func (h *Handler) UpdateLastLogin(userID uuid.UUID) {

server/transaction.go

@@ -8,8 +8,8 @@ import (
 
 	"git.javil.eu/jacob1123/budgeteer/postgres"
 	"git.javil.eu/jacob1123/budgeteer/postgres/numeric"
-	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
 )
 
 type NewTransactionPayload struct {
@@ -27,24 +27,37 @@ type NewTransactionPayload struct {
 	State      string        `json:"state"`
 }
 
-func (h *Handler) newTransaction(c *gin.Context) {
+func (h *Handler) updateTransaction(c echo.Context) error {
 	var payload NewTransactionPayload
-	err := c.BindJSON(&payload)
+	err := c.Bind(&payload)
 	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, err)
+		return echo.NewHTTPError(http.StatusBadRequest, err)
-		return
 	}
 
 	amount, err := numeric.Parse(payload.Amount)
 	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, fmt.Errorf("amount: %w", err))
+		return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("amount: %w", err))
-		return
 	}
 
 	transactionID := c.Param("transactionid")
-	if transactionID != "" {
+	transactionUUID, err := uuid.Parse(transactionID)
-		h.UpdateTransaction(payload, amount, transactionID, c)
+	if err != nil {
-		return
+		return echo.NewHTTPError(http.StatusBadRequest, "transactionid missing from URL")
+	}
+
+	return h.UpdateTransaction(payload, amount, transactionUUID, c)
+}
+
+func (h *Handler) newTransaction(c echo.Context) error {
+	var payload NewTransactionPayload
+	err := c.Bind(&payload)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, err)
+	}
+
+	amount, err := numeric.Parse(payload.Amount)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("amount: %w", err))
 	}
 
 	newTransaction := postgres.CreateTransactionParams{
@@ -59,42 +72,38 @@ func (h *Handler) newTransaction(c *gin.Context) {
 	if payload.Payee.Type == "account" {
 		groupID, err := h.CreateTransferForOtherAccount(newTransaction, amount, payload, c)
 		if err != nil {
-			c.AbortWithError(http.StatusInternalServerError, err)
+			return echo.NewHTTPError(http.StatusInternalServerError, err)
-			return
 		}
 
 		newTransaction.GroupID = groupID
 	} else {
-		payeeID, err := GetPayeeID(c.Request.Context(), payload, h)
+		payeeID, err := GetPayeeID(c.Request().Context(), payload, h)
 		if err != nil {
-			c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("create payee: %w", err))
+			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("create payee: %w", err))
 		}
 		newTransaction.PayeeID = payeeID
 	}
 
-	transactionUUID, err := h.Service.CreateTransaction(c.Request.Context(), newTransaction)
+	transactionUUID, err := h.Service.CreateTransaction(c.Request().Context(), newTransaction)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("create transaction: %w", err))
+		return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("create transaction: %w", err))
-		return
 	}
 
-	transaction, err := h.Service.GetTransaction(c.Request.Context(), transactionUUID)
+	transaction, err := h.Service.GetTransaction(c.Request().Context(), transactionUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("get transaction: %w", err))
+		return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("get transaction: %w", err))
-		return
 	}
 
-	c.JSON(http.StatusOK, transaction)
+	return c.JSON(http.StatusOK, transaction)
 }
 
-func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeric.Numeric, transactionID string, c *gin.Context) {
+func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeric.Numeric, transactionUUID uuid.UUID, c echo.Context) error {
-	transactionUUID := uuid.MustParse(transactionID)
 	if amount.IsZero() {
-		err := h.Service.DeleteTransaction(c.Request.Context(), transactionUUID)
+		err := h.Service.DeleteTransaction(c.Request().Context(), transactionUUID)
 		if err != nil {
-			c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("delete transaction: %w", err))
+			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("delete transaction: %w", err))
 		}
-		return
+		return nil
 	}
 
 	editTransaction := postgres.UpdateTransactionParams{
@@ -106,22 +115,20 @@ func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeri
 		ID:         transactionUUID,
 	}
 
-	err := h.Service.UpdateTransaction(c.Request.Context(), editTransaction)
+	err := h.Service.UpdateTransaction(c.Request().Context(), editTransaction)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("edit transaction: %w", err))
+		return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("edit transaction: %w", err))
-		return
 	}
 
-	transaction, err := h.Service.GetTransaction(c.Request.Context(), transactionUUID)
+	transaction, err := h.Service.GetTransaction(c.Request().Context(), transactionUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("get transaction: %w", err))
+		return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("get transaction: %w", err))
-		return
 	}
 
-	c.JSON(http.StatusOK, transaction)
+	return c.JSON(http.StatusOK, transaction)
 }
 
-func (h *Handler) CreateTransferForOtherAccount(newTransaction postgres.CreateTransactionParams, amount numeric.Numeric, payload NewTransactionPayload, c *gin.Context) (uuid.NullUUID, error) {
+func (h *Handler) CreateTransferForOtherAccount(newTransaction postgres.CreateTransactionParams, amount numeric.Numeric, payload NewTransactionPayload, c echo.Context) (uuid.NullUUID, error) {
 	newTransaction.GroupID = uuid.NullUUID{UUID: uuid.New(), Valid: true}
 	newTransaction.Amount = amount.Neg()
 	newTransaction.AccountID = payload.Payee.ID.UUID
@@ -129,7 +136,7 @@ func (h *Handler) CreateTransferForOtherAccount(newTransaction postgres.CreateTr
 	// transfer does not need category. Either it's account is off-budget or no category was supplied.
 	newTransaction.CategoryID = uuid.NullUUID{}
 
-	_, err := h.Service.CreateTransaction(c.Request.Context(), newTransaction)
+	_, err := h.Service.CreateTransaction(c.Request().Context(), newTransaction)
 	if err != nil {
 		return uuid.NullUUID{}, fmt.Errorf("create transfer transaction: %w", err)
 	}

server/util.go

@@ -0,0 +1,37 @@
+package server
+
+import (
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/labstack/echo/v4"
+)
+
+func getDate(c echo.Context) (Month, error) {
+	var year, month int
+	yearString := c.Param("year")
+	monthString := c.Param("month")
+	if yearString == "" && monthString == "" {
+		return getFirstOfMonthTime(time.Now()), nil
+	}
+
+	year, err := strconv.Atoi(yearString)
+	if err != nil {
+		return Month{}, fmt.Errorf("parse year: %w", err)
+	}
+
+	month, err = strconv.Atoi(monthString)
+	if err != nil {
+		return Month{}, fmt.Errorf("parse month: %w", err)
+	}
+
+	return Month{year, month}, nil
+}
+
+func getFirstOfMonthTime(date time.Time) Month {
+	var monthM time.Month
+	year, monthM, _ := date.Date()
+	month := int(monthM)
+	return Month{year, month}
+}

server/ynab-import.go

@@ -4,114 +4,103 @@ import (
 	"net/http"
 
 	"git.javil.eu/jacob1123/budgeteer/postgres"
-	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
 )
 
-func (h *Handler) importYNAB(c *gin.Context) {
+func (h *Handler) importYNAB(c echo.Context) error {
-	budgetID, succ := c.Params.Get("budgetid")
+	budgetID := c.Param("budgetid")
-	if !succ {
+	if budgetID == "" {
-		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"no budget_id specified"})
+		return echo.NewHTTPError(http.StatusBadRequest, "no budget_id specified")
-		return
 	}
 
 	budgetUUID, err := uuid.Parse(budgetID)
-	if !succ {
+	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, err)
+		return echo.NewHTTPError(http.StatusBadRequest, err)
-		return
 	}
 
-	ynab, err := postgres.NewYNABImport(c.Request.Context(), h.Service.Queries, budgetUUID)
+	ynab, err := postgres.NewYNABImport(c.Request().Context(), h.Service.Queries, budgetUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
 	}
 
 	transactionsFile, err := c.FormFile("transactions")
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
 	}
 
 	transactions, err := transactionsFile.Open()
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
 	}
 
-	err = ynab.ImportTransactions(c.Request.Context(), transactions)
+	err = ynab.ImportTransactions(c.Request().Context(), transactions)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
 	}
 
 	assignmentsFile, err := c.FormFile("assignments")
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
 	}
 
 	assignments, err := assignmentsFile.Open()
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
 	}
 
-	err = ynab.ImportAssignments(c.Request.Context(), assignments)
+	err = ynab.ImportAssignments(c.Request().Context(), assignments)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
-	}
 	}
 
-func (h *Handler) exportYNABTransactions(c *gin.Context) {
+	return nil
-	budgetID, succ := c.Params.Get("budgetid")
+}
-	if !succ {
+
-		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"no budget_id specified"})
+func (h *Handler) exportYNABTransactions(c echo.Context) error {
-		return
+	budgetID := c.Param("budgetid")
+	if budgetID == "" {
+		return echo.NewHTTPError(http.StatusBadRequest, "no budget_id specified")
 	}
 
 	budgetUUID, err := uuid.Parse(budgetID)
-	if !succ {
-		c.AbortWithError(http.StatusBadRequest, err)
-		return
-	}
-
-	ynab, err := postgres.NewYNABExport(c.Request.Context(), h.Service.Queries, budgetUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return echo.NewHTTPError(http.StatusBadRequest, err)
-		return
 	}
 
-	err = ynab.ExportTransactions(c.Request.Context(), c.Writer)
+	ynab, err := postgres.NewYNABExport(c.Request().Context(), h.Service.Queries, budgetUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return err
-		return
-	}
 	}
 
-func (h *Handler) exportYNABAssignments(c *gin.Context) {
+	err = ynab.ExportTransactions(c.Request().Context(), c.Response().Writer)
-	budgetID, succ := c.Params.Get("budgetid")
+	if err != nil {
-	if !succ {
+		return err
-		c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"no budget_id specified"})
+	}
-		return
+
+	return nil
+}
+
+func (h *Handler) exportYNABAssignments(c echo.Context) error {
+	budgetID := c.Param("budgetid")
+	if budgetID == "" {
+		return echo.NewHTTPError(http.StatusBadRequest, "no budget_id specified")
 	}
 
 	budgetUUID, err := uuid.Parse(budgetID)
-	if !succ {
+	if err != nil {
-		c.AbortWithError(http.StatusBadRequest, err)
+		return echo.NewHTTPError(http.StatusBadRequest, err)
-		return
 	}
 
-	ynab, err := postgres.NewYNABExport(c.Request.Context(), h.Service.Queries, budgetUUID)
+	ynab, err := postgres.NewYNABExport(c.Request().Context(), h.Service.Queries, budgetUUID)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return echo.NewHTTPError(http.StatusInternalServerError, err)
-		return
 	}
 
-	err = ynab.ExportAssignments(c.Request.Context(), c.Writer)
+	err = ynab.ExportAssignments(c.Request().Context(), c.Response().Writer)
 	if err != nil {
-		c.AbortWithError(http.StatusInternalServerError, err)
+		return echo.NewHTTPError(http.StatusInternalServerError, err)
-		return
 	}
+
+	return nil
 }

web/.eslintrc.js

@@ -0,0 +1,21 @@
+module.exports = {
+    extends: [
+        // add more generic rulesets here, such as:
+        // 'eslint:recommended',
+        "plugin:vue/vue3-recommended",
+        // 'plugin:vue/recommended' // Use this if you are using Vue.js 2.x.
+    ],
+    rules: {
+        // override/add rules settings here, such as:
+        'vue/max-attributes-per-line': 'off',
+        'vue/singleline-html-element-content-newline': 'off',
+        'vue/first-attribute-linebreak': 'off',
+        'vue/html-closing-bracket-newline': 'off',
+        // 'vue/no-unused-vars': 'error'
+    },
+    parser: "vue-eslint-parser",
+    parserOptions: {
+        parser: "@typescript-eslint/parser",
+        sourceType: "module",
+    },
+};

web/index.html

@@ -6,7 +6,8 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title>Vite App</title>
     </head>
-  <body class="bg-slate-200 text-slate-800 dark:bg-slate-800 dark:text-slate-200">
+    <body
+        class="bg-slate-200 text-slate-800 dark:bg-slate-800 dark:text-slate-200 box-border w-full">
         <div id="app"></div>
         <script type="module" src="/src/main.ts"></script>
     </body>

web/package.json

@@ -20,14 +20,22 @@
     },
     "devDependencies": {
         "@types/file-saver": "^2.0.5",
+        "@typescript-eslint/parser": "^5.13.0",
         "@vitejs/plugin-vue": "^2.0.0",
-    "@vue/cli-plugin-babel": "5.0.0-beta.7",
+        "eslint": "^8.10.0",
-    "@vue/cli-plugin-typescript": "~4.5.0",
+        "eslint-plugin-vue": "^8.5.0",
-    "@vue/cli-service": "5.0.0-beta.7",
+        "prettier": "2.5.1",
         "sass": "^1.38.0",
         "sass-loader": "^10.0.0",
         "typescript": "^4.5.5",
         "vite": "^2.7.2",
         "vue-tsc": "^0.32.0"
-  }
+    },
+    "prettier": {
+        "bracketSameLine": true,
+        "embeddedLanguageFormatting": "off",
+        "tabWidth": 4,
+        "useTabs": false
+    },
+    "eslintIgnore": ["index.css"]
 }

web/postcss.config.js

@@ -3,4 +3,4 @@ module.exports = {
         tailwindcss: {},
         autoprefixer: {},
     },
-}
+};

web/src/App.vue

@@ -1,65 +1,17 @@
-<script lang="ts">
+<script lang="ts" setup>
-import { mapState } from "pinia";
+import MainMenu from "./components/MainMenu.vue";
-import { defineComponent } from "vue";
-import { useBudgetsStore } from "./stores/budget";
-import { useSessionStore } from "./stores/session";
-import { useSettingsStore } from "./stores/settings";
-
-export default defineComponent({
-    computed: {
-        ...mapState(useBudgetsStore, ["CurrentBudgetName"]),
-        ...mapState(useSettingsStore, ["Menu"]),
-        ...mapState(useSessionStore, ["LoggedIn"]),
-    },
-    methods: {
-        logout() {
-            useSessionStore().logout();
-            this.$router.push("/login");
-        },
-        toggleMenu() {
-            useSettingsStore().toggleMenu();
-        },
-        toggleMenuSize() {
-            useSettingsStore().toggleMenuSize();
-        }
-    },
-})
 </script>
 
 <template>
-    <div class="box-border w-full">
+  <div class="flex flex-col md:flex-row flex-1 h-screen">
-        <div class="flex bg-gray-400 dark:bg-gray-600 p-4 m-2 rounded-lg">
+    <router-view name="sidebar" />
-            <span class="flex-1 font-bold text-5xl -my-3 hidden md:inline" @click="toggleMenuSize">≡</span>
-            <span class="flex-1 font-bold text-5xl -my-3 md:hidden" @click="toggleMenu">≡</span>
 
-            <span class="flex-1">{{ CurrentBudgetName }}</span>
+    <div class="flex-1 overflow-auto">
+      <MainMenu />
 
-            <div class="flex flex-1 flex-row justify-end -mx-4">
+      <div class="p-3 pl-6">
-                <router-link class="mx-4" v-if="LoggedIn" to="/dashboard">Dashboard</router-link>
+        <router-view />
-                <router-link class="mx-4" v-if="!LoggedIn" to="/login">Login</router-link>
-                <a class="mx-4" v-if="LoggedIn" @click="logout">Logout</a>
-            </div>
-        </div>
-
-        <div class="flex flex-col md:flex-row flex-1">
-            <div
-                :class="[Menu.Expand ? 'md:w-72' : 'md:w-36', Menu.Show ? '' : 'hidden']"
-                class="md:block flex-shrink-0 w-full"
-            >
-                <router-view name="sidebar"></router-view>
-            </div>
-
-            <div class="flex-1 p-6">
-                <router-view></router-view>
       </div>
     </div>
   </div>
 </template>
-
-<style>
-#app {
-    font-family: Avenir, Helvetica, Arial, sans-serif;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
-</style>

web/src/api.ts

@@ -1,26 +1,29 @@
 import { useSessionStore } from "./stores/session";
 
-export const BASE_URL = "/api/v1"
+export const BASE_URL = "/api/v1";
 
 export function GET(path: string) {
     const sessionStore = useSessionStore();
     return fetch(BASE_URL + path, {
         headers: sessionStore.AuthHeaders,
-    })
+    });
-};
+}
 
 export function POST(path: string, body: FormData | string | null) {
     const sessionStore = useSessionStore();
     return fetch(BASE_URL + path, {
         method: "POST",
-        headers: sessionStore.AuthHeaders,
+        headers: {
+          ...sessionStore.AuthHeaders,
+          "Content-Type": "application/json"
+        },
         body: body,
-    })
+    });
 }
 export function DELETE(path: string) {
     const sessionStore = useSessionStore();
     return fetch(BASE_URL + path, {
         method: "DELETE",
         headers: sessionStore.AuthHeaders,
-    })
+    });
 }

web/src/components/AccountWithReconciled.vue

@@ -0,0 +1,35 @@
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { useBudgetsStore } from '../stores/budget';
+import { Account } from '../stores/budget-account';
+
+const props = defineProps<{
+  account: Account
+}>();
+
+const budgetStore = useBudgetsStore();
+const CurrentBudgetID = computed(() => budgetStore.CurrentBudgetID);
+
+const days = 24 * 60 * 60 * 1000;
+function daysSinceLastReconciled() {
+  const now = new Date().getTime();
+  const diff = new Date(now).getTime() - props.account.LastReconciled.Time.getTime();
+  return Math.floor(diff / days);
+}
+</script>
+
+<template>
+  <span>
+    <router-link
+      :to="'/budget/' + CurrentBudgetID + '/account/' + account.ID"
+    >
+      {{ account.Name }}
+    </router-link>
+    <span
+      v-if="props.account.LastReconciled.Valid && daysSinceLastReconciled() > 7"
+      class="font-bold bg-gray-500 rounded-md text-sm px-2 mx-2 py-1 no-underline"
+    >
+      {{ daysSinceLastReconciled() }}
+    </span>
+  </span>
+</template>

web/src/components/Autocomplete.vue

@@ -11,9 +11,9 @@ export interface Suggestion {
 }
 
 const props = defineProps<{
-    text: String,
+    text: string,
-    id: String | undefined,
+    id: string | undefined,
-    model: String,
+    model: string,
     type?: string | undefined,
 }>();
 
@@ -83,19 +83,27 @@ function clear() {
 <template>
   <div>
     <Input
-            type="text"
-            class="border-b-2 border-black"
-            @keypress="keypress"
       v-if="id == undefined"
       v-model="SearchQuery"
+      type="text"
+      class="border-b-2 border-black block w-full border-b-2 border-black"
+      @keypress="keypress"
     />
-        <span @click="clear" v-if="id != undefined" class="bg-gray-300 dark:bg-gray-700">{{ text }}</span>
+    <span
-        <div v-if="Suggestions.length > 0" class="absolute bg-gray-400 dark:bg-gray-600 w-64 p-2">
+      v-if="id != undefined"
+      class="bg-gray-300 dark:bg-gray-700"
+      @click="clear"
+    >{{ text }}</span>
+    <div
+      v-if="Suggestions.length > 0"
+      class="absolute bg-gray-400 dark:bg-gray-600 w-64 p-2"
+    >
       <span
         v-for="suggestion in Suggestions"
+        :key="suggestion.ID"
         class="block"
-                @click="select"
         :value="suggestion.ID"
+        @click="select"
       >{{ suggestion.Name }}</span>
     </div>
   </div>

web/src/components/Button.vue

@@ -1,10 +0,0 @@
-<script lang="ts" setup>
-</script>
-
-<template>
-    <button
-        class="px-4 rounded-md shadow-sm focus:outline-none focus:ring-2"
-    >
-        <slot></slot>
-    </button>
-</template>

web/src/components/Card.vue

@@ -1,8 +0,0 @@
-<script lang="ts" setup>
-</script>
-
-<template>
-    <div class="flex flex-row items-center bg-gray-300 dark:bg-gray-700 rounded-lg">
-        <slot></slot>
-    </div>
-</template>

web/src/components/Checkbox.vue

@@ -0,0 +1,15 @@
+<script lang="ts" setup>
+const props = defineProps<{modelValue?: boolean}>();
+const emits = defineEmits<{
+  (e: "update:modelValue", value: boolean): void
+}>();
+</script>
+
+<template>
+  <input
+    type="checkbox"
+    :checked="modelValue"
+    class="dark:bg-slate-900"
+    @change="emits('update:modelValue', ($event.target as HTMLInputElement)?.checked)"
+  >
+</template>

web/src/components/Currency.vue

@@ -1,7 +1,11 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 
-const props = defineProps<{ value: number | undefined }>();
+const props = defineProps<{
+    value: number | undefined
+    negativeClass?: string
+    positiveClass?: string
+}>();
 
 const internalValue = computed(() => Number(props.value ?? 0));
 
@@ -11,5 +15,8 @@ const formattedValue = computed(() => internalValue.value.toLocaleString(undefin
 </script>
 
 <template>
-    <span class="text-right" :class="internalValue < 0 ? 'negative' : ''">{{ formattedValue }} €</span>
+  <span
+    class="text-right"
+    :class="internalValue < 0 ? (negativeClass ?? 'negative') : positiveClass"
+  >{{ formattedValue }} €</span>
 </template>

web/src/components/DateInput.vue

@@ -1,9 +1,11 @@
 <script lang="ts" setup>
 import Input from './Input.vue';
-const props = defineProps(["modelValue"]);
+const props = defineProps<{
+  modelValue?: Date
+}>();
 const emit = defineEmits(['update:modelValue']);
 
-function dateToYYYYMMDD(d: Date) : string {
+function dateToYYYYMMDD(d: Date | undefined) : string {
   if(d == null)
     return "";
   // alternative implementations in https://stackoverflow.com/q/23593052/1850609
@@ -27,9 +29,9 @@ function selectAll(event: FocusEvent) {
 
 <template>
   <Input
-    type="date"
     ref="input"
-    v-bind:value="dateToYYYYMMDD(modelValue)"
+    type="date"
+    :value="dateToYYYYMMDD(modelValue)"
     @input="updateValue"
     @focus="selectAll"
   />

web/src/components/Input.vue

@@ -1,10 +1,26 @@
 <script lang="ts" setup>
-const props = defineProps(["modelValue"]);
+const props = defineProps<{
+  modelValue?: number | string,
+  type: string,
+}>();
+
+const emits = defineEmits<{
+  (e: "update:modelValue", value: number | string): void
+}>();
+
+function valueChanged(e: Event) {
+  const target = <HTMLInputElement>e.target;
+  switch (props.type) {
+    case "number":
+      emits('update:modelValue', target.valueAsNumber);
+      break;
+    default:
+      emits('update:modelValue', target.value)
+      break;
+  }
+}
 </script>
 
 <template>
-    <input 
+  <input :value="modelValue" :type="type" class="dark:bg-slate-900" @input="valueChanged">
-        v-model="modelValue"
-        @input="$emit('update:modelValue', ($event.target as HTMLInputElement)?.value)"
-        class="dark:bg-slate-900">
 </template>

web/src/components/MainMenu.vue

@@ -0,0 +1,44 @@
+<script lang="ts" setup>
+import { computed } from "vue";
+import { useRouter } from "vue-router";
+import { useBudgetsStore } from "../stores/budget";
+import { useSessionStore } from "../stores/session";
+import { useSettingsStore } from "../stores/settings";
+
+const router = useRouter();
+
+const CurrentBudgetName = computed(() => useBudgetsStore().CurrentBudgetName);
+const LoggedIn = computed(() => useSessionStore().LoggedIn);
+function logout() {
+  useSessionStore().logout();
+  router.push("/login");
+}
+
+function toggleMenu() {
+  useSettingsStore().toggleMenu();
+}
+function toggleMenuSize() {
+  useSettingsStore().toggleMenuSize();
+}
+
+router.afterEach(function(to, from) {
+  useSettingsStore().Menu.Show = false;
+})
+</script>
+
+<template>
+  <div class="flex bg-gray-400 dark:bg-gray-600 p-4 static top-0 left-0 w-full h-14">
+    <span class="flex-1 font-bold text-5xl -my-3 hidden md:inline" @click="toggleMenuSize">≡</span>
+    <span class="flex-1 font-bold text-5xl -my-3 md:hidden" @click="toggleMenu">≡</span>
+    <span class="flex-1">{{ CurrentBudgetName }}</span>
+    <div class="flex flex-1 flex-row justify-end -mx-4">
+      <router-link v-if="LoggedIn" class="mx-4" to="/dashboard">
+        Dashboard
+      </router-link>
+      <router-link v-if="!LoggedIn" class="mx-4" to="/login">
+        Login
+      </router-link>
+      <a v-if="LoggedIn" class="mx-4" @click="logout">Logout</a>
+    </div>
+  </div>
+</template>

web/src/components/Modal.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import Card from '../components/Card.vue';
+import RowCard from './RowCard.vue';
 import { ref } from "vue";
 
 const props = defineProps<{
@@ -7,7 +7,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-    (e: 'submit'): void,
+    (e: 'submit', event : {cancel:boolean}): boolean,
     (e: 'open'): void,
 }>();
 
@@ -20,37 +20,56 @@ function openDialog() {
     visible.value = true;
 };
 function submitDialog() {
+    const e = {cancel: false};
+    emit("submit", e);
+    if(e.cancel)
+        return;
+
     visible.value = false;
-    emit("submit");
 }
 </script>
 
 <template>
   <button @click="openDialog">
     <slot name="placeholder">
-            <Card>
+      <RowCard>
-                <p class="w-24 text-center text-6xl">+</p>
+        <p class="w-24 text-center text-6xl">
-                <span class="text-lg" dark>{{ buttonText }}</span>
+          +
-            </Card>
+        </p>
+        <span
+          class="text-lg"
+          dark
+        >{{ buttonText }}</span>
+      </RowCard>
     </slot>
   </button>
   <div
     v-if="visible"
     class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full"
   >
-        <div class="relative top-20 mx-auto p-5 border w-96 shadow-lg rounded-md bg-white">
+    <div
+      class="relative md:top-20 md:mx-auto p-5 md:w-96 shadow-lg md:h-auto h-full rounded-md bg-white dark:bg-black"
+    >
       <div class="mt-3 text-center">
-                <h3 class="mt-3 text-lg leading-6 font-medium text-gray-900">{{ buttonText }}</h3>
+        <h3
-                <slot></slot>
+          class="mt-3 text-lg leading-6 font-medium text-gray-900 dark:text-gray-100"
+        >
+          {{ buttonText }}
+        </h3>
+        <slot />
         <div class="grid grid-cols-2 gap-6">
           <button
-                        @click="closeDialog"
             class="px-4 py-2 bg-red-500 text-white text-base font-medium rounded-md shadow-sm hover:bg-green-600 focus:outline-none focus:ring-2 focus:ring-green-300"
-                    >Close</button>
+            @click="closeDialog"
+          >
+            Close
+          </button>
           <button
-                        @click="submitDialog"
             class="px-4 py-2 bg-green-500 text-white text-base font-medium rounded-md shadow-sm hover:bg-green-600 focus:outline-none focus:ring-2 focus:ring-green-300"
-                    >Save</button>
+            @click="submitDialog"
+          >
+            Save
+          </button>
         </div>
       </div>
     </div>

web/src/components/RowCard.vue

@@ -0,0 +1,9 @@
+<script lang="ts" setup></script>
+
+<template>
+  <div
+    class="flex flex-row items-center bg-gray-300 dark:bg-gray-700 rounded-lg"
+  >
+    <slot />
+  </div>
+</template>

web/src/components/SimpleButton.vue

@@ -0,0 +1,7 @@
+<script lang="ts" setup></script>
+
+<template>
+  <button class="px-4 rounded-md shadow-sm focus:outline-none focus:ring-2">
+    <slot />
+  </button>
+</template>

web/src/components/TransactionEditRow.vue

@@ -5,10 +5,11 @@ import { useAccountStore } from '../stores/budget-account'
 import DateInput from "./DateInput.vue";
 import { useTransactionsStore } from "../stores/transactions";
 import Input from "./Input.vue";
-import Button from "./Button.vue";
+import Button from "./SimpleButton.vue";
 
 const props = defineProps<{
-    transactionid: string
+  transactionid: string,
+  withAccount: boolean,
 }>()
 
 const emit = defineEmits(["save"]);
@@ -40,7 +41,10 @@ function saveTransaction(e: MouseEvent) {
 <template>
   <tr>
     <td class="text-sm">
-            <DateInput class="border-b-2 border-black" v-model="TX.Date" />
+      <DateInput v-model="TX.Date" class="border-b-2 border-black" />
+    </td>
+    <td v-if="withAccount">
+      <Autocomplete v-model:text="TX.Account" v-model:id="TX.AccountID" model="accounts" />
     </td>
     <td>
       <Autocomplete v-model:text="TX.Payee" v-model:id="TX.PayeeID" v-model:type="payeeType" model="payees" />
@@ -49,18 +53,16 @@ function saveTransaction(e: MouseEvent) {
       <Autocomplete v-model:text="TX.Category" v-model:id="TX.CategoryID" model="categories" />
     </td>
     <td>
-            <Input class="block w-full border-b-2 border-black" type="text" v-model="TX.Memo" />
+      <Input v-model="TX.Memo" class="block w-full border-b-2 border-black" type="text" />
     </td>
     <td class="text-right">
-            <Input
+      <Input v-model="TX.Amount" class="text-right block w-full border-b-2 border-black" type="currency" />
-                class="text-right block w-full border-b-2 border-black"
-                type="currency"
-                v-model="TX.Amount"
-            />
     </td>
     <td>
-            <Button class="bg-blue-500" @click="saveTransaction">Save</Button>
+      <Button class="bg-blue-500" @click="saveTransaction">
+        Save
+      </Button>
     </td>
-        <td></td>
+    <td />
   </tr>
 </template>

web/src/components/TransactionInputRow.vue

@@ -3,7 +3,7 @@ import { computed, ref } from "vue";
 import Autocomplete from '../components/Autocomplete.vue'
 import { Transaction, useTransactionsStore } from "../stores/transactions";
 import DateInput from "./DateInput.vue";
-import Button from "./Button.vue";
+import Button from "./SimpleButton.vue";
 import Input from "./Input.vue";
 
 const props = defineProps<{
@@ -24,7 +24,9 @@ const TX = ref<Transaction>({
     ID: "",
     Status: "Uncleared",
     TransferAccount: "",
-    Reconciled: false
+    Reconciled: false,
+    Account: "",
+    AccountID: "",
 });
 
 const payeeType = ref<string|undefined>(undefined);
@@ -47,37 +49,65 @@ const payload = computed(() => JSON.stringify({
 const transactionsStore = useTransactionsStore();
 function saveTransaction(e: MouseEvent) {
     e.preventDefault();
+    Save();
+}
+
+function Save() {
     transactionsStore.saveTransaction(payload.value);
 }
+
+defineExpose({Save});
 </script>
 
 <template>
   <tr>
     <label class="md:hidden">Date</label>
     <td class="text-sm">
-            <DateInput class="border-b-2 border-black" v-model="TX.Date" />
+      <DateInput
+        v-model="TX.Date"
+        class="block w-full border-b-2 border-black"
+      />
     </td>
     <label class="md:hidden">Payee</label>
     <td>
-            <Autocomplete v-model:text="TX.Payee" v-model:id="TX.PayeeID" v-model:type="payeeType" model="payees" />
+      <Autocomplete
+        v-model:text="TX.Payee"
+        v-model:id="TX.PayeeID"
+        v-model:type="payeeType"
+        model="payees"
+      />
     </td>
     <label class="md:hidden">Category</label>
     <td>
-            <Autocomplete v-model:text="TX.Category" v-model:id="TX.CategoryID" model="categories" />
+      <Autocomplete
+        v-model:text="TX.Category"
+        v-model:id="TX.CategoryID"
+        model="categories"
+      />
     </td>
+    <label class="md:hidden">Memo</label>
     <td class="col-span-2">
-            <Input class="block w-full border-b-2 border-black" type="text" v-model="TX.Memo" />
+      <Input
+        v-model="TX.Memo"
+        class="block w-full border-b-2 border-black"
+        type="text"
+      />
     </td>
     <label class="md:hidden">Amount</label>
     <td class="text-right">
       <Input
+        v-model="TX.Amount"
         class="text-right block w-full border-b-2 border-black"
         type="currency"
-                v-model="TX.Amount"
       />
     </td>
     <td class="hidden md:table-cell">
-            <Button class="bg-blue-500" @click="saveTransaction">Save</Button>
+      <Button
+        class="bg-blue-500"
+        @click="saveTransaction"
+      >
+        Save
+      </Button>
     </td>
   </tr>
 </template>

web/src/components/TransactionRow.vue

@@ -6,11 +6,12 @@ import Currency from "./Currency.vue";
 import TransactionEditRow from "./TransactionEditRow.vue";
 import { formatDate } from "../date";
 import { useAccountStore } from "../stores/budget-account";
-import Input from "./Input.vue";
+import Checkbox from "./Checkbox.vue";
 
 const props = defineProps<{
     transactionid: string,
     index: number,
+    withAccount: boolean,
 }>();
 
 const edit = ref(false);
@@ -21,19 +22,6 @@ const Reconciling = computed(() => useTransactionsStore().Reconciling);
 const transactionsStore = useTransactionsStore();
 const TX = transactionsStore.Transactions.get(props.transactionid)!;
 
-function dateChanged() {
-    const currentAccount = useAccountStore().CurrentAccount;
-    if (currentAccount == null)
-        return true;
-    const transactionIndex = currentAccount.Transactions.indexOf(props.transactionid);
-    if(transactionIndex<=0)
-        return true;
-
-    const previousTransactionId = currentAccount.Transactions[transactionIndex-1];
-    const previousTransaction = transactionsStore.Transactions.get(previousTransactionId);
-    return TX.Date.getTime() != previousTransaction?.Date.getTime();
-}
-
 function getStatusSymbol() {
     if(TX.Status == "Reconciled")
         return "✔";
@@ -46,34 +34,50 @@ function getStatusSymbol() {
 </script>
 
 <template>
-    <tr v-if="dateChanged()" class="table-row md:hidden">
-        <td class="bg-gray-200 dark:bg-gray-800 rounded-lg p-2" colspan="5">{{ formatDate(TX.Date) }}</td>
-    </tr>
   <tr
     v-if="!edit"
     class="{{new Date(TX.Date) > new Date() ? 'future' : ''}}"
-        :class="[index % 6 < 3 ? 'md:bg-gray-300 dark:md:bg-gray-700' : 'md:bg-gray-100 dark:md:bg-gray-900']"
+    :class="[index % 2 < 1 ? 'md:bg-gray-300 dark:md:bg-gray-700' : 'md:bg-gray-100 dark:md:bg-gray-900']"
   >
-        <!--:class="[index % 6 < 3 ? index % 6 === 1 ? 'bg-gray-400' : 'bg-gray-300' : index % 6 !== 4 ? 'bg-gray-100' : '']">-->
+    <td class="hidden md:block">
-        <td class="hidden md:block">{{ formatDate(TX.Date) }}</td>
+      {{ formatDate(TX.Date) }}
-        <td class="pl-2 md:pl-0">{{ TX.TransferAccount ? "Transfer : " + TX.TransferAccount : TX.Payee }}</td>
+    </td>
-        <td>{{ TX.CategoryGroup ? TX.CategoryGroup + " : " + TX.Category : "" }}</td>
+    <td v-if="withAccount" class="pl-2 md:pl-0">
+      {{ TX.Account }}
+    </td>
+    <td class="pl-2 md:pl-0">
+      {{ TX.TransferAccount ? "Transfer : " + TX.TransferAccount : TX.Payee }}
+    </td>
+    <td>
+      {{ TX.CategoryGroup ? TX.CategoryGroup + " : " + TX.Category : "" }}
+    </td>
     <td>
       <a
         :href="'/budget/' + CurrentBudgetID + '/transaction/' + TX.ID"
       >{{ TX.Memo }}</a>
     </td>
     <td>
-            <Currency class="block" :value="TX.Amount" />
+      <Currency
+        class="block"
+        :value="TX.Amount"
+      />
     </td>
     <td class="text-right">
       {{ TX.GroupID ? "☀" : "" }}
       {{ getStatusSymbol() }}
       <a @click="edit = true;">✎</a>
-            <Input v-if="Reconciling && TX.Status != 'Reconciled'" type="checkbox" v-model="TX.Reconciled" />
+      <Checkbox
+        v-if="Reconciling && TX.Status != 'Reconciled'"
+        v-model="TX.Reconciled"
+      />
     </td>
   </tr>
-    <TransactionEditRow v-if="edit" :transactionid="TX.ID" @save="edit = false" />
+  <TransactionEditRow
+    v-if="edit"
+    :transactionid="TX.ID"
+    :with-account="withAccount"
+    @save="edit = false"
+  />
 </template>
 
 <style>

web/src/date.ts

@@ -1,7 +1,17 @@
 export function formatDate(date: Date): string {
-    return date.toLocaleDateString(undefined, { // you can use undefined as first argument
+    return date.toLocaleDateString(undefined, {
+        // you can use undefined as first argument
         year: "numeric",
         month: "2-digit",
         day: "2-digit",
     });
 }
+
+export function groupBy<T, K extends keyof any>(list: T[], getKey: (item: T) => K) {
+  return list.reduce((previous, currentItem) => {
+    const group = getKey(currentItem);
+    if (!previous[group]) previous[group] = [];
+    previous[group].push(currentItem);
+    return previous;
+  }, {} as Record<K, T[]>);
+}

web/src/dialogs/EditAccount.vue

@@ -3,43 +3,83 @@ import { computed, ref } from 'vue';
 import Modal from '../components/Modal.vue';
 import { useAccountStore } from '../stores/budget-account';
 import Input from '../components/Input.vue';
+import Checkbox from '../components/Checkbox.vue';
+import { useRouter } from 'vue-router';
+import { useBudgetsStore } from '../stores/budget';
 
+const router = useRouter();
 const accountStore = useAccountStore();
 const CurrentAccount = computed(() => accountStore.CurrentAccount);
 
 const accountName = ref("");
 const accountOnBudget = ref(true);
+const accountOpen = ref(true);
+const error = ref("");
 
-function editAccount(e : any) {
+function editAccount(e : {cancel:boolean}) : boolean {
-    accountStore.EditAccount(CurrentAccount.value?.ID ?? "", accountName.value, accountOnBudget.value);
+    if(CurrentAccount.value?.ClearedBalance != 0 && !accountOpen.value){
+        e.cancel = true;
+        error.value = "Cannot close account with balance";
+        return false;
+    }
+
+    error.value = "";
+    accountStore.EditAccount(CurrentAccount.value?.ID ?? "", accountName.value, accountOnBudget.value, accountOpen.value);
+
+    // account closed, move to Budget
+    if(!accountOpen.value){
+        const currentBudgetID = useBudgetsStore().CurrentBudgetID;
+        router.replace('/budget/'+currentBudgetID+'/budgeting');
+    }
+    return true;
 }
 
 function openEditAccount(e : any) {
     accountName.value = CurrentAccount.value?.Name ?? "";
     accountOnBudget.value = CurrentAccount.value?.OnBudget ?? true;
+    accountOpen.value = CurrentAccount.value?.IsOpen ?? true;
 }
 </script>
 
 <template>
-    <Modal button-text="Edit Account" @open="openEditAccount" @submit="editAccount">
+  <Modal
-        <template v-slot:placeholder>✎</template>
+    button-text="Edit Account"
+    @open="openEditAccount"
+    @submit="editAccount"
+  >
+    <template #placeholder>
+      <span class="ml-2">✎</span>
+    </template>
     <div class="mt-2 px-7 py-3">
       <Input
-                class="border-2"
-                type="text"
         v-model="accountName"
+        class="border-2 dark:border-gray-700"
+        type="text"
         placeholder="Account name"
         required
       />
     </div>
     <div class="mt-2 px-7 py-3">
-            <Input
+      <Checkbox
-                class="border-2"
-                type="checkbox"
         v-model="accountOnBudget"
+        class="border-2"
         required
       />
       <label>On Budget</label>
     </div>
+    <div class="mt-2 px-7 py-3">
+      <Checkbox
+        v-model="accountOpen"
+        class="border-2"
+        required
+      />
+      <label>Open</label>
+    </div>
+    <div
+      v-if="error != ''"
+      class="dark:text-red-300 text-red-700"
+    >
+      {{ error }}
+    </div>
   </Modal>
 </template>

web/src/dialogs/NewBudget.vue

@@ -11,9 +11,18 @@ function saveBudget() {
 </script>
 
 <template>
-  <Modal button-text="New Budget" @submit="saveBudget">
+  <Modal
+    button-text="New Budget"
+    @submit="saveBudget"
+  >
     <div class="mt-2 px-7 py-3">
-      <Input class="border-2" type="text" v-model="budgetName" placeholder="Budget name" required />
+      <Input
+        v-model="budgetName"
+        class="border-2"
+        type="text"
+        placeholder="Budget name"
+        required
+      />
     </div>
   </Modal>
 </template>

web/src/index.css

@@ -9,3 +9,9 @@ h1 {
 a {
     text-decoration: underline;
 }
+
+#app {
+    font-family: Avenir, Helvetica, Arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}

web/src/main.ts

@@ -1,28 +1,79 @@
-import { createApp } from 'vue'
+import { createApp } from "vue";
-import App from './App.vue'
+import App from "./App.vue";
-import './index.css'
+import "./index.css";
-import router from './router'
+import router from "./router";
-import { createPinia } from 'pinia'
+import { createPinia } from "pinia";
-import { useBudgetsStore } from './stores/budget';
+import { useBudgetsStore } from "./stores/budget";
-import { useAccountStore } from './stores/budget-account'
+import { useAccountStore } from "./stores/budget-account";
-import PiniaLogger from './pinia-logger'
+import PiniaLogger from "./pinia-logger";
+import { useSessionStore } from "./stores/session";
 
-const app = createApp(App)
+const app = createApp(App);
-app.use(router)
+app.use(router);
 
-const pinia = createPinia()
+const pinia = createPinia();
-pinia.use(PiniaLogger({
+pinia.use(
+    PiniaLogger({
         expanded: false,
-  showDuration: true
+        showDuration: true,
-}))
+    })
-app.use(pinia)
+);
-app.mount('#app')
+app.use(pinia);
+app.mount("#app");
 
 router.beforeEach(async (to, from, next) => {
     const budgetStore = useBudgetsStore();
-  await budgetStore.SetCurrentBudget((<string>to.params.budgetid));
+    await budgetStore.SetCurrentBudget(<string>to.params.budgetid);
 
     const accountStore = useAccountStore();
-  await accountStore.SetCurrentAccount((<string>to.params.budgetid), (<string>to.params.accountid));
+    await accountStore.SetCurrentAccount(
+        <string>to.params.budgetid,
+        <string>to.params.accountid
+    );
     next();
+});
+
+router.beforeEach((to, from, next) => {
+    const sessionStore = useSessionStore();
+    const token = sessionStore.Session?.Token;
+    let loggedIn = false;
+
+    if (token != null) {
+        const jwt = parseJwt(token);
+        if (jwt.exp > Date.now() / 1000) loggedIn = true;
+    }
+
+    if (to.matched.some((record) => record.meta.requiresAuth)) {
+        if (!loggedIn) {
+            next({ path: "/login" });
+        } else {
+            next();
+        }
+    } else if (to.matched.some((record) => record.meta.hideForAuth)) {
+        if (loggedIn) {
+            next({ path: "/dashboard" });
+        } else {
+            next();
+        }
+    } else {
+        next();
+    }
+});
+
+function parseJwt(token: string) {
+    var base64Url = token.split(".")[1];
+    var base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
+    var jsonPayload = decodeURIComponent(
+        atob(base64)
+            .split("")
+            .map(function (c) {
+                return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
             })
+            .join("")
+    );
+
+    return JSON.parse(jsonPayload);
+}
+
+1646426130;
+1646512855755;

web/src/pages/Account.vue

@@ -5,16 +5,24 @@ import TransactionRow from "../components/TransactionRow.vue";
 import TransactionInputRow from "../components/TransactionInputRow.vue";
 import { useAccountStore } from "../stores/budget-account";
 import EditAccount from "../dialogs/EditAccount.vue";
-import Button from "../components/Button.vue";
+import Button from "../components/SimpleButton.vue";
 import { useTransactionsStore } from "../stores/transactions";
 import Modal from "../components/Modal.vue";
 import Input from "../components/Input.vue";
+import Checkbox from "../components/Checkbox.vue";
+import { formatDate } from "../date";
 
 defineProps<{
     budgetid: string
     accountid: string
 }>()
 
+const modalInputRow = ref<typeof TransactionInputRow | null>(null);
+
+function submitModal() {
+  modalInputRow.value!.Save();
+}
+
 const accounts = useAccountStore();
 const transactions = useTransactionsStore();
 const TargetReconcilingBalance = ref(0);
@@ -43,48 +51,69 @@ function createReconcilationTransaction() {
 
 <template>
   <div class="grid grid-cols-[1fr_auto]">
+    <div>
       <h1 class="inline">
         {{ accounts.CurrentAccount?.Name }}
-            <EditAccount />
       </h1>
+      <EditAccount />
+    </div>
 
-        <div class="text-right flex flex-wrap flex-col md:flex-row justify-end gap-2 max-w-sm">
+    <div
-            <span class="border-2 rounded-lg p-1 whitespace-nowrap flex-1">
+      class="text-right flex flex-wrap flex-col md:flex-row justify-end gap-2 max-w-sm"
+    >
+      <span class="rounded-lg p-1 whitespace-nowrap flex-1">
         Working:
         <Currency :value="accounts.CurrentAccount?.WorkingBalance" />
       </span>
 
-            <span class="border-2 rounded-lg p-1 whitespace-nowrap flex-1">
+      <span class="rounded-lg p-1 whitespace-nowrap flex-1">
         Cleared:
         <Currency :value="accounts.CurrentAccount?.ClearedBalance" />
       </span>
 
       <span
-                class="border-2 border-blue-500 rounded-lg bg-blue-500 p-1 whitespace-nowrap flex-1"
         v-if="!transactions.Reconciling"
+        class="rounded-lg bg-blue-500 p-1 whitespace-nowrap flex-1"
         @click="transactions.Reconciling = true"
       >
         Reconciled:
         <Currency :value="accounts.CurrentAccount?.ReconciledBalance" />
       </span>
-        </div>
 
-        <span v-if="transactions.Reconciling" class="border-2 block bg-gray-200 dark:bg-gray-800 rounded-lg p-2">
+      <span
-            Is
+        v-if="transactions.Reconciling"
-            <Currency :value="transactions.ReconcilingBalance" />your current balance?
+        class="contents"
-            <Button class="bg-blue-500 mx-3 py-2" @click="submitReconcilation">Yes!</Button>
+      >
-            <br />No, it's:
-            <Input class="text-right" type="number" v-model="TargetReconcilingBalance" />
-            Difference:
-            <Currency :value="transactions.ReconcilingBalance - TargetReconcilingBalance" />
         <Button
-                class="bg-orange-500 mx-3 py-2"
+          class="bg-blue-500 p-1 whitespace-nowrap flex-1"
-                v-if="Math.abs(transactions.ReconcilingBalance - TargetReconcilingBalance) > 0.01"
+          @click="submitReconcilation"
+        >
+          My current balance is&nbsp;
+          <Currency :value="transactions.ReconcilingBalance" />
+        </Button>
+
+        <Button
+          class="bg-orange-500 p-1 whitespace-nowrap flex-1"
           @click="createReconcilationTransaction"
-            >Create reconciling Transaction</Button>
+        >
-            <Button class="bg-red-500 mx-3 py-2" @click="cancelReconcilation">Cancel</Button>
+          No, it's:
+          <Input
+            v-model="TargetReconcilingBalance"
+            class="text-right w-20 bg-transparent dark:bg-transparent border-b-2"
+            type="number"
+          />
+          (Difference
+          <Currency
+            :value="transactions.ReconcilingBalance - TargetReconcilingBalance"
+          />)
+        </Button>
+        <Button
+          class="bg-red-500 p-1 flex-1"
+          @click="cancelReconcilation"
+        >Cancel</Button>
       </span>
     </div>
+  </div>
 
   <table>
     <tr class="font-bold">
@@ -94,23 +123,46 @@ function createReconcilationTransaction() {
       <td>Memo</td>
       <td class="text-right">Amount</td>
       <td style="width: 80px;">
-                <Input v-if="transactions.Reconciling" type="checkbox" @input="setReconciled" />
+        <Checkbox v-if="transactions.Reconciling" @input="setReconciled" />
       </td>
     </tr>
-        <TransactionInputRow class="hidden md:table-row" :budgetid="budgetid" :accountid="accountid" />
+    <TransactionInputRow
-        <TransactionRow
+      class="hidden md:table-row"
-            v-for="(transaction, index) in transactions.TransactionsList"
+      :budgetid="budgetid"
-            :key="transaction.ID"
+      :accountid="accountid"
-            :transactionid="transaction.ID"
-            :index="index"
     />
+    <template v-for="(dayTransactions, key, index) in transactions.TransactionsByDate" :key="key">
+      <tr class="table-row md:hidden">
+        <td class="py-2" colspan="5">
+          <span class="bg-gray-400 dark:bg-slate-600 rounded-lg p-1 px-2 w-full block">
+            {{ key }}
+          </span>
+        </td>
+      </tr>
+      <TransactionRow
+        v-for="transaction in dayTransactions"
+        :key="transaction.ID"
+        :index="index"
+        :transactionid="transaction.ID"
+        :with-account="false"
+      />
+    </template>
   </table>
   <div class="md:hidden">
-        <Modal>
+    <Modal @submit="submitModal">
-            <template v-slot:placeholder>
+      <template #placeholder>
-                <Button class="fixed right-4 bottom-4 font-bold text-lg bg-blue-500 py-2">+</Button>
+        <Button
+          class="fixed right-4 bottom-4 font-bold text-lg bg-blue-500 py-2"
+        >
+          +
+        </Button>
       </template>
-            <TransactionInputRow class="grid grid-cols-2" :budgetid="budgetid" :accountid="accountid" />
+      <TransactionInputRow
+        ref="modalInputRow"
+        class="flex flex-col w-full h-full top-0"
+        :budgetid="budgetid"
+        :accountid="accountid"
+      />
     </Modal>
   </div>
 </template>

web/src/pages/AllAccounts.vue

@@ -0,0 +1,125 @@
+<script lang="ts" setup>
+import { computed, ref, onMounted, watch } from "vue"
+import Currency from "../components/Currency.vue";
+import TransactionRow from "../components/TransactionRow.vue";
+import TransactionInputRow from "../components/TransactionInputRow.vue";
+import { useAccountStore } from "../stores/budget-account";
+import EditAccount from "../dialogs/EditAccount.vue";
+import Button from "../components/SimpleButton.vue";
+import { useTransactionsStore } from "../stores/transactions";
+import Modal from "../components/Modal.vue";
+import Input from "../components/Input.vue";
+import Checkbox from "../components/Checkbox.vue";
+import { formatDate } from "../date";
+import DateInput from "../components/DateInput.vue";
+import Autocomplete from '../components/Autocomplete.vue'
+
+defineProps<{
+    budgetid: string
+}>()
+
+const modalInputRow = ref<typeof TransactionInputRow | null>(null);
+
+function submitModal() {
+  modalInputRow.value!.Save();
+}
+
+const accounts = useAccountStore();
+const transactions = useTransactionsStore();
+
+onMounted(() => {
+  transactions.GetProblematicTransactions();
+})
+
+const filters = ref({
+  Account: null,
+  AccountID: null,
+  Payee: null,
+  PayeeID: null,
+  Category: null,
+  CategoryID: null,
+  FromDate: new Date(1900, 0, 2),
+  ToDate: new Date(2999,11,32),
+});
+
+watch(() => filters.value.AccountID 
+  + filters.value.PayeeID 
+  + filters.value.CategoryID
+  + filters.value.FromDate?.toISOString()
+  + filters.value.ToDate?.toISOString(), function() {
+  if(!hasFilters.value)
+    return;
+  transactions.GetFilteredTransactions(
+    filters.value.AccountID, 
+    filters.value.CategoryID, 
+    filters.value.PayeeID,
+    filters.value.FromDate?.toISOString(),
+    filters.value.ToDate?.toISOString(),
+    );
+})
+
+const hasFilters = computed(() => 
+  filters.value.AccountID != null 
+  || filters.value.PayeeID != null 
+  || filters.value.CategoryID != null
+  || (filters.value.FromDate != null && filters.value.FromDate.getFullYear() > 1901)
+  || (filters.value.ToDate != null && filters.value.ToDate.getFullYear() < 2998))
+
+const transactionsList = computed(() => {
+  if (hasFilters.value){
+    return transactions.FilteredTransactionsList;
+  }
+  return transactions.ProblematicTransactionsList;
+})
+</script>
+
+<template>
+  <div class="grid grid-cols-[1fr_auto]">
+    <div>
+      <h1 class="inline">
+        {{ hasFilters ? "Filtered" : "Problematic" }} Transactions
+      </h1>
+    </div>
+  </div>
+
+  <div class="grid grid-cols-2 w-96">
+    Account: 
+    <Autocomplete v-model:text="filters.Account" v-model:id="filters.AccountID" model="accounts" class="inline-block" /><br>
+    Payee:
+    <Autocomplete v-model:text="filters.Payee" v-model:id="filters.PayeeID" model="payees" class="inline-block" /><br>
+    Category:
+    <Autocomplete v-model:text="filters.Category" v-model:id="filters.CategoryID" model="categories" class="inline-block" /><br>
+    From Date:
+    <DateInput v-model="filters.FromDate" class="inline-block" /><br>
+    To Date:
+    <DateInput v-model="filters.ToDate" class="inline-block" />
+  </div>
+
+  <table>
+    <tr class="font-bold">
+      <td class="hidden md:block" style="width: 90px;">Date</td>
+      <td style="max-width: 200px;">Account</td>
+      <td style="max-width: 150px;">Payee</td>
+      <td style="max-width: 200px;">Category</td>
+      <td>Memo</td>
+      <td class="text-right">Amount</td>
+    </tr>
+    <TransactionRow
+      v-for="(transaction, index) in transactionsList"
+      :key="transaction.ID"
+      :with-account="true"
+      :transactionid="transaction.ID"
+      :index="index"
+    />
+  </table>
+</template>
+
+<style>
+table {
+    width: 100%;
+    table-layout: fixed;
+}
+.negative {
+    color: red;
+}
+</style>

web/src/pages/BudgetSidebar.vue

@@ -1,11 +1,14 @@
 <script lang="ts" setup>
 import { computed } from "vue";
-import Currency from "../components/Currency.vue"
+import Currency from "../components/Currency.vue";
-import { useBudgetsStore } from "../stores/budget"
+import { useBudgetsStore } from "../stores/budget";
-import { Account, useAccountStore } from "../stores/budget-account"
+import { Account, useAccountStore } from "../stores/budget-account";
-import { useSettingsStore } from "../stores/settings"
+import { useSettingsStore } from "../stores/settings";
+import AccountWithReconciled from "../components/AccountWithReconciled.vue";
 
-const ExpandMenu = computed(() => useSettingsStore().Menu.Expand);
+const settings = useSettingsStore();
+const ExpandMenu = computed(() => settings.Menu.Expand);
+const ShowMenu = computed(() => settings.Menu.Show);
 
 const budgetStore = useBudgetsStore();
 const CurrentBudgetName = computed(() => budgetStore.CurrentBudgetName);
@@ -17,64 +20,65 @@ const OffBudgetAccounts = computed(() => accountStore.OffBudgetAccounts);
 const OnBudgetAccountsBalance = computed(() => accountStore.OnBudgetAccountsBalance);
 const OffBudgetAccountsBalance = computed(() => accountStore.OffBudgetAccountsBalance);
 
-function isRecentlyReconciled(account : Account) {
+function toggleMenu() {
-  const now = new Date().getTime();
+  useSettingsStore().toggleMenu();
-  const recently = 7 * 24 * 60 * 60 * 1000;
-  console.log(account.Name, account.LastReconciled, now, recently, new Date(now-recently));
-  return new Date(now - recently).getTime() < account.LastReconciled.getTime();
-}
-
-function getAccountName(account : Account) {
-  const reconciledMarker = isRecentlyReconciled(account) ? "" : " *";
-  return account.Name + reconciledMarker;
 }
 </script>
 
 <template>
+  <div :class="[ExpandMenu ? 'md:w-72' : 'md:w-36', ShowMenu ? '' : 'hidden']"
+       class="md:block flex-shrink-0 w-full bg-gray-500 border-r-4 border-black">
     <div class="flex flex-col">
-    <span class="m-1 p-1 px-3 text-xl">
+      <div class="m-2 md:px-3 p-1">
-      <router-link to="/dashboard">⌂</router-link>
+        <span class="font-bold-my-3 md:hidden font-bold text-5xl pr-3" @click="toggleMenu">≡</span>
+        <span class="h-10 overflow-hidden" :class="[ExpandMenu ? 'text-2xl' : 'text-md']">
+          <router-link to="/dashboard" class="text-5xl">⌂</router-link>
           {{ CurrentBudgetName }}
         </span>
-    <span class="bg-orange-200 dark:bg-orange-700 rounded-lg m-1 p-1 px-3 flex flex-col">
+      </div>
-      <router-link :to="'/budget/'+CurrentBudgetID+'/budgeting'">Budget</router-link><br />
+      <span class="bg-gray-100 dark:bg-gray-700 p-2 px-3 flex flex-col">
+        <router-link :to="'/budget/' + CurrentBudgetID + '/budgeting'">Budget</router-link>
+        <br>
         <!--<router-link :to="'/budget/'+CurrentBudgetID+'/reports'">Reports</router-link>-->
-      <!--<router-link :to="'/budget/'+CurrentBudgetID+'/all-accounts'">All Accounts</router-link>-->
+        <router-link :to="'/budget/'+CurrentBudgetID+'/problematic-transactions'">Transactions</router-link>
       </span>
-    <li class="bg-orange-200 dark:bg-orange-700 rounded-lg m-1 p-1 px-3">
+      <li class="bg-slate-200 dark:bg-slate-700 my-2 p-2 px-3">
         <div class="flex flex-row justify-between font-bold">
           <span>On-Budget Accounts</span>
-        <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="OnBudgetAccountsBalance" />
+          <Currency :class="ExpandMenu ? 'md:inline' : 'md:hidden'" class="whitespace-nowrap" :value="OnBudgetAccountsBalance" />
         </div>
-      <div v-for="account in OnBudgetAccounts" class="flex flex-row justify-between">
+        <div v-for="account in OnBudgetAccounts" :key="account.ID" class="flex flex-row justify-between">
-        <router-link :to="'/budget/'+CurrentBudgetID+'/account/'+account.ID">{{getAccountName(account)}}</router-link>
+          <AccountWithReconciled class="whitespace-nowrap overflow-hidden mr-4" :account="account" />
-        <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="account.ClearedBalance" />
+          <Currency :class="ExpandMenu ? 'md:inline' : 'md:hidden'" class="whitespace-nowrap" :value="account.ClearedBalance" />
         </div>
       </li>
-    <li class="bg-red-200 dark:bg-red-800 rounded-lg m-1 p-1 px-3">
+      <li class="bg-slate-200 dark:bg-slate-700 my-2 p-2 px-3">
         <div class="flex flex-row justify-between font-bold">
           <span>Off-Budget Accounts</span>
-        <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="OffBudgetAccountsBalance" />
+          <Currency :class="ExpandMenu ? 'md:inline' : 'md:hidden'" class="whitespace-nowrap" :value="OffBudgetAccountsBalance" />
         </div>
-      <div v-for="account in OffBudgetAccounts" class="flex flex-row justify-between">
+        <div v-for="account in OffBudgetAccounts" :key="account.ID" class="flex flex-row justify-between">
-        <router-link :to="'/budget/'+CurrentBudgetID+'/account/'+account.ID">{{getAccountName(account)}}</router-link>
+          <AccountWithReconciled class="whitespace-nowrap overflow-hidden mr-4" :account="account" />
-        <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="account.ClearedBalance" />
+          <Currency :class="ExpandMenu ? 'md:inline' : 'md:hidden'" class="whitespace-nowrap" :value="account.ClearedBalance" />
         </div>
       </li>
-    <li class="bg-red-200 dark:bg-red-800 rounded-lg m-1 p-1 px-3">
+      <!--
+    <li class="bg-slate-100 dark:bg-slate-800 my-2 p-2 px-3">
       <div class="flex flex-row justify-between font-bold">
         <span>Closed Accounts</span>
       </div>
+      + Add Account
     </li>
+      -->
       <!--<li>
       <router-link :to="'/budget/'+CurrentBudgetID+'/accounts'">Edit accounts</router-link>
       </li>-->
-    <li class="bg-red-200 dark:bg-red-800 rounded-lg m-1 p-1 px-3">
+      <li class="bg-red-100 dark:bg-slate-600 my-2 p-2 px-3">
-      + Add Account
+        <router-link :to="'/budget/' + CurrentBudgetID + '/settings'">
-    </li>
+          Budget-Settings
-    <li class="bg-red-200 dark:bg-red-800 rounded-lg m-1 p-1 px-3">
+        </router-link>
-      <router-link :to="'/budget/'+CurrentBudgetID+'/settings'">Budget-Settings</router-link>
       </li>
       <!--<li><router-link to="/admin">Admin</router-link></li>-->
     </div>
+  </div>
 </template>

web/src/pages/Budgeting.vue

@@ -1,9 +1,11 @@
 <script lang="ts" setup>
-import { computed, defineProps, onMounted, ref, watchEffect } from "vue";
+import { computed, onMounted, ref, watchEffect } from "vue";
 import Currency from "../components/Currency.vue";
 import { useBudgetsStore } from "../stores/budget";
-import { useAccountStore } from "../stores/budget-account";
+import { Category, useAccountStore } from "../stores/budget-account";
 import { useSessionStore } from "../stores/session";
+import Input from "../components/Input.vue";
+import { POST } from "../api";
 
 const props = defineProps<{
     budgetid: string,
@@ -57,45 +59,160 @@ onMounted(() => {
 const expandedGroups = ref<Map<string, boolean>>(new Map<string, boolean>())
 
 function toggleGroup(group: { Name: string, Expand: boolean }) {
-    console.log(expandedGroups.value);
     expandedGroups.value.set(group.Name, !(expandedGroups.value.get(group.Name) ?? group.Expand))
 }
 
 function getGroupState(group: { Name: string, Expand: boolean }): boolean {
     return expandedGroups.value.get(group.Name) ?? group.Expand;
 }
+
+function assignedChanged(e : Event, category : Category){
+    const target = e.target as HTMLInputElement;
+    const value = target.valueAsNumber;
+    POST("/budget/"+CurrentBudgetID.value+"/category/" + category.ID + "/" + selected.value.Year + "/" + (selected.value.Month+1),
+    JSON.stringify({Assigned: category.Assigned}));
+}
+
+const budgeted = computed(() => accountStore.GetBudgeted(selected.value.Year, selected.value.Month))
 </script>
 
 <template>
   <h1>Budget for {{ selected.Month + 1 }}/{{ selected.Year }}</h1>
+  <table class="inline-block">
+    <tr>
+      <td>
+        Available last month:
+      </td>
+      <td class="text-right">
+        <Currency :value="accountStore.Available-accountStore.OverspentLastMonth+budgeted.Assigned+budgeted.Deassigned" />
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Overspent last month:
+      </td>
+      <td class="text-right">
+        <Currency :value="accountStore.OverspentLastMonth" />
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Budgeted this month:
+      </td>
+      <td class="text-right">
+        <Currency :value="budgeted.Assigned+budgeted.Deassigned" />
+      </td>
+      <td class="text-sm pl-2">
+        = <Currency :value="budgeted.Assigned" /> - <Currency :value="-budgeted.Deassigned" />
+      </td>
+    </tr>
+    <tr class="font-bold">
+      <td class="py-2">
+        Available balance:
+      </td>
+      <td class="text-right">
+        <Currency :value="accountStore.Available" />
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Activity:
+      </td>
+      <td class="text-right">
+        <Currency :value="budgeted.Income + budgeted.Spent" />
+      </td>
+      <td class="text-sm pl-2">
+        = <Currency :value="budgeted.Income" /> - <Currency :value="-1 * budgeted.Spent" />
+      </td>
+    </tr>
+  </table>
   <div>
     <router-link
       :to="'/budget/' + CurrentBudgetID + '/budgeting/' + previous.Year + '/' + previous.Month"
-        >&lt;&lt;</router-link>&nbsp;
+    >
+      &lt;&lt;
+    </router-link>&nbsp;
     <router-link
       :to="'/budget/' + CurrentBudgetID + '/budgeting/' + current.Year + '/' + current.Month"
-        >Current Month</router-link>&nbsp;
+    >
+      Current Month
+    </router-link>&nbsp;
     <router-link
       :to="'/budget/' + CurrentBudgetID + '/budgeting/' + next.Year + '/' + next.Month"
-        >&gt;&gt;</router-link>
+    >
+      &gt;&gt;
+    </router-link>
   </div>
-    <div class="container col-lg-12 grid grid-cols-2 sm:grid-cols-4 lg:grid-cols-5" id="content">
+  <div
-        <span class="hidden sm:block"></span>
+    id="content"
+    class="container col-lg-12 grid grid-cols-2 sm:grid-cols-4 lg:grid-cols-5"
+  >
+    <span class="hidden sm:block" />
     <span class="hidden lg:block text-right">Leftover</span>
     <span class="hidden sm:block text-right">Assigned</span>
     <span class="hidden sm:block text-right">Activity</span>
     <span class="hidden sm:block text-right">Available</span>
-        <template v-for="group in GroupsForMonth">
+    <template
-            <a
+      v-for="group in GroupsForMonth"
-                class="text-lg font-bold col-span-2 sm:col-span-4 lg:col-span-5"
+      :key="group.Name"
+    >
+      <span
+        class="text-lg font-bold mt-2"
         @click="toggleGroup(group)"
-            >{{ (getGroupState(group) ? "−" : "+") + " " + group.Name }}</a>
+      >{{ (getGroupState(group) ? "−" : "+") + " " + group.Name }}</span>
-            <template v-for="category in GetCategories(group.Name)" v-if="getGroupState(group)">
+      <Currency
-                <span class="whitespace-nowrap overflow-hidden">{{ category.Name }}</span>
+        :value="group.AvailableLastMonth"
-                <Currency :value="category.AvailableLastMonth" class="hidden lg:block" />
+        class="hidden lg:block mt-2"
-                <Currency :value="category.Assigned" class="hidden sm:block" />
+        positive-class="text-slate-500"
-                <Currency :value="category.Activity" class="hidden sm:block" />
+        negative-class="text-red-700 dark:text-red-400"
-                <Currency :value="category.Available" />
+      />
+      <Currency
+        :value="group.Assigned"
+        class="hidden sm:block mx-2 mt-2 text-right"
+        positive-class="text-slate-500"
+        negative-class="text-red-700 dark:text-red-400"
+      />
+      <Currency
+        :value="group.Activity"
+        class="hidden sm:block mt-2"
+        positive-class="text-slate-500"
+        negative-class="text-red-700 dark:text-red-400"
+      />
+      <Currency
+        :value="group.Available"
+        class="mt-2"
+        positive-class="text-slate-500"
+        negative-class="text-red-700 dark:text-red-400"
+      />
+      <template
+        v-for="category in GetCategories(group.Name)"
+        :key="category.ID"
+      >
+        <div
+          v-if="getGroupState(group)"
+          class="contents"
+        >
+          <span
+            class="whitespace-nowrap overflow-hidden"
+          >{{ category.Name }}</span>
+          <Currency
+            :value="category.AvailableLastMonth"
+            class="hidden lg:block"
+          />
+          <Input
+            v-model="category.Assigned"
+            type="number"
+            class="hidden sm:block mx-2 text-right"
+            @input="(evt) => assignedChanged(evt, category)"
+          />
+          <Currency
+            :value="category.Activity"
+            class="hidden sm:block"
+          />
+          <Currency
+            :value="accountStore.GetCategoryAvailable(category)"
+          />
+        </div>
       </template>
     </template>
   </div>

web/src/pages/Dashboard.vue

@@ -1,25 +1,28 @@
 <script lang="ts" setup>
 import NewBudget from '../dialogs/NewBudget.vue';
-import Card from '../components/Card.vue';
+import RowCard from '../components/RowCard.vue';
 import { useSessionStore } from '../stores/session';
 
-const props = defineProps<{
-    budgetid: string,
-}>();
-
 const BudgetsList = useSessionStore().BudgetsList;
 </script>
 
 <template>
   <h1>Budgets</h1>
   <div class="grid md:grid-cols-2 gap-6">
-        <Card v-for="budget in BudgetsList">
+    <RowCard
-            <router-link v-bind:to="'/budget/'+budget.ID+'/budgeting'" class="contents">
+      v-for="budget in BudgetsList"
+      :key="budget.ID"
+    >
+      <router-link
+        :to="'/budget/'+budget.ID+'/budgeting'"
+        class="contents"
+      >
         <!--<svg class="w-24"></svg>-->
-                <p class="w-24 text-center text-6xl"></p>
+        <p class="w-24 text-center text-6xl" />
-                <span class="text-lg">{{budget.Name}}{{budget.ID == budgetid ? " *" : ""}}</span>
+        <span class="text-lg">{{ budget.Name
+        }}</span>
       </router-link>
-        </Card>
+    </RowCard>
     <NewBudget />
   </div>
 </template>

web/src/pages/Index.vue

@@ -1,13 +0,0 @@
-<script lang="ts" setup>
-</script>
-
-<template>
-  <div>
-    <div class="font-bold" id="content">
-      Willkommen bei Budgeteer, der neuen App für's Budget!
-    </div>
-    <div class="container col-md-4" id="login">
-      <router-link to="/login">Login</router-link> or <router-link to="/login">register</router-link>
-    </div>
-  </div>
-</template>

web/src/pages/Login.vue

@@ -29,17 +29,31 @@ function formSubmit(e: MouseEvent) {
 
 <template>
   <div>
-        <Input type="text" v-model="login.user"
+    <Input
+      v-model="login.user"
+      type="text"
       placeholder="Username"
-            class="border-2 border-black rounded-lg block px-2 my-2 w-48" />
+      class="border-2 border-black rounded-lg block px-2 my-2 w-48"
-        <Input type="password" v-model="login.password"
+    />
+    <Input
+      v-model="login.password"
+      type="password"
       placeholder="Password"
-            class="border-2 border-black rounded-lg block px-2 my-2 w-48" />
+      class="border-2 border-black rounded-lg block px-2 my-2 w-48"
+    />
   </div>
   <div>{{ error }}</div>
-    <button type="submit" @click="formSubmit" class="bg-blue-300 rounded-lg p-2 w-48">Login</button>
+  <button
+    type="submit"
+    class="bg-blue-300 rounded-lg p-2 w-48"
+    @click="formSubmit"
+  >
+    Login
+  </button>
   <p>
     New user?
-        <router-link to="/register">Register</router-link> instead!
+    <router-link to="/register">
+      Register
+    </router-link> instead!
   </p>
 </template>

web/src/pages/Register.vue

@@ -29,20 +29,37 @@ function formSubmit(e: MouseEvent) {
 
 <template>
   <div>
-        <Input type="text" v-model="login.name"
+    <Input
+      v-model="login.name"
+      type="text"
       placeholder="Name"
-            class="border-2 border-black rounded-lg block px-2 my-2 w-48" />
+      class="border-2 border-black rounded-lg block px-2 my-2 w-48"
-        <Input type="text" v-model="login.email"
+    />
+    <Input
+      v-model="login.email"
+      type="text"
       placeholder="Email"
-            class="border-2 border-black rounded-lg block px-2 my-2 w-48" />
+      class="border-2 border-black rounded-lg block px-2 my-2 w-48"
-        <Input type="password" v-model="login.password"
+    />
+    <Input
+      v-model="login.password"
+      type="password"
       placeholder="Password"
-            class="border-2 border-black rounded-lg block px-2 my-2 w-48" />
+      class="border-2 border-black rounded-lg block px-2 my-2 w-48"
+    />
   </div>
   <div>{{ error }}</div>
-    <button type="submit" @click="formSubmit" class="bg-blue-300 rounded-lg p-2 w-48">Register</button>
+  <button
+    type="submit"
+    class="bg-blue-300 rounded-lg p-2 w-48"
+    @click="formSubmit"
+  >
+    Register
+  </button>
   <p>
     Existing user?
-        <router-link to="/login">Login</router-link> instead!
+    <router-link to="/login">
+      Login
+    </router-link> instead!
   </p>
 </template>

web/src/pages/Settings.vue

@@ -4,11 +4,13 @@ import { useRouter } from "vue-router";
 import { DELETE, POST } from "../api";
 import { useBudgetsStore } from "../stores/budget";
 import { useSessionStore } from "../stores/session";
-import Card from "../components/Card.vue";
+import RowCard from "../components/RowCard.vue";
-import Button from "../components/Button.vue";
+import Button from "../components/SimpleButton.vue";
 import { saveAs } from 'file-saver';
 import Input from "../components/Input.vue";
 
+const router = useRouter();
+
 const transactionsFile = ref<File | undefined>(undefined);
 const assignmentsFile = ref<File | undefined>(undefined);
 
@@ -39,14 +41,11 @@ function deleteBudget() {
 
     const budgetStore = useSessionStore();
     budgetStore.Budgets.delete(CurrentBudgetID.value);
-    useRouter().push("/")
+    router.push("/dashboard")
 };
 function clearBudget() {
     POST("/budget/" + CurrentBudgetID.value + "/settings/clear", null)
 };
-function cleanNegative() {
-    // <a href="/budget/{{.Budget.ID}}/settings/clean-negative">Fix all historic negative category-balances</a>
-};
 function ynabImport() {
     if (transactionsFile.value == undefined || assignmentsFile.value == undefined)
         return
@@ -72,53 +71,90 @@ function ynabExport() {
             saveAs(blob, timeStamp + " " + CurrentBudgetName.value + " - Transactions.tsv");
         })
 }
-
 </script>
 
 <template>
   <div>
     <h1>Danger Zone</h1>
     <div class="grid md:grid-cols-2 gap-6">
-            <Card class="flex-col p-3">
+      <RowCard class="flex-col p-3">
-                <h2 class="text-lg font-bold">Clear Budget</h2>
+        <h2 class="text-lg font-bold">
-                <p>This removes transactions and assignments to start from scratch. Accounts and categories are kept. Not undoable!</p>
+          Clear Budget
+        </h2>
+        <p>
+          This removes transactions and assignments to start from
+          scratch. Accounts and categories are kept. Not undoable!
+        </p>
 
-                <Button class="bg-red-500 py-2" @click="clearBudget">Clear budget</Button>
+        <Button
-            </Card>
+          class="bg-red-500 py-2"
-            <Card class="flex-col p-3">
+          @click="clearBudget"
-                <h2 class="text-lg font-bold">Delete Budget</h2>
+        >
-                <p>This deletes the whole bugdet including all transactions, assignments, accounts and categories. Not undoable!</p>
+          Clear budget
-                <Button class="bg-red-500 py-2" @click="deleteBudget">Delete budget</button>
+        </Button>
-            </Card>
+      </RowCard>
-            <Card class="flex-col p-3">
+      <RowCard class="flex-col p-3">
-                <h2 class="text-lg font-bold">Fix all historic negative category-balances</h2>
+        <h2 class="text-lg font-bold">
-                <p>This restores YNABs functionality, that would substract any overspent categories' balances from next months inflows.</p>
+          Delete Budget
-                <Button class="bg-orange-500 py-2" @click="cleanNegative">Fix negative</button>
+        </h2>
-            </Card>
+        <p>
-            <Card class="flex-col p-3">
+          This deletes the whole bugdet including all transactions,
-                <h2 class="text-lg font-bold">Import YNAB Budget</h2>
+          assignments, accounts and categories. Not undoable!
+        </p>
+        <Button
+          class="bg-red-500 py-2"
+          @click="deleteBudget"
+        >
+          Delete budget
+        </Button>
+      </RowCard>
+      <RowCard class="flex-col p-3">
+        <h2 class="text-lg font-bold">
+          Import YNAB Budget
+        </h2>
 
         <div>
           <label for="transactions_file">
             Transaktionen:
-                        <input type="file" @change="gotTransactions" accept="text/*" />
+            <input
+              type="file"
+              accept="text/*"
+              @change="gotTransactions"
+            >
           </label>
-                    <br />
+          <br>
           <label for="assignments_file">
             Budget:
-                        <input type="file" @change="gotAssignments" accept="text/*" />
+            <input
+              type="file"
+              accept="text/*"
+              @change="gotAssignments"
+            >
           </label>
         </div>
 
-                <Button class="bg-blue-500 py-2" :disabled="filesIncomplete" @click="ynabImport">Importieren</Button>
+        <Button
-            </Card>
+          class="bg-blue-500 py-2"
-            <Card class="flex-col p-3">
+          :disabled="filesIncomplete"
-                <h2 class="text-lg font-bold">Export as YNAB TSV</h2>
+          @click="ynabImport"
+        >
+          Importieren
+        </Button>
+      </RowCard>
+      <RowCard class="flex-col p-3">
+        <h2 class="text-lg font-bold">
+          Export as YNAB TSV
+        </h2>
 
         <div class="flex flex-row">
-                    <Button class="bg-blue-500 py-2" @click="ynabExport">Export</Button>
+          <Button
+            class="bg-blue-500 py-2"
+            @click="ynabExport"
+          >
+            Export
+          </Button>
         </div>
-            </Card>
+      </RowCard>
     </div>
   </div>
 </template>

web/src/pages/WelcomePage.vue

@@ -0,0 +1,24 @@
+<script lang="ts" setup>
+</script>
+
+<template>
+  <div>
+    <div
+      id="content"
+      class="font-bold"
+    >
+      Willkommen bei Budgeteer, der neuen App für's Budget!
+    </div>
+    <div
+      id="login"
+      class="container col-md-4"
+    >
+      <router-link to="/login">
+        Login
+      </router-link> or
+      <router-link to="/login">
+        register
+      </router-link>
+    </div>
+  </div>
+</template>

web/src/pinia-logger.ts

@@ -1,4 +1,9 @@
-import { PiniaPluginContext, StoreGeneric, _ActionsTree, _StoreOnActionListenerContext } from 'pinia';
+import {
+    PiniaPluginContext,
+    StoreGeneric,
+    _ActionsTree,
+    _StoreOnActionListenerContext,
+} from "pinia";
 
 const cloneDeep = <T>(obj: T): T => {
     try {
@@ -8,9 +13,9 @@ const cloneDeep = <T>(obj: T): T => {
     }
 };
 const formatTime = (date = new Date()) => {
-  const hours = date.getHours().toString().padStart(2, '0');
+    const hours = date.getHours().toString().padStart(2, "0");
-  const minutes = date.getMinutes().toString().padStart(2, '0');
+    const minutes = date.getMinutes().toString().padStart(2, "0");
-  const seconds = date.getSeconds().toString().padStart(2, '0');
+    const seconds = date.getSeconds().toString().padStart(2, "0");
 
     return `${hours}:${minutes}:${seconds}`;
 };
@@ -18,12 +23,16 @@ const formatTime = (date = new Date()) => {
 export interface PiniaLoggerOptions {
     disabled?: boolean;
     expanded?: boolean;
-  showDuration?: boolean
+    showDuration?: boolean;
     showStoreName?: boolean;
     logErrors?: boolean;
 }
 
-export type PiniaActionListenerContext = _StoreOnActionListenerContext<StoreGeneric, string, _ActionsTree>;
+export type PiniaActionListenerContext = _StoreOnActionListenerContext<
+    StoreGeneric,
+    string,
+    _ActionsTree
+>;
 
 const defaultOptions: PiniaLoggerOptions = {
     logErrors: true,
@@ -33,7 +42,9 @@ const defaultOptions: PiniaLoggerOptions = {
     showDuration: false,
 };
 
-export const PiniaLogger = (config = defaultOptions) => (ctx: PiniaPluginContext) => {
+export const PiniaLogger =
+    (config = defaultOptions) =>
+    (ctx: PiniaPluginContext) => {
         const options = {
             ...defaultOptions,
             ...config,
@@ -41,28 +52,43 @@ export const PiniaLogger = (config = defaultOptions) => (ctx: PiniaPluginContext
 
         if (options.disabled) return;
 
-
         ctx.store.$onAction((action: PiniaActionListenerContext) => {
             const startTime = Date.now();
             const prevState = cloneDeep(ctx.store.$state);
 
             const log = (isError?: boolean, error?: any) => {
                 const endTime = Date.now();
-      const duration = endTime - startTime + 'ms';
+                const duration = endTime - startTime + "ms";
                 const nextState = cloneDeep(ctx.store.$state);
                 const storeName = action.store.$id;
-      const title = `${formatTime()} action 🍍 ${options.showStoreName ? `[${storeName}] ` : ''}${action.name} ${isError ? `failed after ` : ''}in ${duration}`;
+                const title = `${formatTime()} action 🍍 ${
+                    options.showStoreName ? `[${storeName}] ` : ""
+                }${action.name} ${
+                    isError ? `failed after ` : ""
+                }in ${duration}`;
 
-      console[options.expanded ? 'group' : 'groupCollapsed'](`%c${title}`, `font-weight: bold; ${isError ? 'color: #ed4981;' : ''}`);
+                console[options.expanded ? "group" : "groupCollapsed"](
-      console.log('%cprev state', 'font-weight: bold; color: grey;', prevState);
+                    `%c${title}`,
-      console.log('%caction', 'font-weight: bold; color: #69B7FF;', {
+                    `font-weight: bold; ${isError ? "color: #ed4981;" : ""}`
+                );
+                console.log(
+                    "%cprev state",
+                    "font-weight: bold; color: grey;",
+                    prevState
+                );
+                console.log("%caction", "font-weight: bold; color: #69B7FF;", {
                     type: action.name,
-        args: action.args.length > 0 ? { ...action.args } : undefined,
+                    args:
+                        action.args.length > 0 ? { ...action.args } : undefined,
                     ...(options.showStoreName && { store: action.store.$id }),
                     ...(options.showDuration && { duration }),
                     ...(isError && { error }),
                 });
-      console.log('%cnext state', 'font-weight: bold; color: #4caf50;', nextState);
+                console.log(
+                    "%cnext state",
+                    "font-weight: bold; color: #4caf50;",
+                    nextState
+                );
                 console.groupEnd();
             };