diff --git a/web-ui/src/components/guild-results/GuildSummaryCard.jsx b/web-ui/src/components/guild-results/GuildSummaryCard.jsx index 0e58a20aa5..4946e25b16 100644 --- a/web-ui/src/components/guild-results/GuildSummaryCard.jsx +++ b/web-ui/src/components/guild-results/GuildSummaryCard.jsx @@ -1,14 +1,13 @@ import React, { useContext, useState, useCallback } from 'react'; +import { Link } from 'react-router-dom'; +import { Construction, Groups } from '@mui/icons-material'; +import { Link as StyledLink } from '@mui/material'; import { styled } from '@mui/material/styles'; + import { AppContext } from '../../context/AppContext'; import { UPDATE_GUILDS, UPDATE_TOAST } from '../../context/actions'; 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, @@ -135,15 +134,22 @@ const GuildSummaryCard = ({ guild, index, isOpen, onGuildSelect }) => { } }; + const iconStyles = { height: '2.5rem', width: '2.5rem' }; + return ( - + + {guild.community ? ( + + ) : ( + + )} +
Search guilds... @@ -305,7 +301,7 @@ exports[`renders correctly when no guilds are loaded 1`] = `
, + [ReviewStatus.AWAITING_APPROVAL]: , + [ReviewStatus.OPEN]: , + [ReviewStatus.CLOSED]: , + [ReviewStatus.UNKNOWN]: +}; + const ReviewPeriods = ({ onPeriodSelected, mode }) => { const { state, dispatch } = useContext(AppContext); @@ -433,9 +449,9 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => { } > {reviewStatus === ReviewStatus.OPEN ? ( - + ) : ( - + )} @@ -445,7 +461,7 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => { edge="end" aria-label="Delete" > - + @@ -457,17 +473,12 @@ const ReviewPeriods = ({ onPeriodSelected, mode }) => { key={`period-lia-${id}`} onClick={() => onPeriodClick(id)} > - - - + {reviewStatusIconMap[reviewStatus]} onPeriodClick(id)} - primary={ - name + - (reviewStatus === ReviewStatus.OPEN ? ' - Open' : '') - } + primary={`${name} - ${titleCase(reviewStatus)}`} secondary={getSecondaryLabel(id)} /> diff --git a/web-ui/src/helpers/strings.js b/web-ui/src/helpers/strings.js new file mode 100644 index 0000000000..1a62ae277a --- /dev/null +++ b/web-ui/src/helpers/strings.js @@ -0,0 +1,5 @@ +export const titleCase = text => + text.replace( + /\w\S*/g, + word => word.charAt(0).toUpperCase() + word.substr(1).toLowerCase() + ); diff --git a/web-ui/src/helpers/strings.test.js b/web-ui/src/helpers/strings.test.js new file mode 100644 index 0000000000..6aa82f0d94 --- /dev/null +++ b/web-ui/src/helpers/strings.test.js @@ -0,0 +1,10 @@ +import { titleCase } from './strings'; + +describe('strings', () => { + it('can title-case a string', () => { + expect(titleCase('')).toBe(''); + expect(titleCase('a')).toEqual('A'); + expect(titleCase('test')).toBe('Test'); + expect(titleCase('one two three')).toBe('One Two Three'); + }); +});