Web3 integrations

.github/workflows/preview.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - master
   pull_request:
+    types: [opened, synchronize, edited, ready_for_review]
     branches:
       - master
   workflow_dispatch:

.github/workflows/pull-request.yml

@@ -6,7 +6,7 @@ name: Pull Request CI - NextJS & Hardhat
 on:
   workflow_dispatch:
   push:
-    branches: [produciton, release, next]
+    branches: [production, release, next]
   pull_request:
     types: [opened, reopened, ready_for_review, synchronize]
 
@@ -55,25 +55,16 @@ jobs:
         run: |
           echo "$CHANGED_APP $CHANGED_CONTRACTS $CHANGED_SDK"
 
-      - name: 'Build contracts'
-        if: steps.changed-contracts.outputs.changed == 'true'
+      - name: 'Test Build'
         run: |
-          yarn build:contracts
+          yarn build
 
       - name: 'setup test contracts for sdk'
+        if: ${{ steps.changed-contracts.outputs.changed == 'true' || steps.changed-sdk.outputs.changed == 'true' }}
         run: |
           yarn test:setup
 
       - name: 'test sdk & contracts'
         if: ${{ steps.changed-contracts.outputs.changed == 'true' || steps.changed-sdk.outputs.changed == 'true' }}
         run: |
           yarn test
-
-      # - name: 'stop node'
-      #   run: |
-      #     pkill -f "hardhat node"
-
-      - name: 'Build app production'
-        if: steps.changed-app.outputs.changed == 'true'
-        run: |
-          yarn build:app

.yarn/versions/a125cec7.yml

@@ -0,0 +1,5 @@
+undecided:
+  - "@gooddollar/goodcollective"
+  - "@gooddollar/goodcollective-app"
+  - "@gooddollar/goodcollective-contracts"
+  - "@scaffold-eth/subgraph"

README.md

@@ -18,6 +18,9 @@ This is the repo for the GoodCollective protocol and dapp, use it to:
 - install dependencies
   `yarn install`
 
+- build all packages locally
+  `yarn build`
+
 ### Deploying contracts for local development
 
 To start a local node with the deployed contracts:

package.json

@@ -12,7 +12,9 @@
   ],
   "private": true,
   "scripts": {
-    "publish": "yarn workspaces foreach --include '{@gooddollar/goodcollective-contracts,@gooddollar/goodcollective-sdk}' run publish",
+    "postinstall": "husky install",
+    "publish": "yarn workspaces foreach -t --include '{@gooddollar/goodcollective-contracts,@gooddollar/goodcollective-sdk}' run publish",
+    "build": "yarn workspaces foreach -tp --include '{@gooddollar/goodcollective-contracts,@gooddollar/goodcollective-sdk,@gooddollar/goodcollective-app}' run build",
     "build:contracts": "yarn workspace @gooddollar/goodcollective-contracts compile",
     "build:sdk": "yarn workspace @gooddollar/goodcollective-sdk build",
     "deploy:contracts": "yarn workspace @gooddollar/goodcollective-contracts deploy",
@@ -22,11 +24,6 @@
   },
   "workspaces": {
     "packages": [
-      "packages/app",
-      "packages/contracts",
-      "packages/sdk-js",
-      "packages/subgraph",
-      "packages/services/*",
       "packages/*"
     ]
   },
@@ -57,4 +54,4 @@
   "resolutions": {
     "@react-native-aria/interactions": "0.2.3"
   }
-}
+}

packages/app/.env

@@ -0,0 +1 @@
+VITE_NFTSTORAGE_KEY= eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkaWQ6ZXRocjoweDg1RDNkNjZlNzZGRWUwNDQ4Y2YwMDlkOGMwYTUzNzg0NmYxRTBDMEYiLCJpc3MiOiJuZnQtc3RvcmFnZSIsImlhdCI6MTY5MzM0NDI2NTUyNSwibmFtZSI6Imdvb2Rkb2xsYXJzZGsifQ.uXoOM-vy-Vt_I09Cck9Ohdsr54n5lavd6oGeRbLBKSk

