diff --git a/src/components/ProjectComponents/RecentListens.tsx b/src/components/ProjectComponents/RecentListens.tsx index 9a67b4e..b94dea1 100644 --- a/src/components/ProjectComponents/RecentListens.tsx +++ b/src/components/ProjectComponents/RecentListens.tsx @@ -53,7 +53,7 @@ export default function RecentListens() { if (data) { return ( -
+
{ (loading) ? (

Loading..

diff --git a/src/components/ProjectComponents/RecentPhoto.tsx b/src/components/ProjectComponents/RecentPhoto.tsx index bc8632c..fbbfa36 100644 --- a/src/components/ProjectComponents/RecentPhoto.tsx +++ b/src/components/ProjectComponents/RecentPhoto.tsx @@ -1,12 +1,5 @@ import { useState, useEffect } from 'react'; -type PhotoDataResponse = { - result: { - data: { - json: PhotoData[] - } - } -}; type PhotoData = { id: number, name: string, @@ -15,12 +8,12 @@ type PhotoData = { } export default function RecentPhoto() { - const [ data, setData ] = useState(null); + const [ data, setData ] = useState(null); const [ loading, setLoading ] = useState(true); const [ errorState, setErrorState ] = useState(null); useEffect(() => { - fetch("https://photos-cors.alexav.gg", { + fetch("https://api.alexav.gg/v4/social/photos", { method: 'get', headers: { 'content-type': 'application/json' @@ -29,8 +22,8 @@ export default function RecentPhoto() { .then(async (res) => { if (res.ok) { console.log("ok!") - const json = await res.json() as PhotoDataResponse[]; - setData(json[0].result.data.json); + const json = await res.json() + setData(json.data[0]); setLoading(false) } else { console.log("not ok :(") @@ -43,6 +36,9 @@ export default function RecentPhoto() { setErrorState(e.message) }) }, []); + useEffect(() => { + console.log(data) + }, [data]) const parseDate = (date: Date) => { const jsDate = new Date(date); @@ -51,20 +47,20 @@ export default function RecentPhoto() { return (
-
+
{ (loading) ? (

Loading..

) : (!errorState && data) ? (
-

{data[0].name}

+

{data.name}

-

{parseDate(data[0].dateTaken as Date)}

+

{parseDate(data.dateTaken as Date)}

) : ( diff --git a/src/components/ProjectComponents/RecentWatch.tsx b/src/components/ProjectComponents/RecentWatch.tsx index 8d598ec..86390d3 100644 --- a/src/components/ProjectComponents/RecentWatch.tsx +++ b/src/components/ProjectComponents/RecentWatch.tsx @@ -1,11 +1,8 @@ import { useState, useEffect } from 'react'; type WatchDataResponse = { - result: { - data: { - json: WatchData - } - } + status: number, + data: WatchData }; type WatchData = { id: number, @@ -27,13 +24,13 @@ export default function RecentWatch() { const [ errorState, setErrorState ] = useState(""); useEffect(() => { - fetch("https://watch-cors.alexav.gg", { + fetch("https://api.alexav.gg/v4/social/watch", { method: 'get' }) .then(async (res) => { if (res.ok) { const json = await res.json() as WatchDataResponse; - setData(json.result.data.json); + setData(json.data); setLoading(false) } else { setErrorState("Failed to fetch data!"); @@ -53,7 +50,7 @@ export default function RecentWatch() { return (
-
+
{ loading ? (

Loading..