Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

Merge branch 'dev' into test

LinkinStars6da9d718cc0b
diff --cc ui/src/pages/Users/Personal/components/Overview/index.tsx
index 81ed7b32,7f937f68..3c1f590e
--- a/ui/src/pages/Users/Personal/components/Overview/index.tsx
+++ b/ui/src/pages/Users/Personal/components/Overview/index.tsx
@@@ -71,24 -74,24 +74,26 @@@ const Index: FC<Props> = ({ visible, in
</Col>
</Row>
- {Number(recentBadges?.count) > 0 && (
- <div className="mb-4">
- <h5 className="mb-3">{t('recent_badges')}</h5>
- <Row>
+ <div className="mb-5">
+ <h5 className="mb-3">{t('recent_badges')}</h5>
+ {Number(recentBadges?.count) > 0 ? (
+ <div className="d-flex flex-wrap" style={{ margin: '-12px' }}>
{recentBadges?.list?.map((item) => {
return (
- <CardBadge
- data={item}
- urlSearchParams={`username=${username}`}
- badgePillType="count"
- />
+ <Col sm={6} md={4} lg={3} key={item.id} className="mb-4">
+ <CardBadge
+ data={item}
+ urlSearchParams={`username=${username}`}
+ badgePillType="count"
+ />
+ </Col>
);
})}
- </Row>
- </div>
- )}
+ </div>
+ ) : (
+ <div className="mb-5">{t('content_empty')}</div>
+ )}
+ </div>
</div>
);
};