Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Devnet #244

Merged
merged 42 commits into from
Dec 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
503f2f9
Bump crypto-js from 4.1.1 to 4.2.0
dependabot[bot] Oct 25, 2023
705f348
removed user model
lxgr-linux Oct 26, 2023
bbfe2ea
Fixed EncouterVoting
lxgr-linux Oct 26, 2023
44ec9cb
Refactored gallery
lxgr-linux Oct 26, 2023
64c3dbb
Fixed gallery modal
lxgr-linux Oct 26, 2023
3b12298
Fixed Advanced cardview
lxgr-linux Oct 26, 2023
b195e4a
small encountervoting fix
lxgr-linux Oct 26, 2023
55b9c87
Merge pull request #221 from DecentralCardGame/220-fix-voting-for-dev
lxgr-linux Oct 27, 2023
9531378
Added useCards to centralize cardstate
lxgr-linux Oct 28, 2023
9e59b9f
Updated vite to 4.5.0
lxgr-linux Oct 28, 2023
02981a0
Merge pull request #224 from DecentralCardGame/update_vite
lxgr-linux Oct 28, 2023
d3e9137
Merge pull request #223 from DecentralCardGame/216-add-centralized-ap…
lxgr-linux Oct 28, 2023
214e535
Merge branch 'devnet' into dependabot/npm_and_yarn/crypto-js-4.2.0
lxgr-linux Oct 28, 2023
70e506a
Merge pull request #219 from DecentralCardGame/dependabot/npm_and_yar…
lxgr-linux Oct 28, 2023
2ea15b5
extracted gallery component
lxgr-linux Nov 1, 2023
2c5425a
fixed css
lxgr-linux Nov 1, 2023
3fee1b5
Final Votingresultspage fix
lxgr-linux Nov 1, 2023
9454ce6
Fixed hosts for devnet
lxgr-linux Nov 1, 2023
fef3296
Merge pull request #227 from DecentralCardGame/222-fix-voting-results…
lxgr-linux Nov 1, 2023
4e0b0a3
Updated dependecie versions
lxgr-linux Nov 2, 2023
6e81acb
Updated versions
lxgr-linux Nov 2, 2023
7d5e807
Updated versions
lxgr-linux Nov 2, 2023
86d013c
Updated chainid
lxgr-linux Nov 2, 2023
6a9c8f6
Once again updated client
lxgr-linux Nov 2, 2023
602def5
0.0.24
lxgr-linux Nov 2, 2023
2531b60
updated versions once again
lxgr-linux Nov 2, 2023
ac7b155
add avatar.svg and powerstone.svg
patrickwieth Nov 15, 2023
5802d41
Merge branch 'master' into devnet
lxgr-linux Nov 29, 2023
a5116c7
Update main.yml
lxgr-linux Nov 29, 2023
4be6b0b
Merge branch 'master' into devnet
lxgr-linux Nov 29, 2023
0e12f40
Update main.yml
lxgr-linux Nov 29, 2023
8592509
Update main.yml
lxgr-linux Nov 29, 2023
d894145
Update main.yml
lxgr-linux Nov 29, 2023
b8ebf21
Update main.yml
lxgr-linux Nov 30, 2023
d980e45
Updated env
lxgr-linux Dec 8, 2023
30e4190
Merge branch 'devnet' of github.com:DecentralCardGame/frontend into d…
lxgr-linux Dec 8, 2023
c28961c
chainId
lxgr-linux Dec 14, 2023
23b8f1e
fixed transactions
lxgr-linux Dec 14, 2023
8d327bb
fix broken card editing: action cards no ability
patrickwieth Dec 14, 2023
daafd05
fixed modal css
lxgr-linux Dec 16, 2023
6446024
Merge branch 'devnet' of github.com:DecentralCardGame/frontend into d…
lxgr-linux Dec 16, 2023
103a07c
fixed chainid and nodes
lxgr-linux Dec 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#VITE_API_COSMOS="http://lxgr.xyz:1317"
#VITE_WS_TENDERMINT="http://lxgr.xyz:26657"
#VITE_APP_FAUCET="http://lxgr.xyz:4500/claimTokens"

VITE_API_COSMOS="https://cardchain.crowdcontrol.network/cosmos/"
VITE_WS_TENDERMINT="https://cardchain.crowdcontrol.network/tendermint/"
VITE_APP_FAUCET="https://cardchain.crowdcontrol.network/faucet/claimTokens"

