Address CR comments.

This commit is contained in:
Kasen IO 2020-07-20 13:57:28 -04:00
parent 770dd83efc
commit 087ede2f91
7 changed files with 57 additions and 61 deletions

View file

@ -11,20 +11,20 @@
--> -->
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title> <title><%= htmlWebpackPlugin.options.title %></title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
</head> </head>
<body> <body>
<noscript> <noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
</html> </html>

View file

@ -267,11 +267,9 @@ Tablet Vec3 Window */
} }
function onOpened() { function onOpened() {
console.log("hello world!");
} }
function onClosed() { function onClosed() {
console.log("hello world!");
} }
function startup() { function startup() {

View file

@ -703,27 +703,25 @@ if (!browserDevelopment()) {
receivedCommand = JSON.parse(receivedCommand); receivedCommand = JSON.parse(receivedCommand);
// alert("RECEIVED COMMAND:" + receivedCommand.command) // alert("RECEIVED COMMAND:" + receivedCommand.command)
if (receivedCommand.app === "inventory") { if (receivedCommand.app === "inventory") {
// We route the data based on the command given. // We route the data based on the command given.
if (receivedCommand.command === 'script-to-web-inventory') { switch (receivedCommand.command) {
// alert("INVENTORY RECEIVED ON APP:" + JSON.stringify(receivedCommand.data)); case 'script-to-web-inventory':
vue_this.receiveInventory(receivedCommand.data); // alert("INVENTORY RECEIVED ON APP:" + JSON.stringify(receivedCommand.data));
vue_this.receiveInventory(receivedCommand.data);
break;
case 'script-to-web-receiving-item-queue':
// alert("RECEIVING ITEM QUEUE:" + JSON.stringify(receivedCommand.data));
vue_this.receiveReceivingItemQueue(receivedCommand.data);
break;
case 'script-to-web-nearby-users':
// alert("RECEIVING NEARBY USERS:" + JSON.stringify(receivedCommand.data));
vue_this.receiveNearbyUsers(receivedCommand.data);
break;
case 'script-to-web-settings':
// alert("RECEIVING SETTINGS:" + JSON.stringify(receivedCommand.data));
vue_this.receiveSettings(receivedCommand.data);
break;
} }
if (receivedCommand.command === 'script-to-web-receiving-item-queue') {
// alert("RECEIVING ITEM QUEUE:" + JSON.stringify(receivedCommand.data));
vue_this.receiveReceivingItemQueue(receivedCommand.data);
}
if (receivedCommand.command === 'script-to-web-nearby-users') {
// alert("RECEIVING NEARBY USERS:" + JSON.stringify(receivedCommand.data));
vue_this.receiveNearbyUsers(receivedCommand.data);
}
if (receivedCommand.command === 'script-to-web-settings') {
// alert("RECEIVING SETTINGS:" + JSON.stringify(receivedCommand.data));
vue_this.receiveSettings(receivedCommand.data);
}
} }
}); });
@ -1156,7 +1154,7 @@ export default {
"returnedItem": foundItem.returnedItem, "returnedItem": foundItem.returnedItem,
"iteration": foundItem.iteration, "iteration": foundItem.iteration,
"parentArray": foundItem.parentArray, "parentArray": foundItem.parentArray,
"itemUUID": uuid, "itemUUID": uuid
} }
} }
}, },
@ -1166,7 +1164,7 @@ export default {
var foundItem = { var foundItem = {
"returnedItem": indexToSearch[i], "returnedItem": indexToSearch[i],
"iteration": i, "iteration": i,
"parentArray": indexToSearch, "parentArray": indexToSearch
} }
return foundItem; return foundItem;
} else if (Object.prototype.hasOwnProperty.call(indexToSearch[i], "items") && indexToSearch[i].items.length > 0) { } else if (Object.prototype.hasOwnProperty.call(indexToSearch[i], "items") && indexToSearch[i].items.length > 0) {
@ -1187,7 +1185,7 @@ export default {
// console.info("AvoidFolder", avoidFolder, "indexToSearch[i].uuid", indexToSearch[i].uuid); // console.info("AvoidFolder", avoidFolder, "indexToSearch[i].uuid", indexToSearch[i].uuid);
this.recursiveFolderHoldingList.push({ this.recursiveFolderHoldingList.push({
"name": indexToSearch[i].name, "name": indexToSearch[i].name,
"uuid": indexToSearch[i].uuid, "uuid": indexToSearch[i].uuid
}); });
this.recursiveFolderPopulate(indexToSearch[i].items, avoidFolder); this.recursiveFolderPopulate(indexToSearch[i].items, avoidFolder);
@ -1269,7 +1267,7 @@ export default {
property: 'items', property: 'items',
with: value with: value
}); });
}, }
}, },
addDialogStore: { addDialogStore: {
get() { get() {
@ -1280,7 +1278,7 @@ export default {
property: 'addDialog', property: 'addDialog',
with: value with: value
}); });
}, }
}, },
editDialogStore: { editDialogStore: {
get() { get() {
@ -1291,7 +1289,7 @@ export default {
property: 'editDialog', property: 'editDialog',
with: value with: value
}); });
}, }
}, },
editDialogShow: function() { editDialogShow: function() {
return this.$store.state.editDialog.show; return this.$store.state.editDialog.show;
@ -1305,7 +1303,7 @@ export default {
property: 'editFolderDialog', property: 'editFolderDialog',
with: value with: value
}); });
}, }
}, },
editFolderDialogShow: function() { editFolderDialogShow: function() {
return this.$store.state.editFolderDialog.show; return this.$store.state.editFolderDialog.show;
@ -1313,13 +1311,13 @@ export default {
createFolderDialogStore: { createFolderDialogStore: {
get() { get() {
return this.$store.state.createFolderDialog; return this.$store.state.createFolderDialog;
}, }
set(value) { set(value) {
this.$store.commit('mutate', { this.$store.commit('mutate', {
property: 'createFolderDialog', property: 'createFolderDialog',
with: value with: value
}); });
}, }
}, },
receiveDialogStore: { receiveDialogStore: {
get() { get() {
@ -1330,7 +1328,7 @@ export default {
property: 'receiveDialog', property: 'receiveDialog',
with: value with: value
}); });
}, }
}, },
shareDialogShow: function() { shareDialogShow: function() {
return this.$store.state.shareDialog.show; return this.$store.state.shareDialog.show;
@ -1344,7 +1342,7 @@ export default {
property: 'shareDialog', property: 'shareDialog',
with: value with: value
}); });
}, }
}, },
removeFolderDialogStore: { removeFolderDialogStore: {
get() { get() {
@ -1355,7 +1353,7 @@ export default {
property: 'removeFolderDialog', property: 'removeFolderDialog',
with: value with: value
}); });
}, }
}, },
removeDialogStore: { removeDialogStore: {
get() { get() {
@ -1366,7 +1364,7 @@ export default {
property: 'removeDialog', property: 'removeDialog',
with: value with: value
}); });
}, }
}, },
receivingItemQueue: { receivingItemQueue: {
get() { get() {

View file

@ -75,4 +75,4 @@
background-color: rgba(0, 0, 0, 0.3); background-color: rgba(0, 0, 0, 0.3);
} }
.inventoryApp::-webkit-scrollbar { width: 0 !important } .inventoryApp::-webkit-scrollbar { width: 0 !important }

View file

@ -241,7 +241,7 @@ export default {
property: 'editDialog', property: 'editDialog',
with: value with: value
}); });
}, }
}, },
editFolderDialogStore: { editFolderDialogStore: {
get() { get() {
@ -252,7 +252,7 @@ export default {
property: 'editFolderDialog', property: 'editFolderDialog',
with: value with: value
}); });
}, }
}, },
shareDialogStore: { shareDialogStore: {
get() { get() {
@ -263,7 +263,7 @@ export default {
property: 'shareDialog', property: 'shareDialog',
with: value with: value
}); });
}, }
}, },
removeFolderDialogStore: { removeFolderDialogStore: {
get() { get() {
@ -274,7 +274,7 @@ export default {
property: 'removeFolderDialog', property: 'removeFolderDialog',
with: value with: value
}); });
}, }
}, },
removeDialogStore: { removeDialogStore: {
get() { get() {
@ -285,7 +285,7 @@ export default {
property: 'removeDialog', property: 'removeDialog',
with: value with: value
}); });
}, }
} }
}, },
watch: { watch: {

View file

@ -16,7 +16,7 @@ import { store } from './plugins/store';
Vue.config.productionTip = false; Vue.config.productionTip = false;
window.vm = new Vue({ window.vm = new Vue({
vuetify, vuetify,
store, store,
render: h => h(App) render: h => h(App)
}).$mount('#app'); }).$mount('#app');

View file

@ -14,4 +14,4 @@ module.exports = {
"transpileDependencies": [ "transpileDependencies": [
"vuetify" "vuetify"
] ]
} }