Skip to content

Dev ii #19

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
caxtonacollins merged 2 commits into from
Apr 9, 2026
Merged

Dev ii #19

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
4f35b9a
chore: move round info to top left
caxtonacollins Apr 9, 2026
34d774a
fix: fix round entities
caxtonacollins Apr 9, 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
5 changes: 2 additions & 3 deletions backend/src/entities/round.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
CreateDateColumn,
UpdateDateColumn,
} from 'typeorm';
import { PlayerBet } from './player-bet.entity.js';

export type GamePhase = 'BETTING' | 'FLYING' | 'CRASHED';

Expand Down Expand Up @@ -51,8 +50,8 @@
@Column({ type: 'jsonb', nullable: true })
planePosition!: { x: number; y: number } | null;

@OneToMany(() => PlayerBet, (bet: PlayerBet) => bet.round, { cascade: true })
players!: PlayerBet[];
@OneToMany('PlayerBet', 'round', { cascade: true })
players!: any[];

Check warning on line 54 in backend/src/entities/round.entity.ts

View workflow job for this annotation

GitHub Actions / backend 

Unexpected any. Specify a different type

@CreateDateColumn()
createdAt!: Date;
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/RoundInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const RoundInfo: React.FC = () => {
};

return (
<div className="absolute top-2 right-2 sm:top-3 sm:right-3 bg-black/30 backdrop-blur-md px-2 sm:px-3 py-1.5 sm:py-2 rounded-lg border border-green-500/10 shadow-lg max-w-[45vw] sm:max-w-[200px] z-30 transition-opacity hover:bg-black/50">
<div className="absolute -top-10 left-2 sm:top-3 sm:right-3 sm:left-auto sm:-top-0 bg-black/30 backdrop-blur-md px-2 sm:px-3 py-1.5 sm:py-2 rounded-lg border border-green-500/10 shadow-lg max-w-[45vw] sm:max-w-[200px] z-30 transition-opacity hover:bg-black/50">
<div className="text-[10px] sm:text-xs text-gray-400 font-medium leading-tight font-orbitron">
Round #{roundData?.roundId || 0}
</div>
Expand Down
4 changes: 2 additions & 2 deletions frontend/components/nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const Nav = () => {
alt="Plane"
width={48}
height={48}
className="w-12 h-12"
className="w-12 h-12 hidden sm:block"
/>
{isMobile() ? null : (
<span className="font-bold text-xl text-red-800 font-orbitron uppercase tracking-wider">
Expand All @@ -86,7 +86,7 @@ const Nav = () => {
alt="Plane"
width={48}
height={48}
className="w-12 h-12"
className="w-12 h-12 hidden sm:block"
/>
{isMobile() ? null : (
<span className="font-bold text-xl text-red-800 font-orbitron uppercase tracking-wider">
Expand Down
Loading