Skip to content

Commit

Permalink
Merge branch 'develop' of https://i10d111.p.ssafy.io:8989/S10P12D111
Browse files Browse the repository at this point in the history
…into develop

Change-Id: Iba4cde6a5c4ef714ba7a3293de16fe6c931ea10d
  • Loading branch information
jjjoina committed Feb 7, 2024
2 parents 79bd429 + 7572827 commit c36cad1
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 150 deletions.
210 changes: 61 additions & 149 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/src/pages/UserPage/components/Feed/BucketFeed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const BucketFeed = () => {
</div>

{/* 버킷 */}
<ProfileBucket title={bucketTitle} color={color} dayCount={dayCount} isLock={null} />
<ProfileBucket isLoading={false} title={bucketTitle} color={color} dayCount={dayCount} isLock={null} />

{/* 태그 */}
<div className="bg-white">
Expand Down

0 comments on commit c36cad1

Please sign in to comment.