Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/growthepie/gtp-frontend int…
Browse files Browse the repository at this point in the history
…o main
  • Loading branch information
mokelgit committed May 5, 2024
2 parents 65642db + 5332ab1 commit 4e5883a
Show file tree
Hide file tree
Showing 12 changed files with 475 additions and 480 deletions.
12 changes: 0 additions & 12 deletions app/(embeds)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,6 @@ export const metadata: Metadata = {
height: 627,
alt: "growthepie.xyz",
},
{
url: "https://www.growthepie.xyz/logo_full.png",
width: 772,
height: 181,
alt: "growthepie.xyz",
},
{
url: "https://www.growthepie.xyz/logo_pie_only.png",
width: 168,
height: 181,
alt: "growthepie",
},
],
locale: "en_US",
type: "website",
Expand Down
12 changes: 0 additions & 12 deletions app/(fees)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,18 +114,6 @@ export const metadata: Metadata = {
height: 627,
alt: "growthepie.xyz",
},
{
url: `https://${host}/logo_full.png`,
width: 772,
height: 181,
alt: "growthepie.xyz",
},
{
url: `https://${host}/logo_pie_only.png`,
width: 168,
height: 181,
alt: "growthepie",
},
],
locale: "en_US",
type: "website",
Expand Down
14 changes: 1 addition & 13 deletions app/(layout)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,25 +84,14 @@ export const metadata: Metadata = {
title: "growthepie",
description: "Growing Ethereum’s Ecosystem Together",
url: "https://www.growthepie.xyz",

images: [
{
url: "https://www.growthepie.xyz/gtp_og.png",
width: 1200,
height: 627,
alt: "growthepie.xyz",
},
{
url: "https://www.growthepie.xyz/logo_full.png",
width: 772,
height: 181,
alt: "growthepie.xyz",
},
{
url: "https://www.growthepie.xyz/logo_pie_only.png",
width: 168,
height: 181,
alt: "growthepie",
},
],
locale: "en_US",
type: "website",
Expand Down Expand Up @@ -174,7 +163,6 @@ export default function RootLayout({
<SidebarContainer />
<div className="flex flex-col flex-1 overflow-y-auto z-10 overflow-x-hidden relative min-h-full bg-white dark:bg-inherit">
<div className="w-full relative min-h-full">

<div className="background-container">
<div className="background-gradient-group">
<div className="background-gradient-yellow"></div>
Expand Down
4 changes: 4 additions & 0 deletions app/(layout)/server-sitemap.xml/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ export async function GET(request: Request) {
.map(
(option) => `https://www.growthepie.xyz/blockspace/${option.urlKey}`,
),
...Object.keys(masterData.blockspace_categories.main_categories).map(
(category) =>
`https://www.growthepie.xyz/blockspace/chain-overview/${category}`,
),
...chains.options
.filter(
(c) =>
Expand Down
890 changes: 450 additions & 440 deletions components/layout/CategoryMetrics.tsx

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions components/layout/ChainChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1530,6 +1530,7 @@ export default function ChainChart({

{data && (
<div
id="content-container"
className={`grid grid-rows-8 lg:grid-rows-4 lg:grid-cols-2 lg:grid-flow-row gap-y-0 gap-x-[15px] `}
// style={{
// gridRow: `span ${Math.ceil(enabledFundamentalsKeys.length / 2)}`,
Expand Down
3 changes: 2 additions & 1 deletion components/layout/ComparisonChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1642,7 +1642,7 @@ export default function ComparisonChart({

// const { width, height } = useWindowSize();

console.log(data.filter((d) => d.name === "ethereum").length > 0);
// console.log(data.filter((d) => d.name === "ethereum").length > 0);

useLayoutEffect(() => {
if (chartComponent.current) {
Expand Down Expand Up @@ -1907,6 +1907,7 @@ export default function ComparisonChart({
}
>
<div
id="content-container"
className={
is_embed
? "relative block w-full top-0 md:top-8"
Expand Down
3 changes: 3 additions & 0 deletions components/layout/Container.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
type ContainerProps = {
children: React.ReactNode;
id?: string;
className?: string;
ref?: React.Ref<HTMLDivElement>;
style?: React.CSSProperties;
};

export default function Container({
children,
id,
ref,
className = "",
style,
}: ContainerProps) {
return (
<div
id={id}
className={`px-[20px] md:px-[64px] ${className}`}
ref={ref ?? null}
style={style}
Expand Down
5 changes: 4 additions & 1 deletion components/layout/LandingChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1719,7 +1719,10 @@ export default function LandingChart({
);

return (
<div className="w-full h-full flex flex-col justify-between">
<div
id="content-container"
className="w-full h-full flex flex-col justify-between"
>
<div className="h-[225px] lg:h-[81px] xl:h-[60px]">
<div className="flex flex-col lg:hidden justify-center pb-[15px] gap-y-[5px]">
<MobileMetricCard
Expand Down
5 changes: 4 additions & 1 deletion components/layout/OverviewMetrics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,10 @@ export default function OverviewMetrics({
</TopRowContainer>
</Container>
{/*Chain Rows/List */}
<Container className="block w-full !pr-0 lg:!px-[50px]">
<Container
id="content-container"
className="block w-full !pr-0 lg:!px-[50px]"
>
<RowProvider
value={{
master,
Expand Down
1 change: 1 addition & 0 deletions lib/navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ export const navigationItems: NavigationItem[] = [
key: "chain-overview",
rootKey: "chainOverview",
urlKey: "chain-overview",
excludeFromSitemap: true,
},
{
label: "Category Comparison",
Expand Down
5 changes: 5 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ const nextConfig = {
destination: "https://fees.growthepie.xyz",
permanent: true,
},
{
source: "/blockspace/chain-overview",
destination: "/blockspace/chain-overview/nft",
permanent: true,
},
];
},
images: {
Expand Down

0 comments on commit 4e5883a

Please sign in to comment.