Skip to content

Commit 6eccd98

Browse files
RahuljagwaniRahuljagwani
authored
Merge branch 'ControlCore-Project:main' into EditNode
2 parents 6349a62 + 5e6f511 commit 6eccd98

8 files changed

Lines changed: 164 additions & 5 deletions

File tree

‎src/App.jsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import FileEditModal from './component/modals/FileEdit';
1717
import MarkDown from './component/modals/markDown';
1818
import OptionsModal from './component/modals/OptionsModal';
1919
import Logs from './component/Logs';
20+
import ContributeDetails from './component/modals/ContributeDetails';
2021

2122
const app = () => {
2223
const [superState, dispatcher] = useReducer(reducer, initialState);
@@ -36,6 +37,7 @@ const app = () => {
3637
<ShareModal superState={superState} dispatcher={dispatcher} />
3738
<SettingsModal superState={superState} dispatcher={dispatcher} />
3839
<HistoryModal superState={superState} dispatcher={dispatcher} />
40+
<ContributeDetails superState={superState} dispatcher={dispatcher} />
3941
<FileEditModal superState={superState} dispatcher={dispatcher} />
4042
<OptionsModal superState={superState} dispatcher={dispatcher} />
4143
<GraphCompDetails
@@ -56,7 +58,7 @@ const app = () => {
5658
</div>
5759
</section>
5860
<ReactTooltip place="bottom" type="dark" effect="solid" />
59-
<ToastContainer position="top-right" autoClose={5000} pauseOnHover={false} />
61+
<ToastContainer position="bottom-left" autoClose={8000} pauseOnHover={false} />
6062
</div>
6163
);
6264
};

‎src/component/modals/ContributeDetails.jsx‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
import React, { useState } from 'react';
2+
import { toast } from 'react-toastify';
3+
import axios from 'axios';
4+
import Modal from './ParentModal';
5+
import { actionType as T } from '../../reducer';
6+
import './contributeDetails.css';
7+
8+
const ContributeDetails = ({ superState, dispatcher }) => {
9+
const closeModal = () => {
10+
dispatcher({ type: T.SET_CONTRIBUTE_MODAL, payload: false });
11+
};
12+
const [study, setStudy] = useState('');
13+
const [path, setPath] = useState('');
14+
const [auth, setAuth] = useState('');
15+
const [title, setTitle] = useState('');
16+
const [desc, setDesc] = useState('');
17+
const [branch, setBranch] = useState('');
18+
const [showAdvanceOptions, setShowAdvanceOptions] = useState(false);
19+
const submit = async (e) => {
20+
if (study === '' || path === '' || auth === '') {
21+
toast.info('Please Provide necessary inputs');
22+
return;
23+
}
24+
const id = toast.loading('Processing your Request.Please wait...');
25+
try {
26+
e.preventDefault();
27+
const result = await axios.post('http://127.0.0.1:5000/contribute', {
28+
study,
29+
auth,
30+
desc,
31+
title,
32+
path,
33+
branch,
34+
});
35+
toast.success(result.data?.message);
36+
} catch (error) {
37+
if (error?.response?.status === 400) {
38+
toast.info(error?.response?.data?.message);
39+
} else {
40+
toast.error(error?.response.data.message);
41+
}
42+
}
43+
toast.dismiss(id);
44+
closeModal();
45+
};
46+
const toggleOptions = () => {
47+
setShowAdvanceOptions(!showAdvanceOptions);
48+
};
49+
return (
50+
<Modal
51+
ModelOpen={superState.contributeModal}
52+
title="Contribute"
53+
closeModal={closeModal}
54+
>
55+
<form className="contribute-details">
56+
<span>Study Name</span>
57+
<input
58+
required
59+
value={study}
60+
onChange={(e) => setStudy(e.target.value)}
61+
/>
62+
<span>Study Path</span>
63+
<input
64+
placeholder="Enter Full Directory Path of Study"
65+
value={path}
66+
onChange={(e) => setPath(e.target.value)}
67+
required
68+
/>
69+
<span>Author Name</span>
70+
<input
71+
value={auth}
72+
onChange={(e) => setAuth(e.target.value)}
73+
required
74+
/>
75+
{showAdvanceOptions && (
76+
<>
77+
<span>Branch Name</span>
78+
<input
79+
value={branch}
80+
onChange={(e) => setBranch(e.target.value)}
81+
/>
82+
<span>Title of Study</span>
83+
<input
84+
value={title}
85+
onChange={(e) => setTitle(e.target.value)}
86+
/>
87+
<span>Description of Study</span>
88+
<textarea
89+
value={desc}
90+
onChange={(e) => setDesc(e.target.value)}
91+
/>
92+
</>
93+
)}
94+
<button type="button" className="btn btn-secondary" onClick={toggleOptions}>
95+
{showAdvanceOptions ? 'Hide ' : 'Show '}
96+
Advance Options
97+
</button>
98+
<div className="expand">
99+
<button type="submit" className="btn btn-primary" onClick={submit}>Generate PR</button>
100+
</div>
101+
</form>
102+
</Modal>
103+
);
104+
};
105+
export default ContributeDetails;

‎src/component/modals/contributeDetails.css‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
.contribute-details{
2+
padding: 20px;
3+
display: grid;
4+
grid-template-columns: auto auto;
5+
gap: 20px;
6+
}
7+
8+
.contribute-details *{
9+
padding: 10px 5px;
10+
text-align: center;
11+
}
12+
13+
.contribute-details .expand{
14+
grid-column: 1 / span 2;
15+
padding: 0;
16+
}
17+
18+
.contribute-details .btn{
19+
width: 100%;
20+
}
21+
.contribute-details .btn-secondary{
22+
align-self: flex-end;
23+
}
24+
.contribute-details textarea{
25+
resize: vertical;
26+
max-height: 200px;
27+
max-width: 300px;
28+
text-align: left;
29+
max-lines: 10;
30+
}
31+
.Toastify__toast-container {
32+
/* width: 350px; */
33+
/* height: 80px; */
34+
padding: 3px 15px;
35+
display: inline-block;
36+
}
37+
38+
.Toastify__toast {
39+
/* width: 350px; */
40+
/* height: 80px; */
41+
width: fit-content;
42+
font-size: 16px;
43+
}

‎src/reducer/actionType.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ const actionType = {
2424
SET_SHARE_MODAL: 'SET_SHARE_MODAL',
2525
SET_SETTING_MODAL: 'SET_SETTING_MODAL',
2626
SET_MARKDOWN_MODAL: 'SET_MARKDOWN_MODAL',
27+
SET_CONTRIBUTE_MODAL: 'SET_CONTRIBUTE_MODAL',
2728
SET_FILE_REF: 'SET_FILE_REF',
2829
SET_HISTORY_MODAL: 'SET_HISTORY_MODAL',
2930
SET_AUTHOR: 'SET_AUTHOR',

‎src/reducer/initialState.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const initialState = {
1515
newGraphModal: false,
1616
optionsModal: false,
1717
markDownModal: false,
18+
contributeModal: false,
1819
eleSelected: false,
1920
drawModeOn: true,
2021
undoEnabled: false,

‎src/reducer/reducer.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ const reducer = (state, action) => {
6666
},
6767
};
6868
}
69+
case T.SET_CONTRIBUTE_MODAL: {
70+
return { ...state, contributeModal: action.payload };
71+
}
6972
case T.Model_Close: return { ...state, ModelOpen: false };
7073
case T.ELE_SELECTED: return { ...state, eleSelected: true, eleSelectedPayload: action.payload };
7174
case T.ELE_UNSELECTED: return { ...state, eleSelected: false };

‎src/toolbarActions/toolbarFunctions.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,10 @@ const clearAll = (state) => {
152152
getGraphFun(state).clearAll();
153153
};
154154

155+
const contribute = (state, setState) => {
156+
setState({ type: T.SET_CONTRIBUTE_MODAL, payload: true });
157+
};
158+
155159
const resetAfterClear = (state) => {
156160
getGraphFun(state).resetAfterClear();
157161
};
@@ -198,5 +202,5 @@ export {
198202
createNode, editElement, deleteElem, downloadImg, saveAction, saveGraphMLFile,
199203
createFile, readFile, readTextFile, newProject, clearAll, editDetails, undo, redo,
200204
openShareModal, openSettingModal, viewHistory, resetAfterClear, toggleLogs,
201-
toggleServer, optionModalToggle,
205+
toggleServer, optionModalToggle, contribute,
202206
};

‎src/toolbarActions/toolbarList.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
import {
1313
createNode, editElement, deleteElem, downloadImg, saveAction, saveGraphMLFile,
1414
createFile, readFile, clearAll, undo, redo, viewHistory, resetAfterClear,
15-
toggleServer, optionModalToggle, toggleLogs,
15+
toggleServer, optionModalToggle, toggleLogs, contribute,
1616
// openSettingModal,
1717
} from './toolbarFunctions';
1818

@@ -255,8 +255,8 @@ const toolbarList = (state, dispatcher) => [
255255
type: 'action',
256256
text: 'Contribute',
257257
icon: FiTriangle,
258-
action: () => { window.open('https://github.com/ControlCore-Project/concore', '_blank'); },
259-
active: state.curGraphInstance || state.uploadedDirName,
258+
action: contribute,
259+
active: true,
260260
visibility: true,
261261
},
262262
// {

0 commit comments

Comments
 (0)