Locofy

.gitignore

@@ -1,18 +1 @@
-# directories
-cache
-coverage
-node_modules
-out
-
-# files
-*.env
-*.log
-.DS_Store
-.pnp.*
-lcov.info
-yarn.lock
-
-# broadcasts
-!broadcast
-broadcast/*
-broadcast/*/31337/
+**/node_modules

.gitmodules

@@ -1,24 +1,24 @@
-[submodule "lib/forge-std"]
+[submodule "packages/contracts/lib/forge-std"]
 	branch = "v1"
-	path = "lib/forge-std"
+	path = "packages/contracts/lib/forge-std"
 	url = "https://github.com/foundry-rs/forge-std"
-[submodule "lib/prb-test"]
+[submodule "packages/contracts/lib/prb-test"]
 	branch = "release-v0"
-	path = "lib/prb-test"
+	path = "packages/contracts/lib/prb-test"
 	url = "https://github.com/PaulRBerg/prb-test"
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
+[submodule "packages/contracts/lib/openzeppelin-contracts"]
+	path = packages/contracts/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/osx"]
-	path = lib/osx
+[submodule "packages/contracts/lib/osx"]
+	path = packages/contracts/lib/osx
 	url = https://github.com/aragon/osx
-[submodule "lib/openzeppelin-contracts-upgradeable"]
+[submodule "packages/contracts/lib/openzeppelin-contracts-upgradeable"]
 	branch = "release-v4.9"
-	path = lib/openzeppelin-contracts-upgradeable
+	path = packages/contracts/lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
-[submodule "lib/ens-contracts"]
-	path = lib/ens-contracts
+[submodule "packages/contracts/lib/ens-contracts"]
+	path = packages/contracts/lib/ens-contracts
 	url = https://github.com/ensdomains/ens-contracts
-[submodule "lib/BokkyPooBahsDateTimeLibrary"]
-	path = lib/BokkyPooBahsDateTimeLibrary
+[submodule "packages/contracts/lib/BokkyPooBahsDateTimeLibrary"]
+	path = packages/contracts/lib/BokkyPooBahsDateTimeLibrary
 	url = https://github.com/bokkypoobah/BokkyPooBahsDateTimeLibrary

.vscode/settings.json

@@ -2,9 +2,28 @@
   "[solidity]": {
     "editor.defaultFormatter": "NomicFoundation.hardhat-solidity"
   },
-  "[toml]": {
-    "editor.defaultFormatter": "tamasfe.even-better-toml"
-  },
   "npm.exclude": "**/lib/**",
-  "solidity.formatter": "forge"
-}
+  "solidity.formatter": "forge",
+  "conventionalCommits.scopes": [
+    "hooks"
+  ],
+  "detectedConfig": {
+    "typescript": false,
+    "naming": "Pascal Case",
+    "unit": "rem",
+    "framework": "nextjs",
+    "styling": "Tailwind"
+  },
+  "locofyConfig": {
+    "project_name": "budget2",
+    "id": "6550a1218cd0bab876c5d4ce",
+    "framework": "react",
+    "typescript": true,
+    "path": "public/",
+    "componentsPath": "/Users/abuusama/repos/daobox/budget/packages/dapp/components",
+    "screensPath": "/Users/abuusama/repos/daobox/budget/frontend-v2/pages",
+    "styling": "Tailwind",
+    "unit": "rem",
+    "naming": "Pascal Case"
+  }
+}

README.md

@@ -1,19 +1,35 @@
+<<<<<<< HEAD
 <h1 align="center">DAOBox - Budget</h1>
+=======
+# budget2
 
+>>>>>>> Incoming
+
+<<<<<<< HEAD
 <p align="center">
   <img src="./assets/banner.png" alt="daobox-banner" />
   <br>
   <i>DAOBox - Budget is an Aragon OSx Plugin that allows the execution of payments bypassing the need for regular voting.</i>
   <br>
 </p>
+=======
+Note: Please ensure you have installed <code><a href="https://nodejs.org/en/download/">nodejs</a></code>
+
+>>>>>>> Incoming
 
+<<<<<<< HEAD
 <p align="center">
   <a href="https://github.com/DAObox/budget/actions"><img src="https://github.com/DAObox/budget/actions/workflows/ci.yml/badge.svg" alt="Github Actions"></a>
   <a href="https://getfoundry.sh/"><img src="https://img.shields.io/badge/Built%20with-Foundry-FFDB1C.svg" alt="Foundry"></a>
   <a href="https://opensource.org/license/agpl-v3/"><img src="https://img.shields.io/badge/License-AGPL-blue.svg" alt="License: AGPL-3-0"></a>
   <a href="https://use-aragon.daobox.app"><img src="https://img.shields.io/badge/Docs-DAOBox-blue.svg" alt="Docs"></a>
   <a href="https://discord.gg/d5nCgVt4kE"><img alt="Discord" src="https://img.shields.io/discord/1019114018545352734"></a>
