Merge pull request #110 from pitzzahh/patch/issues

fix: some known issues

Author: pitzzahh

package.json

@@ -40,7 +40,7 @@
     "dotenv": "^17.3.1",
     "gsap": "^3.14.2",
     "mode-watcher": "^1.1.0",
-    "pg": "^8.18.0",
+    "pg": "^8.19.0",
     "runed": "^0.37.1",
     "svelte-toolbelt": "^0.10.6",
     "valibot": "^1.2.0"
@@ -52,10 +52,10 @@
     "@svelte-put/qr": "^2.1.1",
     "@sveltejs/adapter-node": "^5.5.3",
     "@sveltejs/enhanced-img": "^0.10.3",
-    "@sveltejs/kit": "^2.53.0",
+    "@sveltejs/kit": "^2.53.2",
     "@sveltejs/vite-plugin-svelte": "^6.2.4",
     "@tailwindcss/typography": "^0.5.19",
-    "@tailwindcss/vite": "^4.2.0",
+    "@tailwindcss/vite": "^4.2.1",
     "@tanstack/table-core": "^8.21.3",
     "@types/d3-scale": "^4.0.9",
     "@types/d3-shape": "^3.1.8",
@@ -72,14 +72,14 @@
     "prettier": "^3.8.1",
     "prettier-plugin-svelte": "^3.5.0",
     "prettier-plugin-tailwindcss": "^0.7.2",
-    "svelte": "^5.53.3",
+    "svelte": "^5.53.5",
     "svelte-check": "^4.4.3",
     "svelte-render-scan": "^1.1.0",
     "svelte-sonner": "^1.0.7",
     "sveltekit-sse": "^0.14.3",
     "tailwind-merge": "^3.5.0",
     "tailwind-variants": "^3.2.2",
-    "tailwindcss": "^4.2.0",
+    "tailwindcss": "^4.2.1",
     "tsx": "^4.21.0",
     "tw-animate-css": "^1.4.0",
     "typescript": "^5.9.3",

pnpm-lock.yaml

@@ -62,11 +62,11 @@ export const requireAuth = query(() => requireAuthServer());
 export const signout = form(async () => {
   const event = getRequestEvent();
   if (event.locals.session === null) {
-    return redirect(303, "/");
+    return redirect(303, "/auth?act=login");
   }
   invalidateSession(event.locals.session.id);
   deleteSessionTokenCookie(event);
-  redirect(303, "/");
+  redirect(303, "/auth?act=login");
 });
 
 export const login = form(loginSchema, async (user, issues) => {

src/lib/api/auth.remote.ts

@@ -74,3 +74,4 @@ export { default as Shield } from "phosphor-svelte/lib/ShieldIcon";
 export { default as ShieldCheck } from "phosphor-svelte/lib/ShieldCheckIcon";
 export { default as ShieldOff } from "phosphor-svelte/lib/ShieldSlashIcon";
 export { default as Copy } from "phosphor-svelte/lib/CopyIcon";
+export { default as InvoiceIcon } from "phosphor-svelte/lib/InvoiceIcon";

src/lib/assets/icons.ts

@@ -58,7 +58,7 @@
           column.toggleVisibility(!!value);
         }}
       >
-        {column.id}
+        {column.id.replace("Formatted", "")}
       </DropdownMenu.CheckboxItem>
     {/each}
   </DropdownMenu.Content>

src/lib/components/data-table/data-table-view-options.svelte

@@ -4,6 +4,8 @@ export const site = {
   url: "https://powertrackr.up.railway.app",
   ogImage: "https://powertrackr.vercel.app/og.avif",
   description: "Track and reconcile electricity usage and payments.",
+  fullDescription:
+    "Record, organize, and reconcile electricity usage and payments across an account and its sub-meters.",
   keywords: `svelte, monitoring-tool, energy-monitoring, sveltekit, bill-monitoring, payment-reconciliation`,
 };
 export type SiteConfig = typeof site;

src/lib/site.ts

@@ -33,13 +33,10 @@ export type BillingInfoTableView = Omit<BillingInfo, "date" | "createdAt" | "upd
   updatedAt: string;
 };
 
-export type ExtendedBillingInfoTableView = Omit<
-  ExtendedBillingInfo,
-  "date" | "createdAt" | "updatedAt"
-> & {
-  date: string;
-  createdAt: string;
-  updatedAt: string;
+export type ExtendedBillingInfoTableView = ExtendedBillingInfo & {
+  dateFormatted: string;
+  createdAtFormatted: string;
+  updatedAtFormatted: string;
 };
 
 export type ExtendedBillingInfo = BillingInfo & {

src/lib/types/billing-info.ts

@@ -13,3 +13,22 @@ export interface Stats {
     formatted: string;
   };
 }
+
+/* Types for the stats payload. Keep these narrow and explicit so the cache is portable. */
+export type EnergyUsed = {
+  total: number;
+  formatted: string;
+  energyUnit: string;
+};
+
+export type PaymentsAmount = {
+  total: number;
+  formatted: string;
+};
+
+export type StatsPayload = {
+  userCount: number;
+  energyUsed: EnergyUsed;
+  billingCount: number;
+  paymentsAmount: PaymentsAmount;
+};

src/lib/types/stats.ts

@@ -5,15 +5,15 @@ import type {
   ExtendedBillingInfo,
   ExtendedBillingInfoTableView,
 } from "$/types/billing-info";
-import { formatDate, DateFormat, parseCalendarDate } from "$/utils/format";
+import { formatDate, DateFormat } from "$/utils/format";
 
 export function billingInfoToDto(
   original: ExtendedBillingInfoTableView
 ): BillingInfoDTOWithSubMeters {
   return {
     id: original.id,
     userId: original.userId,
-    date: parseCalendarDate(original.date),
+    date: original.date,
     totalkWh: original.totalkWh,
     balance: original.balance,
     payPerkWh: original.payPerkWh,
@@ -43,11 +43,11 @@ export function extendedBillingInfoToTableView(
 ): ExtendedBillingInfoTableView {
   return {
     ...original,
-    date: formatDate(original.date),
-    createdAt: formatDate(new Date(original.createdAt), {
+    dateFormatted: formatDate(original.date),
+    createdAtFormatted: formatDate(new Date(original.createdAt), {
       format: DateFormat.DateTime,
     }),
-    updatedAt: formatDate(new Date(original.updatedAt), {
+    updatedAtFormatted: formatDate(new Date(original.updatedAt), {
       format: DateFormat.DateTime,
     }),
   };

src/lib/utils/mapper/billing-info.ts

@@ -578,8 +578,7 @@
                     <Button
                       type="submit"
                       variant="destructive"
-                      disabled={(disable2FA.fields.code.value() &&
-                        disable2FA.fields.code.value().length !== 6) ||
+                      disabled={disable2FA.fields?.code?.value()?.length !== 6 ||
                         securityAsyncState === "processing"}
                     >
                       {#if securityAsyncState === "processing"}