ConceptProd/Portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small fixes
Some checks failed
Backend CI / build (3.12) (push) Has been cancelled
Details
Frontend CI / build (18.x) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Ivan 2024-07-14 14:23:28 +03:00
parent 6949461bfd
commit 98ad3e2534
5 changed files with 733 additions and 1664 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rsconcept/backend/fixtures/InitialData.json
View File

@ -1,22 +1,4 @@
[ [
{
"model": "auth.user",
"pk": 1,
"fields": {
"password": "pbkdf2_sha256$720000$gFZkaBswurtL0naQKiUnW7$3b6SUN3fY2Xl1H7erAszVpQl2LpoKusan+yJP7Bp3JA=",
"last_login": "2024-06-03T20:57:02.522Z",
"is_superuser": true,
"username": "admin",
"first_name": "Администратор",
"last_name": "",
"email": "admin@mail.ru",
"is_staff": true,
"is_active": true,
"date_joined": "2024-05-27T18:31:48.913Z",
"groups": [],
"user_permissions": []
}
},
{ {
"model": "auth.user", "model": "auth.user",
"pk": 3, "pk": 3,

2341
rsconcept/frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

32
rsconcept/frontend/package.json
View File

@ -13,12 +13,12 @@
}, },
"dependencies": { "dependencies": {
"@lezer/lr": "^1.4.1", "@lezer/lr": "^1.4.1",
"@tanstack/react-table": "^8.17.3", "@tanstack/react-table": "^8.19.3",
"@uiw/codemirror-themes": "^4.22.2", "@uiw/codemirror-themes": "^4.23.0",
"@uiw/react-codemirror": "^4.22.2", "@uiw/react-codemirror": "^4.23.0",
"axios": "^1.7.2", "axios": "^1.7.2",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"framer-motion": "^11.0.10", "framer-motion": "^11.3.2",
"js-file-download": "^0.4.12", "js-file-download": "^0.4.12",
"react": "^18.3.1", "react": "^18.3.1",
"react-dom": "^18.3.1", "react-dom": "^18.3.1",
@ -26,12 +26,12 @@
"react-icons": "^5.2.1", "react-icons": "^5.2.1",
"react-intl": "^6.6.8", "react-intl": "^6.6.8",
"react-loader-spinner": "^6.1.6", "react-loader-spinner": "^6.1.6",
"react-pdf": "^9.0.0", "react-pdf": "^9.1.0",
"react-router-dom": "^6.24.0", "react-router-dom": "^6.24.1",
"react-select": "^5.8.0", "react-select": "^5.8.0",
"react-tabs": "^6.0.2", "react-tabs": "^6.0.2",
"react-toastify": "^10.0.5", "react-toastify": "^10.0.5",
"react-tooltip": "^5.27.0", "react-tooltip": "^5.27.1",
"reactflow": "^11.11.4", "reactflow": "^11.11.4",
"reagraph": "^4.19.2", "reagraph": "^4.19.2",
"use-debounce": "^10.0.1" "use-debounce": "^10.0.1"
@ -39,24 +39,24 @@
"devDependencies": { "devDependencies": {
"@lezer/generator": "^1.7.1", "@lezer/generator": "^1.7.1",
"@types/jest": "^29.5.12", "@types/jest": "^29.5.12",
"@types/node": "^20.14.9", "@types/node": "^20.14.10",
"@types/react": "^18.3.3", "@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0", "@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^7.14.1", "@typescript-eslint/eslint-plugin": "^7.16.0",
"@typescript-eslint/parser": "^7.14.1", "@typescript-eslint/parser": "^7.16.0",
"@vitejs/plugin-react": "^4.3.1", "@vitejs/plugin-react": "^4.3.1",
"autoprefixer": "^10.4.19", "autoprefixer": "^10.4.19",
"eslint": "^8.57.0", "eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2", "eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.7", "eslint-plugin-react-refresh": "^0.4.8",
"eslint-plugin-simple-import-sort": "^12.1.0", "eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-tsdoc": "^0.3.0", "eslint-plugin-tsdoc": "^0.3.0",
"jest": "^29.7.0", "jest": "^29.7.0",
"postcss": "^8.4.38", "postcss": "^8.4.39",
"tailwindcss": "^3.4.4", "tailwindcss": "^3.4.4",
"ts-jest": "^29.1.5", "ts-jest": "^29.2.2",
"typescript": "^5.5.2", "typescript": "^5.5.3",
"vite": "^5.3.1" "vite": "^5.3.3"
}, },
"jest": { "jest": {
"preset": "ts-jest", "preset": "ts-jest",

4
rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx
View File

@ -11,7 +11,7 @@ import InputNode from './InputNode';
import OperationNode from './OperationNode'; import OperationNode from './OperationNode';
const OssNodeTypes: NodeTypes = { const OssNodeTypes: NodeTypes = {
operation: OperationNode, synthesis: OperationNode,
input: InputNode input: InputNode
}; };
@ -28,7 +28,7 @@ function OssFlow({ controller }: OssFlowProps) {
const initialNodes = [ const initialNodes = [
{ id: '1', position: { x: 0, y: 0 }, data: { label: '1' }, type: 'input' }, { id: '1', position: { x: 0, y: 0 }, data: { label: '1' }, type: 'input' },
{ id: '2', position: { x: 0, y: 100 }, data: { label: '2' }, type: 'operation' } { id: '2', position: { x: 0, y: 100 }, data: { label: '2' }, type: 'synthesis' }
]; ];
const initialEdges = [{ id: 'e1-2', source: '1', target: '2' }]; const initialEdges = [{ id: 'e1-2', source: '1', target: '2' }];

2
rsconcept/frontend/src/styling/overrides.css
View File

@ -46,7 +46,7 @@
border-radius: 5px; border-radius: 5px;
} }
.react-flow__node-operation { .react-flow__node-synthesis {
border: 1px solid #555; border: 1px solid #555;
padding: 10px; padding: 10px;
width: 250px; width: 250px;