Skip to content

Commit b1e7993

Browse files
authored
Merge pull request #131 from DataScience-GT/feature/member-site
Feature: feature/member-site to dev
2 parents 0d80b55 + 28f06f1 commit b1e7993

43 files changed

Lines changed: 2731 additions & 3198 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package.json

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "query",
33
"private": true,
44
"version": "1.0.0",
5-
"packageManager": "pnpm@10.28.1",
5+
"packageManager": "pnpm@10.4.1",
66
"engines": {
77
"node": ">=20.16.0 <23",
88
"pnpm": ">=9"
@@ -24,50 +24,57 @@
2424
},
2525
"dependencies": {
2626
"@query/db": "workspace:*",
27-
"@tanstack/react-router": "^1.141.2",
28-
"autoprefixer": "^10.4.22",
29-
"chart.js": "^4.5.1",
30-
"csv-parse": "^6.1.0",
31-
"minimatch": "^10.2.3",
32-
"next": "^16.2.1",
33-
"postcss": "^8.5.6",
34-
"react": "^19.0.0",
35-
"react-dom": "^19.0.0"
27+
"@tanstack/react-router": "1.141.2",
28+
"autoprefixer": "10.4.22",
29+
"chart.js": "4.5.1",
30+
"csv-parse": "6.1.0",
31+
"minimatch": "10.2.3",
32+
"next": "16.2.1",
33+
"postcss": "8.5.6",
34+
"react": "19.0.0",
35+
"react-dom": "19.0.0"
3636
},
3737
"devDependencies": {
3838
"@query/eslint-config": "workspace:*",
3939
"@query/prettier-config": "workspace:*",
4040
"@query/tailwind-config": "workspace:*",
4141
"@query/tsconfig": "workspace:*",
42-
"@tailwindcss/postcss": "^4.1.18",
43-
"@tanstack/react-query": "^5.90.12",
44-
"@trpc/client": "^11.7.2",
45-
"@trpc/react-query": "^11.7.2",
46-
"@trpc/server": "^11.8.0",
47-
"@turbo/gen": "^2.1.3",
48-
"@types/node": "^22.19.2",
49-
"@types/react": "^19.0.0",
50-
"@types/react-dom": "^19.0.0",
51-
"prettier": "^3.3.3",
52-
"tsx": "^4.21.0",
53-
"turbo": "^2.6.3",
42+
"@tailwindcss/postcss": "4.1.18",
43+
"@tanstack/react-query": "5.90.12",
44+
"@trpc/client": "11.8.0",
45+
"@trpc/react-query": "11.8.0",
46+
"@trpc/server": "11.8.0",
47+
"@turbo/gen": "2.1.3",
48+
"@types/node": "22.19.2",
49+
"@types/react": "19.0.0",
50+
"@types/react-dom": "19.0.0",
51+
"prettier": "3.3.3",
52+
"tsx": "4.21.0",
53+
"turbo": "2.6.3",
5454
"typescript": "^6.0.0",
55-
"zod": "^3.23.8"
55+
"zod": "3.23.8"
5656
},
5757
"prettier": "@query/prettier-config",
5858
"pnpm": {
5959
"overrides": {
6060
"basic-ftp": ">=5.2.0",
6161
"minimatch": ">=10.2.3",
62-
"next": "^16.2.1",
63-
"ajv": "^8.12.0",
62+
"next": "16.2.1",
6463
"js-yaml": ">=4.1.0",
6564
"esbuild": ">=0.25.0",
6665
"qs": ">=6.14.2",
6766
"tmp": ">=0.2.3",
6867
"rollup": ">=4.59.0",
6968
"immutable": ">=5.1.5",
70-
"undici": ">=6.23.0"
69+
"undici": ">=6.24.0",
70+
"flatted": "3.4.2",
71+
"picomatch": ">=2.3.2",
72+
"handlebars": ">=4.7.9",
73+
"brace-expansion": ">=5.0.5",
74+
"nodemailer": ">=8.0.4",
75+
"ipaddr.js": ">=2.2.1",
76+
"typescript": "^6.0.0",
77+
"eslint": "9.17.0"
7178
}
7279
}
7380
}

packages/api/eslint.config.mjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { config } from "@query/eslint-config/base";
2+
3+
/** @type {import("eslint").Linter.Config[]} */
4+
export default config;

