From 222b676f33513923093e1fad12dd92acbcc9c18c Mon Sep 17 00:00:00 2001 From: BFlat Date: Sat, 4 Feb 2023 13:30:18 +0700 Subject: [PATCH 1/3] channels page --- package.json | 1 - packages/fakeyou.com/package.json | 1 + .../fakeyou.com/src/v2/view/PageContainer.tsx | 21 ++++++-- .../v2/view/pages/channels/ChannelsPage.tsx | 54 +++++++++++++++++++ yarn.lock | 11 ++++ 5 files changed, 82 insertions(+), 6 deletions(-) create mode 100644 packages/fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx diff --git a/package.json b/package.json index 9868d71a27..97cd325e3c 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "lerna": "^4.0.0" }, "dependencies": { - "react-select": "^5.7.0", "yarn": "^1.22.19" }, "packageManager": "yarn@3.3.1" diff --git a/packages/fakeyou.com/package.json b/packages/fakeyou.com/package.json index b9e150f161..b9d41de0ee 100644 --- a/packages/fakeyou.com/package.json +++ b/packages/fakeyou.com/package.json @@ -48,6 +48,7 @@ "react-scripts": "5.0.0", "react-select": "^5.7.0", "react-share": "^4.4.1", + "react-twitch-embed": "^3.0.1", "react-wavesurfer.js": "^0.0.8", "sass": "^1.57.1", "typescript": "^3.7.5", diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index 1820d11c17..42d8b221bf 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -63,6 +63,7 @@ import { CheckoutCancelPage } from "./pages/premium/CheckoutCancelPage"; import { PortalSuccessPage } from "./pages/premium/PortalSuccessPage"; import { PrivacyPage } from "./pages/about/privacy_page/PrivacyPage"; import { GetComputedTtsCategoryAssignmentsSuccessResponse } from "@storyteller/components/src/api/category/GetComputedTtsCategoryAssignments"; +import { ChannelsPage } from "./pages/channels/ChannelsPage"; //import { LandingPage } from "./pages/landing/LandingPage"; //import { VcModelListPage } from "./pages/vc/vc_model_list/VcModelListPage"; @@ -132,8 +133,8 @@ interface Props { maybeSelectedTtsModel?: TtsModelListItem; setMaybeSelectedTtsModel: (maybeSelectedTtsModel: TtsModelListItem) => void; - selectedTtsLanguageScope: string, - setSelectedTtsLanguageScope: (selectedTtsLanguageScope: string) => void, + selectedTtsLanguageScope: string; + setSelectedTtsLanguageScope: (selectedTtsLanguageScope: string) => void; } interface State {} @@ -164,7 +165,13 @@ class PageContainer extends React.Component { - + + + + + @@ -300,7 +307,9 @@ class PageContainer extends React.Component { - + @@ -498,7 +507,9 @@ class PageContainer extends React.Component { maybeSelectedTtsModel={this.props.maybeSelectedTtsModel} setMaybeSelectedTtsModel={this.props.setMaybeSelectedTtsModel} selectedTtsLanguageScope={this.props.selectedTtsLanguageScope} - setSelectedTtsLanguageScope={this.props.setSelectedTtsLanguageScope} + setSelectedTtsLanguageScope={ + this.props.setSelectedTtsLanguageScope + } /> diff --git a/packages/fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx b/packages/fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx new file mode 100644 index 0000000000..5758ca7563 --- /dev/null +++ b/packages/fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx @@ -0,0 +1,54 @@ +import React, { useState, useEffect, useRef } from "react"; +import { ApiConfig } from "@storyteller/components"; +import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; +import { Gravatar } from "@storyteller/components/src/elements/Gravatar"; +import { Link } from "react-router-dom"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import {} from "@fortawesome/free-solid-svg-icons"; +import {} from "@fortawesome/free-brands-svg-icons"; +import { motion } from "framer-motion"; +import { container, item } from "../../../../data/animation"; +import { usePrefixedDocumentTitle } from "../../../../common/UsePrefixedDocumentTitle"; +import { RatingButtons } from "../../_common/ratings/RatingButtons"; +import { TwitchPlayerNonInteractive, TwitchChat } from "react-twitch-embed"; + +interface Props { + sessionWrapper: SessionWrapper; +} + +function ChannelsPage(props: Props) { + usePrefixedDocumentTitle("Channels"); + + return ( + +
+
+
+ {/*
+ + Media Feed + +
*/} + + {/* Feed Content */} + + + +
+ + {/* Side column */} +
+ +
+
+
+
+ ); +} + +export { ChannelsPage }; diff --git a/yarn.lock b/yarn.lock index a42c201601..ba580f1c99 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3901,6 +3901,7 @@ __metadata: craco: ^0.0.3 lerna: ^4.0.0 react-select: ^5.7.0 + react-twitch-embed: ^3.0.1 yarn: ^1.22.19 languageName: unknown linkType: soft @@ -16360,6 +16361,16 @@ __metadata: languageName: node linkType: hard +"react-twitch-embed@npm:^3.0.1": + version: 3.0.1 + resolution: "react-twitch-embed@npm:3.0.1" + peerDependencies: + react: ^18.2.0 + react-dom: ^18.2.0 + checksum: 07e885abc479afcf2918584fd449f516c37d3a766762004fdbb92f84a3d3177287e92009755f16bbc9e68b022820e26af1bf86b1edddef2499abe750345b662b + languageName: node + linkType: hard + "react-wavesurfer.js@npm:^0.0.5": version: 0.0.5 resolution: "react-wavesurfer.js@npm:0.0.5" From e60750d14d6d7aa5ee173c9dc3d260ec4e3c8a4a Mon Sep 17 00:00:00 2001 From: BFlat Date: Sat, 4 Feb 2023 13:36:40 +0700 Subject: [PATCH 2/3] fix --- .../src/v2/view/pages/channels/ChannelsPage.tsx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx b/packages/fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx index 5758ca7563..991d73814f 100644 --- a/packages/fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx @@ -1,15 +1,10 @@ -import React, { useState, useEffect, useRef } from "react"; -import { ApiConfig } from "@storyteller/components"; +import React from "react"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; -import { Gravatar } from "@storyteller/components/src/elements/Gravatar"; -import { Link } from "react-router-dom"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import {} from "@fortawesome/free-solid-svg-icons"; import {} from "@fortawesome/free-brands-svg-icons"; import { motion } from "framer-motion"; import { container, item } from "../../../../data/animation"; import { usePrefixedDocumentTitle } from "../../../../common/UsePrefixedDocumentTitle"; -import { RatingButtons } from "../../_common/ratings/RatingButtons"; import { TwitchPlayerNonInteractive, TwitchChat } from "react-twitch-embed"; interface Props { @@ -22,7 +17,7 @@ function ChannelsPage(props: Props) { return (
-
+
{/*
From d6db5489362e08ebaefe8c02884e1ba112b60da2 Mon Sep 17 00:00:00 2001 From: BFlat Date: Sat, 4 Feb 2023 13:39:33 +0700 Subject: [PATCH 3/3] fix --- .../fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx b/packages/fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx index 991d73814f..9207764d06 100644 --- a/packages/fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/channels/ChannelsPage.tsx @@ -18,7 +18,7 @@ function ChannelsPage(props: Props) {
-
+
{/*
Media Feed @@ -37,8 +37,8 @@ function ChannelsPage(props: Props) {
{/* Side column */} -
- +
+