From 44bd60afe8aa4ef0a1437de766e5e31d77af7cf7 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Wed, 15 Feb 2023 17:07:26 +0200
Subject: [PATCH] Adjust layout

---
 app/components/Main.tsx         | 39 +++++++++++++++------------------
 app/components/layout/index.tsx |  4 ++++
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/components/Main.tsx b/app/components/Main.tsx
index 490e30a2c..e24f719b5 100644
--- a/app/components/Main.tsx
+++ b/app/components/Main.tsx
@@ -19,26 +19,23 @@ export const Main = ({
   const showLeaderboard = !user?.patronTier;
 
   return (
-    <>
-      {showLeaderboard ? <div id="top-leaderboard" /> : null}
-      <main
-        className={
-          classNameOverwrite
-            ? clsx(classNameOverwrite, {
-                "half-width": halfWidth,
-                "pt-12-forced": showLeaderboard,
-              })
-            : clsx(
-                "layout__main",
-                "main",
-                { "half-width": halfWidth, "pt-12-forced": showLeaderboard },
-                className
-              )
-        }
-        style={style}
-      >
-        {children}
-      </main>
-    </>
+    <main
+      className={
+        classNameOverwrite
+          ? clsx(classNameOverwrite, {
+              "half-width": halfWidth,
+              "pt-12-forced": showLeaderboard,
+            })
+          : clsx(
+              "layout__main",
+              "main",
+              { "half-width": halfWidth, "pt-12-forced": showLeaderboard },
+              className
+            )
+      }
+      style={style}
+    >
+      {children}
+    </main>
   );
 };
diff --git a/app/components/layout/index.tsx b/app/components/layout/index.tsx
index b898f2d35..aae6d28e9 100644
--- a/app/components/layout/index.tsx
+++ b/app/components/layout/index.tsx
@@ -50,6 +50,9 @@ export const Layout = React.memo(function Layout({
 
   const isFrontPage = location.pathname === "/";
 
+  const showLeaderboard =
+    !user?.patronTier && !location.pathname.includes("plans");
+
   return (
     <div className="layout__container">
       <header className="layout__header">
@@ -107,6 +110,7 @@ export const Layout = React.memo(function Layout({
         </div>
       </header>
       {!isFrontPage ? <SideNav /> : null}
+      {showLeaderboard ? <div id="top-leaderboard" /> : null}
       {children}
       <Footer patrons={patrons} />
     </div>