Skip to content

Commit

Permalink
Merge pull request #253 from MarcusLlewellyn/fix/console-rebrand
Browse files Browse the repository at this point in the history
Rebrand server console to Vircadia with Kasen icon.
  • Loading branch information
two-one-five authored Apr 2, 2020
2 parents 243309f + 05f4bfc commit 76aff7a
Show file tree
Hide file tree
Showing 29 changed files with 31 additions and 31 deletions.
6 changes: 3 additions & 3 deletions server-console/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "HighFidelityConsole",
"description": "High Fidelity Console",
"name": "VircadiaConsole",
"description": "Vircadia Console",
"author": "High Fidelity",
"license": "Apache-2.0",
"version": "1.0.0",
Expand All @@ -13,7 +13,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/highfidelity/hifi.git"
"url": "https://github.com/kasenvr/project-athena.git"
},
"main": "src/main.js",
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions server-console/packager.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ var options = {

const EXEC_NAME = "server-console";
var SHORT_NAME = argv.client_only ? "Console" : "Sandbox";
var FULL_NAME = argv.client_only ? "High Fidelity Console" : "High Fidelity Sandbox";
var FULL_NAME = argv.client_only ? "Vircadia Console" : "Vircadia Sandbox";

// setup per OS options
if (osType == "Darwin") {
options["app-bundle-id"] = "com.highfidelity.server-console" + (argv.production ? "" : "-dev")
options["app-bundle-id"] = "com.vircadia.server-console" + (argv.production ? "" : "-dev")
options["name"] = SHORT_NAME
} else if (osType == "Windows_NT") {
options["version-string"] = {
CompanyName: "High Fidelity, Inc.",
CompanyName: "Vircadia",
FileDescription: FULL_NAME,
ProductName: FULL_NAME,
OriginalFilename: EXEC_NAME + ".exe"
Expand Down
Binary file modified server-console/resources/console-beta.icns
Binary file not shown.
Binary file modified server-console/resources/console-beta.ico
Binary file not shown.
Binary file modified server-console/resources/console-beta.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/console-notification.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/console-tray-osx-stopped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/console-tray-osx-stopping.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/console-tray-osx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/console-tray-stopped.ico
Binary file not shown.
Binary file modified server-console/resources/console-tray-win-stopped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/console-tray-win-stopping.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/console-tray-win.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified server-console/resources/console-tray.ico
Binary file not shown.
Binary file modified server-console/resources/console.icns
Binary file not shown.
Binary file modified server-console/resources/console.ico
Binary file not shown.
Binary file modified server-console/resources/console.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions server-console/src/content-update.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>High Fidelity Sandbox</title>
<title>Vircadia Sandbox</title>
<script src="content-update.js"></script>
<link rel="stylesheet" type="text/css" href="content-update.css"></link>
</head>
Expand Down Expand Up @@ -45,7 +45,7 @@ <h3>We backed up your old Sandbox content, just in case.</h3>
</div>

<div class="footer">
<p>For more information about managing your high Fidelity Sandbox Server, check out our docs: <a href="https://wiki.highfidelity.com/wiki/Sandbox" target="_blank">wiki.highfidelity.com/wiki/Sandbox</a>
<p>For more information about managing your Vircadia Sandbox Server, check out our docs: <a href="https://docs.vircadia.dev/host.html" target="_blank">docs.vircadia.com</a>
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion server-console/src/downloader.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>High Fidelity</title>
<title>Vircadia</title>
<script src="downloader.js"></script>
<link rel="stylesheet" type="text/css" href="downloader.css"></link>
</head>
Expand Down
Binary file modified server-console/src/images/console-hf-logo-2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions server-console/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ function isInterfaceInstalled () {
// the executable to a random location before starting it
// which makes finding the interface near impossible using
// relative paths. For now, as there are no server-only
// installs, we just assume the interface is installed here
// installs, we just assume the interface is installed here
return true;
} else {
return interfacePath;
Expand All @@ -134,7 +134,7 @@ function shutdown() {
dialog.showMessageBox({
type: 'question',
buttons: ['Yes', 'No'],
title: 'Stopping High Fidelity Sandbox',
title: 'Stopping Vircadia Sandbox',
message: 'Quitting will stop your Sandbox and your Home domain will no longer be running.\nDo you wish to continue?'
}, shutdownCallback);
} else {
Expand Down Expand Up @@ -280,7 +280,7 @@ function binaryMissingMessage(displayName, executableName, required) {
var message = "The " + displayName + " executable was not found.\n";

if (required) {
message += "It is required for the High Fidelity Sandbox to run.\n\n";
message += "It is required for the Vircadia Sandbox to run.\n\n";
} else {
message += "\n";
}
Expand All @@ -293,7 +293,7 @@ function binaryMissingMessage(displayName, executableName, required) {
message += paths.join("\n");
} else {
message += "It is expected to be found beside this executable.\n";
message += "You may need to re-install the High Fidelity Sandbox.";
message += "You may need to re-install the Vircadia Sandbox.";
}

return message;
Expand Down Expand Up @@ -337,10 +337,10 @@ var notificationState = NotificationState.UNNOTIFIED;

function setNotificationState (notificationType, pending = undefined) {
if (pending !== undefined) {
if ((notificationType === HifiNotificationType.TRANSACTIONS ||
if ((notificationType === HifiNotificationType.TRANSACTIONS ||
notificationType === HifiNotificationType.ITEMS)) {
// special case, because we want to clear the indicator light
// on INVENTORY when either Transactions or Items are
// on INVENTORY when either Transactions or Items are
// clicked on in the notification popup, we detect that case
// here and force both to be unnotified.
pendingNotifications[HifiNotificationType.TRANSACTIONS] = pending;
Expand Down Expand Up @@ -399,7 +399,7 @@ function visitSandboxClicked() {
StartInterface('hifi://localhost');
} else {
// show an error to say that we can't go home without an interface instance
dialog.showErrorBox("Client Not Found", binaryMissingMessage("High Fidelity client", "Interface", false));
dialog.showErrorBox("Client Not Found", binaryMissingMessage("Vircadia client", "Interface", false));
}
}

Expand Down Expand Up @@ -613,7 +613,7 @@ function updateTrayMenu(serverState) {
tray.setImage(trayIcons[notificationState]);
tray.setContextMenu(Menu.buildFromTemplate(menuArray));
if (isShuttingDown) {
tray.setToolTip('High Fidelity - Shutting Down');
tray.setToolTip('Vircadia - Shutting Down');
}
}
}
Expand Down Expand Up @@ -868,7 +868,7 @@ function onContentLoaded() {
notifier.notify({
icon: notificationIcon,
title: 'An update is available!',
message: 'High Fidelity version ' + latestVersion + ' is available',
message: 'Vircadia version ' + latestVersion + ' is available',
wait: true,
appID: buildInfo.appUserModelId,
url: url
Expand Down Expand Up @@ -941,7 +941,7 @@ app.on('ready', function() {

// Create tray icon
tray = new Tray(trayIcons[NotificationState.UNNOTIFIED]);
tray.setToolTip('High Fidelity');
tray.setToolTip('Vircadia');

tray.on('click', function() {
tray.popUpContextMenu(tray.menu);
Expand All @@ -951,7 +951,7 @@ app.on('ready', function() {
trayNotifications.startPolling();
}
updateTrayMenu(ProcessGroupStates.STOPPED);

if (isServerInstalled()) {
maybeInstallDefaultContentSet(onContentLoaded);
}
Expand Down
10 changes: 5 additions & 5 deletions server-console/src/modules/hf-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ exports.getBuildInfo = function() {
buildIdentifier: "dev",
buildNumber: "0",
stableBuild: "0",
organization: "High Fidelity - dev",
appUserModelId: "com.highfidelity.console"
organization: "Vircadia - dev",
appUserModelId: "com.vircadia.console"
};
var buildInfo = DEFAULT_BUILD_INFO;

Expand Down Expand Up @@ -63,11 +63,11 @@ exports.startInterface = function(url) {

// do this as a workaround for app translocation on osx, which makes
// it nearly impossible to find the interface executable
var bundle_id = 'com.highfidelity.interface-dev';
var bundle_id = 'com.vircadia.interface-dev';
if (buildInfo.releaseType == 'PR') {
bundle_id = 'com.highfidelity.interface-pr';
bundle_id = 'com.vircadia.interface-pr';
} else if (buildInfo.releaseType == 'PRODUCTION') {
bundle_id = 'com.highfidelity.interface';
bundle_id = 'com.vircadia.interface';
}
childProcess.exec('open -b ' + bundle_id + ' --args --url ' + url);
} else {
Expand Down
12 changes: 6 additions & 6 deletions server-console/src/splash.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>High Fidelity</title>
<title>Vircadia</title>
<script src="splash.js"></script>
<link rel="stylesheet" type="text/css" href="splash.css"></link>
</head>
Expand All @@ -19,7 +19,7 @@ <h1>Hello Worlds!</h1>
<div class="column left">
<p>
<h2>What now?</h2>
High Fidelity is now installed and your Home domain is ready for you to explore. To start you off, we've put a few things in your home to play around with and learn the ropes.
Vircadia is now installed and your Home domain is ready for you to explore. To start you off, we've put a few things in your home to play around with and learn the ropes.
</p>

<p>
Expand All @@ -28,13 +28,13 @@ <h2>What now?</h2>
</p>

<p>
<em>To get started exploring and creating,</em> <a target="_blank" href="https://docs.highfidelity.com/docs/explore">check out our Quick-start Guide</a>
<em>To get started exploring and creating,</em> <a target="_blank" href="https://docs.vircadia.dev/explore.html">check out our Quick-start Guide</a>
</p>
</div>
<div class="column center">
<p>
<h2>How do I use it?</h2>
You can manage your server by clicking on the High Fidelity icon in your
You can manage your server by clicking on the Vircadia icon in your
<script>
var osType = require('os').type();
document.write(osType == 'Windows_NT' ? 'system tray.' : 'menu bar.');
Expand All @@ -44,14 +44,14 @@ <h2>How do I use it?</h2>

<p>
<ul>
<li>go to your 'Home,' automatically launching High Fidelity</li>
<li>go to your 'Home,' automatically launching Vircadia</li>
<li>administer basic function like starting and stopping your server</li>
<li>access your server's settings and logs</li>
</ul>
</p>

<p>
<em>For more information on managing your server,</em> <a target="_blank" href="https://docs.highfidelity.com/">visit our documentation</a>
<em>For more information on managing your server,</em> <a target="_blank" href="https://docs.vircadia.dev/host.html">visit our documentation</a>
</p>
</div>
<div class="column right">
Expand Down

0 comments on commit 76aff7a

Please sign in to comment.