From de3c060130a8313535ae1bdf5495144b39697ae9 Mon Sep 17 00:00:00 2001 From: Yinan Bao Date: Sat, 14 Sep 2024 16:36:43 -0400 Subject: [PATCH] save --- .github/workflows/clientProdDeploy | 39 ------------------------------ .github/workflows/pullRequest.yml | 1 - server/services/crudTraders.ts | 2 +- 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 .github/workflows/clientProdDeploy diff --git a/.github/workflows/clientProdDeploy b/.github/workflows/clientProdDeploy deleted file mode 100644 index 1a98b559..00000000 --- a/.github/workflows/clientProdDeploy +++ /dev/null @@ -1,39 +0,0 @@ -name: Client Prod Deploy CI - -on: - push: - branches: [ main ] - -env: - REACT_APP_SERVER_HOST: ${{ vars.CLIENT_PROD_SERVER_HOST }} - REACT_APP_SERVER_TYPE: ${{ vars.CLIENT_PROD_SERVER_TYPE }} - REACT_APP_PAYPAL_CLIENT_ID: ${{ vars.CLIENT_PROD_PAYPAL_CLIENT_ID }} - REACT_APP_CONTACT_EMAIL: ${{ vars.CLIENT_PROD_CONTACT_EMAIL }} - REACT_APP_IS_MAINTAINING: ${{ vars.CLIENT_PROD_IS_MAINTAINING }} - -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18.12.1] - steps: - - uses: actions/checkout@v3 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - cache: 'npm' - - run: npm ci - - run: npm run build:client - - name: Push dist files - uses: dmnemec/copy_file_to_another_repo_action@main - env: - API_TOKEN_GITHUB: ${{ secrets.CLIENT_DEPLOY_TOKEN }} - with: - source_file: './client/dist/.' - destination_repo: 'ValueMelody/melody-prod' - destination_folder: './' - user_email: 'byn9826@gmail.com' - user_name: 'Baozier' - commit_message: 'Production deploy' diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index 2111a35d..ea7e22d2 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -21,4 +21,3 @@ jobs: - run: npm run lint - run: npm run shared - run: npm run tsc - - run: npm run test diff --git a/server/services/crudTraders.ts b/server/services/crudTraders.ts index 56a60562..c9394fc6 100644 --- a/server/services/crudTraders.ts +++ b/server/services/crudTraders.ts @@ -14,9 +14,9 @@ import * as traderHoldingModel from 'models/traderHolding' import * as traderLogic from 'logics/trader' import * as traderModel from 'models/trader' import * as traderPatternModel from 'models/traderPattern' +import * as helpers from '@shared/helpers' import buildComboEntities from './shared/buildComboEntities' import buildHoldingValueStats from './shared/buildHoldingValueStats' -import * as helpers from '@shared/helpers' export const getTraderProfile = async ( id: number, accessCode: string,