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.

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

add card images #24

Merged
merged 2 commits into from
Dec 1, 2024
Merged

add card images #24

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
9ff785e
add card images
danbastin Dec 1, 2024
92e282b
remove console log
danbastin Dec 1, 2024
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
7 changes: 7 additions & 0 deletions src/app/_components/_sharedcomponents/Cards/CardTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
interface CardSetId {
set: string;
number: number;
}

export interface CardData {
uuid: string;
id?: number;
Expand All @@ -14,6 +19,8 @@ export interface CardData {
cost?: number;
exhausted?: boolean;
damage?: number;
setId: CardSetId;
type: string;
}

export interface GameCardProps {
Expand Down
50 changes: 18 additions & 32 deletions src/app/_components/_sharedcomponents/Cards/GameCard/GameCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import {
import Image from "next/image";
import { GameCardProps, CardData } from "@/app/_components/_sharedcomponents/Cards/CardTypes";
import { useGame } from "@/app/_contexts/Game.context";
import { wrap } from "module";
import { text } from "stream/consumers";
import { s3CardImageURL } from "@/app/_utils/s3Assets";

const GameCard: React.FC<GameCardProps> = ({
card,
Expand All @@ -24,15 +23,16 @@ const GameCard: React.FC<GameCardProps> = ({

const cardBorderColor = (card: CardData) => {
if (card.selected) return "yellow";
if (card.selectable) return "green";
if (card.selectable) return "limegreen";
if (card.exhausted) return "gray";
return "";
}

const styles = {
cardWrapper: {
height: size === "standard" ? "9.36rem" : "8rem",
width: size === "standard" ? "6rem" : "8rem",
cardStyles: {
borderRadius: ".38em",
height: size === "standard" ? "10rem" : "8rem",
width: size === "standard" ? "7.18rem" : "8rem",
},
cardContentStyle: {
width: "100%",
Expand All @@ -41,6 +41,12 @@ const GameCard: React.FC<GameCardProps> = ({
padding: ".5em",
textAlign: "center",
whiteSpace: "normal",
backgroundColor: "black",
backgroundImage: `url(${s3CardImageURL(card)})`,
backgroundSize: size === "standard" ? "contain" : "cover",
backgroundPosition: size === "standard" ? "center" : "top",
backgroundRepeat: "no-repeat",
border: `2px solid ${cardBorderColor(card)}`,
},
imageStyle: {
width: "2.5rem",
Expand All @@ -55,39 +61,19 @@ const GameCard: React.FC<GameCardProps> = ({
}

return (
<MuiCard sx={{ backgroundColor: cardBorderColor(card) }}
<MuiCard sx={styles.cardStyles}
onClick={() => {
if (card.selectable) {
sendGameMessage(["cardClicked", card.uuid]);
}
}}
>
{isFaceUp ? (
<CardActionArea sx={styles.cardWrapper}>
<CardContent sx={styles.cardContentStyle}>
<Box sx={{ display: 'flex', flexDirection: 'column', height: "100%"}}>
<Box sx={{ display: 'flex', justifyContent: 'space-between', flex: 1}}>
<Typography variant="body1" component="span" sx={{...styles.typographyStyle, color: 'goldenrod'}}>
{card.cost}
</Typography>
<Typography variant="body1" component="span" sx={{...styles.typographyStyle, color: 'hotpink'}}>
{card.damage}
</Typography>
</Box>
<Typography variant="body1" component="span" sx={styles.typographyStyle}>
{card.name}
</Typography>
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: "flex-end", flex: 1}}>
<Typography variant="body1" component="span" sx={{...styles.typographyStyle, color: 'red'}}>
{card.power}
</Typography>
<Typography variant="body1" component="span" sx={{...styles.typographyStyle, color: 'blue'}}>
{card.hp}
</Typography>
</Box>
</Box>
</CardContent>
</CardActionArea>
<CardContent sx={styles.cardContentStyle}>
<Box sx={{ display: 'flex', flexDirection: 'column', height: "100%"}}>

</Box>
</CardContent>
) : (
<CardContent sx={styles.cardContentStyle}>
<Image
Expand Down
32 changes: 14 additions & 18 deletions src/app/_components/_sharedcomponents/Cards/LeaderBaseCard/LeaderBaseCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
import { LeaderBaseCardProps } from "../CardTypes";
import { CardData } from "../CardTypes";
import { useGame } from "@/app/_contexts/Game.context";
import { s3CardImageURL } from "@/app/_utils/s3Assets";


const LeaderBaseCard: React.FC<LeaderBaseCardProps> = ({
Expand All @@ -20,25 +21,25 @@ const LeaderBaseCard: React.FC<LeaderBaseCardProps> = ({
const cardBorderColor = (card: CardData) => {
if (!card) return "";
if (card.selected) return "yellow";
if (card.selectable) return "green";
if (card.selectable) return "limegreen";
if (card.exhausted) return "gray";
return "black";
};

const cardStyle = {
backgroundColor: cardBorderColor(card),
width: isLobbyView ? "18vw" : "12vw",
height: isLobbyView ? "18vh" : "11vh",
backgroundColor: "black",
backgroundImage: `url(${s3CardImageURL(card)})`,
backgroundSize: "contain",
backgroundPosition: "center",
width: "10rem",
height: "7.18rem",
textAlign: "center",
color: "white",
display: "flex",
backdropFilter: "blur(20px)",
"&:hover": {
backgroundColor: "#708090E6",
},
cursor: "pointer",
m: "0em",
position: "relative", // Needed for positioning the red box
border: `2px solid ${cardBorderColor(card)}`,
};

const typographyStyle = {
Expand Down Expand Up @@ -102,16 +103,11 @@ const LeaderBaseCard: React.FC<LeaderBaseCardProps> = ({
}
}}
>
<CardActionArea>
<CardContent>
<Box sx={{ display: "flex", justifyContent: "end" }}>
<Typography variant="body1" sx={damageStyle}>{card.damage}</Typography>
</Box>
<Typography variant="body1" sx={typographyStyle}>
{card.name}
</Typography>
</CardContent>
</CardActionArea>
<CardContent>
<Box sx={{ display: "flex", justifyContent: "end" }}>
<Typography variant="body1" sx={damageStyle}>{card.damage}</Typography>
</Box>
</CardContent>

{/* Show title inside a red box at the bottom if not in lobby view and variant is leader */}
{variant === "leader" && !isLobbyView && title && (
Expand Down
1 change: 1 addition & 0 deletions src/app/_components/_sharedcomponents/LeaderBaseBoard/LeaderBase/LeaderBase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import Grid from "@mui/material/Grid2";
import LeaderBaseCard from "../../Cards/LeaderBaseCard/LeaderBaseCard";
import { LeaderBaseProps } from "../LeaderBaseBoardTypes";
import { useGame } from "@/app/_contexts/Game.context";
import { s3CardImageURL } from "@/app/_utils/s3Assets";

const LeaderBase: React.FC<LeaderBaseProps> = ({
player,
Expand Down
8 changes: 8 additions & 0 deletions src/app/_utils/s3Assets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
import { CardData } from "../_components/_sharedcomponents/Cards/CardTypes";

export const s3ImageURL = (path: string) => {
const s3Bucket = "https://karabast-assets.s3.amazonaws.com/";
return s3Bucket + path;
};

export const s3CardImageURL = (card: CardData) => {
if (!card) return "game/epic-action-token.webp";
const cardNumber = card.setId.number.toString().padStart(3, "0") + (card.type === "leaderUnit" ? "-portrait" : "");
return s3ImageURL(`cards/${card.setId.set}/${cardNumber}.webp`);
};