diff options
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/src/App.tsx | 7 | ||||
| -rw-r--r-- | frontend/src/api/Maps.tsx | 4 | ||||
| -rw-r--r-- | frontend/src/components/UploadRunDialog.tsx | 9 |
3 files changed, 12 insertions, 8 deletions
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index d1d501d..6953de9 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx | |||
| @@ -81,7 +81,6 @@ const App: React.FC = () => { | |||
| 81 | 81 | ||
| 82 | return ( | 82 | return ( |
| 83 | <> | 83 | <> |
| 84 | <UploadRunDialog token={token} open={uploadRunDialog} onClose={() => setUploadRunDialog(false)} games={games} /> | ||
| 85 | <Sidebar setToken={setToken} profile={profile} setProfile={setProfile} onUploadRun={() => setUploadRunDialog(true)} /> | 84 | <Sidebar setToken={setToken} profile={profile} setProfile={setProfile} onUploadRun={() => setUploadRunDialog(true)} /> |
| 86 | <Routes> | 85 | <Routes> |
| 87 | <Route path="/" element={<Homepage />} /> | 86 | <Route path="/" element={<Homepage />} /> |
| @@ -95,6 +94,12 @@ const App: React.FC = () => { | |||
| 95 | <Route path='/rankings' element={<Rankings />}></Route> | 94 | <Route path='/rankings' element={<Rankings />}></Route> |
| 96 | <Route path="*" element={"404"} /> | 95 | <Route path="*" element={"404"} /> |
| 97 | </Routes> | 96 | </Routes> |
| 97 | <UploadRunDialog token={token} open={uploadRunDialog} onClose={(updateProfile) => { | ||
| 98 | setUploadRunDialog(false); | ||
| 99 | if (token) { | ||
| 100 | _set_profile(get_user_id_from_token(token)); | ||
| 101 | } | ||
| 102 | }} games={games} /> | ||
| 98 | </> | 103 | </> |
| 99 | ); | 104 | ); |
| 100 | }; | 105 | }; |
diff --git a/frontend/src/api/Maps.tsx b/frontend/src/api/Maps.tsx index 2209788..e57fc45 100644 --- a/frontend/src/api/Maps.tsx +++ b/frontend/src/api/Maps.tsx | |||
| @@ -75,7 +75,7 @@ export const delete_map_discussion = async (token: string, map_id: string, discu | |||
| 75 | return response.data.success; | 75 | return response.data.success; |
| 76 | }; | 76 | }; |
| 77 | 77 | ||
| 78 | export const post_record = async (token: string, run: UploadRunContent): Promise<string> => { | 78 | export const post_record = async (token: string, run: UploadRunContent): Promise<[boolean, string]> => { |
| 79 | if (run.partner_demo) { | 79 | if (run.partner_demo) { |
| 80 | const response = await axios.postForm(url(`maps/${run.map_id}/record`), { | 80 | const response = await axios.postForm(url(`maps/${run.map_id}/record`), { |
| 81 | "host_demo": run.host_demo, | 81 | "host_demo": run.host_demo, |
| @@ -94,7 +94,7 @@ export const post_record = async (token: string, run: UploadRunContent): Promise | |||
| 94 | "Authorization": token, | 94 | "Authorization": token, |
| 95 | } | 95 | } |
| 96 | }); | 96 | }); |
| 97 | return response.data.message; | 97 | return [ response.data.success, response.data.message ]; |
| 98 | } | 98 | } |
| 99 | } | 99 | } |
| 100 | 100 | ||
diff --git a/frontend/src/components/UploadRunDialog.tsx b/frontend/src/components/UploadRunDialog.tsx index a1bebd6..b39aab6 100644 --- a/frontend/src/components/UploadRunDialog.tsx +++ b/frontend/src/components/UploadRunDialog.tsx | |||
| @@ -13,7 +13,7 @@ import useConfirm from '../hooks/UseConfirm'; | |||
| 13 | interface UploadRunDialogProps { | 13 | interface UploadRunDialogProps { |
| 14 | token?: string; | 14 | token?: string; |
| 15 | open: boolean; | 15 | open: boolean; |
| 16 | onClose: () => void; | 16 | onClose: (updateProfile: boolean) => void; |
| 17 | games: Game[]; | 17 | games: Game[]; |
| 18 | } | 18 | } |
| 19 | 19 | ||
| @@ -123,10 +123,9 @@ const UploadRunDialog: React.FC<UploadRunDialogProps> = ({ token, open, onClose, | |||
| 123 | return; | 123 | return; |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | const response = await API.post_record(token, uploadRunContent); | 126 | const [ success, response ] = await API.post_record(token, uploadRunContent); |
| 127 | await message("Upload Record", response); | 127 | await message("Upload Record", response); |
| 128 | // navigate(0); | 128 | onClose(success); |
| 129 | onClose(); | ||
| 130 | } | 129 | } |
| 131 | }; | 130 | }; |
| 132 | 131 | ||
| @@ -193,7 +192,7 @@ const UploadRunDialog: React.FC<UploadRunDialogProps> = ({ token, open, onClose, | |||
| 193 | </div> | 192 | </div> |
| 194 | <div className='upload-run-buttons-container'> | 193 | <div className='upload-run-buttons-container'> |
| 195 | <button onClick={_upload_run}>Submit</button> | 194 | <button onClick={_upload_run}>Submit</button> |
| 196 | <button onClick={() => onClose()}>Cancel</button> | 195 | <button onClick={() => onClose(false)}>Cancel</button> |
| 197 | </div> | 196 | </div> |
| 198 | </div> | 197 | </div> |
| 199 | </> | 198 | </> |