Skip to content

Commit

Permalink
Merge pull request #433 from torusresearch/develop
Browse files Browse the repository at this point in the history
Release v2.0.0
chaitanyapotti authored Sep 9, 2023
2 parents b51df24 + 32dd9a3 commit 6994af1
Showing 57 changed files with 12,517 additions and 20,565 deletions.
4 changes: 1 addition & 3 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
> 1%
last 2 versions
supports bigint
not dead
not ie 11
2 changes: 1 addition & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -5,6 +5,6 @@ VUE_APP_MODE=development
VUE_APP_SENTRY_SAMPLE_RATE=0.95
VUE_APP_SENTRY_DSN=https://f08dc5725ef448ba9960e5d8ec4f8a3c@o503538.ingest.sentry.io/6125850
VUE_APP_SOLANA_BUILD_VERSION=0.1
VUE_APP_GA_ID=G-LQ8G005HR9
VUE_APP_GA_ID=GTM-LQ8G005HR9
VUE_APP_DEVELOPER_DASHBOARD_URL=https://api-dev-dashboard.web3auth.io
VUE_APP_IMGPROXY_URL=https://img-cdn.magiceden.dev
2 changes: 2 additions & 0 deletions .env.production
Original file line number Diff line number Diff line change
@@ -8,3 +8,5 @@ VUE_APP_SOLANA_BUILD_VERSION=0.1
VUE_APP_GA_ID=G-RCNKR0V6N2
VUE_APP_DEVELOPER_DASHBOARD_URL="https://api.developer.tor.us"
VUE_APP_IMGPROXY_URL=https://img-cdn.magiceden.dev
# this signature is for solana.tor.us
VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE=MEQCIBr6QHOgv3vt3JP2ARmEG6tVWTVUxzHjpl0dt9hxb2R6AiBHJTaKoy9vKi9E1lIpNa_5IgCHSHrBDvmtO6ePYhPDyw
2 changes: 2 additions & 0 deletions .env.testing
Original file line number Diff line number Diff line change
@@ -13,3 +13,5 @@ BROWSERSTACK_USERNAME=
BROWSERSTACK_ACCESS_KEY=
VUE_APP_DEVELOPER_DASHBOARD_URL="https://api.developer.tor.us"
VUE_APP_IMGPROXY_URL=https://img-cdn.magiceden.dev
# this signature is for solana-testing.tor.us
VUE_APP_OPENLOGIN_ORIGIN_SIGNATURE="MEQCIDEVNtQVWU2LLTakjtzMor4PHOddH2w9xUy65KSzKALWAiAQMfcYUO-0vd35rZR-TEc89qRAKMR2DxXCvfUqFzIq9g"
58 changes: 58 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
require("@rushstack/eslint-patch/modern-module-resolution");

module.exports = {
extends: ["@toruslabs/vue"],
parser: "vue-eslint-parser",
parserOptions: {
parser: "@typescript-eslint/parser",
sourceType: "module",
ecmaVersion: 2022,
project: "./tsconfig.json",
},
ignorePatterns: [
"*.cjs",
"*.config.js",
"vite.config.ts",
"importLocales.js",
"__generated__",
".eslintrc.js",
"crisp.js",
"tests/setup.js"
],
rules: {
camelcase: 0,
"no-new": 0,
"vue/multi-word-component-names": 0,
"@typescript-eslint/naming-convention": [
"error",
{
selector: "typeLike",
format: ["camelCase", "UPPER_CASE", "PascalCase"],
},
],
quotes: 0,
"@typescript-eslint/quotes": [2, "double"],
"no-console": 2,
"@typescript-eslint/comma-dangle": 0,
"mocha/no-global-tests": ["off"],
"no-shadow": "off",
"@typescript-eslint/no-shadow": ["error"],
"import/extensions": 0,
"prettier/prettier": [
2,
{
singleQuote: false,
printWidth: 150,
semi: true,
trailingComma: "es5",
},
],
},
settings: {
"import/resolver": {
typescript: {
project: "./tsconfig.json",
},
},
},
};
45 changes: 0 additions & 45 deletions .eslintrc.json

This file was deleted.

42 changes: 19 additions & 23 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
@@ -11,31 +11,19 @@ jobs:
name: build
strategy:
matrix:
node: ["14.x"]
node: ["20.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
@@ -46,6 +34,15 @@ jobs:
- name: Controller Unit Tests
run: npm run test:report

# Set the credentials from repository settings/secrets
- name: Configure AWS credentials
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: ${{ secrets.AWS_REGION_US }}


# Upload to S3
- name: sync s3
uses: jakejarvis/s3-sync-action@master
@@ -58,10 +55,9 @@ jobs:

# Invalidate Cloudfront (this action)
- name: invalidate
uses: chetan/invalidate-cloudfront-action@master
env:
DISTRIBUTION: ${{ secrets.DISTRIBUTION_BETA }}
PATHS: "/*"
AWS_REGION: "us-east-1"
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
uses: chaitanyapotti/cloudfront-update-distribution@v2
with:
cloudfront-distribution-id: ${{ secrets.DISTRIBUTION_BETA }}
cloudfront-invalidation-path: "/*"
cloudfront-invalidation-required: true
cloudfront-wait-for-service-update: false
41 changes: 18 additions & 23 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
@@ -11,31 +11,19 @@ jobs:
name: build
strategy:
matrix:
node: ["14.x"]
node: ["20.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
@@ -46,6 +34,14 @@ jobs:
- name: Controller Unit Tests
run: npm run test:report

# Set the credentials from repository settings/secrets
- name: Configure AWS credentials
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: ${{ secrets.AWS_REGION_US }}

# Upload to S3
- name: sync s3
uses: jakejarvis/s3-sync-action@master
@@ -58,10 +54,9 @@ jobs:

# Invalidate Cloudfront (this action)
- name: invalidate
uses: chetan/invalidate-cloudfront-action@master
env:
DISTRIBUTION: ${{ secrets.DISTRIBUTION_PROD }}
PATHS: "/*"
AWS_REGION: "us-east-1"
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
uses: chaitanyapotti/cloudfront-update-distribution@v2
with:
cloudfront-distribution-id: ${{ secrets.DISTRIBUTION_PROD }}
cloudfront-invalidation-path: "/*"
cloudfront-invalidation-required: true
cloudfront-wait-for-service-update: false
20 changes: 4 additions & 16 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -11,31 +11,19 @@ jobs:
name: build
strategy:
matrix:
node: ["14.x"]
node: ["20.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
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -2,8 +2,10 @@
"javascript.suggestionActions.enabled": false,
"files.associations": { "*.css": "postcss" },
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": { "source.fixAll": true },
"files.trimTrailingWhitespace": true,
"files.trimFinalNewlines": true,
"files.insertFinalNewline": true,
"editor.codeActionsOnSave": {
"source.fixAll": true
}
}
Loading

0 comments on commit 6994af1

Please sign in to comment.