VITE_APP_FAUCET_SITEKEY="ea68532a-a9e6-4f99-9361-db90a3071b72"
VITE_APP_ADDRESS_PREFIX=cc
VITE_APP_CHAIN_ID="cardtestnet-5"
VITE_APP_CHAIN_ID="cardtestnet-6"
VITE_APP_CHAIN_NAME="Cardchain"
VITE_APP_CARDIMG_MAXKB=500
VITE_APP_CARDIMG_SIZE_X=840
Expand Down
2 changes: 1 addition & 1 deletion .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

VITE_APP_FAUCET_SITEKEY="ea68532a-a9e6-4f99-9361-db90a3071b72"
VITE_APP_ADDRESS_PREFIX=cc
VITE_APP_CHAIN_ID="cardtestnet-5"
VITE_APP_CHAIN_ID="carddevnet-2"
VITE_APP_CHAIN_NAME="Cardchain"
VITE_APP_CARDIMG_MAXKB=500
VITE_APP_CARDIMG_SIZE_X=840
Expand Down
2 changes: 1 addition & 1 deletion .fleet/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"backend.maxHeapSizeMb": 896
"backend.maxHeapSizeMb": 1568
}
20 changes: 12 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,25 @@ on:
pull_request:
types: [opened, labeled, unlabeled, synchronize]
workflow_dispatch:
env:
# Setting an environment variable with the value of a configuration variable
tag_name: ${{
contains(github.event.pull_request.labels.*.name, 'deploy_5173') && 'deploy_5173' ||
(contains(github.event.pull_request.labels.*.name, 'deploy_5174') && 'deploy_5175' || '')
}}



jobs:
run_pull:
if: ${{ env.tag_name != '' }}
name: run pull
runs-on: ubuntu-latest
env:
# Setting an environment variable with the value of a configuration variable
LABEL: ${{
contains(github.event.pull_request.labels.*.name, 'deploy_5173') && 'deploy_5173' ||
(contains(github.event.pull_request.labels.*.name, 'deploy_5174') && 'deploy_5174' || 'none')
}}

steps:
- name: exit
if: ${{ env.LABEL == 'none' }}
run: |
exit 1
- name: install ssh keys
# check this thread to understand why its needed:
# https://stackoverflow.com/a/70447517
Expand All @@ -26,6 +30,6 @@ jobs:
echo "${{ secrets.LXGR_DEPLOY_PRIV }}" > ~/.ssh/id_rsa
ssh-keyscan -H ${{ secrets.LXGR_HOST }} > ~/.ssh/known_hosts
- name: connect and pull
run: ssh ${{ secrets.LXGR_USER }}@${{ secrets.LXGR_HOST }} "cd ~/$tag_name && git fetch && git checkout ${{ github.event.pull_request.base.ref }} && git pull && npm i && exit"
run: ssh ${{ secrets.LXGR_USER }}@${{ secrets.LXGR_HOST }} "cd ~/$LABEL && git fetch && git checkout ${{ github.event.pull_request.head.ref }} && git pull && npm i && npm run build && chgrp -R www-data ~/$LABEL && exit"
- name: cleanup
run: rm -rf ~/.ssh
229 changes: 18 additions & 211 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"dependencies": {
"@cosmjs/encoding": "^0.29.3",
"@cosmjs/launchpad": "^0.27.0",
"@cosmjs/stargate": "^0.27.0",
"@cosmjs/proto-signing": "^0.27.0",
"@cosmjs/proto-signing": "^0.27.1",
"@cosmjs/stargate": "^0.27.1",
"@hcaptcha/vue3-hcaptcha": "^1.0.1",
"@headlessui/tailwindcss": "^0.2.0",
"@headlessui/vue": "^1.7.16",
Expand All @@ -13,8 +13,8 @@
"@tanstack/vue-query": "^4.13.5",
"axios": "^1.5.1",
"bignumber.js": "^9.1.0",
"crypto-js": "^4.1.1",
"decentralcardgame-cardchain-client-ts": "^0.0.17",
"crypto-js": "^4.2.0",
"decentralcardgame-cardchain-client-ts": "0.0.25",
"long": "^5.2.0",
"merge-images": "^2.0.0",
"pinia": "^2.0.23",
Expand Down Expand Up @@ -50,7 +50,7 @@
"sass": "^1.55.0",
"tailwindcss": "^3.3.3",
"typescript": "~4.8.4",
"vite": "^4.4.9",
"vite": "^4.5.0",
"vue-tsc": "^1.0.9"
},
"name": "@decentralcardgame/frontend",
Expand Down
Loading