From de49e387d7571c250f9f3858583fad37b2f5351c Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Wed, 2 Feb 2022 22:07:46 -0500 Subject: [PATCH] Change URL for Overte Change URL for Overte --- README.md | 6 +- more/app-more.js | 239 ++++++++++---------- more/more.html | 551 ++++++++++++++++++++++++----------------------- web/index.html | 19 +- 4 files changed, 409 insertions(+), 406 deletions(-) diff --git a/README.md b/README.md index 67e0ede..9c71c67 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Community Apps Repository -Applications repository for Vircadia, pulled directly from GitHub. You can add or edit your app in the "More" application by opening a pull request to this repo. +Applications repository for Overte, pullable directly from GitHub. You can add or edit your app in the "More" application by opening a pull request to this repository. Direct link to run the "More..." application in the interface: -https://cdn.vircadia.com/community-apps/more/app-more.js +https://more.overte.org/more/app-more.js See all the details about adding your app here: -https://cdn.vircadia.com/community-apps/web/index.html +https://overte-org.github.io/community-apps/web/index.html ### Contributors diff --git a/more/app-more.js b/more/app-more.js index 1c31653..136360f 100644 --- a/more/app-more.js +++ b/more/app-more.js @@ -1,119 +1,120 @@ -"use strict"; - -// app-more.js -// VERSION 1.0 -// -// Created by Keb Helion, February 2020. -// Copyright 2020 Vircadia contributors. -// -// This script adds a "More Apps" selector to Vircadia to allow the user to add optional functionalities to the tablet. -// This application has been designed to work directly from the Github repository. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// -(function() { - var ROOT = Script.resolvePath('').split("app-more.js")[0]; - var DEV_PARAMETER = Script.resolvePath('').split("?")[1]; - var APP_NAME = "MORE..."; - var APP_URL = (ROOT + "more.html" + (DEV_PARAMETER === "dev" ? "?dev" : "")).replace(/%5C/g, "/"); - var APP_ICON_INACTIVE = ROOT + "appicon_i.png"; - var APP_ICON_ACTIVE = ROOT + "appicon_a.png"; - var appStatus = false; - var lastProcessing = { - "action": "", - "script": "" - }; - - var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); - tablet.screenChanged.connect(onScreenChanged); - var button = tablet.addButton({ - text: APP_NAME, - icon: APP_ICON_INACTIVE, - activeIcon: APP_ICON_ACTIVE - }); - - function clicked() { - if (appStatus) { - tablet.webEventReceived.disconnect(onMoreAppWebEventReceived); - tablet.gotoHomeScreen(); - appStatus = false; - } else { - tablet.gotoWebScreen(APP_URL); - tablet.webEventReceived.connect(onMoreAppWebEventReceived); - appStatus = true; - } - button.editProperties({ - isActive: appStatus - }); - } - - button.clicked.connect(clicked); - - function sendRunningScriptList() { - var currentlyRunningScripts = ScriptDiscoveryService.getRunning(); - var newMessage = "RSL4MOREAPP:"; - var runningScriptJson; - for (var j = 0; j < currentlyRunningScripts.length; j++) { - runningScriptJson = currentlyRunningScripts[j].url; - if (runningScriptJson.indexOf("https://cdn.vircadia.com/community-apps/applications") !== -1) { - newMessage += "_" + runningScriptJson; - } - } - tablet.emitScriptEvent(newMessage); - } - - function onMoreAppWebEventReceived(message) { - if (typeof message === "string") { - var instruction = JSON.parse(message); - - if (instruction.action === "installScript") { - if (lastProcessing.action !== instruction.action || lastProcessing.script !== instruction.script) { - ScriptDiscoveryService.loadScript(instruction.script, true, false, false, true, false); // Force reload the script, do not use cache. - lastProcessing.action = instruction.action; - lastProcessing.script = instruction.script; - Script.setTimeout(function() { - sendRunningScriptList(); - }, 1500); - } - } - - if (instruction.action === "uninstallScript") { - if (lastProcessing.action !== instruction.action || lastProcessing.script !== instruction.script) { - ScriptDiscoveryService.stopScript(instruction.script, false); - lastProcessing.action = instruction.action; - lastProcessing.script = instruction.script; - Script.setTimeout(function() { - sendRunningScriptList(); - }, 1500); - } - } - - if (instruction.action === "requestRunningScriptData") { - sendRunningScriptList(); - } - } - } - - function onScreenChanged(type, url) { - if (type === "Web" && url.indexOf(APP_URL) !== -1) { - appStatus = true; - } else { - appStatus = false; - } - button.editProperties({ - isActive: appStatus - }); - } - - function cleanup() { - if (appStatus) { - tablet.gotoHomeScreen(); - tablet.webEventReceived.disconnect(onMoreAppWebEventReceived); - } - tablet.screenChanged.disconnect(onScreenChanged); - tablet.removeButton(button); - } - - Script.scriptEnding.connect(cleanup); -}()); +"use strict"; + +// app-more.js +// VERSION 1.0 +// +// Created by Keb Helion, February 2020. +// Copyright 2020 Vircadia contributors. +// Copyright 2022 Overte e.V. +// +// This script adds a "More Apps" selector to Overte to allow the user to add optional functionalities to the tablet. +// This application has been designed to work directly from the Github repository. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// +(function() { + var ROOT = Script.resolvePath('').split("app-more.js")[0]; + var DEV_PARAMETER = Script.resolvePath('').split("?")[1]; + var APP_NAME = "MORE..."; + var APP_URL = (ROOT + "more.html" + (DEV_PARAMETER === "dev" ? "?dev" : "")).replace(/%5C/g, "/"); + var APP_ICON_INACTIVE = ROOT + "appicon_i.png"; + var APP_ICON_ACTIVE = ROOT + "appicon_a.png"; + var appStatus = false; + var lastProcessing = { + "action": "", + "script": "" + }; + + var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); + tablet.screenChanged.connect(onScreenChanged); + var button = tablet.addButton({ + text: APP_NAME, + icon: APP_ICON_INACTIVE, + activeIcon: APP_ICON_ACTIVE + }); + + function clicked() { + if (appStatus) { + tablet.webEventReceived.disconnect(onMoreAppWebEventReceived); + tablet.gotoHomeScreen(); + appStatus = false; + } else { + tablet.gotoWebScreen(APP_URL); + tablet.webEventReceived.connect(onMoreAppWebEventReceived); + appStatus = true; + } + button.editProperties({ + isActive: appStatus + }); + } + + button.clicked.connect(clicked); + + function sendRunningScriptList() { + var currentlyRunningScripts = ScriptDiscoveryService.getRunning(); + var newMessage = "RSL4MOREAPP:"; + var runningScriptJson; + for (var j = 0; j < currentlyRunningScripts.length; j++) { + runningScriptJson = currentlyRunningScripts[j].url; + if (runningScriptJson.indexOf("https://more.overte.org/applications") !== -1) { + newMessage += "_" + runningScriptJson; + } + } + tablet.emitScriptEvent(newMessage); + } + + function onMoreAppWebEventReceived(message) { + if (typeof message === "string") { + var instruction = JSON.parse(message); + + if (instruction.action === "installScript") { + if (lastProcessing.action !== instruction.action || lastProcessing.script !== instruction.script) { + ScriptDiscoveryService.loadScript(instruction.script, true, false, false, true, false); // Force reload the script, do not use cache. + lastProcessing.action = instruction.action; + lastProcessing.script = instruction.script; + Script.setTimeout(function() { + sendRunningScriptList(); + }, 1500); + } + } + + if (instruction.action === "uninstallScript") { + if (lastProcessing.action !== instruction.action || lastProcessing.script !== instruction.script) { + ScriptDiscoveryService.stopScript(instruction.script, false); + lastProcessing.action = instruction.action; + lastProcessing.script = instruction.script; + Script.setTimeout(function() { + sendRunningScriptList(); + }, 1500); + } + } + + if (instruction.action === "requestRunningScriptData") { + sendRunningScriptList(); + } + } + } + + function onScreenChanged(type, url) { + if (type === "Web" && url.indexOf(APP_URL) !== -1) { + appStatus = true; + } else { + appStatus = false; + } + button.editProperties({ + isActive: appStatus + }); + } + + function cleanup() { + if (appStatus) { + tablet.gotoHomeScreen(); + tablet.webEventReceived.disconnect(onMoreAppWebEventReceived); + } + tablet.screenChanged.disconnect(onScreenChanged); + tablet.removeButton(button); + } + + Script.scriptEnding.connect(cleanup); +}()); diff --git a/more/more.html b/more/more.html index e5e171d..0be950c 100644 --- a/more/more.html +++ b/more/more.html @@ -1,275 +1,276 @@ - - - - - - - - - - - - -
- Add more functionalities...
- - - - - -
- - - - - -
-
- -
- 		- -
- 		-
-
-
-
-
- -
-
-

