diff options
| author | Wolfboy248 <georgejvindkarlsen@gmail.com> | 2024-10-30 10:03:28 +0100 |
|---|---|---|
| committer | Wolfboy248 <georgejvindkarlsen@gmail.com> | 2024-10-30 10:03:28 +0100 |
| commit | c909aa9a9d2547d1b5366ed99962a0e97ba4becc (patch) | |
| tree | 33b8d3d2662d4a6f79630e4383e2ff989c56fb37 | |
| parent | frontend: random css stuff (diff) | |
| parent | backend: order map routes (diff) | |
| download | lphub-c909aa9a9d2547d1b5366ed99962a0e97ba4becc.tar.gz lphub-c909aa9a9d2547d1b5366ed99962a0e97ba4becc.tar.bz2 lphub-c909aa9a9d2547d1b5366ed99962a0e97ba4becc.zip | |
Merge branch 'typescript' of https://github.com/pektezol/LeastPortalsHub into typescript
| -rw-r--r-- | backend/handlers/map.go | 2 | ||||
| -rw-r--r-- | frontend/src/components/Summary.tsx | 2 | ||||
| -rw-r--r-- | frontend/src/pages/Maps.tsx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/backend/handlers/map.go b/backend/handlers/map.go index 33910fe..b2a0b91 100644 --- a/backend/handlers/map.go +++ b/backend/handlers/map.go | |||
| @@ -92,7 +92,7 @@ func FetchMapSummary(c *gin.Context) { | |||
| 92 | INNER JOIN categories c ON mh.category_id = c.id | 92 | INNER JOIN categories c ON mh.category_id = c.id |
| 93 | LEFT JOIN map_ratings rt ON mh.map_id = rt.map_id AND mh.category_id = rt.category_id | 93 | LEFT JOIN map_ratings rt ON mh.map_id = rt.map_id AND mh.category_id = rt.category_id |
| 94 | WHERE mh.map_id = $1 AND mh.score_count = mh.score_count GROUP BY mh.id, c.id, mh.user_name, mh.score_count, mh.record_date, mh.description, mh.showcase | 94 | WHERE mh.map_id = $1 AND mh.score_count = mh.score_count GROUP BY mh.id, c.id, mh.user_name, mh.score_count, mh.record_date, mh.description, mh.showcase |
| 95 | ORDER BY mh.record_date ASC;` | 95 | ORDER BY mh.category_id ASC, mh.score_count ASC;` |
| 96 | rows, err := database.DB.Query(sql, id) | 96 | rows, err := database.DB.Query(sql, id) |
| 97 | if err != nil { | 97 | if err != nil { |
| 98 | c.JSON(http.StatusOK, models.ErrorResponse(err.Error())) | 98 | c.JSON(http.StatusOK, models.ErrorResponse(err.Error())) |
diff --git a/frontend/src/components/Summary.tsx b/frontend/src/components/Summary.tsx index aa351da..23da82c 100644 --- a/frontend/src/components/Summary.tsx +++ b/frontend/src/components/Summary.tsx | |||
| @@ -57,7 +57,7 @@ const Summary: React.FC<SummaryProps> = ({ selectedRun, setSelectedRun, data }) | |||
| 57 | 57 | ||
| 58 | React.useEffect(() => { | 58 | React.useEffect(() => { |
| 59 | _select_run(0, selectedCategory); | 59 | _select_run(0, selectedCategory); |
| 60 | }, [selectedCategory]); | 60 | }, []); |
| 61 | 61 | ||
| 62 | return ( | 62 | return ( |
| 63 | <> | 63 | <> |
diff --git a/frontend/src/pages/Maps.tsx b/frontend/src/pages/Maps.tsx index bc939cf..9862cbb 100644 --- a/frontend/src/pages/Maps.tsx +++ b/frontend/src/pages/Maps.tsx | |||
| @@ -83,7 +83,7 @@ const Maps: React.FC<MapProps> = ({ token, isModerator }) => { | |||
| 83 | <section id='section1' className='summary1'> | 83 | <section id='section1' className='summary1'> |
| 84 | <div> | 84 | <div> |
| 85 | <Link to="/games"><button className='nav-button' style={{ borderRadius: "20px 0px 0px 20px" }}><i className='triangle'></i><span>Games List</span></button></Link> | 85 | <Link to="/games"><button className='nav-button' style={{ borderRadius: "20px 0px 0px 20px" }}><i className='triangle'></i><span>Games List</span></button></Link> |
| 86 | <Link to={`/games/${!mapSummaryData.map.is_coop ? "1" : "2"}?chapter=${mapSummaryData.map.chapter_name.split(" ")[1]}`}><button className='nav-button' style={{ borderRadius: "0px 20px 20px 0px", marginLeft: "2px" }}><i className='triangle'></i><span>{mapSummaryData.map.chapter_name}</span></button></Link> | 86 | <Link to={`/games/${mapSummaryData.map.is_coop ? "1" : "2"}?chapter=${mapSummaryData.map.chapter_name.split(" ")[1]}`}><button className='nav-button' style={{ borderRadius: "0px 20px 20px 0px", marginLeft: "2px" }}><i className='triangle'></i><span>{mapSummaryData.map.chapter_name}</span></button></Link> |
| 87 | <br /><span><b>{mapSummaryData.map.map_name}</b></span> | 87 | <br /><span><b>{mapSummaryData.map.map_name}</b></span> |
| 88 | </div> | 88 | </div> |
| 89 | </section> | 89 | </section> |