diff --git a/app.js b/app.js index 790918c..63cd94b 100644 --- a/app.js +++ b/app.js @@ -73,7 +73,7 @@ app.use(function(err, req, res, next) { module.exports = app; -var debug = require('debug')('allcast-site'); +var debug = require('debug')('vysor-site'); app.set('port', process.env.PORT || 3000); diff --git a/public/app/friendly-names.js b/public/app/friendly-names.js new file mode 100644 index 0000000..95b5995 --- /dev/null +++ b/public/app/friendly-names.js @@ -0,0 +1 @@ +// Nothing to see here. Uglified. diff --git a/public/app/list.html b/public/app/list.html index 7559320..08b859a 100644 --- a/public/app/list.html +++ b/public/app/list.html @@ -5,18 +5,20 @@ Vysor - + - + - + + + + + + @@ -57,7 +59,7 @@ @@ -69,6 +71,28 @@ + +
Choose a device @@ -140,7 +164,7 @@

- Login to use your purchase offline. + Login for offline usage and Vysor Share.

Logging in... diff --git a/public/app/list.js b/public/app/list.js index d46e1c6..95b5995 100644 --- a/public/app/list.js +++ b/public/app/list.js @@ -1,82 +1 @@ -function selectDevices() { - chrome.usb.getUserSelectedDevices({ - multiple: true, - filters: [ - { - interfaceClass: 0xff, - interfaceSubclass: 0x42, - interfaceProtocol: 0x1, - } - ] - }, function(devices) { - $.each(devices, function(key, device) { - var vidpid = device.vendorId.toString(16) + ':' + device.productId.toString(16); - tracker.sendEvent('select-device', vidpid); - - adbServer.refreshDevice(device, function(adb) { - if (adb) { - tracker.sendEvent('connect-device', adb.properties['ro.product.name'], device.vendorId.toString(16) + ':' + device.productId.toString(16), vidpid); - } - else { - - var appName = chrome.runtime.getManifest().name; - chrome.notifications.create("reload", { - type: "basic", - iconUrl: "/icon.png", - title: appName, - message: "An error occurred while connecting to the Android device. Restarting the Vysor app, or disconnecting and reconnecting the Android may resolve this issue.", - buttons: [ - { - title: "Reload" - } - ] - }); - } - }); - }) - }); -} - -$(document).ready(function() { - $('#logging-in').hide(); - $('#login-container').hide(); - $('#connect-android').click(selectDevices); - $('#vysor-version').text('Vysor Version ' + chrome.runtime.getManifest().version) - $('#reload-vysor').click(function() { - chrome.runtime.reload(); - }) - - function checkUsage() { - chrome.storage.local.get(['vysorUsage'], function(d) { - var vysorUsage = d.vysorUsage; - if (!vysorUsage) - vysorUsage = 0; - var hoursUsed = vysorUsage / (60 * 60 * 1000); - // half hour - hoursUsed = Math.round(hoursUsed * 2) / 2; - console.log('hours used', hoursUsed); - $('#used').html("You've used Vysor for " + hoursUsed + " hours. Support Vysor. Go Pro.") - }); - - setTimeout(checkUsage, 60 * 60 * 1000) - } - - checkUsage(); -}); - -function goModal() { - $('#notificationModal').modal(); -} - -function hideModal() { - $('#notificationModal').modal('hide'); -} - -function showConnect() { - $('#connectModal').modal(); - -} - -function hideConnect() { - $('#connectModal').modal('hide'); -} +// Nothing to see here. Uglified. diff --git a/public/app/manifest.json b/public/app/manifest.json index ab089b3..d3c55fd 100644 --- a/public/app/manifest.json +++ b/public/app/manifest.json @@ -2,7 +2,7 @@ "name": "Vysor", "short_name": "Vysor", "description": "A window to your Android", - "version": "1.1.2.4", + "version": "1.1.3.1", "minimum_chrome_version": "48", "sockets": { "tcp": { @@ -73,6 +73,7 @@ "client_id": "64148182473-mmrruv55po0sjb7ghlnmhgkkuk2u8eou.apps.googleusercontent.com", "scopes": [ "https://www.googleapis.com/auth/userinfo.profile", + "https://www.googleapis.com/auth/userinfo.email", "https://www.googleapis.com/auth/chromewebstore.readonly" ] }, diff --git a/public/app/purchase.html b/public/app/purchase.html index 60038d6..e9c8f86 100644 --- a/public/app/purchase.html +++ b/public/app/purchase.html @@ -9,6 +9,7 @@ +