Skip to content

130 fix dono goal in dono page to reflect real goal remove placeholder #131

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
aaronashby merged 2 commits into from
Jun 11, 2026
Merged

130 fix dono goal in dono page to reflect real goal remove placeholder #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f0c975
fix: EditDonationGoal overflow bug
thaninbew Jun 11, 2026
09f4954
refactor: rename goal columns to prevent confusion; + feat: only admi…
thaninbew Jun 11, 2026
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
2 changes: 1 addition & 1 deletion apps/backend/src/donations/goal.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export class Goal {
})
id!: number;

@Column({ type: 'int' })
@Column({ name: 'admin_target_amount', type: 'int' })
targetAmount!: number;

@Column({ type: 'text', nullable: true })
Expand Down
15 changes: 15 additions & 0 deletions apps/backend/src/migrations/1781161660-rename-goal-columns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class RenameGoalColumns1781161660 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "goals" RENAME COLUMN "targetAmount" TO "admin_target_amount"`,
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "goals" RENAME COLUMN "admin_target_amount" TO "targetAmount"`,
);
}
}
14 changes: 7 additions & 7 deletions apps/frontend/src/components/DonationGoal/EditDonationGoal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ export default function EditDonationGoal({

return (
<div
className="flex aspect-[7/10] w-full flex-col gap-3 rounded-[10px] border border-[#E5E5E5] bg-[#FCFCFC] p-4 font-['Source_Sans_Pro'] shadow-[0px_4px_12px_rgba(0,0,0,0.1)]"
className="flex h-full w-full flex-col gap-3 overflow-y-auto rounded-[10px] border border-[#E5E5E5] bg-[#FCFCFC] p-4 font-['Source_Sans_Pro'] shadow-[0px_4px_12px_rgba(0,0,0,0.1)]"
onClick={(e) => e.stopPropagation()}
>
{/* Header */}
<div className="mb-1 flex w-full items-start justify-between border-b border-[#E5E5E5] pb-2">
<div className="mb-1 flex w-full shrink-0 items-start justify-between border-b border-[#E5E5E5] pb-2">
<h4 className="text-[18px] font-semibold leading-tight tracking-[-0.2px] text-black">
Edit Donation Goal
</h4>
Expand All @@ -72,7 +72,7 @@ export default function EditDonationGoal({
</div>

{/* Title Field */}
<div className="flex w-full flex-col gap-1">
<div className="flex w-full shrink-0 flex-col gap-1">
<label className="text-[13px] font-normal leading-tight text-[#171717]">
Title displayed on{' '}
<span className="font-bold">live donation site</span>
Expand All @@ -90,7 +90,7 @@ export default function EditDonationGoal({
</div>

{/* Goal Amount Field */}
<div className="flex w-full flex-col gap-1">
<div className="flex w-full shrink-0 flex-col gap-1">
<div className="flex w-full items-center justify-between">
<label className="text-[13px] font-normal leading-tight text-[#171717]">
Goal Amount
Expand All @@ -115,7 +115,7 @@ export default function EditDonationGoal({
</div>

{/* Start Date Field */}
<div className="flex w-full flex-col gap-1">
<div className="flex w-full shrink-0 flex-col gap-1">
<label className="text-[13px] font-normal leading-tight text-[#171717]">
Start Date
</label>
Expand All @@ -136,7 +136,7 @@ export default function EditDonationGoal({
</div>

{/* End Date Field */}
<div className="flex w-full flex-col gap-1">
<div className="flex w-full shrink-0 flex-col gap-1">
<label className="text-[13px] font-normal leading-tight text-[#171717]">
End Date
</label>
Expand All @@ -159,7 +159,7 @@ export default function EditDonationGoal({
<div className="flex-grow" />

{/* Bottom Buttons */}
<div className="flex w-full gap-2">
<div className="mt-auto flex w-full shrink-0 gap-2 pt-2">
<button
type="button"
onClick={onCancel}
Expand Down
13 changes: 12 additions & 1 deletion apps/frontend/src/containers/dashboard/sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use client';

import { Link, useLocation } from 'react-router-dom';
import { useAuth } from '../../../components/AuthProvider';
import {
Bookmark,
ListFilter,
Expand Down Expand Up @@ -58,6 +59,16 @@ type SidebarProps = {

export default function Sidebar({ className }: SidebarProps) {
const { pathname } = useLocation();
const { user } = useAuth();

const isAdmin = user?.status === 'ADMIN';

const filteredNavItems = navItems.filter((item) => {
if (item.href === '/dashboard/approval') {
return isAdmin;
}
return true;
});

return (
<aside
Expand All @@ -76,7 +87,7 @@ export default function Sidebar({ className }: SidebarProps) {
</div>

<nav className="flex w-full flex-col gap-0.05 px-4 pt-8">
{navItems.map((item) => {
{filteredNavItems.map((item) => {
const isActive = pathname === item.href;

return (
Expand Down
Loading