Skip to content

Commit

Permalink
Merge pull request #8 from 1Hive/generate-typechain
Browse files Browse the repository at this point in the history
Generate typechain
  • Loading branch information
kamikazebr authored Jan 10, 2024
2 parents 9312e30 + d9c29b5 commit 4c73ea4
Show file tree
Hide file tree
Showing 169 changed files with 6,863 additions and 5,586 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: "pnpm"

- name: Cache pnpm modules
Expand Down
9 changes: 5 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ coverage

# next.js
.next/
out/
build
**/src/generated.ts

# misc
.DS_Store
Expand All @@ -38,9 +38,10 @@ yarn-error.log*
cache/

# Ignores development broadcast logs
!pkg/contracts/broadcast
pkg/contracts/broadcast/*/31337/
pkg/contracts/broadcast/**/dry-run/
!broadcast
broadcast/*/31337/
broadcast/**/1/
broadcast/**/dry-run/

# subgraph
pkg/subgraph/generated
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "lib/safe-contracts"]
path = lib/safe-contracts
url = https://github.com/safe-global/safe-contracts
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
3 changes: 2 additions & 1 deletion apps/web/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ module.exports = {
},
},
rules: {
"@typescript-eslint/no-deprecated": "off",
"react-hooks/exhaustive-deps": "off",
"no-html-link-for-pages": "off",
},
};
160 changes: 160 additions & 0 deletions apps/web/app/(app)/gardens/communities/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
import { honeyIcon, gardenLand } from "@/assets";
import Image from "next/image";
import { CommunityCard } from "@/components";

export default function Garden() {
return (
<div className=" relative mx-auto max-w-5xl space-y-10 rounded-xl border-2 border-black bg-base-100 bg-surface p-8">
{/* header: honey logo +stats */}
<header className="flex items-center justify-between gap-4 py-6">
<div className="flex w-44 items-center justify-center gap-2">
<Image src={honeyIcon} alt="honey icon" className="h-20 w-20" />
<span className="text-2xl font-bold">HNY</span>
</div>
<div className="flex flex-1">
{stats.map((stat, i) => (
<div
className="flex w-full flex-col items-center justify-center gap-2"
key={stat.label + i}
>
<span className="text-3xl font-semibold text-info">
{stat.label}
</span>
<span className="text-xl font-bold">{stat.value}</span>
</div>
))}
</div>
</header>
<section className="mx-auto flex flex-col gap-8">
{/* communites */}
{conmmunities.map((community, i) => (
<CommunityCard {...community} key={community.name + i} />
))}
</section>
</div>
);
}

const stats = [
{
label: "Price",
value: "11.4",
},
{
label: "Total Supply",
value: "49,126",
},
{
label: "Total Support",
value: "8,649 ",
},
];

const conmmunities = [
{
name: "1Hive",
address: "0x...",
href: "1hive",
pools: [
{
name: "Pool 1",
strategy: "c.v",
proposals: 3,
href: "1",
},
{
name: "Pool 2",
strategy: "c.v",
proposals: 6,
href: "2",
},
{
name: "Pool 3",
strategy: "c.v",
proposals: 2,
href: "3",
},
{
name: "Pool 4",
strategy: "c.v",
proposals: 3,
href: "4",
},
{
name: "Pool 5",
strategy: "c.v",
proposals: 6,
href: "5",
},
{
name: "Pool 6",
strategy: "c.v",
proposals: 2,
href: "6",
},
{
name: "Pool 7",
strategy: "c.v",
proposals: 3,
href: "7",
},
{
name: "Pool 8",
strategy: "c.v",
proposals: 6,
href: "8",
},
],
},
{
name: "1hive Memecoins",
address: "0x...",
href: "#",
pools: [
{
name: "Pool 1",
strategy: "c.v",
proposals: 5,
},
{
name: "Pool 2",
strategy: "quest",
proposals: 2,
},
],
},
{
name: "1hive Foundation DAO",
address: "0x...",
href: "#",
pools: [
{
name: "Pool 1",
strategy: "c.v",
proposals: 2,
},
{
name: "Pool 2",
strategy: "quest",
proposals: 3,
},
{
name: "Pool 3",
strategy: "c.v",
proposals: 1,
},
],
},
{
name: "1hive Gardens Swarm",
address: "0x...",
href: "#",
pools: [
{
name: "Pool 1",
strategy: "c.v",
proposals: 8,
},
],
},
];
61 changes: 61 additions & 0 deletions apps/web/app/(app)/gardens/communities/pool/[poolId]/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import { gardenLand } from "@/assets";
import { Proposals } from "@/components";
import Image from "next/image";

export default function Pool({
params: { poolId },
}: {
params: { poolId: string };
}) {
return (
<div className="mx-auto flex max-w-7xl gap-3 px-4 sm:px-6 lg:px-8">
<div className="flex flex-1 flex-col gap-6 rounded-xl border-2 border-black bg-surface p-16">
<header>
<h3 className="text-center">
Pool {poolId} Gardens Swarm Community Funding Pool
</h3>
</header>
<main className="flex flex-col gap-10">
{/* header: description - data - bottom land image */}
<section className="relative flex w-full flex-col items-center overflow-hidden rounded-lg border-2 border-black bg-white">
<div className="mt-4 flex flex-col gap-12 p-8">
<p className="max-w-2xl text-center text-lg font-semibold">
Funding pool for the Gardens Platform. Dedicated to investing in
operations, growth, and improvements of gardens, including
maintenance and bug fixes to the open-source software, community
outreach, support, contributor compensation, and education.
</p>
<div className="flex w-full p-4">
<div className="flex flex-1 flex-col space-y-4 font-semibold">
<span>Strategy type: Conviction Voting</span>
<span>Funding Token: Honey</span>
</div>
<div className="flex flex-1 flex-col items-center space-y-4 font-bold">
<span>Proposals type accepted:</span>
<div className="flex w-full items-center justify-evenly">
<span className="badge w-28 bg-primary p-4">Funding</span>
<span className="badge w-28 bg-secondary p-4">
Streaming
</span>
<span className="badge w-28 bg-accent p-4">Signaling</span>
</div>
</div>
</div>
</div>
<div className="mt-8 flex">
{[...Array(6)].map((_, i) => (
<Image
key={i}
src={gardenLand}
alt="garden land"
className=""
/>
))}
</div>
</section>
<Proposals />
</main>
</div>
</div>
);
}
Loading

0 comments on commit 4c73ea4

Please sign in to comment.