Skip to content

Commit

Permalink
Merge pull request #556 from ONEARMY/master
Browse files Browse the repository at this point in the history
v0.5.1
  • Loading branch information
BenGamma authored Sep 2, 2019
2 parents 6ec258b + c4a6e03 commit daa72cc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "one-army-world",
"version": "0.5.0",
"version": "0.5.1",
"private": true,
"dependencies": {
"@babel/core": "7.2.2",
Expand Down
11 changes: 8 additions & 3 deletions src/pages/Maps/Content/View/Popup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { distanceInWords } from 'date-fns'
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
Expand All @@ -16,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;
Expand Down Expand Up @@ -118,12 +121,14 @@ export class Popup extends React.Component<IProps> {
<HeroImage src={heroImageUrl} />
<ProfileImage src={profilePicUrl} />
<ContentWrapper>
<ComradeName>{name}</ComradeName>
<Link to={'u/' + name}>
<ComradeName>{name}</ComradeName>
</Link>
<PinTypeWrapper>
<PinTypeDot type={pinType.grouping}>{pinType.icon}</PinTypeDot>
<PinTypeName>{pinType.displayName}</PinTypeName>
</PinTypeWrapper>
<Description>{shortDescription}</Description>
<Text clipped>{shortDescription}</Text>
<LastOnline>
last active {distanceInWords(lastActive, new Date())} ago
</LastOnline>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/PageList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit daa72cc

Please sign in to comment.