seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

merge conflicts fix

This commit is contained in:
Nuwan 2024-02-05 19:10:40 +05:30
parent 1de7a1f2f2
commit 30aa9eeed2
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jam-ui/src/helpers/rest.js
View File

@ -42,7 +42,6 @@ export const getPeopleIndex = () => {
.catch(error => reject(error));
});
};
<<<<<<< HEAD
export const getLobbyUsers = () => {
return new Promise((resolve, reject) => {
@ -51,27 +50,14 @@ export const getLobbyUsers = () => {
.catch(error => reject(error))
})
}
=======
>>>>>>> c16be142076c0228762477ae926a56507df93da1
export const updateUser = (id, data) => {
return new Promise((resolve, reject) => {
<<<<<<< HEAD
apiFetch(`/users/${id}`, {
method: 'POST',
body: JSON.stringify(data)
})
.then(response => resolve(response))
.catch(error => reject(error))
})
}
=======
apiFetch('/genres')
.then(response => resolve(response))
.catch(error => reject(error));
});
};
>>>>>>> c16be142076c0228762477ae926a56507df93da1
export const getGenres = () => {
return new Promise((resolve, reject) => {