feat: better question page layout (WIP)
This commit is contained in:
parent
8fac309bf3
commit
69e5a6ece5
16
package-lock.json
generated
16
package-lock.json
generated
|
@ -61,6 +61,7 @@
|
||||||
"postcss-preset-env": "^7.3.2",
|
"postcss-preset-env": "^7.3.2",
|
||||||
"prisma": "^3.11.1",
|
"prisma": "^3.11.1",
|
||||||
"query-string": "^7.1.1",
|
"query-string": "^7.1.1",
|
||||||
|
"re-resizable": "^6.9.9",
|
||||||
"react": "^17.0.2",
|
"react": "^17.0.2",
|
||||||
"react-component-export-image": "^1.0.6",
|
"react-component-export-image": "^1.0.6",
|
||||||
"react-compound-slider": "^3.3.1",
|
"react-compound-slider": "^3.3.1",
|
||||||
|
@ -37219,6 +37220,15 @@
|
||||||
"rc": "cli.js"
|
"rc": "cli.js"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/re-resizable": {
|
||||||
|
"version": "6.9.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.9.tgz",
|
||||||
|
"integrity": "sha512-l+MBlKZffv/SicxDySKEEh42hR6m5bAHfNu3Tvxks2c4Ah+ldnWjfnVRwxo/nxF27SsUsxDS0raAzFuJNKABXA==",
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": "^16.13.1 || ^17.0.0 || ^18.0.0",
|
||||||
|
"react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/react": {
|
"node_modules/react": {
|
||||||
"version": "17.0.2",
|
"version": "17.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
|
||||||
|
@ -67696,6 +67706,12 @@
|
||||||
"strip-json-comments": "~2.0.1"
|
"strip-json-comments": "~2.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"re-resizable": {
|
||||||
|
"version": "6.9.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.9.tgz",
|
||||||
|
"integrity": "sha512-l+MBlKZffv/SicxDySKEEh42hR6m5bAHfNu3Tvxks2c4Ah+ldnWjfnVRwxo/nxF27SsUsxDS0raAzFuJNKABXA==",
|
||||||
|
"requires": {}
|
||||||
|
},
|
||||||
"react": {
|
"react": {
|
||||||
"version": "17.0.2",
|
"version": "17.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
|
||||||
|
|
|
@ -79,6 +79,7 @@
|
||||||
"postcss-preset-env": "^7.3.2",
|
"postcss-preset-env": "^7.3.2",
|
||||||
"prisma": "^3.11.1",
|
"prisma": "^3.11.1",
|
||||||
"query-string": "^7.1.1",
|
"query-string": "^7.1.1",
|
||||||
|
"re-resizable": "^6.9.9",
|
||||||
"react": "^17.0.2",
|
"react": "^17.0.2",
|
||||||
"react-component-export-image": "^1.0.6",
|
"react-component-export-image": "^1.0.6",
|
||||||
"react-compound-slider": "^3.3.1",
|
"react-compound-slider": "^3.3.1",
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import domtoimage from "dom-to-image"; // https://github.com/tsayen/dom-to-image
|
import domtoimage from "dom-to-image"; // https://github.com/tsayen/dom-to-image
|
||||||
|
import { Resizable } from "re-resizable";
|
||||||
import { useEffect, useRef, useState } from "react";
|
import { useEffect, useRef, useState } from "react";
|
||||||
|
|
||||||
import { Button } from "../../common/Button";
|
import { Button } from "../../common/Button";
|
||||||
|
@ -118,35 +119,44 @@ export const CaptureQuestion: React.FC<Props> = ({ question }) => {
|
||||||
await exportAsPictureAndCode();
|
await exportAsPictureAndCode();
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
if (imgSrc) {
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4 place-items-center">
|
return (
|
||||||
<div ref={containerRef}>
|
<div className="flex flex-col items-center space-y-4">
|
||||||
<QuestionCard
|
<div>
|
||||||
question={question}
|
<img src={imgSrc} />
|
||||||
showTimeStamp={true}
|
</div>
|
||||||
showExpandButton={false}
|
<div>
|
||||||
expandFooterToFullWidth={true}
|
<ImageSource question={question} imgSrc={imgSrc} />
|
||||||
/>
|
</div>
|
||||||
|
<div className="justify-self-stretch">
|
||||||
|
<MetaculusEmbed question={question} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<MetaculusSource question={question} />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex flex-col items-center space-y-4">
|
||||||
|
<Resizable
|
||||||
|
minWidth={320}
|
||||||
|
bounds="parent"
|
||||||
|
enable={{ right: true, left: true }}
|
||||||
|
>
|
||||||
|
<div ref={containerRef}>
|
||||||
|
<QuestionCard
|
||||||
|
question={question}
|
||||||
|
showTimeStamp={true}
|
||||||
|
showExpandButton={false}
|
||||||
|
expandFooterToFullWidth={true}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</Resizable>
|
||||||
<div>
|
<div>
|
||||||
<Button onClick={onCaptureButtonClick}>{mainButtonText}</Button>
|
<Button onClick={onCaptureButtonClick}>{mainButtonText}</Button>
|
||||||
</div>
|
</div>
|
||||||
{imgSrc ? (
|
|
||||||
<>
|
|
||||||
<div>
|
|
||||||
<img src={imgSrc} />
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<ImageSource question={question} imgSrc={imgSrc} />
|
|
||||||
</div>
|
|
||||||
<div className="justify-self-stretch">
|
|
||||||
<MetaculusEmbed question={question} />
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<MetaculusSource question={question} />
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
) : null}
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
@ -83,6 +83,7 @@ const LargeQuestionCard: React.FC<{
|
||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const QuestionScreen: React.FC<{ question: QuestionWithHistoryFragment }> = ({
|
const QuestionScreen: React.FC<{ question: QuestionWithHistoryFragment }> = ({
|
||||||
question,
|
question,
|
||||||
}) => (
|
}) => (
|
||||||
|
@ -93,6 +94,8 @@ const QuestionScreen: React.FC<{ question: QuestionWithHistoryFragment }> = ({
|
||||||
<h1>Capture</h1>
|
<h1>Capture</h1>
|
||||||
</LineHeader>
|
</LineHeader>
|
||||||
<CaptureQuestion question={question} />
|
<CaptureQuestion question={question} />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-4">
|
||||||
<LineHeader>
|
<LineHeader>
|
||||||
<h1>Embed</h1>
|
<h1>Embed</h1>
|
||||||
</LineHeader>
|
</LineHeader>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user