[feat] Contracts Changes Dev to Main

.github/workflows/ci.yaml

@@ -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

.gitignore

@@ -10,8 +10,8 @@ coverage
 
 # next.js
 .next/
-out/
 build
+**/src/generated.ts
 
 # misc
 .DS_Store
@@ -38,10 +38,12 @@ 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
 pkg/**/data
+

.gitmodules

@@ -4,3 +4,9 @@
 [submodule "lib/allo-v2"]
  path = lib/allo-v2
  url = https://github.com/allo-protocol/allo-v2
+[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

.prettierrc.json

@@ -0,0 +1,23 @@
+{
+ "plugins": [
+ "@ianvs/prettier-plugin-sort-imports",
+ "prettier-plugin-tailwindcss"
+ ],
+ "tailwindConfig": "./packages/config/tailwind",
+ "importOrder": [
+ "^(react/(.*)$)|^(react$)|^(react-native(.*)$)",
+ "^(next/(.*)$)|^(next$)",
+ "^(expo(.*)$)|^(expo$)",
+ "<THIRD_PARTY_MODULES>",
+ "",
+ "^@blobscan/(.*)$",
+ "",
+ "^~/utils/(.*)$",
+ "^~/components/(.*)$",
+ "^~/styles/(.*)$",
+ "^~/(.*)$",
+ "^[./]"
+ ],
+ "importOrderParserPlugins": ["typescript", "jsx", "decorators-legacy"],
+ "importOrderTypeScriptVersion": "4.4.0"
+}

.vscode/settings.json

@@ -2,7 +2,7 @@
  "solidity.packageDefaultDependenciesContractsDirectory": "pkg/contracts/src",
  "solidity.packageDefaultDependenciesDirectory": "lib",
  "[solidity]": {
- "editor.defaultFormatter": "JuanBlanco.solidity",
+ "editor.defaultFormatter": "NomicFoundation.hardhat-solidity",
  "editor.formatOnSave": true
  },
  "solidity.formatter": "forge",

apps/web/.eslintrc.js

@@ -1,4 +1,16 @@
+/**
+ * @type {import('eslint').Linter.Config}
+ */
 module.exports = {
- root: true,
- extends: ["custom"],
+ extends: ["next/core-web-vitals", "turbo", "prettier"],
+ ignorePatterns: ["node_modules", "dist"],
+ parserOptions: {
+ babelOptions: {
+ presets: [require.resolve("next/babel")],
+ },
+ },
+ rules: {
+ "react-hooks/exhaustive-deps": "off",
+ "no-html-link-for-pages": "off",
+ },
 };

apps/web/app/(app)/create-garden/page.tsx

@@ -0,0 +1,5 @@
+import React from "react";
+
+export default function CreateGarden() {
+ return <div>Create a garden form...</div>;
+}

apps/web/app/(app)/docs/page.tsx

@@ -0,0 +1,5 @@
+import React from "react";
+
+export default function Docs() {
+ return <div>Docs...</div>;
+}

apps/web/app/(app)/gardens/communities/page.tsx

@@ -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,
+ },
+ ],
+ },
+];