diff --git a/backend/api/src/compatible-profiles.ts b/backend/api/src/compatible-profiles.ts index f39979c..e9a3330 100644 --- a/backend/api/src/compatible-profiles.ts +++ b/backend/api/src/compatible-profiles.ts @@ -1,6 +1,6 @@ import { groupBy, sortBy } from 'lodash' import { APIError, type APIHandler } from 'api/helpers/endpoint' -import { getCompatibilityScore } from 'common/love/compatibility-score' +import { getCompatibilityScore } from 'common/profiles/compatibility-score' import { getProfile, getCompatibilityAnswers, diff --git a/backend/api/src/send-search-notifications.ts b/backend/api/src/send-search-notifications.ts index b32b175..8d5ec1f 100644 --- a/backend/api/src/send-search-notifications.ts +++ b/backend/api/src/send-search-notifications.ts @@ -3,7 +3,7 @@ import {from, renderSql, select} from "shared/supabase/sql-builder"; import {loadProfiles, profileQueryType} from "api/get-profiles"; import {Row} from "common/supabase/utils"; import {sendSearchAlertsEmail} from "email/functions/helpers"; -import {MatchesByUserType} from "common/love/bookmarked_searches"; +import {MatchesByUserType} from "common/profiles/bookmarked_searches"; import {keyBy} from "lodash"; export function convertSearchRow(row: any): any { diff --git a/backend/email/emails/functions/helpers.tsx b/backend/email/emails/functions/helpers.tsx index 47962bf..6aef6c1 100644 --- a/backend/email/emails/functions/helpers.tsx +++ b/backend/email/emails/functions/helpers.tsx @@ -6,7 +6,7 @@ import {NewEndorsementEmail} from '../new-endorsement' import {Test} from '../test' import {getProfile} from 'shared/love/supabase' import { render } from "@react-email/render" -import {MatchesType} from "common/love/bookmarked_searches"; +import {MatchesType} from "common/profiles/bookmarked_searches"; import NewSearchAlertsEmail from "email/new-search_alerts"; import WelcomeEmail from "email/welcome"; diff --git a/backend/email/emails/functions/mock.ts b/backend/email/emails/functions/mock.ts index 36ef0d6..5560a49 100644 --- a/backend/email/emails/functions/mock.ts +++ b/backend/email/emails/functions/mock.ts @@ -1,4 +1,4 @@ -import {ProfileRow} from 'common/love/profile' +import {ProfileRow} from 'common/profiles/profile' import type {User} from 'common/user' // for email template testing diff --git a/backend/email/emails/new-match.tsx b/backend/email/emails/new-match.tsx index 5213b1c..5ce1ee9 100644 --- a/backend/email/emails/new-match.tsx +++ b/backend/email/emails/new-match.tsx @@ -1,6 +1,6 @@ import {Body, Button, Container, Head, Html, Preview, Section, Text,} from '@react-email/components' import {DOMAIN} from 'common/envs/constants' -import {type ProfileRow} from 'common/love/profile' +import {type ProfileRow} from 'common/profiles/profile' import {type User} from 'common/user' import {jamesProfile, jamesUser, mockUser} from './functions/mock' import {Footer} from "email/utils"; diff --git a/backend/email/emails/new-message.tsx b/backend/email/emails/new-message.tsx index c716605..02eb51a 100644 --- a/backend/email/emails/new-message.tsx +++ b/backend/email/emails/new-message.tsx @@ -1,6 +1,6 @@ import {Body, Button, Container, Head, Html, Preview, Section, Text,} from '@react-email/components' import {type User} from 'common/user' -import {type ProfileRow} from 'common/love/profile' +import {type ProfileRow} from 'common/profiles/profile' import {jamesProfile, jamesUser, mockUser,} from './functions/mock' import {DOMAIN} from 'common/envs/constants' import {button, container, content, Footer, imageContainer, main, paragraph} from "email/utils"; diff --git a/backend/email/emails/new-search_alerts.tsx b/backend/email/emails/new-search_alerts.tsx index 47b1b29..cc6922f 100644 --- a/backend/email/emails/new-search_alerts.tsx +++ b/backend/email/emails/new-search_alerts.tsx @@ -3,7 +3,7 @@ import {type User} from 'common/user' import {mockUser,} from './functions/mock' import {DOMAIN} from 'common/envs/constants' import {container, content, Footer, main, paragraph} from "email/utils"; -import {MatchesType} from "common/love/bookmarked_searches"; +import {MatchesType} from "common/profiles/bookmarked_searches"; import {formatFilters, locationType} from "common/searches" import {FilterFields} from "common/filters"; diff --git a/backend/shared/src/love/supabase.ts b/backend/shared/src/love/supabase.ts index 213a51e..befeaa2 100644 --- a/backend/shared/src/love/supabase.ts +++ b/backend/shared/src/love/supabase.ts @@ -1,5 +1,5 @@ -import { areGenderCompatible } from 'common/love/compatibility-util' -import { type Profile, type ProfileRow } from 'common/love/profile' +import { areGenderCompatible } from 'common/profiles/compatibility-util' +import { type Profile, type ProfileRow } from 'common/profiles/profile' import { type User } from 'common/user' import { Row } from 'common/supabase/utils' import { createSupabaseDirectClient } from 'shared/supabase/init' diff --git a/common/src/api/schema.ts b/common/src/api/schema.ts index 10c26b0..cad0f81 100644 --- a/common/src/api/schema.ts +++ b/common/src/api/schema.ts @@ -5,9 +5,9 @@ import { arraybeSchema, } from 'common/api/zod-types' import {PrivateChatMessage} from 'common/chat-message' -import {CompatibilityScore} from 'common/love/compatibility-score' -import {MAX_COMPATIBILITY_QUESTION_LENGTH} from 'common/love/constants' -import {Profile, ProfileRow} from 'common/love/profile' +import {CompatibilityScore} from 'common/profiles/compatibility-score' +import {MAX_COMPATIBILITY_QUESTION_LENGTH} from 'common/profiles/constants' +import {Profile, ProfileRow} from 'common/profiles/profile' import {Row} from 'common/supabase/utils' import {PrivateUser, User} from 'common/user' import {z} from 'zod' diff --git a/common/src/filters.ts b/common/src/filters.ts index c1955aa..45f0c24 100644 --- a/common/src/filters.ts +++ b/common/src/filters.ts @@ -1,4 +1,4 @@ -import {Profile, ProfileRow} from "common/love/profile"; +import {Profile, ProfileRow} from "common/profiles/profile"; import {cloneDeep} from "lodash"; import {filterDefined} from "common/util/array"; diff --git a/common/src/love/bookmarked_searches.ts b/common/src/profiles/bookmarked_searches.ts similarity index 100% rename from common/src/love/bookmarked_searches.ts rename to common/src/profiles/bookmarked_searches.ts diff --git a/common/src/love/compatibility-score.ts b/common/src/profiles/compatibility-score.ts similarity index 98% rename from common/src/love/compatibility-score.ts rename to common/src/profiles/compatibility-score.ts index 80e64dc..081b6ab 100644 --- a/common/src/love/compatibility-score.ts +++ b/common/src/profiles/compatibility-score.ts @@ -1,5 +1,5 @@ import { keyBy, sumBy } from 'lodash' -import { ProfileRow } from 'common/love/profile' +import { ProfileRow } from 'common/profiles/profile' import { Row as rowFor } from 'common/supabase/utils' import { areAgeCompatible, diff --git a/common/src/love/compatibility-util.ts b/common/src/profiles/compatibility-util.ts similarity index 97% rename from common/src/love/compatibility-util.ts rename to common/src/profiles/compatibility-util.ts index 5dc1006..6bf33af 100644 --- a/common/src/love/compatibility-util.ts +++ b/common/src/profiles/compatibility-util.ts @@ -1,4 +1,4 @@ -import { ProfileRow } from 'common/love/profile' +import { ProfileRow } from 'common/profiles/profile' import {MAX_INT, MIN_INT} from "common/constants"; const isPreferredGender = ( diff --git a/common/src/love/constants.ts b/common/src/profiles/constants.ts similarity index 100% rename from common/src/love/constants.ts rename to common/src/profiles/constants.ts diff --git a/common/src/love/multiple-choice.ts b/common/src/profiles/multiple-choice.ts similarity index 100% rename from common/src/love/multiple-choice.ts rename to common/src/profiles/multiple-choice.ts diff --git a/common/src/love/og-image.ts b/common/src/profiles/og-image.ts similarity index 92% rename from common/src/love/og-image.ts rename to common/src/profiles/og-image.ts index 1d63448..5ecde97 100644 --- a/common/src/love/og-image.ts +++ b/common/src/profiles/og-image.ts @@ -1,5 +1,5 @@ import { User } from 'common/user' -import { ProfileRow } from 'common/love/profile' +import { ProfileRow } from 'common/profiles/profile' import { buildOgUrl } from 'common/util/og' // TODO: handle age, gender undefined better diff --git a/common/src/love/profile.ts b/common/src/profiles/profile.ts similarity index 100% rename from common/src/love/profile.ts rename to common/src/profiles/profile.ts diff --git a/web/components/answers/add-compatibility-question-button.tsx b/web/components/answers/add-compatibility-question-button.tsx index 71ba17d..44ada69 100644 --- a/web/components/answers/add-compatibility-question-button.tsx +++ b/web/components/answers/add-compatibility-question-button.tsx @@ -16,7 +16,7 @@ import { Row as rowFor } from 'common/supabase/utils' import { AnswerCompatibilityQuestionContent } from './answer-compatibility-question-content' import { uniq } from 'lodash' import { QuestionWithCountType } from 'web/hooks/use-questions' -import { MAX_COMPATIBILITY_QUESTION_LENGTH } from 'common/love/constants' +import { MAX_COMPATIBILITY_QUESTION_LENGTH } from 'common/profiles/constants' export function AddCompatibilityQuestionButton(props: { refreshCompatibilityAll: () => void diff --git a/web/components/answers/compatibility-questions-display.tsx b/web/components/answers/compatibility-questions-display.tsx index 8de35f8..0aeb926 100644 --- a/web/components/answers/compatibility-questions-display.tsx +++ b/web/components/answers/compatibility-questions-display.tsx @@ -1,6 +1,6 @@ import {PencilIcon, TrashIcon} from '@heroicons/react/outline' -import {getAnswerCompatibility, getScoredAnswerCompatibility,} from 'common/love/compatibility-score' -import {Profile} from 'common/love/profile' +import {getAnswerCompatibility, getScoredAnswerCompatibility,} from 'common/profiles/compatibility-score' +import {Profile} from 'common/profiles/profile' import {Row as rowFor} from 'common/supabase/utils' import {User} from 'common/user' import {keyBy, partition, sortBy} from 'lodash' diff --git a/web/components/answers/free-response-display.tsx b/web/components/answers/free-response-display.tsx index c6973eb..eb65df3 100644 --- a/web/components/answers/free-response-display.tsx +++ b/web/components/answers/free-response-display.tsx @@ -26,7 +26,7 @@ import { import { partition } from 'lodash' import { shortenName } from 'web/components/widgets/user-link' import { AddQuestionButton } from './free-response-add-question' -import { Profile } from 'common/love/profile' +import { Profile } from 'common/profiles/profile' export function FreeResponseDisplay(props: { isCurrentUser: boolean diff --git a/web/components/answers/profile-answers.tsx b/web/components/answers/profile-answers.tsx index d3aaeb8..3ffb281 100644 --- a/web/components/answers/profile-answers.tsx +++ b/web/components/answers/profile-answers.tsx @@ -1,7 +1,7 @@ import {User} from 'common/user' import {Col} from 'web/components/layout/col' import {CompatibilityQuestionsDisplay} from './compatibility-questions-display' -import {Profile} from 'common/love/profile' +import {Profile} from 'common/profiles/profile' export function ProfileAnswers(props: { isCurrentUser: boolean diff --git a/web/components/bio/editable-bio.tsx b/web/components/bio/editable-bio.tsx index 60f5c5e..9cb9dc7 100644 --- a/web/components/bio/editable-bio.tsx +++ b/web/components/bio/editable-bio.tsx @@ -1,6 +1,6 @@ import {Editor} from '@tiptap/core' import {MAX_DESCRIPTION_LENGTH} from 'common/envs/constants' -import {Profile} from 'common/love/profile' +import {Profile} from 'common/profiles/profile' import {tryCatch} from 'common/util/try-catch' import {Button} from 'web/components/buttons/button' import {Col} from 'web/components/layout/col' diff --git a/web/components/bio/profile-bio-block.tsx b/web/components/bio/profile-bio-block.tsx index 7ececb5..0f86cc6 100644 --- a/web/components/bio/profile-bio-block.tsx +++ b/web/components/bio/profile-bio-block.tsx @@ -2,7 +2,7 @@ import { PencilIcon, XIcon } from '@heroicons/react/outline' import { JSONContent } from '@tiptap/core' import clsx from 'clsx' -import { Profile } from 'common/love/profile' +import { Profile } from 'common/profiles/profile' import DropdownMenu from 'web/components/comments/dropdown-menu' import { Col } from 'web/components/layout/col' import { Row } from 'web/components/layout/row' diff --git a/web/components/bio/profile-bio.tsx b/web/components/bio/profile-bio.tsx index 2aeb151..3f2edca 100644 --- a/web/components/bio/profile-bio.tsx +++ b/web/components/bio/profile-bio.tsx @@ -1,4 +1,4 @@ -import {Profile} from 'common/love/profile' +import {Profile} from 'common/profiles/profile' import {useEffect, useState} from 'react' import {Col} from 'web/components/layout/col' import {Subtitle} from '../widgets/profile-subtitle' diff --git a/web/components/chat/chat-message.tsx b/web/components/chat/chat-message.tsx index 2087679..3180bcd 100644 --- a/web/components/chat/chat-message.tsx +++ b/web/components/chat/chat-message.tsx @@ -13,7 +13,7 @@ import { UserAvatarAndBadge } from 'web/components/widgets/user-link' import Link from 'next/link' import DropdownMenu from 'web/components/comments/dropdown-menu' import { DotsHorizontalIcon, ReplyIcon } from '@heroicons/react/solid' -import { manifoldLoveUserId } from 'common/love/constants' +import { manifoldLoveUserId } from 'common/profiles/constants' import { DisplayUser } from 'common/api/user-types' export const ChatMessageItem = memo(function ChatMessageItem(props: { diff --git a/web/components/filters/desktop-filters.tsx b/web/components/filters/desktop-filters.tsx index a734194..2ec04b3 100644 --- a/web/components/filters/desktop-filters.tsx +++ b/web/components/filters/desktop-filters.tsx @@ -11,7 +11,7 @@ import {GenderFilter, GenderFilterText} from './gender-filter' import {LocationFilter, LocationFilterProps, LocationFilterText,} from './location-filter' import {RelationshipFilter, RelationshipFilterText,} from './relationship-filter' import {MyMatchesToggle} from './my-matches-toggle' -import {Profile} from 'common/love/profile' +import {Profile} from 'common/profiles/profile' import {FilterFields} from "common/filters"; import {ShortBioToggle} from "web/components/filters/short-bio-toggle"; import {PrefGenderFilter, PrefGenderFilterText} from "web/components/filters/pref-gender-filter"; diff --git a/web/components/filters/location-filter.tsx b/web/components/filters/location-filter.tsx index cefba3c..2a89fad 100644 --- a/web/components/filters/location-filter.tsx +++ b/web/components/filters/location-filter.tsx @@ -4,7 +4,7 @@ import {Slider} from 'web/components/widgets/slider' import {usePersistentInMemoryState} from 'web/hooks/use-persistent-in-memory-state' import {Row} from 'web/components/layout/row' import {City, CityRow, profileToCity, originToCity, useCitySearch,} from '../search-location' -import {Profile} from 'common/love/profile' +import {Profile} from 'common/profiles/profile' import {useEffect, useState} from 'react' import {Input} from 'web/components/widgets/input' import {XIcon} from '@heroicons/react/solid' diff --git a/web/components/filters/mobile-filters.tsx b/web/components/filters/mobile-filters.tsx index 5efe8b6..a9c09e1 100644 --- a/web/components/filters/mobile-filters.tsx +++ b/web/components/filters/mobile-filters.tsx @@ -8,7 +8,7 @@ import {GenderFilter, GenderFilterText} from './gender-filter' import {LocationFilter, LocationFilterProps, LocationFilterText,} from './location-filter' import {RelationshipFilter, RelationshipFilterText,} from './relationship-filter' import {MyMatchesToggle} from './my-matches-toggle' -import {Profile} from 'common/love/profile' +import {Profile} from 'common/profiles/profile' import {Gender} from 'common/gender' import {RelationshipType, RomanticType} from 'web/lib/util/convert-relationship-type' import {FilterFields} from "common/filters"; diff --git a/web/components/filters/my-matches-toggle.tsx b/web/components/filters/my-matches-toggle.tsx index 4b87312..3a3a7d9 100644 --- a/web/components/filters/my-matches-toggle.tsx +++ b/web/components/filters/my-matches-toggle.tsx @@ -1,6 +1,6 @@ import { Row } from 'web/components/layout/row' import clsx from 'clsx' -import { Profile } from 'common/love/profile' +import { Profile } from 'common/profiles/profile' export function MyMatchesToggle(props: { setYourFilters: (checked: boolean) => void diff --git a/web/components/filters/search.tsx b/web/components/filters/search.tsx index 5a27cbc..ff3cfa4 100644 --- a/web/components/filters/search.tsx +++ b/web/components/filters/search.tsx @@ -1,4 +1,4 @@ -import {Profile} from 'common/love/profile' +import {Profile} from 'common/profiles/profile' import {useEffect, useState} from 'react' import {IoFilterSharp} from 'react-icons/io5' import {Button} from 'web/components/buttons/button' diff --git a/web/components/filters/use-filters.ts b/web/components/filters/use-filters.ts index 3b5b715..52289c5 100644 --- a/web/components/filters/use-filters.ts +++ b/web/components/filters/use-filters.ts @@ -1,4 +1,4 @@ -import {Profile} from "common/love/profile"; +import {Profile} from "common/profiles/profile"; import {useIsLooking} from "web/hooks/use-is-looking"; import {usePersistentLocalState} from "web/hooks/use-persistent-local-state"; import {useCallback, useEffect} from "react"; diff --git a/web/components/love-page.tsx b/web/components/love-page.tsx index 2b9f457..0b2fc21 100644 --- a/web/components/love-page.tsx +++ b/web/components/love-page.tsx @@ -21,7 +21,7 @@ import {useUser} from 'web/hooks/use-user' import {GoogleOneTapLogin} from 'web/lib/firebase/google-onetap-login' import Sidebar from './nav/love-sidebar' import {useProfile} from 'web/hooks/use-profile' -import {Profile} from 'common/love/profile' +import {Profile} from 'common/profiles/profile' import {NotificationsIcon, SolidNotificationsIcon} from './notifications-icon' import {IS_MAINTENANCE} from "common/constants"; import {MdThumbUp} from "react-icons/md"; diff --git a/web/components/matches/match-avatars.tsx b/web/components/matches/match-avatars.tsx index 9d55beb..dcea667 100644 --- a/web/components/matches/match-avatars.tsx +++ b/web/components/matches/match-avatars.tsx @@ -1,6 +1,6 @@ import { Row } from 'web/components/layout/row' import { HeartIcon } from '@heroicons/react/solid' -import { Profile } from 'common/love/profile' +import { Profile } from 'common/profiles/profile' import Image from 'next/image' import { Col } from 'web/components/layout/col' import { UserIcon } from '@heroicons/react/solid' diff --git a/web/components/optional-profile-form.tsx b/web/components/optional-profile-form.tsx index 93abadb..50d4d1e 100644 --- a/web/components/optional-profile-form.tsx +++ b/web/components/optional-profile-form.tsx @@ -16,7 +16,7 @@ import {track} from 'web/lib/service/analytics' import {Races} from './race' import {Carousel} from 'web/components/widgets/carousel' import {tryCatch} from 'common/util/try-catch' -import {ProfileRow} from 'common/love/profile' +import {ProfileRow} from 'common/profiles/profile' import {removeNullOrUndefinedProps} from 'common/util/object' import {isEqual, range} from 'lodash' import {PlatformSelect} from 'web/components/widgets/platform-select' @@ -27,7 +27,7 @@ import {Select} from 'web/components/widgets/select' import {City, CityRow, profileToCity, useCitySearch} from "web/components/search-location"; import {AddPhotosWidget} from './widgets/add-photos' import {RadioToggleGroup} from "web/components/widgets/radio-toggle-group"; -import {MultipleChoiceOptions} from "common/love/multiple-choice"; +import {MultipleChoiceOptions} from "common/profiles/multiple-choice"; import {POLITICAL_CHOICES, RELATIONSHIP_CHOICES, ROMANTIC_CHOICES} from "web/components/filters/choices"; import toast from "react-hot-toast"; diff --git a/web/components/profile-about.tsx b/web/components/profile-about.tsx index 1d60c1e..f8a7d46 100644 --- a/web/components/profile-about.tsx +++ b/web/components/profile-about.tsx @@ -17,7 +17,7 @@ import {convertGenderPlural, Gender} from 'common/gender' import {HiOutlineGlobe} from 'react-icons/hi' import {UserHandles} from 'web/components/user/user-handles' import {convertRace} from './race' -import {Profile} from 'common/love/profile' +import {Profile} from 'common/profiles/profile' import {UserActivity} from "common/user"; import {ClockIcon} from "@heroicons/react/solid"; diff --git a/web/components/profile-carousel.tsx b/web/components/profile-carousel.tsx index 0690ff7..60b0be7 100644 --- a/web/components/profile-carousel.tsx +++ b/web/components/profile-carousel.tsx @@ -7,7 +7,7 @@ import { Carousel } from 'web/components/widgets/carousel' import { MODAL_CLASS, Modal } from 'web/components/layout/modal' import { Col } from 'web/components/layout/col' import { SignUpButton } from './nav/love-sidebar' -import { Profile } from 'common/love/profile' +import { Profile } from 'common/profiles/profile' import { useAdmin } from 'web/hooks/use-admin' import { Button } from 'web/components/buttons/button' import { updateProfile } from 'web/lib/api' diff --git a/web/components/profile-comment-section.tsx b/web/components/profile-comment-section.tsx index 9597fe2..f603a39 100644 --- a/web/components/profile-comment-section.tsx +++ b/web/components/profile-comment-section.tsx @@ -13,7 +13,7 @@ import { updateProfile } from 'web/lib/api' import { Tooltip } from 'web/components/widgets/tooltip' import { toast } from 'react-hot-toast' import { Subtitle } from './widgets/profile-subtitle' -import { Profile } from 'common/love/profile' +import { Profile } from 'common/profiles/profile' export const ProfileCommentSection = (props: { onUser: User diff --git a/web/components/profile-grid.tsx b/web/components/profile-grid.tsx index c3e8dc9..8add122 100644 --- a/web/components/profile-grid.tsx +++ b/web/components/profile-grid.tsx @@ -1,5 +1,5 @@ -import {Profile} from 'common/love/profile' -import {CompatibilityScore} from 'common/love/compatibility-score' +import {Profile} from 'common/profiles/profile' +import {CompatibilityScore} from 'common/profiles/compatibility-score' import {CompassLoadingIndicator} from 'web/components/widgets/loading-indicator' import {LoadMoreUntilNotVisible} from 'web/components/widgets/visibility-observer' import {track} from 'web/lib/service/analytics' diff --git a/web/components/profile/profile-header.tsx b/web/components/profile/profile-header.tsx index aac6ab5..5df20d5 100644 --- a/web/components/profile/profile-header.tsx +++ b/web/components/profile/profile-header.tsx @@ -14,7 +14,7 @@ import {OnlineIcon} from '../online-icon' import {track} from 'web/lib/service/analytics' import DropdownMenu from 'web/components/comments/dropdown-menu' import {ShareProfileButton} from '../widgets/share-profile-button' -import {Profile} from 'common/love/profile' +import {Profile} from 'common/profiles/profile' import {useUser} from 'web/hooks/use-user' import {linkClass} from 'web/components/widgets/site-link' import {updateProfile} from 'web/lib/api' diff --git a/web/components/profile/profile-info.tsx b/web/components/profile/profile-info.tsx index 7fd6340..24826f7 100644 --- a/web/components/profile/profile-info.tsx +++ b/web/components/profile/profile-info.tsx @@ -8,7 +8,7 @@ import {User} from 'web/lib/firebase/users' import ProfileAbout from 'web/components/profile-about' import {ProfileAnswers} from 'web/components/answers/profile-answers' import {SignUpButton} from 'web/components/nav/love-sidebar' -import {Profile} from 'common/love/profile' +import {Profile} from 'common/profiles/profile' import {ProfileBio} from 'web/components/bio/profile-bio' import {useGetter} from 'web/hooks/use-getter' import {getStars} from 'web/lib/supabase/stars' diff --git a/web/components/profile/profile-primary-info.tsx b/web/components/profile/profile-primary-info.tsx index f578a20..de979d5 100644 --- a/web/components/profile/profile-primary-info.tsx +++ b/web/components/profile/profile-primary-info.tsx @@ -7,7 +7,7 @@ import { Row } from 'web/components/layout/row' import GenderIcon from '../gender-icon' import { Gender, convertGender } from 'common/gender' import { formatProfileValue } from '../profile-about' -import { Profile } from 'common/love/profile' +import { Profile } from 'common/profiles/profile' export default function ProfilePrimaryInfo(props: { profile: Profile }) { const { profile } = props diff --git a/web/components/profiles/profiles-home.tsx b/web/components/profiles/profiles-home.tsx index eb6aa78..9ca479c 100644 --- a/web/components/profiles/profiles-home.tsx +++ b/web/components/profiles/profiles-home.tsx @@ -1,4 +1,4 @@ -import {Profile} from 'common/love/profile' +import {Profile} from 'common/profiles/profile' import {removeNullOrUndefinedProps} from 'common/util/object' import {Search} from 'web/components/filters/search' import {useProfile} from 'web/hooks/use-profile' diff --git a/web/components/required-profile-form.tsx b/web/components/required-profile-form.tsx index 3fc932b..6609337 100644 --- a/web/components/required-profile-form.tsx +++ b/web/components/required-profile-form.tsx @@ -10,7 +10,7 @@ import {User} from 'common/user' import {useEditableUserInfo} from 'web/hooks/use-editable-user-info' import {LoadingIndicator} from 'web/components/widgets/loading-indicator' import {Column} from 'common/supabase/utils' -import {ProfileRow} from 'common/love/profile' +import {ProfileRow} from 'common/profiles/profile' import {SignupBio} from "web/components/bio/editable-bio"; import {Editor} from "@tiptap/core"; diff --git a/web/components/search-location.tsx b/web/components/search-location.tsx index 004d4c6..43ddcf1 100644 --- a/web/components/search-location.tsx +++ b/web/components/search-location.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx' import {useEffect, useRef, useState} from 'react' import {api} from 'web/lib/api' import {countryCodeToFlag} from 'web/lib/util/location' -import {ProfileRow} from 'common/love/profile' +import {ProfileRow} from 'common/profiles/profile' import {OriginLocation} from "common/filters"; function isDigitString(value: string): boolean { diff --git a/web/components/widgets/compatible-badge.tsx b/web/components/widgets/compatible-badge.tsx index b47fcc4..9a93ff6 100644 --- a/web/components/widgets/compatible-badge.tsx +++ b/web/components/widgets/compatible-badge.tsx @@ -1,7 +1,7 @@ import { BadgeCheckIcon } from '@heroicons/react/solid' import clsx from 'clsx' -import { CompatibilityScore } from 'common/love/compatibility-score' +import { CompatibilityScore } from 'common/profiles/compatibility-score' import { formatPercent } from 'common/util/format' import { Row } from 'web/components/layout/row' diff --git a/web/components/widgets/like-button.tsx b/web/components/widgets/like-button.tsx index ee265f3..4d588e5 100644 --- a/web/components/widgets/like-button.tsx +++ b/web/components/widgets/like-button.tsx @@ -9,7 +9,7 @@ import { Tooltip } from 'web/components/widgets/tooltip' import { Col } from 'web/components/layout/col' import { MODAL_CLASS, Modal } from 'web/components/layout/modal' import { Row } from 'web/components/layout/row' -import { Profile } from 'common/love/profile' +import { Profile } from 'common/profiles/profile' import { useUserById } from 'web/hooks/use-user-supabase' import { MatchAvatars } from '../matches/match-avatars' import { useProfile } from 'web/hooks/use-profile' diff --git a/web/components/widgets/likes-display.tsx b/web/components/widgets/likes-display.tsx index 7290c95..7ff44f5 100644 --- a/web/components/widgets/likes-display.tsx +++ b/web/components/widgets/likes-display.tsx @@ -3,7 +3,7 @@ import Image from 'next/image' import Link from 'next/link' import { UserIcon } from '@heroicons/react/solid' -import { Profile } from 'common/love/profile' +import { Profile } from 'common/profiles/profile' import { useProfileByUserId } from 'web/hooks/use-profile' import { Col } from 'web/components/layout/col' import { Avatar, EmptyAvatar } from 'web/components/widgets/avatar' diff --git a/web/components/widgets/ships-display.tsx b/web/components/widgets/ships-display.tsx index 8b9f178..4df547e 100644 --- a/web/components/widgets/ships-display.tsx +++ b/web/components/widgets/ships-display.tsx @@ -5,7 +5,7 @@ import clsx from 'clsx' import { MODAL_CLASS, Modal } from 'web/components/layout/modal' import { MatchAvatars } from '../matches/match-avatars' import { Row } from 'web/components/layout/row' -import { Profile } from 'common/love/profile' +import { Profile } from 'common/profiles/profile' import { useProfileByUserId } from 'web/hooks/use-profile' import { Col } from 'web/components/layout/col' import { EmptyAvatar, Avatar } from 'web/components/widgets/avatar' diff --git a/web/components/widgets/star-button.tsx b/web/components/widgets/star-button.tsx index c7daaf2..76d4dfe 100644 --- a/web/components/widgets/star-button.tsx +++ b/web/components/widgets/star-button.tsx @@ -6,7 +6,7 @@ import { api } from 'web/lib/api' import { buttonClass } from 'web/components/buttons/button' import { track } from 'web/lib/service/analytics' import { Tooltip } from 'web/components/widgets/tooltip' -import { Profile } from 'common/love/profile' +import { Profile } from 'common/profiles/profile' export const StarButton = (props: { targetProfile: Profile diff --git a/web/hooks/use-profile.ts b/web/hooks/use-profile.ts index a28910e..a2d5118 100644 --- a/web/hooks/use-profile.ts +++ b/web/hooks/use-profile.ts @@ -3,7 +3,7 @@ import {useEffect} from 'react' import {Row} from 'common/supabase/utils' import {usePersistentInMemoryState} from 'web/hooks/use-persistent-in-memory-state' import {User} from 'common/user' -import {getProfileRow, Profile, ProfileRow} from 'common/love/profile' +import {getProfileRow, Profile, ProfileRow} from 'common/profiles/profile' import {db} from 'web/lib/supabase/db' import {usePersistentLocalState} from 'web/hooks/use-persistent-local-state' diff --git a/web/hooks/use-profiles.ts b/web/hooks/use-profiles.ts index a021de5..1dd4289 100644 --- a/web/hooks/use-profiles.ts +++ b/web/hooks/use-profiles.ts @@ -4,7 +4,7 @@ import { usePersistentInMemoryState } from 'web/hooks/use-persistent-in-memory-s import { api } from 'web/lib/api' import { APIResponse } from 'common/api/schema' import { useProfileByUserId } from './use-profile' -import { getProfilesCompatibilityFactor } from 'common/love/compatibility-score' +import { getProfilesCompatibilityFactor } from 'common/profiles/compatibility-score' export const useCompatibleProfiles = ( userId: string | null | undefined, diff --git a/web/lib/util/signup.ts b/web/lib/util/signup.ts index 7bffe92..6caf50c 100644 --- a/web/lib/util/signup.ts +++ b/web/lib/util/signup.ts @@ -1,7 +1,7 @@ import Router from 'next/router' import { firebaseLogin } from 'web/lib/firebase/users' import { db } from 'web/lib/supabase/db' -import { getProfileRow } from 'common/love/profile' +import { getProfileRow } from 'common/profiles/profile' export const signupThenMaybeRedirectToSignup = async () => { const creds = await firebaseLogin() diff --git a/web/pages/[username]/index.tsx b/web/pages/[username]/index.tsx index afe50c4..0ee426c 100644 --- a/web/pages/[username]/index.tsx +++ b/web/pages/[username]/index.tsx @@ -9,8 +9,8 @@ import {useUser} from 'web/hooks/use-user' import {useTracking} from 'web/hooks/use-tracking' import {BackButton} from 'web/components/back-button' import {useSaveReferral} from 'web/hooks/use-save-referral' -import {getLoveOgImageUrl} from 'common/love/og-image' -import {getProfileRow, ProfileRow} from 'common/love/profile' +import {getLoveOgImageUrl} from 'common/profiles/og-image' +import {getProfileRow, ProfileRow} from 'common/profiles/profile' import {db} from 'web/lib/supabase/db' import {ProfileInfo} from 'web/components/profile/profile-info' import {User} from 'common/user' diff --git a/web/pages/api/og/profile.tsx b/web/pages/api/og/profile.tsx index 9bcdce8..b699688 100644 --- a/web/pages/api/og/profile.tsx +++ b/web/pages/api/og/profile.tsx @@ -3,7 +3,7 @@ import { ImageResponseOptions } from '@vercel/og/dist/types' import { NextRequest } from 'next/server' import { classToTw } from 'web/components/og/utils' import { Gender, convertGender } from 'common/gender' -import { LoveOgProps } from 'common/love/og-image' +import { LoveOgProps } from 'common/profiles/og-image' export const config = { runtime: 'edge' } diff --git a/web/pages/profile.tsx b/web/pages/profile.tsx index cedb5f4..110b067 100644 --- a/web/pages/profile.tsx +++ b/web/pages/profile.tsx @@ -1,4 +1,4 @@ -import {Profile, ProfileRow} from 'common/love/profile' +import {Profile, ProfileRow} from 'common/profiles/profile' import {Column} from 'common/supabase/utils' import {User} from 'common/user' import {OptionalLoveUserForm} from 'web/components/optional-profile-form' diff --git a/web/pages/register.tsx b/web/pages/register.tsx index d468e08..7aee5c4 100644 --- a/web/pages/register.tsx +++ b/web/pages/register.tsx @@ -9,7 +9,7 @@ import {createUserWithEmailAndPassword} from "firebase/auth"; import {auth} from "web/lib/firebase/users"; import FavIcon from "web/public/FavIcon"; import {LovePage} from "web/components/love-page"; -import {getProfileRow} from "common/love/profile"; +import {getProfileRow} from "common/profiles/profile"; import {db} from "web/lib/supabase/db"; import Router from "next/router"; import {useUser} from "web/hooks/use-user"; diff --git a/web/pages/signin.tsx b/web/pages/signin.tsx index db55809..3e1f9a4 100644 --- a/web/pages/signin.tsx +++ b/web/pages/signin.tsx @@ -7,7 +7,7 @@ import {auth, firebaseLogin} from "web/lib/firebase/users"; import FavIcon from "web/public/FavIcon"; import {signInWithEmailAndPassword} from "firebase/auth"; -import {getProfileRow} from "common/love/profile"; +import {getProfileRow} from "common/profiles/profile"; import {db} from "web/lib/supabase/db"; import Router from "next/router"; import {LovePage} from "web/components/love-page"; diff --git a/web/pages/signup.tsx b/web/pages/signup.tsx index 45973f0..018268c 100644 --- a/web/pages/signup.tsx +++ b/web/pages/signup.tsx @@ -12,7 +12,7 @@ import {track} from 'web/lib/service/analytics' import {safeLocalStorage} from 'web/lib/util/local' import {removeNullOrUndefinedProps} from 'common/util/object' import {useProfileByUserId} from 'web/hooks/use-profile' -import {ProfileRow} from 'common/love/profile' +import {ProfileRow} from 'common/profiles/profile' import {LovePage} from "web/components/love-page"; export default function SignupPage() {