Skip to content

Commit

Permalink
Merge branch 'develop' into fix/whitelabel-issue
Browse files Browse the repository at this point in the history
  • Loading branch information
BboyStatix authored Oct 9, 2023
2 parents 00e6fa3 + 4100700 commit 48a0c09
Show file tree
Hide file tree
Showing 184 changed files with 23,051 additions and 36,303 deletions.
2 changes: 2 additions & 0 deletions .env.basealpha
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ VUE_APP_LINKED_VERIFIER_SUBIDENTIFIER=torus
VUE_APP_LOGIN_DOMAIN=https://torus-test.auth0.com
VUE_APP_PASSWORDLESS_DOMAIN=https://lrc.auth.openlogin.com
VUE_APP_DEVELOPER_DASHBOARD_URL=https://api-dev-dashboard.web3auth.io
VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31
VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE=MEUCIQDmIoMAvTj6_uAKYC90yorSOhXE-8NQ1dCs_srDzQbr0wIgeQv9-fk1WkZE3bkUDotUn_2GeUjaRWLNCKydHwpmxyA
3 changes: 2 additions & 1 deletion .env.binance
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ VUE_APP_REQUIRE_SEED_PHRASE=true
VUE_APP_HIDE_TOPUP=true
VUE_APP_TKEY_SECURITY_QUESTIONS_MANDATORY=true
VUE_APP_ETH_TRANSFER_ONLY=true
VUE_APP_SENTRY_DSN=https://[email protected]/5607693
VUE_APP_SENTRY_DSN=https://[email protected]/5607693
VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31
1 change: 1 addition & 0 deletions .env.bnb
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,4 @@ VUE_APP_SENTRY_DSN=https://[email protected]
VUE_APP_DEVELOPER_DASHBOARD_URL=https://api.developer.tor.us
# this is for bnb.tor.us
VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE=MEQCIB9wN5FYV91zbJWssKw-T707Iz-k2qigQ8OB6tt0N_IGAiAJ6aoQZ2oM3RBJ6G1bFeU8zPv54cv_LBYzOVtXZj6G3w
VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,4 @@ VUE_APP_LOGIN_DOMAIN=https://torus-test.auth0.com
VUE_APP_PASSWORDLESS_DOMAIN=https://lrc.auth.openlogin.com
VUE_APP_DEVELOPER_DASHBOARD_URL=https://api-dev-dashboard.web3auth.io
# VUE_APP_DEVELOPER_DASHBOARD_URL=http://localhost:5051
VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31
1 change: 1 addition & 0 deletions .env.lrc
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,4 @@ VUE_APP_PASSWORDLESS_DOMAIN=https://lrc.auth.openlogin.com
VUE_APP_DEVELOPER_DASHBOARD_URL=https://api-dev-dashboard.web3auth.io
# this is for lrc.tor.us
VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE=MEQCIGv3oTOdAMltfeDrcT-0ilhYlGuZ8yuhezQHU883XjJEAiByG6Duhn5kqNgEy2oJosza1t0VOfPxzeI25g_ZHysXNA
VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31
1 change: 1 addition & 0 deletions .env.polygon
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,4 @@ VUE_APP_SENTRY_DSN=https://[email protected]
VUE_APP_DEVELOPER_DASHBOARD_URL=https://api.developer.tor.us
# this is for polygon.tor.us
VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE=MEQCIHmKCljC6Ncxe-TyhKHWxTUI7eFj3kjUEqgu40aLZkS0AiAki72DNFmj2WD_itl-5LZ_wYzK1ZS_B7o5qzHzSnzI5w
VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31
1 change: 1 addition & 0 deletions .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,4 @@ VUE_APP_SENTRY_DSN=https://[email protected]
VUE_APP_DEVELOPER_DASHBOARD_URL=https://api.developer.tor.us
# this is for app.tor.us
VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE=MEUCIQDFdkBIGWMCQzmclVVWSrUiropSXKmh9OudXiOhp-jZfwIgdCCO2LM3xE5XQPVQA4M4d_GNwYU-h87ieA3cfhZ6-Yo
VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31
1 change: 1 addition & 0 deletions .env.testing
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@ VUE_APP_PASSWORDLESS_DOMAIN=https://auth.openlogin.com
VUE_APP_DEVELOPER_DASHBOARD_URL=https://api.developer.tor.us
# this is for testing.tor.us
VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE=MEUCIQDtJOb6jb4iY6-ENsf8IB19W0SZ21VJFNHd1GfSTOj7RwIgfIiCR7QU8MA-kIkv_qaF28fqTljaCLvF38-oWtvg-ZI
VUE_APP_WALLET_CONNECT_PROJECT_ID=000b7e9596f9a108b279f1a72ee7cd31
6 changes: 5 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@
}
},
"rules": {
"import/order": 0,
"array-callback-return": 0,
"unicorn/switch-case-braces": 0,
"unicorn/prefer-event-target": 0,
"unicorn/prefer-logical-operator-over-ternary": 0,
"unicorn/prefer-string-replace-all": 0,
"no-promise-executor-return": 0,
"no-restricted-exports": [2, { "restrictedNamedExports": [] }],
"import/prefer-default-export": 0,
Expand Down Expand Up @@ -111,7 +114,8 @@
{
"singleQuote": true,
"printWidth": 150,
"semi": false
"semi": false,
"trailingComma": "es5"
}
]
},
Expand Down
44 changes: 10 additions & 34 deletions .github/workflows/alphas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,23 @@ jobs:
name: Test release
strategy:
matrix:
node: ['16.x']
node: ['18.x']
os: [ubuntu-latest]

