Skip to content

Feature/react fe #33

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
OutsideofemiT merged 3 commits into from
Apr 28, 2025
Merged

Feature/react fe #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d04d008
Merge branch 'main' of https://github.com/Treevyy/Codezilla into feat…
hazyplebian Apr 26, 2025
e71ce51
Merge branch 'main' of https://github.com/Treevyy/Codezilla into feat…
hazyplebian Apr 28, 2025
0a55a13
better pathing for images in GameOver and Victory pages
hazyplebian Apr 28, 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
Binary file added client/background/confetti_image.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 3 additions & 9 deletions client/src/components/screens/GameOver.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
import './codezilla.css';

const GameOverPage = ({
backgroundUrl = '/assets/background.jpg',
logoUrl = '/assets/codezilla-logo.png',
avatarUrl = '/assets/player-avatar.png',
codezillaUrl = '/assets/codezilla.png',
backgroundUrl = 'client/background/codezilla_bkgd.png',
avatarUrl = 'client/avatars/avatar4.png',
codezillaUrl = 'client/minions/codezilla2.png',
}) => {
return (
<div
className="game-over-page"
style={{ backgroundImage: `url(${backgroundUrl})` }}
>
<img
className="game-over-logo"
src={logoUrl}
alt="Codezilla Logo"
/>

<div className="game-over-container">
<h1 className="game-over-title">Game Over!</h1>
Expand Down
12 changes: 3 additions & 9 deletions client/src/components/screens/Victory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
import './codezilla.css';

export default function VictoryPage({
backgroundUrl = '/assets/background.jpg',
logoUrl = '/assets/codezilla-logo.png',
avatarUrl = '/assets/player-avatar.png',
confettiUrl = '/assets/confetti.png',
backgroundUrl = 'client/background/codezilla_bkgd.png',
avatarUrl = 'client/avatars/avatar4.png',
confettiUrl = 'client/background/confetti_image.jpg',
}) {
return (
<div
className="victory-page"
style={{ backgroundImage: `url(${backgroundUrl})` }}
>
<img
className="victory-logo"
src={logoUrl}
alt="Codezilla Logo"
/>

<div className="victory-container">
{/* Confetti overlay */}
Expand Down
Loading