mirror/Compass
1
0
Fork 0
mirror of https://github.com/CompassConnections/Compass.git synced 2026-07-30 17:59:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move relationship style (like monogamous) from the seeking text to chips below

Browse Source
This commit is contained in:
MartinBraquet
2026-06-06 14:18:21 +02:00
parent a385a31642
commit ed20465e3e
2 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
web/components/profile-about.tsx
View File

@@ -11,6 +11,7 @@ import {
INVERTED_PSYCHEDELICS_CHOICES,
INVERTED_RELATIONSHIP_STATUS_CHOICES,
INVERTED_RELIGION_CHOICES,
INVERTED_ROMANTIC_CHOICES,
INVERTED_SUBSTANCE_INTENTION_CHOICES,
MBTI_TYPE_NAMES,
SUBSTANCE_PREFERENCE_ABOUT,
@@ -190,6 +191,7 @@ function SeekingAndRelationship(props: {profile: Profile}) {
const {profile} = props
const seekingText = getSeekingText(profile, t)
const relationship_status = profile.relationship_status ?? []
const relationshipTypes = profile.pref_relation_styles ?? []
if (relationship_status.length === 0 && !seekingText) return null
@@ -203,6 +205,13 @@ function SeekingAndRelationship(props: {profile: Profile}) {
)
: null
let romanticStyles: string[] | undefined
if (relationshipTypes?.includes('relationship')) {
romanticStyles = profile.pref_romantic_styles
?.map((style) => t(`profile.romantic.${style}`, INVERTED_ROMANTIC_CHOICES[style]))
.filter(Boolean)
}
// const key = relationship_status[0] as keyof typeof RELATIONSHIP_ICONS
// const icon = RELATIONSHIP_ICONS[key] ?? FaHeart
@@ -212,7 +221,17 @@ function SeekingAndRelationship(props: {profile: Profile}) {
title={t('profile.connection_goals', 'Connection Goals')}
text={seekingText}
details={relationshipText}
/>
>
{romanticStyles && (
<div className="flex flex-wrap gap-2 mt-2">
{romanticStyles!.map((r) => (
<Chip key={r} variant="muted">
{r}
</Chip>
))}
</div>
)}
</AboutRow>
)
}

23
web/lib/profile/seeking.ts
View File

@@ -1,4 +1,3 @@
import {INVERTED_ROMANTIC_CHOICES} from 'common/choices'
import {Profile} from 'common/profiles/profile'
import {capitalize} from 'lodash'
import {convertRelationshipType, RelationshipType} from 'web/lib/util/convert-types'
@@ -6,7 +5,7 @@ import stringOrStringArrayToText from 'web/lib/util/string-or-string-array-to-te
export function getSeekingConnectionText(profile: Profile, t: any, _short?: boolean) {
const relationshipTypes = profile.pref_relation_styles
let seekingGenderText = stringOrStringArrayToText({
const seekingGenderText = stringOrStringArrayToText({
text: relationshipTypes?.length
? relationshipTypes
.map((rel) =>
@@ -22,15 +21,15 @@ export function getSeekingConnectionText(profile: Profile, t: any, _short?: bool
capitalizeFirstLetterOption: false,
t: t,
})
if (relationshipTypes?.includes('relationship')) {
const romanticStyles = profile.pref_romantic_styles
?.map((style) =>
t(`profile.romantic.${style}`, INVERTED_ROMANTIC_CHOICES[style]).toLowerCase(),
)
.filter(Boolean)
if (romanticStyles && romanticStyles.length > 0) {
seekingGenderText += ` (${romanticStyles.join(', ')})`
}
}
// if (relationshipTypes?.includes('relationship')) {
// const romanticStyles = profile.pref_romantic_styles
// ?.map((style) =>
// t(`profile.romantic.${style}`, INVERTED_ROMANTIC_CHOICES[style]).toLowerCase(),
// )
// .filter(Boolean)
// if (romanticStyles && romanticStyles.length > 0) {
// seekingGenderText += ` (${romanticStyles.join(', ')})`
// }
// }
return capitalize(seekingGenderText ?? undefined)
}