Revert "🎃👻🧛 (l2beat#5538)" (l2beat#5692)

morph-l2 · Nov 4, 2024 · af4ccf0 · af4ccf0
1 parent 950c85b
commit af4ccf0
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 227 deletions.
diff --git a/packages/frontend/src/app/(side-nav)/bridges/summary/page.tsx b/packages/frontend/src/app/(side-nav)/bridges/summary/page.tsx
@@ -1,7 +1,6 @@
 import { BridgesTvlChart } from '~/components/chart/tvl/bridges-tvl-chart'
 import { MainPageCard } from '~/components/main-page-card'
 import { MainPageHeader } from '~/components/main-page-header'
-import { SpiderWeb } from '~/components/spider-web'
 import { getBridgesSummaryEntries } from '~/server/features/bridges/get-bridges-summary-entries'
 import { HydrateClient, api } from '~/trpc/server'
 import { getCookie } from '~/utils/cookies/server'
@@ -32,8 +31,7 @@ export default async function Page() {
         <BridgesFilterContextProvider>
           <MainPageHeader>Summary</MainPageHeader>
           <BridgesMvpWarning className="md:mb-3" sidebar />
-          <MainPageCard className="relative">
-            <SpiderWeb className="absolute left-0 top-0 hidden md:block" />
+          <MainPageCard>
             <BridgesTvlChart />
           </MainPageCard>
           <MainPageCard className="md:mt-6">

diff --git a/packages/frontend/src/app/(side-nav)/scaling/activity/page.tsx b/packages/frontend/src/app/(side-nav)/scaling/activity/page.tsx
@@ -2,7 +2,6 @@ import { HOMEPAGE_MILESTONES } from '@l2beat/config'
 import { ActivityChart } from '~/components/chart/activity/activity-chart'
 import { MainPageCard } from '~/components/main-page-card'
 import { MainPageHeader } from '~/components/main-page-header'
-import { SpiderWeb } from '~/components/spider-web'
 import { getScalingActivityEntries } from '~/server/features/scaling/get-scaling-activity-entries'
 import { HydrateClient, api } from '~/trpc/server'
 import { getCookie } from '~/utils/cookies/server'
@@ -35,8 +34,7 @@ export default async function Page() {
       <ScalingFilterContextProvider>
         <ActivityTimeRangeContextProvider>
           <MainPageHeader>Activity</MainPageHeader>
-          <MainPageCard className="relative">
-            <SpiderWeb className="absolute left-0 top-0 hidden md:block" />
+          <MainPageCard>
             <ActivityChart
               milestones={HOMEPAGE_MILESTONES}
               entries={

diff --git a/packages/frontend/src/app/(side-nav)/scaling/costs/page.tsx b/packages/frontend/src/app/(side-nav)/scaling/costs/page.tsx
@@ -2,7 +2,6 @@ import { HOMEPAGE_MILESTONES } from '@l2beat/config'
 import { ScalingCostsChart } from '~/components/chart/costs/scaling-costs-chart'
 import { MainPageCard } from '~/components/main-page-card'
 import { MainPageHeader } from '~/components/main-page-header'
-import { SpiderWeb } from '~/components/spider-web'
 import { getScalingCostsEntries } from '~/server/features/scaling/costs/get-scaling-costs-entries'
 import { HydrateClient, api } from '~/trpc/server'
 import { getCookie } from '~/utils/cookies/server'
@@ -32,8 +31,7 @@ export default async function Page() {
           <CostsUnitContextProvider>
             <CostsMetricContextProvider>
               <MainPageHeader>Onchain costs</MainPageHeader>
-              <MainPageCard className="relative">
-                <SpiderWeb className="absolute left-0 top-0 hidden md:block" />
+              <MainPageCard>
                 <ScalingCostsChart
                   entries={
                     entries.type === 'recategorised'

diff --git a/packages/frontend/src/app/(side-nav)/scaling/summary/_components/chart-tabs.tsx b/packages/frontend/src/app/(side-nav)/scaling/summary/_components/chart-tabs.tsx
@@ -4,7 +4,6 @@ import { ScalingSummaryActivityChart } from '~/components/chart/activity/scaling
 import { ScalingSummaryTvlChart } from '~/components/chart/tvl/scaling-summary-tvl-chart'
 import { type ChartUnit } from '~/components/chart/types'
 import { MainPageCard } from '~/components/main-page-card'
-import { SpiderWeb } from '~/components/spider-web'
 import { type ActivityTimeRange } from '~/server/features/scaling/activity/utils/range'
 import { cn } from '~/utils/cn'
 import { type TimeRange } from '~/utils/range/range'
@@ -17,8 +16,7 @@ interface Props {
 
 export function ChartTabs({ unit, timeRange, className }: Props) {
   return (
-    <MainPageCard className={cn(className, 'relative pb-1')}>
-      <SpiderWeb className="absolute left-0 top-0 hidden md:block" />
+    <MainPageCard className={cn(className, 'pb-1')}>
       <Tabs.Root defaultValue="tvl">
         <Tabs.Content value="tvl">
           <ScalingSummaryTvlChart unit={unit} timeRange={timeRange} />

diff --git a/packages/frontend/src/app/(side-nav)/scaling/summary/page.tsx b/packages/frontend/src/app/(side-nav)/scaling/summary/page.tsx
@@ -2,7 +2,6 @@ import { ScalingSummaryActivityChart } from '~/components/chart/activity/scaling
 import { ScalingSummaryTvlChart } from '~/components/chart/tvl/scaling-summary-tvl-chart'
 import { MainPageCard } from '~/components/main-page-card'
 import { MainPageHeader } from '~/components/main-page-header'
-import { SpiderWeb } from '~/components/spider-web'
 import { getScalingSummaryEntries } from '~/server/features/scaling/summary/get-scaling-summary-entries'
 import { HydrateClient, api } from '~/trpc/server'
 import { getDefaultMetadata } from '~/utils/metadata'
@@ -41,12 +40,10 @@ export default async function Page() {
     <HydrateClient>
       <MainPageHeader>Summary</MainPageHeader>
       <div className="grid grid-cols-2 gap-4 max-lg:hidden">
-        <MainPageCard className="relative">
-          <SpiderWeb className="absolute left-0 top-0" />
+        <MainPageCard>
           <ScalingSummaryTvlChart unit={UNIT} timeRange={TIME_RANGE} />
         </MainPageCard>
-        <MainPageCard className="relative">
-          <SpiderWeb className="absolute left-0 top-0" />
+        <MainPageCard>
           <ScalingSummaryActivityChart timeRange={TIME_RANGE} />
         </MainPageCard>
       </div>

diff --git a/packages/frontend/src/app/(side-nav)/scaling/tvl/page.tsx b/packages/frontend/src/app/(side-nav)/scaling/tvl/page.tsx
@@ -2,7 +2,6 @@ import { HOMEPAGE_MILESTONES } from '@l2beat/config'
 import { ScalingStackedTvlChart } from '~/components/chart/tvl/stacked/scaling-stacked-tvl-chart'
 import { MainPageCard } from '~/components/main-page-card'
 import { MainPageHeader } from '~/components/main-page-header'
-import { SpiderWeb } from '~/components/spider-web'
 import { getImplementationChangeReport } from '~/server/features/implementation-change-report/get-implementation-change-report'
 import { getScalingTvlEntries } from '~/server/features/scaling/tvl/get-scaling-tvl-entries'
 import { get7dTvlBreakdown } from '~/server/features/scaling/tvl/utils/get-7d-tvl-breakdown'
@@ -44,8 +43,7 @@ export default async function Page() {
       <ScalingFilterContextProvider>
         <ScalingAssociatedTokensContextProvider>
           <MainPageHeader>Value Locked</MainPageHeader>
-          <MainPageCard className="relative">
-            <SpiderWeb className="absolute left-0 top-0 hidden md:block" />
+          <MainPageCard>
             <ScalingStackedTvlChart
               milestones={HOMEPAGE_MILESTONES}
               entries={

diff --git a/packages/frontend/src/app/layout.tsx b/packages/frontend/src/app/layout.tsx
@@ -11,7 +11,6 @@ import { GlossaryContextProvider } from '../components/markdown/glossary-context
 import { ProgressBar } from '../components/progress-bar'
 import { roboto } from '../fonts'
 import '../styles/globals.css'
-import HalloweenCursor from '~/components/halloween-cursor'
 import { getSearchBarProjects } from '~/components/search-bar/get-search-bar-projects'
 import { SearchBarContextProvider } from '~/components/search-bar/search-bar-context'
 
@@ -60,7 +59,6 @@ export default async function RootLayout({
                   }))}
                 >
                   <SearchBarContextProvider projects={searchBarProjects}>
-                    <HalloweenCursor />
                     {children}
                   </SearchBarContextProvider>
                   <ProgressBar />

diff --git a/packages/frontend/src/components/chart/core/chart.tsx b/packages/frontend/src/components/chart/core/chart.tsx
@@ -1,6 +1,6 @@
 'use client'
-import { HalloweenLogo } from '~/components/halloween-logo'
 import { cn } from '~/utils/cn'
+import { Logo } from '../../logo'
 import { ChartHover } from './chart-hover'
 import { ChartInteractionZone } from './chart-interaction-zone'
 import { ChartLabels } from './chart-labels'
@@ -33,9 +33,9 @@ export function Chart({ className, disableHovers, disableMilestones }: Props) {
       {!disableHovers && <ChartHover />}
       {!disableMilestones && <ChartMilestones />}
       <ChartNoDataState />
-      <HalloweenLogo
+      <Logo
         animated={false}
-        className="absolute bottom-2 right-3 z-30 h-[41px] w-20 opacity-50"
+        className="absolute bottom-3 right-3 z-30 h-8 w-20 opacity-50"
       />
       <ChartTimeline />
     </div>

diff --git a/packages/frontend/src/components/halloween-cursor.tsx b/packages/frontend/src/components/halloween-cursor.tsx
diff --git a/packages/frontend/src/components/halloween-logo.tsx b/packages/frontend/src/components/halloween-logo.tsx
diff --git a/packages/frontend/src/components/nav/legacy-navbar.tsx b/packages/frontend/src/components/nav/legacy-navbar.tsx
@@ -3,7 +3,7 @@ import { externalLinks } from '~/consts/external-links'
 import { env } from '~/env'
 import { HiringBadge } from '../badge/hiring-badge'
 import { DarkThemeToggle } from '../dark-theme-toggle'
-import { HalloweenLogo } from '../halloween-logo'
+import { Logo } from '../logo'
 import { SmallSearchBarButton } from '../search-bar/search-bar-button'
 import { SocialLinks } from '../social-links'
 import { LegacyNavLink } from './legacy-nav-link'
@@ -25,7 +25,7 @@ export function LegacyNavbar({
         <ul className="flex items-center py-4">
           <li className="mr-8">
             <Link href={logoLink}>
-              <HalloweenLogo className="h-[41px] w-auto" />
+              <Logo className="h-8 w-auto" />
             </Link>
           </li>
           {groups.map((group) => {

diff --git a/packages/frontend/src/components/nav/mobile-navbar.tsx b/packages/frontend/src/components/nav/mobile-navbar.tsx
@@ -1,5 +1,5 @@
 import Link from 'next/link'
-import { HalloweenLogo } from '../halloween-logo'
+import { Logo } from '../logo'
 import { SmallSearchBarButton } from '../search-bar/search-bar-button'
 import { MobileNavTabs } from './mobile-nav-tabs'
 import { MobileNavTriggerOpen } from './mobile-nav-trigger'
@@ -20,7 +20,7 @@ export function MobileNavbar({
         <div className="flex items-center gap-3">
           <div className="py-4">
             <Link href={logoLink}>
-              <HalloweenLogo className="h-[41px] w-auto" />
+              <Logo className="h-8 w-auto" />
             </Link>
           </div>
           <MobileSelectedLink groups={groups} />

diff --git a/packages/frontend/src/components/nav/nav-sidebar.tsx b/packages/frontend/src/components/nav/nav-sidebar.tsx
@@ -3,7 +3,7 @@ import { externalLinks } from '~/consts/external-links'
 import { env } from '~/env'
 import { HiringBadge } from '../badge/hiring-badge'
 import { DarkThemeToggle } from '../dark-theme-toggle'
-import { HalloweenLogo } from '../halloween-logo'
+import { Logo } from '../logo'
 import { SocialLinks } from '../social-links'
 import { MobileNavTriggerClose } from './mobile-nav-trigger'
 import { NavLinkGroup } from './nav-link-group'
@@ -24,7 +24,7 @@ export async function NavSidebar({ groups, logoLink, legacyNav }: Props) {
     <NavSideBarWrapper legacyNav={legacyNav}>
       <div className="flex h-[38px] flex-row items-center justify-between">
         <Link href={logoLink}>
-          <HalloweenLogo className="block h-[41px] w-auto" animated />
+          <Logo className="block h-8 w-auto" />
         </Link>
         <div className="flex flex-row items-center gap-4">
           <DarkThemeToggle />