From 72bdf5d40bc8217af8ed6bf45735e27ff6c565f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bel=C3=A9n=20Curcio?= Date: Tue, 25 Sep 2018 11:08:31 -0300 Subject: [PATCH] Changes --- src/core/client/stream/components/App.tsx | 4 ++-- src/core/client/stream/containers/AppContainer.tsx | 4 ++-- src/core/client/stream/mutations/SetActiveTabMutation.ts | 2 +- .../stream/tabs/profile/components/CommentsHistory.tsx | 6 +++--- .../stream/tabs/profile/components/HistoryComment.tsx | 4 ++-- src/locales/en-US/stream.ftl | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/core/client/stream/components/App.tsx b/src/core/client/stream/components/App.tsx index 762a11c6c..d7d25be8f 100644 --- a/src/core/client/stream/components/App.tsx +++ b/src/core/client/stream/components/App.tsx @@ -17,7 +17,7 @@ import * as styles from "./App.css"; export interface AppProps { activeTab: "COMMENTS" | "PROFILE" | "%future added value"; - setActiveTab: SetActiveTabMutation; + onActiveTab: SetActiveTabMutation; signedIn: boolean; } @@ -26,7 +26,7 @@ const App: StatelessComponent = props => { props.setActiveTab({ tab })} + onTabClick={tab => props.onActiveTab({ tab })} > Comments {props.signedIn && My Profile} diff --git a/src/core/client/stream/containers/AppContainer.tsx b/src/core/client/stream/containers/AppContainer.tsx index c132aa61e..65e74d219 100644 --- a/src/core/client/stream/containers/AppContainer.tsx +++ b/src/core/client/stream/containers/AppContainer.tsx @@ -12,7 +12,7 @@ import App from "../components/App"; interface InnerProps { local: Local; - setActiveTab: SetActiveTabMutation; + onsetActiveTab: SetActiveTabMutation; } const AppContainer: StatelessComponent = ({ @@ -22,7 +22,7 @@ const AppContainer: StatelessComponent = ({ return ( ); diff --git a/src/core/client/stream/mutations/SetActiveTabMutation.ts b/src/core/client/stream/mutations/SetActiveTabMutation.ts index 8cffe9828..e7e742042 100644 --- a/src/core/client/stream/mutations/SetActiveTabMutation.ts +++ b/src/core/client/stream/mutations/SetActiveTabMutation.ts @@ -3,7 +3,7 @@ import { commitLocalUpdate, Environment } from "relay-runtime"; import { createMutationContainer, LOCAL_ID } from "talk-framework/lib/relay"; export interface SetActiveTabInput { - tab: "COMMENTS" | "PROFILE" | string; + tab: "COMMENTS" | "PROFILE" | "%future added value"; } export type SetActiveTabMutation = (input: SetActiveTabInput) => Promise; diff --git a/src/core/client/stream/tabs/profile/components/CommentsHistory.tsx b/src/core/client/stream/tabs/profile/components/CommentsHistory.tsx index 67b9d46c6..edd51678c 100644 --- a/src/core/client/stream/tabs/profile/components/CommentsHistory.tsx +++ b/src/core/client/stream/tabs/profile/components/CommentsHistory.tsx @@ -5,16 +5,16 @@ import { CommentsHistoryContainer_me as MeData } from "talk-stream/__generated__ import { HorizontalGutter, Typography } from "talk-ui/components"; import HistoryComment from "./HistoryComment"; -export interface CommentHistoryProps { +export interface CommentsHistoryProps { goToConversation: () => void; me: MeData; } -const CommentsHistory: StatelessComponent = props => { +const CommentsHistory: StatelessComponent = props => { const comments = props.me.comments.edges.map(edge => edge.node); return ( - + Comment History {comments.map(comment => ( diff --git a/src/core/client/stream/tabs/profile/components/HistoryComment.tsx b/src/core/client/stream/tabs/profile/components/HistoryComment.tsx index 19bffcb73..b9471c373 100644 --- a/src/core/client/stream/tabs/profile/components/HistoryComment.tsx +++ b/src/core/client/stream/tabs/profile/components/HistoryComment.tsx @@ -33,7 +33,7 @@ const HistoryComment: StatelessComponent = props => { launch - + = props => { className={styles.text} > reply - + Replies {props.comment.replyCount} diff --git a/src/locales/en-US/stream.ftl b/src/locales/en-US/stream.ftl index 9c9044eb7..101dfccc7 100644 --- a/src/locales/en-US/stream.ftl +++ b/src/locales/en-US/stream.ftl @@ -69,7 +69,7 @@ comments-editCommentForm-editRemainingTime = Edit: remaining comments-editCommentForm-editTimeExpired = Edit time has expired. You can no longer edit this comment. Why not post another one? comments-editedMarker-edited = Edited -## Comment History -commentHistory-viewConversation = View Conversation -commentHistory-replies = Replies -commentHistory-commentHistory = Comment History +## Profile Tab +profile-viewConversation = View Conversation +profile-replies= Replies +profile-commentHistory= Comment History