Skip to content

Commit

Permalink
Merge commit '2cadf283771310006491222794c008c22054e812' into fix-routing
Browse files Browse the repository at this point in the history
  • Loading branch information
Mati0x committed Aug 6, 2024
2 parents 0e9b94b + 2cadf28 commit 84762b8
Show file tree
Hide file tree
Showing 13 changed files with 165 additions and 111 deletions.
19 changes: 13 additions & 6 deletions apps/web/app/(app)/gardens/[chain]/[garden]/[community]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
CurrencyDollarIcon,
PlusIcon,
RectangleGroupIcon,
UserGroupIcon,
} from "@heroicons/react/24/outline";
import { Dnum } from "dnum";
import Image from "next/image";
Expand Down Expand Up @@ -199,7 +200,11 @@ export default function Page({
<EthAddress address={communityAddr as Address} />
</div>
<div className="flex flex-col gap-2">
<Statistic label="members" count={members?.length ?? 0} />
<Statistic
label="members"
count={members?.length ?? 0}
icon={<UserGroupIcon />}
/>
<Statistic
label="pools"
icon={<RectangleGroupIcon />}
Expand All @@ -214,12 +219,11 @@ export default function Page({
</Statistic>
<div className="flex">
<p className="font-medium">Registration cost:</p>
<InfoIcon content={`Registration amount: ${parseToken(registrationAmount)} ${tokenGarden.symbol}\nCommunity fee: ${parseToken(parsedCommunityFee())} ${tokenGarden.symbol}`}>
<InfoIcon
content={`Registration amount: ${parseToken(registrationAmount)} ${tokenGarden.symbol}\nCommunity fee: ${parseToken(parsedCommunityFee())} ${tokenGarden.symbol}`}
>
<DisplayNumber
number={[
getTotalRegistrationCost(),
tokenGarden?.decimals,
]}
number={[getTotalRegistrationCost(), tokenGarden?.decimals]}
className="font-semibold text-primary-content"
disableTooltip={true}
compact={true}
Expand Down Expand Up @@ -274,6 +278,7 @@ export default function Page({
key={pool.poolId}
tokenGarden={{
decimals: tokenGarden?.decimals ?? 18,
symbol: tokenGarden?.symbol ?? "",
}}
pool={pool}
/>
Expand All @@ -289,6 +294,7 @@ export default function Page({
<PoolCard
key={pool.poolId}
tokenGarden={{
symbol: tokenGarden?.symbol ?? "",
decimals: tokenGarden?.decimals ?? 18,
}}
pool={pool}
Expand All @@ -306,6 +312,7 @@ export default function Page({
key={pool.poolId}
tokenGarden={{
decimals: tokenGarden?.decimals ?? 18,
symbol: tokenGarden?.symbol ?? "",
}}
pool={pool}
/>
Expand Down
15 changes: 12 additions & 3 deletions apps/web/app/(app)/gardens/[chain]/[garden]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
"use client";

import React, { useEffect } from "react";
import { CubeTransparentIcon, PlusIcon } from "@heroicons/react/24/outline";
import {
CubeTransparentIcon,
PlusIcon,
UserGroupIcon,
} from "@heroicons/react/24/outline";
import Image from "next/image";
import Link from "next/link";
import { Address } from "viem";
Expand Down Expand Up @@ -110,7 +114,8 @@ export default function Page({
<div>
<div className="mb-2 flex flex-col">
<div className="flex items-center gap-4">
<h2>{tokenGarden?.name}</h2> <TokenLabel chainId={chain} />
<h2>{tokenGarden?.name}</h2>{" "}
<TokenLabel chainId={chain} classNames="bg-neutral-soft" />
</div>
<EthAddress address={tokenGarden?.id as Address} />
</div>
Expand All @@ -128,7 +133,11 @@ export default function Page({
icon={<CubeTransparentIcon />}
count={communities?.length ?? 0}
/>
<Statistic label="members" count={gardenTotalMembers()} />
<Statistic
label="members"
count={gardenTotalMembers()}
icon={<UserGroupIcon />}
/>
</div>
</div>
</header>
Expand Down
Binary file modified apps/web/assets/CommunityImage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed apps/web/assets/ProposalImage.png
Binary file not shown.
Binary file modified apps/web/assets/ecosystem.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 23 additions & 8 deletions apps/web/assets/gardenLand.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions apps/web/assets/gardenLandBefore.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 84762b8

Please sign in to comment.