Refactoring and UI improvements
This commit is contained in:
username
parent
d9ffbb92dd
commit
67b0160735
File diff suppressed because one or more lines are too long
24
src/App.css
24
src/App.css
@ -4,17 +4,6 @@
|
||||
padding: 1vh;
|
||||
}
|
||||
|
||||
svg {
|
||||
height: 14vmin;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
svg {
|
||||
animation: App-logo-spin infinite 20s linear;
|
||||
}
|
||||
}
|
||||
|
||||
.App-header {
|
||||
background-color: #282c34;
|
||||
min-height: 5vh;
|
||||
@ -26,16 +15,3 @@ svg {
|
||||
.App-header h1 {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.App-link {
|
||||
color: #61dafb;
|
||||
}
|
||||
|
||||
@keyframes App-logo-spin {
|
||||
from {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,16 +1,14 @@
|
||||
import "./App.css";
|
||||
import Logo from "./components/Logo";
|
||||
import Workplace from "./components/Workplace";
|
||||
import Form from "./components/Form";
|
||||
|
||||
function App() {
|
||||
return (
|
||||
<>
|
||||
<div className="App">
|
||||
<header className="App-header">
|
||||
<Logo />
|
||||
<h1>Guillotine-cutter App</h1>
|
||||
</header>
|
||||
<Workplace />
|
||||
<Form />
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
|
||||
28
src/components/Form.css
Normal file
28
src/components/Form.css
Normal file
@ -0,0 +1,28 @@
|
||||
input,
|
||||
button {
|
||||
width: calc(25% - 1.5em);
|
||||
padding: 0.5em;
|
||||
font-size: 1.3rem;
|
||||
outline: none;
|
||||
margin: 1em auto;
|
||||
border: solid gainsboro;
|
||||
border-radius: 8px;
|
||||
transition: border 0.5s ease;
|
||||
}
|
||||
|
||||
label p {
|
||||
font-size: 1.5em;
|
||||
}
|
||||
|
||||
label > input:focus {
|
||||
border: solid rgb(0, 140, 255);
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
form > input {
|
||||
transition: background 0.3s ease;
|
||||
}
|
||||
form > input:active {
|
||||
background: rgb(0, 140, 255);
|
||||
border: solid rgb(0, 110, 255);
|
||||
}
|
||||
57
src/components/Form.js
Normal file
57
src/components/Form.js
Normal file
@ -0,0 +1,57 @@
|
||||
import { useState } from "react";
|
||||
import "./Form.css";
|
||||
import Workspace from "./Workspace";
|
||||
import InfoIcon from "@material-ui/icons/Info";
|
||||
|
||||
export default function Form(props) {
|
||||
var randomColor = Math.floor(Math.random() * 16777215).toString(16);
|
||||
var current = "#" + randomColor;
|
||||
|
||||
const [width, setWidth] = useState("");
|
||||
const [height, setHeight] = useState("");
|
||||
const [rectanglesItems, setRectanglesItems] = useState([]);
|
||||
|
||||
//if (w || h == 0 || null) dont display;
|
||||
const handleFormSubmit = (e) => {
|
||||
e.preventDefault();
|
||||
setRectanglesItems([
|
||||
...rectanglesItems,
|
||||
{
|
||||
w: width / 2,
|
||||
h: height / 2,
|
||||
c: current,
|
||||
},
|
||||
]);
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<br />
|
||||
<form onSubmit={handleFormSubmit}>
|
||||
<label>
|
||||
<p>Dimensions:</p>
|
||||
<input
|
||||
type="text"
|
||||
placeholder="e.g. 200"
|
||||
value={width}
|
||||
onChange={(e) => setWidth(e.target.value)}
|
||||
/>
|
||||
{" x "}
|
||||
<input
|
||||
type="text"
|
||||
placeholder="e.g. 100"
|
||||
value={height}
|
||||
onChange={(e) => setHeight(e.target.value)}
|
||||
/>
|
||||
</label>
|
||||
<br />
|
||||
<input type="submit" value="Add a rectangle" />
|
||||
</form>
|
||||
<p style={{ display: "block" }}>
|
||||
<InfoIcon /> Some rectangles may appear invisible. That's because the
|
||||
color of the figures probably matches the background color.
|
||||
</p>
|
||||
<Workspace rectangles={rectanglesItems} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
@ -1,18 +0,0 @@
|
||||
import { logRoles } from "@testing-library/react";
|
||||
|
||||
export default function Logo() {
|
||||
var randomColor = Math.floor(Math.random() * 16777215).toString(16);
|
||||
var current = "#" + randomColor;
|
||||
return (
|
||||
<>
|
||||
{" "}
|
||||
<svg xmlns="http://width.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
|
||||
<g fill={current}>
|
||||
<path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z" />
|
||||
<circle cx="420.9" cy="296.5" r="45.7" />
|
||||
<path d="M520.5 78.1z" />
|
||||
</g>
|
||||
</svg>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
import { useState } from "react";
|
||||
import List from "./List";
|
||||
|
||||
export default function Workplace(props) {
|
||||
const [width, setWidth] = useState("");
|
||||
const [height, setHeight] = useState("");
|
||||
const [rectanglesItems, setRectanglesItems] = useState([]);
|
||||
|
||||
const handleFormSubmit = (e) => {
|
||||
e.preventDefault();
|
||||
setRectanglesItems([
|
||||
...rectanglesItems,
|
||||
{
|
||||
w: width + "px",
|
||||
h: height + "px",
|
||||
},
|
||||
]);
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<br />
|
||||
<form onSubmit={handleFormSubmit}>
|
||||
<label>
|
||||
Dimensions:
|
||||
<input
|
||||
type="text"
|
||||
value={width}
|
||||
onChange={(e) => setWidth(e.target.value)}
|
||||
/>
|
||||
<input
|
||||
type="text"
|
||||
value={height}
|
||||
onChange={(e) => setHeight(e.target.value)}
|
||||
/>
|
||||
</label>
|
||||
<input type="submit" value="Submit" />
|
||||
</form>
|
||||
<List rectangles={rectanglesItems} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
@ -1,10 +1,9 @@
|
||||
.list {
|
||||
.workspace {
|
||||
width: 1000px;
|
||||
height: 1000px;
|
||||
margin: auto;
|
||||
width: 50%;
|
||||
display: block;
|
||||
border: solid brown;
|
||||
border: solid #fafafa;
|
||||
flex-wrap: wrap;
|
||||
align-content: flex-start;
|
||||
}
|
||||
@ -1,23 +1,25 @@
|
||||
import "./List.css";
|
||||
export default function List(props) {
|
||||
import "./Workspace.css";
|
||||
|
||||
export default function Workspace(props) {
|
||||
const rectangles = props.rectangles;
|
||||
const listRectangles = rectangles.map((rectangle) => (
|
||||
<div
|
||||
style={{
|
||||
width: rectangle.w,
|
||||
height: rectangle.h,
|
||||
border: "solid",
|
||||
background: rectangle.c,
|
||||
display: "inline-block",
|
||||
float: "left",
|
||||
position: "relative",
|
||||
}}
|
||||
>
|
||||
{rectangle.w} x {rectangle.h}
|
||||
{2 * rectangle.w} x {2 * rectangle.h}
|
||||
</div>
|
||||
));
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="list">{listRectangles}</div>
|
||||
<div className="workspace">{listRectangles}</div>
|
||||
</>
|
||||
);
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user