Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-30 05:31:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #26 from overte-org/feature/mv_server_url_update

Browse source 
Update metaverse server URL
This commit is contained in:
ksuprynowicz 2022-02-22 17:17:18 +01:00 committed by GitHub
commit bea15ee5d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/apps/interface/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java
View file

@ -9,7 +9,7 @@ import java.net.URISyntaxException;
public class HifiUtils { public class HifiUtils {
public static final String METAVERSE_BASE_URL = "https://overte.org/mvs"; public static final String METAVERSE_BASE_URL = "https://mv.overte.org/server";
private static HifiUtils instance; private static HifiUtils instance;

4
android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
View file

@ -41,7 +41,7 @@ public class LoginFragment extends Fragment
private final String OAUTH_CLIENT_ID = BuildConfig.OAUTH_CLIENT_ID; private final String OAUTH_CLIENT_ID = BuildConfig.OAUTH_CLIENT_ID;
private final String OAUTH_REDIRECT_URI = BuildConfig.OAUTH_REDIRECT_URI; private final String OAUTH_REDIRECT_URI = BuildConfig.OAUTH_REDIRECT_URI;
private final String OAUTH_AUTHORIZE_BASE_URL = "https://overte.org/mvs/oauth/authorize"; private final String OAUTH_AUTHORIZE_BASE_URL = "https://mv.overte.org/server/oauth/authorize";
private static final int OAUTH_AUTHORIZE_REQUEST = 1; private static final int OAUTH_AUTHORIZE_REQUEST = 1;
private EditText mUsername; private EditText mUsername;
@ -222,7 +222,7 @@ public class LoginFragment extends Fragment
} }
private void onForgotPasswordClicked() { private void onForgotPasswordClicked() {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://overte.org/mvs/users/password/new")); Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://mv.overte.org/server/users/password/new"));
startActivity(intent); startActivity(intent);
} }

2
android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java
View file

