diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml new file mode 100644 index 0000000..f52bbc8 --- /dev/null +++ b/.github/workflows/master.yml @@ -0,0 +1,25 @@ +name: "Main workflow" +on: [pull_request, push] +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macOS-latest] + steps: + - uses: actions/checkout@v1 + with: + fetch-depth: 1 + - uses: actions/setup-node@v1 + - name: "Install dependencies" + run: yarn + - name: "Build application" + run: yarn dist + - name: "Archive build artifacts" + uses: svenstaro/upload-release-action@v1-release + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: dist/* + tag: ${{ github.run_id }} + overwrite: true + file_glob: true \ No newline at end of file diff --git a/desktop-app/src/app/app.component.ts b/desktop-app/src/app/app.component.ts index b34fed5..9a0741b 100644 --- a/desktop-app/src/app/app.component.ts +++ b/desktop-app/src/app/app.component.ts @@ -47,7 +47,6 @@ export class AppComponent { ngAfterViewInit() { this.spinnerService.setSpinner(this.spinner); this.statusService.setStatus(this.status); - console.log(this.webview); this.webService.setWebView(this.webview.nativeElement); } } diff --git a/desktop-app/src/app/electron.service.ts b/desktop-app/src/app/electron.service.ts index a849b65..cd32fc8 100644 --- a/desktop-app/src/app/electron.service.ts +++ b/desktop-app/src/app/electron.service.ts @@ -77,9 +77,9 @@ export class ElectronService { rejectUnauthorized: !isDevMode(), json: { token: token }, }; - console.log(options); + // console.log(options); this.appService.request(options, async (error, response, body) => { - console.log(error, body); + // console.log(error, body); if (!error && body.data && body.data.apps && body.data.apps.length) { for (let i = 0; i < body.data.apps.length; i++) { let app = body.data.apps[i]; @@ -157,8 +157,13 @@ export class ElectronService { if (data) { let url = data.split('#'); switch (url[0]) { + case 'sidequest://w/': + this.adbService.runAdbCommand('adb shell am start -a android.intent.action.VIEW -d ' + url[1]).then(() => { + this.statusService.showStatus('Launching WebXR in browser...'); + }); + this.webviewService.isWebviewLoading = false; + break; case 'sidequest://i/': - console.log(data); this.installFromToken(url[1]); break; case 'sidequest://unload/': diff --git a/desktop-app/src/app/process-bucket.service.ts b/desktop-app/src/app/process-bucket.service.ts index a432735..6feee25 100644 --- a/desktop-app/src/app/process-bucket.service.ts +++ b/desktop-app/src/app/process-bucket.service.ts @@ -149,7 +149,6 @@ export class ProcessBucketService { this.tasks = this.tasks.filter(t => !t.failed); } clearAll() { - igin; this.tasks = []; } } diff --git a/desktop-app/src/app/webview.service.ts b/desktop-app/src/app/webview.service.ts index 5654aea..9873a2b 100644 --- a/desktop-app/src/app/webview.service.ts +++ b/desktop-app/src/app/webview.service.ts @@ -14,7 +14,6 @@ export class WebviewService { appService.setWebviewService(this); } setWebView(webView) { - console.log({ webView }); this.webView = webView; this.setupWebview(); }