Date: Sat, 27 Aug 2022 12:23:57 -0400
Subject: [PATCH 3/8] Added titles to sodcial links
---
packages/fakeyou/src/v2/view/NewFooterNavFc.tsx | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/packages/fakeyou/src/v2/view/NewFooterNavFc.tsx b/packages/fakeyou/src/v2/view/NewFooterNavFc.tsx
index 8d3addae7d..5f90331ce8 100644
--- a/packages/fakeyou/src/v2/view/NewFooterNavFc.tsx
+++ b/packages/fakeyou/src/v2/view/NewFooterNavFc.tsx
@@ -86,6 +86,7 @@ function NewFooterNavFc(props: Props) {
href="https://discord.gg/fakeyou"
target="_blank"
rel="noopener noreferrer"
+ title="Join our Discord Server"
>
@@ -94,6 +95,7 @@ function NewFooterNavFc(props: Props) {
href="https://twitch.tv/FakeYouLabs"
target="_blank"
rel="noopener noreferrer"
+ title="Subscribe to our Twitch Channel"
>
@@ -102,6 +104,7 @@ function NewFooterNavFc(props: Props) {
href="https://twitter.com/intent/follow?screen_name=FakeYouApp"
target="_blank"
rel="noopener noreferrer"
+ title="Follow us on Twitter"
>
@@ -110,6 +113,7 @@ function NewFooterNavFc(props: Props) {
href="https://facebook.com/vocodes"
target="_blank"
rel="noopener noreferrer"
+ title="Like us on Facebook"
>
@@ -118,6 +122,7 @@ function NewFooterNavFc(props: Props) {
href="https://www.patreon.com/FakeYou"
target="_blank"
rel="noopener noreferrer"
+ title="Support us by becoming a patreon"
>
From c78e43cb53e7afc8238396dbba4edef91f330aaa Mon Sep 17 00:00:00 2001
From: Angelica Chung
Date: Sat, 27 Aug 2022 12:27:57 -0400
Subject: [PATCH 4/8] updateed duplicative ID's
---
packages/fakeyou/src/v2/view/NewTopNavFc.tsx | 32 +++++++++-----------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/packages/fakeyou/src/v2/view/NewTopNavFc.tsx b/packages/fakeyou/src/v2/view/NewTopNavFc.tsx
index dbf0c05583..42ba6c7a31 100644
--- a/packages/fakeyou/src/v2/view/NewTopNavFc.tsx
+++ b/packages/fakeyou/src/v2/view/NewTopNavFc.tsx
@@ -225,9 +225,8 @@ function NewTopNavFc(props: Props) {
*/}
@@ -357,7 +355,7 @@ function NewTopNavFc(props: Props) {
@@ -366,7 +364,7 @@ function NewTopNavFc(props: Props) {
@@ -452,9 +450,8 @@ function NewTopNavFc(props: Props) {
Options:
Date: Sat, 27 Aug 2022 12:59:09 -0400
Subject: [PATCH 5/8] title added to toggle
---
packages/dashboard.power.stream/src/layout/TopNav.tsx | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/dashboard.power.stream/src/layout/TopNav.tsx b/packages/dashboard.power.stream/src/layout/TopNav.tsx
index abe07b814f..0e7fd99c11 100644
--- a/packages/dashboard.power.stream/src/layout/TopNav.tsx
+++ b/packages/dashboard.power.stream/src/layout/TopNav.tsx
@@ -29,6 +29,7 @@ function TopNav(props: Props) {
data-bs-toggle="offcanvas"
data-bs-target="#offcanvasNavbar2"
aria-controls="offcanvasNavbar2"
+ title="toggle navbar"
>
Navbar toggle
From 3a0a8a68c098f64d0a4f915756cacbaa2f8ae2ee Mon Sep 17 00:00:00 2001
From: Angelica Chung
Date: Sat, 27 Aug 2022 13:27:09 -0400
Subject: [PATCH 6/8] minor replacements in NewTopNavFc.tsx
---
packages/fakeyou/src/v2/view/NewTopNavFc.tsx | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/packages/fakeyou/src/v2/view/NewTopNavFc.tsx b/packages/fakeyou/src/v2/view/NewTopNavFc.tsx
index 42ba6c7a31..d2adc7dfea 100644
--- a/packages/fakeyou/src/v2/view/NewTopNavFc.tsx
+++ b/packages/fakeyou/src/v2/view/NewTopNavFc.tsx
@@ -358,6 +358,7 @@ function NewTopNavFc(props: Props) {
id="offcanvasNavbarLgDropdown-community"
role="button"
data-bs-toggle="dropdown"
+ aria-label="Community dropdown"
>
Community
@@ -367,34 +368,32 @@ function NewTopNavFc(props: Props) {
aria-labelledby="offcanvasNavbarLgDropdown-community"
>
-
+
Contribute/Upload
-
+
Leaderboard
-
+
Patrons
-
+
Feed
-
-
-
+
-
+
My Data
@@ -403,13 +402,13 @@ function NewTopNavFc(props: Props) {
-
+
About
-
+
Terms of Use
@@ -419,13 +418,14 @@ function NewTopNavFc(props: Props) {
Developers
-
+
@@ -443,7 +443,7 @@ function NewTopNavFc(props: Props) {
-
+
@@ -480,7 +480,7 @@ function NewTopNavFc(props: Props) {
-
+
From 784b576024b716871fcbeca32fa8657ebdffda50 Mon Sep 17 00:00:00 2001
From: Brandon Thomas
Date: Sun, 4 Sep 2022 00:44:43 -0400
Subject: [PATCH 7/8] Add scripts to publish to production
Eventually a central deploy system that doesn't push from developer
machines should be the standard mechanism. This will work for now.
---
publish_production_fakeyou.sh | 21 +++++++++++++++++++++
publish_production_storyteller.sh | 21 +++++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100755 publish_production_fakeyou.sh
create mode 100755 publish_production_storyteller.sh
diff --git a/publish_production_fakeyou.sh b/publish_production_fakeyou.sh
new file mode 100755
index 0000000000..57ec5a9364
--- /dev/null
+++ b/publish_production_fakeyou.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+MASTER_BRANCH='master'
+PRODUCTION_BRANCH='production-fakeyou'
+
+git stash
+git checkout $MASTER_BRANCH
+git pull
+
+if git show-ref --verify --quiet "refs/heads/$PRODUCTION_BRANCH"; then
+ echo "Deleting branch ${PRODUCTION_BRANCH}"
+ git branch -D $PRODUCTION_BRANCH
+fi
+
+git checkout -b $PRODUCTION_BRANCH
+git push --set-upstream origin $PRODUCTION_BRANCH
+
+git checkout $MASTER_BRANCH
+
diff --git a/publish_production_storyteller.sh b/publish_production_storyteller.sh
new file mode 100755
index 0000000000..129cac9e4b
--- /dev/null
+++ b/publish_production_storyteller.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+MASTER_BRANCH='master'
+PRODUCTION_BRANCH='production-storyteller'
+
+git stash
+git checkout $MASTER_BRANCH
+git pull
+
+if git show-ref --verify --quiet "refs/heads/$PRODUCTION_BRANCH"; then
+ echo "Deleting branch ${PRODUCTION_BRANCH}"
+ git branch -D $PRODUCTION_BRANCH
+fi
+
+git checkout -b $PRODUCTION_BRANCH
+git push --set-upstream origin $PRODUCTION_BRANCH
+
+git checkout $MASTER_BRANCH
+
From d3cfa903b8f8fb191f347909e53af3bee943f618 Mon Sep 17 00:00:00 2001
From: Brandon Thomas
Date: Sun, 4 Sep 2022 22:49:36 -0400
Subject: [PATCH 8/8] Collect common 3rd party links as central constants;
dropdown Discord
---
.../components/src/constants/ThirdPartyLinks.ts | 15 +++++++++++++++
packages/components/src/elements/DiscordLink.tsx | 3 ++-
packages/components/src/elements/DiscordLink2.tsx | 3 ++-
packages/components/src/elements/PatreonLink.tsx | 3 ++-
packages/components/src/elements/TwitterLink.tsx | 3 ++-
packages/fakeyou/src/v2/view/NewFooterNavFc.tsx | 7 ++++---
packages/fakeyou/src/v2/view/NewTopNavFc.tsx | 13 ++++++++++++-
.../src/v2/view/about/terms_page/TermsPage.tsx | 3 ++-
.../fakeyou/src/v2/view/patrons/PatronPage.tsx | 3 ++-
.../w2l/w2l_template_view/W2lTemplateViewFc.tsx | 3 ++-
.../src/pages/index/IndexPage.tsx | 7 ++++---
11 files changed, 49 insertions(+), 14 deletions(-)
create mode 100644 packages/components/src/constants/ThirdPartyLinks.ts
diff --git a/packages/components/src/constants/ThirdPartyLinks.ts b/packages/components/src/constants/ThirdPartyLinks.ts
new file mode 100644
index 0000000000..e25de2e5be
--- /dev/null
+++ b/packages/components/src/constants/ThirdPartyLinks.ts
@@ -0,0 +1,15 @@
+/**
+ * Define links to third party sources here so we can update them in one place.
+ */
+class ThirdPartyLinks {
+ // This should only need to change if our Nitro expires.
+ // Old FakeYou Discord invite link: https://discord.gg/H72KFXm
+ public static readonly FAKEYOU_DISCORD = "https://discord.gg/fakeyou";
+
+ // A link to Twitter that will open a "Follow" prompt
+ public static readonly FAKEYOU_TWITTER_WITH_FOLLOW_INTENT = "https://twitter.com/intent/follow?screen_name=FakeYouApp";
+
+ public static readonly FAKEYOU_PATREON = "https://www.patreon.com/fakeyou";
+}
+
+export { ThirdPartyLinks }
\ No newline at end of file
diff --git a/packages/components/src/elements/DiscordLink.tsx b/packages/components/src/elements/DiscordLink.tsx
index f8eaed3fbb..2c7911cc12 100644
--- a/packages/components/src/elements/DiscordLink.tsx
+++ b/packages/components/src/elements/DiscordLink.tsx
@@ -2,6 +2,7 @@ import React from "react";
import { faDiscord } from "@fortawesome/free-brands-svg-icons";
import { IconProp } from "@fortawesome/fontawesome-svg-core";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { ThirdPartyLinks } from "../constants/ThirdPartyLinks";
interface Props {
text?: string;
@@ -24,7 +25,7 @@ function DiscordLink(props: Props) {
);
return (
diff --git a/packages/components/src/elements/DiscordLink2.tsx b/packages/components/src/elements/DiscordLink2.tsx
index a158611416..a825c0483e 100644
--- a/packages/components/src/elements/DiscordLink2.tsx
+++ b/packages/components/src/elements/DiscordLink2.tsx
@@ -2,6 +2,7 @@ import React from "react";
import { faDiscord } from "@fortawesome/free-brands-svg-icons";
import { IconProp } from "@fortawesome/fontawesome-svg-core";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { ThirdPartyLinks } from "../constants/ThirdPartyLinks";
interface Props {
hideIcon?: boolean;
@@ -35,7 +36,7 @@ function DiscordLink2(props: Props) {
return (
diff --git a/packages/components/src/elements/PatreonLink.tsx b/packages/components/src/elements/PatreonLink.tsx
index a037bdb9b7..4556c03f8a 100644
--- a/packages/components/src/elements/PatreonLink.tsx
+++ b/packages/components/src/elements/PatreonLink.tsx
@@ -2,6 +2,7 @@ import React from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { IconProp } from "@fortawesome/fontawesome-svg-core";
import { faPatreon } from "@fortawesome/free-brands-svg-icons";
+import { ThirdPartyLinks } from "../constants/ThirdPartyLinks";
interface Props {
text?: string;
@@ -24,7 +25,7 @@ function PatreonLink(props: Props) {
);
return (
diff --git a/packages/components/src/elements/TwitterLink.tsx b/packages/components/src/elements/TwitterLink.tsx
index e76de793f7..2e90b857f2 100644
--- a/packages/components/src/elements/TwitterLink.tsx
+++ b/packages/components/src/elements/TwitterLink.tsx
@@ -2,6 +2,7 @@ import React from "react";
import { faTwitter } from "@fortawesome/free-brands-svg-icons";
import { IconProp } from "@fortawesome/fontawesome-svg-core";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { ThirdPartyLinks } from "../constants/ThirdPartyLinks";
interface Props {
hideIcon?: boolean;
@@ -35,7 +36,7 @@ function TwitterLink(props: Props) {
return (
diff --git a/packages/fakeyou/src/v2/view/NewFooterNavFc.tsx b/packages/fakeyou/src/v2/view/NewFooterNavFc.tsx
index 5f90331ce8..d2cebc53a7 100644
--- a/packages/fakeyou/src/v2/view/NewFooterNavFc.tsx
+++ b/packages/fakeyou/src/v2/view/NewFooterNavFc.tsx
@@ -15,6 +15,7 @@ import {
faTwitter,
faFacebook,
} from "@fortawesome/free-brands-svg-icons";
+import { ThirdPartyLinks } from "@storyteller/components/src/constants/ThirdPartyLinks";
interface Props {
sessionWrapper: SessionWrapper;
@@ -83,7 +84,7 @@ function NewFooterNavFc(props: Props) {
+
+
+
+ Discord Chat
+
+
diff --git a/packages/fakeyou/src/v2/view/about/terms_page/TermsPage.tsx b/packages/fakeyou/src/v2/view/about/terms_page/TermsPage.tsx
index 21eafae204..65da2e2a3a 100644
--- a/packages/fakeyou/src/v2/view/about/terms_page/TermsPage.tsx
+++ b/packages/fakeyou/src/v2/view/about/terms_page/TermsPage.tsx
@@ -1,6 +1,7 @@
import React from "react";
import { motion } from "framer-motion";
import { container, item, panel } from "../../../../data/animation";
+import { ThirdPartyLinks } from "@storyteller/components/src/constants/ThirdPartyLinks";
interface Props {}
@@ -28,7 +29,7 @@ function TermsPage(props: Props) {
We do not condone the use of FakeYou for any type of deception,
slur, abuse, or mistreatment of any individual or group. Please
report such abuses to our{" "}
-
+
community staff on Discord
. Bad actors will have their access revoked and materials deleted.
diff --git a/packages/fakeyou/src/v2/view/patrons/PatronPage.tsx b/packages/fakeyou/src/v2/view/patrons/PatronPage.tsx
index 3cf640d906..200ad23b8f 100644
--- a/packages/fakeyou/src/v2/view/patrons/PatronPage.tsx
+++ b/packages/fakeyou/src/v2/view/patrons/PatronPage.tsx
@@ -6,6 +6,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faPatreon } from "@fortawesome/free-brands-svg-icons";
import { motion } from "framer-motion";
import { container, item, image, panel } from "../../../data/animation";
+import { ThirdPartyLinks } from "@storyteller/components/src/constants/ThirdPartyLinks";
interface Props {
sessionWrapper: SessionWrapper;
}
@@ -29,7 +30,7 @@ function PatronPage(props: Props) {
Not yet (ask for approval in our
diff --git a/packages/storyteller-home/src/pages/index/IndexPage.tsx b/packages/storyteller-home/src/pages/index/IndexPage.tsx
index 507a403de8..bb4faa2e8e 100644
--- a/packages/storyteller-home/src/pages/index/IndexPage.tsx
+++ b/packages/storyteller-home/src/pages/index/IndexPage.tsx
@@ -27,6 +27,7 @@ import { useEffect } from "react";
import gsap from "gsap";
import SplitType from "split-type";
import Scene from "./Scene";
+import { ThirdPartyLinks } from "@storyteller/components/src/constants/ThirdPartyLinks"
import { Swiper, SwiperSlide } from "swiper/react";
import "swiper/css";
import "swiper/css/pagination";
@@ -164,7 +165,7 @@ function IndexPage() {
data-scroll-position="top"
>
-
+
@@ -591,7 +592,7 @@ function IndexPage() {