Skip to content

Prod push deps #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joeboppell merged 11 commits into from
Oct 25, 2025
Merged

Prod push deps #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9ad3c6b
Update nextjs monorepo to v16
renovate[bot] Oct 24, 2025
56bb1b3
Refactor font imports in globals.css for consistency
kensac Oct 24, 2025
5175b99
Merge pull request #417 from Hack-PSU/renovate/major-nextjs-monorepo
kensac Oct 24, 2025
cb08232
Update dependency @posthog/nextjs-config to v1.3.6 (#416)
renovate[bot] Oct 24, 2025
46ffecd
Update dependency @types/node to v24.9.1 (#406)
renovate[bot] Oct 25, 2025
1eea4e8
Update dependency lint-staged to v16.2.6 (#399)
renovate[bot] Oct 25, 2025
30b7500
Update dependency posthog-node to v5.10.3 (#404)
renovate[bot] Oct 25, 2025
e8ae398
Update dependency knip to v5.66.3 (#420)
renovate[bot] Oct 25, 2025
88cc2a3
fixed user category
JeremiahO89 Oct 25, 2025
51f021c
Update dependency swiper to v12.0.3 (#408)
renovate[bot] Oct 25, 2025
6c0f140
Merge pull request #421 from Hack-PSU/reimbursement_form_fix
joeboppell Oct 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@heroicons/react": "^2.0.18",
"@mui/icons-material": "^6.0.0",
"@mui/material": "^6.4.4",
"@next/third-parties": "^15.3.1",
"@next/third-parties": "^16.0.0",
"@posthog/nextjs-config": "^1.0.2",
"@radix-ui/react-avatar": "^1.1.10",
"@radix-ui/react-checkbox": "^1.3.2",
Expand Down Expand Up @@ -46,7 +46,7 @@
"clsx": "^2.1.1",
"cmdk": "^1.1.1",
"eslint": "9.38.0",
"eslint-config-next": "15.5.6",
"eslint-config-next": "16.0.0",
"firebase": "^12.0.0",
"form-data": "^4.0.0",
"framer-motion": "^12.0.0",
Expand All @@ -55,7 +55,7 @@
"lint-staged": "^16.0.0",
"lucide-react": "^0.546.0",
"luxon": "^3.4.2",
"next": "15.5.6",
"next": "16.0.0",
"posthog-js": "^1.257.0",
"posthog-node": "^5.5.1",
"prettier": "^3.3.3",
Expand Down
11 changes: 6 additions & 5 deletions src/app/(protected)/reimbursements/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
Status,
SubmitterType,
useCreateFinance,
Category,
UsersCategory
} from "@/lib/api/finance";
import { useFlagState } from "@/lib/api/flag/hook";

Expand Down Expand Up @@ -64,7 +64,7 @@ const reimbursementSchema = z.object({
required_error: "Description is required",
})
.min(5, "Description must be at least 5 characters"),
category: z.nativeEnum(Category, {
category: z.nativeEnum(UsersCategory, {
required_error: "Category is required",
}),
street: z
Expand Down Expand Up @@ -102,7 +102,7 @@ const BasicInfoStep = ({
}: {
control: any;
errors: any;
categories: Category[];
categories: UsersCategory[];
}) => (
<Grid container spacing={4} className="mb-6">
<Grid item xs={12} md={6}>
Expand Down Expand Up @@ -332,7 +332,8 @@ const NavigationButtons = ({

// ----- 3) Main ReimbursementPage Component -----
const steps = ["Basic Information", "Address Details", "Receipt Upload"];
const categories = Object.values(Category);
const categories = Object.values(UsersCategory
);

export default function ReimbursementPage() {
const [activeStep, setActiveStep] = useState(0);
Expand Down Expand Up @@ -371,7 +372,7 @@ export default function ReimbursementPage() {
},
defaultValues: {
amount: 0,
category: Category.Food,
category: UsersCategory.TravelTransportation,
description: "",
street: "",
city: "",
Expand Down
4 changes: 4 additions & 0 deletions src/lib/api/finance/entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ export enum SubmitterType {
ORGANIZER = "ORGANIZER",
}

export enum UsersCategory {
TravelTransportation = "Travel - Transportation"
}

export enum Category {
TelephoneRental = "Telephone Rental",
Postage = "Postage",
Expand Down
7 changes: 4 additions & 3 deletions src/styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@import url("https://fonts.googleapis.com/css?family=Lato:300,400,500,600,700");
@import url("https://fonts.googleapis.com/css2?family=Rye&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Monomaniac+One&display=swap");

@tailwind base;
@tailwind components;
@tailwind utilities;
Expand Down Expand Up @@ -31,9 +35,6 @@
animation: float-up linear infinite;
}

@import url("https://fonts.googleapis.com/css?family=Lato:300,400,500,600,700");
@import url("https://fonts.googleapis.com/css2?family=Rye&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Monomaniac+One&display=swap");

@layer base {
:root {
Expand Down
Loading