Skip to content

Commit 103e3e2

Browse files
authored
Merge pull request #1298 from Hubs-Foundation/remove-mozilla-branding-1
[Mozilla Branding Removal] First pass at removing Mozilla references, links, images, etc.
2 parents 6afca85 + 53c0d59 commit 103e3e2

32 files changed

+69
-68
lines changed

.github/workflows/spoke-RetPageOrigin.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
turkeyGitops:
10-
uses: mozilla/hubs-ops/.github/workflows/turkeyGitops.yml@master
10+
uses: Hubs-Foundation/hubs-ops/.github/workflows/turkeyGitops.yml@master
1111
with:
1212
registry: mozillareality
1313
dockerfile: RetPageOriginDockerfile

CODE_OF_CONDUCT.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
# Community Participation Guidelines
22

3-
This repository is governed by Mozilla's code of conduct and etiquette guidelines.
3+
This repository is governed by the Hubs Foundations' code of conduct and etiquette guidelines.
44
For more details, please read the
5-
[Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/).
5+
[Community Participation Guidelines](https://hubsfoundation.org) (TBD).
6+
For now, the rules of the Hubs Discord server can be considered to stand in.
67

78
## How to Report
8-
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.
9+
For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://hubsfoundation.org)' page (TBD).
10+
For now, any reports should be made on the Hubs Discord server.
911

1012
<!--
1113
## Project Specific Etiquette
1214
13-
In some cases, there will be additional project etiquette i.e.: (https://bugzilla.mozilla.org/page.cgi?id=etiquette.html).
15+
In some cases, there will be additional project etiquette.
1416
Please update for your project.
1517
-->

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing
22

3-
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).
3+
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).
44

55
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.
66

Jenkinsfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pipeline {
7272
if (showQAPromoteCommand == "true") {
7373
def text = (
7474
"*<http://localhost:8080/job/${jobName}/${buildNumber}|#${buildNumber}>* *${jobName}* " +
75-
"<https://github.com/mozilla/Spoke/commit/$gitSha|$gitSha> ${spokeVersion} " +
75+
"<https://github.com/Hubs-Foundation/Spoke/commit/$gitSha|$gitSha> ${spokeVersion} " +
7676
"Spoke: ```${gitSha} ${gitMessage}```\n" +
7777
"${packageIdent} built and uploaded - to promote:\n" +
7878
"`/mr promote-spoke-qa ${packageIdent}`"
@@ -81,7 +81,7 @@ pipeline {
8181
} else {
8282
def text = (
8383
"*<http://localhost:8080/job/${jobName}/${buildNumber}|#${buildNumber}>* *${jobName}* " +
84-
"<https://github.com/mozilla/Spoke/commit/$gitSha|$gitSha> ${spokeVersion} " +
84+
"<https://github.com/Hubs-Foundation/Spoke/commit/$gitSha|$gitSha> ${spokeVersion} " +
8585
"Spoke: ```${gitSha} ${gitMessage}```\n" +
8686
"<${smokeURL}?required_version=${spokeVersion}|Smoke Test> - to push:\n" +
8787
"`/mr spoke deploy ${spokeVersion} s3://${targetS3Bucket}`"

PROMOTION.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
## Scene Promotion
22

3-
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.
3+
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Remixing
22

3-
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.
3+
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.
44

55
You can change this setting at any time, by re-publishing your scene.
66

7-
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/).
7+
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
## Getting Started
2525

26-
- `git clone https://github.com/mozilla/Spoke.git`
26+
- `git clone https://github.com/Hubs-Foundation/Spoke.git`
2727
- `cd Spoke`
2828
- `yarn install`
2929
- `yarn start`
@@ -408,6 +408,6 @@ export default class HubsSoundPackSource extends AssetManifestSource {
408408

409409
```
410410

411-
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.
411+
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.
412412

413-
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.
413+
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Creating Kits
22

3-
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.
3+
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.
44

5-
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.
5+
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.
66

77
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.
88

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"repository": {
1717
"type": "git",
18-
"url": "https://github.com/mozilla/Spoke.git"
18+
"url": "https://github.com/Hubs-Foundation/Spoke.git"
1919
},
2020
"scripts": {
2121
"start": "cross-env NODE_ENV=development webpack-dev-server --mode development",
@@ -102,7 +102,7 @@
102102
"recharts": "^1.8.5",
103103
"styled-components": "4.4.0",
104104
"styled-icons": "^8.4.2",
105-
"three": "https://github.com/MozillaReality/three.js.git#0f9b0024725f0dd917caa54c2934a4ba1fc12c4f",
105+
"three": "https://github.com/Hubs-Foundation/three.js.git#0f9b0024725f0dd917caa54c2934a4ba1fc12c4f",
106106
"three-mesh-bvh": "^0.1.4",
107107
"troika-three-text": "^0.44.0",
108108
"url-toolkit": "^2.1.6",
@@ -165,4 +165,4 @@
165165
"webpack-dev-server": "^3.8.0",
166166
"worker-loader": "^2.0.0"
167167
}
168-
}
168+
}

src/api/Api.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { matchesFileTypes, AudioFileTypes } from "../ui/assets/fileTypes";
1414
import { RethrownError } from "../editor/utils/errors";
1515

1616
// Media related functions should be kept up to date with Hubs media-utils:
17-
// https://github.com/mozilla/hubs/blob/master/src/utils/media-utils.js
17+
// https://github.com/Hubs-Foundation/hubs/blob/master/src/utils/media-utils.js
1818

1919
const resolveUrlCache = new Map();
2020
const resolveMediaCache = new Map();
@@ -1020,7 +1020,7 @@ export default class Project extends EventEmitter {
10201020
}
10211021

10221022
async upload(blob, onUploadProgress, signal) {
1023-
// Use direct upload API, see: https://github.com/mozilla/reticulum/pull/319
1023+
// Use direct upload API, see: https://github.com/Hubs-Foundation/reticulum/pull/319
10241024
const { phx_host: uploadHost } = await (await this.fetch(`https://${RETICULUM_SERVER}/api/v1/meta`)).json();
10251025
const uploadPort = new URL(`https://${RETICULUM_SERVER}`).port;
10261026

src/api/AuthForm.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ export default class AuthForm extends Component {
9595
<LegalText>
9696
By proceeding, you agree to the{" "}
9797
<a rel="noopener noreferrer" target="_blank" href={TERMS}>
98-
terms of use
98+
terms of use (TBD)
9999
</a>{" "}
100100
and{" "}
101101
<a rel="noopener noreferrer" target="_blank" href={PRIVACY}>
102-
privacy notice
103-
</a>
102+
privacy notice (TBD)
103+
</a>{" "}
104104
.
105105
</LegalText>
106106
<button type="submit">Send Magic Link</button>

src/api/PublishDialog.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export default class PublishDialog extends Component {
7575
<label htmlFor="allowRemixing">
7676
Allow{" "}
7777
<a
78-
href="https://github.com/mozilla/Spoke/blob/master/REMIXING.md"
78+
href="https://github.com/Hubs-Foundation/Spoke/blob/master/REMIXING.md"
7979
target="_blank"
8080
rel="noopener noreferrer"
8181
>
@@ -92,9 +92,9 @@ export default class PublishDialog extends Component {
9292
</FormField>
9393
<FormField inline>
9494
<label htmlFor="allowPromotion">
95-
Allow {configs.isMoz() ? "Mozilla to " : ""}
95+
Allow {configs.isMoz() ? "Hubs Foundation to " : ""}
9696
<a
97-
href="https://github.com/mozilla/Spoke/blob/master/PROMOTION.md"
97+
href="https://github.com/Hubs-Foundation/Spoke/blob/master/PROMOTION.md"
9898
target="_blank"
9999
rel="noopener noreferrer"
100100
>

src/api/SketchfabZipLoader.worker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Keep in sync with https://github.com/mozilla/hubs/blob/master/src/workers/sketchfab-zip.worker.js
1+
// Keep in sync with https://github.com/Hubs-Foundation/hubs/blob/master/src/workers/sketchfab-zip.worker.js
22
import JSZip from "jszip";
33

44
async function fetchZipAndGetBlobs(src) {

src/assets/hubs-logo.png

15.9 KB
Loading

src/assets/mozilla-logo.png

-1.71 KB
Binary file not shown.

src/assets/spoke-logo.png

-51 KB
Loading

src/configs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function fixBaseAssetsPath(path) {
4444

4545
configs.isMoz = () => configs.IS_MOZ === "true";
4646
configs.name = () => (configs.isMoz() ? "Spoke" : "Scene Editor");
47-
configs.longName = () => (configs.isMoz() ? "Spoke by Mozilla" : "Scene Editor");
47+
configs.longName = () => (configs.isMoz() ? "Spoke by the Hubs Community" : "Scene Editor");
4848
configs.icon = () => (configs.isMoz() ? fixBaseAssetsPath(spokeIcon) : fixBaseAssetsPath(editorIcon));
4949

5050
export default configs;

src/constants.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const PRIVACY = "https://www.mozilla.org/en-US/privacy/hubs/";
2-
const TERMS = "https://www.mozilla.org/en-US/about/legal/terms/hubs/";
1+
const PRIVACY = "https://hubsfoundation.org/hubs-privacy-policy";
2+
const TERMS = "https://hubsfoundation.org/hubs-terms-of-use";
33

44
module.exports = {
55
PRIVACY,

src/editor/Editor.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -432,12 +432,12 @@ export default class Editor extends EventEmitter {
432432
}
433433

434434
// Increment this version when you are making a breaking change.
435-
// Document your changes here: https://github.com/mozilla/hubs/wiki/MOZ_hubs_components-Changelog
435+
// Document your changes here: https://github.com/Hubs-Foundation/hubs/wiki/MOZ_hubs_components-Changelog
436436
json.extensions.MOZ_hubs_components = {
437437
version: 4
438438
};
439439

440-
json.asset.generator = `Mozilla Spoke ${process.env.BUILD_VERSION}`;
440+
json.asset.generator = `Spoke ${process.env.BUILD_VERSION}`;
441441

442442
try {
443443
const glbBlob = await exporter.exportGLBBlob(chunks);

src/editor/nodes/TroikaTextNode.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// This is a port of https://github.com/protectwise/troika/tree/master/packages/troika-three-text
2-
// that has been made functional and restyled for Mozilla Hubs and Spoke (hubs.mozilla.com)
2+
// that has been made functional and restyled for Hubs and Spoke (https://hubsfoundation.org)
33
// by @jamesckane at Paradowski Creative (paradowski.com)
44

55
import { Color, Object3D, Vector2 } from "three";

src/telemetry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export function Telemetry({ overridePage, overrideTitle }) {
3434
}
3535

3636
const page = `/spoke${overridePage || location.pathname}`;
37-
const title = overrideTitle ? "Spoke by Mozilla | " + overrideTitle : document.title;
37+
const title = overrideTitle ? "Spoke by the Hubs Community | " + overrideTitle : document.title;
3838

3939
console.info(`Telemetry ${telemetryEnabled ? "enabled" : "disabled"} | Navigated to: ${page}`);
4040

src/ui/EditorContainer.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ class EditorContainer extends Component {
391391
},
392392
{
393393
name: "Keyboard and Mouse Controls",
394-
action: () => window.open("https://hubs.mozilla.com/docs/spoke-controls.html")
394+
action: () => window.open("https://docs.hubsfoundation.org/spoke-controls.html")
395395
},
396396
{
397397
name: "Get Support",
@@ -403,18 +403,18 @@ class EditorContainer extends Component {
403403
},
404404
{
405405
name: "Report an Issue",
406-
action: () => window.open("https://github.com/mozilla/Spoke/issues/new")
406+
action: () => window.open("https://github.com/Hubs-Foundation/Spoke/issues/new")
407407
},
408408
{
409409
name: "Join us on Discord",
410410
action: () => window.open("https://discord.gg/wHmY4nd")
411411
},
412412
{
413-
name: "Terms of Use",
413+
name: "Terms of Use (TBD)",
414414
action: () => window.open(TERMS)
415415
},
416416
{
417-
name: "Privacy Notice",
417+
name: "Privacy Notice (TBD)",
418418
action: () => window.open(PRIVACY)
419419
}
420420
]

src/ui/assets/sources/MyAssetsSource.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default class MyAssetsSource extends BaseSource {
3535
{ label: "Videos", value: "video" },
3636
{ label: "Audio", value: "audio" }
3737
];
38-
this.searchLegalCopy = "Search by Mozilla Hubs";
38+
this.searchLegalCopy = "Search by Hubs";
3939
this.privacyPolicyUrl = PRIVACY;
4040
this.uploadSource = true;
4141
this.uploadMultiple = true;

src/ui/dialogs/ErrorDialog.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default class ErrorDialog extends Component {
3737
eventId: this.state.eventId,
3838
user: {
3939
name: "Anonymous Spoke User",
40-
email: "anonymous.spoke.user@mozilla.com"
40+
email: "anonymous.spoke.user@example.com"
4141
}
4242
});
4343
};

src/ui/dialogs/PerformanceCheckDialog.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export default function PerformanceCheckDialog({ scores, ...rest }) {
110110
<PerformanceCheckItem
111111
title="Polygon Count"
112112
description="We recommend your scene use no more than 50,000 triangles for mobile devices."
113-
learnMoreUrl="https://hubs.mozilla.com/docs/spoke-optimization.html"
113+
learnMoreUrl="https://docs.hubsfoundation.org/spoke-optimization.html"
114114
score={scores.polygons.score}
115115
scoreColor={scoreToColor[scores.polygons.score]}
116116
>
@@ -121,7 +121,7 @@ export default function PerformanceCheckDialog({ scores, ...rest }) {
121121
<PerformanceCheckItem
122122
title="Materials"
123123
description="We recommend using no more than 25 unique materials in your scene to reduce draw calls on mobile devices."
124-
learnMoreUrl="https://hubs.mozilla.com/docs/spoke-optimization.html"
124+
learnMoreUrl="https://docs.hubsfoundation.org/spoke-optimization.html"
125125
score={scores.materials.score}
126126
scoreColor={scoreToColor[scores.materials.score]}
127127
>
@@ -132,7 +132,7 @@ export default function PerformanceCheckDialog({ scores, ...rest }) {
132132
<PerformanceCheckItem
133133
title="Textures"
134134
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."
135-
learnMoreUrl="https://hubs.mozilla.com/docs/spoke-optimization.html"
135+
learnMoreUrl="https://docs.hubsfoundation.org/spoke-optimization.html"
136136
score={texturesScore}
137137
scoreColor={scoreToColor[texturesScore]}
138138
>
@@ -147,7 +147,7 @@ export default function PerformanceCheckDialog({ scores, ...rest }) {
147147
<PerformanceCheckItem
148148
title="Lights"
149149
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."
150-
learnMoreUrl="https://hubs.mozilla.com/docs/spoke-optimization.html"
150+
learnMoreUrl="https://docs.hubsfoundation.org/spoke-optimization.html"
151151
score={scores.lights.score}
152152
scoreColor={scoreToColor[scores.lights.score]}
153153
>
@@ -156,7 +156,7 @@ export default function PerformanceCheckDialog({ scores, ...rest }) {
156156
<PerformanceCheckItem
157157
title="File Size"
158158
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."
159-
learnMoreUrl="https://hubs.mozilla.com/docs/spoke-optimization.html"
159+
learnMoreUrl="https://docs.hubsfoundation.org/spoke-optimization.html"
160160
score={scores.fileSize.score}
161161
scoreColor={scoreToColor[scores.fileSize.score]}
162162
>

src/ui/dialogs/SupportDialog.js

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

src/ui/landing/LandingPage.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ export default class LandingPage extends Component {
101101
<HeroContainer>
102102
<HeroLeft>
103103
<LogoContainer>
104-
<img src={spokeLogo} alt="Spoke by Mozilla" />
104+
<img src={spokeLogo} alt="Spoke by the Hubs Community" />
105105
<h2>make your space</h2>
106106
</LogoContainer>
107107
<h3>
108108
Create 3D social scenes for{" "}
109-
<a href="https://hubs.mozilla.com" rel="noopener noreferrer">
109+
<a href="https://hubsfoundation.org" rel="noopener noreferrer">
110110
Hubs
111111
</a>
112112
</h3>

0 commit comments

Comments
 (0)