diff --git a/domain-server/resources/web/web-new/package-lock.json b/domain-server/resources/web/web-new/package-lock.json
index 8cb14881ee..dc355eca00 100644
--- a/domain-server/resources/web/web-new/package-lock.json
+++ b/domain-server/resources/web/web-new/package-lock.json
@@ -5866,6 +5866,11 @@
}
}
},
+ "js-sha256": {
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",
+ "integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA=="
+ },
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
diff --git a/domain-server/resources/web/web-new/package.json b/domain-server/resources/web/web-new/package.json
index 3f8ac5deb5..ea2c62a8be 100644
--- a/domain-server/resources/web/web-new/package.json
+++ b/domain-server/resources/web/web-new/package.json
@@ -14,6 +14,7 @@
"@quasar/extras": "^1.0.0",
"axios": "^0.21.1",
"core-js": "^3.6.5",
+ "js-sha256": "^0.9.0",
"quasar": "^2.0.0",
"three": "^0.132.2",
"vanta": "^0.5.21",
diff --git a/domain-server/resources/web/web-new/public/favicon.ico b/domain-server/resources/web/web-new/public/favicon.ico
index ae7bbdb712..a74299c83d 100644
Binary files a/domain-server/resources/web/web-new/public/favicon.ico and b/domain-server/resources/web/web-new/public/favicon.ico differ
diff --git a/domain-server/resources/web/web-new/public/icons/favicon-128x128.png b/domain-server/resources/web/web-new/public/icons/favicon-128x128.png
index 1401176192..8113a603c0 100644
Binary files a/domain-server/resources/web/web-new/public/icons/favicon-128x128.png and b/domain-server/resources/web/web-new/public/icons/favicon-128x128.png differ
diff --git a/domain-server/resources/web/web-new/public/icons/favicon-16x16.png b/domain-server/resources/web/web-new/public/icons/favicon-16x16.png
index 679063a314..7f2ab3cf82 100644
Binary files a/domain-server/resources/web/web-new/public/icons/favicon-16x16.png and b/domain-server/resources/web/web-new/public/icons/favicon-16x16.png differ
diff --git a/domain-server/resources/web/web-new/public/icons/favicon-32x32.png b/domain-server/resources/web/web-new/public/icons/favicon-32x32.png
index fd1fbc6f1b..0b9c7aed25 100644
Binary files a/domain-server/resources/web/web-new/public/icons/favicon-32x32.png and b/domain-server/resources/web/web-new/public/icons/favicon-32x32.png differ
diff --git a/domain-server/resources/web/web-new/public/icons/favicon-96x96.png b/domain-server/resources/web/web-new/public/icons/favicon-96x96.png
index e93b80a09c..52b28f771c 100644
Binary files a/domain-server/resources/web/web-new/public/icons/favicon-96x96.png and b/domain-server/resources/web/web-new/public/icons/favicon-96x96.png differ
diff --git a/domain-server/resources/web/web-new/quasar.conf.js b/domain-server/resources/web/web-new/quasar.conf.js
index c572b7bdca..e063c0aa80 100644
--- a/domain-server/resources/web/web-new/quasar.conf.js
+++ b/domain-server/resources/web/web-new/quasar.conf.js
@@ -88,7 +88,7 @@ module.exports = configure(function (ctx) {
// https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework
framework: {
config: {
- dark: 'auto'
+ dark: "auto"
},
// iconSet: 'material-icons', // Quasar icon set
@@ -103,7 +103,8 @@ module.exports = configure(function (ctx) {
// Quasar plugins
plugins: [
- 'Notify'
+ "Notify",
+ "Loading"
]
},
diff --git a/domain-server/resources/web/web-new/src/assets/hq1.jpg b/domain-server/resources/web/web-new/src/assets/hq1.jpg
new file mode 100644
index 0000000000..15590edbf3
Binary files /dev/null and b/domain-server/resources/web/web-new/src/assets/hq1.jpg differ
diff --git a/domain-server/resources/web/web-new/src/assets/hub_world.zip b/domain-server/resources/web/web-new/src/assets/hub_world.zip
new file mode 100644
index 0000000000..24a8401554
Binary files /dev/null and b/domain-server/resources/web/web-new/src/assets/hub_world.zip differ
diff --git a/domain-server/resources/web/web-new/src/assets/quasar-logo-vertical.svg b/domain-server/resources/web/web-new/src/assets/quasar-logo-vertical.svg
deleted file mode 100644
index 821083104a..0000000000
--- a/domain-server/resources/web/web-new/src/assets/quasar-logo-vertical.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
\ No newline at end of file
diff --git a/domain-server/resources/web/web-new/src/assets/vircadia-icon-1024.png b/domain-server/resources/web/web-new/src/assets/vircadia-icon-1024.png
new file mode 100644
index 0000000000..7eb70eebeb
Binary files /dev/null and b/domain-server/resources/web/web-new/src/assets/vircadia-icon-1024.png differ
diff --git a/domain-server/resources/web/web-new/src/boot/axios.ts b/domain-server/resources/web/web-new/src/boot/axios.ts
index 27b1073df1..0cc43a1a12 100644
--- a/domain-server/resources/web/web-new/src/boot/axios.ts
+++ b/domain-server/resources/web/web-new/src/boot/axios.ts
@@ -1,3 +1,11 @@
+// axios.ts
+//
+// Created by Kalila L. on Sep. 4th, 2021.
+// Copyright 2021 Vircadia contributors.
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
import { boot } from "quasar/wrappers";
import axios, { AxiosInstance } from "axios";
import Log from "../modules/utilities/log";
diff --git a/domain-server/resources/web/web-new/src/components/components/login/MetaverseLogin.vue b/domain-server/resources/web/web-new/src/components/components/login/MetaverseLogin.vue
index 2de899a4c8..b9c5bf9dfd 100644
--- a/domain-server/resources/web/web-new/src/components/components/login/MetaverseLogin.vue
+++ b/domain-server/resources/web/web-new/src/components/components/login/MetaverseLogin.vue
@@ -13,6 +13,7 @@
@submit="onSubmit"
@reset="onReset"
class="q-gutter-md"
+ :autocomplete="AUTOCOMPLETE"
>
{
- Log.info(Log.types.METAVERSE, `Successfully got Domain token for Metaverse linking.`);
+ .catch((result) => {
+ Log.error(Log.types.METAVERSE, "Failed to link server with Metaverse.");
- var settingsToCommit = {
+ this.$q.notify({
+ type: "negative",
+ textColor: "white",
+ icon: "warning",
+ message: `Metaverse link attempt failed. ${result}`
+ });
+ })
+ .then(async (response) => {
+ Log.info(Log.types.METAVERSE, "Successfully got Domain token for Metaverse linking.");
+
+ const settingsToCommit = {
"metaverse": {
"access_token": response.data.data.token
}
};
- var committed = await this.commitSettings(settingsToCommit);
+ const committed = await this.commitSettings(settingsToCommit);
if (committed === true) {
- Log.info(Log.types.METAVERSE, `Successfully committed Domain server access token for the Metaverse.`);
+ Log.info(Log.types.METAVERSE, "Successfully committed Domain server access token for the Metaverse.");
this.$q.notify({
type: "positive",
textColor: "white",
icon: "cloud_done",
- message: `Successfully linked your server to the Metaverse.`
+ message: "Successfully linked your server to the Metaverse."
});
this.$emit("connectionResult", { "success": true });
} else {
- Log.error(Log.types.METAVERSE, `Failed to link server with Metaverse: Could not commit token to settings.`);
+ Log.error(Log.types.METAVERSE, "Failed to link server with Metaverse: Could not commit token to settings.");
this.$q.notify({
type: "negative",
textColor: "white",
icon: "warning",
- message: `Metaverse link attempt failed because the settings were unable to be saved.`
+ message: "Metaverse link attempt failed because the settings were unable to be saved."
});
this.$emit("connectionResult", { "success": false });
}
- })
- .catch((result) => {
- Log.error(Log.types.METAVERSE, `Failed to link server with Metaverse: ${result.responseJSON.error}`);
- this.$q.notify({
- type: "negative",
- textColor: "white",
- icon: "warning",
- message: `Metaverse link attempt failed: ${result.responseJSON.error}`
- });
});
} else {
this.$q.notify({
@@ -115,13 +116,13 @@ export default {
// TODO: This needs to go somewhere universal.
commitSettings (settingsToCommit) {
// TODO: This and all other URL endpoints should be in centralized (in their respective module) constants files.
- return axios.post(`/settings.json`, JSON.stringify(settingsToCommit))
- .then((response) => {
- Log.info(Log.types.DOMAIN, `Successfully committed settings.`);
+ return axios.post("/settings.json", JSON.stringify(settingsToCommit))
+ .then(() => {
+ Log.info(Log.types.DOMAIN, "Successfully committed settings.");
return true;
})
.catch((response) => {
- Log.error(Log.types.DOMAIN, `Failed to commit settings to Domain.`);
+ Log.error(Log.types.DOMAIN, `Failed to commit settings to Domain: ${response}`);
return false;
});
}
diff --git a/domain-server/resources/web/web-new/src/index.template.html b/domain-server/resources/web/web-new/src/index.template.html
index 8157cbfff4..58502c7bda 100644
--- a/domain-server/resources/web/web-new/src/index.template.html
+++ b/domain-server/resources/web/web-new/src/index.template.html
@@ -1,3 +1,13 @@
+
+
diff --git a/domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue b/domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue
index 7c732b6ff3..8faa567fbb 100644
--- a/domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue
+++ b/domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue
@@ -148,6 +148,7 @@
Start
@@ -173,30 +174,30 @@
- Skip
-
-
Import (coming soon)
+
+ Skip
+
Back
@@ -244,7 +245,7 @@
@click="$refs.stepper.previous()"
size="sm"
flat
- icon-left="chevron_left"
+ icon="chevron_left"
>
Back
@@ -264,8 +265,8 @@
Let's configure some security settings for your world.
+
+
Who should be an in-world admin of your Domain?
+
+
+
+
+
Who can connect to your Domain?
+
+
+
+
+
Who can rez items in your Domain?
+
+
+
Back
+
+
+
+
+
Let's create a username and password for your Domain's administrator web panel.
+
Warning: Immediately after saving the credentials, you will be prompted to enter them into your browser to continue.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Skip
+
+
+ Back
+
+
+
+
+
+
+
+
+
Enable high performance mode?
+
If you are hosting this Domain on your local computer and it is not very powerful, then consider leaving this off because the server will use more resources if it's busy, thereby slowing down your computer.
+ If you are running this server on a powerful system (or a remote server) and intend to have a large audience, then turn this setting on.