+=======
+To preview and run the project on your device:
 
+>>>>>>> Incoming
+
+<<<<<<< HEAD
 </p>
 
 <hr>
@@ -230,3 +246,38 @@ constraints of this system, this is a non-issue:
 ## License
 
 This project is licensed under AGPL-3.0-or-later
+
+---
+
+```
+[submodule "lib/forge-std"]
+	branch = "v1"
+	path = "lib/forge-std"
+	url = "https://github.com/foundry-rs/forge-std"
+[submodule "lib/prb-test"]
+	branch = "release-v0"
+	path = "lib/prb-test"
+	url = "https://github.com/PaulRBerg/prb-test"
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "lib/osx"]
+	path = lib/osx
+	url = https://github.com/aragon/osx
+[submodule "lib/openzeppelin-contracts-upgradeable"]
+	branch = "release-v4.9"
+	path = lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+[submodule "lib/ens-contracts"]
+	path = lib/ens-contracts
+	url = https://github.com/ensdomains/ens-contracts
+[submodule "lib/BokkyPooBahsDateTimeLibrary"]
+	path = lib/BokkyPooBahsDateTimeLibrary
+	url = https://github.com/bokkypoobah/BokkyPooBahsDateTimeLibrary
+```
+=======
+1. Open project folder in <a href="https://code.visualstudio.com/download">Visual Studio Code</a>
+2. In the terminal, run `npm install`
+3. Run `npm start` to view project in browser
+
+>>>>>>> Incoming

active_contracts.json

@@ -0,0 +1,9 @@
+{
+    "ens-domain": "budget.plugin.dao.eth",
+    "goerli": {
+        "BudgetSetup": "0x636Dc42B54029702ee5bDd39059bF8f75696B1C9",
+        "BudgetRepo": "0x9b72Af17B8aE55AE2F3C06E46A44D9bEaFb10801",
+        "dao": "0xce780fea1c950a29769b4f10817a9c51154d12af",
+        "budget": "0xfea7C89Ae8168f0f0FB9bA053b79C02819eC8C91"
+    }
+}

package.json

@@ -1,39 +1,62 @@
 {
-  "name": "@daobox/budget",
-  "description": "",
+<<<<<<< HEAD
+  "name": "budget-monorepo",
   "version": "1.0.0",
-  "author": {
-    "name": "DAObox",
-    "url": "https://github.com/DAObox"
+  "description": "",
+  "main": "index.js",
+=======
+  "name": "budget2",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^13.4.0",
+    "@testing-library/user-event": "^13.5.0",
+    "@types/jest": "^29.5.0",
+    "@types/node": "^16.11.14",
+    "@types/react": "^18.0.28",
+    "@types/react-dom": "^18.0.11",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-scripts": "5.0.1",
+    "web-vitals": "^2.1.4",
+    "typescript": "^4.5.4",
+    "react-router-dom": "^6.2.1"
   },
   "devDependencies": {
-    "prettier": "^3.0.0"
+    "autoprefixer": "^10.4.8",
+    "postcss": "^8.4.16",
+    "tailwindcss": "^3.1.8"
   },
-  "keywords": [
-    "blockchain",
-    "ethereum",
-    "forge",
-    "foundry",
-    "smart-contracts",
-    "solidity",
-    "aragon",
-    "osx",
-    "dao",
-    "daobox"
-  ],
-  "private": true,
+
+>>>>>>> Incoming
   "scripts": {
-    "clean": "rm -rf cache out",
-    "build": "forge build",
-    "lint": "pnpm lint:sol && pnpm prettier:check",
-    "lint:sol": "forge fmt --check && pnpm solhint {script,src,test}/**/*.sol",
-    "prettier:check": "prettier --check **/*.{json,md,yml} --ignore-path=.prettierignore",
-    "prettier:write": "prettier --write **/*.{json,md,yml} --ignore-path=.prettierignore",
-    "test": "forge test -vvv",
-    "test:coverage": "forge coverage",
-    "test:coverage:report": "forge coverage --report lcov && genhtml lcov.info --branch-coverage --output-dir coverage"
+<<<<<<< HEAD
+    "test": "echo \"Error: no test specified\" && exit 1"
+=======
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+
+>>>>>>> Incoming
   },
-  "dependencies": {
-    "solhint": "^3.6.2"
+<<<<<<< HEAD
+  "keywords": [],
+  "author": "pythonpete32",
+  "license": "ISC"
+=======
+  "eslintConfig": {
+    "root": true
+  },
+  "browserslist": {
+    "production": [">0.2%", "not dead", "not op_mini all"],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
   }
+
+>>>>>>> Incoming
 }

packages/contracts/.gitignore

@@ -0,0 +1,18 @@
+# directories
+cache
+coverage
+node_modules
+out
+
+# files
+*.env
+*.log
+.DS_Store
+.pnp.*
+lcov.info
+yarn.lock
+
+# broadcasts
+!broadcast
+broadcast/*
+broadcast/*/31337/