mirror of
https://github.com/lubosz/overte.git
synced 2025-04-24 03:53:52 +02:00
Merge pull request #9540 from fayeli/new-users-js
Rework Users.js for Tablet
This commit is contained in:
Seth Alves
GitHub
commit
ec67cabaf5
2 changed files with 279 additions and 1251 deletions
241
scripts/system/html/users.html
Normal file
241
scripts/system/html/users.html
Normal file
|
|
@ -0,0 +1,241 @@
|
|||
<!--
|
||||
// users.html
|
||||
//
|
||||
// Created by Faye Li on 18 Jan 2017
|
||||
// Copyright 2017 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
-->
|
||||
<html>
|
||||
<head>
|
||||
<title>Users Online</title>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link href="https://fonts.googleapis.com/css?family=Raleway:300,400,600,700"" rel="stylesheet">
|
||||
<style>
|
||||
body {
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
font-family: 'Raleway', sans-serif;
|
||||
color: white;
|
||||
background: linear-gradient(#2b2b2b, #0f212e);
|
||||
}
|
||||
|
||||
.top-bar {
|
||||
width: 100%;
|
||||
height: 90px;
|
||||
background: linear-gradient(#2b2b2b, #1e1e1e);
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.top-bar .container {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-left: 30px;
|
||||
margin-right: 30px;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
#refresh-button {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
}
|
||||
|
||||
.main {
|
||||
padding: 30px;
|
||||
}
|
||||
|
||||
.tabs {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.tabs li {
|
||||
display: inline-block;
|
||||
padding: 10px 15px;
|
||||
}
|
||||
|
||||
.tabs li.current {
|
||||
background: rgba(255,255,255,0.15);
|
||||
}
|
||||
|
||||
.tab-content {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.tab-content.current {
|
||||
display: inherit;
|
||||
background: rgba(255,255,255,0.15);
|
||||
}
|
||||
|
||||
.tab-content ul {
|
||||
list-style: none;
|
||||
padding: 15px 0px 15px 15px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.tab-content ul li {
|
||||
padding: 2px 0px;
|
||||
}
|
||||
|
||||
input[type=button] {
|
||||
font-family: 'Raleway';
|
||||
font-weight: bold;
|
||||
font-size: 13px;
|
||||
text-transform: uppercase;
|
||||
vertical-align: top;
|
||||
height: 28px;
|
||||
min-width: 120px;
|
||||
padding: 0px 18px;
|
||||
margin-right: 6px;
|
||||
border-radius: 5px;
|
||||
border: none;
|
||||
color: #fff;
|
||||
background-color: #000;
|
||||
background: linear-gradient(#343434 20%, #000 100%);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
input[type=button].blue {
|
||||
color: #fff;
|
||||
background-color: #1080b8;
|
||||
background: linear-gradient(#00b4ef 20%, #1080b8 100%);
|
||||
}
|
||||
|
||||
input[type=button].blue:hover {
|
||||
background: linear-gradient(#00b4ef, #00b4ef);
|
||||
border: none;
|
||||
}
|
||||
|
||||
input[type=button].blue:active {
|
||||
background: linear-gradient(#1080b8, #1080b8);
|
||||
}
|
||||
|
||||
#friends-button {
|
||||
margin: 0px 0px 15px 10px;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="top-bar">
|
||||
<div class="container">
|
||||
<div>Users Online</div>
|
||||
<img id="refresh-button" onclick="pollUsers()" src="https://hifi-content.s3.amazonaws.com/faye/tablet-dev/refresh-icon.svg"></img>
|
||||
</div>
|
||||
</div>
|
||||
<div class="main">
|
||||
<ul class="tabs">
|
||||
<li tab-id="tab-1" class="current">Everyone (0)</li>
|
||||
<li tab-id="tab-2">Friends (0)</li>
|
||||
</ul>
|
||||
<div id="tab-1" class="tab-content current">
|
||||
<ul></ul>
|
||||
</div>
|
||||
<div id="tab-2" class="tab-content">
|
||||
<ul></ul>
|
||||
<input type="button" class="blue" id="friends-button" value="Add/Remove Friends">
|
||||
</div>
|
||||
</div>
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
|
||||
<script>
|
||||
var METAVERSE_API_URL = "https://metaverse.highfidelity.com/api/v1/users?status=online";
|
||||
var FRIENDS_FILTER = "&filter=friends";
|
||||
var myUsername = null;
|
||||
|
||||
function displayUsers(data, element) {
|
||||
element.empty();
|
||||
for (var i = 0; i < data.users.length; i++) {
|
||||
// Don't display users who aren't in a domain
|
||||
if (typeof data.users[i].location.root.name === "undefined") {
|
||||
console.log(data.users[i].username + "is online but not in a domain");
|
||||
$("#dev-div").append("<p>" + data.users[i].username + "is online but not in a domain</p>");
|
||||
} else {
|
||||
$("#dev-div").append("<li>" + data.users[i].username + " @ " + data.users[i].location.root.name + "</li>");
|
||||
// Don't display yourself
|
||||
if (data.users[i].username !== myUsername) {
|
||||
console.log(data.users[i].username + " @ " + data.users[i].location.root.name);
|
||||
element.append("<li>" + data.users[i].username + " @ " + data.users[i].location.root.name + "</li>");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function processData(data, type) {
|
||||
var num = data.users.length;
|
||||
if (type === "everyone") {
|
||||
$(".tabs li:nth-child(1)").text("Everyone (" + num + ")");
|
||||
displayUsers(data, $("#tab-1 ul"));
|
||||
} else if (type === "friends") {
|
||||
$(".tabs li:nth-child(2)").text("Friends (" + num + ")");
|
||||
displayUsers(data, $("#tab-2 ul"));
|
||||
}
|
||||
}
|
||||
|
||||
function pollUsers() {
|
||||
$("#dev-div").append("<p>polling users..</p>");
|
||||
$.ajax({
|
||||
url: METAVERSE_API_URL,
|
||||
success: function(response) {
|
||||
console.log(response);
|
||||
$("#dev-div").append("<p>polling everyone sucess</p>");
|
||||
processData(response.data, "everyone");
|
||||
}
|
||||
});
|
||||
$.ajax({
|
||||
url: METAVERSE_API_URL + FRIENDS_FILTER,
|
||||
success: function(response) {
|
||||
console.log(response);
|
||||
$("#dev-div").append("<p>polling friends sucess</p>");
|
||||
processData(response.data, "friends");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function onScriptEventReceived(event) {
|
||||
$("#dev-div").append("<p>Received a script event, its type is " + typeof event + "</p>");
|
||||
if (typeof event === "string") {
|
||||
// Parse the string into an object
|
||||
event = JSON.parse(event);
|
||||
}
|
||||
if (event.type === "sendUsername") {
|
||||
myUsername = event.data.username;
|
||||
$("#dev-div").append("<p>myUsername is " + myUsername + "</p>");
|
||||
consoloe.log("myUsername is " + myUsername);
|
||||
}
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
$("#dev-div").append("<p>ready</p>");
|
||||
// Auto-load user lists when page loads
|
||||
pollUsers();
|
||||
|
||||
// Click listener for tabs
|
||||
$(".tabs li").click(function() {
|
||||
var tabID = $(this).attr("tab-id");
|
||||
$(".tab-content").removeClass("current");
|
||||
$("#" + tabID).addClass("current");
|
||||
$(".tabs li").removeClass("current");
|
||||
$(this).addClass("current");
|
||||
});
|
||||
|
||||
// Listen for events from hifi
|
||||
EventBridge.scriptEventReceived.connect(onScriptEventReceived);
|
||||
|
||||
// Send a ready event to hifi
|
||||
var eventObject = {"type": "ready"};
|
||||
EventBridge.emitWebEvent(JSON.stringify(eventObject));
|
||||
|
||||
// Click listener mangage friends button
|
||||
$("#friends-button").click(function() {
|
||||
// Send a manage friends event to hifi
|
||||
eventObject = {"type": "manage-friends"};
|
||||
EventBridge.emitWebEvent(JSON.stringify(eventObject));
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue