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.
-
+
Clear Done
-
+
Retry Failed
-
+
Clear Failed
-
+
Clear All
diff --git a/desktop-app/src/app/files/files.component.html b/desktop-app/src/app/files/files.component.html index 70336fc..5e7a99e 100644 --- a/desktop-app/src/app/files/files.component.html +++ b/desktop-app/src/app/files/files.component.html @@ -26,7 +26,7 @@ + mTooltip="{{favourite.name}}">
@@ -56,27 +56,27 @@

- + add
    -
  • favorite
  • -
  • file_upload
  • -
  • create_new_folder
  • -
  • open_in_new
  • -
  • get_app
  • -
  • delete
  • -
  • get_app
  • diff --git a/desktop-app/src/app/header-banner/header-banner.component.html b/desktop-app/src/app/header-banner/header-banner.component.html index 087571d..35663a9 100644 --- a/desktop-app/src/app/header-banner/header-banner.component.html +++ b/desktop-app/src/app/header-banner/header-banner.component.html @@ -4,8 +4,8 @@
    SideQuest inside your VR headset
    Discover, Download & Play thousands of FREE VR apps and games with SideQuest's VR App
    - - + + diff --git a/desktop-app/src/app/header/header.component.html b/desktop-app/src/app/header/header.component.html index 412d9ec..1f640f3 100644 --- a/desktop-app/src/app/header/header.component.html +++ b/desktop-app/src/app/header/header.component.html @@ -55,81 +55,81 @@ - + arrow_back - + public -
    - +
    + arrow_forward - + live_tv - + [ngClass]="{'green-text':adbService.wifiEnabled,'white-text':!adbService.wifiEnabled}" data-position="bottom" + mTooltip data-tooltip="Enable wireless mode. (Experimental)"> wifi - + archive - + folder - + apps - + playlist_add_check - {{processService.left_length>100?'99+':processService.left_length}} - {{processService.failed_length>100?'99+':processService.failed_length}} - + build - + contact_support - + data-position="bottom" mTooltip data-tooltip="Run ADB commands"> input
    - + data-position="bottom" mTooltip data-tooltip="Select Device"> arrow_drop_down
    -
    +
    diff --git a/desktop-app/src/app/headset-settings/headset-settings.component.spec.ts b/desktop-app/src/app/headset-settings/headset-settings.component.spec.ts index a6e68c6..5557c40 100644 --- a/desktop-app/src/app/headset-settings/headset-settings.component.spec.ts +++ b/desktop-app/src/app/headset-settings/headset-settings.component.spec.ts @@ -1,19 +1,19 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { ToolsComponent } from './tools.component'; +import { HeadsetSettingsComponent } from './headset-settings.component'; -describe('ToolsComponent', () => { - let component: ToolsComponent; - let fixture: ComponentFixture; +describe('HeadsetSettingsComponent', () => { + let component: HeadsetSettingsComponent; + let fixture: ComponentFixture; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ToolsComponent], + declarations: [HeadsetSettingsComponent], }).compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(ToolsComponent); + fixture = TestBed.createComponent(HeadsetSettingsComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/desktop-app/src/app/mz-components/LICENSE b/desktop-app/src/app/mz-components/LICENSE new file mode 100644 index 0000000..0e51449 --- /dev/null +++ b/desktop-app/src/app/mz-components/LICENSE @@ -0,0 +1,190 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2017 SherWeb + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/desktop-app/src/app/mz-components/README.md b/desktop-app/src/app/mz-components/README.md new file mode 100644 index 0000000..3baacc7 --- /dev/null +++ b/desktop-app/src/app/mz-components/README.md @@ -0,0 +1,8 @@ +This code in this directory is a modified version of this code as +that version of the code was not working properly in later versions +of Angular. Rather than rewrite all the mzmodel's we use in the app, it was +easier to just fix this component to use the newer Material api. + +https://github.com/sherweb/ngx-materialize/tree/master/lib/src/modal + +The library is licensed under the Apache 2.0 library. diff --git a/desktop-app/src/app/packages/packages.component.html b/desktop-app/src/app/packages/packages.component.html index f2b2b33..51f1942 100644 --- a/desktop-app/src/app/packages/packages.component.html +++ b/desktop-app/src/app/packages/packages.component.html @@ -13,16 +13,16 @@
    Manage settings on your headset.
    -
    +
    Cloud Backup
    -
    +
    Backup/Restore All
    -
    +
    Change Backup Location
    diff --git a/desktop-app/src/app/setup-guide/setup-guide.component.html b/desktop-app/src/app/setup-guide/setup-guide.component.html index bb1f6cb..53c922b 100644 --- a/desktop-app/src/app/setup-guide/setup-guide.component.html +++ b/desktop-app/src/app/setup-guide/setup-guide.component.html @@ -16,8 +16,8 @@

    If you are still having trouble then please visit our support community on SideQuest.

    Open Support Community

    -

    If instructed to upload logs by a SideQuest support person, please click this button.

    -
    {{'Upload Logs'}}
    +

    If instructed to upload logs by a SideQuest support person, please click this button.

    +
    {{'Upload Logs'}}
    Copy and paste this link into your support request:

    {{link}}

    diff --git a/desktop-app/src/main.ts b/desktop-app/src/main.ts index 28bfa9e..38f8358 100644 --- a/desktop-app/src/main.ts +++ b/desktop-app/src/main.ts @@ -1,3 +1,5 @@ +/// + import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; diff --git a/desktop-app/src/tsconfig.app.json b/desktop-app/src/tsconfig.app.json index 01e653a..a142e30 100644 --- a/desktop-app/src/tsconfig.app.json +++ b/desktop-app/src/tsconfig.app.json @@ -2,7 +2,9 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/app", - "types": [ ] + "types": [ + "@angular/localize" + ] }, "files": [ "main.ts", diff --git a/desktop-app/src/tsconfig.spec.json b/desktop-app/src/tsconfig.spec.json index de77336..bceb363 100644 --- a/desktop-app/src/tsconfig.spec.json +++ b/desktop-app/src/tsconfig.spec.json @@ -4,7 +4,8 @@ "outDir": "../out-tsc/spec", "types": [ "jasmine", - "node" + "node", + "@angular/localize" ] }, "files": [