diff --git a/desktop-app/angular.json b/desktop-app/angular.json
index b0f16cb..cdc966c 100644
--- a/desktop-app/angular.json
+++ b/desktop-app/angular.json
@@ -35,7 +35,10 @@
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
- "namedChunks": true
+ "namedChunks": true,
+ "allowedCommonJsDependencies": [
+ "dragula"
+ ]
},
"configurations": {
"production": {
diff --git a/desktop-app/package.json b/desktop-app/package.json
index 9a79e9c..875711c 100644
--- a/desktop-app/package.json
+++ b/desktop-app/package.json
@@ -26,16 +26,17 @@
"@angular/platform-browser-dynamic": "^17.2.2",
"@angular/platform-server": "^17.2.2",
"@angular/router": "^17.2.2",
+ "@iharbeck/ngx-virtual-scroller": "17.0.2",
"@simonwep/pickr": "^1.0.0-beta",
+ "@steinv/ngx-materialize": "^17.0.0",
+ "@tweenjs/tween.js": "^23.1.1",
"@types/hammerjs": "^2.0.45",
"dom-autoscroller": "^2.3.4",
+ "dragula": "^3.7.3",
"hammerjs": "^2.0.8",
"materialize-css": "1.0.0",
- "dragula": "^3.7.3",
"ng2-dragula": "^5.0.1",
"ngx-color-picker": "^16.0.0",
- "@steinv/ngx-materialize": "^17.0.0",
- "@iharbeck/ngx-virtual-scroller": "17.0.2",
"randomcolor": "^0.6.2",
"rxjs": "^7.8.1",
"rxjs-compat": "^6.6.7",
@@ -50,6 +51,7 @@
"@angular/cli": "^17.2.0",
"@angular/compiler-cli": "^17.2.2",
"@angular/language-service": "^17.2.2",
+ "@angular/localize": "17.2.2",
"@types/jasmine": "~5.1.4",
"@types/jasminewd2": "~2.0.13",
"@types/node": "^20.11.20",
diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts
index f16dde7..e3c3a39 100644
--- a/desktop-app/src/app/adb-client.service.ts
+++ b/desktop-app/src/app/adb-client.service.ts
@@ -396,7 +396,11 @@ export class AdbClientService {
return requestAnimationFrame(this.connectedStatus.bind(this));
this.lastConnectionCheck = now;
return this.adbCommand('listDevices')
- .then((devices: any) => devices.filter(device => device.type !== 'offline'))
+ .then((devices: any) => {
+ console.log("d1", devices);
+ let f = devices.filter(device => device.type !== 'offline')
+ return f;
+ })
.then(async devices => {
if (devices.length > 1 && this.justChangedMPT) {
this.justChangedMPT = false;
@@ -415,7 +419,7 @@ export class AdbClientService {
requestAnimationFrame(this.connectedStatus.bind(this));
})
.catch(err => {
- console.warn(err);
+ console.warn(err, err.stack);
alert(
this.appService.os.platform() === 'win32'
? `It looks like there is something wrong with your install.
@@ -455,6 +459,7 @@ This can sometimes be caused by changes to your hosts file. Don't make changes u
await this.appService.seedPlatformTools();
}
this.appService.electron.ipcRenderer.on('adb-command', (event, arg: any) => {
+ console.log("result", arg.uuid, arg.status, arg.error, arg.resp)
if (this.adbResolves[arg.uuid]) {
if (arg.status && this.adbResolves[arg.uuid].callback) {
this.adbResolves[arg.uuid].callback(arg.status);
@@ -470,7 +475,7 @@ This can sometimes be caused by changes to your hosts file. Don't make changes u
});
this.lastErrorMessage = null;
} catch (e) {
- console.error(e);
+ console.error(e, e.stack);
this.deviceStatus = ConnectionStatus.DISCONNECTED;
this.deviceStatusMessage = 'ADB Setup Error';
this.lastErrorMessage = e.toString();
diff --git a/desktop-app/src/app/app.module.ts b/desktop-app/src/app/app.module.ts
index 636b5a1..5e23412 100644
--- a/desktop-app/src/app/app.module.ts
+++ b/desktop-app/src/app/app.module.ts
@@ -4,6 +4,7 @@ import { AppComponent } from './app.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
// import { MzButtonModule, MzCheckboxModule, MzModalModule, MzTooltipModule } from '@steinv/ngx-materialize';
+import { MzModalModule} from './mz-components/modal';
import { NgxMaterialize } from '@steinv/ngx-materialize';
import { DragulaModule } from 'ng2-dragula';
import { HeaderComponent } from './header/header.component';
@@ -60,7 +61,7 @@ import { StreamOptionsComponent } from './stream-options/stream-options.componen
FormsModule,
RouterModule.forRoot(AppRoutes, { useHash: true }),
// MzTooltipModule,
- // MzModalModule,
+ MzModalModule,
// MzButtonModule,
HttpClientModule,
// MzCheckboxModule,
diff --git a/desktop-app/src/app/connection-status/connection-status.component.html b/desktop-app/src/app/connection-status/connection-status.component.html
index 142b96e..d77fc41 100644
--- a/desktop-app/src/app/connection-status/connection-status.component.html
+++ b/desktop-app/src/app/connection-status/connection-status.component.html
@@ -2,16 +2,16 @@
Connection Status
-
-
{{adb.diagnostics.usb && adb.diagnostics.usb.is_connected?'Quest Detected':'Quest Not Detected'}}
+
+
{{adb.diagnostics?.usb && adb.diagnostics.usb.is_connected?'Quest Detected':'Quest Not Detected'}}
-
-
{{adb.diagnostics.usb && adb.diagnostics.usb.is_dev_mode_enabled?'Dev Mode Enabled':'Dev Mode Not Enabled'}}
+
+
{{adb.diagnostics?.usb && adb.diagnostics.usb.is_dev_mode_enabled?'Dev Mode Enabled':'Dev Mode Not Enabled'}}
-
-
{{adb.diagnostics.usb && adb.diagnostics.usb.is_adb_enabled?'ADB Detected':'No ADB Detected'}}
+
+
{{adb.diagnostics?.usb && adb.diagnostics.usb.is_adb_enabled?'ADB Detected':'No ADB Detected'}}
@@ -25,13 +25,13 @@
- {{(adb.diagnostics.usb && adb.diagnostics.usb.result_status=='diag-good' && adb.devices.length && adb.deviceStatus !== ConnectionStatus.UNAUTHORIZED)?'You\'re all set!':'So how do I fix it?'}}
+ {{(adb.diagnostics?.usb && adb.diagnostics.usb.result_status=='diag-good' && adb.devices.length && adb.deviceStatus !== ConnectionStatus.UNAUTHORIZED)?'You\'re all set!':'So how do I fix it?'}}
Here are some solutions we have come across related to this problem.
Please try the recommendations here before following tutorials online, this information is always the most up to date.
-
{{(adb.diagnostics.usb && adb.diagnostics.usb.result_status=='diag-good' && adb.devices.length && adb.deviceStatus !== ConnectionStatus.UNAUTHORIZED) ? "Check for a popup to accept inside the headset.":adb.diagnostics.usb ? adb.diagnostics.usb.recommendation : ''}}
+
{{(adb.diagnostics?.usb && adb.diagnostics.usb.result_status=='diag-good' && adb.devices.length && adb.deviceStatus !== ConnectionStatus.UNAUTHORIZED) ? "Check for a popup to accept inside the headset.":adb.diagnostics.usb ? adb.diagnostics.usb.recommendation : ''}}
Close
diff --git a/desktop-app/src/app/current-task-item/current-task-item.component.html b/desktop-app/src/app/current-task-item/current-task-item.component.html
index 77b6392..eb3d1a3 100644
--- a/desktop-app/src/app/current-task-item/current-task-item.component.html
+++ b/desktop-app/src/app/current-task-item/current-task-item.component.html
@@ -1,8 +1,8 @@
-
diff --git a/desktop-app/src/app/current-task-item/current-task-item.component.ts b/desktop-app/src/app/current-task-item/current-task-item.component.ts
index f14af76..86d6a1f 100644
--- a/desktop-app/src/app/current-task-item/current-task-item.component.ts
+++ b/desktop-app/src/app/current-task-item/current-task-item.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, AfterViewInit, OnDestroy, ViewChild } from '@angular/core';
import { ProcessBucketService } from '../process-bucket.service';
@Component({
@@ -6,11 +6,40 @@ import { ProcessBucketService } from '../process-bucket.service';
templateUrl: './current-task-item.component.html',
styleUrls: ['./current-task-item.component.scss'],
})
-export class CurrentTaskItemComponent implements OnInit {
+export class CurrentTaskItemComponent implements AfterViewInit, OnDestroy {
@Input() task;
+ @ViewChild('tooltip') tooltip;
+ toolTipInterval: number
+ toolTipStatus: number = 0
constructor(public processService: ProcessBucketService) {}
- ngOnInit() {}
+ ngAfterViewInit() {
+ return;
+ this.toolTipInterval = setInterval(() => {
+ if (this.task) {
+ if (this.task.running && this.toolTipStatus !== 2) {
+ this.toolTipStatus = 2;
+ this.tooltip.nativeElement.dataset.tooltip = 'This task is running';
+ } else if (this.task.failed && this.toolTipStatus !== 3) {
+ this.toolTipStatus = 3;
+ this.tooltip.nativeElement.dataset.tooltip = 'This task has failed';
+ } else if (this.task.succeeded && this.toolTipStatus !== 4) {
+ this.toolTipStatus = 4;
+ this.tooltip.nativeElement.dataset.tooltip = 'This task succeeded';
+ } else if (this.toolTipStatus !== 1) {
+ this.toolTipStatus = 1;
+ this.tooltip.nativeElement.dataset.tooltip = 'This task is waiting';
+ }
+ } else {
+ this.toolTipStatus = 1;
+ this.tooltip.nativeElement.dataset.tooltip = 'This task is waiting';
+ }
+ }, 500);
+ }
+
+ ngOnDestroy() {
+ // clearInterval(this.toolTipInterval);
+ }
deleteItem() {
this.processService.tasks = this.processService.tasks.filter(t => t !== this.task);
diff --git a/desktop-app/src/app/current-tasks/current-tasks.component.html b/desktop-app/src/app/current-tasks/current-tasks.component.html
index 0bb1290..b87dc59 100644
--- a/desktop-app/src/app/current-tasks/current-tasks.component.html
+++ b/desktop-app/src/app/current-tasks/current-tasks.component.html
@@ -1,20 +1,20 @@
Manage tasks for downloading, transferring and installing to your headset.