From 21ea5ee4c941ad4f5e9b2bffe6d3e9e7456ecf85 Mon Sep 17 00:00:00 2001 From: Benjamin Gammaire Date: Mon, 2 Sep 2019 11:19:22 +0200 Subject: [PATCH 1/4] add link to user profile from map card --- src/pages/Maps/Content/View/Popup.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/Maps/Content/View/Popup.tsx b/src/pages/Maps/Content/View/Popup.tsx index a40f20a4aa..bc1a97199d 100644 --- a/src/pages/Maps/Content/View/Popup.tsx +++ b/src/pages/Maps/Content/View/Popup.tsx @@ -7,6 +7,7 @@ import { distanceInWords } from 'date-fns' import { IMapPin, IMapPinDetail } from 'src/models/maps.models' import './popup.css' +import { Link } from 'src/components/Links' interface IProps { pinDetail?: IMapPin | IMapPinDetail @@ -118,7 +119,9 @@ export class Popup extends React.Component { - {name} + + {name} + {pinType.icon} {pinType.displayName} From 710bab21cbbeb1be374759f1b4f2d0546d653d78 Mon Sep 17 00:00:00 2001 From: Benjamin Gammaire Date: Mon, 2 Sep 2019 11:20:29 +0200 Subject: [PATCH 2/4] display map section in production --- src/pages/PageList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/PageList.tsx b/src/pages/PageList.tsx index 8369fc361f..3dd88b263b 100644 --- a/src/pages/PageList.tsx +++ b/src/pages/PageList.tsx @@ -70,7 +70,7 @@ const admin = { // community pages (various pages hidden on production build) const devCommunityPages = [howTo, events, maps] -const prodCommunityPages = [howTo, events] +const prodCommunityPages = [howTo, events, maps] const communityPages = SITE === 'production' ? prodCommunityPages : devCommunityPages // community 'more' dropdown pages (various pages hidden on production build) From 063443d7dd9f3039ad446839e799e0ccaaaf4bf4 Mon Sep 17 00:00:00 2001 From: Benjamin Gammaire Date: Mon, 2 Sep 2019 11:26:32 +0200 Subject: [PATCH 3/4] improve map user popup display --- src/pages/Maps/Content/View/Popup.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/Maps/Content/View/Popup.tsx b/src/pages/Maps/Content/View/Popup.tsx index bc1a97199d..464b74548b 100644 --- a/src/pages/Maps/Content/View/Popup.tsx +++ b/src/pages/Maps/Content/View/Popup.tsx @@ -8,6 +8,7 @@ import { IMapPin, IMapPinDetail } from 'src/models/maps.models' import './popup.css' import { Link } from 'src/components/Links' +import Text from 'src/components/Text' interface IProps { pinDetail?: IMapPin | IMapPinDetail @@ -17,10 +18,11 @@ interface IProps { const HeroImage = styled.img` width: 285px; height: 175px; + object-fit: cover; ` const ProfileImage = styled.img` - width 50px; + width: 50px; height: 50px; border-radius: 50%; margin-top: -25px; @@ -126,7 +128,7 @@ export class Popup extends React.Component { {pinType.icon} {pinType.displayName} - {shortDescription} + {shortDescription} last active {distanceInWords(lastActive, new Date())} ago From c4a6e03c49f758fda30d229dbee6cafbca280ce7 Mon Sep 17 00:00:00 2001 From: Benjamin Gammaire Date: Mon, 2 Sep 2019 11:33:02 +0200 Subject: [PATCH 4/4] update version number to v0.5.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01db3f6852..c572cd50ca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "one-army-world", - "version": "0.5.0", + "version": "0.5.1", "private": true, "dependencies": { "@babel/core": "7.2.2",