feat: question page layout tuning

This commit is contained in:
Vyacheslav Matyukhin 2022-05-09 15:29:31 +04:00
parent a2f94efcc7
commit 05b0daa631
No known key found for this signature in database
GPG Key ID: 3D2A774C5489F96C
3 changed files with 43 additions and 30 deletions

View File

@ -47,7 +47,7 @@ export const InnerChart: React.FC<{
top: 20, top: 20,
bottom: 65, bottom: 65,
left: 60, left: 60,
right: 20, right: 5,
}; };
return ( return (

View File

@ -22,7 +22,7 @@ export const HistoryChart: React.FC<Props> = ({ question }) => {
const data = useMemo(() => buildChartData(question), [question]); const data = useMemo(() => buildChartData(question), [question]);
return ( return (
<div className="flex items-center flex-col sm:flex-row"> <div className="flex items-center flex-col space-y-4 sm:flex-row sm:space-y-0">
<InnerChart data={data} highlight={highlight} /> <InnerChart data={data} highlight={highlight} />
<Legend <Legend
items={data.seriesNames.map((name, i) => ({ items={data.seriesNames.map((name, i) => ({

View File

@ -11,6 +11,7 @@ import { ssrUrql } from "../../urql";
import { CaptureQuestion } from "../components/CaptureQuestion"; import { CaptureQuestion } from "../components/CaptureQuestion";
import { HistoryChart } from "../components/HistoryChart"; import { HistoryChart } from "../components/HistoryChart";
import { IndicatorsTable } from "../components/IndicatorsTable"; import { IndicatorsTable } from "../components/IndicatorsTable";
import { Stars } from "../components/Stars";
import { QuestionPageDocument } from "../queries.generated"; import { QuestionPageDocument } from "../queries.generated";
interface Props { interface Props {
@ -40,42 +41,66 @@ export const getServerSideProps: GetServerSideProps<Props> = async (
}; };
const Section: React.FC<{ title: string }> = ({ title, children }) => ( const Section: React.FC<{ title: string }> = ({ title, children }) => (
<div className="space-y-2 flex flex-col items-center"> <div className="space-y-2 flex flex-col items-start">
<h2 className="text-xl text-gray-900">{title}</h2> <h2 className="text-xl text-gray-900">{title}</h2>
<div>{children}</div> <div>{children}</div>
</div> </div>
); );
const QuestionCardContents: React.FC<{ const LargeQuestionCard: React.FC<{
question: QuestionWithHistoryFragment; question: QuestionWithHistoryFragment;
}> = ({ question }) => ( }> = ({ question }) => (
<div className="flex flex-col space-y-4 items-center"> <Card highlightOnHover={false} large={true}>
<h1 className="sm:text-4xl text-2xl text-center"> <h1 className="sm:text-3xl text-xl">
<a <a
className="text-black no-underline hover:text-gray-600" className="text-black no-underline hover:text-gray-700"
href={question.url} href={question.url}
target="_blank" target="_blank"
> >
{question.title}{" "} {question.title}{" "}
<FaExternalLinkAlt className="text-gray-400 inline" size="24" /> <FaExternalLinkAlt className="text-gray-400 inline sm:text-3xl text-xl mb-1" />
</a> </a>
</h1> </h1>
<div className="max-w-3xl">
<div className="flex gap-2 mb-2">
<a
className="text-black no-underline bg-red-300 rounded p-1 px-2 text-xs hover:text-gray-600"
href={question.url}
target="_blank"
>
{question.platform.label}
</a>
<Stars num={question.qualityIndicators.stars} />
</div>
<div className="mb-8">
<HistoryChart question={question} /> <HistoryChart question={question} />
</div> </div>
<Section title="Question description"> <ReactMarkdown
<ReactMarkdown linkTarget="_blank"
linkTarget="_blank" className="font-normal text-gray-900 max-w-prose"
className="font-normal text-gray-900 max-w-prose" >
> {question.description.replaceAll("---", "")}
{question.description.replaceAll("---", "")} </ReactMarkdown>
</ReactMarkdown>
</Section>
<Section title="Indicators"> <Section title="Indicators">
<IndicatorsTable question={question} /> <IndicatorsTable question={question} />
</Section> </Section>
</Card>
);
const QuestionScreen: React.FC<{ question: QuestionWithHistoryFragment }> = ({
question,
}) => (
<div className="space-y-8">
<LargeQuestionCard question={question} />
<div className="space-y-4">
<LineHeader>
<h1>Capture</h1>
</LineHeader>
<CaptureQuestion question={question} />
</div>
</div> </div>
); );
@ -84,19 +109,7 @@ const QuestionPage: NextPage<Props> = ({ id }) => {
<Layout page="question"> <Layout page="question">
<div className="max-w-4xl mx-auto"> <div className="max-w-4xl mx-auto">
<Query document={QuestionPageDocument} variables={{ id }}> <Query document={QuestionPageDocument} variables={{ id }}>
{({ data }) => ( {({ data }) => <QuestionScreen question={data.result} />}
<div className="space-y-8">
<Card highlightOnHover={false} large={true}>
<QuestionCardContents question={data.result} />
</Card>
<div className="space-y-4">
<LineHeader>
<h1>Capture</h1>
</LineHeader>
<CaptureQuestion question={data.result} />
</div>
</div>
)}
</Query> </Query>
</div> </div>
</Layout> </Layout>