From 9ff6b88e1951c0bae3e51e4ab2e225a88691d3bd Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Sun, 22 Apr 2018 08:51:06 -0700
Subject: [PATCH] Add ToU and PN
---
src/assets/stylesheets/profile.scss | 12 ++++++++++++
src/assets/translations.data.json | 6 +++++-
src/react-components/home-root.js | 16 ++++++++++++++++
src/react-components/profile-entry-panel.js | 12 ++++++++++++
4 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/src/assets/stylesheets/profile.scss b/src/assets/stylesheets/profile.scss
index 479207b3e..9ffa58085 100644
--- a/src/assets/stylesheets/profile.scss
+++ b/src/assets/stylesheets/profile.scss
@@ -35,6 +35,18 @@
max-height: 1000px;
height: 90%;
+ &__links {
+ display: flex;
+ justify-content: center;
+ width: 100%;
+ margin: 16px;
+
+ a {
+ margin: 0px 12px;
+ color: $light-text;
+ }
+ }
+
&--darkened {
background-color: $darkest-transparent;
}
diff --git a/src/assets/translations.data.json b/src/assets/translations.data.json
index c5274d398..9ae0b27c4 100644
--- a/src/assets/translations.data.json
+++ b/src/assets/translations.data.json
@@ -16,6 +16,8 @@
"profile.display_name.validation_warning": "Alphanumerics and hyphens. At least 3 characters, no more than 32",
"profile.header": "Your display name:",
"profile.avatar-selector.loading": "Loading Avatars...",
+ "profile.terms_of_use": "Terms of Use",
+ "profile.privacy_notice": "Privacy Notice",
"audio.title": "Test your audio",
"audio.subtitle-desktop": "Confirm HMD speaker output",
"audio.subtitle-mobile": "Earphones are recommended",
@@ -42,7 +44,9 @@
"home.webvr_disclaimer_mr_team": "Mozilla Mixed Reality",
"home.view_source": "View Source",
"home.join_us": "Join the Conversation",
- "home.report_issue": "Report an Issue",
+ "home.report_issue": "Report Issues",
+ "home.privacy_notice": "Privacy Notice",
+ "home.terms_of_use": "Terms of Use",
"home.get_updates": "Get Updates",
"home.hero_title": "A new way to get together online.",
"home.hero_subtitle": "Laugh, play, get stuff done, or just hang out.",
diff --git a/src/react-components/home-root.js b/src/react-components/home-root.js
index b95b9d58a..8c3bb3d13 100644
--- a/src/react-components/home-root.js
+++ b/src/react-components/home-root.js
@@ -154,6 +154,22 @@ class HomeRoot extends Component {
>
<FormattedMessage id="home.report_issue" />
</a>
+ <a
+ className="footer-content__links__link"
+ target="_blank"
+ rel="noopener noreferrer"
+ href="https://github.com/mozilla/hubs/blob/master/TERMS.md"
+ >
+ <FormattedMessage id="home.terms_of_use" />
+ </a>
+ <a
+ className="footer-content__links__link"
+ target="_blank"
+ rel="noopener noreferrer"
+ href="https://github.com/mozilla/hubs/blob/master/PRIVACY.md"
+ >
+ <FormattedMessage id="home.privacy_notice" />
+ </a>
</div>
<div className="footer-content__links__bottom">
<FormattedMessage id="home.made_with_love" />
diff --git a/src/react-components/profile-entry-panel.js b/src/react-components/profile-entry-panel.js
index 5414b0229..18c442e7c 100644
--- a/src/react-components/profile-entry-panel.js
+++ b/src/react-components/profile-entry-panel.js
@@ -97,6 +97,18 @@ class ProfileEntryPanel extends Component {
ref={ifr => (this.avatarSelector = ifr)}
/>
<input className="profile-entry__form-submit" type="submit" value={formatMessage({ id: "profile.save" })} />
+ <div className="profile-entry__box__links">
+ <a target="_blank" rel="noopener noreferrer" href="https://github.com/mozilla/hubs/blob/master/TERMS.md">
+ <FormattedMessage id="profile.terms_of_use" />
+ </a>
+ <a
+ target="_blank"
+ rel="noopener noreferrer"
+ href="https://github.com/mozilla/hubs/blob/master/PRIVACY.md"
+ >
+ <FormattedMessage id="profile.privacy_notice" />
+ </a>
+ </div>
</div>
</form>
</div>
--
GitLab