X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Fusers%2FBox.js;h=fd5814f6216896baa4dcdda3d7ee784c394b917d;hb=ff1f7c9fc9660ec838fb626cf6543201531020bb;hp=139e6f65573081dda97849ead6a0681b5ae292b4;hpb=edd0e97bfdc544114f30bf4c13a929631c44a555;p=alttp.git

diff --git a/resources/js/components/users/Box.js b/resources/js/components/users/Box.js
index 139e6f6..fd5814f 100644
--- a/resources/js/components/users/Box.js
+++ b/resources/js/components/users/Box.js
@@ -1,26 +1,50 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import { Button } from 'react-bootstrap';
 import { withTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
 
 import { getAvatarUrl } from '../../helpers/User';
 import i18n from '../../i18n';
 
-const Box = ({ user }) => user ?
-	<span className="user-box">
+const Box = ({ discriminator, noLink, user }) => {
+	const navigate = useNavigate();
+
+	if (!user) {
+		return <span>{i18n.t('general.anonymous')}</span>;
+	}
+
+	const content = <>
 		<img alt="" src={getAvatarUrl(user)} />
-		<span>{user.username}</span>
-		<span className="text-muted">
-			{'#'}
-			{user.discriminator}
-		</span>
-	</span>
-:
-	<span>{i18n.t('general.anonymous')}</span>
-;
+		<span>{discriminator || !user.nickname ? user.username : user.nickname}</span>
+		{discriminator && user.discriminator ?
+			<span className="text-muted">
+				{'#'}
+				{user.discriminator}
+			</span>
+		: null}
+	</>;
+
+	if (noLink) {
+		return <span className="user-box">{content}</span>;
+	}
+
+	return <Button
+		className="user-box"
+		onClick={() => navigate(`/users/${user.id}`)}
+		variant="link"
+	>
+		{content}
+	</Button>;
+};
 
 Box.propTypes = {
+	discriminator: PropTypes.bool,
+	noLink: PropTypes.bool,
 	user: PropTypes.shape({
 		discriminator: PropTypes.string,
+		id: PropTypes.string,
+		nickname: PropTypes.string,
 		username: PropTypes.string,
 	}),
 };