Split FORM and regular POST

Reviewed-on: #78

.dockerignore

@@ -1,5 +1,5 @@
 build/
-.git/
+docker/
 docker-compose.yml
 README.md
 Earthfile

.golangci.yml

@@ -14,6 +14,7 @@ linters:
     - gci # not working, shows errors on freshly formatted file
     - varnamelen
     - lll
+
 linters-settings:
   errcheck:
     exclude-functions:
@@ -25,3 +26,18 @@ linters-settings:
   varnamelen:
     ignore-decls:
       - c *gin.Context
+  wrapcheck:
+    ignoreSigs:
+      - .JSON(
+      - .Redirect(
+      - .String(
+      - .Errorf(
+      - errors.New(
+      - errors.Unwrap(
+      - .Wrap(
+      - .Wrapf(
+      - .WithMessage(
+      - .WithMessagef(
+      - .WithStack(
+    ignorePackageGlobs:
+      - git.javil.eu/jacob1123/budgeteer/postgres

Taskfile.yml

@@ -139,4 +139,4 @@ tasks:
     desc: Run dev environment in docker
     deps: [dev-docker]
     cmds:
-      - docker-compose -f docker/docker-compose.dev.yml -p budgeteer up -d
+      - docker-compose -f docker/docker-compose.dev.yml up -d

docker/Dockerfile.dev

@@ -1,15 +1,9 @@
-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
+FROM nixos/nix
 ENV PATH="/root/.yarn/bin/:${PATH}"
-WORKDIR /src/web
+RUN nix-env --install go go-task sqlc nodejs yarn git
 ADD web/package.json web/yarn.lock /src/web/
+WORKDIR /src/web
+RUN yarn
 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/dev.sh

@@ -2,6 +2,6 @@
 
 tmux new-session -d -s watch 'cd web; yarn dev'
 tmux split-window;
-tmux send 'task -w run' ENTER;
+tmux send 'go-task -w run' ENTER;
 tmux split-window;
 tmux a;

docker/docker-compose.dev.yml

@@ -1,5 +1,7 @@
 version: '3.7'
 
+name: "budgeteer"
+
 services:
         backend:
                 image: hub.javil.eu/budgeteer:dev
@@ -7,7 +9,7 @@ services:
                 ports:
                         - 1323:1323
                 volumes:
-                        - ~/budgeteer:/src
+                        - ../:/src
                         - go-cache:/go
                         - yarn-cache:/.cache
                 environment:
@@ -22,7 +24,7 @@ services:
                 ports:
                         - 3000:3000
                 volumes:
-                        - ~/budgeteer:/src
+                        - ../:/src
                 depends_on:
                         - backend
 

docker/docker-compose.yml

@@ -1,5 +1,7 @@
 version: '3.7'
 
+name: "budgeteer"
+
 services:
         app:
                 image: hub.javil.eu/budgeteer:latest

postgres/categories.sql.go

@@ -91,6 +91,24 @@ func (q *Queries) GetCategories(ctx context.Context, budgetID uuid.UUID) ([]GetC
 	return items, nil
 }
 
+const getCategoryGroupByName = `-- name: GetCategoryGroupByName :one
+SELECT category_groups.id, category_groups.budget_id, category_groups.name FROM category_groups 
+WHERE category_groups.budget_id = $1
+AND category_groups.name = $2
+`
+
+type GetCategoryGroupByNameParams struct {
+	BudgetID uuid.UUID
+	Name     string
+}
+
+func (q *Queries) GetCategoryGroupByName(ctx context.Context, arg GetCategoryGroupByNameParams) (CategoryGroup, error) {
+	row := q.db.QueryRowContext(ctx, getCategoryGroupByName, arg.BudgetID, arg.Name)
+	var i CategoryGroup
+	err := row.Scan(&i.ID, &i.BudgetID, &i.Name)
+	return i, err
+}
+
 const getCategoryGroups = `-- name: GetCategoryGroups :many
 SELECT category_groups.id, category_groups.budget_id, category_groups.name FROM category_groups 
 WHERE category_groups.budget_id = $1

postgres/payees.sql.go

@@ -24,6 +24,9 @@ type CreatePayeeParams struct {
 }
 
 func (q *Queries) CreatePayee(ctx context.Context, arg CreatePayeeParams) (Payee, error) {
+	if len(arg.Name) > 50 {
+		arg.Name = arg.Name[:50]
+	}
 	row := q.db.QueryRowContext(ctx, createPayee, arg.Name, arg.BudgetID)
 	var i Payee
 	err := row.Scan(&i.ID, &i.BudgetID, &i.Name)

postgres/queries/categories.sql

@@ -8,6 +8,11 @@ RETURNING *;
 SELECT category_groups.* FROM category_groups 
 WHERE category_groups.budget_id = $1;
 
+-- name: GetCategoryGroupByName :one
+SELECT category_groups.* FROM category_groups 
+WHERE category_groups.budget_id = $1
+AND category_groups.name = $2;
+
 -- name: CreateCategory :one
 INSERT INTO categories
 (name, category_group_id)

server/account_test.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -35,17 +36,23 @@ func TestRegisterUser(t *testing.T) {
 
 	t.Run("RegisterUser", func(t *testing.T) {
 		t.Parallel()
-		request, err := http.NewRequest(
+		request, err := http.NewRequestWithContext(context.Background(),
 			http.MethodPost,
 			"/api/v1/user/register",
 			strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`))
+		request.Header.Set("Content-Type", "application/json")
 		context := engine.NewContext(request, recorder)
 		if err != nil {
 			t.Errorf("error creating request: %s", err)
 			return
 		}
 
-		h.registerPost(context)
+		err = h.registerPost(context)
+		if err != nil {
+			t.Error(err.Error())
+			t.Error("Error registering")
+			return
+		}
 
 		if recorder.Code != http.StatusOK {
 			t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK)

server/budgeting.go

@@ -41,7 +41,7 @@ func (h *Handler) budgetingForMonth(c echo.Context) error {
 
 	month, err := getDate(c)
 	if err != nil {
-		c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budget.ID.String())
+		return c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budget.ID.String())
 	}
 
 	data, err := h.getBudgetingViewForMonth(c.Request().Context(), budget, month)

server/category_group_new.go

@@ -0,0 +1,35 @@
+package server
+
+import (
+	"net/http"
+
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
+)
+
+type newCategoryGroupInformation struct {
+	BudgetID uuid.UUID `json:"budgetId"`
+	Group    string    `json:"group"`
+}
+
+func (h *Handler) newCategoryGroup(c echo.Context) error {
+	var newCategory newCategoryGroupInformation
+	if err := c.Bind(&newCategory); err != nil {
+		return echo.NewHTTPError(http.StatusNotAcceptable, err)
+	}
+
+	if newCategory.Group == "" {
+		return echo.NewHTTPError(http.StatusBadRequest, "category group is required")
+	}
+
+	categoryGroup, err := h.Service.CreateCategoryGroup(c.Request().Context(), postgres.CreateCategoryGroupParams{
+		BudgetID: newCategory.BudgetID,
+		Name:     newCategory.Group,
+	})
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(http.StatusOK, categoryGroup)
+}

server/category_new.go

@@ -0,0 +1,48 @@
+package server
+
+import (
+	"net/http"
+
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
+)
+
+type newCategoryInformation struct {
+	BudgetID uuid.UUID `json:"budgetId"`
+	Name     string    `json:"name"`
+	Group    string    `json:"group"`
+}
+
+func (h *Handler) newCategory(c echo.Context) error {
+	var newCategory newCategoryInformation
+	if err := c.Bind(&newCategory); err != nil {
+		return echo.NewHTTPError(http.StatusNotAcceptable, err)
+	}
+
+	if newCategory.Name == "" {
+		return echo.NewHTTPError(http.StatusBadRequest, "category name is required")
+	}
+
+	if newCategory.Group == "" {
+		return echo.NewHTTPError(http.StatusBadRequest, "category group is required")
+	}
+
+	categoryGroup, err := h.Service.GetCategoryGroupByName(c.Request().Context(), postgres.GetCategoryGroupByNameParams{
+		BudgetID: newCategory.BudgetID,
+		Name:     newCategory.Group,
+	})
+	if err != nil {
+		return err
+	}
+
+	category, err := h.Service.CreateCategory(c.Request().Context(), postgres.CreateCategoryParams{
+		CategoryGroupID: categoryGroup.ID,
+		Name:            newCategory.Name,
+	})
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(http.StatusOK, category)
+}

server/http.go

@@ -1,11 +1,8 @@
 package server
 
 import (
-	"errors"
-	"io"
-	"io/fs"
+	"fmt"
 	"net/http"
-	"path"
 	"strings"
 
 	"git.javil.eu/jacob1123/budgeteer"
@@ -36,6 +33,7 @@ func (h *Handler) Serve() {
 
 // LoadRoutes initializes all the routes.
 func (h *Handler) LoadRoutes(router *echo.Echo) {
+	router.Use(middleware.Logger())
 	router.Use(enableCachingForStaticFiles())
 	router.Use(middleware.StaticWithConfig(middleware.StaticConfig{
 		Filesystem: h.StaticFS,
@@ -51,10 +49,16 @@ func (h *Handler) LoadRoutes(router *echo.Echo) {
 	authenticated := api.Group("")
 	{
 		authenticated.Use(h.verifyLoginWithForbidden)
-		authenticated.GET("/account/:accountid/transactions", h.transactionsForAccount)
-		authenticated.POST("/account/:accountid/reconcile", h.reconcileTransactions)
-		authenticated.POST("/account/:accountid", h.editAccount)
-		authenticated.GET("/admin/clear-database", h.clearDatabase)
+		account := authenticated.Group("/account")
+		account.GET("/:accountid/transactions", h.transactionsForAccount)
+		account.POST("/:accountid/reconcile", h.reconcileTransactions)
+		account.POST("/:accountid", h.editAccount)
+
+		category := authenticated.Group("/category")
+		category.POST("/new", h.newCategory)
+
+		categoryGroup := authenticated.Group("/category-group")
+		categoryGroup.POST("/new", h.newCategoryGroup)
 
 		budget := authenticated.Group("/budget")
 		budget.POST("/new", h.newBudget)
@@ -75,44 +79,16 @@ func (h *Handler) LoadRoutes(router *echo.Echo) {
 		transaction := authenticated.Group("/transaction")
 		transaction.POST("/new", h.newTransaction)
 		transaction.POST("/:transactionid", h.updateTransaction)
-	}
+
+		authenticated.GET("/admin/clear-database", h.clearDatabase)
 	}
 
-func (h *Handler) ServeStatic(next echo.HandlerFunc) echo.HandlerFunc {
-	return func(c echo.Context) error {
-		h.ServeStaticFile(c, c.Path())
-		return nil
-	}
+	api.Any("/*", h.notFound)
 }
 
-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"))
-		return
-	}
-
-	if err != nil {
-		c.Error(err)
-		return
-	}
-
-	stat, err := file.Stat()
-	if err != nil {
-		c.Error(err)
-		return
-	}
-
-	if stat.IsDir() {
-		h.ServeStaticFile(c, path.Join(fullPath, "index.html"))
-		return
-	}
-
-	if file, ok := file.(io.ReadSeeker); ok {
-		http.ServeContent(c.Response().Writer, c.Request(), stat.Name(), stat.ModTime(), file)
-	} else {
-		panic("File does not implement ReadSeeker")
-	}
+func (h *Handler) notFound(c echo.Context) error {
+	fmt.Println("not found?")
+	return echo.NewHTTPError(http.StatusNotImplemented, "not found")
 }
 
 func enableCachingForStaticFiles() echo.MiddlewareFunc {

server/session.go

@@ -35,7 +35,7 @@ func (h *Handler) verifyLogin(c echo.Context) (budgeteer.Token, error) { //nolin
 	tokenString = tokenString[7:]
 	token, err := h.TokenVerifier.VerifyToken(tokenString)
 	if err != nil {
-		return nil, fmt.Errorf("verify token '%s': %s", tokenString, err)
+		return nil, fmt.Errorf("verify token '%s': %w", tokenString, err)
 	}
 
 	return token, nil
@@ -63,7 +63,7 @@ func (h *Handler) loginPost(c echo.Context) error {
 	var login loginInformation
 	err := c.Bind(&login)
 	if err != nil {
-		return err
+		return fmt.Errorf("parse payload: %w", err)
 	}
 
 	user, err := h.Service.GetUserByUsername(c.Request().Context(), login.User)
@@ -72,12 +72,12 @@ func (h *Handler) loginPost(c echo.Context) error {
 	}
 
 	if err = h.CredentialsVerifier.Verify(login.Password, user.Password); err != nil {
-		return err
+		return fmt.Errorf("verify password: %w", err)
 	}
 
 	token, err := h.TokenVerifier.CreateToken(&user)
 	if err != nil {
-		return err
+		return fmt.Errorf("create token: %w", err)
 	}
 
 	go h.UpdateLastLogin(user.ID)
@@ -120,7 +120,7 @@ func (h *Handler) registerPost(c echo.Context) error {
 
 	hash, err := h.CredentialsVerifier.Hash(register.Password)
 	if err != nil {
-		return err
+		return fmt.Errorf("hash password: %w", err)
 	}
 
 	createUser := postgres.CreateUserParams{
@@ -135,7 +135,7 @@ func (h *Handler) registerPost(c echo.Context) error {
 
 	token, err := h.TokenVerifier.CreateToken(&user)
 	if err != nil {
-		return err
+		return fmt.Errorf("create token: %w", err)
 	}
 
 	go h.UpdateLastLogin(user.ID)

server/ynab-import.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"fmt"
 	"net/http"
 
 	"git.javil.eu/jacob1123/budgeteer/postgres"
@@ -26,12 +27,12 @@ func (h *Handler) importYNAB(c echo.Context) error {
 
 	transactionsFile, err := c.FormFile("transactions")
 	if err != nil {
-		return err
+		return fmt.Errorf("get transactions: %w", err)
 	}
 
 	transactions, err := transactionsFile.Open()
 	if err != nil {
-		return err
+		return fmt.Errorf("open transactions: %w", err)
 	}
 
 	err = ynab.ImportTransactions(c.Request().Context(), transactions)
@@ -41,12 +42,12 @@ func (h *Handler) importYNAB(c echo.Context) error {
 
 	assignmentsFile, err := c.FormFile("assignments")
 	if err != nil {
-		return err
+		return fmt.Errorf("get assignments: %w", err)
 	}
 
 	assignments, err := assignmentsFile.Open()
 	if err != nil {
-		return err
+		return fmt.Errorf("open assignments: %w", err)
 	}
 
 	err = ynab.ImportAssignments(c.Request().Context(), assignments)

web/src/api.ts

@@ -9,7 +9,18 @@ export function GET(path: string) {
     });
 }
 
-export function POST(path: string, body: FormData | string | null) {
+export function FORM(path: string, body: FormData) {
+    const sessionStore = useSessionStore();
+    return fetch(BASE_URL + path, {
+        method: "POST",
+        headers: {
+          ...sessionStore.AuthHeaders,
+        },
+        body: body,
+    });
+}
+
+export function POST(path: string, body: string | null) {
     const sessionStore = useSessionStore();
     return fetch(BASE_URL + path, {
         method: "POST",

web/src/components/Autocomplete.vue

@@ -11,10 +11,10 @@ export interface Suggestion {
 }
 
 const props = defineProps<{
-    text: string,
-    id: string | undefined,
+    text: string | null,
+    id: string | null,
     model: string,
-    type?: string | undefined,
+    type?: string | null,
 }>();
 
 const SearchQuery = ref(props.text || "");

web/src/components/BudgetingCategory.vue

@@ -0,0 +1,49 @@
+<script lang="ts" setup>
+import { computed, ref, watch } from 'vue';
+import { useAccountStore } from '../stores/budget-account';
+import { Category, useCategoryStore } from '../stores/category';
+import Currency from './Currency.vue'
+import Input from './Input.vue';
+
+const props = defineProps<{category:Category, year: number, month: number}>()
+
+const assigned = ref(props.category.Assigned);
+watch(() => props.category.Assigned, () =>{ assigned.value = props.category.Assigned});
+
+const accountStore = useAccountStore();
+const categoryStore = useCategoryStore();
+
+function assignedChanged(_e : Event, category : Category){
+  categoryStore.SetAssigned(category, props.year, props.month, assigned.value);
+}
+</script>
+
+<template
+  v-for="category in getCategoriesForGroup(group)"
+  :key="category.ID"
+>
+  <div
+    class="contents"
+  >
+    <span
+      class="whitespace-nowrap overflow-hidden"
+    >{{ category.Name }}</span>
+    <Currency
+      :value="category.AvailableLastMonth"
+      class="hidden lg:block"
+    />
+    <Input
+      v-model="assigned"
+      type="number"
+      class="hidden sm:block mx-2 text-right"
+      @input="(evt : Event) => assignedChanged(evt, category)"
+    />
+    <Currency
+      :value="category.Activity"
+      class="hidden sm:block"
+    />
+    <Currency
+      :value="accountStore.GetCategoryAvailable(category)"
+    />
+  </div>
+</template>

web/src/components/BudgetingCategoryGroup.vue

@@ -0,0 +1,66 @@
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
+import { useCategoryStore } from '../stores/category';
+import { CategoryGroup } from '../stores/category-group';
+import BudgetingCategory from './BudgetingCategory.vue';
+import Currency from './Currency.vue'
+import CreateCategory from '../dialogs/CreateCategory.vue';
+
+const props = defineProps<{group: CategoryGroup, year: number, month: number}>();
+
+const categoryStore = useCategoryStore();
+const categoriesForGroup = computed(() => categoryStore.GetCategoriesForGroup(props.group));
+
+const expanded = ref(true)
+function toggleGroup() {
+    expanded.value = !expanded.value;
+}
+
+const availableLastMonth = computed(() => categoriesForGroup.value.reduce((prev, current) => prev + current.AvailableLastMonth, 0))
+const assigned = computed(() => categoriesForGroup.value.reduce((prev, current) => prev + current.Assigned, 0))
+const activity = computed(() => categoriesForGroup.value.reduce((prev, current) => prev + current.Activity, 0))
+const available = computed(() => activity.value+assigned.value+availableLastMonth.value);
+</script>
+
+<template>
+  <span
+    class="text-lg font-bold mt-2"
+    @click="toggleGroup()"
+  >{{ (expanded ? "−" : "+") + " " + group.Name }}
+    <CreateCategory :category-group="group.Name" />
+  </span>
+  <Currency
+    :value="availableLastMonth"
+    class="hidden lg:block mt-2"
+    positive-class="text-slate-500"
+    negative-class="text-red-700 dark:text-red-400"
+  />
+  <Currency
+    :value="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="activity"
+    class="hidden sm:block mt-2"
+    positive-class="text-slate-500"
+    negative-class="text-red-700 dark:text-red-400"
+  />
+  <Currency
+    :value="available"
+    class="mt-2"
+    positive-class="text-slate-500"
+    negative-class="text-red-700 dark:text-red-400"
+  />
+  <template
+    v-if="expanded">
+    <BudgetingCategory 
+      v-for="category in categoriesForGroup"
+      :key="category.ID"
+      :category="category"
+      :year="year"
+      :month="month"
+    />
+  </template>
+</template>

web/src/components/BudgetingSummary.vue

@@ -0,0 +1,62 @@
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { useAccountStore } from '../stores/budget-account';
+import Currency from './Currency.vue';
+
+const props = defineProps<{
+  year:number,
+  month:number
+}>();
+
+const accountStore = useAccountStore();
+const budgeted = computed(() => accountStore.GetBudgeted(props.year, props.month))
+</script>
+
+<template>
+  <h1>Budget for {{ month + 1 }}/{{ 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.Assigned+budgeted.Deassigned)>=0?"Budgeted":"Freed" }} this month:
+      </td>
+      <td class="text-right">
+        <Currency :value="-1*(budgeted.Assigned+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>
+</template>

web/src/components/Modal.vue

@@ -15,10 +15,13 @@ const visible = ref(false);
 function closeDialog() {
     visible.value = false;
 };
-function openDialog() {
+
+function openDialog(e : MouseEvent) {
+  e.stopPropagation();
   emit("open");
   visible.value = true;
 };
+
 function submitDialog() {
     const e = {cancel: false};
     emit("submit", e);

web/src/components/TransactionInputRow.vue

@@ -16,9 +16,9 @@ const TX = ref<Transaction>({
     Memo: "",
     Amount: 0,
     Payee: "",
-    PayeeID: undefined,
+    PayeeID: null,
     Category: "",
-    CategoryID: undefined,
+    CategoryID: null,
     CategoryGroup: "",
     GroupID: "",
     ID: "",

web/src/dialogs/CreateCategory.vue

@@ -0,0 +1,53 @@
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
+import Modal from '../components/Modal.vue';
+import { useAccountStore } from '../stores/budget-account';
+import Input from '../components/Input.vue';
+import { useCategoryStore } from '../stores/category';
+
+const categoryStore = useCategoryStore();
+
+const props = defineProps<{
+  categoryGroup: string
+}>();
+
+const categoryName = ref("");
+const error = ref("");
+
+function createCategory(e : {cancel:boolean}) : boolean {
+  error.value = "";
+  categoryStore.CreateCategory(props.categoryGroup, categoryName.value);
+
+  return true;
+}
+
+</script>
+
+<template>
+  <Modal
+    button-text="Create Category"
+    @submit="createCategory"
+  >
+    <template #placeholder>
+      <span class="ml-2">+</span>
+    </template>
+    <div class="mt-2 px-7 py-3">
+      Parent: {{ categoryGroup }}
+    </div>
+    <div class="mt-2 px-7 py-3">
+      <Input
+        v-model="categoryName"
+        class="border-2 dark:border-gray-700"
+        type="text"
+        placeholder="Category name"
+        required
+      />
+    </div>
+    <div
+      v-if="error != ''"
+      class="dark:text-red-300 text-red-700"
+    >
+      {{ error }}
+    </div>
+  </Modal>
+</template>

web/src/dialogs/CreateCategoryGroup.vue

@@ -0,0 +1,44 @@
+<script lang="ts" setup>
+import { ref } from 'vue';
+import Modal from '../components/Modal.vue';
+import Input from '../components/Input.vue';
+import { useCategoryGroupStore } from '../stores/category-group';
+
+const categoryGroupStore = useCategoryGroupStore();
+
+const categoryGroupName = ref("");
+const error = ref("");
+
+function createCategoryGroup(e : {cancel:boolean}) : boolean {
+  error.value = "";
+  categoryGroupStore.CreateCategoryGroup(categoryGroupName.value);
+  return true;
+}
+
+</script>
+
+<template>
+  <Modal
+    button-text="Create Category Group"
+    @submit="createCategoryGroup"
+  >
+    <template #placeholder>
+      <button class="px-2 py-0 w-full bg-slate-400 rounded-md mt-4">Add Group</button>
+    </template>
+    <div class="mt-2 px-7 py-3">
+      <Input
+        v-model="categoryGroupName"
+        class="border-2 dark:border-gray-700"
+        type="text"
+        placeholder="Category name"
+        required
+      />
+    </div>
+    <div
+      v-if="error != ''"
+      class="dark:text-red-300 text-red-700"
+    >
+      {{ error }}
+    </div>
+  </Modal>
+</template>

web/src/pages/AllAccounts.vue

@@ -42,7 +42,7 @@ const filters = ref({
   ToDate: new Date(2999,11,32),
 });
 
-watch(() => filters.value.AccountID 
+watch(() => (filters.value.AccountID ?? "")
   + filters.value.PayeeID 
   + filters.value.CategoryID
   + filters.value.FromDate?.toISOString()

web/src/pages/Budgeting.vue

@@ -1,11 +1,14 @@
 <script lang="ts" setup>
-import { computed, onMounted, ref, watchEffect } from "vue";
-import Currency from "../components/Currency.vue";
+import { computed, onMounted, watchEffect } from "vue";
 import { useBudgetsStore } from "../stores/budget";
-import { Category, useAccountStore } from "../stores/budget-account";
+import { useCategoryGroupStore } from "../stores/category-group";
+import { useAccountStore } from "../stores/budget-account";
 import { useSessionStore } from "../stores/session";
-import Input from "../components/Input.vue";
 import { POST } from "../api";
+import BudgetingSummary from "../components/BudgetingSummary.vue";
+import { Category } from "../stores/category";
+import CreateCategoryGroup from "../dialogs/CreateCategoryGroup.vue";
+import BudgetingCategoryGroup from "../components/BudgetingCategoryGroup.vue";
 
 const props = defineProps<{
     budgetid: string,
@@ -13,22 +16,12 @@ const props = defineProps<{
     month: string,
 }>()
 
+const categoryGroupStore = useCategoryGroupStore()
+const categoryGroups = computed(() => [...categoryGroupStore.CategoryGroups.values()]);
+
 const budgetsStore = useBudgetsStore();
 const CurrentBudgetID = computed(() => budgetsStore.CurrentBudgetID);
 
-const accountStore = useAccountStore();
-const categoriesForMonth = accountStore.CategoriesForMonthAndGroup;
-
-function GetCategories(group: string) {
-    return [...categoriesForMonth(selected.value.Year, selected.value.Month, group)];
-};
-
-const groupsForMonth = accountStore.CategoryGroupsForMonth;
-const GroupsForMonth = computed(() => {
-    return [...groupsForMonth(selected.value.Year, selected.value.Month)];
-});
-
-
 const previous = computed(() => ({
     Year: new Date(selected.value.Year, selected.value.Month - 1, 1).getFullYear(),
     Month: new Date(selected.value.Year, selected.value.Month - 1, 1).getMonth(),
@@ -55,77 +48,10 @@ onMounted(() => {
     useSessionStore().setTitle("Budget for " + selected.value.Month + "/" + selected.value.Year);
 })
 
-
-const expandedGroups = ref<Map<string, boolean>>(new Map<string, boolean>())
-
-function toggleGroup(group: { Name: string, Expand: boolean }) {
-    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>
+  <BudgetingSummary :year="selected.Year" :month="selected.Month" />
   <div>
     <router-link
       :to="'/budget/' + CurrentBudgetID + '/budgeting/' + previous.Year + '/' + previous.Month"
@@ -152,68 +78,13 @@ const budgeted = computed(() => accountStore.GetBudgeted(selected.value.Year, se
     <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"
+    <BudgetingCategoryGroup
+      v-for="group in categoryGroups"
       :key="group.Name"
-    >
-      <span
-        class="text-lg font-bold mt-2"
-        @click="toggleGroup(group)"
-      >{{ (getGroupState(group) ? "−" : "+") + " " + group.Name }}</span>
-      <Currency
-        :value="group.AvailableLastMonth"
-        class="hidden lg:block mt-2"
-        positive-class="text-slate-500"
-        negative-class="text-red-700 dark:text-red-400"
-      />
-      <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)"
+      :group="group"
+      :year="selected.Year"
+      :month="selected.Month"
     />
-        </div>
-      </template>
-    </template>
+    <CreateCategoryGroup />
   </div>
 </template>

web/src/stores/budget-account.ts

@@ -1,13 +1,14 @@
 import { defineStore } from "pinia";
 import { GET, POST } from "../api";
 import { useBudgetsStore } from "./budget";
+import { Category, useCategoryStore } from "./category";
+import { useCategoryGroupStore } from "./category-group";
 import { useSessionStore } from "./session";
-import { useTransactionsStore } from "./transactions";
+import { Transaction, useTransactionsStore } from "./transactions";
 
 interface State {
     Accounts: Map<string, Account>;
     CurrentAccountID: string | null;
-    Categories: Map<string, Category>;
     Months: Map<number, Map<number, Map<string, Category>>>;
     Available: number,
     OverspentLastMonth: number,
@@ -22,7 +23,6 @@ export interface Account {
     ClearedBalance: number;
     WorkingBalance: number;
     ReconciledBalance: number;
-    Transactions: string[];
     LastReconciled: NullDate;
 }
 
@@ -31,15 +31,6 @@ interface NullDate {
     Time: Date;
 }
 
-export interface Category {
-    ID: string;
-    Group: string;
-    Name: string;
-    AvailableLastMonth: number;
-    Assigned: number;
-    Activity: number;
-}
-
 interface BudgetedAmounts {
     Assigned: number,
     Deassigned: number,
@@ -54,7 +45,6 @@ export const useAccountStore = defineStore("budget/account", {
         Months: new Map<number, Map<number, Map<string, Category>>>(),
         Available: 0,
         OverspentLastMonth: 0,
-        Categories: new Map<string, Category>(),
         Assignments: [],
     }),
     getters: {
@@ -130,15 +120,10 @@ export const useAccountStore = defineStore("budget/account", {
                             Expand: prev.Name != "Hidden Categories",
                         });
                     } else {
-                        categoryGroups[categoryGroups.length - 1].Available +=
-                            this.GetCategoryAvailable(category);
-                        categoryGroups[
-                            categoryGroups.length - 1
-                        ].AvailableLastMonth += category.AvailableLastMonth;
-                        categoryGroups[categoryGroups.length - 1].Activity +=
-                            category.Activity;
-                        categoryGroups[categoryGroups.length - 1].Assigned +=
-                            category.Assigned;
+                        categoryGroups[categoryGroups.length - 1].Available += this.GetCategoryAvailable(category);
+                        categoryGroups[categoryGroups.length - 1].AvailableLastMonth += category.AvailableLastMonth;
+                        categoryGroups[categoryGroups.length - 1].Activity += category.Activity;
+                        categoryGroups[categoryGroups.length - 1].Assigned += category.Assigned;
                         continue;
                     }
                 }
@@ -241,6 +226,9 @@ export const useAccountStore = defineStore("budget/account", {
             available: number,
             overspentLastMonth: number,
         ): void {
+          useCategoryStore().AddCategory(...categories)
+          useCategoryGroupStore().AddCategoryGroup(...categories.map(x => ({ID: x.CategoryGroupID, Name: x.Group})));
+
           this.$patch((state) => {
             const yearMap =
                 state.Months.get(year) ||

web/src/stores/budget.ts

@@ -1,6 +1,7 @@
 import { defineStore } from "pinia";
-import { GET, POST } from "../api";
+import { GET, POST, FORM } from "../api";
 import { useAccountStore } from "./budget-account";
+import { useCategoryStore } from "./category";
 import { Budget, useSessionStore } from "./session";
 
 interface State {
@@ -24,9 +25,9 @@ export const useBudgetsStore = defineStore("budget", {
     },
     actions: {
         ImportYNAB(formData: FormData) {
-            return POST(
+            return FORM(
                 "/budget/" + this.CurrentBudgetID + "/import/ynab",
-                formData
+                formData,
             );
         },
         async NewBudget(budgetName: string): Promise<void> {
@@ -40,9 +41,13 @@ export const useBudgetsStore = defineStore("budget", {
             sessionStore.Budgets.set(response.ID, response);
         },
         async SetCurrentBudget(budgetid: string): Promise<void> {
+            if(this.CurrentBudgetID == budgetid)
+              return;
+
             this.CurrentBudgetID = budgetid;
 
-            if (budgetid == null) return;
+            if (budgetid == null)
+              return;
 
             await this.FetchBudget(budgetid);
         },
@@ -54,16 +59,16 @@ export const useBudgetsStore = defineStore("budget", {
         MergeBudgetingData(response: any) {
             const accounts = useAccountStore();
             for (const account of response.Accounts || []) {
-                const existingAccount = accounts.Accounts.get(account.ID);
-                account.Transactions = existingAccount?.Transactions ?? [];
                 if (account.LastReconciled.Valid)
                     account.LastReconciled.Time = new Date(
                         account.LastReconciled.Time
                     );
                 accounts.Accounts.set(account.ID, account);
             }
+
+            const categories = useCategoryStore();
             for (const category of response.Categories || []) {
-                accounts.Categories.set(category.ID, category);
+                categories.Categories.set(category.ID, category);
             }
         },
     },

web/src/stores/category-group.ts

@@ -0,0 +1,40 @@
+import { defineStore } from "pinia";
+import { POST } from "../api";
+import { useBudgetsStore } from "./budget";
+
+interface State {
+    CategoryGroups: Map<string, CategoryGroup>;
+}
+
+export interface CategoryGroup {
+  ID: string;
+  Name: string;
+}
+
+export const useCategoryGroupStore = defineStore("category-group", {
+  state: (): State => ({
+      CategoryGroups: new Map<string, CategoryGroup>(),
+  }),
+  getters: {
+  },
+  actions: {
+    async CreateCategoryGroup(
+      group: string,
+    ) {
+      const result = await POST(
+        "/category-group/new",
+        JSON.stringify({
+          budgetId: useBudgetsStore().CurrentBudgetID,
+          group: group,
+        })
+      );
+      const response = await result.json();
+      this.AddCategoryGroup(response);
+    },
+    async AddCategoryGroup(...categoryGroups : CategoryGroup[]){
+      for (const categoryGroup of categoryGroups) {
+        this.CategoryGroups.set(categoryGroup.ID, categoryGroup);
+      }
+    }
+  },
+});

web/src/stores/category.ts

@@ -0,0 +1,59 @@
+import { defineStore } from "pinia";
+import { POST } from "../api";
+import { useBudgetsStore } from "./budget";
+import { CategoryGroup } from "./category-group";
+
+interface State {
+    Categories: Map<string, Category>;
+}
+
+export interface Category {
+    ID: string;
+    CategoryGroupID: string;
+    Group: string;
+    Name: string;
+    AvailableLastMonth: number;
+    Assigned: number;
+    Activity: number;
+}
+
+export const useCategoryStore = defineStore("category", {
+  state: (): State => ({
+      Categories: new Map<string, Category>(),
+  }),
+  getters: {
+    GetCategoriesForGroup(state) {
+      return (group : CategoryGroup) : Category[] => {
+        return [...state.Categories.values()].filter(x => x.CategoryGroupID == group.ID);
+      }
+    },
+  },
+  actions: {
+    async CreateCategory(
+      group: string,
+      name: string,
+    ) {
+      const result = await POST(
+        "/category/new",
+        JSON.stringify({
+          budgetId: useBudgetsStore().CurrentBudgetID,
+          name: name,
+          group: group,
+        })
+      );
+      const response = await result.json();
+      this.AddCategory(response);
+    },
+    async AddCategory(...categories : Category[]){
+      for (const category of categories) {
+        this.Categories.set(category.ID, category);
+      }
+    },
+    async SetAssigned(category : Category, year : number, month : number, assigned : number){
+      this.Categories.get(category.ID)!.Assigned = assigned;
+      const currentBudgetID = useBudgetsStore().CurrentBudgetID;
+      await POST("/budget/"+currentBudgetID+"/category/" + category.ID + "/" + year + "/" + (month+1),
+        JSON.stringify({Assigned: assigned}));
+    }
+  },
+});

web/src/stores/transactions.ts

@@ -17,12 +17,12 @@ export interface Transaction {
     TransferAccount: string;
     CategoryGroup: string;
     Category: string;
-    CategoryID: string | undefined;
+    CategoryID: string | null;
     Memo: string;
     Status: string;
     GroupID: string;
     Payee: string;
-    PayeeID: string | undefined;
+    PayeeID: string | null;
     Amount: number;
     Reconciled: boolean;
     Account: string;
@@ -47,10 +47,12 @@ export const useTransactionsStore = defineStore("budget/transactions", {
             }
             return reconciledBalance;
         },
-        TransactionsByDate(state) : Record<string, Transaction[]> {
+        TransactionsByDate(state) : Record<string, Transaction[]>|undefined{
             const accountsStore = useAccountStore();
-            const accountID = accountsStore.CurrentAccountID;
-            const allTransactions = [...this.Transactions.values()].filter(x => x.AccountID == accountID);
+            const account = accountsStore.CurrentAccount;
+            if(account === undefined)
+              return undefined;
+            const allTransactions = [...this.Transactions.values()].filter(x => x.AccountID == account.ID);
             return groupBy(allTransactions, x => formatDate(x.Date));
         },
         TransactionsList(state) : Transaction[] {
@@ -128,18 +130,15 @@ export const useTransactionsStore = defineStore("budget/transactions", {
             const recTrans = response.ReconciliationTransaction;
             if (recTrans) {
                 this.AddTransactions([recTrans]);
-                account.Transactions.unshift(recTrans.ID);
             }
         },
         logout() {
             this.$reset();
         },
         async saveTransaction(payload: string) {
-            const accountsStore = useAccountStore();
             const result = await POST("/transaction/new", payload);
             const response = (await result.json()) as Transaction;
             this.AddTransactions([response]);
-            accountsStore.CurrentAccount?.Transactions.unshift(response.ID);
         },
         async editTransaction(transactionid: string, payload: string) {
             const result = await POST("/transaction/" + transactionid, payload);