diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 14ef043..0000000 --- a/.babelrc +++ /dev/null @@ -1,13 +0,0 @@ -{ - "presets": ["next/babel"], - "plugins": [ - [ - "styled-components", - { - "ssr": true, - "displayName": true, - "preprocess": false - } - ] - ] -} diff --git a/.eslintrc.json b/.eslintrc.json index bffb357..4d765f2 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,3 +1,3 @@ { - "extends": "next/core-web-vitals" + "extends": ["next/core-web-vitals", "prettier"] } diff --git a/components/skills.jsx b/components/skills.jsx index 91e7212..13cf6b5 100644 --- a/components/skills.jsx +++ b/components/skills.jsx @@ -56,10 +56,12 @@ function Skills() { ); } else { - var lastFMempty = true; - if (skills?.lastfm_current.data.recenttracks.track.length > 0) { - lastFMempty = false; - } + let lastFMempty = true; + // if (skills?.lastfm_current.data.recenttracks.track.length > 0) { + // lastFMempty = false; + // } + + console.log(skills); return (
@@ -76,8 +78,6 @@ function Skills() { following={skills?.gh_user?.data?.following} public_gists={skills?.gh_user?.data?.public_gists} created_at={skills?.gh_user?.data?.created_at} - // mouseOverEvent={mouseOverEvent} - // mouseOutEvent={mouseOutEvent} /> - - - {/* */} - + /> */} - + /> */}
)} diff --git a/config.js b/config.js index 40346df..7b952f6 100644 --- a/config.js +++ b/config.js @@ -2,7 +2,7 @@ export const name = "Jyotirmoy Bandhapadhayaya"; export const github_url = "https://github.com/bravo68web"; export const twitter_url = "https://twitter.com/bravo68web"; export const linkedin_url = "https://linkedin.com/in/bravo68web"; -export const email = "mailto:me@bravo68web"; +export const email = "mailto:hi@b68.dev"; export const instagram_url = "https://instagram.com/bravo68web"; export const phone = ""; export const address = ""; diff --git a/handlers/axios.js b/handlers/axios.js index 7fb0903..a7ff388 100644 --- a/handlers/axios.js +++ b/handlers/axios.js @@ -1,6 +1,6 @@ import axios from "axios"; export default axios.create({ - baseURL: "https://api.b68dev.xyz", - // baseURL: "http://localhost:8080", + baseURL: "https://api.b68.dev", + // baseURL: "http://localhost:9000", }); diff --git a/handlers/requester.js b/handlers/requester.js index e203a89..8688a07 100644 --- a/handlers/requester.js +++ b/handlers/requester.js @@ -3,7 +3,7 @@ import axios from "./axios"; export const tempEndpoint = async (endpoint, data) => { let response = [false, { error: "Error" }]; - var reqPromise = axios + let reqPromise = axios .get(endpoint) .then((res) => { data.github = res.data; @@ -19,14 +19,13 @@ export const tempEndpoint = async (endpoint, data) => { export const requester = async (configs, data) => { let requests = []; - for (let i = 0; i < configs.length; i++) { - const { endpoint, name } = configs[i]; - // console.log(endpoint, name); + for (const element of configs) { + const { endpoint, name } = element; data[name] = {}; let request = axios .get(endpoint) .then((res) => { - data[name].data = res.data; + data[name] = res.data; }) .catch((err) => { console.error(err); diff --git a/handlers/sdk.js b/handlers/sdk.js index ef418f4..c608b61 100644 --- a/handlers/sdk.js +++ b/handlers/sdk.js @@ -1,4 +1,4 @@ -import {requester } from "./requester"; +import { requester } from "./requester"; export const APISDK = { data: {}, @@ -6,23 +6,23 @@ export const APISDK = { await requester( [ { - endpoint: "/me/github/userdata", + endpoint: "/me/github/user", name: "gh_user", }, { - endpoint: "/me/discord/activity", + endpoint: "/me/discord/profile", name: "discord_activity", }, { - endpoint: "/me/osu/v2/user", + endpoint: "/me/gaming/osu/user", name: "osu_user", }, { - endpoint: "/me/osu/v2/bestScores", + endpoint: "/me/gaming/osu/best", name: "osu_bestScores", }, { - endpoint: "/me/spotify/myTopSongs", + endpoint: "/me/spotify/top", name: "spotify_top_songs", }, { @@ -38,15 +38,15 @@ export const APISDK = { name: "wakatime_lang", }, { - endpoint: "/me/hashnode/me/all", + endpoint: "/me/hashnode/", name: "hn_user", }, { - endpoint: "/me/twitter/me", + endpoint: "/me/twitter/profile", name: "twitter_user", }, { - endpoint: "/me/twitter/recentTweets", + endpoint: "/me/twitter/tweets", name: "twitter_tweets", }, { @@ -54,11 +54,11 @@ export const APISDK = { name: "lastfm_current", }, { - endpoint: "/me/github/userevent", + endpoint: "/me/github/events", name: "gh_events", }, { - endpoint: "/me/vscode", + endpoint: "/me/vscode/", name: "vscode", }, ], @@ -67,3 +67,5 @@ export const APISDK = { // return tempEndpoint("https://api.github.com/users/bravo68web", this.data); }, }; + +console.log(APISDK.data); \ No newline at end of file diff --git a/package.json b/package.json index 668c166..1656ef2 100644 --- a/package.json +++ b/package.json @@ -32,19 +32,18 @@ "core-js": "^3.21.1", "date-format-parse": "^0.2.7", "fs-extra": "^10.0.1", - "next": "^12.1.4", + "next": "^13.1.1", "next-connect": "^0.12.2", - "react": "^17.0.2", - "react-dom": "^17.0.2", + "react": "^18.2.0", + "react-dom": "^18.2.0", "react-use-lanyard": "^0.1.1", "sitemap": "^7.1.1", "styled-components": "^5.3.3", "use-last-fm": "https://github.com/BRAVO68WEB/use-last-fm" }, "devDependencies": { - "babel-plugin-styled-components": "^2.0.7", "eslint": "^7.32.0", - "eslint-config-next": "12.0.4", + "eslint-config-next": "^13.1.1", "prettier": "^2.6.2" } } diff --git a/pages/_document.js b/pages/_document.js new file mode 100644 index 0000000..b977028 --- /dev/null +++ b/pages/_document.js @@ -0,0 +1,62 @@ +import Document, { Html, Head, Main, NextScript } from 'next/document' +import { ServerStyleSheet } from 'styled-components' +import Nav from '../components/nav' + + +export default class MyDocument extends Document { + static async getInitialProps(ctx) { + const sheet = new ServerStyleSheet() + const originalRenderPage = ctx.renderPage + + try { + ctx.renderPage = () => + originalRenderPage({ + enhanceApp: (App) => (props) => + sheet.collectStyles(), + }) + + const initialProps = await Document.getInitialProps(ctx) + return { + ...initialProps, + styles: [initialProps.styles, sheet.getStyleElement()], + } + } finally { + sheet.seal() + } + } + + render() { + return ( + + + + + + + + + + + + +