Skip to content
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 removed public/pets/EGG_0.png
Binary file not shown.
Binary file removed public/pets/EGG_1.png
Binary file not shown.
Binary file modified public/pets/EGG_1_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/pets/EGG_2_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/pets/GROWN_0.png
Binary file not shown.
Binary file removed public/pets/GROWN_1.png
Binary file not shown.
Binary file modified public/pets/GROWN_1_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/pets/GROWN_2_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/pets/HATCH_0.png
Binary file not shown.
Binary file removed public/pets/HATCH_1.png
Binary file not shown.
Binary file modified public/pets/HATCH_1_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/pets/HATCH_2_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/pages/Profile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ const Profile = ({ userInfo }) => {

// 티어 아이콘 매핑
const tierEmojis = {
SEED: "🌱",
SPROUT: "🌿",
SEED: "🫘",
SPROUT: "🌱",
FLOWER: "🌺",
FRUIT: "🍎",
TREE: "🌳",
Expand Down Expand Up @@ -153,7 +153,7 @@ const Profile = ({ userInfo }) => {
<div className="pet-section">
<div className="pet-frame">
<img
src={`/pets/${userInfo.petGrow}_0_128.png`}
src={`/pets/${userInfo.petGrow}_${userInfo.petType}_128.png`}
alt="Pet"
className={`pet-image animated-pet ${isRefreshing ? 'refreshing' : ''}`}
/>
Expand Down
10 changes: 9 additions & 1 deletion src/pages/profile.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
width: 100%;
background-color: white;
border-radius: 12px;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.1);
padding: 24px;
margin-bottom: 32px;
box-sizing: border-box;
Expand All @@ -18,9 +18,16 @@
transform: translateY(-2px);
}

h2 {
color: #222222;
}

/* Pet section styling */
.pet-section {
position: relative;
display: flex ;
justify-content: center;
width: 170px;
flex-shrink: 0;
}

Expand Down Expand Up @@ -75,6 +82,7 @@
display: flex;
flex-direction: column;
gap: 12px;
padding-left:10px;
}

.user-header {
Expand Down