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.

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

feat: rewards #1579

Merged
merged 25 commits into from
Dec 12, 2024
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e7c876e
feat(RewardCard): change layout with container queries
BrickheadJohnny Dec 6, 2024
6ca5366
chore: update schemas
BrickheadJohnny Dec 6, 2024
6fda0da
feat: custom reward cards for permissions and points
BrickheadJohnny Dec 6, 2024
fd62fb6
feat: fetch real rewards data and add a simple reward leaderboard
BrickheadJohnny Dec 6, 2024
f9bd2b9
Merge branch 'add-guild-page' into rewards
BrickheadJohnny Dec 6, 2024
1476c42
fix: remove points name for now
BrickheadJohnny Dec 6, 2024
8ff689c
Merge branch 'add-guild-page' into rewards
BrickheadJohnny Dec 9, 2024
227c405
feat: separate join and leave guild components
BrickheadJohnny Dec 10, 2024
4c7f21c
feat: useGuild hook
BrickheadJohnny Dec 10, 2024
81d3c38
fix: add missing use client directives
BrickheadJohnny Dec 10, 2024
da7220f
feat: auth rework (#1581)
BrickheadJohnny Dec 10, 2024
4ed0ffc
feat: third party auth (#1582)
BrickheadJohnny Dec 10, 2024
679da40
Merge branch 'add-guild-page' into rewards
BrickheadJohnny Dec 11, 2024
e01371f
fix: invalidate queries when signing in/out
BrickheadJohnny Dec 11, 2024
bbe0179
feat: join modal
BrickheadJohnny Dec 11, 2024
c4292ab
feat: DiscordRewardCard
BrickheadJohnny Dec 11, 2024
0cbbfdc
cleanup(RoleCard): remove unnecessary TODO comments
BrickheadJohnny Dec 12, 2024
3686ffe
feat: better identity-related types
BrickheadJohnny Dec 12, 2024
f34335b
fix(DiscordRewardCard): disabled state
BrickheadJohnny Dec 12, 2024
ac22552
fix(ConnectResultToast): show toast only after platform connection
BrickheadJohnny Dec 12, 2024
ee5cf51
fix(PointsRewardCard): don't use pathname for navigation
BrickheadJohnny Dec 12, 2024
f3a4c6c
fix(rewardCards): add proper types
BrickheadJohnny Dec 12, 2024
8c4d465
feat(leaderboard): display points' name
BrickheadJohnny Dec 12, 2024
a5c591b
feat(leaderboard): display user addresses & "Your position" section
BrickheadJohnny Dec 12, 2024
a84095d
feat(DiscordRewardCard): more detailed tooltip message
BrickheadJohnny Dec 12, 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
Prev Previous commit
Next Next commit
cleanup(RoleCard): remove unnecessary TODO comments
  • Loading branch information
BrickheadJohnny committed Dec 12, 2024
commit 0cbbfdc3496b0bf00df7c38966d8f567749927c0
3 changes: 1 addition & 2 deletions src/app/(dashboard)/[guildUrlName]/[pageUrlName]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const RoleCard = ({ role }: { role: Role }) => (
{role.imageUrl ? (
<img
className="size-14 rounded-full border"
src={role.imageUrl} // TODO: fallback image
src={role.imageUrl}
alt="role avatar"
/>
) : (
Expand Down Expand Up @@ -104,7 +104,6 @@ const RoleRewards = ({ roleRewards }: { roleRewards: Role["rewards"] }) => {
return roleRewards?.length > 0 && rewards?.length > 0 ? (
<div className="mt-auto grid @[26rem]:grid-cols-2 gap-2">
{roleRewards.map((roleReward) => {
// TODO: How to find guildRewards?
const guildReward = rewards.find((gr) => gr.id === roleReward.rewardId);
if (!guildReward) return null;

Expand Down