Skip to content

Commit

Permalink
fix: confict
Browse files Browse the repository at this point in the history
  • Loading branch information
Vivomo committed Nov 11, 2023
2 parents 850cf7e + 070a962 commit 9fcafa6
Show file tree
Hide file tree
Showing 37 changed files with 12,148 additions and 4,089 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/cf-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
# - name: deploy on lattice testnet
# run: cd packages/contracts; pnpm run deploy:testnet

- name: build
- name: build clinet
run: pnpm build


Expand All @@ -64,13 +64,13 @@ jobs:
branch: main
# The working directory in which to run Wrangler

- name: Vercel Action
uses: amondnet/vercel-action@v25
# - name: Vercel Action
# uses: amondnet/vercel-action@v25

with:
vercel-token: ${{ secrets.VERCEL_TOKEN }} # Required
vercel-org-id: ${{ secrets.ORG_ID}} #Required
vercel-project-id: ${{ secrets.PROJECT_ID}} #Required
working-directory: ./packages/client/dist
scope: ${{secrets.TEAM_SLUG}}
# with:
# vercel-token: ${{ secrets.VERCEL_TOKEN }} # Required
# vercel-org-id: ${{ secrets.ORG_ID}} #Required
# vercel-project-id: ${{ secrets.PROJECT_ID}} #Required
# working-directory: ./packages/client/dist
# scope: ${{secrets.TEAM_SLUG}}

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ packages/contracts/node_modules/*
packages/contracts/broadcast/*
packages/contracts/types/*
*.meta
/pnpm-lock.yaml
# /pnpm-lock.yaml

# out for loot and user
!packages/contracts/out/Loot.sol/
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"private": true,
"scripts": {
"build": "pnpm recursive run build",
"build:client":"pnpm --filter 'client' run build",
"dev": "concurrently -n contracts,client -c cyan,magenta \"cd packages/contracts && pnpm run dev\" \"cd packages/client && pnpm run dev\"",
"dev:client": "pnpm --filter 'client' run dev",
"dev:contracts": "pnpm --filter 'contracts' dev",
Expand Down
2 changes: 1 addition & 1 deletion packages/client/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
VITE_CHAIN_ID=4242
VITE_CHAIN_ID=33784
TEST_CHAIN_ID=31337
Binary file added packages/client/src/assets/img/battle/bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9fcafa6

Please sign in to comment.