diff --git a/Saved/Songs/Example/Config.json b/Saved/Songs/Example/Config.json
deleted file mode 100644
index e4b457e..0000000
--- a/Saved/Songs/Example/Config.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "Name": "Dubidubidu",
- "Year": 2003,
- "Artist": "Christell",
- "Length": 224,
- "UUID": "runit",
- "PreviewTime": 0,
- "MinorMajor": "Minor",
- "Key": "A",
- "Album": "Christell",
- "GuitarType": "Keytar",
- "BeatsPerMinute": 145,
- "AssetID": "SID_Placeholder_59",
- "JoinCode": "0000-0000-0000",
- "LipsyncData": "https://cdn2.unrealengine.com/saveyourtears-3b556f295b86.lad",
- "Cover": "https://steamuserimages-a.akamaihd.net/ugc/2319980071298431643/13F80F955F3612EF407370E522ABA956D690374E/?imw=512&&ima=fit&impolicy=Letterbox&imcolor=%23000000&letterbox=false"
-}
\ No newline at end of file
diff --git a/Saved/Songs/Example/Dogsong.mp3 b/Saved/Songs/Example/Dogsong.mp3
deleted file mode 100644
index c0197b5..0000000
Binary files a/Saved/Songs/Example/Dogsong.mp3 and /dev/null differ
diff --git a/Server/Saved/Songs/ButterBarnHoedown/Cover.png b/Server/Saved/Songs/ButterBarnHoedown/Cover.png
new file mode 100644
index 0000000..99331c5
Binary files /dev/null and b/Server/Saved/Songs/ButterBarnHoedown/Cover.png differ
diff --git a/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00001.m4s b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00001.m4s
new file mode 100644
index 0000000..eb617fd
Binary files /dev/null and b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00001.m4s differ
diff --git a/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00002.m4s b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00002.m4s
new file mode 100644
index 0000000..9908a37
Binary files /dev/null and b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00002.m4s differ
diff --git a/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00003.m4s b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00003.m4s
new file mode 100644
index 0000000..653867c
Binary files /dev/null and b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00003.m4s differ
diff --git a/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00004.m4s b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00004.m4s
new file mode 100644
index 0000000..2dc6e1a
Binary files /dev/null and b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00004.m4s differ
diff --git a/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00005.m4s b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00005.m4s
new file mode 100644
index 0000000..c0c4bde
Binary files /dev/null and b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00005.m4s differ
diff --git a/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00006.m4s b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00006.m4s
new file mode 100644
index 0000000..f34178d
Binary files /dev/null and b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00006.m4s differ
diff --git a/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00007.m4s b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00007.m4s
new file mode 100644
index 0000000..d2af797
Binary files /dev/null and b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00007.m4s differ
diff --git a/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00008.m4s b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00008.m4s
new file mode 100644
index 0000000..62bd3e0
Binary files /dev/null and b/Server/Saved/Songs/Dogsong/Chunks/chunk-stream0-00008.m4s differ
diff --git a/Server/Saved/Songs/Dogsong/Chunks/init-stream0.m4s b/Server/Saved/Songs/Dogsong/Chunks/init-stream0.m4s
new file mode 100644
index 0000000..dcd866d
Binary files /dev/null and b/Server/Saved/Songs/Dogsong/Chunks/init-stream0.m4s differ
diff --git a/Server/Saved/Songs/Dogsong/Cover.png b/Server/Saved/Songs/Dogsong/Cover.png
new file mode 100644
index 0000000..dd660ca
Binary files /dev/null and b/Server/Saved/Songs/Dogsong/Cover.png differ
diff --git a/Server/Saved/Songs/Dogsong/Data.mid b/Server/Saved/Songs/Dogsong/Data.mid
new file mode 100644
index 0000000..50e8d7b
Binary files /dev/null and b/Server/Saved/Songs/Dogsong/Data.mid differ
diff --git a/Server/Saved/Songs/Dogsong/Dogsong.m4a b/Server/Saved/Songs/Dogsong/Dogsong.m4a
new file mode 100644
index 0000000..1962042
Binary files /dev/null and b/Server/Saved/Songs/Dogsong/Dogsong.m4a differ
diff --git a/Server/Saved/Songs/Dogsong/Manifest.mpd b/Server/Saved/Songs/Dogsong/Manifest.mpd
new file mode 100644
index 0000000..2267abf
--- /dev/null
+++ b/Server/Saved/Songs/Dogsong/Manifest.mpd
@@ -0,0 +1,31 @@
+
+
+ {BASEURL}
+
+ Dogsong
+
+
+
+
+
+
+
+
+
+ 
Partypack
- Daily Rotation
- Leaderboards
- Tracks
- Tutorials
- FAQ
+ navigate("/rotation")}>Daily Rotation
+ navigate("/creators")}>Top Creators
+ navigate("/tracks")}>Tracks
+ navigate("/tutorials")}>Tutorials
+ navigate("/faq")}>FAQ
window.open("https://discord.gg/KaxknAbqDS")}>Discord
- Download
+ navigate("/download")}>Download
{ cookies["AdminKey"] ? navigate("/admin")} sx={{ cursor: "pointer", color: "danger.emphasis" }}>Admin : <> }
{
cookies["Token"] && state.UserDetails ?
navigate("/profile")}> :
- discordUrl ? window.location.assign(discordUrl) : console.log("no discord url :(")}>
+ state.DiscordOauthURL ? window.location.assign(state.DiscordOauthURL) : toast("Cannot redirect to login. No Discord OAuth URL has been received from the backend.", { type: "error" })}>
}
);
diff --git a/src/components/Song.tsx b/src/components/Song.tsx
index 0980b79..0d27b6d 100644
--- a/src/components/Song.tsx
+++ b/src/components/Song.tsx
@@ -1,13 +1,13 @@
import { Box, Text } from "@primer/react";
import { Divider } from "@primer/react/lib-esm/ActionList/Divider";
-export function Song({ children }: { children: JSX.Element[] }) {
+export function Song({ data, children }: { data: any, children: JSX.Element[] | JSX.Element | string }) {
return (
- 
+ 
- Someone
- Someone's Song Someone's Song
+ {data.ArtistName}
+ {data.Name}
{children}
diff --git a/src/css/index.css b/src/css/index.css
index f48d3a3..85c72af 100644
--- a/src/css/index.css
+++ b/src/css/index.css
@@ -1,8 +1,14 @@
.content {
padding: 10px;
+ margin-left: 15%;
+ margin-right: 15%;
}
.songCategory {
display: inline-flex;
gap: 10px;
+}
+
+#__primerPortalRoot__ > div {
+ z-index: 1000 !important;
}
\ No newline at end of file
diff --git a/src/routes/AdminTrackList.tsx b/src/routes/AdminTrackList.tsx
index f27a6ec..463a8b3 100644
--- a/src/routes/AdminTrackList.tsx
+++ b/src/routes/AdminTrackList.tsx
@@ -1,9 +1,47 @@
-import { Text } from "@primer/react";
+import axios from "axios";
+import { Box, Button, Heading } from "@primer/react";
+import { useEffect, useState } from "react";
+import { toast } from "react-toastify";
+import { Song } from "../components/Song";
+import { useNavigate } from "react-router-dom";
export function AdminTrackList() {
+ const [tracks, setTracks] = useState([]);
+ const navigate = useNavigate();
+
+ useEffect(() => {
+ (async () => {
+ const Tracks = await axios.get("/admin/api/tracks");
+ if (Tracks.status !== 200)
+ return toast("Error while requesting tracks!");
+
+ setTracks(Tracks.data);
+ })();
+ }, []);
+
return (
<>
- Track list
+ All tracks (admin)
+
+ {
+ tracks.map(x => {
+ return
+
+
+
+
+ })
+ }
+
)
}
\ No newline at end of file
diff --git a/src/routes/Profile.tsx b/src/routes/Profile.tsx
index dcb74c3..3c5d1e0 100644
--- a/src/routes/Profile.tsx
+++ b/src/routes/Profile.tsx
@@ -1,59 +1,136 @@
-import { Avatar, Box, Button, Heading, Text } from "@primer/react"
+import { ActionList, ActionMenu, Avatar, Box, Button, Dialog, Heading, Text } from "@primer/react"
import { Divider } from "@primer/react/lib-esm/ActionList/Divider";
import { PageHeader } from "@primer/react/drafts";
-import { useContext } from "react";
+import { useContext, useEffect, useState } from "react";
import { SiteContext } from "../utils/State";
import { useCookies } from "react-cookie";
import { useNavigate } from "react-router-dom";
import { Song } from "../components/Song";
+import axios from "axios";
+import { toast } from "react-toastify";
export function Profile() {
- const { state, setState } = useContext(SiteContext);
- const [, , removeCookie] = useCookies();
- const navigate = useNavigate();
+ const { state, setState } = useContext(SiteContext);
+ const [, , removeCookie] = useCookies();
+ const [isActivateDialogOpen, setIsActivateDialogOpen] = useState(false);
+ const [librarySongs, setLibrarySongs] = useState([]);
+ const [bookmarkedSongs, setBookmarkedSongs] = useState([]);
+ const [availableOverrides, setAvailableOverrides] = useState<{ Name: string, Template: string }[]>([]);
+ const [overriding, setOverriding] = useState({});
+ const navigate = useNavigate();
- return (
- <>
- {
- state.UserDetails ?
-
-
-
-
-
-
-
- {state.UserDetails.GlobalName} (@{state.UserDetails.Username})
-
-
-
-
-
-
-
- Active Songs
-
-
- Overriding: Party Rock Anthem
-
-
-
- My Bookmarks
-
-
-
-
-
-
-
-
-
-
- :
- <>
- You are not logged in.
Log in using the button in the top right.
-
- }
-
- )
+ useEffect(() => {
+ (async () => {
+ const Data = await axios.get("/api/library/me");
+ const Overrides = await axios.get("/api/library/available");
+
+ if (Data.status !== 200 || Overrides.status !== 200)
+ return toast("An error has occured while getting your library!", { type: "error" });
+
+ const LibSongs = (await Promise.all(Data.data.Library.map((x: { SongID: string; }) => axios.get(`/api/library/song/data/${x.SongID}`)))).map(x => { return { ...x.data, Override: Data.data.Library.find((y: { SongID: string; }) => y.SongID === x.data.ID).Overriding } });
+ const BookSongs = (await Promise.all(Data.data.Bookmarks.map((x: { ID: string; }) => axios.get(`/api/library/song/data/${x.ID}`)))).map(x => x.data);
+ setLibrarySongs(LibSongs);
+ setBookmarkedSongs(BookSongs);
+ setAvailableOverrides(Overrides.data);
+ })();
+ }, []);
+
+ return (
+ <>
+ {
+ state.UserDetails ?
+
+
+
+
+
+
+
+ {state.UserDetails.GlobalName} (@{state.UserDetails.Username})
+
+
+
+
+
+
+
+ Active Songs
+
+
+ {
+ librarySongs.length >= 1 ?
+ librarySongs.map(x => {
+ return
+ Overriding: {availableOverrides.find(y => y.Template.toLowerCase() === x.Override.toLowerCase())?.Name}
+
+ ;
+ })
+ : You have no activated songs.
+ }
+
+ My Bookmarks
+
+ {
+ bookmarkedSongs.length >= 1 ?
+ bookmarkedSongs.map(x => {
+ return
+
+
+ ;
+ })
+ : You have no bookmarked songs.
+ }
+
+ :
+ <>
+ You are not logged in.
Log in using the button in the top right.
+
+ }
+
+ )
}
\ No newline at end of file
diff --git a/src/routes/Tracks.tsx b/src/routes/Tracks.tsx
new file mode 100644
index 0000000..75c836c
--- /dev/null
+++ b/src/routes/Tracks.tsx
@@ -0,0 +1,79 @@
+import { Box, Button, Heading } from "@primer/react";
+import { Song } from "../components/Song";
+import { useContext, useEffect, useState } from "react";
+import axios from "axios";
+import { toast } from "react-toastify";
+import { SiteContext } from "../utils/State";
+
+export function Tracks() {
+ const [trackData, setTrackData] = useState<{ Header: string, Songs: unknown[] }[]>([]);
+ const [bookmarks, setBookmarks] = useState([]);
+ const {state} = useContext(SiteContext);
+
+ useEffect(() => {
+ (async () => {
+ const Discovery = await axios.get("/api/discovery");
+ if (Discovery.status !== 200)
+ return toast(Discovery.data.errorMessage, { type: "error" });
+
+ setTrackData(Discovery.data);
+
+ const Bookmarks = await axios.get("/api/library/me");
+ if (Bookmarks.status !== 200)
+ return// toast(Bookmarks.data.errorMessage, { type: "error" });
+
+ setBookmarks(Bookmarks.data.Bookmarks);
+ })();
+ }, [])
+
+ return (
+ <>
+ {
+ trackData.map(x => {
+ return
+ {x.Header}
+
+ {
+ x.Songs.map(x => {
+ return
+ {
+ bookmarks.findIndex(y => y.ID === x.ID) !== -1 ?
+ :
+
+ }
+
+ })
+ }
+
+
+ })
+ }
+
+ )
+}
\ No newline at end of file
diff --git a/src/utils/State.ts b/src/utils/State.ts
index 3aaf1be..b0f9f0d 100644
--- a/src/utils/State.ts
+++ b/src/utils/State.ts
@@ -6,7 +6,8 @@ export const SiteContext = createContext({} as IContext);
export interface UserDetailInterface { ID: string, Username: string, GlobalName: string, Avatar: string }
export interface SiteState {
- UserDetails: UserDetailInterface | null
+ UserDetails: UserDetailInterface | null;
+ DiscordOauthURL: string | null;
}
export interface IContext {
diff --git a/tsconfig.json b/tsconfig.json
index a7fc6fb..7891d62 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,6 +16,7 @@
/* Linting */
"strict": true,
+ "noImplicitAny": false,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true