From 4e0f26d37192e5d95fb303a40cd58db987c6fe7f Mon Sep 17 00:00:00 2001 From: Mark Volkmann Date: Thu, 2 May 2024 10:17:40 -0500 Subject: [PATCH 1/3] added community/guild icon in GuildSummaryCard --- .../guild-results/GuildSummaryCard.jsx | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/web-ui/src/components/guild-results/GuildSummaryCard.jsx b/web-ui/src/components/guild-results/GuildSummaryCard.jsx index c784beec42..e1f020d23f 100644 --- a/web-ui/src/components/guild-results/GuildSummaryCard.jsx +++ b/web-ui/src/components/guild-results/GuildSummaryCard.jsx @@ -7,6 +7,9 @@ import EditGuildModal from './EditGuildModal'; import { Link } from 'react-router-dom'; import { Link as StyledLink } from '@mui/material'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import { faHammer, faPeopleGroup } from '@fortawesome/free-solid-svg-icons'; + import { Button, Card, @@ -32,14 +35,20 @@ const classes = { }; const StyledCard = styled(Card)(() => ({ [`&.${classes.card}`]: { - width: '340px', display: 'flex', flexDirection: 'column', - justifyContent: 'space-between' + justifyContent: 'space-between', + position: 'relative', + width: '340px' }, [`& .${classes.header}`]: { width: '100%' }, + ['& [data-icon]']: { + position: 'absolute', + right: '1rem', + top: '1rem' + }, [`& .${classes.title}`]: { overflow: 'hidden', textOverflow: 'ellipsis', @@ -128,6 +137,10 @@ const GuildSummaryCard = ({ guild, index, isOpen, onGuildSelect }) => { return ( + Date: Thu, 2 May 2024 10:58:59 -0500 Subject: [PATCH 2/3] updated title for Guilds page --- web-ui/src/components/menu/Menu.jsx | 2 +- web-ui/src/components/routes/Routes.jsx | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/web-ui/src/components/menu/Menu.jsx b/web-ui/src/components/menu/Menu.jsx index 0990f309cf..5094106990 100644 --- a/web-ui/src/components/menu/Menu.jsx +++ b/web-ui/src/components/menu/Menu.jsx @@ -109,7 +109,7 @@ const adminLinks = [ ]; const directoryLinks = [ - ['/guilds', 'Guilds'], + ['/guilds', 'Guilds & Communities'], ['/people', 'People'], ['/teams', 'Teams'] ]; diff --git a/web-ui/src/components/routes/Routes.jsx b/web-ui/src/components/routes/Routes.jsx index 3186b3948e..a8c5c08b9d 100644 --- a/web-ui/src/components/routes/Routes.jsx +++ b/web-ui/src/components/routes/Routes.jsx @@ -50,9 +50,7 @@ export default function Routes() { -
- -
+
From 1cfe74e9dc2e75a1b6dec82e78327724fe7ab46f Mon Sep 17 00:00:00 2001 From: Mark Volkmann Date: Thu, 2 May 2024 12:04:47 -0500 Subject: [PATCH 3/3] updated some snapshot tests --- .../__snapshots__/GuildResults.test.jsx.snap | 34 ++++++++++++- .../GuildSummaryCard.test.jsx.snap | 51 +++++++++++++++++-- .../menu/__snapshots__/Menu.test.jsx.snap | 12 ++--- 3 files changed, 86 insertions(+), 11 deletions(-) diff --git a/web-ui/src/components/guild-results/__snapshots__/GuildResults.test.jsx.snap b/web-ui/src/components/guild-results/__snapshots__/GuildResults.test.jsx.snap index 52586b8646..6ec672f781 100644 --- a/web-ui/src/components/guild-results/__snapshots__/GuildResults.test.jsx.snap +++ b/web-ui/src/components/guild-results/__snapshots__/GuildResults.test.jsx.snap @@ -78,8 +78,23 @@ exports[`renders correctly 1`] = ` class="guilds" >
+
@@ -163,8 +178,23 @@ exports[`renders correctly 1`] = `
+
diff --git a/web-ui/src/components/guild-results/__snapshots__/GuildSummaryCard.test.jsx.snap b/web-ui/src/components/guild-results/__snapshots__/GuildSummaryCard.test.jsx.snap index d4d8665777..3ad645da17 100644 --- a/web-ui/src/components/guild-results/__snapshots__/GuildSummaryCard.test.jsx.snap +++ b/web-ui/src/components/guild-results/__snapshots__/GuildSummaryCard.test.jsx.snap @@ -3,8 +3,23 @@ exports[`renders correctly 1`] = `
+
@@ -52,8 +67,23 @@ exports[`renders correctly 1`] = ` exports[`renders correctly for ADMIN 1`] = `
+
@@ -142,8 +172,23 @@ exports[`renders correctly for ADMIN 1`] = ` exports[`renders correctly for guild lead 1`] = `
+
diff --git a/web-ui/src/components/menu/__snapshots__/Menu.test.jsx.snap b/web-ui/src/components/menu/__snapshots__/Menu.test.jsx.snap index 483bf04f81..28e7a641aa 100644 --- a/web-ui/src/components/menu/__snapshots__/Menu.test.jsx.snap +++ b/web-ui/src/components/menu/__snapshots__/Menu.test.jsx.snap @@ -144,7 +144,7 @@ exports[` > renders correctly 1`] = ` - Guilds + Guilds & Communities
@@ -281,7 +281,7 @@ exports[` > renders correctly 1`] = ` - Guilds + Guilds & Communities
@@ -500,7 +500,7 @@ exports[` > renders correctly for admin 1`] = ` - Guilds + Guilds & Communities
@@ -668,7 +668,7 @@ exports[` > renders correctly for admin 1`] = ` - Guilds + Guilds & Communities
@@ -892,7 +892,7 @@ exports[` > renders correctly for pdl 1`] = ` - Guilds + Guilds & Communities
@@ -1029,7 +1029,7 @@ exports[` > renders correctly for pdl 1`] = ` - Guilds + Guilds & Communities