From f0aca03017d0dab8d358961905a71ea81d0de606 Mon Sep 17 00:00:00 2001
From: Luis Felipe Risch <lfr20@inf.ufpr.br>
Date: Wed, 5 May 2021 12:49:03 -0300
Subject: [PATCH] changed the user items to the correct router
---
src/Components/BadgesModal.js | 42 ++++++++++++++++++++++++++++++-----
1 file changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/Components/BadgesModal.js b/src/Components/BadgesModal.js
index 3709bd58..8632a38e 100644
--- a/src/Components/BadgesModal.js
+++ b/src/Components/BadgesModal.js
@@ -129,7 +129,7 @@ export default function FullScreenDialog(props) {
const [loadingCardFrame, setLoadingCardFrame] = useState(true)
const buildUrl = (objType, page) => {
- return `/user_items/?item_type=${objType}&page=${page}&range=[0,9]&results_per_page=10&sort=["id","DESC"]`
+ return `/users/${state.currentUser.id}/items/?item_type=${objType}&being_used=false&page=${page}&range=[0,9]&results_per_page=10&sort=["id","DESC"]`
}
const handleUserItems = (userItems) => {
@@ -170,16 +170,24 @@ export default function FullScreenDialog(props) {
}
)
}, [state.currentUser.id])
+
useEffect(() => {
setDisabledBadges(true)
getRequest(
buildUrl("badge", currBadgePage),
(data, header) => {
+ const newData = []
if (data.length === 0)
setStopLoadingBadges(true)
if (header.has('X-Total-Count'))
setTotalBadges(header.get('X-Total-Count'))
- setBadges((previous) => previous.concat(data))
+
+ for (let index = 0; index < data.length; index++) {
+ const item = data[index].item;
+ newData.push(item)
+ }
+
+ setBadges((previous) => previous.concat(newData))
setDisabledBadges(false)
setLoadingBadge(false)
},
@@ -196,11 +204,19 @@ export default function FullScreenDialog(props) {
getRequest(
buildUrl("avatar_frame", currAvatarFramePage),
(data, header) => {
+ const newData = []
+
if (data.length === 0)
setStopLoadingAvatarFrame(true)
if (header.has('X-Total-Count'))
setTotalAvatarFrame(header.get('X-Total-Count'))
- setAvatarFrames((previous) => previous.concat(data))
+
+ for (let index = 0; index < data.length; index++) {
+ const item = data[index].item;
+ newData.push(item)
+ }
+
+ setAvatarFrames((previous) => previous.concat(newData))
setDisabledAvatarFrame(false)
setLoadingAvatarFrame(false)
},
@@ -217,11 +233,19 @@ export default function FullScreenDialog(props) {
getRequest(
buildUrl("cover_frame", currCoverFramePage),
(data, header) => {
+ const newData = []
+
if (data.length === 0)
setStopLoadingCoverFrame(true)
if (header.has('X-Total-Count'))
setTotalCoverFrame(header.get('X-Total-Count'))
- setCoverFrames((previous) => previous.concat(data))
+
+ for (let index = 0; index < data.length; index++) {
+ const item = data[index].item;
+ newData.push(item)
+ }
+
+ setCoverFrames((previous) => previous.concat(newData))
setDisabledCoverFrame(false)
setLoadingCoverFrame(false)
},
@@ -238,11 +262,19 @@ export default function FullScreenDialog(props) {
getRequest(
buildUrl("card_frame", currCardFramePage),
(data, header) => {
+ const newData = []
+
if (data.length === 0)
setStopLoadingCardFrame(true)
if (header.has('X-Total-Count'))
setTotalCardFrame(header.get('X-Total-Count'))
- setCardFrames((previous) => previous.concat(data))
+
+ for (let index = 0; index < data.length; index++) {
+ const item = data[index].item;
+ newData.push(item)
+ }
+
+ setCardFrames((previous) => previous.concat(newData))
setDisabledCardFrame(false)
setLoadingCardFrame(false)
},
--
GitLab