diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 421791a..223a32a 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -25,7 +25,8 @@ jobs: npm set //packages.deskreen.com/:_authToken="${{ secrets.NPMRC_USER_TOKEN }}" npm config set always-auth true yarn install --frozen-lockfile - yarn install-client:frozenlockfile + cd app/client + yarn install --frozen-lockfile - name: yarn build run: yarn build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2c3e4e1..38c9b98 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: artifact_name: 'release/{*.AppImage,*.rpm,*.deb,*.yml}' - os: windows-2019 artifact_name: 'release/{*.msi,*.exe,*.blockmap,*.yml}' - - os: macos-10.14 + - os: macos-10.15 artifact_name: 'release/{*.zip,*.dmg,*.blockmap,*.yml}' steps: @@ -58,7 +58,8 @@ jobs: npm set //packages.deskreen.com/:_authToken="${{ secrets.NPMRC_USER_TOKEN }}" npm config set always-auth true yarn install --frozen-lockfile - yarn install-client:frozenlockfile + cd app/client + yarn install --frozen-lockfile - name: yarn package-ci env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 25d7e08..a918103 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,74 +1,74 @@ -name: build and test +# name: build and test -on: [pull_request] +# on: [pull_request] -# NPMRC_ADMIN_USER_AUTH_TOKEN +# # NPMRC_ADMIN_USER_AUTH_TOKEN -jobs: - build-and-test: - runs-on: ${{ matrix.os }} +# jobs: +# build-and-test: +# runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-10.14, windows-2019, ubuntu-18.04] +# strategy: +# matrix: +# os: [macos-10.14, windows-2019, ubuntu-18.04] - steps: - - name: Check out Git repository - uses: actions/checkout@v2.3.1 +# steps: +# - name: Check out Git repository +# uses: actions/checkout@v2.3.1 - - name: Install Node.js, NPM and Yarn - uses: actions/setup-node@v1.4.2 - with: - node-version: 14 +# - name: Install Node.js, NPM and Yarn +# uses: actions/setup-node@v1.4.2 +# with: +# node-version: 14 - # - name: yarn install from npmjs registry - # run: | - # yarn install --no-lockfile - # yarn install-client:nolockfile +# # - name: yarn install from npmjs registry +# # run: | +# # yarn install --no-lockfile +# # yarn install-client:nolockfile - - name: Configure private AWS npm registry and install packages from it - # if: ${{ failure() }} - run: | - npm config set registry https://packages.deskreen.com/ - npm set //packages.deskreen.com/:_authToken="${{ secrets.NPMRC_USER_TOKEN }}" - npm config set always-auth true - yarn install --frozen-lockfile - yarn install-client:frozenlockfile +# - name: Configure private AWS npm registry and install packages from it +# # if: ${{ failure() }} +# run: | +# npm config set registry https://packages.deskreen.com/ +# npm set //packages.deskreen.com/:_authToken="${{ secrets.NPMRC_USER_TOKEN }}" +# npm config set always-auth true +# yarn install --frozen-lockfile +# yarn install-client:frozenlockfile - # following step does code signing when `electron-builder --publish always` (look in package.json) - - name: yarn package-ci - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: yarn package-ci +# # following step does code signing when `electron-builder --publish always` (look in package.json) +# - name: yarn package-ci +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# run: yarn package-ci - - name: yarn build - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: yarn build +# - name: yarn build +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# run: yarn build - - name: yarn lint - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: yarn lint +# - name: yarn lint +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# run: yarn lint - - name: yarn tsc - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: yarn tsc +# - name: yarn tsc +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# run: yarn tsc - - name: yarn test - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: yarn test +# - name: yarn test +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# run: yarn test - - name: yarn build-e2e - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: yarn build-e2e +# - name: yarn build-ux +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# run: yarn build-ux - - name: yarn test-e2e - uses: GabrielBB/xvfb-action@v1.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - run: yarn test-e2e +# - name: yarn test-ux +# uses: GabrielBB/xvfb-action@v1.2 +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# with: +# run: yarn test-ux diff --git a/LICENSE b/LICENSE index 4f9058d..ce05389 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2020-present Deskreen +Copyright (c) 2020-present Pavlo (Paul) Buidenkov Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/app/components/StepsOfStepper/IntermediateStep.tsx b/app/components/StepsOfStepper/IntermediateStep.tsx index 21c0fe1..82bda9d 100644 --- a/app/components/StepsOfStepper/IntermediateStep.tsx +++ b/app/components/StepsOfStepper/IntermediateStep.tsx @@ -78,12 +78,12 @@ export default function IntermediateStep(props: IntermediateStepProps) { )} { - /* TODO: (REMOVE: process.env.NODE_ENV === 'production') !!!!!!!!!) - Connect Test Device button, displayed only when RUN_MODE is 'dev' or 'test' */ - props.activeStep === 0 && - (process.env.RUN_MODE === 'dev' || - process.env.RUN_MODE === 'test' || - process.env.NODE_ENV === 'production') ? ( + // eslint-disable-next-line no-nested-ternary + process.env.NODE_ENV === 'production' && + process.env.RUN_MODE !== 'dev' && + process.env.RUN_MODE !== 'test' ? ( + <> + ) : props.activeStep === 0 ? ( // eslint-disable-next-line react/jsx-indent @@ -132,7 +135,7 @@ const ScanQRStep: React.FC = () => {
+ + + when rendered should match exact snapshot 1`] = ` level="H" renderAs="svg" size={128} - value="http://192.168.31.214:65000/99999" + value="http://255.255.255.255:65000/99999" />
@@ -166,7 +166,7 @@ exports[` when rendered should match exact snapshot 1`] = ` level="H" renderAs="svg" size={128} - value="http://192.168.31.214:65000/99999" + value="http://255.255.255.255:65000/99999" width="390px" /> diff --git a/app/containers/__snapshots__/HomePage.spec.tsx.snap b/app/containers/__snapshots__/HomePage.spec.tsx.snap index 68bb6a5..2598cb8 100644 --- a/app/containers/__snapshots__/HomePage.spec.tsx.snap +++ b/app/containers/__snapshots__/HomePage.spec.tsx.snap @@ -1838,7 +1838,7 @@ exports[`should match exact snapshot 1`] = ` level="H" renderAs="svg" size={128} - value="http://192.168.31.214:65000/99999" + value="http://255.255.255.255:65000/99999" > + + + + + +