2024-12-23 04:30:11 +09:00
35 changed files with 1006 additions and 3120 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -1,3 +0,0 @@
-{
-  "extends": "next/core-web-vitals"
-}
--- a/.gitignore
+++ b/.gitignore
@ -11,5 +11,3 @@ yarn-error.log
 .vimrc~
 ..vimrc.un~
 .env.local
-
-.vercel
--- a/docs/hcunews/ja.md
+++ b/docs/hcunews/ja.md
@ -1,11 +1,12 @@
 このアカウントは**非公式**アカウントです。また、内容を保証するものではありません。

-# 連絡先
+# 管理者
 広島市立大学 情報科学部 2年の [yude](https://yude.jp/profile) が管理しています。このアカウントについての連絡は下記までお願いします。
+## 連絡先
 * 電子メール: [admin@yude.jp](mailto:admin@yude.jp)
 * Twitter: [@yude_jp](https://twitter.com/yude_jp)

-# 仕組み
+# 稼働方法
 Microsoft Power Automate によって広島市立大学WebページのRSSフィードを取得し、新しい記事が投稿されている場合にツイートします。\
 次の URL を監視しています。
 * [お知らせ｜広島市立大学](https://www.hiroshima-cu.ac.jp/news/)
--- a/locales/en/profile.json
+++ b/locales/en/profile.json
@ -19,6 +19,5 @@
    "fingerprint": "Digital fingerprint",
    "view": "View",
    "device": "Devices",
-    "account": "Accounts",
-    "wishlist": "Amazon Wishlist"
+    "account": "Accounts"
 }
--- a/locales/ja/profile.json
+++ b/locales/ja/profile.json
@ -19,6 +19,5 @@
    "fingerprint": "電子指紋",
    "view": "閲覧",
    "device": "デバイス",
-    "account": "アカウント",
-    "wishlist": "Amazon ほしいものリスト"
+    "account": "アカウント"
 }
--- a/next.config.js
+++ b/next.config.js
@ -1,25 +1,12 @@
 const nextTranslate = require('next-translate')

-const rewrites = async () => {
-  return [
-    {
-      source: '/minecraft/players/:uuid(\[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})',
-      destination: '/minecraft/players/:uuid'
-    },
-    {
-      source: '/minecraft/players/:uuid',
-      destination: '/404'
-    }
-  ]
-}
-
 module.exports = nextTranslate({
    i18n: {
      locales: ['ja', 'en'],
      defaultLocale: 'ja',
    },
    images: {
-      domains: ['mackerel.io', 'mc-heads.net', 'crafatar.com'],
+      domains: ['mackerel.io', 'mc-heads.net'],
    },
    webpack: function (config) {
      config.module.rules.push({
@ -28,19 +15,4 @@ module.exports = nextTranslate({
      })
      return config
    },
-    async redirects() {
-      return [
-        {
-          source: '/wishlist',
-          destination: 'https://www.amazon.jp/hz/wishlist/ls/8WTKCPWKOJ2N?ref_=wl_share',
-          permanent: true,
-        },
-        {
-          source: '/scrapbox',
-          destination: 'https://scrapbox.io/yude',
-          permanent: true,
-        }
-      ]
-    },
-    rewrites,
  })
--- a/package.json
+++ b/package.json
@ -7,8 +7,7 @@
    "dev": "next",
    "build": "next build",
    "start": "next start",
-    "export": "next export",
-    "lint": "next lint"
+    "export": "next export"
  },
  "repository": {
    "type": "git",
@ -22,43 +21,39 @@
  },
  "homepage": "https://github.com/yudemoe/yude.jp#readme",
  "dependencies": {
-    "@babel/core": "^7.15.5",
-    "@fortawesome/fontawesome-svg-core": "^1.2.36",
-    "@fortawesome/free-brands-svg-icons": "^5.15.4",
-    "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@fortawesome/react-fontawesome": "^0.1.15",
+    "@fortawesome/fontawesome-svg-core": "^1.2.35",
+    "@fortawesome/free-brands-svg-icons": "^5.15.3",
+    "@fortawesome/free-solid-svg-icons": "^5.15.3",
+    "@fortawesome/react-fontawesome": "^0.1.14",
    "@tailwindcss/typography": "^0.4.0",
-    "autoprefixer": "^10.3.4",
-    "axios": "^0.21.4",
+    "autoprefixer": "^10.2.5",
+    "axios": "^0.21.1",
    "microcms-js-sdk": "^1.2.0",
    "moment": "^2.29.1",
-    "next": "^11.1.2",
-    "next-seo": "^4.28.1",
-    "next-themes": "^0.0.15",
-    "next-translate": "^1.1.0",
+    "next": "^11.1.1",
+    "next-seo": "^4.26.0",
+    "next-themes": "^0.0.14",
+    "next-translate": "^1.0.7",
    "popper.js": "^1.16.1",
-    "postcss": "^8.3.6",
-    "prop-types": "^15.7.2",
+    "postcss": "^8.3.0",
    "querystring": "^0.2.1",
    "raw-loader": "^4.0.2",
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
-    "react-markdown": "^7.0.1",
+    "react-markdown": "^6.0.2",
    "react-moment": "^1.1.1",
    "react-switch": "^6.0.0",
-    "remark-gfm": "^2.0.0",
-    "swr": "^1.0.1",
-    "tailwindcss": "^2.2.15",
+    "remark-gfm": "^1.0.0",
+    "swr": "^0.5.6",
+    "tailwindcss": "^2.1.4",
    "tailwindcss-filters": "^3.0.0",
    "tailwindcss-responsive-embed": "^1.0.0",
-    "webpack": "^5.53.0"
+    "webpack": "^5.37.1"
  },
  "devDependencies": {
-    "@types/node": "^16.9.6",
-    "@types/react": "^17.0.24",
+    "@types/node": "^15.6.0",
+    "@types/react": "^17.0.6",
    "babel-plugin-inline-react-svg": "^2.0.1",
-    "eslint": "7.32.0",
-    "eslint-config-next": "11.1.2",
-    "typescript": "^4.4.3"
+    "typescript": "^4.2.4"
  }
 }
--- a/pages/api/PlayerName/[uuid].js
+++ b/pages/api/PlayerName/[uuid].js
@ -1,23 +0,0 @@
-// React
-import React, { useState, useEffect } from 'react';
-import axios from 'axios';
-
-export const getName = async (props) => {
-  const uuid = props;
-  return fetch('https://api.ashcon.app/mojang/v2/user/' + uuid);
-};
-
-const RawPlayerName = async (req, res) => {
-    const { uuid } = req.query
-    const response = await getName(uuid);
-    const data = await response.json();
-    if (response.status === 204 || response.status > 400) {
-      return res.status(200).send("404");
-    }
-    const username = data.username;
-    return res.status(200).json({
-      username,
-    });
-};
-
-export default RawPlayerName
--- a/pages/api/Spotify.js
+++ b/pages/api/Spotify.js
@ -36,7 +36,7 @@ export const getNowPlaying = async () => {
  });
 };

