|
1 | 1 | import { useDispatch, useSelector } from "react-redux"; |
2 | 2 | import type { AppDispatch } from "../shared/redux/store"; |
3 | | -import { generateStringArtThunk, type StringArtState } from "../shared/redux/stringArtSlice"; |
| 3 | +import { |
| 4 | + generateStringArtThunk, |
| 5 | + type StringArtState, |
| 6 | +} from "../shared/redux/stringArtSlice"; |
4 | 7 | import StringArtConfigSection from "./components/StringArtConfig/StringArtConfigSection"; |
| 8 | +import UploadScreen from "../1Upload/UploadScreen"; |
| 9 | +import { StringArtCanvas } from "./components/StringArtCanvas/StringArtCanvas"; |
5 | 10 |
|
6 | 11 | export default function RenderImageScreen() { |
7 | 12 | const dispatch = useDispatch<AppDispatch>(); |
8 | | - const { |
9 | | - imageData, |
10 | | - isGenerating, |
11 | | - progress, |
12 | | - settings, |
13 | | - } = useSelector((state: { stringArt: StringArtState }) => state.stringArt); |
| 13 | + const { imageData, isGenerating, progress, settings } = useSelector( |
| 14 | + (state: { stringArt: StringArtState }) => state.stringArt |
| 15 | + ); |
14 | 16 |
|
15 | 17 | const handleStartGeneration = () => { |
16 | 18 | if (!imageData) return; |
17 | | - dispatch( |
18 | | - generateStringArtThunk({ imageData, settings }) |
19 | | - ); |
| 19 | + dispatch(generateStringArtThunk({ imageData, settings })); |
20 | 20 | }; |
21 | 21 |
|
22 | 22 | return ( |
23 | | - <div className="generation-controls"> |
24 | | - <StringArtConfigSection key={"stringArt"} /> |
| 23 | + <main className="app-main"> |
| 24 | + <div className="controls-section"> |
| 25 | + <UploadScreen /> |
25 | 26 |
|
26 | | - <button |
27 | | - onClick={handleStartGeneration} |
28 | | - disabled={isGenerating} |
29 | | - className="generate-button" |
30 | | - > |
31 | | - {isGenerating ? "Generating..." : "Generate String Art"} |
32 | | - </button> |
| 27 | + {imageData && ( |
| 28 | + <div className="generation-controls"> |
| 29 | + <StringArtConfigSection key={"stringArt"} /> |
33 | 30 |
|
34 | | - {progress && ( |
35 | | - <div className="progress-section"> |
36 | | - <div className="progress-header"> |
37 | | - <span>Progress: {progress.completion_percent.toFixed(1)}%</span> |
38 | | - <span> |
39 | | - Lines: {progress.lines_completed}/{progress.total_lines} |
40 | | - </span> |
41 | | - </div> |
42 | | - <div className="progress-bar"> |
43 | | - <div |
44 | | - className="progress-fill" |
45 | | - style={{ width: `${progress.completion_percent}%` }} |
46 | | - ></div> |
| 31 | + <button |
| 32 | + onClick={handleStartGeneration} |
| 33 | + disabled={isGenerating} |
| 34 | + className="generate-button" |
| 35 | + > |
| 36 | + {isGenerating ? "Generating..." : "Generate String Art"} |
| 37 | + </button> |
| 38 | + |
| 39 | + {progress && ( |
| 40 | + <div className="progress-section"> |
| 41 | + <div className="progress-header"> |
| 42 | + <span> |
| 43 | + Progress: {progress.completion_percent.toFixed(1)}% |
| 44 | + </span> |
| 45 | + <span> |
| 46 | + Lines: {progress.lines_completed}/{progress.total_lines} |
| 47 | + </span> |
| 48 | + </div> |
| 49 | + <div className="progress-bar"> |
| 50 | + <div |
| 51 | + className="progress-fill" |
| 52 | + style={{ width: `${progress.completion_percent}%` }} |
| 53 | + ></div> |
| 54 | + </div> |
| 55 | + <div className="progress-details"> |
| 56 | + <span>Score: {progress.score.toFixed(1)}</span> |
| 57 | + </div> |
| 58 | + </div> |
| 59 | + )} |
47 | 60 | </div> |
48 | | - <div className="progress-details"> |
49 | | - <span>Score: {progress.score.toFixed(1)}</span> |
| 61 | + )} |
| 62 | + </div> |
| 63 | + |
| 64 | + <div className="canvas-section"> |
| 65 | + <StringArtCanvas |
| 66 | + width={500} |
| 67 | + height={500} |
| 68 | + /> |
50 | 69 | </div> |
51 | | - </div> |
52 | | - )} |
53 | | - </div> |
| 70 | + </main> |
54 | 71 | ); |
55 | 72 | } |
0 commit comments