packages/app/.eslintrc.js

@@ -4,5 +4,8 @@ module.exports = {
   rules: {
     'object-curly-spacing': 'off',
     'comma-dangle': 'off',
+    'react/react-in-jsx-scope': 'off',
+    'react/jsx-uses-react': 'off',
+    '@typescript-eslint/no-unused-vars': 'warn',
   },
 };

packages/app/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "typescript.tsdk": "node_modules/typescript/lib",
+    "cSpell.words": [
+        "celo",
+        "wagmi"
+    ]
+}

packages/app/README.md

@@ -0,0 +1,35 @@
+# How to theme
+
+Current theme based on design system can be found here: GoodCollective/packages/app/src/theme
+example of implementation can be found at:
+
+1. import components from 'native-base' instead of 'react-native'
+   1a. they are mostly the same, but have extended styling options and are connected to the above mentioned theme
+2. by using the withTheme hook you can apply styles similiar to how you would do with react-native's StyleSheet
+   ie.
+
+```
+import { withTheme } from '@gooddollar/good-design'
+import { Text } from 'native-base'
+
+export const theme = {
+  baseStyle: {
+    fontStyles: {
+      title: {
+        fontWeight: 700,
+        color: 'black',
+        fontFamily: 'heading',
+        fontSize: 'md',
+      }
+    },
+      ...// define additional styles
+    }
+}
+
+const TestComponent = withTheme({ name: <Name of component, should match exported name> })(({ fontStyles }: any) => (
+  <Text {...fontStyles}>TestText </Text> // add as props so that it can apply the definitions from theme
+))
+```
+
+3. todo: add example for breakpoint values
+4. todo: add example for variants

packages/app/index.html

@@ -1,41 +1,46 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <!-- Google tag (gtag.js) -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-NNPTP7GK17"></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag() {
-        dataLayer.push(arguments);
-      }
-      gtag('js', new Date());
-
-      gtag('config', 'G-NNPTP7GK17');
-    </script>
-    <title>GoodCollective</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="./web/main.tsx"></script>
-  </body>
-  <style>
-    /* These styles make the body full-height */
-    html,
-    body {
-      height: 100%;
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>GoodCollective</title>
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@500;600;700;800&display=swap" rel="stylesheet">
+
+  <!-- Google tag (gtag.js) -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=G-NNPTP7GK17"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag() {
+      dataLayer.push(arguments);
     }
+    gtag('js', new Date());
 
-    /* These styles disable body scrolling if you are using <ScrollView> */
-    body {
-      overflow: hidden;
-    }
+    gtag('config', 'G-NNPTP7GK17');
+  </script>
+  <title>GoodCollective</title>
+</head>
+<body>
+  <div id="root"></div>
+  <script type="module" src="./web/main.tsx"></script>
+</body>
+<style>
+  /* These styles make the body full-height */
+  html,
+  body {
+    height: 100%;
+  }
 
-    /* These styles make the root element full-height */
-    #root {
-      height: 100%;
-    }
-  </style>
+  /* These styles disable body scrolling if you are using <ScrollView> */
+  body {
+    overflow: hidden;
+  }
+
+  /* These styles make the root element full-height */
+  #root {
+    height: 100%;
+  }
+</style>
 </html>

packages/app/package.json

@@ -11,27 +11,49 @@
     "start": "react-native start",
     "test": "jest",
     "web": "vite -c web/vite.config.ts",