Want to contribute and add your own app?
- Read the guide!

- - - + + + + + + + + + + + + +
+ Add more functionalities...
+ + + + + +
+ + + + + +
+
+ +
+ 		+ +
+ 		+
+
+
+
+
+ +
+
+

Want to contribute and add your own app?
+ Read the guide!

+ + + diff --git a/web/index.html b/web/index.html index e327168..5f92040 100644 --- a/web/index.html +++ b/web/index.html @@ -3,6 +3,7 @@ // // Created by Keb Helion, February 2020. // Copyright 2020 Vircadia contributors. +// Copyright 2022 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -16,13 +17,13 @@
-

Vircadia Community Applications Repository

+

Overte Community Applications Repository

This repository stores optional tablet applications provided by the contributions of community members. - If you have created an application for Vircadia and want to offer it to the community, this is where you can do it.

+ If you have created an application for Overte and want to offer it to the community, this is where you can do it.

Before going further:

    -
  1. If your application is a core feature that you think should be installed by default for all Vircadia users, you should instead consider making your contribution directly in the Vircadia code repository. See the Vircadia repository and contact the core team.

    2. -
  2. If your application is dependent on an external server or service (if it has to deal in any way with servers other than a Vircadia Domain or Metaverse API), then this repository is not where you should publish your application. It will have to be published to a different source, like the Marketplace (when it is created) or another web site.
    3. +
  3. If your application is a core feature that you think should be installed by default for all Overte users, you should instead consider making your contribution directly in the Overte code repository. See the Overte repository and contact the core team.

    4. +
  4. If your application is dependent on an external server or service (if it has to deal in any way with servers other than a Overte Domain or Metaverse API), then this repository is not where you should publish your application. It will have to be published to a different source, like the Marketplace (when it is created) or another web site.