@ -22,7 +22,7 @@ import retrofit2.http.Query;
public class UserStoryDomainProvider implements DomainProvider { public class UserStoryDomainProvider implements DomainProvider {
public static final String BASE_URL = "https://overte.org/mvs/"; public static final String BASE_URL = "https://mv.overte.org/server/";
private static final String INCLUDE_ACTIONS_FOR_PLACES = "concurrency"; private static final String INCLUDE_ACTIONS_FOR_PLACES = "concurrency";
private static final String INCLUDE_ACTIONS_FOR_FULL_SEARCH = "concurrency,announcements,snapshot"; private static final String INCLUDE_ACTIONS_FOR_FULL_SEARCH = "concurrency,announcements,snapshot";

2
android/apps/interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java
View file

@ -16,7 +16,7 @@ import io.highfidelity.hifiinterface.HifiUtils;
*/ */
public class DownloadProfileImageTask extends AsyncTask<String, Void, String> { public class DownloadProfileImageTask extends AsyncTask<String, Void, String> {
// Note: This should now be available in the API, correct? // Note: This should now be available in the API, correct?
private static final String BASE_PROFILE_URL = "https://overte.org/mvs"; private static final String BASE_PROFILE_URL = "https://mv.overte.org/server";
private static final String TAG = "Interface"; private static final String TAG = "Interface";
private final DownloadProfileImageResultProcessor mResultProcessor; private final DownloadProfileImageResultProcessor mResultProcessor;

2
domain-server/resources/describe-settings.json
View file

@ -1981,7 +1981,7 @@
"name": "provider", "name": "provider",
"label": "Provider", "label": "Provider",
"help": "OAuth provider URL.", "help": "OAuth provider URL.",
"default": "https://overte.org/mvs", "default": "https://mv.overte.org/server",
"advanced": true, "advanced": true,
"backup": false "backup": false
}, },

2
domain-server/resources/web/js/shared.js
View file

@ -51,7 +51,7 @@ $.extend(Settings, {
var URLs = { var URLs = {
// STABLE METAVERSE_URL: https://metaverse.highfidelity.com // STABLE METAVERSE_URL: https://metaverse.highfidelity.com
// STAGING METAVERSE_URL: https://staging.highfidelity.com // STAGING METAVERSE_URL: https://staging.highfidelity.com
DEFAULT_METAVERSE_URL: "https://overte.org/mvs", DEFAULT_METAVERSE_URL: "https://mv.overte.org/server",
CDN_URL: 'https://cdn-1.vircadia.com/eu-c-1', CDN_URL: 'https://cdn-1.vircadia.com/eu-c-1',
PLACE_URL: 'https://xr.place' PLACE_URL: 'https://xr.place'
}; };

1
domain-server/resources/web/web-new/dist/spa/css/472.1b315250.css vendored
View file

@ -1 +0,0 @@
#firstTimeWizardContainer[data-v-4c988532]{animation:firstTimeWizardContainerFadeIn-4c988532 5s;-webkit-animation:firstTimeWizardContainerFadeIn-4c988532 5s;-moz-animation:firstTimeWizardContainerFadeIn-4c988532 5s;-o-animation:firstTimeWizardContainerFadeIn-4c988532 5s;-ms-animation:firstTimeWizardContainerFadeIn-4c988532 5s;background-color:#000000bf}@keyframes firstTimeWizardContainerFadeIn-4c988532{0%{background-color:#0000}to{background-color:#000000bf}}.welcome[data-v-4c988532]{color:#fff}.wizardCard[data-v-4c988532]{color:#fff}.mainWizardStepper[data-v-4c988532],.wizardCard[data-v-4c988532]{background:none!important;box-shadow:none!important}[data-v-4c988532] .q-stepper__header{display:none!important}[data-v-4c988532] .q-panel{overflow:hidden!important}.q-dialog__inner div[data-v-4c988532]{border:none!important;box-shadow:none!important}

1
domain-server/resources/web/web-new/dist/spa/css/660.91830e49.css vendored Normal file
View file

@ -0,0 +1 @@
#firstTimeWizardContainer[data-v-0072c5f6]{animation:firstTimeWizardContainerFadeIn-0072c5f6 5s;-webkit-animation:firstTimeWizardContainerFadeIn-0072c5f6 5s;-moz-animation:firstTimeWizardContainerFadeIn-0072c5f6 5s;-o-animation:firstTimeWizardContainerFadeIn-0072c5f6 5s;-ms-animation:firstTimeWizardContainerFadeIn-0072c5f6 5s;background-color:#000000bf}@keyframes firstTimeWizardContainerFadeIn-0072c5f6{0%{background-color:#0000}to{background-color:#000000bf}}.welcome[data-v-0072c5f6]{color:#fff}.wizardCard[data-v-0072c5f6]{color:#fff}.mainWizardStepper[data-v-0072c5f6],.wizardCard[data-v-0072c5f6]{background:none!important;box-shadow:none!important}[data-v-0072c5f6] .q-stepper__header{display:none!important}[data-v-0072c5f6] .q-panel{overflow:hidden!important}.q-dialog__inner div[data-v-0072c5f6]{border:none!important;box-shadow:none!important}

2
domain-server/resources/web/web-new/dist/spa/index.html vendored
View file

@ -1 +1 @@
<!DOCTYPE html><html><head><title>Overte Domain Dashboard</title><meta charset=utf-8><meta name=description content="The Domain dashboard for Overte virtual worlds."><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png sizes=128x128 href=icons/favicon-128x128.png><link rel=icon type=image/png sizes=96x96 href=icons/favicon-96x96.png><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link rel=icon type=image/ico href=favicon.ico><script defer src=js/vendor.f7426f3d.js></script><script defer src=js/app.a371137e.js></script><link href=css/vendor.2ba81df8.css rel=stylesheet><link href=css/app.31d6cfe0.css rel=stylesheet></head><body><div id=q-app></div></body></html> <!DOCTYPE html><html><head><title>Overte Domain Dashboard</title><meta charset=utf-8><meta name=description content="The Domain dashboard for Overte virtual worlds."><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png sizes=128x128 href=icons/favicon-128x128.png><link rel=icon type=image/png sizes=96x96 href=icons/favicon-96x96.png><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link rel=icon type=image/ico href=favicon.ico><script defer src=js/vendor.f7426f3d.js></script><script defer src=js/app.60f8a6d5.js></script><link href=css/vendor.2ba81df8.css rel=stylesheet><link href=css/app.31d6cfe0.css rel=stylesheet></head><body><div id=q-app></div></body></html>

1
domain-server/resources/web/web-new/dist/spa/js/472.efda1ea2.js vendored
View file

File diff suppressed because one or more lines are too long

1
domain-server/resources/web/web-new/dist/spa/js/660.86f8c0b6.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

1
domain-server/resources/web/web-new/dist/spa/js/app.60f8a6d5.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

1
domain-server/resources/web/web-new/dist/spa/js/app.a371137e.js vendored
View file

File diff suppressed because one or more lines are too long

2
domain-server/resources/web/web-new/src/boot/axios.ts
View file

@ -19,7 +19,7 @@ declare module "@vue/runtime-core" {
Log.info(Log.types.OTHER, "Bootstrapping Axios."); Log.info(Log.types.OTHER, "Bootstrapping Axios.");
// TODO: This needs to be centralized and not hardcoded. // TODO: This needs to be centralized and not hardcoded.
const METAVERSE_URL = "https://overte.org/mvs"; const METAVERSE_URL = "https://mv.overte.org/server";
axios.interceptors.request.use((config) => { axios.interceptors.request.use((config) => {
// This is a necessary header to be passed to the Metaverse server in order for // This is a necessary header to be passed to the Metaverse server in order for
// it to fail with an HTTP error code instead of succeeding and returning // it to fail with an HTTP error code instead of succeeding and returning

2
domain-server/resources/web/web-new/src/components/components/login/MetaverseLogin.vue
View file

@ -67,7 +67,7 @@ export default {
password: "", password: "",
showPassword: false, showPassword: false,
// TODO: Needs to be stored somewhere central. // TODO: Needs to be stored somewhere central.
DEFAULT_METAVERSE_URL: "https://overte.org/mvs", DEFAULT_METAVERSE_URL: "https://mv.overte.org/server",
AUTOCOMPLETE: false AUTOCOMPLETE: false
}), }),

2
domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue
View file

@ -720,7 +720,7 @@ export default defineComponent({
// Consts // Consts
WELCOME_TEXT_TIMEOUT: 4500, WELCOME_TEXT_TIMEOUT: 4500,
MAIN_WIZARD_TRANSITION_TIME: 1000, MAIN_WIZARD_TRANSITION_TIME: 1000,
DEFAULT_METAVERSE_URL: "https://overte.org/mvs", DEFAULT_METAVERSE_URL: "https://mv.overte.org/server",
FINAL_WIZARD_STEP: 9, FINAL_WIZARD_STEP: 9,
COMPLETE_WIZARD_REDIRECT_DELAY: 4000 COMPLETE_WIZARD_REDIRECT_DELAY: 4000
}; };

4
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -529,7 +529,7 @@ Item {
font.pixelSize: linkAccountBody.textFieldFontSize font.pixelSize: linkAccountBody.textFieldFontSize
font.bold: linkAccountBody.fontBold font.bold: linkAccountBody.fontBold
text: "<a href='https://overte.org/mvs/users/password/new'> Can't access your account?</a>" text: "<a href='https://mv.overte.org/server/users/password/new'> Can't access your account?</a>"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -655,7 +655,7 @@ Item {
leftMargin: hifi.dimensions.contentSpacing.x leftMargin: hifi.dimensions.contentSpacing.x
} }
text: "<a href='https://overte.org/mvs/users/register'>Sign Up</a>" text: "<a href='https://mv.overte.org/server/users/register'>Sign Up</a>"
linkColor: hifi.colors.blueAccent linkColor: hifi.colors.blueAccent
onLinkActivated: { onLinkActivated: {

4
libraries/networking/src/NetworkingConstants.h
View file

@ -29,8 +29,8 @@ namespace NetworkingConstants {
const QString WEB_ENGINE_VERSION = "Chrome/83.0.4103.122"; const QString WEB_ENGINE_VERSION = "Chrome/83.0.4103.122";
// For now we only have one Metaverse server. // For now we only have one Metaverse server.
const QUrl METAVERSE_SERVER_URL_STABLE { "https://overte.org/mvs" }; const QUrl METAVERSE_SERVER_URL_STABLE { "https://mv.overte.org/server" };
const QUrl METAVERSE_SERVER_URL_STAGING { "https://overte.org/mvs" }; const QUrl METAVERSE_SERVER_URL_STAGING { "https://mv.overte.org/server" };
// Web Engine requests to this parent domain have an account authorization header added // Web Engine requests to this parent domain have an account authorization header added
const QString AUTH_HOSTNAME_BASE = "overte.org"; const QString AUTH_HOSTNAME_BASE = "overte.org";

2
scripts/communityScripts/explore/explore.html
View file

@ -354,7 +354,7 @@
// if metaverse data not loaded fire a request for it // if metaverse data not loaded fire a request for it
if (placesData == null) { if (placesData == null) {
// fire off data get against the metaverse // fire off data get against the metaverse
axios.get("https://overte.org/mvs/api/v1/places") axios.get("https://mv.overte.org/server/api/v1/places")
.then((response) => { .then((response) => {
placesData = response.data.data.places; placesData = response.data.data.places;
exploreComponent.updateData(blendedData()); exploreComponent.updateData(blendedData());

2
scripts/system/places/federation.json
View file

@ -1,4 +1,4 @@
[ [
{"node": "https://metaverse.vircadia.com/live"}, {"node": "https://metaverse.vircadia.com/live"},
{"node": "https://overte.org/mvs"} {"node": "https://mv.overte.org/server"}
] ]

2
tools/nitpick/AppDataHighFidelity/Interface.json
View file

@ -279,6 +279,6 @@
"toolbar/com.highfidelity.interface.toolbar.system/x": 655, "toolbar/com.highfidelity.interface.toolbar.system/x": 655,
"toolbar/com.highfidelity.interface.toolbar.system/y": 953, "toolbar/com.highfidelity.interface.toolbar.system/y": 953,
"toolbar/constrainToolbarToCenterX": true, "toolbar/constrainToolbarToCenterX": true,
"private/selectedMetaverseURL": "https://overte.org/mvs", "private/selectedMetaverseURL": "https://mv.overte.org/server",
"wallet/autoLogout": true "wallet/autoLogout": true
} }