+    "build": "yarn build:web",
     "build:web": "tsc && vite build -c web/vite.config.ts",
     "preview:web": "vite preview -c web/vite.config.ts"
   },
   "dependencies": {
+    "@apollo/client": "^3.7.14",
     "@celo-tools/celo-ethers-wrapper": "^0.4.0",
     "@ethersproject/shims": "^5.7.0",
-    "@gooddollar/goodcollective-sdk": "^1.*",
-    "@gooddollar/web3sdk-v2": "^0.1.108",
+    "@gooddollar/good-design": "^0.1.31",
+    "@gooddollar/goodcollective-sdk": "^1.0.15",
+    "@gooddollar/web3sdk-v2": "^0.2.2",
     "@react-native-aria/interactions": "0.2.3",
     "@react-native-async-storage/async-storage": "^1.18.2",
     "@react-native-firebase/analytics": "16.7.0",
     "@react-native-firebase/app": "16.7.0",
+    "@superfluid-finance/sdk-core": "^0.3.2",
+    "@uniswap/router-sdk": "^1.7.1",
+    "@uniswap/sdk-core": "^4.0.7",
+    "@uniswap/smart-order-router": "^3.20.0",
+    "@uniswap/v3-sdk": "^3.10.0",
     "@usedapp/core": "^1.2.10",
+    "@wagmi/core": "^1.4.5",
     "@walletconnect/modal-react-native": "^1.0.0-rc.9",
+    "@web3-onboard/react": "^2.8.10",
+    "@web3modal/ethereum": "^2.7.1",
+    "@web3modal/react": "^2.7.1",
+    "apollo-link": "^1.2.14",
+    "apollo-link-rest": "^0.9.0",
+    "apollo3-cache-persist": "^0.14.1",
+    "axios": "^1.5.0",
     "crypto-browserify": "^3.12.0",
+    "decimal.js": "^10.4.3",
+    "ethers": "^5.6.2",
     "fast-text-encoding": "^1.0.6",
+    "graphql": "^16.6.0",
+    "lodash": "^4.17.21",
     "mixpanel-react-native": "^2.3.1",
+    "mobile-device-detect": "^0.4.3",
     "moment": "^2.29.4",
     "moment-duration-format": "^2.3.2",
     "native-base": "^3.4.28",
     "node-libs-react-native": "^1.2.1",
+    "qs": "^6.11.2",
     "react": "18",
     "react-dom": "18",
     "react-native": "^0.71.11",
@@ -42,22 +64,29 @@
     "react-native-safe-area-context": "3.3.2",
     "react-native-svg": "^13.9.0",
     "react-native-svg-web": "^1.0.9",
-    "react-native-web": "0.18.*"
+    "react-native-web": "0.18.*",
+    "react-router-dom": "^6.14.1",
+    "react-router-native": "^6.14.1",
+    "viem": "^1.10.8",
+    "wagmi": "^1.4.5"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
     "@babel/runtime": "^7.20.0",
     "@react-native-community/eslint-config": "^3.2.0",
+    "@react-stately/checkbox": "^3.6.0",
+    "@react-stately/combobox": "^3.8.0",
     "@tsconfig/react-native": "^2.0.2",
     "@types/fast-text-encoding": "^1",
     "@types/jest": "^29.2.1",
     "@types/moment-duration-format": "^2",
+    "@types/qs": "^6",
     "@types/react": "^18.2.12",
     "@types/react-dom": "^18.2.5",
     "@types/react-native": "^0.72.2",
     "@types/react-test-renderer": "^18.0.0",
-    "@vitejs/plugin-react": "^4.0.0",
+    "@vitejs/plugin-react": "^4.1.1",
     "babel-jest": "^29.2.1",
     "eslint": "^8.19.0",
     "eslint-plugin-react-refresh": "^0.4.1",
@@ -66,10 +95,13 @@
     "metro-react-native-babel-preset": "0.73.9",
     "prettier": "^2.4.1",
     "react-test-renderer": "18.2.0",
+    "typechain": "^8.1.1",
     "typescript": "^5.1.3",
     "vercel": "latest",
-    "vite": "^4.3.9",
-    "vite-plugin-node-polyfills": "^0.9.0"
+    "vite": "^4.5.0",
+    "vite-plugin-dynamic-import": "^1.5.0",
+    "vite-plugin-node-polyfills": "^0.16.0",
+    "vite-tsconfig-paths": "^4.2.2"
   },
   "jest": {
     "preset": "react-native"