diff --git a/.github/workflows/nc-android-apk.yml b/.github/workflows/connect-android-build.yml similarity index 87% rename from .github/workflows/nc-android-apk.yml rename to .github/workflows/connect-android-build.yml index 22783d782a..b2e2e8178e 100644 --- a/.github/workflows/nc-android-apk.yml +++ b/.github/workflows/connect-android-build.yml @@ -1,4 +1,4 @@ -name: NC Android APK Release +name: Nym Connect - Android APK Build on: workflow_dispatch: @@ -88,14 +88,14 @@ jobs: run: | yarn install --frozen-lockfile yarn build - yarn workspace @nym/nym-connect-android webpack:prod + yarn workspace @nym/nym-connect-mobile webpack:prod - name: Build APK - working-directory: nym-connect-android + working-directory: nym-connect/mobile env: ANDROID_SDK_ROOT: ${{ env.ANDROID_HOME }} - WRY_ANDROID_PACKAGE: net.nymtech.nym_connect_android - WRY_ANDROID_LIBRARY: nym_connect_android + WRY_ANDROID_PACKAGE: net.nymtech.nym_connect + WRY_ANDROID_LIBRARY: nym_connect # TODO build with release profile (--release), it will requires # to sign the APK. For now build with debug profile to avoid that run: cargo tauri android build --debug --apk --split-per-abi -t aarch64 @@ -104,9 +104,9 @@ jobs: - name: Rename APK artifact run: | mkdir apk/ - mv nym-connect-android/src-tauri/gen/android/nym_connect_android/app/build/outputs/apk/arm64/debug/app-arm64-debug.apk \ + mv nym-connect/mobile/src-tauri/gen/android/nym_connect/app/build/outputs/apk/arm64/debug/app-arm64-debug.apk \ apk/nym-connect-arm64-debug.apk - mv nym-connect-android/src-tauri/gen/android/nym_connect_android/app/build/outputs/apk/x86_64/debug/app-x86_64-debug.apk \ + mv nym-connect/mobile/src-tauri/gen/android/nym_connect/app/build/outputs/apk/x86_64/debug/app-x86_64-debug.apk \ apk/nym-connect-x86_64-debug.apk - name: Upload APK artifact diff --git a/.github/workflows/nym-connect.yml b/.github/workflows/connect-desktop-ci.yml similarity index 92% rename from .github/workflows/nym-connect.yml rename to .github/workflows/connect-desktop-ci.yml index 69f5acb147..5846212222 100644 --- a/.github/workflows/nym-connect.yml +++ b/.github/workflows/connect-desktop-ci.yml @@ -1,13 +1,13 @@ -name: CI for nym-connect +name: CI for nym-connect - Desktop on: push: paths: - - 'nym-connect/**' + - 'nym-connect/desktop/**' defaults: run: - working-directory: nym-connect + working-directory: nym-connect/desktop jobs: build: @@ -34,7 +34,7 @@ jobs: env: SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }} ARGS: "-rltgoDzvO --delete" - SOURCE: "nym-connect/storybook-static/" + SOURCE: "nym-connect/desktop/storybook-static/" REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }} REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }} TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/nym-connect-${{ env.GITHUB_REF_SLUG }} diff --git a/.github/workflows/connect.yml b/.github/workflows/connect-desktop.yml similarity index 53% rename from .github/workflows/connect.yml rename to .github/workflows/connect-desktop.yml index 29e347586e..e74b67a3bd 100644 --- a/.github/workflows/connect.yml +++ b/.github/workflows/connect-desktop.yml @@ -1,28 +1,30 @@ -name: Nym Connect (rust) +name: Nym Connect - desktop (Rust) on: push: paths: - - 'nym-connect/**' - - 'clients/client-core/**' - - 'clients/socks5/**' - - 'common/**' - - 'gateway/gateway-requests/**' - - 'contracts/vesting/**' - - 'nym-api/nym-api-requests/**' + - "nym-connect/desktop/src-tauri/**" + - "nym-connect/desktop/src-tauri/Cargo.toml" + - "clients/client-core/**" + - "clients/socks5/**" + - "common/**" + - "gateway/gateway-requests/**" + - "contracts/vesting/**" + - "nym-api/nym-api-requests/**" pull_request: paths: - - 'nym-connect/**' - - 'clients/client-core/**' - - 'clients/socks5/**' - - 'common/**' - - 'gateway/gateway-requests/**' - - 'contracts/vesting/**' - - 'nym-api/nym-api-requests/**' + - "nym-connect/desktop/src-tauri/**" + - "nym-connect/desktop/src-tauri/Cargo.toml" + - "clients/client-core/**" + - "clients/socks5/**" + - "common/**" + - "gateway/gateway-requests/**" + - "contracts/vesting/**" + - "nym-api/nym-api-requests/**" jobs: build: - runs-on: [ self-hosted, custom-linux ] + runs-on: [self-hosted, custom-linux] env: RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache steps: @@ -45,29 +47,29 @@ jobs: uses: actions-rs/cargo@v1 with: command: build - args: --manifest-path nym-connect/Cargo.toml --workspace + args: --manifest-path nym-connect/desktop/Cargo.toml --workspace - name: Run all tests uses: actions-rs/cargo@v1 with: command: test - args: --manifest-path nym-connect/Cargo.toml --workspace + args: --manifest-path nym-connect/desktop/Cargo.toml --workspace - name: Check formatting uses: actions-rs/cargo@v1 with: command: fmt - args: --manifest-path nym-connect/Cargo.toml --all -- --check + args: --manifest-path nym-connect/desktop/Cargo.toml --all -- --check - uses: actions-rs/clippy-check@v1 name: Clippy checks continue-on-error: true with: token: ${{ secrets.GITHUB_TOKEN }} - args: --manifest-path nym-connect/Cargo.toml --workspace --all-features + args: --manifest-path nym-connect/desktop/Cargo.toml --workspace --all-features - name: Run clippy uses: actions-rs/cargo@v1 with: command: clippy - args: --manifest-path nym-connect/Cargo.toml --workspace --all-features -- -D warnings + args: --manifest-path nym-connect/desktop/Cargo.toml --workspace --all-features -- -D warnings diff --git a/.github/workflows/connect-android.yml b/.github/workflows/connect-mobile.yml similarity index 65% rename from .github/workflows/connect-android.yml rename to .github/workflows/connect-mobile.yml index f6a30a6eb0..ccbd7203c4 100644 --- a/.github/workflows/connect-android.yml +++ b/.github/workflows/connect-mobile.yml @@ -1,10 +1,11 @@ -name: Nym Connect for Android (rust) +name: Nym Connect - mobile (Rust) on: push: paths: - - "nym-connect-android/src-tauri/**" - - "!nym-connect-android/src-tauri/gen/**" + - "nym-connect/mobile/src-tauri/**" + - "nym-connect/mobile/src-tauri/Cargo.toml" + - "!nym-connect/mobile/src-tauri/gen/**" - "clients/client-core/**" - "clients/socks5/**" - "common/**" @@ -13,8 +14,9 @@ on: - "nym-api/nym-api-requests/**" pull_request: paths: - - "nym-connect-android/src-tauri/**" - - "!nym-connect-android/src-tauri/gen/**" + - "nym-connect/mobile/src-tauri/**" + - "nym-connect/mobile/src-tauri/Cargo.toml" + - "!nym-connect/mobile/src-tauri/gen/**" - "clients/client-core/**" - "clients/socks5/**" - "common/**" @@ -30,7 +32,7 @@ jobs: #RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache #defaults: #run: - #working-directory: nym-connect-android/src-tauri/ + #working-directory: nym-connect/mobile/src-tauri/ steps: - name: Install Dependencies (Linux) run: | @@ -59,13 +61,13 @@ jobs: components: clippy, rustfmt - name: Check formatting - run: cargo fmt --manifest-path nym-connect-android/src-tauri/Cargo.toml -- --check + run: cargo fmt --manifest-path nym-connect/mobile/src-tauri/Cargo.toml -- --check - name: Build all binaries - run: cargo build --manifest-path nym-connect-android/src-tauri/Cargo.toml + run: cargo build --manifest-path nym-connect/mobile/src-tauri/Cargo.toml - name: Run all tests - run: cargo test --manifest-path nym-connect-android/src-tauri/Cargo.toml + run: cargo test --manifest-path nym-connect/mobile/src-tauri/Cargo.toml - name: Clippy - run: cargo clippy --manifest-path nym-connect-android/src-tauri/Cargo.toml --all-targets -- -D warnings + run: cargo clippy --manifest-path nym-connect/mobile/src-tauri/Cargo.toml --all-targets -- -D warnings diff --git a/.github/workflows/nym-connect-publish-macos.yml b/.github/workflows/nym-connect-publish-macos.yml index ba2acfe519..faff21a30c 100644 --- a/.github/workflows/nym-connect-publish-macos.yml +++ b/.github/workflows/nym-connect-publish-macos.yml @@ -1,4 +1,4 @@ -name: Publish Nym Connect (MacOS) +name: Publish Nym Connect - desktop (MacOS) on: workflow_dispatch: release: @@ -6,7 +6,7 @@ on: defaults: run: - working-directory: nym-connect + working-directory: nym-connect/desktop jobs: publish-tauri: @@ -73,7 +73,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: nym-connect_1.0.0_x64.dmg - path: nym-connect/target/release/bundle/dmg/nym-connect_1.0.0_x64.dmg + path: nym-connect/desktop/target/release/bundle/dmg/nym-connect_1.0.0_x64.dmg retention-days: 30 - name: Clean up keychain @@ -86,5 +86,5 @@ jobs: if: github.event_name == 'release' with: files: | - nym-connect/target/release/bundle/dmg/*.dmg - nym-connect/target/release/bundle/macos/*.app.tar.gz* + nym-connect/desktop/target/release/bundle/dmg/*.dmg + nym-connect/desktop/target/release/bundle/macos/*.app.tar.gz* diff --git a/.github/workflows/nym-connect-publish-ubuntu.yml b/.github/workflows/nym-connect-publish-ubuntu.yml index f311abb53d..fd36ca4909 100644 --- a/.github/workflows/nym-connect-publish-ubuntu.yml +++ b/.github/workflows/nym-connect-publish-ubuntu.yml @@ -1,4 +1,4 @@ -name: Publish Nym Connect (Ubuntu) +name: Publish Nym Connect - desktop (Ubuntu) on: workflow_dispatch: release: @@ -6,7 +6,7 @@ on: defaults: run: - working-directory: nym-connect + working-directory: nym-connect/desktop jobs: publish-tauri: @@ -53,7 +53,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: nym-connect.AppImage.tar.gz - path: nym-connect/target/release/bundle/appimage/nym-connect_1.0.0_amd64.AppImage + path: nym-connect/desktop/target/release/bundle/appimage/nym-connect_1.0.0_amd64.AppImage retention-days: 30 - name: Upload to release based on tag name @@ -61,5 +61,5 @@ jobs: if: github.event_name == 'release' with: files: | - nym-connect/target/release/bundle/appimage/*.AppImage - nym-connect/target/release/bundle/appimage/*.AppImage.tar.gz* + nym-connect/desktop/target/release/bundle/appimage/*.AppImage + nym-connect/desktop/target/release/bundle/appimage/*.AppImage.tar.gz* diff --git a/.github/workflows/nym-connect-publish-windows10.yml b/.github/workflows/nym-connect-publish-windows10.yml index 599b6d27e4..8e0f983754 100644 --- a/.github/workflows/nym-connect-publish-windows10.yml +++ b/.github/workflows/nym-connect-publish-windows10.yml @@ -1,4 +1,4 @@ -name: Publish Nym Connect (Windows 10) +name: Publish Nym Connect - desktop (Windows 10) on: workflow_dispatch: release: @@ -6,7 +6,7 @@ on: defaults: run: - working-directory: nym-connect + working-directory: nym-connect/desktop jobs: publish-tauri: @@ -72,7 +72,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: nym-connect_1.0.0_x64_en-US.msi - path: nym-connect/target/release/bundle/msi/nym-connect_1.0.0_x64_en-US.msi + path: nym-connect/desktop/target/release/bundle/msi/nym-connect_1.0.0_x64_en-US.msi retention-days: 30 - name: Upload to release based on tag name @@ -80,5 +80,5 @@ jobs: if: github.event_name == 'release' with: files: | - nym-connect/target/release/bundle/msi/*.msi - nym-connect/target/release/bundle/msi/*.msi.zip* + nym-connect/desktop/target/release/bundle/msi/*.msi + nym-connect/desktop/target/release/bundle/msi/*.msi.zip* diff --git a/.github/workflows/typescript-lint.yml b/.github/workflows/typescript-lint.yml index 7d03515abb..b3bd15b6e6 100644 --- a/.github/workflows/typescript-lint.yml +++ b/.github/workflows/typescript-lint.yml @@ -5,10 +5,20 @@ on: paths: - 'ts-packages/**' - 'sdk/typescript/**' - - 'nym-connect/src/**' - - 'nym-connect/package.json' - - 'nym-connect-android/src/**' - - 'nym-connect-android/package.json' + - 'nym-connect/desktop/src/**' + - 'nym-connect/desktop/package.json' + - 'nym-connect/mobile/src/**' + - 'nym-connect/mobile/package.json' + - 'nym-wallet/src/**' + - 'nym-wallet/package.json' + pull_request: + paths: + - 'ts-packages/**' + - 'sdk/typescript/**' + - 'nym-connect/desktop/src/**' + - 'nym-connect/desktop/package.json' + - 'nym-connect/mobile/src/**' + - 'nym-connect/mobile/package.json' - 'nym-wallet/src/**' - 'nym-wallet/package.json' diff --git a/Cargo.toml b/Cargo.toml index 5998bb32b6..96ef6b17cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,7 +94,7 @@ default-members = [ "explorer-api", ] -exclude = ["explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect", "nym-connect-android"] +exclude = ["explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop"] [workspace.package] authors = ["Nym Technologies SA"] diff --git a/Makefile b/Makefile index 5ae3c7d51a..a13100f7ba 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,12 @@ test: clippy-all cargo-test wasm fmt test-all: test cargo-test-expensive no-clippy: build cargo-test wasm fmt happy: fmt clippy-happy test -clippy-all: clippy-main clippy-main-examples clippy-all-contracts clippy-all-wallet clippy-all-connect clippy-all-connect-android clippy-all-wasm-client -clippy-happy: clippy-happy-main clippy-happy-contracts clippy-happy-wallet clippy-happy-connect clippy-happy-connect-android -cargo-test: test-main test-contracts test-wallet test-connect test-connect-android +clippy-all: clippy-main clippy-main-examples clippy-all-contracts clippy-all-wallet clippy-all-connect clippy-all-connect-mobile clippy-all-wasm-client +clippy-happy: clippy-happy-main clippy-happy-contracts clippy-happy-wallet clippy-happy-connect clippy-happy-connect-mobile +cargo-test: test-main test-contracts test-wallet test-connect test-connect-mobile cargo-test-expensive: test-main-expensive test-contracts-expensive test-wallet-expensive test-connect-expensive -build: build-contracts build-wallet build-main build-main-examples build-connect build-connect-android build-wasm-client -fmt: fmt-main fmt-contracts fmt-wallet fmt-connect fmt-connect-android fmt-wasm-client +build: build-contracts build-wallet build-main build-main-examples build-connect build-connect-mobile build-wasm-client +fmt: fmt-main fmt-contracts fmt-wallet fmt-connect fmt-connect-mobile fmt-wasm-client clippy-happy-main: cargo clippy @@ -19,10 +19,10 @@ clippy-happy-wallet: cargo clippy --manifest-path nym-wallet/Cargo.toml clippy-happy-connect: - cargo clippy --manifest-path nym-connect/Cargo.toml + cargo clippy --manifest-path nym-connect/desktop/Cargo.toml -clippy-happy-connect-android: - cargo clippy --manifest-path nym-connect-android/src-tauri/Cargo.toml +clippy-happy-connect-mobile: + cargo clippy --manifest-path nym-connect/mobile/src-tauri/Cargo.toml clippy-main: cargo clippy --workspace -- -D warnings @@ -41,10 +41,10 @@ clippy-all-wallet: cargo clippy --workspace --manifest-path nym-wallet/Cargo.toml --all-features -- -D warnings clippy-all-connect: - cargo clippy --workspace --manifest-path nym-connect/Cargo.toml --all-features -- -D warnings + cargo clippy --workspace --manifest-path nym-connect/desktop/Cargo.toml --all-features -- -D warnings -clippy-all-connect-android: - cargo clippy --workspace --manifest-path nym-connect-android/src-tauri/Cargo.toml --all-features -- -D warnings +clippy-all-connect-mobile: + cargo clippy --workspace --manifest-path nym-connect/mobile/src-tauri/Cargo.toml --all-features -- -D warnings clippy-all-wasm-client: cargo clippy --workspace --manifest-path clients/webassembly/Cargo.toml --all-features --target wasm32-unknown-unknown -- -D warnings @@ -68,16 +68,16 @@ test-wallet-expensive: cargo test --manifest-path nym-wallet/Cargo.toml --all-features -- --ignored test-connect: - cargo test --manifest-path nym-connect/Cargo.toml --all-features + cargo test --manifest-path nym-connect/desktop/Cargo.toml --all-features test-connect-expensive: - cargo test --manifest-path nym-connect/Cargo.toml --all-features -- --ignored + cargo test --manifest-path nym-connect/desktop/Cargo.toml --all-features -- --ignored -test-connect-android: - cargo test --manifest-path nym-connect-android/src-tauri/Cargo.toml --all-features +test-connect-mobile: + cargo test --manifest-path nym-connect/mobile/src-tauri/Cargo.toml --all-features -test-connect-android-expensive: - cargo test --manifest-path nym-connect-android/src-tauri/Cargo.toml --all-features -- --ignored +test-connect-mobile-expensive: + cargo test --manifest-path nym-connect/mobile/src-tauri/Cargo.toml --all-features -- --ignored build-main: cargo build --workspace @@ -92,10 +92,10 @@ build-wallet: cargo build --manifest-path nym-wallet/Cargo.toml --workspace build-connect: - cargo build --manifest-path nym-connect/Cargo.toml --workspace + cargo build --manifest-path nym-connect/desktop/Cargo.toml --workspace -build-connect-android: - cargo build --manifest-path nym-connect-android/src-tauri/Cargo.toml --workspace +build-connect-mobile: + cargo build --manifest-path nym-connect/mobile/src-tauri/Cargo.toml --workspace build-explorer-api: cargo build --manifest-path explorer-api/Cargo.toml --workspace @@ -116,10 +116,10 @@ fmt-wallet: cargo fmt --manifest-path nym-wallet/Cargo.toml --all fmt-connect: - cargo fmt --manifest-path nym-connect/Cargo.toml --all + cargo fmt --manifest-path nym-connect/desktop/Cargo.toml --all -fmt-connect-android: - cargo fmt --manifest-path nym-connect-android/src-tauri/Cargo.toml --all +fmt-connect-mobile: + cargo fmt --manifest-path nym-connect/mobile/src-tauri/Cargo.toml --all fmt-wasm-client: cargo fmt --manifest-path clients/webassembly/Cargo.toml --all diff --git a/lerna.json b/lerna.json index e53d32b504..5d17094fd5 100644 --- a/lerna.json +++ b/lerna.json @@ -2,10 +2,9 @@ "packages": [ "ts-packages/*", "nym-wallet", - "nym-connect", - "nym-connect-android", + "nym-connect/**", "sdk/typescript/examples/docs", "sdk/typescript/packages/**" ], "version": "0.0.0" -} \ No newline at end of file +} diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/.gitignore b/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/.gitignore deleted file mode 100644 index cd06a0a15a..0000000000 --- a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/src/main/java/net/nymtech/nym_connect_android/generated diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/java/net/nymtech/nym_connect_android/MainActivity.kt b/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/java/net/nymtech/nym_connect_android/MainActivity.kt deleted file mode 100644 index 5b7526aed3..0000000000 --- a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/java/net/nymtech/nym_connect_android/MainActivity.kt +++ /dev/null @@ -1,3 +0,0 @@ -package net.nymtech.nym_connect_android - -class MainActivity : TauriActivity() diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/jniLibs/arm64-v8a/libnym_connect_android.so b/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/jniLibs/arm64-v8a/libnym_connect_android.so deleted file mode 120000 index 5963e98ea2..0000000000 --- a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/jniLibs/arm64-v8a/libnym_connect_android.so +++ /dev/null @@ -1 +0,0 @@ -/home/pierre/Documents/nym/nym/nym-connect-android/src-tauri/target/aarch64-linux-android/debug/libnym_connect_android.so \ No newline at end of file diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/jniLibs/armeabi-v7a/libnym_connect_android.so b/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/jniLibs/armeabi-v7a/libnym_connect_android.so deleted file mode 120000 index 28db5686bb..0000000000 --- a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/jniLibs/armeabi-v7a/libnym_connect_android.so +++ /dev/null @@ -1 +0,0 @@ -/home/pierre/Documents/nym/nym/nym-connect-android/src-tauri/target/armv7-linux-androideabi/debug/libnym_connect_android.so \ No newline at end of file diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/jniLibs/x86/libnym_connect_android.so b/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/jniLibs/x86/libnym_connect_android.so deleted file mode 120000 index 3041208a37..0000000000 --- a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/jniLibs/x86/libnym_connect_android.so +++ /dev/null @@ -1 +0,0 @@ -/home/pierre/Documents/nym/nym/nym-connect-android/src-tauri/target/i686-linux-android/debug/libnym_connect_android.so \ No newline at end of file diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/jniLibs/x86_64/libnym_connect_android.so b/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/jniLibs/x86_64/libnym_connect_android.so deleted file mode 120000 index d6aac3cf45..0000000000 --- a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/jniLibs/x86_64/libnym_connect_android.so +++ /dev/null @@ -1 +0,0 @@ -/home/pierre/Documents/nym/nym/nym-connect-android/src-tauri/target/x86_64-linux-android/debug/libnym_connect_android.so \ No newline at end of file diff --git a/nym-connect-android/.babelrc b/nym-connect/desktop/.babelrc similarity index 100% rename from nym-connect-android/.babelrc rename to nym-connect/desktop/.babelrc diff --git a/nym-connect-android/.env.sample b/nym-connect/desktop/.env.sample similarity index 100% rename from nym-connect-android/.env.sample rename to nym-connect/desktop/.env.sample diff --git a/nym-connect-android/.eslintrc b/nym-connect/desktop/.eslintrc similarity index 100% rename from nym-connect-android/.eslintrc rename to nym-connect/desktop/.eslintrc diff --git a/nym-connect-android/.nvmrc b/nym-connect/desktop/.nvmrc similarity index 100% rename from nym-connect-android/.nvmrc rename to nym-connect/desktop/.nvmrc diff --git a/nym-connect-android/.prettierrc b/nym-connect/desktop/.prettierrc similarity index 100% rename from nym-connect-android/.prettierrc rename to nym-connect/desktop/.prettierrc diff --git a/nym-connect-android/.storybook/main.js b/nym-connect/desktop/.storybook/main.js similarity index 100% rename from nym-connect-android/.storybook/main.js rename to nym-connect/desktop/.storybook/main.js diff --git a/nym-connect-android/.storybook/mocks/tauri/app.js b/nym-connect/desktop/.storybook/mocks/tauri/app.js similarity index 100% rename from nym-connect-android/.storybook/mocks/tauri/app.js rename to nym-connect/desktop/.storybook/mocks/tauri/app.js diff --git a/nym-connect-android/.storybook/mocks/tauri/clipboard.js b/nym-connect/desktop/.storybook/mocks/tauri/clipboard.js similarity index 100% rename from nym-connect-android/.storybook/mocks/tauri/clipboard.js rename to nym-connect/desktop/.storybook/mocks/tauri/clipboard.js diff --git a/nym-connect-android/.storybook/mocks/tauri/event.js b/nym-connect/desktop/.storybook/mocks/tauri/event.js similarity index 100% rename from nym-connect-android/.storybook/mocks/tauri/event.js rename to nym-connect/desktop/.storybook/mocks/tauri/event.js diff --git a/nym-connect-android/.storybook/mocks/tauri/index.js b/nym-connect/desktop/.storybook/mocks/tauri/index.js similarity index 100% rename from nym-connect-android/.storybook/mocks/tauri/index.js rename to nym-connect/desktop/.storybook/mocks/tauri/index.js diff --git a/nym-connect-android/.storybook/mocks/tauri/notification.js b/nym-connect/desktop/.storybook/mocks/tauri/notification.js similarity index 100% rename from nym-connect-android/.storybook/mocks/tauri/notification.js rename to nym-connect/desktop/.storybook/mocks/tauri/notification.js diff --git a/nym-connect-android/.storybook/mocks/tauri/window.js b/nym-connect/desktop/.storybook/mocks/tauri/window.js similarity index 100% rename from nym-connect-android/.storybook/mocks/tauri/window.js rename to nym-connect/desktop/.storybook/mocks/tauri/window.js diff --git a/nym-connect-android/.storybook/preview-fonts.js b/nym-connect/desktop/.storybook/preview-fonts.js similarity index 100% rename from nym-connect-android/.storybook/preview-fonts.js rename to nym-connect/desktop/.storybook/preview-fonts.js diff --git a/nym-connect-android/.storybook/preview.js b/nym-connect/desktop/.storybook/preview.js similarity index 100% rename from nym-connect-android/.storybook/preview.js rename to nym-connect/desktop/.storybook/preview.js diff --git a/nym-connect/CHANGELOG.md b/nym-connect/desktop/CHANGELOG.md similarity index 100% rename from nym-connect/CHANGELOG.md rename to nym-connect/desktop/CHANGELOG.md diff --git a/nym-connect/Cargo.toml b/nym-connect/desktop/Cargo.toml similarity index 100% rename from nym-connect/Cargo.toml rename to nym-connect/desktop/Cargo.toml diff --git a/nym-connect/README.md b/nym-connect/desktop/README.md similarity index 99% rename from nym-connect/README.md rename to nym-connect/desktop/README.md index bbd9b55bbb..a30341be85 100644 --- a/nym-connect/README.md +++ b/nym-connect/desktop/README.md @@ -3,7 +3,7 @@ Copyright 2020 - Nym Technologies SA SPDX-License-Identifier: Apache-2.0 --> -# Nym Connect +# Nym Connect - Desktop Nym is an open-source, decentralized and permissionless privacy system. It provides full-stack privacy, allowing other applications, services or blockchains to provide their users with strong metadata protection, at both the network level (mixnet), and the application level (anonymous credentials) without the need to build privacy from scratch. diff --git a/nym-connect-android/dist/.gitkeep b/nym-connect/desktop/dist/.gitkeep similarity index 100% rename from nym-connect-android/dist/.gitkeep rename to nym-connect/desktop/dist/.gitkeep diff --git a/nym-connect/package.json b/nym-connect/desktop/package.json similarity index 96% rename from nym-connect/package.json rename to nym-connect/desktop/package.json index b124d71730..75b69a863e 100644 --- a/nym-connect/package.json +++ b/nym-connect/desktop/package.json @@ -4,17 +4,17 @@ "main": "index.js", "license": "MIT", "scripts": { - "prewebpack:dev": "yarn --cwd .. build", + "prewebpack:dev": "yarn --cwd ../.. build", "webpack:dev": "yarn webpack serve --config webpack.dev.js", "webpack:dev:onlyThis": "yarn webpack serve --config webpack.dev.js", "webpack:prod": "yarn webpack --progress --config webpack.prod.js", "tauri:dev": "RUST_DEBUG=1 yarn tauri dev", "tauri:build": "yarn tauri build", "dev": "run-p webpack:dev tauri:dev", - "prebuild": "yarn --cwd .. build", + "prebuild": "yarn --cwd ../.. build", "build": "run-s webpack:prod tauri:build", "storybook": "start-storybook -p 6006", - "prestorybook:build": "yarn --cwd .. build", + "prestorybook:build": "yarn --cwd ../.. build", "storybook:build": "build-storybook", "tsc": "tsc --noEmit true", "tsc:watch": "tsc --noEmit true --watch", @@ -113,4 +113,4 @@ "webpack-merge": "^5.8.0", "yaml-loader": "^0.8.0" } -} \ No newline at end of file +} diff --git a/nym-connect-android/public/favicon.ico b/nym-connect/desktop/public/favicon.ico similarity index 100% rename from nym-connect-android/public/favicon.ico rename to nym-connect/desktop/public/favicon.ico diff --git a/nym-connect-android/public/favicon.png b/nym-connect/desktop/public/favicon.png similarity index 100% rename from nym-connect-android/public/favicon.png rename to nym-connect/desktop/public/favicon.png diff --git a/nym-connect/public/growth.html b/nym-connect/desktop/public/growth.html similarity index 100% rename from nym-connect/public/growth.html rename to nym-connect/desktop/public/growth.html diff --git a/nym-connect-android/public/index.html b/nym-connect/desktop/public/index.html similarity index 100% rename from nym-connect-android/public/index.html rename to nym-connect/desktop/public/index.html diff --git a/nym-connect/public/log.html b/nym-connect/desktop/public/log.html similarity index 100% rename from nym-connect/public/log.html rename to nym-connect/desktop/public/log.html diff --git a/nym-connect-android/src-tauri/.gitignore b/nym-connect/desktop/src-tauri/.gitignore similarity index 100% rename from nym-connect-android/src-tauri/.gitignore rename to nym-connect/desktop/src-tauri/.gitignore diff --git a/nym-connect/src-tauri/Cargo.toml b/nym-connect/desktop/src-tauri/Cargo.toml similarity index 75% rename from nym-connect/src-tauri/Cargo.toml rename to nym-connect/desktop/src-tauri/Cargo.toml index 51a42283ab..982b000e28 100644 --- a/nym-connect/src-tauri/Cargo.toml +++ b/nym-connect/desktop/src-tauri/Cargo.toml @@ -44,14 +44,14 @@ tokio = { version = "1.24.1", features = ["sync", "time"] } url = "2.2" yaml-rust = "0.4" -client-core = { path = "../../clients/client-core" } -nym-api-requests = { path = "../../nym-api/nym-api-requests" } -nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common"} -config-common = { path = "../../common/config", package = "config" } -nym-crypto = { path = "../../common/crypto" } -nym-bin-common = { path = "../../common/bin-common"} -nym-socks5-client = { path = "../../clients/socks5" } -nym-task = { path = "../../common/task" } +client-core = { path = "../../../clients/client-core" } +nym-api-requests = { path = "../../../nym-api/nym-api-requests" } +nym-contracts-common = { path = "../../../common/cosmwasm-smart-contracts/contracts-common"} +config-common = { path = "../../../common/config", package = "config" } +nym-crypto = { path = "../../../common/crypto" } +nym-bin-common = { path = "../../../common/bin-common"} +nym-socks5-client = { path = "../../../clients/socks5" } +nym-task = { path = "../../../common/task" } [dev-dependencies] ts-rs = "6.1.2" diff --git a/nym-connect-android/src-tauri/icons/128x128.png b/nym-connect/desktop/src-tauri/icons/128x128.png similarity index 100% rename from nym-connect-android/src-tauri/icons/128x128.png rename to nym-connect/desktop/src-tauri/icons/128x128.png diff --git a/nym-connect-android/src-tauri/icons/128x128@2x.png b/nym-connect/desktop/src-tauri/icons/128x128@2x.png similarity index 100% rename from nym-connect-android/src-tauri/icons/128x128@2x.png rename to nym-connect/desktop/src-tauri/icons/128x128@2x.png diff --git a/nym-connect-android/src-tauri/icons/32x32.png b/nym-connect/desktop/src-tauri/icons/32x32.png similarity index 100% rename from nym-connect-android/src-tauri/icons/32x32.png rename to nym-connect/desktop/src-tauri/icons/32x32.png diff --git a/nym-connect-android/src-tauri/icons/Square107x107Logo.png b/nym-connect/desktop/src-tauri/icons/Square107x107Logo.png similarity index 100% rename from nym-connect-android/src-tauri/icons/Square107x107Logo.png rename to nym-connect/desktop/src-tauri/icons/Square107x107Logo.png diff --git a/nym-connect-android/src-tauri/icons/Square142x142Logo.png b/nym-connect/desktop/src-tauri/icons/Square142x142Logo.png similarity index 100% rename from nym-connect-android/src-tauri/icons/Square142x142Logo.png rename to nym-connect/desktop/src-tauri/icons/Square142x142Logo.png diff --git a/nym-connect-android/src-tauri/icons/Square150x150Logo.png b/nym-connect/desktop/src-tauri/icons/Square150x150Logo.png similarity index 100% rename from nym-connect-android/src-tauri/icons/Square150x150Logo.png rename to nym-connect/desktop/src-tauri/icons/Square150x150Logo.png diff --git a/nym-connect-android/src-tauri/icons/Square284x284Logo.png b/nym-connect/desktop/src-tauri/icons/Square284x284Logo.png similarity index 100% rename from nym-connect-android/src-tauri/icons/Square284x284Logo.png rename to nym-connect/desktop/src-tauri/icons/Square284x284Logo.png diff --git a/nym-connect-android/src-tauri/icons/Square30x30Logo.png b/nym-connect/desktop/src-tauri/icons/Square30x30Logo.png similarity index 100% rename from nym-connect-android/src-tauri/icons/Square30x30Logo.png rename to nym-connect/desktop/src-tauri/icons/Square30x30Logo.png diff --git a/nym-connect-android/src-tauri/icons/Square310x310Logo.png b/nym-connect/desktop/src-tauri/icons/Square310x310Logo.png similarity index 100% rename from nym-connect-android/src-tauri/icons/Square310x310Logo.png rename to nym-connect/desktop/src-tauri/icons/Square310x310Logo.png diff --git a/nym-connect-android/src-tauri/icons/Square44x44Logo.png b/nym-connect/desktop/src-tauri/icons/Square44x44Logo.png similarity index 100% rename from nym-connect-android/src-tauri/icons/Square44x44Logo.png rename to nym-connect/desktop/src-tauri/icons/Square44x44Logo.png diff --git a/nym-connect-android/src-tauri/icons/Square71x71Logo.png b/nym-connect/desktop/src-tauri/icons/Square71x71Logo.png similarity index 100% rename from nym-connect-android/src-tauri/icons/Square71x71Logo.png rename to nym-connect/desktop/src-tauri/icons/Square71x71Logo.png diff --git a/nym-connect-android/src-tauri/icons/Square89x89Logo.png b/nym-connect/desktop/src-tauri/icons/Square89x89Logo.png similarity index 100% rename from nym-connect-android/src-tauri/icons/Square89x89Logo.png rename to nym-connect/desktop/src-tauri/icons/Square89x89Logo.png diff --git a/nym-connect-android/src-tauri/icons/StoreLogo.png b/nym-connect/desktop/src-tauri/icons/StoreLogo.png similarity index 100% rename from nym-connect-android/src-tauri/icons/StoreLogo.png rename to nym-connect/desktop/src-tauri/icons/StoreLogo.png diff --git a/nym-connect-android/src-tauri/icons/icon.icns b/nym-connect/desktop/src-tauri/icons/icon.icns similarity index 100% rename from nym-connect-android/src-tauri/icons/icon.icns rename to nym-connect/desktop/src-tauri/icons/icon.icns diff --git a/nym-connect-android/src-tauri/icons/icon.ico b/nym-connect/desktop/src-tauri/icons/icon.ico similarity index 100% rename from nym-connect-android/src-tauri/icons/icon.ico rename to nym-connect/desktop/src-tauri/icons/icon.ico diff --git a/nym-connect-android/src-tauri/icons/icon.png b/nym-connect/desktop/src-tauri/icons/icon.png similarity index 100% rename from nym-connect-android/src-tauri/icons/icon.png rename to nym-connect/desktop/src-tauri/icons/icon.png diff --git a/nym-connect-android/src-tauri/icons/tray_icon.ico b/nym-connect/desktop/src-tauri/icons/tray_icon.ico similarity index 100% rename from nym-connect-android/src-tauri/icons/tray_icon.ico rename to nym-connect/desktop/src-tauri/icons/tray_icon.ico diff --git a/nym-connect-android/src-tauri/icons/tray_icon.png b/nym-connect/desktop/src-tauri/icons/tray_icon.png similarity index 100% rename from nym-connect-android/src-tauri/icons/tray_icon.png rename to nym-connect/desktop/src-tauri/icons/tray_icon.png diff --git a/nym-connect-android/src-tauri/src/build.rs b/nym-connect/desktop/src-tauri/src/build.rs similarity index 100% rename from nym-connect-android/src-tauri/src/build.rs rename to nym-connect/desktop/src-tauri/src/build.rs diff --git a/nym-connect/src-tauri/src/config/mod.rs b/nym-connect/desktop/src-tauri/src/config/mod.rs similarity index 100% rename from nym-connect/src-tauri/src/config/mod.rs rename to nym-connect/desktop/src-tauri/src/config/mod.rs diff --git a/nym-connect/src-tauri/src/error.rs b/nym-connect/desktop/src-tauri/src/error.rs similarity index 100% rename from nym-connect/src-tauri/src/error.rs rename to nym-connect/desktop/src-tauri/src/error.rs diff --git a/nym-connect-android/src-tauri/src/events.rs b/nym-connect/desktop/src-tauri/src/events.rs similarity index 100% rename from nym-connect-android/src-tauri/src/events.rs rename to nym-connect/desktop/src-tauri/src/events.rs diff --git a/nym-connect-android/src-tauri/src/logging.rs b/nym-connect/desktop/src-tauri/src/logging.rs similarity index 100% rename from nym-connect-android/src-tauri/src/logging.rs rename to nym-connect/desktop/src-tauri/src/logging.rs diff --git a/nym-connect/src-tauri/src/main.rs b/nym-connect/desktop/src-tauri/src/main.rs similarity index 100% rename from nym-connect/src-tauri/src/main.rs rename to nym-connect/desktop/src-tauri/src/main.rs diff --git a/nym-connect/src-tauri/src/menu.rs b/nym-connect/desktop/src-tauri/src/menu.rs similarity index 100% rename from nym-connect/src-tauri/src/menu.rs rename to nym-connect/desktop/src-tauri/src/menu.rs diff --git a/nym-connect/src-tauri/src/models/mod.rs b/nym-connect/desktop/src-tauri/src/models/mod.rs similarity index 100% rename from nym-connect/src-tauri/src/models/mod.rs rename to nym-connect/desktop/src-tauri/src/models/mod.rs diff --git a/nym-connect-android/src-tauri/src/operations/connection/connect.rs b/nym-connect/desktop/src-tauri/src/operations/connection/connect.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/connection/connect.rs rename to nym-connect/desktop/src-tauri/src/operations/connection/connect.rs diff --git a/nym-connect-android/src-tauri/src/operations/connection/disconnect.rs b/nym-connect/desktop/src-tauri/src/operations/connection/disconnect.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/connection/disconnect.rs rename to nym-connect/desktop/src-tauri/src/operations/connection/disconnect.rs diff --git a/nym-connect-android/src-tauri/src/operations/connection/health_check.rs b/nym-connect/desktop/src-tauri/src/operations/connection/health_check.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/connection/health_check.rs rename to nym-connect/desktop/src-tauri/src/operations/connection/health_check.rs diff --git a/nym-connect-android/src-tauri/src/operations/connection/mod.rs b/nym-connect/desktop/src-tauri/src/operations/connection/mod.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/connection/mod.rs rename to nym-connect/desktop/src-tauri/src/operations/connection/mod.rs diff --git a/nym-connect-android/src-tauri/src/operations/connection/status.rs b/nym-connect/desktop/src-tauri/src/operations/connection/status.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/connection/status.rs rename to nym-connect/desktop/src-tauri/src/operations/connection/status.rs diff --git a/nym-connect-android/src-tauri/src/operations/directory/mod.rs b/nym-connect/desktop/src-tauri/src/operations/directory/mod.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/directory/mod.rs rename to nym-connect/desktop/src-tauri/src/operations/directory/mod.rs diff --git a/nym-connect-android/src-tauri/src/operations/export.rs b/nym-connect/desktop/src-tauri/src/operations/export.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/export.rs rename to nym-connect/desktop/src-tauri/src/operations/export.rs diff --git a/nym-connect/src-tauri/src/operations/growth/api_client.rs b/nym-connect/desktop/src-tauri/src/operations/growth/api_client.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/growth/api_client.rs rename to nym-connect/desktop/src-tauri/src/operations/growth/api_client.rs diff --git a/nym-connect/src-tauri/src/operations/growth/assets.rs b/nym-connect/desktop/src-tauri/src/operations/growth/assets.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/growth/assets.rs rename to nym-connect/desktop/src-tauri/src/operations/growth/assets.rs diff --git a/nym-connect/src-tauri/src/operations/growth/mod.rs b/nym-connect/desktop/src-tauri/src/operations/growth/mod.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/growth/mod.rs rename to nym-connect/desktop/src-tauri/src/operations/growth/mod.rs diff --git a/nym-connect/src-tauri/src/operations/growth/test_and_earn.rs b/nym-connect/desktop/src-tauri/src/operations/growth/test_and_earn.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/growth/test_and_earn.rs rename to nym-connect/desktop/src-tauri/src/operations/growth/test_and_earn.rs diff --git a/nym-connect/src-tauri/src/operations/help/log.rs b/nym-connect/desktop/src-tauri/src/operations/help/log.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/help/log.rs rename to nym-connect/desktop/src-tauri/src/operations/help/log.rs diff --git a/nym-connect-android/src-tauri/src/operations/help/mod.rs b/nym-connect/desktop/src-tauri/src/operations/help/mod.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/help/mod.rs rename to nym-connect/desktop/src-tauri/src/operations/help/mod.rs diff --git a/nym-connect-android/src-tauri/src/operations/help/storage.rs b/nym-connect/desktop/src-tauri/src/operations/help/storage.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/help/storage.rs rename to nym-connect/desktop/src-tauri/src/operations/help/storage.rs diff --git a/nym-connect-android/src-tauri/src/operations/http.rs b/nym-connect/desktop/src-tauri/src/operations/http.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/http.rs rename to nym-connect/desktop/src-tauri/src/operations/http.rs diff --git a/nym-connect/src-tauri/src/operations/mod.rs b/nym-connect/desktop/src-tauri/src/operations/mod.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/mod.rs rename to nym-connect/desktop/src-tauri/src/operations/mod.rs diff --git a/nym-connect-android/src-tauri/src/operations/window/mod.rs b/nym-connect/desktop/src-tauri/src/operations/window/mod.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/window/mod.rs rename to nym-connect/desktop/src-tauri/src/operations/window/mod.rs diff --git a/nym-connect/src-tauri/src/state.rs b/nym-connect/desktop/src-tauri/src/state.rs similarity index 100% rename from nym-connect/src-tauri/src/state.rs rename to nym-connect/desktop/src-tauri/src/state.rs diff --git a/nym-connect/src-tauri/src/tasks.rs b/nym-connect/desktop/src-tauri/src/tasks.rs similarity index 100% rename from nym-connect/src-tauri/src/tasks.rs rename to nym-connect/desktop/src-tauri/src/tasks.rs diff --git a/nym-connect-android/src-tauri/src/window.rs b/nym-connect/desktop/src-tauri/src/window.rs similarity index 100% rename from nym-connect-android/src-tauri/src/window.rs rename to nym-connect/desktop/src-tauri/src/window.rs diff --git a/nym-connect/src-tauri/tauri.conf.json b/nym-connect/desktop/src-tauri/tauri.conf.json similarity index 100% rename from nym-connect/src-tauri/tauri.conf.json rename to nym-connect/desktop/src-tauri/tauri.conf.json diff --git a/nym-connect-android/src/assets/help-step-four.png b/nym-connect/desktop/src/assets/help-step-four.png similarity index 100% rename from nym-connect-android/src/assets/help-step-four.png rename to nym-connect/desktop/src/assets/help-step-four.png diff --git a/nym-connect-android/src/assets/help-step-one-legacy.png b/nym-connect/desktop/src/assets/help-step-one-legacy.png similarity index 100% rename from nym-connect-android/src/assets/help-step-one-legacy.png rename to nym-connect/desktop/src/assets/help-step-one-legacy.png diff --git a/nym-connect-android/src/assets/help-step-one.png b/nym-connect/desktop/src/assets/help-step-one.png similarity index 100% rename from nym-connect-android/src/assets/help-step-one.png rename to nym-connect/desktop/src/assets/help-step-one.png diff --git a/nym-connect-android/src/assets/help-step-three.png b/nym-connect/desktop/src/assets/help-step-three.png similarity index 100% rename from nym-connect-android/src/assets/help-step-three.png rename to nym-connect/desktop/src/assets/help-step-three.png diff --git a/nym-connect-android/src/assets/help-step-two-legacy.png b/nym-connect/desktop/src/assets/help-step-two-legacy.png similarity index 100% rename from nym-connect-android/src/assets/help-step-two-legacy.png rename to nym-connect/desktop/src/assets/help-step-two-legacy.png diff --git a/nym-connect-android/src/assets/help-step-two.png b/nym-connect/desktop/src/assets/help-step-two.png similarity index 100% rename from nym-connect-android/src/assets/help-step-two.png rename to nym-connect/desktop/src/assets/help-step-two.png diff --git a/nym-connect-android/src/components/AppVersion.tsx b/nym-connect/desktop/src/components/AppVersion.tsx similarity index 100% rename from nym-connect-android/src/components/AppVersion.tsx rename to nym-connect/desktop/src/components/AppVersion.tsx diff --git a/nym-connect/src/components/AppWindowFrame.tsx b/nym-connect/desktop/src/components/AppWindowFrame.tsx similarity index 100% rename from nym-connect/src/components/AppWindowFrame.tsx rename to nym-connect/desktop/src/components/AppWindowFrame.tsx diff --git a/nym-connect-android/src/components/ConnectionButton.tsx b/nym-connect/desktop/src/components/ConnectionButton.tsx similarity index 100% rename from nym-connect-android/src/components/ConnectionButton.tsx rename to nym-connect/desktop/src/components/ConnectionButton.tsx diff --git a/nym-connect-android/src/components/ConnectionStats.tsx b/nym-connect/desktop/src/components/ConnectionStats.tsx similarity index 100% rename from nym-connect-android/src/components/ConnectionStats.tsx rename to nym-connect/desktop/src/components/ConnectionStats.tsx diff --git a/nym-connect/src/components/ConnectionStatus.tsx b/nym-connect/desktop/src/components/ConnectionStatus.tsx similarity index 100% rename from nym-connect/src/components/ConnectionStatus.tsx rename to nym-connect/desktop/src/components/ConnectionStatus.tsx diff --git a/nym-connect/src/components/ConntectionTimer.tsx b/nym-connect/desktop/src/components/ConntectionTimer.tsx similarity index 100% rename from nym-connect/src/components/ConntectionTimer.tsx rename to nym-connect/desktop/src/components/ConntectionTimer.tsx diff --git a/nym-connect-android/src/components/CopyToClipboard.tsx b/nym-connect/desktop/src/components/CopyToClipboard.tsx similarity index 100% rename from nym-connect-android/src/components/CopyToClipboard.tsx rename to nym-connect/desktop/src/components/CopyToClipboard.tsx diff --git a/nym-connect/src/components/CustomTitleBar.tsx b/nym-connect/desktop/src/components/CustomTitleBar.tsx similarity index 87% rename from nym-connect/src/components/CustomTitleBar.tsx rename to nym-connect/desktop/src/components/CustomTitleBar.tsx index d88b603873..88235e6074 100644 --- a/nym-connect/src/components/CustomTitleBar.tsx +++ b/nym-connect/desktop/src/components/CustomTitleBar.tsx @@ -1,7 +1,8 @@ import React from 'react'; import { ArrowBack, Close, Menu, Minimize } from '@mui/icons-material'; import { Box, IconButton, Typography } from '@mui/material'; -import { NymWordmark } from '@nymproject/react/logo/NymWordmark'; +// TODO since the structure refactor for NC this import fails +// import { NymWordmark } from '@nymproject/react/logo/NymWordmark'; import { appWindow } from '@tauri-apps/api/window'; import { useNavigate } from 'react-router-dom'; @@ -47,7 +48,13 @@ const getTitleIcon = (path: string) => { ); } - return ; + + // TODO return ; + return ( + + NYM + + ); }; export const CustomTitleBar = ({ path = '/', onBack }: { path?: string; onBack?: () => void }) => ( diff --git a/nym-connect-android/src/components/Error.tsx b/nym-connect/desktop/src/components/Error.tsx similarity index 100% rename from nym-connect-android/src/components/Error.tsx rename to nym-connect/desktop/src/components/Error.tsx diff --git a/nym-connect-android/src/components/ErrorFallback.tsx b/nym-connect/desktop/src/components/ErrorFallback.tsx similarity index 100% rename from nym-connect-android/src/components/ErrorFallback.tsx rename to nym-connect/desktop/src/components/ErrorFallback.tsx diff --git a/nym-connect/src/components/ExperimentalWarning.tsx b/nym-connect/desktop/src/components/ExperimentalWarning.tsx similarity index 100% rename from nym-connect/src/components/ExperimentalWarning.tsx rename to nym-connect/desktop/src/components/ExperimentalWarning.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnButtonArea.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnButtonArea.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnButtonArea.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnButtonArea.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnCurrentDraw.stories.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnCurrentDraw.stories.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnCurrentDraw.stories.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnCurrentDraw.stories.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnCurrentDraw.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnCurrentDraw.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnCurrentDraw.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnCurrentDraw.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnDraws.stories.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnDraws.stories.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnDraws.stories.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnDraws.stories.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnDraws.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnDraws.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnDraws.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnDraws.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnEnterWalletAddress.stories.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnEnterWalletAddress.stories.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnEnterWalletAddress.stories.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnEnterWalletAddress.stories.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnEnterWalletAddress.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnEnterWalletAddress.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnEnterWalletAddress.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnEnterWalletAddress.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnError.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnError.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnError.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnError.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnPopup.stories.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnPopup.stories.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnPopup.stories.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnPopup.stories.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnPopup.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnPopup.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnPopup.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnPopup.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnTakePart.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnTakePart.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnTakePart.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnTakePart.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnWinner.stories.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnWinner.stories.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnWinner.stories.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnWinner.stories.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnWinner.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnWinner.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnWinner.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnWinner.tsx diff --git a/nym-connect/src/components/Growth/TestAndEarnWinnerWalletAddress.tsx b/nym-connect/desktop/src/components/Growth/TestAndEarnWinnerWalletAddress.tsx similarity index 100% rename from nym-connect/src/components/Growth/TestAndEarnWinnerWalletAddress.tsx rename to nym-connect/desktop/src/components/Growth/TestAndEarnWinnerWalletAddress.tsx diff --git a/nym-connect/src/components/Growth/content/TestAndEarn/Error.mdx b/nym-connect/desktop/src/components/Growth/content/TestAndEarn/Error.mdx similarity index 100% rename from nym-connect/src/components/Growth/content/TestAndEarn/Error.mdx rename to nym-connect/desktop/src/components/Growth/content/TestAndEarn/Error.mdx diff --git a/nym-connect/src/components/Growth/content/TestAndEarn/Stage0_intro.mdx b/nym-connect/desktop/src/components/Growth/content/TestAndEarn/Stage0_intro.mdx similarity index 100% rename from nym-connect/src/components/Growth/content/TestAndEarn/Stage0_intro.mdx rename to nym-connect/desktop/src/components/Growth/content/TestAndEarn/Stage0_intro.mdx diff --git a/nym-connect/src/components/Growth/content/TestAndEarn/WinnerEntersWalletAddress.mdx b/nym-connect/desktop/src/components/Growth/content/TestAndEarn/WinnerEntersWalletAddress.mdx similarity index 100% rename from nym-connect/src/components/Growth/content/TestAndEarn/WinnerEntersWalletAddress.mdx rename to nym-connect/desktop/src/components/Growth/content/TestAndEarn/WinnerEntersWalletAddress.mdx diff --git a/nym-connect/src/components/Growth/content/TestAndEarnNotAvaialble.mdx b/nym-connect/desktop/src/components/Growth/content/TestAndEarnNotAvaialble.mdx similarity index 100% rename from nym-connect/src/components/Growth/content/TestAndEarnNotAvaialble.mdx rename to nym-connect/desktop/src/components/Growth/content/TestAndEarnNotAvaialble.mdx diff --git a/nym-connect-android/src/components/Growth/content/assets/matrix.webp b/nym-connect/desktop/src/components/Growth/content/assets/matrix.webp similarity index 100% rename from nym-connect-android/src/components/Growth/content/assets/matrix.webp rename to nym-connect/desktop/src/components/Growth/content/assets/matrix.webp diff --git a/nym-connect/src/components/Growth/content/assets/winner.webp b/nym-connect/desktop/src/components/Growth/content/assets/winner.webp similarity index 100% rename from nym-connect/src/components/Growth/content/assets/winner.webp rename to nym-connect/desktop/src/components/Growth/content/assets/winner.webp diff --git a/nym-connect/src/components/Growth/content/en.yaml b/nym-connect/desktop/src/components/Growth/content/en.yaml similarity index 100% rename from nym-connect/src/components/Growth/content/en.yaml rename to nym-connect/desktop/src/components/Growth/content/en.yaml diff --git a/nym-connect/src/components/Growth/context/TestAndEarnContext.tsx b/nym-connect/desktop/src/components/Growth/context/TestAndEarnContext.tsx similarity index 100% rename from nym-connect/src/components/Growth/context/TestAndEarnContext.tsx rename to nym-connect/desktop/src/components/Growth/context/TestAndEarnContext.tsx diff --git a/nym-connect/src/components/Growth/context/mocks/TestAndEarnContext.tsx b/nym-connect/desktop/src/components/Growth/context/mocks/TestAndEarnContext.tsx similarity index 100% rename from nym-connect/src/components/Growth/context/mocks/TestAndEarnContext.tsx rename to nym-connect/desktop/src/components/Growth/context/mocks/TestAndEarnContext.tsx diff --git a/nym-connect/src/components/Growth/context/types.ts b/nym-connect/desktop/src/components/Growth/context/types.ts similarity index 100% rename from nym-connect/src/components/Growth/context/types.ts rename to nym-connect/desktop/src/components/Growth/context/types.ts diff --git a/nym-connect/src/components/HelpPage.tsx b/nym-connect/desktop/src/components/HelpPage.tsx similarity index 100% rename from nym-connect/src/components/HelpPage.tsx rename to nym-connect/desktop/src/components/HelpPage.tsx diff --git a/nym-connect/src/components/HelpPageActions.tsx b/nym-connect/desktop/src/components/HelpPageActions.tsx similarity index 100% rename from nym-connect/src/components/HelpPageActions.tsx rename to nym-connect/desktop/src/components/HelpPageActions.tsx diff --git a/nym-connect-android/src/components/HelpPageImage.tsx b/nym-connect/desktop/src/components/HelpPageImage.tsx similarity index 100% rename from nym-connect-android/src/components/HelpPageImage.tsx rename to nym-connect/desktop/src/components/HelpPageImage.tsx diff --git a/nym-connect/src/components/HelpPageStepIndicator.tsx b/nym-connect/desktop/src/components/HelpPageStepIndicator.tsx similarity index 100% rename from nym-connect/src/components/HelpPageStepIndicator.tsx rename to nym-connect/desktop/src/components/HelpPageStepIndicator.tsx diff --git a/nym-connect/src/components/InfoModal.tsx b/nym-connect/desktop/src/components/InfoModal.tsx similarity index 100% rename from nym-connect/src/components/InfoModal.tsx rename to nym-connect/desktop/src/components/InfoModal.tsx diff --git a/nym-connect/src/components/IpAddressAndPort.tsx b/nym-connect/desktop/src/components/IpAddressAndPort.tsx similarity index 100% rename from nym-connect/src/components/IpAddressAndPort.tsx rename to nym-connect/desktop/src/components/IpAddressAndPort.tsx diff --git a/nym-connect-android/src/components/IpAddressAndPortModal.tsx b/nym-connect/desktop/src/components/IpAddressAndPortModal.tsx similarity index 100% rename from nym-connect-android/src/components/IpAddressAndPortModal.tsx rename to nym-connect/desktop/src/components/IpAddressAndPortModal.tsx diff --git a/nym-connect/src/components/LogViewer/index.tsx b/nym-connect/desktop/src/components/LogViewer/index.tsx similarity index 100% rename from nym-connect/src/components/LogViewer/index.tsx rename to nym-connect/desktop/src/components/LogViewer/index.tsx diff --git a/nym-connect-android/src/components/NeedHelp.tsx b/nym-connect/desktop/src/components/NeedHelp.tsx similarity index 100% rename from nym-connect-android/src/components/NeedHelp.tsx rename to nym-connect/desktop/src/components/NeedHelp.tsx diff --git a/nym-connect/src/components/PowerButton/PowerButton.tsx b/nym-connect/desktop/src/components/PowerButton/PowerButton.tsx similarity index 100% rename from nym-connect/src/components/PowerButton/PowerButton.tsx rename to nym-connect/desktop/src/components/PowerButton/PowerButton.tsx diff --git a/nym-connect/src/components/PowerButton/power-button.css b/nym-connect/desktop/src/components/PowerButton/power-button.css similarity index 100% rename from nym-connect/src/components/PowerButton/power-button.css rename to nym-connect/desktop/src/components/PowerButton/power-button.css diff --git a/nym-connect-android/src/components/ServiceProviderPopup.tsx b/nym-connect/desktop/src/components/ServiceProviderPopup.tsx similarity index 100% rename from nym-connect-android/src/components/ServiceProviderPopup.tsx rename to nym-connect/desktop/src/components/ServiceProviderPopup.tsx diff --git a/nym-connect-android/src/components/ServiceProviderSelector.stories.tsx b/nym-connect/desktop/src/components/ServiceProviderSelector.stories.tsx similarity index 100% rename from nym-connect-android/src/components/ServiceProviderSelector.stories.tsx rename to nym-connect/desktop/src/components/ServiceProviderSelector.stories.tsx diff --git a/nym-connect-android/src/components/ServiceProviderSelector.tsx b/nym-connect/desktop/src/components/ServiceProviderSelector.tsx similarity index 100% rename from nym-connect-android/src/components/ServiceProviderSelector.tsx rename to nym-connect/desktop/src/components/ServiceProviderSelector.tsx diff --git a/nym-connect-android/src/components/ServiceSelector.stories.tsx b/nym-connect/desktop/src/components/ServiceSelector.stories.tsx similarity index 100% rename from nym-connect-android/src/components/ServiceSelector.stories.tsx rename to nym-connect/desktop/src/components/ServiceSelector.stories.tsx diff --git a/nym-connect-android/src/components/ServiceSelector.tsx b/nym-connect/desktop/src/components/ServiceSelector.tsx similarity index 100% rename from nym-connect-android/src/components/ServiceSelector.tsx rename to nym-connect/desktop/src/components/ServiceSelector.tsx diff --git a/nym-connect/src/components/TooltipInfo.tsx b/nym-connect/desktop/src/components/TooltipInfo.tsx similarity index 100% rename from nym-connect/src/components/TooltipInfo.tsx rename to nym-connect/desktop/src/components/TooltipInfo.tsx diff --git a/nym-connect-android/src/config.ts b/nym-connect/desktop/src/config.ts similarity index 100% rename from nym-connect-android/src/config.ts rename to nym-connect/desktop/src/config.ts diff --git a/nym-connect-android/src/context/main.tsx b/nym-connect/desktop/src/context/main.tsx similarity index 100% rename from nym-connect-android/src/context/main.tsx rename to nym-connect/desktop/src/context/main.tsx diff --git a/nym-connect-android/src/context/mocks/main.tsx b/nym-connect/desktop/src/context/mocks/main.tsx similarity index 100% rename from nym-connect-android/src/context/mocks/main.tsx rename to nym-connect/desktop/src/context/mocks/main.tsx diff --git a/nym-connect-android/src/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf b/nym-connect/desktop/src/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf similarity index 100% rename from nym-connect-android/src/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf rename to nym-connect/desktop/src/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf diff --git a/nym-connect-android/src/fonts/OpenSans-VariableFont_wdth,wght.ttf b/nym-connect/desktop/src/fonts/OpenSans-VariableFont_wdth,wght.ttf similarity index 100% rename from nym-connect-android/src/fonts/OpenSans-VariableFont_wdth,wght.ttf rename to nym-connect/desktop/src/fonts/OpenSans-VariableFont_wdth,wght.ttf diff --git a/nym-connect-android/src/fonts/fonts.css b/nym-connect/desktop/src/fonts/fonts.css similarity index 100% rename from nym-connect-android/src/fonts/fonts.css rename to nym-connect/desktop/src/fonts/fonts.css diff --git a/nym-connect/src/growth.tsx b/nym-connect/desktop/src/growth.tsx similarity index 100% rename from nym-connect/src/growth.tsx rename to nym-connect/desktop/src/growth.tsx diff --git a/nym-connect-android/src/hooks/events.ts b/nym-connect/desktop/src/hooks/events.ts similarity index 100% rename from nym-connect-android/src/hooks/events.ts rename to nym-connect/desktop/src/hooks/events.ts diff --git a/nym-connect/src/index.tsx b/nym-connect/desktop/src/index.tsx similarity index 100% rename from nym-connect/src/index.tsx rename to nym-connect/desktop/src/index.tsx diff --git a/nym-connect/src/layouts/ConnectionLayout.tsx b/nym-connect/desktop/src/layouts/ConnectionLayout.tsx similarity index 100% rename from nym-connect/src/layouts/ConnectionLayout.tsx rename to nym-connect/desktop/src/layouts/ConnectionLayout.tsx diff --git a/nym-connect/src/log.tsx b/nym-connect/desktop/src/log.tsx similarity index 100% rename from nym-connect/src/log.tsx rename to nym-connect/desktop/src/log.tsx diff --git a/nym-connect/src/pages/connection/Connected.tsx b/nym-connect/desktop/src/pages/connection/Connected.tsx similarity index 100% rename from nym-connect/src/pages/connection/Connected.tsx rename to nym-connect/desktop/src/pages/connection/Connected.tsx diff --git a/nym-connect/src/pages/connection/Disconnected.tsx b/nym-connect/desktop/src/pages/connection/Disconnected.tsx similarity index 100% rename from nym-connect/src/pages/connection/Disconnected.tsx rename to nym-connect/desktop/src/pages/connection/Disconnected.tsx diff --git a/nym-connect/src/pages/connection/index.tsx b/nym-connect/desktop/src/pages/connection/index.tsx similarity index 100% rename from nym-connect/src/pages/connection/index.tsx rename to nym-connect/desktop/src/pages/connection/index.tsx diff --git a/nym-connect/src/pages/menu/Apps.tsx b/nym-connect/desktop/src/pages/menu/Apps.tsx similarity index 100% rename from nym-connect/src/pages/menu/Apps.tsx rename to nym-connect/desktop/src/pages/menu/Apps.tsx diff --git a/nym-connect-android/src/pages/menu/Guide.tsx b/nym-connect/desktop/src/pages/menu/Guide.tsx similarity index 100% rename from nym-connect-android/src/pages/menu/Guide.tsx rename to nym-connect/desktop/src/pages/menu/Guide.tsx diff --git a/nym-connect/src/pages/menu/index.tsx b/nym-connect/desktop/src/pages/menu/index.tsx similarity index 100% rename from nym-connect/src/pages/menu/index.tsx rename to nym-connect/desktop/src/pages/menu/index.tsx diff --git a/nym-connect/src/pages/menu/settings/GatewaySettings.tsx b/nym-connect/desktop/src/pages/menu/settings/GatewaySettings.tsx similarity index 100% rename from nym-connect/src/pages/menu/settings/GatewaySettings.tsx rename to nym-connect/desktop/src/pages/menu/settings/GatewaySettings.tsx diff --git a/nym-connect/src/pages/menu/settings/index.tsx b/nym-connect/desktop/src/pages/menu/settings/index.tsx similarity index 100% rename from nym-connect/src/pages/menu/settings/index.tsx rename to nym-connect/desktop/src/pages/menu/settings/index.tsx diff --git a/nym-connect/src/routes/index.tsx b/nym-connect/desktop/src/routes/index.tsx similarity index 100% rename from nym-connect/src/routes/index.tsx rename to nym-connect/desktop/src/routes/index.tsx diff --git a/nym-connect-android/src/stories/AppFlow.stories.tsx b/nym-connect/desktop/src/stories/AppFlow.stories.tsx similarity index 100% rename from nym-connect-android/src/stories/AppFlow.stories.tsx rename to nym-connect/desktop/src/stories/AppFlow.stories.tsx diff --git a/nym-connect-android/src/stories/AppWindowFrame.stories.tsx b/nym-connect/desktop/src/stories/AppWindowFrame.stories.tsx similarity index 100% rename from nym-connect-android/src/stories/AppWindowFrame.stories.tsx rename to nym-connect/desktop/src/stories/AppWindowFrame.stories.tsx diff --git a/nym-connect-android/src/stories/ConnectedLayout.stories.tsx b/nym-connect/desktop/src/stories/ConnectedLayout.stories.tsx similarity index 100% rename from nym-connect-android/src/stories/ConnectedLayout.stories.tsx rename to nym-connect/desktop/src/stories/ConnectedLayout.stories.tsx diff --git a/nym-connect-android/src/stories/ConnectionButton.stories.tsx b/nym-connect/desktop/src/stories/ConnectionButton.stories.tsx similarity index 100% rename from nym-connect-android/src/stories/ConnectionButton.stories.tsx rename to nym-connect/desktop/src/stories/ConnectionButton.stories.tsx diff --git a/nym-connect-android/src/stories/ConnectionStats.stories.tsx b/nym-connect/desktop/src/stories/ConnectionStats.stories.tsx similarity index 100% rename from nym-connect-android/src/stories/ConnectionStats.stories.tsx rename to nym-connect/desktop/src/stories/ConnectionStats.stories.tsx diff --git a/nym-connect-android/src/stories/ConnectionStatus.stories.tsx b/nym-connect/desktop/src/stories/ConnectionStatus.stories.tsx similarity index 100% rename from nym-connect-android/src/stories/ConnectionStatus.stories.tsx rename to nym-connect/desktop/src/stories/ConnectionStatus.stories.tsx diff --git a/nym-connect-android/src/stories/DefaultLayout.stories.tsx b/nym-connect/desktop/src/stories/DefaultLayout.stories.tsx similarity index 100% rename from nym-connect-android/src/stories/DefaultLayout.stories.tsx rename to nym-connect/desktop/src/stories/DefaultLayout.stories.tsx diff --git a/nym-connect-android/src/stories/Introduction.stories.mdx b/nym-connect/desktop/src/stories/Introduction.stories.mdx similarity index 100% rename from nym-connect-android/src/stories/Introduction.stories.mdx rename to nym-connect/desktop/src/stories/Introduction.stories.mdx diff --git a/nym-connect-android/src/stories/IpAddressAndPort.stories.tsx b/nym-connect/desktop/src/stories/IpAddressAndPort.stories.tsx similarity index 100% rename from nym-connect-android/src/stories/IpAddressAndPort.stories.tsx rename to nym-connect/desktop/src/stories/IpAddressAndPort.stories.tsx diff --git a/nym-connect-android/src/stories/PowerButton.stories.tsx b/nym-connect/desktop/src/stories/PowerButton.stories.tsx similarity index 100% rename from nym-connect-android/src/stories/PowerButton.stories.tsx rename to nym-connect/desktop/src/stories/PowerButton.stories.tsx diff --git a/nym-connect-android/src/theme/index.tsx b/nym-connect/desktop/src/theme/index.tsx similarity index 94% rename from nym-connect-android/src/theme/index.tsx rename to nym-connect/desktop/src/theme/index.tsx index ad2350053d..d307fe46ee 100644 --- a/nym-connect-android/src/theme/index.tsx +++ b/nym-connect/desktop/src/theme/index.tsx @@ -3,7 +3,7 @@ import { createTheme, ThemeProvider } from '@mui/material/styles'; import { CssBaseline } from '@mui/material'; import { getDesignTokens } from './theme'; // eslint-disable-next-line import/no-relative-packages -import '../../../assets/fonts/non-variable/fonts.css'; +import '../../../../assets/fonts/non-variable/fonts.css'; /** * Provides the theme for Nym Connect by reacting to the light/dark mode choice stored in the app context. diff --git a/nym-connect-android/src/theme/mui-theme.d.ts b/nym-connect/desktop/src/theme/mui-theme.d.ts similarity index 100% rename from nym-connect-android/src/theme/mui-theme.d.ts rename to nym-connect/desktop/src/theme/mui-theme.d.ts diff --git a/nym-connect/src/theme/theme.tsx b/nym-connect/desktop/src/theme/theme.tsx similarity index 100% rename from nym-connect/src/theme/theme.tsx rename to nym-connect/desktop/src/theme/theme.tsx diff --git a/nym-connect-android/src/types/connection.ts b/nym-connect/desktop/src/types/connection.ts similarity index 100% rename from nym-connect-android/src/types/connection.ts rename to nym-connect/desktop/src/types/connection.ts diff --git a/nym-connect-android/src/types/directory.ts b/nym-connect/desktop/src/types/directory.ts similarity index 100% rename from nym-connect-android/src/types/directory.ts rename to nym-connect/desktop/src/types/directory.ts diff --git a/nym-connect-android/src/types/error.ts b/nym-connect/desktop/src/types/error.ts similarity index 100% rename from nym-connect-android/src/types/error.ts rename to nym-connect/desktop/src/types/error.ts diff --git a/nym-connect-android/src/types/event.ts b/nym-connect/desktop/src/types/event.ts similarity index 100% rename from nym-connect-android/src/types/event.ts rename to nym-connect/desktop/src/types/event.ts diff --git a/nym-connect-android/src/types/gateway.ts b/nym-connect/desktop/src/types/gateway.ts similarity index 100% rename from nym-connect-android/src/types/gateway.ts rename to nym-connect/desktop/src/types/gateway.ts diff --git a/nym-connect-android/src/types/index.ts b/nym-connect/desktop/src/types/index.ts similarity index 100% rename from nym-connect-android/src/types/index.ts rename to nym-connect/desktop/src/types/index.ts diff --git a/nym-connect-android/src/types/rust/index.ts b/nym-connect/desktop/src/types/rust/index.ts similarity index 100% rename from nym-connect-android/src/types/rust/index.ts rename to nym-connect/desktop/src/types/rust/index.ts diff --git a/nym-connect-android/src/types/rust/stateparams.ts b/nym-connect/desktop/src/types/rust/stateparams.ts similarity index 100% rename from nym-connect-android/src/types/rust/stateparams.ts rename to nym-connect/desktop/src/types/rust/stateparams.ts diff --git a/nym-connect-android/src/typings/FC.d.ts b/nym-connect/desktop/src/typings/FC.d.ts similarity index 100% rename from nym-connect-android/src/typings/FC.d.ts rename to nym-connect/desktop/src/typings/FC.d.ts diff --git a/nym-connect-android/src/typings/jpeg.d.ts b/nym-connect/desktop/src/typings/jpeg.d.ts similarity index 100% rename from nym-connect-android/src/typings/jpeg.d.ts rename to nym-connect/desktop/src/typings/jpeg.d.ts diff --git a/nym-connect-android/src/typings/json.d.ts b/nym-connect/desktop/src/typings/json.d.ts similarity index 100% rename from nym-connect-android/src/typings/json.d.ts rename to nym-connect/desktop/src/typings/json.d.ts diff --git a/nym-connect-android/src/typings/png.d.ts b/nym-connect/desktop/src/typings/png.d.ts similarity index 100% rename from nym-connect-android/src/typings/png.d.ts rename to nym-connect/desktop/src/typings/png.d.ts diff --git a/nym-connect-android/src/typings/svg.d.ts b/nym-connect/desktop/src/typings/svg.d.ts similarity index 100% rename from nym-connect-android/src/typings/svg.d.ts rename to nym-connect/desktop/src/typings/svg.d.ts diff --git a/nym-connect-android/src/typings/webp.d.ts b/nym-connect/desktop/src/typings/webp.d.ts similarity index 100% rename from nym-connect-android/src/typings/webp.d.ts rename to nym-connect/desktop/src/typings/webp.d.ts diff --git a/nym-connect-android/src/typings/yaml.d.ts b/nym-connect/desktop/src/typings/yaml.d.ts similarity index 100% rename from nym-connect-android/src/typings/yaml.d.ts rename to nym-connect/desktop/src/typings/yaml.d.ts diff --git a/nym-connect/src/utils/index.ts b/nym-connect/desktop/src/utils/index.ts similarity index 100% rename from nym-connect/src/utils/index.ts rename to nym-connect/desktop/src/utils/index.ts diff --git a/nym-connect-android/tsconfig.eslint.json b/nym-connect/desktop/tsconfig.eslint.json similarity index 100% rename from nym-connect-android/tsconfig.eslint.json rename to nym-connect/desktop/tsconfig.eslint.json diff --git a/nym-connect/tsconfig.json b/nym-connect/desktop/tsconfig.json similarity index 100% rename from nym-connect/tsconfig.json rename to nym-connect/desktop/tsconfig.json diff --git a/nym-connect/webpack.common.js b/nym-connect/desktop/webpack.common.js similarity index 100% rename from nym-connect/webpack.common.js rename to nym-connect/desktop/webpack.common.js diff --git a/nym-connect/webpack.dev.js b/nym-connect/desktop/webpack.dev.js similarity index 100% rename from nym-connect/webpack.dev.js rename to nym-connect/desktop/webpack.dev.js diff --git a/nym-connect/webpack.prod.js b/nym-connect/desktop/webpack.prod.js similarity index 100% rename from nym-connect/webpack.prod.js rename to nym-connect/desktop/webpack.prod.js diff --git a/nym-connect/.babelrc b/nym-connect/mobile/.babelrc similarity index 100% rename from nym-connect/.babelrc rename to nym-connect/mobile/.babelrc diff --git a/nym-connect/.env.sample b/nym-connect/mobile/.env.sample similarity index 100% rename from nym-connect/.env.sample rename to nym-connect/mobile/.env.sample diff --git a/nym-connect/.eslintrc b/nym-connect/mobile/.eslintrc similarity index 100% rename from nym-connect/.eslintrc rename to nym-connect/mobile/.eslintrc diff --git a/nym-connect/.nvmrc b/nym-connect/mobile/.nvmrc similarity index 100% rename from nym-connect/.nvmrc rename to nym-connect/mobile/.nvmrc diff --git a/nym-connect/.prettierrc b/nym-connect/mobile/.prettierrc similarity index 100% rename from nym-connect/.prettierrc rename to nym-connect/mobile/.prettierrc diff --git a/nym-connect/.storybook/main.js b/nym-connect/mobile/.storybook/main.js similarity index 100% rename from nym-connect/.storybook/main.js rename to nym-connect/mobile/.storybook/main.js diff --git a/nym-connect/.storybook/mocks/tauri/app.js b/nym-connect/mobile/.storybook/mocks/tauri/app.js similarity index 100% rename from nym-connect/.storybook/mocks/tauri/app.js rename to nym-connect/mobile/.storybook/mocks/tauri/app.js diff --git a/nym-connect/.storybook/mocks/tauri/clipboard.js b/nym-connect/mobile/.storybook/mocks/tauri/clipboard.js similarity index 100% rename from nym-connect/.storybook/mocks/tauri/clipboard.js rename to nym-connect/mobile/.storybook/mocks/tauri/clipboard.js diff --git a/nym-connect/.storybook/mocks/tauri/event.js b/nym-connect/mobile/.storybook/mocks/tauri/event.js similarity index 100% rename from nym-connect/.storybook/mocks/tauri/event.js rename to nym-connect/mobile/.storybook/mocks/tauri/event.js diff --git a/nym-connect/.storybook/mocks/tauri/index.js b/nym-connect/mobile/.storybook/mocks/tauri/index.js similarity index 100% rename from nym-connect/.storybook/mocks/tauri/index.js rename to nym-connect/mobile/.storybook/mocks/tauri/index.js diff --git a/nym-connect/.storybook/mocks/tauri/notification.js b/nym-connect/mobile/.storybook/mocks/tauri/notification.js similarity index 100% rename from nym-connect/.storybook/mocks/tauri/notification.js rename to nym-connect/mobile/.storybook/mocks/tauri/notification.js diff --git a/nym-connect/.storybook/mocks/tauri/window.js b/nym-connect/mobile/.storybook/mocks/tauri/window.js similarity index 100% rename from nym-connect/.storybook/mocks/tauri/window.js rename to nym-connect/mobile/.storybook/mocks/tauri/window.js diff --git a/nym-connect/.storybook/preview-fonts.js b/nym-connect/mobile/.storybook/preview-fonts.js similarity index 100% rename from nym-connect/.storybook/preview-fonts.js rename to nym-connect/mobile/.storybook/preview-fonts.js diff --git a/nym-connect/.storybook/preview.js b/nym-connect/mobile/.storybook/preview.js similarity index 100% rename from nym-connect/.storybook/preview.js rename to nym-connect/mobile/.storybook/preview.js diff --git a/nym-connect-android/CHANGELOG.md b/nym-connect/mobile/CHANGELOG.md similarity index 100% rename from nym-connect-android/CHANGELOG.md rename to nym-connect/mobile/CHANGELOG.md diff --git a/nym-connect-android/README.md b/nym-connect/mobile/README.md similarity index 71% rename from nym-connect-android/README.md rename to nym-connect/mobile/README.md index a97d3c8ea0..1bbc685447 100644 --- a/nym-connect-android/README.md +++ b/nym-connect/mobile/README.md @@ -3,12 +3,15 @@ Copyright 2020 - Nym Technologies SA SPDX-License-Identifier: Apache-2.0 --> -# Nym Connect - Android +# Nym Connect - Mobile -[Nym Connect](https://github.com/nymtech/nym/tree/develop/nym-connect) application for Android. +[Nym Connect](https://github.com/nymtech/nym/tree/develop/nym-connect) application for Mobile. Nym Connects sets up a SOCKS5 proxy for local applications to use. +**NOTE**: Currently we only focus on Android, +the remaining docs apply for Android development only. + ## Installation prerequisites - Linux / Mac - `Yarn` @@ -21,7 +24,7 @@ https://next--tauri.netlify.app/next/guides/getting-started/prerequisites/linux# ## Installation -Inside the `nym-connect-android` directory, run the following commands: +Inside the `mobile/nym-connect` directory, run the following commands: ``` yarn install @@ -32,10 +35,10 @@ yarn prewebpack:dev Assuming there is a running android [emulator](https://developer.android.com/studio/run/emulator) or a real [device](https://developer.android.com/studio/run/device) connected. -Inside the `nym-connect-android/src-tauri` directory, run the following command: +Inside the `mobile/nym-connect/src-tauri` directory, run the following command: ``` -yarn dev +yarn dev:android ``` #### Debugging @@ -48,7 +51,7 @@ To build the APK, run the build commands. ``` yarn webpack:prod -WRY_ANDROID_PACKAGE=net.nymtech.nym_connect_android WRY_ANDROID_LIBRARY=nym_connect_android cargo tauri android build --debug --apk +WRY_ANDROID_PACKAGE=net.nymtech.nym_connect WRY_ANDROID_LIBRARY=nym_connect cargo tauri android build --debug --apk ``` # Storybook diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/java/net/nymtech/nym_connect_android/generated/.gitkeep b/nym-connect/mobile/dist/.gitkeep similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/java/net/nymtech/nym_connect_android/generated/.gitkeep rename to nym-connect/mobile/dist/.gitkeep diff --git a/nym-connect-android/package.json b/nym-connect/mobile/package.json similarity index 82% rename from nym-connect-android/package.json rename to nym-connect/mobile/package.json index fdb5d84aa4..09df008b57 100644 --- a/nym-connect-android/package.json +++ b/nym-connect/mobile/package.json @@ -1,28 +1,32 @@ { - "name": "@nym/nym-connect-android", + "name": "@nym/nym-connect-mobile", "version": "1.1.7", "main": "index.js", "license": "MIT", "scripts": { - "prewebpack:dev": "yarn --cwd .. build", + "prewebpack:dev": "yarn --cwd ../.. build", "webpack:dev": "yarn webpack serve --config webpack.dev.js", "webpack:dev:onlyThis": "yarn webpack serve --config webpack.dev.js", "webpack:prod": "yarn webpack --progress --config webpack.prod.js", "tauri": "tauri", - "tauri:dev": "WRY_ANDROID_PACKAGE=net.nymtech.nym_connect_android WRY_ANDROID_LIBRARY=nym_connect_android cargo tauri android dev", - "tauri:build": "WRY_ANDROID_PACKAGE=net.nymtech.nym_connect_android WRY_ANDROID_LIBRARY=nym_connect_android cargo tauri android build", - "dev": "run-p webpack:dev:onlyThis tauri:dev", - "prebuild": "yarn --cwd .. build", - "build": "run-s webpack:prod tauri:build", + "tauri:dev:android": "WRY_ANDROID_PACKAGE=net.nymtech.nym_connect WRY_ANDROID_LIBRARY=nym_connect cargo tauri android dev", + "tauri:build:android": "WRY_ANDROID_PACKAGE=net.nymtech.nym_connect WRY_ANDROID_LIBRARY=nym_connect cargo tauri android build", + "dev:android": "run-p webpack:dev:onlyThis tauri:dev:android", + "prebuild": "yarn --cwd ../.. build", + "build:android": "run-s webpack:prod tauri:build:android", "storybook": "start-storybook -p 6006", - "prestorybook:build": "yarn --cwd .. build", + "prestorybook:build": "yarn --cwd ../.. build", "storybook:build": "build-storybook", "tsc": "tsc --noEmit true", "tsc:watch": "tsc --noEmit true --watch", "lint": "eslint src", "lint:fix": "eslint src --fix", "test": "jest", - "test:watch": "jest --watch" + "test:watch": "jest --watch", + "clean:dist": "rm -rf dist", + "clean:node": "rm -rf node_modules", + "clean:rust": "cargo clean --manifest-path src-tauri/Cargo.toml", + "clean:": "run-p clean:node clean:rust" }, "dependencies": { "@emotion/react": "^11.7.0", diff --git a/nym-connect/public/favicon.ico b/nym-connect/mobile/public/favicon.ico similarity index 100% rename from nym-connect/public/favicon.ico rename to nym-connect/mobile/public/favicon.ico diff --git a/nym-connect/public/favicon.png b/nym-connect/mobile/public/favicon.png similarity index 100% rename from nym-connect/public/favicon.png rename to nym-connect/mobile/public/favicon.png diff --git a/nym-connect/public/index.html b/nym-connect/mobile/public/index.html similarity index 100% rename from nym-connect/public/index.html rename to nym-connect/mobile/public/index.html diff --git a/nym-connect-android/src-tauri/.cargo/config.toml b/nym-connect/mobile/src-tauri/.cargo/config.toml similarity index 78% rename from nym-connect-android/src-tauri/.cargo/config.toml rename to nym-connect/mobile/src-tauri/.cargo/config.toml index d4585a1646..be3873a8cf 100644 --- a/nym-connect-android/src-tauri/.cargo/config.toml +++ b/nym-connect/mobile/src-tauri/.cargo/config.toml @@ -4,7 +4,7 @@ target = 'x86_64-unknown-linux-gnu' linker = '/home/pierre/.local/share/android/sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang' rustflags = [ '-L', - '/home/pierre/Documents/nym/nym/nym-connect-android/src-tauri/.cargo', + '/home/pierre/Documents/nym/nym/nym-connect-new/mobile/src-tauri/.cargo', '-Clink-arg=-landroid', '-Clink-arg=-llog', '-Clink-arg=-lOpenSLES', @@ -14,7 +14,7 @@ rustflags = [ linker = '/home/pierre/.local/share/android/sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang' rustflags = [ '-L', - '/home/pierre/Documents/nym/nym/nym-connect-android/src-tauri/.cargo', + '/home/pierre/Documents/nym/nym/nym-connect-new/mobile/src-tauri/.cargo', '-Clink-arg=-landroid', '-Clink-arg=-llog', '-Clink-arg=-lOpenSLES', @@ -24,7 +24,7 @@ rustflags = [ linker = '/home/pierre/.local/share/android/sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android24-clang' rustflags = [ '-L', - '/home/pierre/Documents/nym/nym/nym-connect-android/src-tauri/.cargo', + '/home/pierre/Documents/nym/nym/nym-connect-new/mobile/src-tauri/.cargo', '-Clink-arg=-landroid', '-Clink-arg=-llog', '-Clink-arg=-lOpenSLES', @@ -34,7 +34,7 @@ rustflags = [ linker = '/home/pierre/.local/share/android/sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android24-clang' rustflags = [ '-L', - '/home/pierre/Documents/nym/nym/nym-connect-android/src-tauri/.cargo', + '/home/pierre/Documents/nym/nym/nym-connect-new/mobile/src-tauri/.cargo', '-Clink-arg=-landroid', '-Clink-arg=-llog', '-Clink-arg=-lOpenSLES', diff --git a/nym-connect-android/src-tauri/.cargo/libgcc.a b/nym-connect/mobile/src-tauri/.cargo/libgcc.a similarity index 100% rename from nym-connect-android/src-tauri/.cargo/libgcc.a rename to nym-connect/mobile/src-tauri/.cargo/libgcc.a diff --git a/nym-connect/src-tauri/.gitignore b/nym-connect/mobile/src-tauri/.gitignore similarity index 100% rename from nym-connect/src-tauri/.gitignore rename to nym-connect/mobile/src-tauri/.gitignore diff --git a/nym-connect-android/src-tauri/Cargo.lock b/nym-connect/mobile/src-tauri/Cargo.lock similarity index 99% rename from nym-connect-android/src-tauri/Cargo.lock rename to nym-connect/mobile/src-tauri/Cargo.lock index 8c08eced60..3cbbdc7478 100644 --- a/nym-connect-android/src-tauri/Cargo.lock +++ b/nym-connect/mobile/src-tauri/Cargo.lock @@ -3509,7 +3509,7 @@ dependencies = [ ] [[package]] -name = "nym-connect-android" +name = "nym-connect" version = "1.1.9" dependencies = [ "anyhow", diff --git a/nym-connect-android/src-tauri/Cargo.toml b/nym-connect/mobile/src-tauri/Cargo.toml similarity index 75% rename from nym-connect-android/src-tauri/Cargo.toml rename to nym-connect/mobile/src-tauri/Cargo.toml index 7db18d789b..f83ffd2fe5 100644 --- a/nym-connect-android/src-tauri/Cargo.toml +++ b/nym-connect/mobile/src-tauri/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "nym-connect-android" +name = "nym-connect" version = "1.1.9" -description = "nym-connect for Android" +description = "nym-connect for Mobile" authors = ["Nym Technologies SA"] license = "" repository = "" -default-run = "nym-connect-android" +default-run = "nym-connect" edition = "2021" build = "src/build.rs" rust-version = "1.58" @@ -46,14 +46,14 @@ tokio = { version = "1.24.1", features = ["sync", "time"] } url = "2.2" yaml-rust = "0.4" -client-core = { path = "../../clients/client-core" } -nym-api-requests = { path = "../../nym-api/nym-api-requests" } -nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common"} -config-common = { path = "../../common/config", package = "config" } -nym-crypto = { path = "../../common/crypto" } -nym-bin-common = { path = "../../common/bin-common"} -nym-socks5-client = { path = "../../clients/socks5", features = ["mobile"], default-features = false } -nym-task = { path = "../../common/task" } +client-core = { path = "../../../clients/client-core" } +nym-api-requests = { path = "../../../nym-api/nym-api-requests" } +nym-contracts-common = { path = "../../../common/cosmwasm-smart-contracts/contracts-common"} +config-common = { path = "../../../common/config", package = "config" } +nym-crypto = { path = "../../../common/crypto" } +nym-bin-common = { path = "../../../common/bin-common"} +nym-socks5-client = { path = "../../../clients/socks5", features = ["mobile"], default-features = false } +nym-task = { path = "../../../common/task" } [dev-dependencies] ts-rs = "6.1.2" diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/.editorconfig b/nym-connect/mobile/src-tauri/gen/android/nym_connect/.editorconfig similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/.editorconfig rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/.editorconfig diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/.gitignore b/nym-connect/mobile/src-tauri/gen/android/nym_connect/.gitignore similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/.gitignore rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/.gitignore diff --git a/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/.gitignore b/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/.gitignore new file mode 100644 index 0000000000..1b13319aad --- /dev/null +++ b/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/.gitignore @@ -0,0 +1 @@ +/src/main/java/net/nymtech/nym_connect/generated \ No newline at end of file diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/build.gradle.kts b/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/build.gradle.kts similarity index 96% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/app/build.gradle.kts rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/app/build.gradle.kts index cf8fdbfa28..3b092d967a 100644 --- a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/build.gradle.kts +++ b/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/build.gradle.kts @@ -8,11 +8,11 @@ android { compileSdk = 33 defaultConfig { manifestPlaceholders["usesCleartextTraffic"] = "false" - applicationId = "net.nymtech.nym_connect_android" + applicationId = "net.nymtech.nym_connect" minSdk = 24 targetSdk = 33 versionCode = 1 - versionName = "1.0" + versionName = "1.1.9" } sourceSets.getByName("main") { // Vulkan validation layers @@ -81,7 +81,7 @@ android { } assetPacks += mutableSetOf() - namespace = "net.nymtech.nym_connect_android" + namespace = "net.nymtech.nym_connect" } rust { diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/proguard-rules.pro b/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/proguard-rules.pro similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/app/proguard-rules.pro rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/app/proguard-rules.pro diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/AndroidManifest.xml b/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/src/main/AndroidManifest.xml similarity index 86% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/AndroidManifest.xml rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/app/src/main/AndroidManifest.xml index 572a6d4960..1c575ab17a 100644 --- a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/AndroidManifest.xml +++ b/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/src/main/AndroidManifest.xml @@ -1,11 +1,14 @@ - + + - \ No newline at end of file diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/res/values/colors.xml b/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/src/main/res/values/colors.xml similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/res/values/colors.xml rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/app/src/main/res/values/colors.xml diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/res/values/ic_launcher_background.xml b/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/res/values/ic_launcher_background.xml rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/app/src/main/res/values/ic_launcher_background.xml diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/res/values/strings.xml b/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/src/main/res/values/strings.xml similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/res/values/strings.xml rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/app/src/main/res/values/strings.xml diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/res/values/themes.xml b/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/src/main/res/values/themes.xml similarity index 88% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/res/values/themes.xml rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/app/src/main/res/values/themes.xml index 7416b4c5cb..894b25a6c9 100644 --- a/nym-connect-android/src-tauri/gen/android/nym_connect_android/app/src/main/res/values/themes.xml +++ b/nym-connect/mobile/src-tauri/gen/android/nym_connect/app/src/main/res/values/themes.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/build.gradle.kts b/nym-connect/mobile/src-tauri/gen/android/nym_connect/build.gradle.kts similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/build.gradle.kts rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/build.gradle.kts diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/buildSrc/build.gradle.kts b/nym-connect/mobile/src-tauri/gen/android/nym_connect/buildSrc/build.gradle.kts similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/buildSrc/build.gradle.kts rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/buildSrc/build.gradle.kts diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/buildSrc/src/main/java/net/nymtech/nym_connect_android/kotlin/BuildTask.kt b/nym-connect/mobile/src-tauri/gen/android/nym_connect/buildSrc/src/main/java/net/nymtech/nym_connect/kotlin/BuildTask.kt similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/buildSrc/src/main/java/net/nymtech/nym_connect_android/kotlin/BuildTask.kt rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/buildSrc/src/main/java/net/nymtech/nym_connect/kotlin/BuildTask.kt diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/buildSrc/src/main/java/net/nymtech/nym_connect_android/kotlin/RustPlugin.kt b/nym-connect/mobile/src-tauri/gen/android/nym_connect/buildSrc/src/main/java/net/nymtech/nym_connect/kotlin/RustPlugin.kt similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/buildSrc/src/main/java/net/nymtech/nym_connect_android/kotlin/RustPlugin.kt rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/buildSrc/src/main/java/net/nymtech/nym_connect/kotlin/RustPlugin.kt diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/gradle.properties b/nym-connect/mobile/src-tauri/gen/android/nym_connect/gradle.properties similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/gradle.properties rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/gradle.properties diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/gradle/wrapper/gradle-wrapper.jar b/nym-connect/mobile/src-tauri/gen/android/nym_connect/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/gradle/wrapper/gradle-wrapper.jar rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/gradle/wrapper/gradle-wrapper.jar diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/gradle/wrapper/gradle-wrapper.properties b/nym-connect/mobile/src-tauri/gen/android/nym_connect/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/gradle/wrapper/gradle-wrapper.properties rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/gradle/wrapper/gradle-wrapper.properties diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/gradlew b/nym-connect/mobile/src-tauri/gen/android/nym_connect/gradlew similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/gradlew rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/gradlew diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/gradlew.bat b/nym-connect/mobile/src-tauri/gen/android/nym_connect/gradlew.bat similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/gradlew.bat rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/gradlew.bat diff --git a/nym-connect-android/src-tauri/gen/android/nym_connect_android/settings.gradle b/nym-connect/mobile/src-tauri/gen/android/nym_connect/settings.gradle similarity index 100% rename from nym-connect-android/src-tauri/gen/android/nym_connect_android/settings.gradle rename to nym-connect/mobile/src-tauri/gen/android/nym_connect/settings.gradle diff --git a/nym-connect/src-tauri/icons/128x128.png b/nym-connect/mobile/src-tauri/icons/128x128.png similarity index 100% rename from nym-connect/src-tauri/icons/128x128.png rename to nym-connect/mobile/src-tauri/icons/128x128.png diff --git a/nym-connect/src-tauri/icons/128x128@2x.png b/nym-connect/mobile/src-tauri/icons/128x128@2x.png similarity index 100% rename from nym-connect/src-tauri/icons/128x128@2x.png rename to nym-connect/mobile/src-tauri/icons/128x128@2x.png diff --git a/nym-connect/src-tauri/icons/32x32.png b/nym-connect/mobile/src-tauri/icons/32x32.png similarity index 100% rename from nym-connect/src-tauri/icons/32x32.png rename to nym-connect/mobile/src-tauri/icons/32x32.png diff --git a/nym-connect/src-tauri/icons/Square107x107Logo.png b/nym-connect/mobile/src-tauri/icons/Square107x107Logo.png similarity index 100% rename from nym-connect/src-tauri/icons/Square107x107Logo.png rename to nym-connect/mobile/src-tauri/icons/Square107x107Logo.png diff --git a/nym-connect/src-tauri/icons/Square142x142Logo.png b/nym-connect/mobile/src-tauri/icons/Square142x142Logo.png similarity index 100% rename from nym-connect/src-tauri/icons/Square142x142Logo.png rename to nym-connect/mobile/src-tauri/icons/Square142x142Logo.png diff --git a/nym-connect/src-tauri/icons/Square150x150Logo.png b/nym-connect/mobile/src-tauri/icons/Square150x150Logo.png similarity index 100% rename from nym-connect/src-tauri/icons/Square150x150Logo.png rename to nym-connect/mobile/src-tauri/icons/Square150x150Logo.png diff --git a/nym-connect/src-tauri/icons/Square284x284Logo.png b/nym-connect/mobile/src-tauri/icons/Square284x284Logo.png similarity index 100% rename from nym-connect/src-tauri/icons/Square284x284Logo.png rename to nym-connect/mobile/src-tauri/icons/Square284x284Logo.png diff --git a/nym-connect/src-tauri/icons/Square30x30Logo.png b/nym-connect/mobile/src-tauri/icons/Square30x30Logo.png similarity index 100% rename from nym-connect/src-tauri/icons/Square30x30Logo.png rename to nym-connect/mobile/src-tauri/icons/Square30x30Logo.png diff --git a/nym-connect/src-tauri/icons/Square310x310Logo.png b/nym-connect/mobile/src-tauri/icons/Square310x310Logo.png similarity index 100% rename from nym-connect/src-tauri/icons/Square310x310Logo.png rename to nym-connect/mobile/src-tauri/icons/Square310x310Logo.png diff --git a/nym-connect/src-tauri/icons/Square44x44Logo.png b/nym-connect/mobile/src-tauri/icons/Square44x44Logo.png similarity index 100% rename from nym-connect/src-tauri/icons/Square44x44Logo.png rename to nym-connect/mobile/src-tauri/icons/Square44x44Logo.png diff --git a/nym-connect/src-tauri/icons/Square71x71Logo.png b/nym-connect/mobile/src-tauri/icons/Square71x71Logo.png similarity index 100% rename from nym-connect/src-tauri/icons/Square71x71Logo.png rename to nym-connect/mobile/src-tauri/icons/Square71x71Logo.png diff --git a/nym-connect/src-tauri/icons/Square89x89Logo.png b/nym-connect/mobile/src-tauri/icons/Square89x89Logo.png similarity index 100% rename from nym-connect/src-tauri/icons/Square89x89Logo.png rename to nym-connect/mobile/src-tauri/icons/Square89x89Logo.png diff --git a/nym-connect/src-tauri/icons/StoreLogo.png b/nym-connect/mobile/src-tauri/icons/StoreLogo.png similarity index 100% rename from nym-connect/src-tauri/icons/StoreLogo.png rename to nym-connect/mobile/src-tauri/icons/StoreLogo.png diff --git a/nym-connect/src-tauri/icons/icon.icns b/nym-connect/mobile/src-tauri/icons/icon.icns similarity index 100% rename from nym-connect/src-tauri/icons/icon.icns rename to nym-connect/mobile/src-tauri/icons/icon.icns diff --git a/nym-connect/src-tauri/icons/icon.ico b/nym-connect/mobile/src-tauri/icons/icon.ico similarity index 100% rename from nym-connect/src-tauri/icons/icon.ico rename to nym-connect/mobile/src-tauri/icons/icon.ico diff --git a/nym-connect/src-tauri/icons/icon.png b/nym-connect/mobile/src-tauri/icons/icon.png similarity index 100% rename from nym-connect/src-tauri/icons/icon.png rename to nym-connect/mobile/src-tauri/icons/icon.png diff --git a/nym-connect/src-tauri/icons/tray_icon.ico b/nym-connect/mobile/src-tauri/icons/tray_icon.ico similarity index 100% rename from nym-connect/src-tauri/icons/tray_icon.ico rename to nym-connect/mobile/src-tauri/icons/tray_icon.ico diff --git a/nym-connect/src-tauri/icons/tray_icon.png b/nym-connect/mobile/src-tauri/icons/tray_icon.png similarity index 100% rename from nym-connect/src-tauri/icons/tray_icon.png rename to nym-connect/mobile/src-tauri/icons/tray_icon.png diff --git a/nym-connect/src-tauri/src/build.rs b/nym-connect/mobile/src-tauri/src/build.rs similarity index 100% rename from nym-connect/src-tauri/src/build.rs rename to nym-connect/mobile/src-tauri/src/build.rs diff --git a/nym-connect-android/src-tauri/src/config/mod.rs b/nym-connect/mobile/src-tauri/src/config/mod.rs similarity index 100% rename from nym-connect-android/src-tauri/src/config/mod.rs rename to nym-connect/mobile/src-tauri/src/config/mod.rs diff --git a/nym-connect-android/src-tauri/src/error.rs b/nym-connect/mobile/src-tauri/src/error.rs similarity index 100% rename from nym-connect-android/src-tauri/src/error.rs rename to nym-connect/mobile/src-tauri/src/error.rs diff --git a/nym-connect/src-tauri/src/events.rs b/nym-connect/mobile/src-tauri/src/events.rs similarity index 100% rename from nym-connect/src-tauri/src/events.rs rename to nym-connect/mobile/src-tauri/src/events.rs diff --git a/nym-connect-android/src-tauri/src/lib.rs b/nym-connect/mobile/src-tauri/src/lib.rs similarity index 100% rename from nym-connect-android/src-tauri/src/lib.rs rename to nym-connect/mobile/src-tauri/src/lib.rs diff --git a/nym-connect/src-tauri/src/logging.rs b/nym-connect/mobile/src-tauri/src/logging.rs similarity index 100% rename from nym-connect/src-tauri/src/logging.rs rename to nym-connect/mobile/src-tauri/src/logging.rs diff --git a/nym-connect-android/src-tauri/src/main.rs b/nym-connect/mobile/src-tauri/src/main.rs similarity index 91% rename from nym-connect-android/src-tauri/src/main.rs rename to nym-connect/mobile/src-tauri/src/main.rs index 11ece5dfd8..a36abeaca1 100644 --- a/nym-connect-android/src-tauri/src/main.rs +++ b/nym-connect/mobile/src-tauri/src/main.rs @@ -3,7 +3,7 @@ windows_subsystem = "windows" )] -use nym_connect_android::AppBuilder; +use nym_connect::AppBuilder; fn main() { // As per breaking change description here diff --git a/nym-connect-android/src-tauri/src/menu.rs b/nym-connect/mobile/src-tauri/src/menu.rs similarity index 100% rename from nym-connect-android/src-tauri/src/menu.rs rename to nym-connect/mobile/src-tauri/src/menu.rs diff --git a/nym-connect-android/src-tauri/src/mobile.rs b/nym-connect/mobile/src-tauri/src/mobile.rs similarity index 100% rename from nym-connect-android/src-tauri/src/mobile.rs rename to nym-connect/mobile/src-tauri/src/mobile.rs diff --git a/nym-connect-android/src-tauri/src/models/mod.rs b/nym-connect/mobile/src-tauri/src/models/mod.rs similarity index 100% rename from nym-connect-android/src-tauri/src/models/mod.rs rename to nym-connect/mobile/src-tauri/src/models/mod.rs diff --git a/nym-connect/src-tauri/src/operations/connection/connect.rs b/nym-connect/mobile/src-tauri/src/operations/connection/connect.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/connection/connect.rs rename to nym-connect/mobile/src-tauri/src/operations/connection/connect.rs diff --git a/nym-connect/src-tauri/src/operations/connection/disconnect.rs b/nym-connect/mobile/src-tauri/src/operations/connection/disconnect.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/connection/disconnect.rs rename to nym-connect/mobile/src-tauri/src/operations/connection/disconnect.rs diff --git a/nym-connect/src-tauri/src/operations/connection/health_check.rs b/nym-connect/mobile/src-tauri/src/operations/connection/health_check.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/connection/health_check.rs rename to nym-connect/mobile/src-tauri/src/operations/connection/health_check.rs diff --git a/nym-connect/src-tauri/src/operations/connection/mod.rs b/nym-connect/mobile/src-tauri/src/operations/connection/mod.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/connection/mod.rs rename to nym-connect/mobile/src-tauri/src/operations/connection/mod.rs diff --git a/nym-connect/src-tauri/src/operations/connection/status.rs b/nym-connect/mobile/src-tauri/src/operations/connection/status.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/connection/status.rs rename to nym-connect/mobile/src-tauri/src/operations/connection/status.rs diff --git a/nym-connect/src-tauri/src/operations/directory/mod.rs b/nym-connect/mobile/src-tauri/src/operations/directory/mod.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/directory/mod.rs rename to nym-connect/mobile/src-tauri/src/operations/directory/mod.rs diff --git a/nym-connect/src-tauri/src/operations/export.rs b/nym-connect/mobile/src-tauri/src/operations/export.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/export.rs rename to nym-connect/mobile/src-tauri/src/operations/export.rs diff --git a/nym-connect-android/src-tauri/src/operations/help/log.rs b/nym-connect/mobile/src-tauri/src/operations/help/log.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/help/log.rs rename to nym-connect/mobile/src-tauri/src/operations/help/log.rs diff --git a/nym-connect/src-tauri/src/operations/help/mod.rs b/nym-connect/mobile/src-tauri/src/operations/help/mod.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/help/mod.rs rename to nym-connect/mobile/src-tauri/src/operations/help/mod.rs diff --git a/nym-connect/src-tauri/src/operations/help/storage.rs b/nym-connect/mobile/src-tauri/src/operations/help/storage.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/help/storage.rs rename to nym-connect/mobile/src-tauri/src/operations/help/storage.rs diff --git a/nym-connect/src-tauri/src/operations/http.rs b/nym-connect/mobile/src-tauri/src/operations/http.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/http.rs rename to nym-connect/mobile/src-tauri/src/operations/http.rs diff --git a/nym-connect-android/src-tauri/src/operations/mod.rs b/nym-connect/mobile/src-tauri/src/operations/mod.rs similarity index 100% rename from nym-connect-android/src-tauri/src/operations/mod.rs rename to nym-connect/mobile/src-tauri/src/operations/mod.rs diff --git a/nym-connect/src-tauri/src/operations/window/mod.rs b/nym-connect/mobile/src-tauri/src/operations/window/mod.rs similarity index 100% rename from nym-connect/src-tauri/src/operations/window/mod.rs rename to nym-connect/mobile/src-tauri/src/operations/window/mod.rs diff --git a/nym-connect-android/src-tauri/src/state.rs b/nym-connect/mobile/src-tauri/src/state.rs similarity index 100% rename from nym-connect-android/src-tauri/src/state.rs rename to nym-connect/mobile/src-tauri/src/state.rs diff --git a/nym-connect-android/src-tauri/src/tasks.rs b/nym-connect/mobile/src-tauri/src/tasks.rs similarity index 100% rename from nym-connect-android/src-tauri/src/tasks.rs rename to nym-connect/mobile/src-tauri/src/tasks.rs diff --git a/nym-connect/src-tauri/src/window.rs b/nym-connect/mobile/src-tauri/src/window.rs similarity index 100% rename from nym-connect/src-tauri/src/window.rs rename to nym-connect/mobile/src-tauri/src/window.rs diff --git a/nym-connect-android/src-tauri/tauri.conf.json b/nym-connect/mobile/src-tauri/tauri.conf.json similarity index 97% rename from nym-connect-android/src-tauri/tauri.conf.json rename to nym-connect/mobile/src-tauri/tauri.conf.json index ee8649d537..a45666f724 100644 --- a/nym-connect-android/src-tauri/tauri.conf.json +++ b/nym-connect/mobile/src-tauri/tauri.conf.json @@ -1,6 +1,6 @@ { "package": { - "productName": "nym-connect-android", + "productName": "nym-connect", "version": "1.1.9" }, "build": { diff --git a/nym-connect/src/assets/help-step-four.png b/nym-connect/mobile/src/assets/help-step-four.png similarity index 100% rename from nym-connect/src/assets/help-step-four.png rename to nym-connect/mobile/src/assets/help-step-four.png diff --git a/nym-connect/src/assets/help-step-one-legacy.png b/nym-connect/mobile/src/assets/help-step-one-legacy.png similarity index 100% rename from nym-connect/src/assets/help-step-one-legacy.png rename to nym-connect/mobile/src/assets/help-step-one-legacy.png diff --git a/nym-connect/src/assets/help-step-one.png b/nym-connect/mobile/src/assets/help-step-one.png similarity index 100% rename from nym-connect/src/assets/help-step-one.png rename to nym-connect/mobile/src/assets/help-step-one.png diff --git a/nym-connect/src/assets/help-step-three.png b/nym-connect/mobile/src/assets/help-step-three.png similarity index 100% rename from nym-connect/src/assets/help-step-three.png rename to nym-connect/mobile/src/assets/help-step-three.png diff --git a/nym-connect/src/assets/help-step-two-legacy.png b/nym-connect/mobile/src/assets/help-step-two-legacy.png similarity index 100% rename from nym-connect/src/assets/help-step-two-legacy.png rename to nym-connect/mobile/src/assets/help-step-two-legacy.png diff --git a/nym-connect/src/assets/help-step-two.png b/nym-connect/mobile/src/assets/help-step-two.png similarity index 100% rename from nym-connect/src/assets/help-step-two.png rename to nym-connect/mobile/src/assets/help-step-two.png diff --git a/nym-connect/src/components/AppVersion.tsx b/nym-connect/mobile/src/components/AppVersion.tsx similarity index 100% rename from nym-connect/src/components/AppVersion.tsx rename to nym-connect/mobile/src/components/AppVersion.tsx diff --git a/nym-connect-android/src/components/AppWindowFrame.tsx b/nym-connect/mobile/src/components/AppWindowFrame.tsx similarity index 100% rename from nym-connect-android/src/components/AppWindowFrame.tsx rename to nym-connect/mobile/src/components/AppWindowFrame.tsx diff --git a/nym-connect/src/components/ConnectionButton.tsx b/nym-connect/mobile/src/components/ConnectionButton.tsx similarity index 100% rename from nym-connect/src/components/ConnectionButton.tsx rename to nym-connect/mobile/src/components/ConnectionButton.tsx diff --git a/nym-connect/src/components/ConnectionStats.tsx b/nym-connect/mobile/src/components/ConnectionStats.tsx similarity index 100% rename from nym-connect/src/components/ConnectionStats.tsx rename to nym-connect/mobile/src/components/ConnectionStats.tsx diff --git a/nym-connect-android/src/components/ConnectionStatus.tsx b/nym-connect/mobile/src/components/ConnectionStatus.tsx similarity index 100% rename from nym-connect-android/src/components/ConnectionStatus.tsx rename to nym-connect/mobile/src/components/ConnectionStatus.tsx diff --git a/nym-connect-android/src/components/ConntectionTimer.tsx b/nym-connect/mobile/src/components/ConntectionTimer.tsx similarity index 100% rename from nym-connect-android/src/components/ConntectionTimer.tsx rename to nym-connect/mobile/src/components/ConntectionTimer.tsx diff --git a/nym-connect/src/components/CopyToClipboard.tsx b/nym-connect/mobile/src/components/CopyToClipboard.tsx similarity index 100% rename from nym-connect/src/components/CopyToClipboard.tsx rename to nym-connect/mobile/src/components/CopyToClipboard.tsx diff --git a/nym-connect-android/src/components/CustomTitleBar.tsx b/nym-connect/mobile/src/components/CustomTitleBar.tsx similarity index 86% rename from nym-connect-android/src/components/CustomTitleBar.tsx rename to nym-connect/mobile/src/components/CustomTitleBar.tsx index 43540d743b..ae6f7f8255 100644 --- a/nym-connect-android/src/components/CustomTitleBar.tsx +++ b/nym-connect/mobile/src/components/CustomTitleBar.tsx @@ -1,7 +1,8 @@ import React from 'react'; import { ArrowBack, Menu } from '@mui/icons-material'; import { Box, IconButton, Typography } from '@mui/material'; -import { NymWordmark } from '@nymproject/react/logo/NymWordmark'; +// TODO since the structure refactor for NC this import fails +// import { NymWordmark } from '@nymproject/react/logo/NymWordmark'; import { useNavigate } from 'react-router-dom'; const customTitleBarStyles = { @@ -46,7 +47,13 @@ const getTitleIcon = (path: string) => { ); } - return ; + + // TODO return ; + return ( + + NYM + + ); }; export const CustomTitleBar = ({ path = '/', onBack }: { path?: string; onBack?: () => void }) => ( diff --git a/nym-connect/src/components/Error.tsx b/nym-connect/mobile/src/components/Error.tsx similarity index 100% rename from nym-connect/src/components/Error.tsx rename to nym-connect/mobile/src/components/Error.tsx diff --git a/nym-connect/src/components/ErrorFallback.tsx b/nym-connect/mobile/src/components/ErrorFallback.tsx similarity index 100% rename from nym-connect/src/components/ErrorFallback.tsx rename to nym-connect/mobile/src/components/ErrorFallback.tsx diff --git a/nym-connect-android/src/components/ExperimentalWarning.tsx b/nym-connect/mobile/src/components/ExperimentalWarning.tsx similarity index 100% rename from nym-connect-android/src/components/ExperimentalWarning.tsx rename to nym-connect/mobile/src/components/ExperimentalWarning.tsx diff --git a/nym-connect/src/components/Growth/content/assets/matrix.webp b/nym-connect/mobile/src/components/Growth/content/assets/matrix.webp similarity index 100% rename from nym-connect/src/components/Growth/content/assets/matrix.webp rename to nym-connect/mobile/src/components/Growth/content/assets/matrix.webp diff --git a/nym-connect-android/src/components/HelpPage.tsx b/nym-connect/mobile/src/components/HelpPage.tsx similarity index 100% rename from nym-connect-android/src/components/HelpPage.tsx rename to nym-connect/mobile/src/components/HelpPage.tsx diff --git a/nym-connect-android/src/components/HelpPageActions.tsx b/nym-connect/mobile/src/components/HelpPageActions.tsx similarity index 100% rename from nym-connect-android/src/components/HelpPageActions.tsx rename to nym-connect/mobile/src/components/HelpPageActions.tsx diff --git a/nym-connect/src/components/HelpPageImage.tsx b/nym-connect/mobile/src/components/HelpPageImage.tsx similarity index 100% rename from nym-connect/src/components/HelpPageImage.tsx rename to nym-connect/mobile/src/components/HelpPageImage.tsx diff --git a/nym-connect-android/src/components/HelpPageStepIndicator.tsx b/nym-connect/mobile/src/components/HelpPageStepIndicator.tsx similarity index 100% rename from nym-connect-android/src/components/HelpPageStepIndicator.tsx rename to nym-connect/mobile/src/components/HelpPageStepIndicator.tsx diff --git a/nym-connect-android/src/components/InfoModal.tsx b/nym-connect/mobile/src/components/InfoModal.tsx similarity index 100% rename from nym-connect-android/src/components/InfoModal.tsx rename to nym-connect/mobile/src/components/InfoModal.tsx diff --git a/nym-connect-android/src/components/IpAddressAndPort.tsx b/nym-connect/mobile/src/components/IpAddressAndPort.tsx similarity index 100% rename from nym-connect-android/src/components/IpAddressAndPort.tsx rename to nym-connect/mobile/src/components/IpAddressAndPort.tsx diff --git a/nym-connect/src/components/IpAddressAndPortModal.tsx b/nym-connect/mobile/src/components/IpAddressAndPortModal.tsx similarity index 100% rename from nym-connect/src/components/IpAddressAndPortModal.tsx rename to nym-connect/mobile/src/components/IpAddressAndPortModal.tsx diff --git a/nym-connect/src/components/NeedHelp.tsx b/nym-connect/mobile/src/components/NeedHelp.tsx similarity index 100% rename from nym-connect/src/components/NeedHelp.tsx rename to nym-connect/mobile/src/components/NeedHelp.tsx diff --git a/nym-connect-android/src/components/PowerButton/PowerButton.tsx b/nym-connect/mobile/src/components/PowerButton/PowerButton.tsx similarity index 100% rename from nym-connect-android/src/components/PowerButton/PowerButton.tsx rename to nym-connect/mobile/src/components/PowerButton/PowerButton.tsx diff --git a/nym-connect-android/src/components/PowerButton/power-button.css b/nym-connect/mobile/src/components/PowerButton/power-button.css similarity index 100% rename from nym-connect-android/src/components/PowerButton/power-button.css rename to nym-connect/mobile/src/components/PowerButton/power-button.css diff --git a/nym-connect/src/components/ServiceProviderPopup.tsx b/nym-connect/mobile/src/components/ServiceProviderPopup.tsx similarity index 100% rename from nym-connect/src/components/ServiceProviderPopup.tsx rename to nym-connect/mobile/src/components/ServiceProviderPopup.tsx diff --git a/nym-connect/src/components/ServiceProviderSelector.stories.tsx b/nym-connect/mobile/src/components/ServiceProviderSelector.stories.tsx similarity index 100% rename from nym-connect/src/components/ServiceProviderSelector.stories.tsx rename to nym-connect/mobile/src/components/ServiceProviderSelector.stories.tsx diff --git a/nym-connect/src/components/ServiceProviderSelector.tsx b/nym-connect/mobile/src/components/ServiceProviderSelector.tsx similarity index 100% rename from nym-connect/src/components/ServiceProviderSelector.tsx rename to nym-connect/mobile/src/components/ServiceProviderSelector.tsx diff --git a/nym-connect/src/components/ServiceSelector.stories.tsx b/nym-connect/mobile/src/components/ServiceSelector.stories.tsx similarity index 100% rename from nym-connect/src/components/ServiceSelector.stories.tsx rename to nym-connect/mobile/src/components/ServiceSelector.stories.tsx diff --git a/nym-connect/src/components/ServiceSelector.tsx b/nym-connect/mobile/src/components/ServiceSelector.tsx similarity index 100% rename from nym-connect/src/components/ServiceSelector.tsx rename to nym-connect/mobile/src/components/ServiceSelector.tsx diff --git a/nym-connect-android/src/components/TooltipInfo.tsx b/nym-connect/mobile/src/components/TooltipInfo.tsx similarity index 100% rename from nym-connect-android/src/components/TooltipInfo.tsx rename to nym-connect/mobile/src/components/TooltipInfo.tsx diff --git a/nym-connect/src/config.ts b/nym-connect/mobile/src/config.ts similarity index 100% rename from nym-connect/src/config.ts rename to nym-connect/mobile/src/config.ts diff --git a/nym-connect/src/context/main.tsx b/nym-connect/mobile/src/context/main.tsx similarity index 100% rename from nym-connect/src/context/main.tsx rename to nym-connect/mobile/src/context/main.tsx diff --git a/nym-connect/src/context/mocks/main.tsx b/nym-connect/mobile/src/context/mocks/main.tsx similarity index 100% rename from nym-connect/src/context/mocks/main.tsx rename to nym-connect/mobile/src/context/mocks/main.tsx diff --git a/nym-connect/src/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf b/nym-connect/mobile/src/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf similarity index 100% rename from nym-connect/src/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf rename to nym-connect/mobile/src/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf diff --git a/nym-connect/src/fonts/OpenSans-VariableFont_wdth,wght.ttf b/nym-connect/mobile/src/fonts/OpenSans-VariableFont_wdth,wght.ttf similarity index 100% rename from nym-connect/src/fonts/OpenSans-VariableFont_wdth,wght.ttf rename to nym-connect/mobile/src/fonts/OpenSans-VariableFont_wdth,wght.ttf diff --git a/nym-connect/src/fonts/fonts.css b/nym-connect/mobile/src/fonts/fonts.css similarity index 100% rename from nym-connect/src/fonts/fonts.css rename to nym-connect/mobile/src/fonts/fonts.css diff --git a/nym-connect/src/hooks/events.ts b/nym-connect/mobile/src/hooks/events.ts similarity index 100% rename from nym-connect/src/hooks/events.ts rename to nym-connect/mobile/src/hooks/events.ts diff --git a/nym-connect-android/src/index.tsx b/nym-connect/mobile/src/index.tsx similarity index 100% rename from nym-connect-android/src/index.tsx rename to nym-connect/mobile/src/index.tsx diff --git a/nym-connect-android/src/layouts/ConnectionLayout.tsx b/nym-connect/mobile/src/layouts/ConnectionLayout.tsx similarity index 100% rename from nym-connect-android/src/layouts/ConnectionLayout.tsx rename to nym-connect/mobile/src/layouts/ConnectionLayout.tsx diff --git a/nym-connect-android/src/pages/connection/Connected.tsx b/nym-connect/mobile/src/pages/connection/Connected.tsx similarity index 100% rename from nym-connect-android/src/pages/connection/Connected.tsx rename to nym-connect/mobile/src/pages/connection/Connected.tsx diff --git a/nym-connect-android/src/pages/connection/Disconnected.tsx b/nym-connect/mobile/src/pages/connection/Disconnected.tsx similarity index 100% rename from nym-connect-android/src/pages/connection/Disconnected.tsx rename to nym-connect/mobile/src/pages/connection/Disconnected.tsx diff --git a/nym-connect-android/src/pages/connection/index.tsx b/nym-connect/mobile/src/pages/connection/index.tsx similarity index 100% rename from nym-connect-android/src/pages/connection/index.tsx rename to nym-connect/mobile/src/pages/connection/index.tsx diff --git a/nym-connect-android/src/pages/menu/Apps.tsx b/nym-connect/mobile/src/pages/menu/Apps.tsx similarity index 100% rename from nym-connect-android/src/pages/menu/Apps.tsx rename to nym-connect/mobile/src/pages/menu/Apps.tsx diff --git a/nym-connect/src/pages/menu/Guide.tsx b/nym-connect/mobile/src/pages/menu/Guide.tsx similarity index 100% rename from nym-connect/src/pages/menu/Guide.tsx rename to nym-connect/mobile/src/pages/menu/Guide.tsx diff --git a/nym-connect-android/src/pages/menu/Settings.tsx b/nym-connect/mobile/src/pages/menu/Settings.tsx similarity index 100% rename from nym-connect-android/src/pages/menu/Settings.tsx rename to nym-connect/mobile/src/pages/menu/Settings.tsx diff --git a/nym-connect-android/src/pages/menu/index.tsx b/nym-connect/mobile/src/pages/menu/index.tsx similarity index 100% rename from nym-connect-android/src/pages/menu/index.tsx rename to nym-connect/mobile/src/pages/menu/index.tsx diff --git a/nym-connect-android/src/routes/index.tsx b/nym-connect/mobile/src/routes/index.tsx similarity index 100% rename from nym-connect-android/src/routes/index.tsx rename to nym-connect/mobile/src/routes/index.tsx diff --git a/nym-connect/src/stories/AppFlow.stories.tsx b/nym-connect/mobile/src/stories/AppFlow.stories.tsx similarity index 100% rename from nym-connect/src/stories/AppFlow.stories.tsx rename to nym-connect/mobile/src/stories/AppFlow.stories.tsx diff --git a/nym-connect/src/stories/AppWindowFrame.stories.tsx b/nym-connect/mobile/src/stories/AppWindowFrame.stories.tsx similarity index 100% rename from nym-connect/src/stories/AppWindowFrame.stories.tsx rename to nym-connect/mobile/src/stories/AppWindowFrame.stories.tsx diff --git a/nym-connect/src/stories/ConnectedLayout.stories.tsx b/nym-connect/mobile/src/stories/ConnectedLayout.stories.tsx similarity index 100% rename from nym-connect/src/stories/ConnectedLayout.stories.tsx rename to nym-connect/mobile/src/stories/ConnectedLayout.stories.tsx diff --git a/nym-connect/src/stories/ConnectionButton.stories.tsx b/nym-connect/mobile/src/stories/ConnectionButton.stories.tsx similarity index 100% rename from nym-connect/src/stories/ConnectionButton.stories.tsx rename to nym-connect/mobile/src/stories/ConnectionButton.stories.tsx diff --git a/nym-connect/src/stories/ConnectionStats.stories.tsx b/nym-connect/mobile/src/stories/ConnectionStats.stories.tsx similarity index 100% rename from nym-connect/src/stories/ConnectionStats.stories.tsx rename to nym-connect/mobile/src/stories/ConnectionStats.stories.tsx diff --git a/nym-connect/src/stories/ConnectionStatus.stories.tsx b/nym-connect/mobile/src/stories/ConnectionStatus.stories.tsx similarity index 100% rename from nym-connect/src/stories/ConnectionStatus.stories.tsx rename to nym-connect/mobile/src/stories/ConnectionStatus.stories.tsx diff --git a/nym-connect/src/stories/DefaultLayout.stories.tsx b/nym-connect/mobile/src/stories/DefaultLayout.stories.tsx similarity index 100% rename from nym-connect/src/stories/DefaultLayout.stories.tsx rename to nym-connect/mobile/src/stories/DefaultLayout.stories.tsx diff --git a/nym-connect/src/stories/Introduction.stories.mdx b/nym-connect/mobile/src/stories/Introduction.stories.mdx similarity index 100% rename from nym-connect/src/stories/Introduction.stories.mdx rename to nym-connect/mobile/src/stories/Introduction.stories.mdx diff --git a/nym-connect/src/stories/IpAddressAndPort.stories.tsx b/nym-connect/mobile/src/stories/IpAddressAndPort.stories.tsx similarity index 100% rename from nym-connect/src/stories/IpAddressAndPort.stories.tsx rename to nym-connect/mobile/src/stories/IpAddressAndPort.stories.tsx diff --git a/nym-connect/src/stories/PowerButton.stories.tsx b/nym-connect/mobile/src/stories/PowerButton.stories.tsx similarity index 100% rename from nym-connect/src/stories/PowerButton.stories.tsx rename to nym-connect/mobile/src/stories/PowerButton.stories.tsx diff --git a/nym-connect/src/theme/index.tsx b/nym-connect/mobile/src/theme/index.tsx similarity index 94% rename from nym-connect/src/theme/index.tsx rename to nym-connect/mobile/src/theme/index.tsx index ad2350053d..d307fe46ee 100644 --- a/nym-connect/src/theme/index.tsx +++ b/nym-connect/mobile/src/theme/index.tsx @@ -3,7 +3,7 @@ import { createTheme, ThemeProvider } from '@mui/material/styles'; import { CssBaseline } from '@mui/material'; import { getDesignTokens } from './theme'; // eslint-disable-next-line import/no-relative-packages -import '../../../assets/fonts/non-variable/fonts.css'; +import '../../../../assets/fonts/non-variable/fonts.css'; /** * Provides the theme for Nym Connect by reacting to the light/dark mode choice stored in the app context. diff --git a/nym-connect/src/theme/mui-theme.d.ts b/nym-connect/mobile/src/theme/mui-theme.d.ts similarity index 100% rename from nym-connect/src/theme/mui-theme.d.ts rename to nym-connect/mobile/src/theme/mui-theme.d.ts diff --git a/nym-connect-android/src/theme/theme.tsx b/nym-connect/mobile/src/theme/theme.tsx similarity index 100% rename from nym-connect-android/src/theme/theme.tsx rename to nym-connect/mobile/src/theme/theme.tsx diff --git a/nym-connect/src/types/connection.ts b/nym-connect/mobile/src/types/connection.ts similarity index 100% rename from nym-connect/src/types/connection.ts rename to nym-connect/mobile/src/types/connection.ts diff --git a/nym-connect/src/types/directory.ts b/nym-connect/mobile/src/types/directory.ts similarity index 100% rename from nym-connect/src/types/directory.ts rename to nym-connect/mobile/src/types/directory.ts diff --git a/nym-connect/src/types/error.ts b/nym-connect/mobile/src/types/error.ts similarity index 100% rename from nym-connect/src/types/error.ts rename to nym-connect/mobile/src/types/error.ts diff --git a/nym-connect/src/types/event.ts b/nym-connect/mobile/src/types/event.ts similarity index 100% rename from nym-connect/src/types/event.ts rename to nym-connect/mobile/src/types/event.ts diff --git a/nym-connect/src/types/gateway.ts b/nym-connect/mobile/src/types/gateway.ts similarity index 100% rename from nym-connect/src/types/gateway.ts rename to nym-connect/mobile/src/types/gateway.ts diff --git a/nym-connect/src/types/index.ts b/nym-connect/mobile/src/types/index.ts similarity index 100% rename from nym-connect/src/types/index.ts rename to nym-connect/mobile/src/types/index.ts diff --git a/nym-connect/src/types/rust/index.ts b/nym-connect/mobile/src/types/rust/index.ts similarity index 100% rename from nym-connect/src/types/rust/index.ts rename to nym-connect/mobile/src/types/rust/index.ts diff --git a/nym-connect/src/types/rust/stateparams.ts b/nym-connect/mobile/src/types/rust/stateparams.ts similarity index 100% rename from nym-connect/src/types/rust/stateparams.ts rename to nym-connect/mobile/src/types/rust/stateparams.ts diff --git a/nym-connect/src/typings/FC.d.ts b/nym-connect/mobile/src/typings/FC.d.ts similarity index 100% rename from nym-connect/src/typings/FC.d.ts rename to nym-connect/mobile/src/typings/FC.d.ts diff --git a/nym-connect/src/typings/jpeg.d.ts b/nym-connect/mobile/src/typings/jpeg.d.ts similarity index 100% rename from nym-connect/src/typings/jpeg.d.ts rename to nym-connect/mobile/src/typings/jpeg.d.ts diff --git a/nym-connect/src/typings/json.d.ts b/nym-connect/mobile/src/typings/json.d.ts similarity index 100% rename from nym-connect/src/typings/json.d.ts rename to nym-connect/mobile/src/typings/json.d.ts diff --git a/nym-connect/src/typings/png.d.ts b/nym-connect/mobile/src/typings/png.d.ts similarity index 100% rename from nym-connect/src/typings/png.d.ts rename to nym-connect/mobile/src/typings/png.d.ts diff --git a/nym-connect/src/typings/svg.d.ts b/nym-connect/mobile/src/typings/svg.d.ts similarity index 100% rename from nym-connect/src/typings/svg.d.ts rename to nym-connect/mobile/src/typings/svg.d.ts diff --git a/nym-connect/src/typings/webp.d.ts b/nym-connect/mobile/src/typings/webp.d.ts similarity index 100% rename from nym-connect/src/typings/webp.d.ts rename to nym-connect/mobile/src/typings/webp.d.ts diff --git a/nym-connect/src/typings/yaml.d.ts b/nym-connect/mobile/src/typings/yaml.d.ts similarity index 100% rename from nym-connect/src/typings/yaml.d.ts rename to nym-connect/mobile/src/typings/yaml.d.ts diff --git a/nym-connect-android/src/utils/index.ts b/nym-connect/mobile/src/utils/index.ts similarity index 100% rename from nym-connect-android/src/utils/index.ts rename to nym-connect/mobile/src/utils/index.ts diff --git a/nym-connect/tsconfig.eslint.json b/nym-connect/mobile/tsconfig.eslint.json similarity index 100% rename from nym-connect/tsconfig.eslint.json rename to nym-connect/mobile/tsconfig.eslint.json diff --git a/nym-connect-android/tsconfig.json b/nym-connect/mobile/tsconfig.json similarity index 100% rename from nym-connect-android/tsconfig.json rename to nym-connect/mobile/tsconfig.json diff --git a/nym-connect-android/webpack.common.js b/nym-connect/mobile/webpack.common.js similarity index 100% rename from nym-connect-android/webpack.common.js rename to nym-connect/mobile/webpack.common.js diff --git a/nym-connect-android/webpack.dev.js b/nym-connect/mobile/webpack.dev.js similarity index 100% rename from nym-connect-android/webpack.dev.js rename to nym-connect/mobile/webpack.dev.js diff --git a/nym-connect-android/webpack.prod.js b/nym-connect/mobile/webpack.prod.js similarity index 100% rename from nym-connect-android/webpack.prod.js rename to nym-connect/mobile/webpack.prod.js diff --git a/package.json b/package.json index 5074398a8b..3bd1e0c24d 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,7 @@ "sdk/typescript/packages/**", "ts-packages/*", "nym-wallet", - "nym-connect", - "nym-connect-android", + "nym-connect/**", "explorer", "types", "clients/validator"