From 30173a5bbd3a8d8e72c95b00b562330ae9243adb Mon Sep 17 00:00:00 2001 From: alex 3 Date: Tue, 19 Dec 2023 17:34:35 -0500 Subject: [PATCH] new currently playing music card --- next.config.mjs | 5 ++ package-lock.json | 91 ++++++++++++++++++++++++++++++++++ package.json | 1 + src/components/MusicCard.tsx | 30 +++++++++++ src/components/footer.tsx | 2 +- src/pages/index.tsx | 6 ++- src/server/api/root.ts | 4 +- src/server/api/routers/misc.ts | 39 +++++++++++++++ 8 files changed, 175 insertions(+), 3 deletions(-) create mode 100644 src/components/MusicCard.tsx create mode 100644 src/server/api/routers/misc.ts diff --git a/next.config.mjs b/next.config.mjs index d88475a..c6b20d6 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -22,6 +22,11 @@ const config = { protocol: "https", port: '', hostname: "storage.thatalex.dev" + }, + { + protocol: "https", + port: '', + hostname: "lastfm.freetls.fastly.net" } ] } diff --git a/package-lock.json b/package-lock.json index 8035c06..84cf9d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "@trpc/next": "^10.37.1", "@trpc/react-query": "^10.37.1", "@trpc/server": "^10.37.1", + "axios": "^1.6.2", "grommet-icons": "^4.11.0", "next": "^13.5.4", "next-auth": "^4.23.0", @@ -1119,6 +1120,11 @@ "has-symbols": "^1.0.3" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/autoprefixer": { "version": "10.4.16", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz", @@ -1177,6 +1183,16 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", + "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/axobject-query": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", @@ -1404,6 +1420,17 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", @@ -1552,6 +1579,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/dequal": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", @@ -2292,6 +2327,25 @@ "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, + "node_modules/follow-redirects": { + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", @@ -2301,6 +2355,19 @@ "is-callable": "^1.1.3" } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fraction.js": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", @@ -3245,6 +3312,25 @@ "node": ">=8.6" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -3977,6 +4063,11 @@ "react-is": "^16.13.1" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/punycode": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", diff --git a/package.json b/package.json index efeb183..4a30d18 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "@trpc/next": "^10.37.1", "@trpc/react-query": "^10.37.1", "@trpc/server": "^10.37.1", + "axios": "^1.6.2", "grommet-icons": "^4.11.0", "next": "^13.5.4", "next-auth": "^4.23.0", diff --git a/src/components/MusicCard.tsx b/src/components/MusicCard.tsx new file mode 100644 index 0000000..5b45209 --- /dev/null +++ b/src/components/MusicCard.tsx @@ -0,0 +1,30 @@ +import Image from "next/image"; +import Link from "next/link"; +import { api } from "@/utils/api"; + +export default function MusicCard() { + const musicFetch = api.misc.song.useQuery() + + if (musicFetch.data) { + return ( + +
+
+
+ Cover Art +
+
+

{musicFetch.data.track.name}

+

{musicFetch.data.track.artist["#text"]}

+
+
+
+ + ) + } +} \ No newline at end of file diff --git a/src/components/footer.tsx b/src/components/footer.tsx index 0b2033a..a8c4c0e 100644 --- a/src/components/footer.tsx +++ b/src/components/footer.tsx @@ -11,7 +11,7 @@ export default function Footer() {

- All music, game, TV and movie covers are owned by their respective authors. + All music, game, TV and movie covers are owned by their respective authors.
Currently playing info provided by Last.fm

© Alex Frantz, 2023 diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 9296cef..a14a190 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -2,6 +2,7 @@ import RootLayout from "@/components/RootLayout"; import Dropdown from "@/components/Dropdown"; import ProjectCard from "@/components/ProjectsCard"; import Image from 'next/image'; +import MusicCard from '@/components/MusicCard' export default function Home() { return ( @@ -45,6 +46,9 @@ function Music() { 5 Seconds of Summer Cover, TLOU Covers and Rarities Cover, Zach Bryan Cover, - Reputation Cover + Reputation Cover, +

+ +
] } \ No newline at end of file diff --git a/src/server/api/root.ts b/src/server/api/root.ts index fc64610..b72aedb 100644 --- a/src/server/api/root.ts +++ b/src/server/api/root.ts @@ -1,5 +1,6 @@ import { postRouter } from "@/server/api/routers/post"; import { linksRouter } from "./routers/links"; +import { miscRouter } from "./routers/misc"; import { createTRPCRouter } from "@/server/api/trpc"; /** @@ -9,7 +10,8 @@ import { createTRPCRouter } from "@/server/api/trpc"; */ export const appRouter = createTRPCRouter({ post: postRouter, - links: linksRouter + links: linksRouter, + misc: miscRouter }); // export type definition of API diff --git a/src/server/api/routers/misc.ts b/src/server/api/routers/misc.ts new file mode 100644 index 0000000..4de389c --- /dev/null +++ b/src/server/api/routers/misc.ts @@ -0,0 +1,39 @@ +import axios from 'axios'; + +import { + createTRPCRouter, + publicProcedure +} from '@/server/api/trpc'; + +type ImageListType = { + "size": string, + "#text": string +} + +type LastTrackType = { + status: number, + track: { + "@attr": object, + "album": { + "mbid": string, + "#text": string + }, + "artist": { + "mbid": string, + "#text": string, + }, + "image": ImageListType[], + "mbid": string, + "name": string, + "streamable": number, + "url": string + } +} + +export const miscRouter = createTRPCRouter({ + song: publicProcedure + .query(async () => { + const response = await axios.get("https://api.thatalex.dev/v3/music/last-track") + return response.data + }), +}) \ No newline at end of file