Merge branch 'master' of https://github.com/yudejp/yude.jp

README.md

@@ -3,7 +3,7 @@
 <img alt="Next JS" src="https://img.shields.io/badge/nextjs-%23000000.svg?style=for-the-badge&logo=next.js&logoColor=white"/>
 <img alt="TailwindCSS" src="https://img.shields.io/badge/tailwindcss-%2338B2AC.svg?style=for-the-badge&logo=tailwind-css&logoColor=white"/>\
 Source code of [yude.jp](https://yude.jp).\
-Built with [Next.js](https://nextjs.org/) and [Tailwind CSS](https://tailwindcss.com/) and deployed on [Vercel](https://vercel.com).
+Built with [Next.js](https://nextjs.org/) and [Tailwind CSS](https://tailwindcss.com/) and deployed to [Cloudflare Pages](https://pages.cloudflare.com/).
 
 ## Development
 1. Run `yarn` to install dependencies.

docs/services/en.md

@@ -0,0 +1,23 @@
+# Available services on yude.jp
+
+## Softwares
+* [AutoMuteUs](https://github.com/denverquane/automuteus)\
+Among Us helper; API: [`galactus.yude.jp`](https://galactus.yude.jp)
+* [Nextcloud](https://nc.yude.jp)
+* [Mastodon](https://mstdn.yude.jp)
+* [Misskey](https://misskey.yude.jp)
+* [Pleroma](https//pleroma.yude.jp)
+* TeamSpeak 3: `yude.jp`
+* [Gitea](https://git.yude.jp)
+* [h5ai](https://files.yude.jp)
+* [JMusicBot (forked)](https://discord.com/oauth2/authorize?client_id=429638220456656896&scope=bot&permissions=338963472)
+* [Owncast](https://live.yude.jp)
+* [Minecraft Server](https://yude.jp/minecraft)
+
+## Anonymous communication
+### Tor
+* Relay: [yudejp]
+* Hidden Service: [yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion](yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion)
+
+### I2P
+* Hidden Service: [yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p](yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p)

docs/services/ja.md

@@ -0,0 +1,23 @@
+# yude.jp で運用中のサービス
+
+## ソフトウェア
+* [AutoMuteUs](https://github.com/denverquane/automuteus)\
+Among Us の自動ミュートボット; API: [`galactus.yude.jp`](https://galactus.yude.jp)
+* [Nextcloud](https://nc.yude.jp)
+* [Mastodon](https://mstdn.yude.jp)
+* [Misskey](https://misskey.yude.jp)
+* [Pleroma](https//pleroma.yude.jp)
+* TeamSpeak 3: `yude.jp`
+* [Gitea](https://git.yude.jp)
+* [h5ai](https://files.yude.jp)
+* [JMusicBot (フォーク)](https://discord.com/oauth2/authorize?client_id=429638220456656896&scope=bot&permissions=338963472)
+* [Owncast](https://live.yude.jp)
+* [Minecraft サーバー](https://yude.jp/minecraft)
+
+## 秘匿化ネットワーク
+### Tor
+* リレー: [yudejp]
+* Hidden Service: [yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion](yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion)
+
+### I2P
+* Hidden Service: [yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p](yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p)

i18n/translations.en.json

@@ -60,5 +60,8 @@
     "service": "Service",
     "shape": "Shape",
     "tos": "yude.jp Terms of Service",
-    "input": "en"
+    "input": "en",
+    "services": "Services",
+    "contents": "Contents",
+    "Blog": "Weblog"
 }

i18n/translations.ja.json

@@ -60,5 +60,8 @@
     "service": "サービス",
     "shape": "シェイプ",
     "tos": "yude.jp サービス利用規約",
-    "input": "ja"
+    "input": "ja",
+    "services": "サービス",
+    "contents": "コンテンツ",
+    "blog": "ブログ"
 }

pages/components/Footer/Footer.js

@@ -18,17 +18,6 @@ export default function Footer(props) {
                 <p className="text-sm font-bold mb-2">
                     {t('footer')} / <Link href="https://github.com/yudejp/yude.jp"><a className="hover:underline">{t('source')}</a></Link>
                 </p>
-                <p>
-                  <span>
-                    <Link href="yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion"><a className="hover:underline">Tor</a></Link>
-                  </span>
-                  <span className="text-xs">
-                    &nbsp;&#9899;&nbsp;
-                  </span>
-                  <span>
-                    <Link href="http://yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p"><a className="hover:underline">I2P</a></Link>
-                  </span>
-                </p>
             </div>
           </div>
         </div>

pages/index.js

@@ -18,7 +18,7 @@ import MinecraftMenu from "./components/Menu/MinecraftMenu"
 
 // Font Awesome
 import { faDiscord, faGit, faGithub } from '@fortawesome/free-brands-svg-icons'
-import { faBook, faUser, faServer, faHouseUser, faHeart } from '@fortawesome/free-solid-svg-icons'
+import { faBook, faUser, faServer, faScrewdriver, faHeart } from '@fortawesome/free-solid-svg-icons'
 
 export default function Index(props) {
   const { t } = useTranslation();
@@ -45,11 +45,10 @@ export default function Index(props) {
           <div className="grid grid-cols-3 gap-10">
             <FAMenu dest="/profile" query={query} icon={faUser} />
             <FAMenu dest="/server" query={query} icon={faServer} />
-            <FAMenu dest="/house" query={query} icon={faHouseUser} />
+            <FAMenu dest="/services" query={query} icon={faScrewdriver} />
-            <FAMenu dest="https://scrapbox.io/yude" query={query} icon={faBook} />
+            <FAMenu dest="https://discord.gg/X6srY7X" icon={faDiscord} />          
-            <FAMenu dest="https://discord.gg/X6srY7X" query={query} icon={faDiscord} />          
+            <FAMenu dest="https://github.com/yudejp" icon={faGithub} />
-            <FAMenu dest="https://github.com/yudejp" query={query} icon={faGithub} />
+            <FAMenu dest="https://git.yude.jp" icon={faGit} />
-            <FAMenu dest="https://git.yude.jp" icon={faGit} query={query} />
             <MinecraftMenu query={query} />
             <FAMenu dest="/mutual" icon={faHeart} query={query} />
           </div>

pages/minecraft.js

@@ -71,7 +71,7 @@ export default function About(props) {
                   </button>
                 </p>
                 
-                <p>{t('version')}: 1.17</p>
+                <p>{t('version')}: 1.18.1</p>
                 
                 <Link href="https://bluemap.yude.jp">
                   <a>

pages/mutual.js

@@ -30,7 +30,7 @@ export default function Tos(props) {
               title="相互リンク"
               description="yude.jp と相互にリンクを貼っている Web サイトの一覧"
             />
-            <Layout title={t('common:mutual')}>
+            <Layout title={t('mutual')}>
               <div>
                 {query["lang"] === 'ja' ? (
                   <ReactMarkdown plugins={[gfm]}>

pages/profile.js

@@ -6,7 +6,7 @@ import { useTranslation, useLanguageQuery } from 'next-export-i18n';
 
 // Font Awesome
 import { faDiscord, faTwitter, faGithub, faKeybase, faInstagram, faMastodon, faSteam, faAmazon } from '@fortawesome/free-brands-svg-icons'
-import { faEnvelope, faBirthdayCake, faMapPin, faSchool, faPhone, faInfo, faLink, faMobile } from '@fortawesome/free-solid-svg-icons'
+import { faEnvelope, faBirthdayCake, faMapPin, faSchool, faPhone, faBlog, faBookDead, faInfo, faBookmark, faLink, faMobile } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 
 // Next.js, React
@@ -86,6 +86,19 @@ export default function Profile(props) {
               <p className="ml-9">{t('hiroshima')}</p>
             </div>
           </div>
+          
+          {
+           // Contents
+          }
+          <div>
+            <div className="text-left">
+                <p className="text-2xl"><FontAwesomeIcon icon={faBookDead} className="w-5 h-5 inline"/> {t('contents')}</p>
+            </div>
+            <div className="my-2 grid grid-cols-2 lg:grid-cols-5 md:grid-cols-3 sm:grid-cols-2justify-items-center gap-y-6">
+              <Contact dest="https://blog.yude.jp" icon={faBlog} caption={t('blog')} />
+              <Contact dest="https://scrapbox.io/yude" icon={faBookmark} caption="Scrapbox" />
+            </div>
+          </div>
   
           {
            // Contact 

pages/services.js

@@ -0,0 +1,49 @@
+// Base layout
+import Layout from "./components/Layout"
+
+// i18n
+import { useTranslation, useLanguageQuery, LanguageSwitcher } from 'next-export-i18n';
+
+// React Router etc.
+import { useRouter } from 'next/router'
+import React from "react"
+
+// React Markdown
+import ReactMarkdown from "react-markdown"
+import gfm from 'remark-gfm';
+import ja from '../docs/services/ja.md'
+import en from '../docs/services/en.md'
+
+// next-seo
+import { NextSeo } from 'next-seo';
+
+export default function Tos(props) {
+    const { t } = useTranslation();
+    const [query] = useLanguageQuery();
+    
+    if (!query) {
+      return <p>Loading...</p>
+    } else {
+    return(
+          <>
+            <NextSeo
+              title="サービス"
+              description="yude.jp で運用中のサービス"
+            />
+            <Layout title={t('services')}>
+              <div>
+                {query["lang"] === 'ja' ? (
+                  <ReactMarkdown plugins={[gfm]}>
+                      {ja}
+                  </ReactMarkdown>
+                ) : (
+                  <ReactMarkdown plugins={[gfm]}>
+                      {en}
+                  </ReactMarkdown>
+                )}
+              </div>
+            </Layout>
+          </>
+        )
+      }
+    }