mirror of
https://github.com/ANL-CEEESA/UnitCommitment.jl.git
synced 2025-12-06 08:18:51 -06:00
web: Add routes, solve button
This commit is contained in:
38
web/frontend/package-lock.json
generated
38
web/frontend/package-lock.json
generated
@@ -28,6 +28,7 @@
|
|||||||
"papaparse": "^5.5.2",
|
"papaparse": "^5.5.2",
|
||||||
"react": "^19.1.0",
|
"react": "^19.1.0",
|
||||||
"react-dom": "^19.1.0",
|
"react-dom": "^19.1.0",
|
||||||
|
"react-router": "^7.9.5",
|
||||||
"react-scripts": "^5.0.1",
|
"react-scripts": "^5.0.1",
|
||||||
"tabulator-tables": "^6.3.1",
|
"tabulator-tables": "^6.3.1",
|
||||||
"typescript": "^4.9.5",
|
"typescript": "^4.9.5",
|
||||||
@@ -14181,6 +14182,37 @@
|
|||||||
"node": ">=0.10.0"
|
"node": ">=0.10.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/react-router": {
|
||||||
|
"version": "7.9.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/react-router/-/react-router-7.9.5.tgz",
|
||||||
|
"integrity": "sha512-JmxqrnBZ6E9hWmf02jzNn9Jm3UqyeimyiwzD69NjxGySG6lIz/1LVPsoTCwN7NBX2XjCEa1LIX5EMz1j2b6u6A==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"cookie": "^1.0.1",
|
||||||
|
"set-cookie-parser": "^2.6.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": ">=18",
|
||||||
|
"react-dom": ">=18"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"react-dom": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/react-router/node_modules/cookie": {
|
||||||
|
"version": "1.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
|
||||||
|
"integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/react-scripts": {
|
"node_modules/react-scripts": {
|
||||||
"version": "5.0.1",
|
"version": "5.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
|
||||||
@@ -15062,6 +15094,12 @@
|
|||||||
"node": ">= 0.8.0"
|
"node": ">= 0.8.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/set-cookie-parser": {
|
||||||
|
"version": "2.7.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
|
||||||
|
"integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/set-function-length": {
|
"node_modules/set-function-length": {
|
||||||
"version": "1.2.2",
|
"version": "1.2.2",
|
||||||
"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
"papaparse": "^5.5.2",
|
"papaparse": "^5.5.2",
|
||||||
"react": "^19.1.0",
|
"react": "^19.1.0",
|
||||||
"react-dom": "^19.1.0",
|
"react-dom": "^19.1.0",
|
||||||
|
"react-router": "^7.9.5",
|
||||||
"react-scripts": "^5.0.1",
|
"react-scripts": "^5.0.1",
|
||||||
"tabulator-tables": "^6.3.1",
|
"tabulator-tables": "^6.3.1",
|
||||||
"typescript": "^4.9.5",
|
"typescript": "^4.9.5",
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
--box-border: 1px solid rgba(0, 0, 0, 0.2);
|
--box-border: 1px solid rgba(0, 0, 0, 0.2);
|
||||||
--box-shadow: 0px 2px 4px -3px rgba(0, 0, 0, 0.2);
|
--box-shadow: 0px 2px 4px -3px rgba(0, 0, 0, 0.2);
|
||||||
--border-radius: 4px;
|
--border-radius: 4px;
|
||||||
--primary: #0d6efd;
|
--primary: #0097A7;
|
||||||
--contrast-100: #202020;
|
--contrast-100: #202020;
|
||||||
--contrast-80: #606060;
|
--contrast-80: #606060;
|
||||||
--contrast-60: #909090;
|
--contrast-60: #909090;
|
||||||
|
|||||||
@@ -91,6 +91,10 @@ const CaseBuilder = () => {
|
|||||||
setAndSaveScenario(undoStack[undoStack.length - 1]!, false);
|
setAndSaveScenario(undoStack[undoStack.length - 1]!, false);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const onSolve = () => {
|
||||||
|
console.log("Solve!");
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<Header
|
<Header
|
||||||
@@ -98,6 +102,7 @@ const CaseBuilder = () => {
|
|||||||
onSave={onSave}
|
onSave={onSave}
|
||||||
onLoad={onLoad}
|
onLoad={onLoad}
|
||||||
onUndo={onUndo}
|
onUndo={onUndo}
|
||||||
|
onSolve={onSolve}
|
||||||
/>
|
/>
|
||||||
<div className="content">
|
<div className="content">
|
||||||
<Parameters
|
<Parameters
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ interface HeaderProps {
|
|||||||
onSave: () => void;
|
onSave: () => void;
|
||||||
onUndo: () => void;
|
onUndo: () => void;
|
||||||
onLoad: (data: UnitCommitmentScenario) => void;
|
onLoad: (data: UnitCommitmentScenario) => void;
|
||||||
|
onSolve: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
function Header(props: HeaderProps) {
|
function Header(props: HeaderProps) {
|
||||||
@@ -36,6 +37,11 @@ function Header(props: HeaderProps) {
|
|||||||
<SiteHeaderButton title="Clear" onClick={props.onClear} />
|
<SiteHeaderButton title="Clear" onClick={props.onClear} />
|
||||||
<SiteHeaderButton title="Load" onClick={onLoad} />
|
<SiteHeaderButton title="Load" onClick={onLoad} />
|
||||||
<SiteHeaderButton title="Save" onClick={props.onSave} />
|
<SiteHeaderButton title="Save" onClick={props.onSave} />
|
||||||
|
<SiteHeaderButton
|
||||||
|
title="Solve"
|
||||||
|
variant="primary"
|
||||||
|
onClick={props.onSolve}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<FileUploadElement ref={fileElem} accept=".json,.json.gz" />
|
<FileUploadElement ref={fileElem} accept=".json,.json.gz" />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -12,17 +12,33 @@
|
|||||||
box-shadow: var(--box-shadow);
|
box-shadow: var(--box-shadow);
|
||||||
border-radius: var(--border-radius);
|
border-radius: var(--border-radius);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
color: var(--contrast-80);
|
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.light {
|
||||||
|
color: var(--contrast-80);
|
||||||
background: linear-gradient(var(--contrast-0) 25%, var(--contrast-10) 100%);
|
background: linear-gradient(var(--contrast-0) 25%, var(--contrast-10) 100%);
|
||||||
}
|
}
|
||||||
|
|
||||||
.SiteHeaderButton:hover {
|
.light:hover {
|
||||||
background: rgb(245, 245, 245);
|
background: rgb(245, 245, 245);
|
||||||
}
|
}
|
||||||
|
|
||||||
.SiteHeaderButton:active {
|
.light:active {
|
||||||
background: rgba(220, 220, 220);
|
background: rgba(220, 220, 220);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.primary {
|
||||||
|
color: white;
|
||||||
|
background: linear-gradient(var(--primary) 25%, color-mix(in hsl, #000, var(--primary) 90%) 100%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.primary:hover {
|
||||||
|
background: color-mix(in hsl, #fff, var(--primary) 90%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.primary:active {
|
||||||
|
background: color-mix(in hsl, #000, var(--primary) 90%);
|
||||||
|
}
|
||||||
|
|||||||
@@ -9,12 +9,19 @@ import styles from "./SiteHeaderButton.module.css";
|
|||||||
function SiteHeaderButton({
|
function SiteHeaderButton({
|
||||||
title,
|
title,
|
||||||
onClick,
|
onClick,
|
||||||
|
variant = "light",
|
||||||
}: {
|
}: {
|
||||||
title: string;
|
title: string;
|
||||||
onClick?: () => void;
|
onClick?: () => void;
|
||||||
|
variant?: "light" | "primary";
|
||||||
}) {
|
}) {
|
||||||
|
const variantClass = variant === "primary" ? styles.primary : styles.light;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<button className={styles.SiteHeaderButton} onClick={onClick}>
|
<button
|
||||||
|
className={`${styles.SiteHeaderButton} ${variantClass}`}
|
||||||
|
onClick={onClick}
|
||||||
|
>
|
||||||
{title}
|
{title}
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -8,15 +8,21 @@ import React from "react";
|
|||||||
import ReactDOM from "react-dom/client";
|
import ReactDOM from "react-dom/client";
|
||||||
import reportWebVitals from "./reportWebVitals";
|
import reportWebVitals from "./reportWebVitals";
|
||||||
import CaseBuilder from "./components/CaseBuilder/CaseBuilder";
|
import CaseBuilder from "./components/CaseBuilder/CaseBuilder";
|
||||||
|
import { BrowserRouter, Routes, Route, Navigate } from "react-router";
|
||||||
|
|
||||||
const root = ReactDOM.createRoot(
|
const root = ReactDOM.createRoot(
|
||||||
document.getElementById("root") as HTMLElement,
|
document.getElementById("root") as HTMLElement,
|
||||||
);
|
);
|
||||||
|
|
||||||
root.render(
|
root.render(
|
||||||
<React.StrictMode>
|
<BrowserRouter>
|
||||||
<CaseBuilder />
|
<React.StrictMode>
|
||||||
</React.StrictMode>,
|
<Routes>
|
||||||
|
<Route path="/builder" element={<CaseBuilder />} />
|
||||||
|
<Route path="/" element={<Navigate to="/builder" replace />} />
|
||||||
|
</Routes>
|
||||||
|
</React.StrictMode>
|
||||||
|
</BrowserRouter>,
|
||||||
);
|
);
|
||||||
|
|
||||||
reportWebVitals();
|
reportWebVitals();
|
||||||
|
|||||||
@@ -29,7 +29,6 @@
|
|||||||
"noUncheckedIndexedAccess": true,
|
"noUncheckedIndexedAccess": true,
|
||||||
"noUnusedLocals": false,
|
"noUnusedLocals": false,
|
||||||
"noUnusedParameters": false,
|
"noUnusedParameters": false,
|
||||||
"checkJs": true
|
|
||||||
},
|
},
|
||||||
"include": ["src"]
|
"include": ["src"]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user