Merge pull request #932 from tablelandnetwork/staging

tablelandnetwork · Oct 24, 2023 · f9f934d · f9f934d
2 parents 6d0d7b2 + 71af0ad
commit f9f934d
Show file tree

Hide file tree

Showing 74 changed files with 1,028 additions and 452 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -60,7 +60,7 @@ jobs:
       - name: Setup Node Environment ⬢
         uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 18
       - name: Install
         run: npm install
       - name: Build
@@ -90,10 +90,12 @@ jobs:
       - name: Setup Node Environment ⬢
         uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 18
       - name: Install
         run: npm install
       - name: Build
         run: npm run build
       - name: Test
         run: npm test
+      - name: Test Voting
+        run: npm run test-voting
diff --git a/garage/package-lock.json b/garage/package-lock.json
diff --git a/garage/package.json b/garage/package.json
@@ -38,6 +38,7 @@
     "typescript": "^5.1.3",
     "vite": "^4.3.2",
     "vite-plugin-ejs": "^1.6.4",
-    "vite-plugin-svgr": "^2.4.0"
+    "vite-plugin-svgr": "^2.4.0",
+    "vite-tsconfig-paths": "^4.2.1"
   }
 }
diff --git a/garage/src/abis/VotingRegistry.ts b/garage/src/abis/VotingRegistry.ts
@@ -76,4 +76,28 @@ export const abi = [
     stateMutability: "nonpayable",
     type: "function",
   },
+  {
+    inputs: [
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32",
+      },
+      {
+        internalType: "address",
+        name: "account",
+        type: "address",
+      },
+    ],
+    name: "hasRole",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
 ] as const;
diff --git a/garage/src/components/AboutPilotsModal.tsx b/garage/src/components/AboutPilotsModal.tsx
@@ -15,7 +15,7 @@ import {
   Text,
   VStack,
 } from "@chakra-ui/react";
-import garage from "../assets/garage.jpg";
+import garage from "~/assets/garage.jpg";
 
 interface ModalProps {
   isOpen: boolean;

diff --git a/garage/src/components/ChainAwareButton.tsx b/garage/src/components/ChainAwareButton.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Button } from "@chakra-ui/react";
 import { Chain, useNetwork } from "wagmi";
 import { useChainModal } from "@rainbow-me/rainbowkit";
-import { mainChain } from "../env";
+import { mainChain } from "~/env";
 
 export const ChainAwareButton = (
   props: { expectedChain?: Chain } & React.ComponentProps<typeof Button>