-const Spotify = async (_, res) => {
+export default async (_, res) => {
  const response = await getNowPlaying();

  if (response.status === 204 || response.status > 400) {
@ -56,5 +56,3 @@ const Spotify = async (_, res) => {
    title,
  });
 };
-
-export default Spotify
--- a/pages/components/Discord/DiscordPlaying.js
+++ b/pages/components/Discord/DiscordPlaying.js
@ -27,7 +27,7 @@ function App (){
  const yes_playing = t('yes_playing', {playing: data.members[0].game.name})
  return <p>{yes_playing}</p>
  }else{
-  return <></>
+  return <p></p>
  }
 }
 };
--- a/pages/components/Footer/BlueRibbon.js
+++ b/pages/components/Footer/BlueRibbon.js
@ -10,7 +10,6 @@ const happybusy = (props) => {
          src="/images/brstrip.gif"
          width={150}
          height={41}
-          alt="EFF Blue Ribbon Campaign"
        />
      </a>
    </Link>
--- a/pages/components/Footer/HappyBusy.js
+++ b/pages/components/Footer/HappyBusy.js
@ -10,7 +10,6 @@ const HappyBusy = (props) => {
            src="/images/busy_banner.png"
            width={200}
            height={42}
-            alt="時間のないサイト運営者リング"
          />
        </a>
    </Link>
--- a/pages/components/Minecraft.js
+++ b/pages/components/Minecraft.js
@ -54,7 +54,7 @@ export default function Minecraft(props) {
                url.push('https://mc-heads.net/avatar/' + data.players.list[i])
              }
              for (var i in url){
-                list.push(<Image src={url[i]} key={i} className="inline" height="50" width="50" alt={i}/>)
+                list.push(<Image src={url[i]} key={i} className="inline" height="50" width="50" />)
              }
              return <div>{list}</div>
            }
--- a/pages/components/Minecraft/Biography.js
+++ b/pages/components/Minecraft/Biography.js
@ -1,33 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import axios from 'axios';
-
-function App (props) {
-  const uuid = props;
-  const [data, setData] = useState({ hits: [] });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      const result = await axios(
-        'https://playersbio.yude.jp/' + uuid.uuid,
-      );
-      setData(result.data);
-    };  
-    fetchData();
-  }, []);
-  if (data === undefined){
-    console.log("[Minecraft: PlayersBio] データの取得に失敗しました。 / Failed to retrieve data.")
-    return <p></p>
-  }else {
-      if (data.toString() == "[object Object]"){
-        return <p>読み込み中...</p>
-      } else {
-        if (data.toString() == "") {
-            return <p>ひとことは設定されていません...</p>
-        } else {
-            return <p>ひとこと: <span className="italic">{data.toString()}</span></p>
-        }
-      }
-    };
-}
-
-export default App;
--- a/pages/components/Minecraft/Group.js
+++ b/pages/components/Minecraft/Group.js
@ -1,30 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import axios from 'axios';
-import { useRouter } from 'next/router'
-
-function App (props) {
-  const uuid = props;
-  const [data, setData] = useState({ hits: [] });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      const result = await axios(
-        'https://minecraft.yude.jp/group/' + uuid.uuid,
-      );
-      setData(result.data);
-    };  
-    fetchData();
-  }, []);
-  
-  if (data === undefined || data === null){
-    return <p></p>
-  }else {
-        if (data.toString() == "staff") {
-            return <span className="inline-flex items-center justify-center px-3 py-2 text-base font-bold leading-none text-indigo-100 bg-indigo-700 rounded ml-3">Staff</span>
-        } else {
-            return <></>
-        }
-    };
-}
-
-export default App;
--- a/pages/components/Minecraft/Head.js
+++ b/pages/components/Minecraft/Head.js
@ -1,16 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import Image from 'next/image'
-
-function App (props) {
-  const uuid = props;
-
-  return (
-    <Image
-        src={"https://crafatar.com/renders/body/" + uuid.uuid}
-        width={110}
-        height={250}
-    />
-  )
-}
-
-export default App;
--- a/pages/components/Minecraft/LastPlayed.js
+++ b/pages/components/Minecraft/LastPlayed.js
@ -1,65 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import axios from 'axios';
-
-function App (props) {
-  const uuid = props;
-  const [data, setData] = useState({ hits: [] });
-  
-  const timeAgo = (prevDate) => {
-    const diff = Number(new Date()) - prevDate;
-    const minute = 60 * 1000;
-    const hour = minute * 60;
-    const day = hour * 24;
-    const month = day * 30;
-    const year = day * 365;
-    switch (true) {
-        case diff < minute:
-            const seconds = Math.round(diff / 1000);
-             return `${seconds} 秒前`
-        case diff < hour:
-            return Math.round(diff / minute) + ' 分前';
-        case diff < day:
-            return Math.round(diff / hour) + ' 時間前';
-        case diff < month:
-            return Math.round(diff / day) + ' 日前';
-        case diff < year:
-            return Math.round(diff / month) + ' ヶ月前';
-        case diff > year:
-            return Math.round(diff / year) + ' 年前';
-        default:
-            return "";
-    }
-};
-
-  useEffect(() => {
-    const fetchData = async () => {
-      const result = await axios(
-        'https://minecraft.yude.jp/last/' + uuid.uuid,
-      );
-      setData(result.data);
-    };  
-    fetchData();
-  }, []);
-  if (data === undefined){
-    console.log("[Minecraft: 最終プレイ日時] データの取得に失敗しました。 / Failed to retrieve data.")
-    return <p></p>
-  }else {
-        if (data.toString() == "[object Object]") {
-            return <p>取得中です...</p>
-        } else {
-            if (data.toString() == "not_found") {
-                return <></>
-            } else {
-            let dateTime = new Date(parseInt(data.toString()) * 1000);
-            return (
-                <div className='has-tooltip'>
-                    <span className='tooltip rounded shadow-lg p-1 bg-gray-100 text-red-500 -mt-8'>{dateTime.toLocaleDateString() + " " + dateTime.toLocaleTimeString()}</span>
-                    最終ログイン: {timeAgo(dateTime)}
-                </div>
-            )
-        }
-        }
-    };
-}
-
-export default App;
--- a/pages/components/Minecraft/Online.js
+++ b/pages/components/Minecraft/Online.js
@ -1,39 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import axios from 'axios';
-import useTranslation from 'next-translate/useTranslation'
-import { useRouter } from 'next/router'
-import LastPlayed from './LastPlayed'
-
-function App (props) {
-  const uuid = props;
-  const router = useRouter()
-  const { locale, locales, defaultLocale, pathname } = router
-  const { t, lang } = useTranslation("common")  
-  const [data, setData] = useState({ hits: [] });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      const result = await axios(
-        'https://minecraft.yude.jp/online/' + uuid.uuid,
-      );
-      setData(result.data);
-    };  
-    fetchData();
-  }, []);
-  if (data === undefined){
-    console.log("[Minecraft: オンライン状況] データの取得に失敗しました。 / Failed to retrieve data.")
-    return <p></p>
-  }else {
-        if (data.toString() == "false") {
-            return <LastPlayed uuid={uuid.uuid} />
-        } else {
-            if (data.toString() == "true") {
-            return <p>オンライン</p>
-            } else {
-                return <p>取得中...</p>
-            }
-        }
-    };
-}
-
-export default App;
--- a/pages/components/Minecraft/PlayerName.js
+++ b/pages/components/Minecraft/PlayerName.js
@ -1,35 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import axios from 'axios';
-
-function App (props) {
-  const uuid = props;
-  const [data, setData] = useState({ hits: [] });
-
-  useEffect(() => {
-    const fetchData = async () => {
-      let result = null;
-      try {
-        result = await axios('https://api.ashcon.app/mojang/v2/user/' + uuid.uuid);
-        setData(result.data);
-      } catch (err) {
-        result = 404;
-        setData(result);
-      }
-    };  
-    fetchData();
-  }, []);
-  if (data === undefined){
-        console.log("[Minecraft: UUID to player's name] データの取得に失敗しました。 / Failed to retrieve data.")
-        return <>取得中...</>
-  }else {
-        if (data === 404) {
-          return <>404</>
-        } else {
-        return (
-          <>{data.username}</>
-        )
-        }
-    };
-}
-
-export default App;
--- a/pages/components/Minecraft/PlayerNameHolder.js
+++ b/pages/components/Minecraft/PlayerNameHolder.js
@ -1,39 +0,0 @@
-// Component
-import Group from './Group';
-
-// Data fetching
-import useSwr from 'swr'
-
-const fetcher = (url) => fetch(url).then((res) => res.json())
-
-function App (props) {
-  const uuid = props;
-  const { data, error } = useSwr(
-    uuid.uuid ? `/api/PlayerName/${uuid.uuid}` : null,
-    fetcher
-  )
-  
-  if (error) {
-    return (
-      <>エラーが発生しました。</>
-    )
-  } else {
-    if (!data) {
-      return (
-        <>読み込み中...</>
-      )
-    } else {
-        return (
-          <>
-            <div className='has-tooltip'>
-              <span className='tooltip rounded shadow-lg p-1 bg-gray-100 text-red-500 -mt-8 font-mono text-sm'>UUID: {uuid.uuid}</span>
-              <p className="text-2xl inline">{data.username}</p>
-              <Group uuid={uuid.uuid} />
-            </div>
-          </>
-        )
-    }
-  }
-}
-
-export default App;
--- a/pages/components/Minecraft/Players.js
+++ b/pages/components/Minecraft/Players.js
@ -1,25 +0,0 @@
-// Components
-import Online from './Online'
-import Head from './Head'
-import PlayerNameHolder from './PlayerNameHolder'
-import Biography from './Biography'
-
-function App (props) {
-  const uuid = props;
-  
-  return (
-    <div className="w-full flex flex-wrap">
-        <div>
-            <Head uuid={uuid.uuid} />
-        </div>
-        <div className="w-5"></div>
-        <div>
-          <p className="text-2xl text-mono"><PlayerNameHolder uuid={uuid.uuid} /></p>
-          <p><Online uuid={uuid.uuid} /></p>
-          <p><Biography uuid={uuid.uuid} /></p>
-        </div>
-    </div>
-  )
-}
-
-export default App;
--- a/pages/components/Minecraft/WrongUUID.js
+++ b/pages/components/Minecraft/WrongUUID.js
@ -1,9 +0,0 @@
-function App (props) {
-    return (
-        <div className="text-center">
-            <h2>入力された UUID に該当するプレイヤーが見つかりませんでした。</h2>
-        </div>
-    )
-  }
-  
-export default App;
--- a/pages/components/Profile/Spotify.js
+++ b/pages/components/Profile/Spotify.js
@ -25,7 +25,7 @@ function App () {
   const status = data.artist + ' / ' + data.title
   return <p>{t('listening', {listening: status})}</p>
  }else{
-   return <></>
+   return <p></p>
  }
 };
 }
