Skip to content
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.

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

Bugfix/72/delete periods & small fixes #151

Merged
merged 2 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified .yarn/install-state.gz
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- DropForeignKey
ALTER TABLE "Application" DROP CONSTRAINT "Application_applicationPeriodId_fkey";

-- AddForeignKey
ALTER TABLE "Application" ADD CONSTRAINT "Application_applicationPeriodId_fkey" FOREIGN KEY ("applicationPeriodId") REFERENCES "ApplicationPeriod"("id") ON DELETE CASCADE ON UPDATE CASCADE;
2 changes: 1 addition & 1 deletion apps/backend/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ model Application {
id Int @id @default(autoincrement())
user User @relation(fields: [userId], references: [authSchId])
userId String
applicationPeriod ApplicationPeriod @relation(fields: [applicationPeriodId], references: [id])
applicationPeriod ApplicationPeriod @relation(fields: [applicationPeriodId], references: [id], onDelete: Cascade)
applicationPeriodId Int
status ApplicationStatus @default(SUBMITTED)
createdAt DateTime @default(now())
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/ui/BodyMemberTile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function BodyMemberTile({ userEntity, simple }: Props) {
className='h-36 rounded'
onError={({ currentTarget }) => {
currentTarget.onerror = null; // prevents looping
currentTarget.src = 'default_pfp.jpg';
currentTarget.src = '/default_pfp.jpg';
}}
/>
<div className='flex flex-col gap-4 ml-4 mt-2'>
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/ui/StatusBadge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default function StatusBadge({ status }: Readonly<{ status: ApplicationSt
}, [convertedStatus]);

return (
<Badge variant={color} hover>
<Badge variant={color} hover={false}>
<div className='py-1 pr-2'>{icon}</div>
{ApplicationStatus[convertedStatus]}
</Badge>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export default function SubmittedApplicationBannerCard({ user, application, curr
<CardHeader className='md:flex-row max-md:flex-col justify-between gap-2 md:items-start p-2'>
{!currentPeriod && <CardTitle className='m-4'>Utolsó jelentkezésed</CardTitle>}
{currentPeriod && (
<div className='flex flex-col gap-4 justify-start '>
<CardTitle className='m-4'> Leadott jelentkezés </CardTitle>
<div className='flex flex-col gap-4 justify-start m-4'>
<CardTitle> Leadott jelentkezés </CardTitle>
<p>
A most zajló, <span className='font-bold'>{currentPeriod.name}</span> időszakra már sikeresen
jelentkeztél!
Expand Down
4 changes: 3 additions & 1 deletion apps/frontend/src/components/ui/Ticket.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ export default function Ticket({ user }: { user: UserEntity }) {
<TooltipTrigger asChild>
<Card className='flex gap-2 p-2 bg-red-200 relative rounded-sm'>
<Image
src={`${process.env.NEXT_PUBLIC_API_URL}/users/${user.authSchId}/profile-picture?cb=${Date.now()} `}
src={`${process.env.NEXT_PUBLIC_API_URL}/users/${user.authSchId}/profile-picture?cb=${Date.now()}`}
className='min-w-[65px] w-[65px] h-[90px] overflow-hidden rounded-sm object-cover'
alt='kep'
width={65}
height={90}
/>
<div>
<CardTitle className='max-w-40 text-lg overflow-hidden whitespace-nowrap'>{user.fullName}</CardTitle>
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/ui/badge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as React from 'react';
import { cn } from '@/lib/utils';

const badgeVariants = cva(
'inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2',
'inline-flex items-center rounded-full border px-2.5 py-0.5 text-sm font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2',
{
variants: {
variant: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
"workspaces": [
"apps/*"
],
"packageManager": "[email protected].1"
"packageManager": "[email protected].3"
}
Loading