Merge pull request #1298 from Hubs-Foundation/remove-mozilla-branding-1

[Mozilla Branding Removal] First pass at removing Mozilla references, links, images, etc.

.github/workflows/spoke-RetPageOrigin.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   turkeyGitops:
-    uses: mozilla/hubs-ops/.github/workflows/turkeyGitops.yml@master
+    uses: Hubs-Foundation/hubs-ops/.github/workflows/turkeyGitops.yml@master
     with:
       registry: mozillareality
       dockerfile: RetPageOriginDockerfile

CODE_OF_CONDUCT.md

@@ -1,15 +1,17 @@
 # Community Participation Guidelines
 
-This repository is governed by Mozilla's code of conduct and etiquette guidelines. 
+This repository is governed by the Hubs Foundations' code of conduct and etiquette guidelines.
 For more details, please read the
-[Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/). 
+[Community Participation Guidelines](https://hubsfoundation.org) (TBD).
+For now, the rules of the Hubs Discord server can be considered to stand in.
 
 ## How to Report
-For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://www.mozilla.org/about/governance/policies/participation/reporting/)' page.
+For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://hubsfoundation.org)' page (TBD).
+For now, any reports should be made on the Hubs Discord server.
 
 <!--
 ## Project Specific Etiquette
 
-In some cases, there will be additional project etiquette i.e.: (https://bugzilla.mozilla.org/page.cgi?id=etiquette.html).
+In some cases, there will be additional project etiquette.
 Please update for your project.
 -->

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-Contributors looking to get involved with Spoke's development should take a look at the [Hubs Contributor Docs](https://github.com/mozilla/hubs/blob/master/CONTRIBUTING.md).
+Contributors looking to get involved with Spoke's development should take a look at the [Hubs Contributor Docs](https://github.com/Hubs-Foundation/hubs/blob/master/CONTRIBUTING.md).
 
 Contributors are expected to abide by the project's [Code of Conduct](./CODE_OF_CONDUCT.md) and to be respectful of the project and people working on it.
 

Jenkinsfile

@@ -72,7 +72,7 @@ pipeline {
           if (showQAPromoteCommand == "true") {
             def text = (
               "*<http://localhost:8080/job/${jobName}/${buildNumber}|#${buildNumber}>* *${jobName}* " +
-              "<https://github.com/mozilla/Spoke/commit/$gitSha|$gitSha> ${spokeVersion} " +
+              "<https://github.com/Hubs-Foundation/Spoke/commit/$gitSha|$gitSha> ${spokeVersion} " +
               "Spoke: ```${gitSha} ${gitMessage}```\n" +
               "${packageIdent} built and uploaded - to promote:\n" +
               "`/mr promote-spoke-qa ${packageIdent}`"
@@ -81,7 +81,7 @@ pipeline {
           } else {
             def text = (
               "*<http://localhost:8080/job/${jobName}/${buildNumber}|#${buildNumber}>* *${jobName}* " +
-              "<https://github.com/mozilla/Spoke/commit/$gitSha|$gitSha> ${spokeVersion} " +
+              "<https://github.com/Hubs-Foundation/Spoke/commit/$gitSha|$gitSha> ${spokeVersion} " +
               "Spoke: ```${gitSha} ${gitMessage}```\n" +
               "<${smokeURL}?required_version=${spokeVersion}|Smoke Test> - to push:\n" +
               "`/mr spoke deploy ${spokeVersion} s3://${targetS3Bucket}`"

PROMOTION.md

@@ -1,3 +1,3 @@
 ## Scene Promotion
 
-As part of publishing your scene, you can choose to allow Mozilla to promote your scene. If you choose to allow Mozilla to promote your scene, you grant to Mozilla a non-exclusive, worldwide, royalty-free, sublicensable license under all of Your rights necessary to review your scene, and publish, distribute, and promote it as part of Hubs and Spoke or related Mozilla promotional efforts.
+As part of publishing your scene, you can choose to allow the Hubs instance owner to promote your scene. If you choose to allow the owner to promote your scene, you grant to the owner a non-exclusive, worldwide, royalty-free, sublicensable license under all of Your rights necessary to review your scene, publish it, and distribute it to the users of the Hubs instance.

REMIXING.md

@@ -1,7 +1,7 @@
 ## Remixing
 
-Allowing remixing means that others can download, edit, change, and re-publish your Spoke scene as long as they give credit to the creators of the scene. If you allow allow remixing, you agree to license your scene under a [CC-BY 3.0](https://creativecommons.org/licenses/by/3.0/legalcode) license. We’ll provide you an opportunity to include the attribution information you want to include. This information will be associated with the scene, but not stored with your account.
+Allowing remixing means that others can download, edit, change, and re-publish your Spoke scene as long as they give credit to the creators of the scene. If you allow remixing, you agree to license your scene under a [CC-BY 3.0](https://creativecommons.org/licenses/by/3.0/legalcode) license. We’ll provide you an opportunity to include the attribution information you want to include. This information will be associated with the scene, but not stored with your account.
 
 You can change this setting at any time, by re-publishing your scene.
 
-If you don't allow remixing, your content will be published under the Hubs and Spoke [Terms of Service](https://www.mozilla.org/en-US/about/legal/terms/hubs/).
+If you don't allow remixing, your content will be published under the Hubs and Spoke [Terms of Service](https://hubsfoundation.org/hubs-terms-of-use) (TBD).

docs/README.md

@@ -23,7 +23,7 @@
 
 ## Getting Started
 
-- `git clone https://github.com/mozilla/Spoke.git`
+- `git clone https://github.com/Hubs-Foundation/Spoke.git`
 - `cd Spoke`
 - `yarn install`
 - `yarn start`
@@ -408,6 +408,6 @@ export default class HubsSoundPackSource extends AssetManifestSource {
 
 ```
 
-Our [Hubs Sound Pack repository](https://github.com/MozillaReality/hubs-sound-pack) is a great example and starting point for creating your own asset manifest source.
+Our [Hubs Sound Pack repository](https://github.com/Hubs-Foundation/hubs-sound-pack) is a great example and starting point for creating your own asset manifest source.
 
-Note that the repository contains a [script for generating an asset manifest](https://github.com/MozillaReality/hubs-sound-pack/blob/master/scripts/manifest-generator.js) from the repository's folder structure. It's fairly specific for this project, but you could easily adopt it for your own project.
+Note that the repository contains a [script for generating an asset manifest](https://github.com/Hubs-Foundation/hubs-sound-pack/blob/master/scripts/manifest-generator.js) from the repository's folder structure. It's fairly specific for this project, but you could easily adopt it for your own project.

docs/creating-kits.md

@@ -1,8 +1,8 @@
 # Creating Kits
 
-Kits, like the [Architecture Kit](https://github.com/MozillaReality/hubs-architecture-kit) and the [Rock Kit](https://github.com/MozillaReality/hubs-rock-kit) are special asset sources in Spoke. They are intended to reduce material usage and increase our ability to combine objects before exporting. In this guide we'll go over how to create a kit using Blender, the Spoke Kit Packager, and write the code to add it to Spoke.
+Kits, like the [Architecture Kit](https://github.com/Hubs-Foundation/hubs-architecture-kit) and the [Rock Kit](https://github.com/Hubs-Foundation/hubs-rock-kit) are special asset sources in Spoke. They are intended to reduce material usage and increase our ability to combine objects before exporting. In this guide we'll go over how to create a kit using Blender, the Spoke Kit Packager, and write the code to add it to Spoke.
 
-To start out, we'll need to grab [Blender](https://www.blender.org/) and install the [Hubs Blender Exporter](https://github.com/MozillaReality/hubs-blender-exporter). Follow the guide in the Hubs Blender Exporter repository to install the addon.
+To start out, we'll need to grab [Blender](https://www.blender.org/) and install the [Hubs Blender Exporter](https://github.com/Hubs-Foundation/hubs-blender-exporter). Follow the guide in the Hubs Blender Exporter repository to install the addon.
 
 Once you've got the addon set up, let's create a new Blender project. We won't be going into the details of how to model with Blender and we'll only be working with primitive shapes.
 

package.json

@@ -15,7 +15,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/mozilla/Spoke.git"
+    "url": "https://github.com/Hubs-Foundation/Spoke.git"
   },
   "scripts": {
     "start": "cross-env NODE_ENV=development webpack-dev-server --mode development",
@@ -102,7 +102,7 @@
     "recharts": "^1.8.5",
     "styled-components": "4.4.0",
     "styled-icons": "^8.4.2",
-    "three": "https://github.com/MozillaReality/three.js.git#0f9b0024725f0dd917caa54c2934a4ba1fc12c4f",
+    "three": "https://github.com/Hubs-Foundation/three.js.git#0f9b0024725f0dd917caa54c2934a4ba1fc12c4f",
     "three-mesh-bvh": "^0.1.4",
     "troika-three-text": "^0.44.0",
     "url-toolkit": "^2.1.6",
@@ -165,4 +165,4 @@
     "webpack-dev-server": "^3.8.0",
     "worker-loader": "^2.0.0"
   }
-}
+}

src/api/Api.js

@@ -14,7 +14,7 @@ import { matchesFileTypes, AudioFileTypes } from "../ui/assets/fileTypes";
 import { RethrownError } from "../editor/utils/errors";
 
 // Media related functions should be kept up to date with Hubs media-utils:
-// https://github.com/mozilla/hubs/blob/master/src/utils/media-utils.js
+// https://github.com/Hubs-Foundation/hubs/blob/master/src/utils/media-utils.js
 
 const resolveUrlCache = new Map();
 const resolveMediaCache = new Map();
@@ -1020,7 +1020,7 @@ export default class Project extends EventEmitter {
   }
 
   async upload(blob, onUploadProgress, signal) {
-    // Use direct upload API, see: https://github.com/mozilla/reticulum/pull/319
+    // Use direct upload API, see: https://github.com/Hubs-Foundation/reticulum/pull/319
     const { phx_host: uploadHost } = await (await this.fetch(`https://${RETICULUM_SERVER}/api/v1/meta`)).json();
     const uploadPort = new URL(`https://${RETICULUM_SERVER}`).port;
 

src/api/AuthForm.js

@@ -95,12 +95,12 @@ export default class AuthForm extends Component {
         <LegalText>
           By proceeding, you agree to the{" "}
           <a rel="noopener noreferrer" target="_blank" href={TERMS}>
-            terms of use
+            terms of use (TBD)
           </a>{" "}
           and{" "}
           <a rel="noopener noreferrer" target="_blank" href={PRIVACY}>
-            privacy notice
-          </a>
+            privacy notice (TBD)
+          </a>{" "}
           .
         </LegalText>
         <button type="submit">Send Magic Link</button>

src/api/PublishDialog.js

@@ -75,7 +75,7 @@ export default class PublishDialog extends Component {
           <label htmlFor="allowRemixing">
             Allow{" "}
             <a
-              href="https://github.com/mozilla/Spoke/blob/master/REMIXING.md"
+              href="https://github.com/Hubs-Foundation/Spoke/blob/master/REMIXING.md"
               target="_blank"
               rel="noopener noreferrer"
             >
@@ -92,9 +92,9 @@ export default class PublishDialog extends Component {
         </FormField>
         <FormField inline>
           <label htmlFor="allowPromotion">
-            Allow {configs.isMoz() ? "Mozilla to " : ""}
+            Allow {configs.isMoz() ? "Hubs Foundation to " : ""}
             <a
-              href="https://github.com/mozilla/Spoke/blob/master/PROMOTION.md"
+              href="https://github.com/Hubs-Foundation/Spoke/blob/master/PROMOTION.md"
               target="_blank"
               rel="noopener noreferrer"
             >

src/api/SketchfabZipLoader.worker.js

@@ -1,4 +1,4 @@
-// Keep in sync with https://github.com/mozilla/hubs/blob/master/src/workers/sketchfab-zip.worker.js
+// Keep in sync with https://github.com/Hubs-Foundation/hubs/blob/master/src/workers/sketchfab-zip.worker.js
 import JSZip from "jszip";
 
 async function fetchZipAndGetBlobs(src) {

src/configs.js

@@ -44,7 +44,7 @@ function fixBaseAssetsPath(path) {
 
 configs.isMoz = () => configs.IS_MOZ === "true";
 configs.name = () => (configs.isMoz() ? "Spoke" : "Scene Editor");
-configs.longName = () => (configs.isMoz() ? "Spoke by Mozilla" : "Scene Editor");
+configs.longName = () => (configs.isMoz() ? "Spoke by the Hubs Community" : "Scene Editor");
 configs.icon = () => (configs.isMoz() ? fixBaseAssetsPath(spokeIcon) : fixBaseAssetsPath(editorIcon));
 
 export default configs;

src/constants.js

@@ -1,5 +1,5 @@
-const PRIVACY = "https://www.mozilla.org/en-US/privacy/hubs/";
-const TERMS = "https://www.mozilla.org/en-US/about/legal/terms/hubs/";
+const PRIVACY = "https://hubsfoundation.org/hubs-privacy-policy";
+const TERMS = "https://hubsfoundation.org/hubs-terms-of-use";
 
 module.exports = {
   PRIVACY,

src/editor/Editor.js

@@ -432,12 +432,12 @@ export default class Editor extends EventEmitter {
     }
 
     // Increment this version when you are making a breaking change.
-    // Document your changes here: https://github.com/mozilla/hubs/wiki/MOZ_hubs_components-Changelog
+    // Document your changes here: https://github.com/Hubs-Foundation/hubs/wiki/MOZ_hubs_components-Changelog
     json.extensions.MOZ_hubs_components = {
       version: 4
     };
 
-    json.asset.generator = `Mozilla Spoke ${process.env.BUILD_VERSION}`;
+    json.asset.generator = `Spoke ${process.env.BUILD_VERSION}`;
 
     try {
       const glbBlob = await exporter.exportGLBBlob(chunks);

src/editor/nodes/TroikaTextNode.js

@@ -1,5 +1,5 @@
 // This is a port of https://github.com/protectwise/troika/tree/master/packages/troika-three-text
-// that has been made functional and restyled for Mozilla Hubs and Spoke (hubs.mozilla.com)
+// that has been made functional and restyled for Hubs and Spoke (https://hubsfoundation.org)
 // by @jamesckane at Paradowski Creative (paradowski.com)
 
 import { Color, Object3D, Vector2 } from "three";

src/telemetry.js

@@ -34,7 +34,7 @@ export function Telemetry({ overridePage, overrideTitle }) {
     }
 
     const page = `/spoke${overridePage || location.pathname}`;
-    const title = overrideTitle ? "Spoke by Mozilla | " + overrideTitle : document.title;
+    const title = overrideTitle ? "Spoke by the Hubs Community | " + overrideTitle : document.title;
 
     console.info(`Telemetry ${telemetryEnabled ? "enabled" : "disabled"} | Navigated to: ${page}`);
 

src/ui/EditorContainer.js

@@ -391,7 +391,7 @@ class EditorContainer extends Component {
           },
           {
             name: "Keyboard and Mouse Controls",
-            action: () => window.open("https://hubs.mozilla.com/docs/spoke-controls.html")
+            action: () => window.open("https://docs.hubsfoundation.org/spoke-controls.html")
           },
           {
             name: "Get Support",
@@ -403,18 +403,18 @@ class EditorContainer extends Component {
           },
           {
             name: "Report an Issue",
-            action: () => window.open("https://github.com/mozilla/Spoke/issues/new")
+            action: () => window.open("https://github.com/Hubs-Foundation/Spoke/issues/new")
           },
           {
             name: "Join us on Discord",
             action: () => window.open("https://discord.gg/wHmY4nd")
           },
           {
-            name: "Terms of Use",
+            name: "Terms of Use (TBD)",
             action: () => window.open(TERMS)
           },
           {
-            name: "Privacy Notice",
+            name: "Privacy Notice (TBD)",
             action: () => window.open(PRIVACY)
           }
         ]

src/ui/assets/sources/MyAssetsSource.js

@@ -35,7 +35,7 @@ export default class MyAssetsSource extends BaseSource {
       { label: "Videos", value: "video" },
       { label: "Audio", value: "audio" }
     ];
-    this.searchLegalCopy = "Search by Mozilla Hubs";
+    this.searchLegalCopy = "Search by Hubs";
     this.privacyPolicyUrl = PRIVACY;
     this.uploadSource = true;
     this.uploadMultiple = true;

src/ui/dialogs/ErrorDialog.js

@@ -37,7 +37,7 @@ export default class ErrorDialog extends Component {
       eventId: this.state.eventId,
       user: {
         name: "Anonymous Spoke User",
-        email: "anonymous.spoke.user@mozilla.com"
+        email: "anonymous.spoke.user@example.com"
       }
     });
   };

src/ui/dialogs/PerformanceCheckDialog.js

@@ -110,7 +110,7 @@ export default function PerformanceCheckDialog({ scores, ...rest }) {
         <PerformanceCheckItem
           title="Polygon Count"
           description="We recommend your scene use no more than 50,000 triangles for mobile devices."
-          learnMoreUrl="https://hubs.mozilla.com/docs/spoke-optimization.html"
+          learnMoreUrl="https://docs.hubsfoundation.org/spoke-optimization.html"
           score={scores.polygons.score}
           scoreColor={scoreToColor[scores.polygons.score]}
         >
@@ -121,7 +121,7 @@ export default function PerformanceCheckDialog({ scores, ...rest }) {
         <PerformanceCheckItem
           title="Materials"
           description="We recommend using no more than 25 unique materials in your scene to reduce draw calls on mobile devices."
-          learnMoreUrl="https://hubs.mozilla.com/docs/spoke-optimization.html"
+          learnMoreUrl="https://docs.hubsfoundation.org/spoke-optimization.html"
           score={scores.materials.score}
           scoreColor={scoreToColor[scores.materials.score]}
         >
@@ -132,7 +132,7 @@ export default function PerformanceCheckDialog({ scores, ...rest }) {
         <PerformanceCheckItem
           title="Textures"
           description="We recommend your textures use no more than 256MB of video RAM for mobile devices. We also recommend against using textures larger than 2048 x 2048."
-          learnMoreUrl="https://hubs.mozilla.com/docs/spoke-optimization.html"
+          learnMoreUrl="https://docs.hubsfoundation.org/spoke-optimization.html"
           score={texturesScore}
           scoreColor={scoreToColor[texturesScore]}
         >
@@ -147,7 +147,7 @@ export default function PerformanceCheckDialog({ scores, ...rest }) {
         <PerformanceCheckItem
           title="Lights"
           description="While dynamic lights are not enabled on mobile devices, we recommend using no more than 3 lights in your scene (excluding ambient and hemisphere lights) for your scene to run on low end PCs."
-          learnMoreUrl="https://hubs.mozilla.com/docs/spoke-optimization.html"
+          learnMoreUrl="https://docs.hubsfoundation.org/spoke-optimization.html"
           score={scores.lights.score}
           scoreColor={scoreToColor[scores.lights.score]}
         >
@@ -156,7 +156,7 @@ export default function PerformanceCheckDialog({ scores, ...rest }) {
         <PerformanceCheckItem
           title="File Size"
           description="We recommend a final file size of no more than 16MB for low bandwidth connections. Reducing the file size will reduce the time it takes to download your scene."
-          learnMoreUrl="https://hubs.mozilla.com/docs/spoke-optimization.html"
+          learnMoreUrl="https://docs.hubsfoundation.org/spoke-optimization.html"
           score={scores.fileSize.score}
           scoreColor={scoreToColor[scores.fileSize.score]}
         >

src/ui/dialogs/SupportDialog.js

@@ -9,10 +9,9 @@ export default function SupportDialog({ onCancel, ...props }) {
         <p>Need to report a problem?</p>
         <p>
           You can file a{" "}
-          <a href="https://github.com/mozilla/Spoke/issues/new" target="_blank" rel="noopener noreferrer">
+          <a href="https://github.com/Hubs-Foundation/Spoke/issues/new" target="_blank" rel="noopener noreferrer">
             GitHub Issue
-          </a>{" "}
-          or e-mail us for support at <a href="mailto:[email protected]">[email protected]</a>
+          </a>
         </p>
         <p>
           You can also find us on{" "}

src/ui/landing/LandingPage.js

@@ -101,12 +101,12 @@ export default class LandingPage extends Component {
             <HeroContainer>
               <HeroLeft>
                 <LogoContainer>
-                  <img src={spokeLogo} alt="Spoke by Mozilla" />
+                  <img src={spokeLogo} alt="Spoke by the Hubs Community" />
                   <h2>make your space</h2>
                 </LogoContainer>
                 <h3>
                   Create 3D social scenes for{" "}
-                  <a href="https://hubs.mozilla.com" rel="noopener noreferrer">
+                  <a href="https://hubsfoundation.org" rel="noopener noreferrer">
                     Hubs
                   </a>
                 </h3>