-- Leo's gemini proxy

-- Connecting to git.thebackupbox.net:1965...

-- Connected

-- Sending request

-- Meta line: 20 text/gemini

repo: janusweb
action: commit
revision:
path_from:
revision_from: 43f32367d41d28f4664c049f1649486293ca414e:
path_to:
revision_to:

git.thebackupbox.net

janusweb

git://git.thebackupbox.net/janusweb

commit 43f32367d41d28f4664c049f1649486293ca414e
Author: James Baicoianu <james_github@baicoianu.com>
Date:   Wed May 9 12:36:22 2018 -0700

    Improved 3D object inventory

diff --git a/media/assets/webui/apps/inventory/inventory.css b/media/assets/webui/apps/inventory/inventory.css

index 72a4b60fdb67386171202b7d2d61ad2fa9e04ade..

index ..b09ff2fbfe2b3e4a8a9393731056e793b8ae143c 100644

--- a/media/assets/webui/apps/inventory/inventory.css
+++ b/media/assets/webui/apps/inventory/inventory.css
@@ -1,8 +1,9 @@
 ui-grid.models {
-  width: 30em;
+  height: 30em;
+  grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
+  grid-template-rows: repeat(auto-fill, minmax(80px, 1fr));
 }
 ui-grid.models>ui-item {
-  width: calc(20% - 2px);
   height: auto;
   padding: 0;
   position: relative;
@@ -10,6 +11,7 @@ ui-grid.models>ui-item {
   border-radius: 10px;
   box-shadow: 0 0 5px rgba(0,0,0,.5);
   margin: 0;
+  display: flex;
 }
 ui-grid.models>ui-item h2 {
   font-size: .8em;
@@ -42,9 +44,9 @@ ui-grid.models>ui-item img {
   display: block;
 }
 ui-grid.models>ui-item a {
-  display: block;
   margin: 0;
   padding: 0;
+  flex: 1 1;
 }
 ui-grid.models>ui-item p {
   display: none;
diff --git a/media/assets/webui/apps/inventory/inventory.html b/media/assets/webui/apps/inventory/inventory.html

index 1e4d96edd43c810980e0ebb2a4f36627b54ed779..

index ..71f4d8891a04e34f583fdebfc3e96061dade90e8 100644

--- a/media/assets/webui/apps/inventory/inventory.html
+++ b/media/assets/webui/apps/inventory/inventory.html
@@ -12,18 +12,40 @@
     </collection-jsonapi>

     <ui-tabs>
-      <ui-tab label="Models">
+      <ui-tab label="Primitives">
+        <ui-grid class="models">
+          <ui-item><a href="janus-object:cube" draggable>cube</a></ui-item>
+          <ui-item><a href="janus-object:sphere" draggable>sphere</a></ui-item>
+          <ui-item><a href="janus-object:cone" draggable>cone</a></ui-item>
+          <ui-item><a href="janus-object:cylinder" draggable>cylinder</a></ui-item>
+          <ui-item><a href="janus-object:pyramid" draggable>pyramid</a></ui-item>
+          <ui-item><a href="janus-object:torus" draggable>torus</a></ui-item>
+          <ui-item><a href="janus-object:capsule" draggable>capsule</a></ui-item>
+          <ui-item><a href="janus-object:pipe" draggable>pipe</a></ui-item>
+          <ui-item><a href="janus-object:plane" draggable>plane</a></ui-item>
+
+          <ui-item><a href="janus-light:point" draggable>point light</a></ui-item>
+        </ui-grid>
+      </ui-tab>
+      <ui-tab label="Google Poly">
         <ui-flexpanel id="poly" vertical>
-          <ui-input noflex value="sword" onkeypress="if (event.keyCode == 13) { models.apiargs.keywords = this.value; delete models.apiargs.pageToken; itemlist.clear(); models.load(); pagination.disabled = false; }"></ui-input>
+          <ui-input noflex value="sword" onkeypress="if (event.keyCode == 13) { let models = document.getElementById('models'); models.apiargs.keywords = this.value; delete models.apiargs.pageToken; document.getElementById('itemlist').clear(); models.load(); pagination.disabled = false; }"></ui-input>
           <ui-grid scrollable-y flex="1" class="models" id="itemlist" itemtemplate="janus.ui.inventory.item.poly" collection="models"></ui-grid>
-          <ui-button noflex id="pagination" onclick="if (models.rawdata.nextPageToken) { models.apiargs.pageToken = models.rawdata.nextPageToken; models.append(); } else { this.disabled = true; }">Next Page</ui-button>
+          <ui-button noflex id="pagination" onclick="let models = document.getElementById('models'); if (models.rawdata.nextPageToken) { models.apiargs.pageToken = models.rawdata.nextPageToken; models.append(); } else { this.disabled = true; }">Load More</ui-button>
         </ui-flexpanel>
       </ui-tab>

-      <ui-tab label="Entities">
-        <ui-flexpanel id="poly" vertical>
-<a href="#" ondragstart="console.log('poops'); event.dataTransfer.setData('text/x-jml', '<Door>');">ding</a>
+      <ui-tab label="Vesta">
+        <ui-flexpanel id="vesta" vertical>
+          <h3>Vesta integration coming soon!</h3>
+          When it's ready, you'll be able to access assets you've stored on your Vesta account, and bring them with you anywhere you go.
+          <a href="https://vesta.janusvr.com/">Sign up for a vesta account today</a>
         </ui-flexpanel>
       </ui-tab>
+      <ui-tab label="Import">
+        <h3>Did you know?</h3>
+        <p>You can drag 3d models, images, videos, and sounds into Janus rooms from other websites, or even your local hard drive!</p>
+        <p>Just select the files, drag them over, and drop them into the world.  Then use our in-world editing tools to place it where you want it to be.</p>
+      </ui-tab>
     </ui-tabs>

diff --git a/media/assets/webui/apps/inventory/inventory.json b/media/assets/webui/apps/inventory/inventory.json

index 651346bcc3dfea6fba8535ba2ec447904a2f41a1..

index ..99d9519a0a6e588bb3fa5203f89a5d1dac5e4f1b 100644

--- a/media/assets/webui/apps/inventory/inventory.json
+++ b/media/assets/webui/apps/inventory/inventory.json
@@ -4,5 +4,8 @@
     "janus.ui.inventory.item.poly": "./inventory-item-poly.html"
   },
   "scripts":  ["./inventory.js"],
-  "css":      ["./inventory.css"]
+  "css":      ["./inventory.css"],
+  "components": [
+    "janus-ui-inventory"
+  ]
 }

-----END OF PAGE-----

-- Response ended

-- Page fetched on Sun Jun 2 15:20:49 2024