diff --git a/webclient/src/components/UserDisplay/UserDisplay.css b/webclient/src/components/UserDisplay/UserDisplay.css index c2dab497..0697c7f6 100644 --- a/webclient/src/components/UserDisplay/UserDisplay.css +++ b/webclient/src/components/UserDisplay/UserDisplay.css @@ -8,4 +8,9 @@ height: 100%; display: flex; align-items: center; -} \ No newline at end of file +} + +.user-display__country { + width: 1.1em; + margin-right: 0.4em; +} diff --git a/webclient/src/components/UserDisplay/UserDisplay.tsx b/webclient/src/components/UserDisplay/UserDisplay.tsx index 12142986..d283daa2 100644 --- a/webclient/src/components/UserDisplay/UserDisplay.tsx +++ b/webclient/src/components/UserDisplay/UserDisplay.tsx @@ -6,6 +6,7 @@ import { NavLink, generatePath } from "react-router-dom"; import Menu from "@material-ui/core/Menu"; import MenuItem from "@material-ui/core/MenuItem"; +import { Images } from "images/Images"; import { SessionService } from "api"; import { ServerSelectors } from "store"; import { RouteEnum, User } from "types"; @@ -85,7 +86,7 @@ class UserDisplay extends Component { render() { const { user } = this.props; const { position } = this.state; - const { name } = user; + const { name, country } = user; const isABuddy = this.isABuddy(); const isIgnored = this.isIgnored(); @@ -96,7 +97,7 @@ class UserDisplay extends Component {
-
+ {country}
{name}
diff --git a/webclient/src/images/Images.tsx b/webclient/src/images/Images.tsx index 3d70134e..c36f5a90 100644 --- a/webclient/src/images/Images.tsx +++ b/webclient/src/images/Images.tsx @@ -1,7 +1,7 @@ import Countries from "./countries/_Countries"; export class Images { - static Countries = [ + static Countries = { ...Countries - ]; -} \ No newline at end of file + }; +} diff --git a/webclient/src/images/countries/_Countries.tsx b/webclient/src/images/countries/_Countries.tsx index 81fc69a0..f1e3f6b4 100644 --- a/webclient/src/images/countries/_Countries.tsx +++ b/webclient/src/images/countries/_Countries.tsx @@ -247,7 +247,7 @@ import za from "./za.svg"; import zm from "./zm.svg"; import zw from "./zw.svg"; -const Countries = [ +const Countries = { ad, ae, af, @@ -496,6 +496,6 @@ const Countries = [ za, zm, zw, -]; +}; -export default Countries; \ No newline at end of file +export default Countries;