Merge pull request #21 from yudejp/dependabot/npm_and_yarn/minimatch-3.1.2

Bump minimatch from 3.0.4 to 3.1.2

docs/services/en.md

@@ -7,17 +7,17 @@ Among Us helper; API: [`galactus.yude.jp`](https://galactus.yude.jp)
 * [Mastodon](https://mstdn.yude.jp)
 * [Misskey](https://misskey.yude.jp)
 * [Pleroma](https//pleroma.yude.jp)
-* [TeamSpeak 3](ts3server://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]
+* Relay: [yudejp](https://metrics.torproject.org/rs.html#details/CF762EF3C86B104C301511894547C72371F952A4)
-* Hidden Service: [yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion](yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion)
+* Hidden Service: [yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion](http://yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion)
 
 ### I2P
-* Hidden Service: [yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p](yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p)
+* Hidden Service: [yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p](http://yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p)

docs/services/ja.md

@@ -7,7 +7,7 @@ Among Us の自動ミュートボット; API: [`galactus.yude.jp`](https://galac
 * [Mastodon](https://mstdn.yude.jp)
 * [Misskey](https://misskey.yude.jp)
 * [Pleroma](https//pleroma.yude.jp)
-* [TeamSpeak 3](ts3server://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)
@@ -16,8 +16,8 @@ Among Us の自動ミュートボット; API: [`galactus.yude.jp`](https://galac
 
 ## 秘匿化ネットワーク
 ### Tor
-* リレー: [yudejp]
+* リレー: [yudejp](https://metrics.torproject.org/rs.html#details/CF762EF3C86B104C301511894547C72371F952A4)
-* Hidden Service: [yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion](yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion)
+* Hidden Service: [yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion](http://yude3mzscyufx5u3zup72ium7tgecy3bd67p7t6vqhaywvr7e2gqpcqd.onion)
 
 ### I2P
-* Hidden Service: [yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p](yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p)
+* Hidden Service: [yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p](http://yudejp.i2p/?i2paddresshelper=55ivoba6mo3mqlwvw5lqz7lchxqew2kh77kwkn5shefrj2dp3coq.b32.i2p)

i18n/translations.en.json

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

i18n/translations.ja.json

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

package.json

@@ -31,8 +31,8 @@
     "autoprefixer": "^10.3.4",
     "axios": "^0.21.4",
     "date-fns": "^2.24.0",
-    "moment": "^2.29.1",
+    "moment": "^2.29.4",
-    "next": "^11.1.3",
+    "next": "^12.1.0",
     "next-export-i18n": "^1.2.1",
     "next-seo": "^4.28.1",
     "next-themes": "^0.0.15",

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/components/LangSelector.js

@@ -31,7 +31,7 @@ const Dropdown = ({ color }) => {
     <>
 
 <div className="text-left mr-2 ml-2 my-3 float-right">
-    <button type="button" className="inline-flex justify-center w-full rounded-md border border-gray-300 dark:border-gray-800 shadow-sm px-2 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50 dark:bg-gray-700 dark:text-white focus:outline-none" id="options-menu" aria-haspopup="true" aria-expanded="true"
+    <button type="button" className="inline-flex justify-center rounded-md border border-gray-300 dark:border-gray-800 shadow-sm px-2 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50 dark:bg-gray-700 dark:text-white focus:outline-none h-10" id="options-menu" aria-haspopup="true" aria-expanded="true"
     style={{ transition: "all .15s ease" }}
     ref={btnDropdownRef}
     onClick={() => {
@@ -40,19 +40,19 @@ const Dropdown = ({ color }) => {
         : openDropdownPopover();
     }}
     >
-      <FontAwesomeIcon icon={faLanguage} className="text-4xl" />
+      <FontAwesomeIcon icon={faLanguage} size="3x" />
       <svg className="-mr-1 ml-2 h-9 w-3" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
         <path fillRule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clipRule="evenodd" />
       </svg>
     </button>  
   <div ref={popoverDropdownRef} className={
-              (dropdownPopoverShow ? "block " : "hidden ") + "z-10 origin-top-right absolute right-0 mt-2 w-40 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5 dark:bg-gray-700"}>
+              (dropdownPopoverShow ? "block " : "hidden ") + "z-10 origin-top-right absolute right-0 mt-2 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5 dark:bg-gray-700"}>
     <div className="py-1" role="menu" aria-orientation="vertical" aria-labelledby="options-menu">
     <LanguageSwitcher lang="ja">
-      <a href="#" className="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-700 dark:text-white dark:hover:bg-gray-800" role="menuitem">日本語</a>
+      <a href="#" className="block px-4 py-2 text-gray-700 hover:bg-gray-100 hover:text-gray-700 dark:text-white dark:hover:bg-gray-800" role="menuitem">日本語</a>
     </LanguageSwitcher>
     <LanguageSwitcher lang="en">
-      <a href="#" className="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-700 dark:text-white dark:hover:bg-gray-800" role="menuitem">English</a>
+      <a href="#" className="block px-4 py-2 text-gray-700 hover:bg-gray-100 hover:text-gray-700 dark:text-white dark:hover:bg-gray-800" role="menuitem">English</a>
     </LanguageSwitcher>
     </div>
   </div>

pages/components/Menu/FontAwesomeMenu.js

@@ -11,7 +11,7 @@ const FontAwesomeMenu = (props) => {
     <div>
         <Link href={{ pathname: dest, query: query }}>
             <a>
-                <FontAwesomeIcon icon={icon} className="text-4xl fill-current inline transition duration-200 ease-in-out transform hover:-translate-y-1 hover:scale-110" />
+                <FontAwesomeIcon icon={icon} size="5x" className="w-9 h-9 fill-current inline transition duration-200 ease-in-out transform hover:-translate-y-1 hover:scale-110" />
             </a>
         </Link>
     </div>

pages/components/Profile/Button.js

@@ -10,7 +10,7 @@ const Button = (props) => {
         <Link href={{ pathname: dest }}>
             <a>
                 <button
-                className="bg-pink-600 text-white active:bg-pink-600 mt-3 font-bold text-sm px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1       ease-linear transition-all duration-150"
+                className="bg-pink-600 text-white active:bg-pink-600 mt-3 font-bold text-sm px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
                 type="button"
                 >
                 <FontAwesomeIcon icon={icon} className="w-5 h-5 inline"/> {caption}

pages/components/Profile/Contact.js

@@ -10,7 +10,7 @@ const Contact = (props) => {
         <div className="hover:underline">
             <Link href={{ pathname: dest }}>
                 <a>
-                    <FontAwesomeIcon icon={icon} className="text-3xl inline lg:text-4xl md:w-7 md:h-7"/>
+                    <FontAwesomeIcon icon={icon} size="5x" className="w-9 h-9 fill-current inline transition duration-200 ease-in-out transform hover:-translate-y-1 hover:scale-110" />
                     <p className="font-mono text-xl">{caption}</p>
                 </a>
             </Link>

pages/components/Profile/WakaTime.js

@@ -1,12 +1,16 @@
 // React
-import React, { useState, useEffect } from 'react';
+import React from 'react';
 
 // Font Awesome
 import { faUserClock } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 
+// i18n
+import { useTranslation } from 'next-export-i18n';
+
 export default function Modal() {
   const [showModal, setShowModal] = React.useState(false);
+  const { t } = useTranslation();
   
   return (
     <>
@@ -36,7 +40,7 @@ export default function Modal() {
                     type="button"
                     onClick={() => setShowModal(false)}
                   >
-                    {close}
+                    {t('close')}
                   </button>
                 </div>
               </div>

pages/index.js

@@ -46,10 +46,9 @@ export default function Index(props) {
             <FAMenu dest="/profile" query={query} icon={faUser} />
             <FAMenu dest="/server" query={query} icon={faServer} />
             <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/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/server.js

@@ -37,7 +37,7 @@ export default function Server(props) {
           <div className="flex-1"><p className="font-bold">OS </p>Arch Linux</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/heHnGhDanoIDlf7jjxUe9yPVrsG3deeH5ptD8suErrq5w46crWEIYdLfzLoukzfF?period=24h" height="400" frameBorder="0" scrolling="no"></iframe>
+          <a href="https://mackerel.io/orgs/yude/hosts/4dkbQuMQjvo/-/graphs/loadavg#period=10m"><img src="https://mackerel.io/embed/public/embed/heHnGhDanoIDlf7jjxUe9yPVrsG3deeH5ptD8suErrq5w46crWEIYdLfzLoukzfF.png?period=10m" className="w-full" /></a>
           
           
           {
@@ -51,7 +51,7 @@ export default function Server(props) {
           <div className="flex-1"><p className="font-bold">OS </p>Ubuntu 20.04 LTS</div>
           <div className="flex-1"><p className="font-bold">{t('region')} </p>Japan Central (Osaka)</div>
           </div>
-          <iframe className="w-full h-96" src="https://mackerel.io/embed/public/embed/vcn6LE4P2hh6GzvtMbIAWxsXpDh6eSoNyAXdhfYaj9yDN6FJwOHIiz9ktqToj1HG?period=24h" height="400" frameBorder="0" scrolling="no"></iframe>
+          <a href="https://mackerel.io/orgs/yude/hosts/4ftHfeojMCU/-/graphs/loadavg#period=10m"><img src="https://mackerel.io/embed/public/embed/vcn6LE4P2hh6GzvtMbIAWxsXpDh6eSoNyAXdhfYaj9yDN6FJwOHIiz9ktqToj1HG.png?period=10m" className="w-full" /></a>
           
           {
               // oracle2
@@ -64,7 +64,20 @@ export default function Server(props) {
           <div className="flex-1"><p className="font-bold">OS </p>Ubuntu 20.04 LTS</div>
           <div className="flex-1"><p className="font-bold">{t('region')} </p>Japan Central (Osaka)</div>
           </div>
-          <iframe className="w-full h-96" src="https://mackerel.io/embed/public/embed/wgmTz7aTgvwfyU6qVHrJJmQlpOHCUJK6qw0W9sJTX68WOI8TFtc27YvJ7dwkQEGv?period=24h" height="400" frameBorder="0" scrolling="no"></iframe>
+          <a href="https://mackerel.io/orgs/yude/hosts/4frgQ1QuivJ/-/graphs/loadavg#period=10m"><img src="https://mackerel.io/embed/public/embed/wgmTz7aTgvwfyU6qVHrJJmQlpOHCUJK6qw0W9sJTX68WOI8TFtc27YvJ7dwkQEGv.png?period=10m" className="w-full" /></a>
+          
+          {
+              // oracle-a1-1
+          }
+          <h2 className="text-2xl text-left font-bold leading-7 sm:text-3xl sm:truncate">oracle-a1-1</h2>
+          <div className="flex xl:w-2/3 text-center">
+          <div className="flex-1"><p className="font-bold">{t('service')} </p>Oracle Cloud</div>
+          <div className="flex-1"><p className="font-bold">{t('shape')} </p>VM.Standard.A1.Flex</div>
+          <div className="flex-1"><p className="font-bold">RAM </p>6GB</div>
+          <div className="flex-1"><p className="font-bold">OS </p>Ubuntu 20.04.3 LTS</div>
+          <div className="flex-1"><p className="font-bold">{t('region')} </p>Japan Central (Osaka)</div>
+          </div>
+          <a href="https://mackerel.io/orgs/yude/hosts/4qzeqT6kToQ/-/graphs/loadavg#period=10m"><img src="https://mackerel.io/embed/public/embed/2C7NdtqLgGFGPiO2IctDGuaMdjBwhXyp0i8imkaJT2GFI55syPaxxACEYIRWDHnS.png?period=10m" className="w-full" /></a>
           
         </div>
       </Layout>