runs-on: ${{ matrix.os }}

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}

- name: Get npm cache directory
id: npm-cache
run: |
echo "::set-output name=dir::$(npm config get cache)"
- name: Node dependency cache
uses: actions/cache@v2
with:
path: ${{ steps.npm-cache.outputs.dir }}
key: ${{ matrix.os }}-node-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ matrix.os }}-node-
cache: 'npm'

- name: Install dependencies
run: npm install --legacy-peer-deps
run: npm install

- name: Pre-build setup
run: npm run pre-build
Expand All @@ -57,36 +45,24 @@ jobs:
name: Build & deploy alpha*.tor.us
strategy:
matrix:
node: ['16.x']
node: ['18.x']
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}

needs: test

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}

- name: Get npm cache directory
id: npm-cache
run: |
echo "::set-output name=dir::$(npm config get cache)"
- name: Node dependency cache
uses: actions/cache@v2
with:
path: ${{ steps.npm-cache.outputs.dir }}
key: ${{ matrix.os }}-node-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ matrix.os }}-node-
cache: 'npm'

- name: Install dependencies
run: npm install --legacy-peer-deps
run: npm install

- name: Run build
run: npm run build:alpha-branches
Expand Down
46 changes: 11 additions & 35 deletions .github/workflows/binance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,25 @@ jobs:
name: Test release
strategy:
matrix:
node: ['16.x']
node: ['18.x']
os: [ubuntu-latest]

runs-on: ${{ matrix.os }}

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ssh-key: ${{ secrets.ALPHA_SSH_KEY }}

- name: setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}

- name: Get npm cache directory
id: npm-cache
run: |
echo "::set-output name=dir::$(npm config get cache)"
- name: Node dependency cache
uses: actions/cache@v2
with:
path: ${{ steps.npm-cache.outputs.dir }}
key: ${{ matrix.os }}-node-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ matrix.os }}-node-
cache: 'npm'

- name: Install dependencies
run: npm install --legacy-peer-deps
run: npm install

- name: Pre-build setup
run: npm run pre-build
Expand All @@ -59,45 +47,33 @@ jobs:
name: Build & deploy binance.tor.us
strategy:
matrix:
node: ['16.x']
node: ['18.x']
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}

needs: test

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ssh-key: ${{ secrets.ALPHA_SSH_KEY }}

- name: setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: 'npm'

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1

- name: Get npm cache directory
id: npm-cache
run: |
echo "::set-output name=dir::$(npm config get cache)"
- name: Node dependency cache
uses: actions/cache@v2
with:
path: ${{ steps.npm-cache.outputs.dir }}
key: ${{ matrix.os }}-node-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ matrix.os }}-node-
- name: Install dependencies
run: npm install --legacy-peer-deps
run: npm install

- name: Run build
run: |
Expand Down
22 changes: 5 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,23 @@ jobs:
name: ci
strategy:
matrix:
node: ['16.x']
node: ['18.x']
os: [ubuntu-latest]

runs-on: ${{ matrix.os }}

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}

- name: Get npm cache directory
id: npm-cache
run: |
echo "::set-output name=dir::$(npm config get cache)"
- name: Node dependency cache
uses: actions/cache@v2
with:
path: ${{ steps.npm-cache.outputs.dir }}
key: ${{ matrix.os }}-node-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ matrix.os }}-node-
cache: 'npm'

- name: Install dependencies
run: npm install --legacy-peer-deps
run: npm install

- name: Pre-build setup
run: npm run pre-build
Expand Down
Loading

0 comments on commit 48a0c09

Please sign in to comment.