diff --git a/.env.example b/.env.example index 6743c73c..27290a9e 100644 --- a/.env.example +++ b/.env.example @@ -7,7 +7,6 @@ GTM_ID= # ALL_PAGES_TO_NO_INDEX=true # GATSBY_ADSENSE_PUB_ID= # GATSBY_ADSENSE_INARTICLE_AD_ID= -# GATSBY_LOG_ROCKET_ID= # GATSBY_SITE_URL=https://bicstone.me # PATH_PREFIX=/portfolio diff --git a/.github/workflows/deploy-to-prod.yml b/.github/workflows/deploy-to-prod.yml index 54bb5f56..e421e64f 100644 --- a/.github/workflows/deploy-to-prod.yml +++ b/.github/workflows/deploy-to-prod.yml @@ -47,7 +47,6 @@ jobs: GTM_ID: ${{ vars.GTM_ID }} GATSBY_ADSENSE_PUB_ID: ${{ vars.GATSBY_ADSENSE_PUB_ID }} GATSBY_ADSENSE_INARTICLE_AD_ID: ${{ vars.GATSBY_ADSENSE_INARTICLE_AD_ID }} - GATSBY_LOG_ROCKET_ID: ${{ vars.GATSBY_LOG_ROCKET_ID }} - uses: aws-actions/configure-aws-credentials@v2 with: diff --git a/gatsby-browser.tsx b/gatsby-browser.tsx index 8e84943a..1208a81c 100644 --- a/gatsby-browser.tsx +++ b/gatsby-browser.tsx @@ -16,9 +16,7 @@ export const wrapPageElement: GatsbyBrowser["wrapPageElement"] = ({ return {element}; }; -export const onRouterUpdate: GatsbyBrowser["onRouteUpdate"] = ({ - location, -}) => { +export const onRouteUpdate: GatsbyBrowser["onRouteUpdate"] = ({ location }) => { if (isDefined(location?.hash)) { const id = location.hash.replace("#", ""); const element = document.getElementById(id); diff --git a/src/components/markdown/InlineCode.tsx b/src/components/markdown/InlineCode.tsx index 7d7bbd38..63b4c760 100644 --- a/src/components/markdown/InlineCode.tsx +++ b/src/components/markdown/InlineCode.tsx @@ -7,6 +7,7 @@ export const InlineCode = styled("span")(({ theme }) => ({ fontFamily: CONSOLE_FONT_FAMILY, paddingLeft: theme.spacing(0.5), paddingRight: theme.spacing(0.5), - backgroundColor: theme.vars.palette.divider, + backgroundColor: theme.vars.palette.surfaceVariant.main, + color: theme.vars.palette.onSurfaceVariant.main, borderRadius: theme.shape.borderRadius, })); diff --git a/src/constants/SITE_METADATA.ts b/src/constants/SITE_METADATA.ts index d0eec1b7..76821ad1 100644 --- a/src/constants/SITE_METADATA.ts +++ b/src/constants/SITE_METADATA.ts @@ -5,7 +5,8 @@ export const SITE_METADATA = { description: "Webエンジニア/機械エンジニア おおいし (@bicstone) のポートフォリオサイトです。", author: "bicstone", - image: "/android-chrome-512x512.png", + logoImage: "https://static.bicstone.me/icon_circular.png", + ogpImage: "https://static.bicstone.me/og_image.png", firstName: "Takanori", lastName: "Oishi", defaultLanguage: "ja", diff --git a/src/features/Timeline/TimelineVirtualizedList.tsx b/src/features/Timeline/TimelineVirtualizedList.tsx index 5b9e4e78..39a0d031 100644 --- a/src/features/Timeline/TimelineVirtualizedList.tsx +++ b/src/features/Timeline/TimelineVirtualizedList.tsx @@ -1,3 +1,4 @@ +import { keyframes } from "@emotion/react"; import styled from "@emotion/styled"; import NoSsr from "@mui/material/NoSsr"; import { graphql } from "gatsby"; @@ -136,6 +137,17 @@ export const TimelineVirtualizedList = ({ }} itemContent={(index, item) => } css={(theme) => ({ + animationName: keyframes({ + "0%": { + opacity: 0, + }, + "100%": { + opacity: 1, + }, + }), + animationDuration: ".3s", + animationTimingFunction: "ease-in", + height: "100%", // prevent flickering caused by virtual scrolling minHeight: minHeightDoubleColumn, diff --git a/src/layouts/HeadTemplate.tsx b/src/layouts/HeadTemplate.tsx index e204ba4e..b63f33a2 100644 --- a/src/layouts/HeadTemplate.tsx +++ b/src/layouts/HeadTemplate.tsx @@ -1,3 +1,5 @@ +import { defaultColorTokens } from "./themes"; + import type { HeadProps } from "gatsby"; import { SITE_METADATA } from "@/constants/SITE_METADATA"; @@ -9,12 +11,19 @@ import { SITE_METADATA } from "@/constants/SITE_METADATA"; export const HeadTemplate = (props: { location: HeadProps["location"]; title: string; - description: string; - image: string; + description?: string; + image?: string; imageAlt: string; type: string; }): JSX.Element => { - const { location, title, description, image, imageAlt, type } = props; + const { + location, + title, + description = SITE_METADATA.description, + image = SITE_METADATA.ogpImage, + imageAlt, + type, + } = props; const isAllPagesToNoIndex = process.env.ALL_PAGES_TO_NO_INDEX === "true"; const canonical = `${SITE_METADATA.siteUrl}${location.pathname}`; @@ -81,6 +90,16 @@ export const HeadTemplate = (props: { /> + + {/* others */} diff --git a/src/pages/histories.tsx b/src/pages/histories.tsx index 3483d178..a9318cbc 100644 --- a/src/pages/histories.tsx +++ b/src/pages/histories.tsx @@ -27,8 +27,6 @@ export const Head: HeadFC = ({ location }) => { diff --git a/src/pages/index.tsx b/src/pages/index.tsx index ee095f0c..c9fc5825 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,5 +1,5 @@ import Container from "@mui/material/Container"; -import { Script, graphql } from "gatsby"; +import { graphql } from "gatsby"; import type { IndexPageQuery } from "@/generated/graphqlTypes"; import type { PageProps, HeadFC } from "gatsby"; @@ -10,7 +10,6 @@ import { BioCardList } from "@/features/Bio"; import { TimelineVirtualizedList } from "@/features/Timeline"; import { TimelineTabList } from "@/features/TimelineTab"; import { HeadTemplate } from "@/layouts/HeadTemplate"; -import { isDefined } from "@/utils/typeguard"; export const query = graphql` query IndexPage { @@ -30,34 +29,15 @@ declare global { export const Head: HeadFC = ({ location }) => { const title = SITE_METADATA.title; - const logRocketId = process.env.GATSBY_LOG_ROCKET_ID; return ( <> - {isDefined(logRocketId) && ( -