From 05b0daa631719c7b80786279645bb9ec63d04c9e Mon Sep 17 00:00:00 2001 From: Vyacheslav Matyukhin Date: Mon, 9 May 2022 15:29:31 +0400 Subject: [PATCH] feat: question page layout tuning --- .../components/HistoryChart/InnerChart.tsx | 2 +- .../components/HistoryChart/index.tsx | 2 +- src/web/questions/pages/QuestionPage.tsx | 69 +++++++++++-------- 3 files changed, 43 insertions(+), 30 deletions(-) diff --git a/src/web/questions/components/HistoryChart/InnerChart.tsx b/src/web/questions/components/HistoryChart/InnerChart.tsx index 09cd2c1..826c46d 100644 --- a/src/web/questions/components/HistoryChart/InnerChart.tsx +++ b/src/web/questions/components/HistoryChart/InnerChart.tsx @@ -47,7 +47,7 @@ export const InnerChart: React.FC<{ top: 20, bottom: 65, left: 60, - right: 20, + right: 5, }; return ( diff --git a/src/web/questions/components/HistoryChart/index.tsx b/src/web/questions/components/HistoryChart/index.tsx index a6a847f..0884adc 100644 --- a/src/web/questions/components/HistoryChart/index.tsx +++ b/src/web/questions/components/HistoryChart/index.tsx @@ -22,7 +22,7 @@ export const HistoryChart: React.FC = ({ question }) => { const data = useMemo(() => buildChartData(question), [question]); return ( -
+
({ diff --git a/src/web/questions/pages/QuestionPage.tsx b/src/web/questions/pages/QuestionPage.tsx index 11b1f9c..cde36f5 100644 --- a/src/web/questions/pages/QuestionPage.tsx +++ b/src/web/questions/pages/QuestionPage.tsx @@ -11,6 +11,7 @@ import { ssrUrql } from "../../urql"; import { CaptureQuestion } from "../components/CaptureQuestion"; import { HistoryChart } from "../components/HistoryChart"; import { IndicatorsTable } from "../components/IndicatorsTable"; +import { Stars } from "../components/Stars"; import { QuestionPageDocument } from "../queries.generated"; interface Props { @@ -40,42 +41,66 @@ export const getServerSideProps: GetServerSideProps = async ( }; const Section: React.FC<{ title: string }> = ({ title, children }) => ( -
+

{title}

{children}
); -const QuestionCardContents: React.FC<{ +const LargeQuestionCard: React.FC<{ question: QuestionWithHistoryFragment; }> = ({ question }) => ( -
-

+ +

{question.title}{" "} - +

-
+ + + +
-
- - {question.description.replaceAll("---", "")} - -
+ + {question.description.replaceAll("---", "")} +
+ +); + +const QuestionScreen: React.FC<{ question: QuestionWithHistoryFragment }> = ({ + question, +}) => ( +
+ +
+ +

Capture

+
+ +
); @@ -84,19 +109,7 @@ const QuestionPage: NextPage = ({ id }) => {
- {({ data }) => ( -
- - - -
- -

Capture

-
- -
-
- )} + {({ data }) => }