GivFNZ/my-website
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: GivFNZ:main
Branches Tags
GivFNZ:main
aidan:main
..
compare: aidan:main
Branches Tags
aidan:main
GivFNZ:main

No commits in common. "main" and "main" have entirely different histories.
main ... main

7 changed files with 3808 additions and 3741 deletions
Show Stats Expand all files Collapse all files

2
.env.example
View File

@ -1,2 +0,0 @@
VITE_GIV_EMAIL = 'youremail@email.com'
VITE_LAST_USERNAME = 'your_last_username'

90
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "givs-website-react", "name": "givs-website-react",
"version": "1.3.3", "version": "1.2.4",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "givs-website-react", "name": "givs-website-react",
"version": "1.3.3", "version": "1.2.4",
"dependencies": { "dependencies": {
"@fontsource-variable/red-hat-display": "^5.1.1", "@fontsource-variable/red-hat-display": "^5.1.1",
"@fortawesome/fontawesome-svg-core": "^6.7.2", "@fortawesome/fontawesome-svg-core": "^6.7.2",
@ -15,6 +15,7 @@
"@tanstack/react-query": "^5.69.0", "@tanstack/react-query": "^5.69.0",
"@types/node": "^22.13.0", "@types/node": "^22.13.0",
"axios": "^1.8.4", "axios": "^1.8.4",
"dotenv": "^16.4.7",
"fs": "^0.0.1-security", "fs": "^0.0.1-security",
"i18next": "^24.2.2", "i18next": "^24.2.2",
"i18next-browser-languagedetector": "^8.0.4", "i18next-browser-languagedetector": "^8.0.4",
@ -208,25 +209,25 @@
} }
}, },
"node_modules/@babel/helpers": { "node_modules/@babel/helpers": {
"version": "7.27.0", "version": "7.26.7",
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz",
"integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==", "integrity": "sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/template": "^7.27.0", "@babel/template": "^7.25.9",
"@babel/types": "^7.27.0" "@babel/types": "^7.26.7"
}, },
"engines": { "engines": {
"node": ">=6.9.0" "node": ">=6.9.0"
} }
}, },
"node_modules/@babel/parser": { "node_modules/@babel/parser": {
"version": "7.27.0", "version": "7.26.7",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz",
"integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==", "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/types": "^7.27.0" "@babel/types": "^7.26.7"
}, },
"bin": { "bin": {
"parser": "bin/babel-parser.js" "parser": "bin/babel-parser.js"
@ -266,9 +267,9 @@
} }
}, },
"node_modules/@babel/runtime": { "node_modules/@babel/runtime": {
"version": "7.27.0", "version": "7.26.9",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.9.tgz",
"integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==", "integrity": "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==",
"dependencies": { "dependencies": {
"regenerator-runtime": "^0.14.0" "regenerator-runtime": "^0.14.0"
}, },
@ -277,14 +278,14 @@
} }
}, },
"node_modules/@babel/template": { "node_modules/@babel/template": {
"version": "7.27.0", "version": "7.25.9",
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
"integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==", "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/code-frame": "^7.26.2", "@babel/code-frame": "^7.25.9",
"@babel/parser": "^7.27.0", "@babel/parser": "^7.25.9",
"@babel/types": "^7.27.0" "@babel/types": "^7.25.9"
}, },
"engines": { "engines": {
"node": ">=6.9.0" "node": ">=6.9.0"
@ -318,9 +319,9 @@
} }
}, },
"node_modules/@babel/types": { "node_modules/@babel/types": {
"version": "7.27.0", "version": "7.26.7",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz",
"integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==", "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/helper-string-parser": "^7.25.9", "@babel/helper-string-parser": "^7.25.9",
@ -1311,6 +1312,11 @@
"@babel/types": "^7.20.7" "@babel/types": "^7.20.7"
} }
}, },
"node_modules/@types/cookie": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
"integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="
},
"node_modules/@types/estree": { "node_modules/@types/estree": {
"version": "1.0.6", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@ -1858,6 +1864,17 @@
"node": ">=0.4.0" "node": ">=0.4.0"
} }
}, },
"node_modules/dotenv": {
"version": "16.4.7",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
"integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://dotenvx.com"
}
},
"node_modules/dunder-proto": { "node_modules/dunder-proto": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@ -2973,9 +2990,9 @@
} }
}, },
"node_modules/pnpm": { "node_modules/pnpm": {
"version": "9.15.9", "version": "9.15.5",
"resolved": "https://registry.npmjs.org/pnpm/-/pnpm-9.15.9.tgz", "resolved": "https://registry.npmjs.org/pnpm/-/pnpm-9.15.5.tgz",
"integrity": "sha512-aARhQYk8ZvrQHAeSMRKOmvuJ74fiaR1p5NQO7iKJiClf1GghgbrlW1hBjDolO95lpQXsfF+UA+zlzDzTfc8lMQ==", "integrity": "sha512-hFGWAmqrHMPwmKBHS2TfurKv56G06R3YaJXY5Koyp6bQMEni0K13C75N4COnEi+2jBodbg0DPHB2CF+dXUgA1A==",
"bin": { "bin": {
"pnpm": "bin/pnpm.cjs", "pnpm": "bin/pnpm.cjs",
"pnpx": "bin/pnpx.cjs" "pnpx": "bin/pnpx.cjs"
@ -3141,10 +3158,11 @@
} }
}, },
"node_modules/react-router": { "node_modules/react-router": {
"version": "7.5.2", "version": "7.1.5",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-7.5.2.tgz", "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.1.5.tgz",
"integrity": "sha512-9Rw8r199klMnlGZ8VAsV/I8WrIF6IyJ90JQUdboupx1cdkgYqwnrYjH+I/nY/7cA1X5zia4mDJqH36npP7sxGQ==", "integrity": "sha512-8BUF+hZEU4/z/JD201yK6S+UYhsf58bzYIDq2NS1iGpwxSXDu7F+DeGSkIXMFBuHZB21FSiCzEcUb18cQNdRkA==",
"dependencies": { "dependencies": {
"@types/cookie": "^0.6.0",
"cookie": "^1.0.1", "cookie": "^1.0.1",
"set-cookie-parser": "^2.6.0", "set-cookie-parser": "^2.6.0",
"turbo-stream": "2.4.0" "turbo-stream": "2.4.0"
@ -3163,11 +3181,11 @@
} }
}, },
"node_modules/react-router-dom": { "node_modules/react-router-dom": {
"version": "7.5.2", "version": "7.1.5",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.5.2.tgz", "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.1.5.tgz",
"integrity": "sha512-yk1XW8Fj7gK7flpYBXF3yzd2NbX6P7Kxjvs2b5nu1M04rb5pg/Zc4fGdBNTeT4eDYL2bvzWNyKaIMJX/RKHTTg==", "integrity": "sha512-/4f9+up0Qv92D3bB8iN5P1s3oHAepSGa9h5k6tpTFlixTTskJZwKGhJ6vRJ277tLD1zuaZTt95hyGWV1Z37csQ==",
"dependencies": { "dependencies": {
"react-router": "7.5.2" "react-router": "7.1.5"
}, },
"engines": { "engines": {
"node": ">=20.0.0" "node": ">=20.0.0"
@ -3541,9 +3559,9 @@
} }
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "5.4.18", "version": "5.4.14",
"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.18.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz",
"integrity": "sha512-1oDcnEp3lVyHCuQ2YFelM4Alm2o91xNoMncRm1U7S+JdYfYOvbiGZ3/CxGttrOu2M/KcGz7cRC2DoNUA6urmMA==", "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"esbuild": "^0.21.3", "esbuild": "^0.21.3",

3
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "givs-website-react", "name": "givs-website-react",
"private": true, "private": true,
"version": "1.3.5", "version": "1.3.3",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
@ -17,6 +17,7 @@
"@tanstack/react-query": "^5.69.0", "@tanstack/react-query": "^5.69.0",
"@types/node": "^22.13.0", "@types/node": "^22.13.0",
"axios": "^1.8.4", "axios": "^1.8.4",
"dotenv": "^16.4.7",
"fs": "^0.0.1-security", "fs": "^0.0.1-security",
"i18next": "^24.2.2", "i18next": "^24.2.2",
"i18next-browser-languagedetector": "^8.0.4", "i18next-browser-languagedetector": "^8.0.4",

55
src/api/lastfm.ts
View File

@ -1,10 +1,61 @@
import { api } from "../lib/axios"; import { api } from "../lib/axios";
export interface TrackResponse {
track: {
album: {
mbid: string,
"#text": string
},
artist: {
mbid: string,
"#text": string
},
date: {
uts: string,
"#text": string
},
image: [{
"#text": string,
size: string
}],
mbid: string,
name: string,
streamable: string,
url: string
}
}
export interface getRecentTracksResponse {
recenttracks: {
track: [{
artist: {
mbid: string,
"#text": string
},
streamable: string,
image: [{
"#text": string,
size: string
}],
mbid: string,
name: string,
url: string,
date: {
uts: string,
"#text": string
}
}]
}
}
export async function getRecentTracks() { export async function getRecentTracks() {
try { try {
const response = await api.get('/latest-song'); const response = await api.get<TrackResponse>('');
console.log('Last.fm data:', response.data);
return response.data; return response.data;
} catch (error) { } catch (error) {
return error; console.error('Err while fetching Last.fm data:', error);
throw error;
} }
} }

5
src/lib/axios.ts
View File

@ -1,8 +1,7 @@
import axios from 'axios' import axios from 'axios'
const username = import.meta.env.VITE_LAST_USERNAME; const defaultApiUrl = 'https://lastfm-last-played.biancarosa.com.br/givfnz/latest-song';
const defaultApiUrl = `https://lastfm-last-played.biancarosa.com.br/${username}`;
export const api = axios.create({ export const api = axios.create({
baseURL: defaultApiUrl, baseURL: import.meta.env.VITE_LASTFM_API_URL || defaultApiUrl,
}) })

4
src/pages/music/index.tsx
View File

@ -1,4 +1,4 @@
import { getRecentTracks } from "../../api/lastfm"; import { getRecentTracks, TrackResponse } from "../../api/lastfm";
import { MainContainer } from "../../components/MainContent/styles"; import { MainContainer } from "../../components/MainContent/styles";
import { useQuery } from '@tanstack/react-query' import { useQuery } from '@tanstack/react-query'
import { Paragraph } from "../../components/Paragraph/styles"; import { Paragraph } from "../../components/Paragraph/styles";
@ -8,7 +8,7 @@ import { MusicDescription, MusicTitle } from "./styles";
export default function Music() { export default function Music() {
const { t } = useTranslation() const { t } = useTranslation()
const { data: lastResponse, isLoading, isError, error } = useQuery({ const { data: lastResponse, isLoading, isError, error } = useQuery<TrackResponse>({
queryKey: ['song'], queryKey: ['song'],
queryFn: getRecentTracks, queryFn: getRecentTracks,
retry: 1, retry: 1,