diff --git a/src/middleware.ts b/src/_middleware.ts similarity index 100% rename from src/middleware.ts rename to src/_middleware.ts diff --git a/src/app/explorer/_components/Explorer.tsx b/src/app/explorer/_components/Explorer.tsx index 1d7bd34085..ec27a49f9d 100644 --- a/src/app/explorer/_components/Explorer.tsx +++ b/src/app/explorer/_components/Explorer.tsx @@ -24,7 +24,7 @@ export const Explorer = ({ searchParams }: { searchParams: SearchParams }) => {

Explore verified guilds

-
+
diff --git a/src/app/explorer/_components/HeaderBackground.tsx b/src/app/explorer/_components/HeaderBackground.tsx index ec91d98f66..35d51615d4 100644 --- a/src/app/explorer/_components/HeaderBackground.tsx +++ b/src/app/explorer/_components/HeaderBackground.tsx @@ -13,9 +13,9 @@ export const HeaderBackground = () => { className={cn( "fixed inset-x-0 top-0 z-10 h-0 bg-card shadow-md transition-all duration-200 dark:bg-background", { - "h-16": isNavStuck, - "h-[calc(theme(space.36)+theme(space.2))] bg-gradient-to-b from-card to-background sm:h-[calc(theme(space.28)-theme(space.2))] dark:from-background dark:to-card-secondary/50": - isSearchStuck, + "h-28": isNavStuck, + // "h-[calc(theme(space.36)+theme(space.2))] bg-gradient-to-b from-card to-background sm:h-[calc(theme(space.28)-theme(space.2))] dark:from-background dark:to-card-secondary/50": + // isSearchStuck, } )} /> diff --git a/src/app/explorer/_components/StickyBar.tsx b/src/app/explorer/_components/StickyBar.tsx index 1c4959e197..1c4cef823a 100644 --- a/src/app/explorer/_components/StickyBar.tsx +++ b/src/app/explorer/_components/StickyBar.tsx @@ -7,7 +7,7 @@ import { cn } from "@/lib/utils" import { Plus } from "@phosphor-icons/react" import useIsStuck from "hooks/useIsStuck" import useScrollspy from "hooks/useScrollSpy" -import { useAtom, useAtomValue, useSetAtom } from "jotai" +import { useAtom, useAtomValue } from "jotai" import Link from "next/link" import { useEffect } from "react" import { activeSectionAtom, isNavStuckAtom, isSearchStuckAtom } from "../atoms" @@ -38,7 +38,8 @@ const Nav = () => { value && setActiveSection(value as ActiveSection)} value={activeSection} @@ -46,7 +47,7 @@ const Nav = () => { smoothScrollTo(ActiveSection.YourGuilds)} > @@ -55,7 +56,7 @@ const Nav = () => { smoothScrollTo(ActiveSection.ExploreGuilds)} > @@ -92,7 +93,7 @@ const CreateGuildLink = () => { export const StickyBar = () => { const { isWeb3Connected } = useWeb3ConnectionManager() - const setIsNavStuck = useSetAtom(isNavStuckAtom) + const [isNavStuck, setIsNavStuck] = useAtom(isNavStuckAtom) const isSearchStuck = useAtomValue(isSearchStuckAtom) const { ref: navToggleRef } = useIsStuck(setIsNavStuck) @@ -101,7 +102,8 @@ export const StickyBar = () => { className={cn( "sticky top-0 z-10 flex h-16 w-full items-center transition-all", { - "h-12": isSearchStuck, + // "h-12": isSearchStuck, + "pt-20": isNavStuck, } )} ref={navToggleRef} diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 4b5f1666e3..6bd7def244 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -4,6 +4,7 @@ import { dystopian, inter } from "fonts" import { type ReactNode, Suspense } from "react" import "./globals.css" import { OAuthResultToast } from "@/components/Providers/OAuthResultToast" +import { ReadOnlyBanner } from "@/components/ReadOnlyBanner" import { TermsOfUseUpdateDialog } from "@/components/TermsOfUseUpdateDialog" import { cn } from "@/lib/utils" import type { Metadata, Viewport } from "next" @@ -58,15 +59,19 @@ export default function RootLayout({ children }: RootLayoutProps) { - - {children} + - - - - - - +
+ + {children} + + + + + + + +
- + +
+ +
diff --git a/src/v2/components/Account/Account.tsx b/src/v2/components/Account/Account.tsx index ec016a3404..ad07ce9b77 100644 --- a/src/v2/components/Account/Account.tsx +++ b/src/v2/components/Account/Account.tsx @@ -17,8 +17,28 @@ import { Avatar } from "../ui/Avatar" import { Button } from "../ui/Button" import { Card } from "../ui/Card" import { Skeleton } from "../ui/Skeleton" +import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/Tooltip" -export const Account = () => { +export const Account = () => ( + + + + + + + + Please use Guild v2 + +) + +export const _Account = () => { const { address, isWeb3Connected } = useWeb3ConnectionManager() const setIsAccountModalOpen = useSetAtom(accountModalAtom) const setIsWalletSelectorModalOpen = useSetAtom(walletSelectorModalAtom) diff --git a/src/v2/components/ReadOnlyBanner.tsx b/src/v2/components/ReadOnlyBanner.tsx new file mode 100644 index 0000000000..427bb0dd55 --- /dev/null +++ b/src/v2/components/ReadOnlyBanner.tsx @@ -0,0 +1,15 @@ +import { ArrowRight } from "@phosphor-icons/react/dist/ssr" +import { Anchor } from "./ui/Anchor" + +export const ReadOnlyBanner = () => ( +
+ Guild Classic is in read-only mode. Please use the new  + + Guild.xyz website + + +
+) diff --git a/src/v2/components/StickyAction.tsx b/src/v2/components/StickyAction.tsx index c2eeb4a8c5..6a0be208ce 100644 --- a/src/v2/components/StickyAction.tsx +++ b/src/v2/components/StickyAction.tsx @@ -19,7 +19,7 @@ const StickyAction = ({ children }: PropsWithChildren) => { ref={ref} className={cn( "max-sm:fixed max-sm:right-0 max-sm:bottom-0 max-sm:left-0 max-sm:z-10 max-sm:border-t max-sm:bg-card max-sm:shadow-2xl", - "sm:sticky sm:top-3" + "sm:sticky sm:top-[calc(theme(space.12)+theme(space.3))]" )} > {children} @@ -34,7 +34,7 @@ const DesktopHeaderBar = ({ }: PropsWithChildren<{ isOpen: boolean }>) => (