Merge branch 'Lokowitz-main'

This commit is contained in:
Owen
2025-09-14 20:34:34 -07:00
6 changed files with 1752 additions and 355 deletions

2052
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -27,7 +27,7 @@
},
"dependencies": {
"@asteasolutions/zod-to-openapi": "^7.3.4",
"@hookform/resolvers": "3.9.1",
"@hookform/resolvers": "4.1.3",
"@node-rs/argon2": "^2.0.2",
"@oslojs/crypto": "1.0.1",
"@oslojs/encoding": "1.1.0",
@@ -49,15 +49,15 @@
"@radix-ui/react-tabs": "1.1.13",
"@radix-ui/react-toast": "1.2.15",
"@radix-ui/react-tooltip": "^1.2.8",
"@react-email/components": "0.5.0",
"@react-email/components": "0.5.3",
"@react-email/render": "^1.2.0",
"@react-email/tailwind": "1.2.2",
"@simplewebauthn/browser": "^13.1.0",
"@simplewebauthn/browser": "^13.1.2",
"@simplewebauthn/server": "^9.0.3",
"@tailwindcss/forms": "^0.5.10",
"@tanstack/react-table": "8.21.3",
"arctic": "^3.7.0",
"axios": "1.11.0",
"axios": "^1.12.2",
"better-sqlite3": "11.7.0",
"canvas-confetti": "1.9.3",
"class-variance-authority": "^0.7.1",
@@ -68,11 +68,11 @@
"cookies": "^0.9.1",
"cors": "2.8.5",
"crypto-js": "^4.2.0",
"drizzle-orm": "0.44.4",
"eslint": "9.33.0",
"eslint-config-next": "15.4.6",
"drizzle-orm": "0.44.5",
"eslint": "9.35.0",
"eslint-config-next": "15.5.3",
"express": "5.1.0",
"express-rate-limit": "8.0.1",
"express-rate-limit": "8.1.0",
"glob": "11.0.3",
"helmet": "8.1.0",
"http-errors": "2.0.0",
@@ -81,22 +81,22 @@
"jmespath": "^0.16.0",
"js-yaml": "4.1.0",
"jsonwebtoken": "^9.0.2",
"lucide-react": "0.539.0",
"lucide-react": "^0.544.0",
"moment": "2.30.1",
"next": "15.4.6",
"next-intl": "^4.3.4",
"next": "15.5.3",
"next-intl": "^4.3.8",
"next-themes": "0.4.6",
"node-cache": "5.1.2",
"node-fetch": "3.3.2",
"nodemailer": "7.0.5",
"npm": "^11.5.2",
"nodemailer": "7.0.6",
"npm": "^11.6.0",
"oslo": "1.2.1",
"pg": "^8.16.2",
"posthog-node": "^5.7.0",
"posthog-node": "^5.8.4",
"qrcode.react": "4.2.0",
"react": "19.1.1",
"react-dom": "19.1.1",
"react-easy-sort": "^1.6.0",
"react-easy-sort": "^1.7.0",
"react-hook-form": "7.62.0",
"react-icons": "^5.5.0",
"rebuild": "0.1.2",
@@ -104,8 +104,8 @@
"source-map-support": "0.5.21",
"swagger-ui-express": "^5.0.1",
"tailwind-merge": "3.3.1",
"tw-animate-css": "^1.3.7",
"uuid": "^11.1.0",
"tw-animate-css": "^1.3.8",
"uuid": "^13.0.0",
"vaul": "1.1.2",
"winston": "3.17.0",
"winston-daily-rotate-file": "5.0.0",
@@ -117,7 +117,7 @@
"devDependencies": {
"@dotenvx/dotenvx": "1.49.0",
"@esbuild-plugins/tsconfig-paths": "0.1.2",
"@tailwindcss/postcss": "^4.1.12",
"@tailwindcss/postcss": "^4.1.13",
"@types/better-sqlite3": "7.6.12",
"@types/cookie-parser": "1.4.9",
"@types/cors": "2.8.19",
@@ -127,12 +127,12 @@
"@types/jmespath": "^0.15.2",
"@types/js-yaml": "4.0.9",
"@types/jsonwebtoken": "^9.0.10",
"@types/node": "^24",
"@types/nodemailer": "6.4.17",
"@types/node": "24.4.0",
"@types/nodemailer": "7.0.1",
"@types/pg": "8.15.5",
"@types/react": "19.1.12",
"@types/react": "19.1.13",
"@types/react-dom": "19.1.9",
"@types/semver": "^7.7.0",
"@types/semver": "^7.7.1",
"@types/swagger-ui-express": "^4.1.8",
"@types/ws": "8.18.1",
"@types/yargs": "17.0.33",
@@ -140,12 +140,12 @@
"esbuild": "0.25.9",
"esbuild-node-externals": "1.18.0",
"postcss": "^8",
"react-email": "4.2.8",
"react-email": "4.2.11",
"tailwindcss": "^4.1.4",
"tsc-alias": "1.8.16",
"tsx": "4.20.5",
"typescript": "^5",
"typescript-eslint": "^8.40.0"
"typescript-eslint": "^8.43.0"
},
"overrides": {
"emblor": {

View File

@@ -1,6 +1,6 @@
#! /usr/bin/env node
import "./extendZod.ts";
import 'source-map-support/register.js'
import 'source-map-support/register.js';
import { runSetupFunctions } from "./setup";
import { createApiServer } from "./apiServer";

View File

@@ -1,7 +1,6 @@
interface AccessLayoutProps {
children: React.ReactNode;
params: Promise<{
resourceId: number | string;
orgId: string;
}>;
}

View File

@@ -10,7 +10,7 @@ import { HorizontalTabs } from "@app/components/HorizontalTabs";
type SettingsLayoutProps = {
children: React.ReactNode;
params: Promise<{ clientId: number; orgId: string }>;
params: Promise<{ clientId: number | string; orgId: string }>;
}
export default async function SettingsLayout(props: SettingsLayoutProps) {

View File

@@ -1,7 +1,7 @@
import { redirect } from "next/navigation";
export default async function ClientPage(props: {
params: Promise<{ orgId: string; clientId: number }>;
params: Promise<{ orgId: string; clientId: number | string }>;
}) {
const params = await props.params;
redirect(`/${params.orgId}/settings/clients/${params.clientId}/general`);