--- a/pages/hcunews.js
+++ b/pages/hcunews.js
@ -1,17 +1,15 @@
-// Base layout
 import Layout from "./components/Layout"
-
-// React, i18n
 import useTranslation from 'next-translate/useTranslation'
+import { useRouter } from 'next/router'
 import React from "react"
 import ReactMarkdown from "react-markdown"
-
-// Markdown
 import gfm from 'remark-gfm';
 import ja from '../docs/hcunews/ja.md'
 import en from '../docs/hcunews/en.md'

-export default function HcuNews() {
+export default function Tos(props) {
+    const router = useRouter()
+    const { locale, locales, defaultLocale, pathname } = router
    const { t, lang } = useTranslation("hcunews")

    return(
@ -19,13 +17,9 @@ export default function HcuNews() {
        <div>
            <h1>{t('hcunews')}</h1>
            {lang === 'ja' ? (
-                <ReactMarkdown plugins={[gfm]}>
-                    {ja}
-                </ReactMarkdown>
+            <ReactMarkdown plugins={[gfm]} children={ja} />
            ) : (
-                <ReactMarkdown plugins={[gfm]}>
-                    {en}
-                </ReactMarkdown>
+            <ReactMarkdown plugins={[gfm]} children={en} />
            )}
        </div>
        </Layout>
--- a/pages/house.js
+++ b/pages/house.js
@ -11,7 +11,7 @@ export default function About(props) {
    <Layout title={t('house')}>
      <div>
      <p className="my-2 text-3xl text-center">{t('house')}</p>
-      <iframe className="w-full h-96" src="https://mackerel.io/embed/public/embed/4mVIU29WCRVZgHUxQPzWsfXo953uxiAegbjDb83hTQ7szesCunwdpVkBIzhnLc9i?period=1d" frameBorder="0" scrolling="no"></iframe>
+      <iframe className="w-full h-96" src="https://mackerel.io/embed/public/embed/4mVIU29WCRVZgHUxQPzWsfXo953uxiAegbjDb83hTQ7szesCunwdpVkBIzhnLc9i?period=1d" frameborder="0" scrolling="no"></iframe>
      </div>
    </Layout>
  )
--- a/pages/index.js
+++ b/pages/index.js
@ -1,4 +1,4 @@
-// Base layout
+// Load base layout
 import Layout from "./components/Layout"

 // Menu
--- a/pages/minecraft.js
+++ b/pages/minecraft.js
@ -53,7 +53,8 @@ export default function About(props) {
                <div className="w-full">
                <Image
                    src         = "/images/dynmap.png"
-                    alt         = "Minecraft brief world map generated by Dynmap"
+                    alt         = "Dynmap Header"
+                    unoptimized = {true}
                    width       = {1354}
                    height      = {619}
                />
@ -87,14 +88,11 @@ export default function About(props) {
              
              {/* Load markdown contents */}
              {lang === 'ja' ? (
-                  <ReactMarkdown plugins={[gfm]}>
-                      {ja}
-                  </ReactMarkdown>
+                <ReactMarkdown plugins={[gfm]} children={ja} />
              ) : (
-                  <ReactMarkdown plugins={[gfm]}>
-                      {en}
-                  </ReactMarkdown>
+                <ReactMarkdown plugins={[gfm]} children={en} />
              )}
+
            </div>
            </Layout>
          </>
--- a/pages/minecraft/players/[uuid].js
+++ b/pages/minecraft/players/[uuid].js
@ -1,59 +0,0 @@
- // Base layout
-import Layout from "../../components/Layout"
-
-// React
-import { useRouter } from 'next/router'
-
-// Data fetching
-import Players from '../../components/Minecraft/Players'
-import useSwr from 'swr'
-const fetcher = (url) => fetch(url).then((res) => res.json())
-
-// Components
-import WrongUUID from '../../components/Minecraft/WrongUUID'
-
-export default function UUID() {
-  const router = useRouter()
-  const { uuid } = router.query
-  const { data, error } = useSwr(
-    uuid ? `/api/PlayerName/${uuid}` : null,
-    fetcher
-  )
-  if (error) {
-    return (
-      <>
-        <Layout title="エラー - プレイヤー情報">
-        <p className="text-2xl">エラーが発生しました。</p>
-        </Layout>
-      </>
-    )
-  } else {
-    if (!data) {
-      return (
-        <>
-          <Layout title="読み込み中... - プレイヤー情報">
-          <Players uuid={uuid} />
-          </Layout>
-        </>
-      )
-    } else {
-      if (!data.username) {
-        return (
-          <>
-            <Layout title="404 - プレイヤー情報">
-              <WrongUUID />
-            </Layout>
-          </>
-        )
-      } else {
-        return (
-          <>
-            <Layout title={data.username + " - " + "プレイヤー情報"}>
-              <Players uuid={uuid} />
-            </Layout>
-          </>
-        )
-      }
-    }
-  }
-}
--- a/pages/mutual.js
+++ b/pages/mutual.js
@ -30,13 +30,9 @@ export default function Tos(props) {
            <Layout title={t('common:mutual')}>
              <div>
                {lang === 'ja' ? (
-                  <ReactMarkdown plugins={[gfm]}>
-                      {ja}
-                  </ReactMarkdown>
+                  <ReactMarkdown plugins={[gfm]} children={ja} />
                ) : (
-                  <ReactMarkdown plugins={[gfm]}>
-                      {en}
-                  </ReactMarkdown>
+                  <ReactMarkdown plugins={[gfm]} children={en} />
                )}
              </div>
            </Layout>
--- a/pages/profile.js
+++ b/pages/profile.js
@ -5,7 +5,7 @@ import Layout from "./components/Layout"
 import useTranslation from 'next-translate/useTranslation'

 // Font Awesome
-import { faDiscord, faTwitter, faGithub, faKeybase, faInstagram, faMastodon, faSteam, faAmazon } from '@fortawesome/free-brands-svg-icons'
+import { faDiscord, faTwitter, faGithub, faKeybase, faInstagram, faMastodon, faSteam } from '@fortawesome/free-brands-svg-icons'
 import { faEnvelope, faBirthdayCake, faMapPin, faSchool, faPhone, faInfo, faLink, faMobile } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'

@ -116,7 +116,6 @@ export default function Profile(props) {
          <PublicKeys />
          <Button dest="https://scrapbox.io/yude/%E3%82%A2%E3%82%AB%E3%82%A6%E3%83%B3%E3%83%88" icon={faLink} caption={t('account')}/>
          <Button dest="https://scrapbox.io/yude/%E3%83%87%E3%83%90%E3%82%A4%E3%82%B9" icon={faMobile} caption={t('device')}/>        
-          <Button dest="https://www.amazon.jp/hz/wishlist/ls/8WTKCPWKOJ2N?ref_=wl_share" icon={faAmazon} caption={t('wishlist')}/>
          </div>
          
        </div>
--- a/pages/server.js
+++ b/pages/server.js
@ -43,18 +43,6 @@ export default function Server(props) {
          </div>
          <iframe className="w-full h-96" src="https://mackerel.io/embed/public/embed/heHnGhDanoIDlf7jjxUe9yPVrsG3deeH5ptD8suErrq5w46crWEIYdLfzLoukzfF?period=24h" height="400" frameBorder="0" scrolling="no"></iframe>
          
-          {
-              // saika
-          }
-          <h2 className="text-2xl text-left font-bold leading-7 sm:text-3xl sm:truncate">saika</h2>
-          <div className="flex xl:w-2/3 text-center">
-          <div className="flex-1"><p className="font-bold">CPU </p>i5-6500</div>
-          <div className="flex-1"><p className="font-bold">RAM </p>DDR4 8GB</div>
-          <div className="flex-1"><p className="font-bold">OS </p>Ubuntu Server 20.04.3 LTS</div>
-          <div className="flex-1"><p className="font-bold">{t('location')} </p>{t('hiroshima')}</div>
-          </div>
-          <iframe className="w-full h-96" src="https://mackerel.io/embed/public/embed/QCRK3wZxG7ufgunJ5iuIs9cIEJ490swAmlYMF50nNLmJw6gASXyVlzhrybiE2A1G?period=24h" height="400" frameBorder="0" scrolling="no"></iframe>
-          
          {
              // yukino
          }
--- a/pages/tos.js
+++ b/pages/tos.js
@ -15,13 +15,9 @@ export default function Tos(props) {
        <Layout title={t('tos')}>
        <div>
        {lang === 'ja' ? (
-            <ReactMarkdown plugins={[gfm]}>
-                {ja}
-            </ReactMarkdown>
+          <ReactMarkdown plugins={[gfm]} children={ja} />
        ) : (
-            <ReactMarkdown plugins={[gfm]}>
-                {en}
-            </ReactMarkdown>
+          <ReactMarkdown plugins={[gfm]} children={en} />
        )}
        </div>
        </Layout>
--- a/public/yude.keys
+++ b/public/yude.keys
@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfEH46roc6pn97+Bi0UxWaeogvN38U5/7W+s2TWAQfpE8gv7ibFwZ5FVvHguT8BbCkK8YuXW7Oug1n8S6o3ABhUQD/zGIuEBLVKO6BTUYNDpYNxmmXKZ+dbB1nz++bvson8pYv/MdkeeeRrmqVgmrZzDifgBqYicGep+LKobhXvgCX6Qb9cHC9MCx+3mUzT0RhwwxEL/AsBm6f5oPJZdnF3agnOi61KA+wrK7RPU5v88HY5jHb87irFjNbc2xvyoLJmx+ILyKIcdsaADiTdy2JX5fqsO4S3WFELK+utw1MgBnGt0ENaev2Tce9r2QuUZQYNpa1+vAcdsc0qcR2W9wV
--- a/vercel.json
+++ b/vercel.json
@ -1,6 +0,0 @@
-{
-    "redirects": [
-        { "source": "/wishlist", "destination": "https://www.amazon.jp/hz/wishlist/ls/8WTKCPWKOJ2N?ref_=wl_share" },
-        { "source": "/scrapbox", "destination": "https://scrapbox.io/yude" }
-    ]
-}
--- a/yarn.lock
+++ b/yarn.lock
				`@ -1 +0,0 @@`
				`ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfEH46roc6pn97+Bi0UxWaeogvN38U5/7W+s2TWAQfpE8gv7ibFwZ5FVvHguT8BbCkK8YuXW7Oug1n8S6o3ABhUQD/zGIuEBLVKO6BTUYNDpYNxmmXKZ+dbB1nz++bvson8pYv/MdkeeeRrmqVgmrZzDifgBqYicGep+LKobhXvgCX6Qb9cHC9MCx+3mUzT0RhwwxEL/AsBm6f5oPJZdnF3agnOi61KA+wrK7RPU5v88HY5jHb87irFjNbc2xvyoLJmx+ILyKIcdsaADiTdy2JX5fqsO4S3WFELK+utw1MgBnGt0ENaev2Tce9r2QuUZQYNpa1+vAcdsc0qcR2W9wV`