Conditions for acceptance:

    @@ -32,21 +33,21 @@
  1. Avoid spaces and special characters in your folders and file names.
    (Stay with: "a-z", "A-Z", "0-9", "-", "_", ".")

    2. -
  2. Add your application in a folder under the "applications" directory.
    +
  3. Add your application in a folder under the "applications" directory.
    (Your main js file and your icon must be directly in that folder)

    4. -
  4. You must add your application to the "metadata.js" file (in the "applications" directory) by generating a new one using this tool: Metadata Generator
    5. +
  5. You must add your application to the "metadata.js" file (in the "applications" directory) by generating a new one using this tool: Metadata Generator

Submit a "Pull Request" to add your "application folder" and the new "metadata.js" file.
- (If you are not comfortable with these procedures, contact Keb Helion on Vircadia Discord.)

+ (If you are not comfortable with these procedures, contact the core members on Overte Discord.)


Guidelines for the code reviewer:

    -
  1. Test the applications in Vircadia.

    2. +
  2. Test the applications in Overte.

  3. Make sure that the JSON and Javascript contained in "metadata.js" are valid before accepting the pull request! This will affect the production "More" application immediately for all users.

    4. -
  4. Test the "More..." application in Vircadia.
    5. +
  5. Test the "More..." application in Overte.