Merge branch 'master' of https://github.com/McMistrzYT/Partypack
This commit is contained in:
commit
537c0966d9
|
@ -35,7 +35,7 @@ export function AdminTrackList() {
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
toast(Res.data.errorMessage, { type: "error" })
|
toast(Res.data.errorMessage, { type: "error" })
|
||||||
}}>Add to Bookmarks</Button>
|
}}>Subscribe</Button>
|
||||||
<Button sx={{ width: "100%", marginBottom: 1 }}>View Details</Button>
|
<Button sx={{ width: "100%", marginBottom: 1 }}>View Details</Button>
|
||||||
<Button sx={{ width: "100%" }} variant="danger">Disable</Button>
|
<Button sx={{ width: "100%" }} variant="danger">Disable</Button>
|
||||||
</Song>
|
</Song>
|
||||||
|
|
|
@ -105,7 +105,7 @@ export function Profile() {
|
||||||
: <Text>You have no activated songs.</Text>
|
: <Text>You have no activated songs.</Text>
|
||||||
}
|
}
|
||||||
</Box>
|
</Box>
|
||||||
<Heading sx={{ marginTop: 2, marginBottom: 2 }}>My Bookmarks</Heading>
|
<Heading sx={{ marginTop: 2, marginBottom: 2 }}>My Subscriptions</Heading>
|
||||||
<Box className="songCategory">
|
<Box className="songCategory">
|
||||||
{
|
{
|
||||||
bookmarkedSongs.length >= 1 ?
|
bookmarkedSongs.length >= 1 ?
|
||||||
|
@ -120,7 +120,11 @@ export function Profile() {
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
toast(Res.data.errorMessage, { type: "error" })
|
toast(Res.data.errorMessage, { type: "error" })
|
||||||
|
<<<<<<< HEAD
|
||||||
}}>Remove Bookmark</Button>
|
}}>Remove Bookmark</Button>
|
||||||
|
=======
|
||||||
|
}}>Unsubscribe</Button>
|
||||||
|
>>>>>>> 824392fdeb17b22dee7e03d7a5c6a381fa7ca5a2
|
||||||
</Song>;
|
</Song>;
|
||||||
})
|
})
|
||||||
: <Text>You have no bookmarked songs.</Text>
|
: <Text>You have no bookmarked songs.</Text>
|
||||||
|
|
|
@ -47,7 +47,11 @@ export function Tracks() {
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
toast(Res.data.errorMessage, { type: "error" })
|
toast(Res.data.errorMessage, { type: "error" })
|
||||||
|
<<<<<<< HEAD
|
||||||
}}>Remove Bookmark</Button> :
|
}}>Remove Bookmark</Button> :
|
||||||
|
=======
|
||||||
|
}}>Unsubscribe</Button> :
|
||||||
|
>>>>>>> 824392fdeb17b22dee7e03d7a5c6a381fa7ca5a2
|
||||||
<Button sx={{ width: "100%", marginBottom: 1 }} variant="primary" onClick={async () => {
|
<Button sx={{ width: "100%", marginBottom: 1 }} variant="primary" onClick={async () => {
|
||||||
if (!state.UserDetails)
|
if (!state.UserDetails)
|
||||||
{
|
{
|
||||||
|
@ -65,7 +69,7 @@ export function Tracks() {
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
toast(Res.data.errorMessage, { type: "error" })
|
toast(Res.data.errorMessage, { type: "error" })
|
||||||
}}>Add to Bookmarks</Button>
|
}}>Subscribe</Button>
|
||||||
}
|
}
|
||||||
</Song>
|
</Song>
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue
Block a user