From 05fa2f98835cb809b98b5289a355341d161d21a7 Mon Sep 17 00:00:00 2001 From: MartinBraquet Date: Thu, 9 Oct 2025 19:47:32 +0200 Subject: [PATCH] Add socials and organization pages --- common/src/constants.ts | 4 +- web/components/love-page.tsx | 61 +++++++++-------- web/components/nav/love-bottom-nav-bar.tsx | 77 +++++++++++----------- web/pages/organization.tsx | 38 +++++++++++ web/pages/social.tsx | 39 +++++++++++ 5 files changed, 150 insertions(+), 69 deletions(-) create mode 100644 web/pages/organization.tsx create mode 100644 web/pages/social.tsx diff --git a/common/src/constants.ts b/common/src/constants.ts index be861c08..9bab04a5 100644 --- a/common/src/constants.ts +++ b/common/src/constants.ts @@ -2,7 +2,7 @@ export const MAX_INT = 99999 export const MIN_INT = -MAX_INT export const supportEmail = 'hello@compassmeet.com'; -export const marketingEmail = 'hello@compassmeet.com'; +// export const marketingEmail = 'hello@compassmeet.com'; export const githubRepo = "https://github.com/CompassConnections/Compass"; export const githubIssues = `${githubRepo}/issues` @@ -11,6 +11,8 @@ export const paypalLink = "https://www.paypal.com/paypalme/CompassConnections" export const patreonLink = "https://patreon.com/CompassMeet" export const discordLink = "https://discord.gg/8Vd7jzqjun" export const stoatLink = "https://stt.gg/YKQp81yA" +export const redditLink = "https://www.reddit.com/r/CompassConnect" +export const xLink = "https://x.com/compassmeet" export const formLink = "https://forms.gle/tKnXUMAbEreMK6FC6" export const pStyle = "mt-1 text-gray-800 dark:text-white whitespace-pre-line"; diff --git a/web/components/love-page.tsx b/web/components/love-page.tsx index ffddb5c0..9eee7f72 100644 --- a/web/components/love-page.tsx +++ b/web/components/love-page.tsx @@ -1,6 +1,8 @@ import {HomeIcon, QuestionMarkCircleIcon} from '@heroicons/react/outline' import { + GlobeAltIcon, HomeIcon as SolidHomeIcon, + LinkIcon, QuestionMarkCircleIcon as SolidQuestionIcon, UserCircleIcon, } from '@heroicons/react/solid' @@ -44,13 +46,11 @@ export function LovePage(props: { const profile = useProfile() const bottomNavOptions = user ? getBottomNavigation(user, profile) - : signedOutNavigation() + : getBottomSignedOutNavigation() // const [isModalOpen, setIsModalOpen] = useState(false) - const desktopSidebarOptions = getDesktopNav(user) + const desktopSidebarOptions = getDesktopNavigation(user) - const mobileSidebarOptions = user - ? getSidebarNavigation(() => setIsAddFundsModalOpen(true)) - : [] + const mobileSidebarOptions = getMobileSidebar(() => setIsAddFundsModalOpen(true)) // eslint-disable-next-line react-hooks/rules-of-hooks trackPageView && useTracking(`view love ${trackPageView}`, trackPageProps) @@ -59,7 +59,7 @@ export function LovePage(props: { return ( <> - + {/* Maintenance banner */} - {IS_MAINTENANCE &&
- Maintenance in progress: Some features may be broken for the next few hours. -
} + {IS_MAINTENANCE && +
+ Maintenance in progress: Some features may be broken for the next few hours. +
} {hideSidebar ? ( -
+
) : ( + /> )}
[ +const getBottomSignedOutNavigation = () => [ Profiles, About, - faq, Signin, ] -const getDesktopNav = (user: User | null | undefined) => { + +const getDesktopNavigation = (user: User | null | undefined) => { if (user) return buildArray( ProfilesHome, Notifs, Messages, - About, - faq + ...base, ) return buildArray( - // { name: 'Profiles', href: '/', icon: HomeIcon }, - About, - faq + ...base ) } -// No sidebar when signed out -const getSidebarNavigation = (_toggleModal: () => void) => { +const getMobileSidebar = (_toggleModal: () => void) => { return buildArray( - About, - faq + ...base, ) } diff --git a/web/components/nav/love-bottom-nav-bar.tsx b/web/components/nav/love-bottom-nav-bar.tsx index a14d41bf..b2ebe95b 100644 --- a/web/components/nav/love-bottom-nav-bar.tsx +++ b/web/components/nav/love-bottom-nav-bar.tsx @@ -1,18 +1,18 @@ import Link from 'next/link' import clsx from 'clsx' -import { MenuAlt3Icon } from '@heroicons/react/solid' -import { Transition, Dialog } from '@headlessui/react' -import { useState, Fragment } from 'react' -import { useRouter } from 'next/router' +import {MenuAlt3Icon} from '@heroicons/react/solid' +import {Dialog, Transition} from '@headlessui/react' +import {Fragment, useState} from 'react' +import {useRouter} from 'next/router' import Sidebar from './love-sidebar' -import { Item } from './love-sidebar-item' -import { useUser } from 'web/hooks/use-user' -import { Avatar } from 'web/components/widgets/avatar' -import { useIsIframe } from 'web/hooks/use-is-iframe' -import { trackCallback } from 'web/lib/service/analytics' -import { User } from 'common/user' -import { Col } from 'web/components/layout/col' -import { useProfile } from 'web/hooks/use-profile' +import {Item} from './love-sidebar-item' +import {useUser} from 'web/hooks/use-user' +import {Avatar} from 'web/components/widgets/avatar' +import {useIsIframe} from 'web/hooks/use-is-iframe' +import {trackCallback} from 'web/lib/service/analytics' +import {User} from 'common/user' +import {Col} from 'web/components/layout/col' +import {useProfile} from 'web/hooks/use-profile' const itemClass = 'sm:hover:bg-ink-200 block w-full py-1 px-3 text-center sm:hover:text-primary-700 transition-colors' @@ -24,7 +24,7 @@ export function BottomNavBar(props: { navigationOptions: Item[] sidebarNavigationOptions: Item[] }) { - const { navigationOptions, sidebarNavigationOptions } = props + const {navigationOptions, sidebarNavigationOptions} = props const [sidebarOpen, setSidebarOpen] = useState(false) const router = useRouter() @@ -38,7 +38,8 @@ export function BottomNavBar(props: { } return ( -