packages/api/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@
2323
"dependencies": {
2424
"@query/auth": "workspace:*",
2525
"@query/db": "workspace:*",
26-
"@tanstack/react-query": "^5.90.12",
27-
"@trpc/client": "^11.7.2",
28-
"@trpc/next": "^11.7.2",
29-
"@trpc/react-query": "^11.7.2",
30-
"@trpc/server": "^11.7.2",
31-
"drizzle-orm": "^0.36.4",
32-
"image-size": "^2.0.2",
33-
"minimatch": "^10.2.1",
34-
"sanitize-html": "^2.17.0",
35-
"superjson": "^2.2.6",
36-
"zod": "^3.23.8"
26+
"@tanstack/react-query": "5.90.12",
27+
"@trpc/client": "11.8.0",
28+
"@trpc/next": "11.8.0",
29+
"@trpc/react-query": "11.8.0",
30+
"@trpc/server": "11.8.0",
31+
"drizzle-orm": "0.36.4",
32+
"image-size": "2.0.2",
33+
"minimatch": "10.2.3",
34+
"sanitize-html": "2.17.0",
35+
"superjson": "2.2.6",
36+
"zod": "3.23.8"
3737
},
3838
"devDependencies": {
3939
"@query/tsconfig": "workspace:*",
40-
"@types/sanitize-html": "^2.16.0",
41-
"typescript": "^6.0.0",
42-
"vitest": "^4.0.18"
40+
"@types/sanitize-html": "2.16.0",
41+
"typescript": "5.7.2",
42+
"vitest": "4.0.18"
4343
}
4444
}

packages/api/src/middleware/security.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,9 @@ async function flushLogs() {
300300
}
301301

302302
// Start flush timer
303-
if (!flushTimer) {
304-
flushTimer = setInterval(() => {
305-
void flushLogs();
306-
}, FLUSH_INTERVAL);
307-
}
303+
setInterval(() => {
304+
void flushLogs();
305+
}, FLUSH_INTERVAL);
308306

309307
export function logSecurityEvent(event: Omit<SecurityEvent, 'timestamp'>) {
310308
// Keep in-memory for immediate/short-term checks

packages/api/src/routers/audit.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { z } from "zod";
22
import { createTRPCRouter } from "../trpc";
3-
import { auditLogs, securitySeverityEnum } from "@query/db";
3+
import { auditLogs } from "@query/db";
44
import { isAdmin } from "../middleware/procedures";
55
import { desc, eq, and, sql } from "drizzle-orm";
66

packages/api/src/routers/hackathon.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import {
1111
hackathonEventAttendees,
1212
} from "@query/db";
1313
import { eq, and, gte, sql, inArray } from "drizzle-orm";
14-
import { CacheKeys } from "../middleware/cache";
1514
import { isAdmin } from "../middleware/procedures";
15+
import { CacheKeys } from "../middleware/cache";
1616

1717
export const hackathonRouter = createTRPCRouter({
1818
list: publicProcedure

packages/api/src/routers/member.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { TRPCError } from "@trpc/server";
33
import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";
44
import { members, membershipHistory } from "@query/db";
55
import { eq, and } from "drizzle-orm";
6-
import { CacheKeys } from "../middleware/cache";
76

87
const nameSchema = z.string().min(1).max(100).regex(/^[a-zA-Z\s'-]+$/, "Invalid name format");
98
const urlSchema = z.string().url().max(500).optional();

packages/api/src/routers/stripe.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Stripe from "stripe";
88

99
const stripe = process.env.STRIPE_SECRET_KEY
1010
? new Stripe(process.env.STRIPE_SECRET_KEY, {
11-
apiVersion: "2025-12-15.clover",
11+
apiVersion: "2026-02-25.clover",
1212
})
1313
: null;
1414

packages/api/src/trpc.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import superjson from "superjson";
33
import { ZodError } from "zod";
44
import type { Context } from "./context";
55
import { rateLimit, RATE_LIMITS, sanitizeInput, logSecurityEvent, ddosProtection, validateRequestSize } from "./middleware/security";
6-
import { CacheKeys } from "./middleware/cache";
76

87
const t = initTRPC.context<Context>().create({
98
transformer: superjson,

packages/auth/eslint.config.mjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { config } from "@query/eslint-config/base";
2+
3+
/** @type {import("eslint").Linter.Config[]} */
4+
export default config;

0 commit comments

Comments
 (0)