Merge branch 'master' into 202409-microsoft

utelecon · Nov 7, 2024 · 3932a48 · 3932a48
2 parents 5aa3186 + 2e5a536
commit 3932a48
Show file tree

Hide file tree

Showing 176 changed files with 1,140 additions and 740 deletions.
diff --git a/.github/workflows/rss-to-twitter.yml b/.github/workflows/rss-to-twitter.yml
@@ -0,0 +1,34 @@
+name: rss-to-twitter
+
+on:
+  schedule:
+    # everyday at 01:00 UTC (10:00 JST)
+    - cron: '0 1 * * *'
+
+jobs:
+  twitter:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: azu/rss-to-twitter@v2
+        with:
+          # RSS feed URL
+          RSS_URL: "https://utelecon.adm.u-tokyo.ac.jp/notice/rss.xml"
+          # UPDATE_WITHIN_MINUTES is calculated from cron schedule to be 1 day
+          TWEET_TEMPLATE: '%title% %url%'
+          TWITTER_APIKEY: ${{ secrets.TWITTER_APIKEY }}
+          TWITTER_APIKEY_SECRET: ${{ secrets.TWITTER_APIKEY_SECRET }}
+          TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
+          TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
+  twitter-en:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: azu/rss-to-twitter@v2
+        with:
+          # RSS feed URL
+          RSS_URL: "https://utelecon.adm.u-tokyo.ac.jp/en/notice/rss.xml"
+          # UPDATE_WITHIN_MINUTES is calculated from cron schedule to be 1 day
+          TWEET_TEMPLATE: '%title% %url%'
+          TWITTER_APIKEY: ${{ secrets.TWITTER_EN_APIKEY }}
+          TWITTER_APIKEY_SECRET: ${{ secrets.TWITTER_EN_APIKEY_SECRET }}
+          TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_EN_ACCESS_TOKEN }}
+          TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_EN_ACCESS_TOKEN_SECRET }}
diff --git a/src/components/en/systems/eccs/Login.mdx b/src/components/en/systems/eccs/Login.mdx
@@ -1,4 +1,4 @@
-import If from "@components/utils/If.astro";
+import Support from "@components/utils/Support.astro";
 
 {/**
   * @typedef {object} Props
@@ -10,6 +10,4 @@ import If from "@components/utils/If.astro";
 1. Press the power button on the ECCS terminal to turn it on.
 2. In the log-in screen that appears, enter your UTokyo Account username (10-digit number) and password.
 
-<If cond={props.support}>
-- If this procedure does not work, please consult the [ECCS tutors](https://www.sodan.ecc.u-tokyo.ac.jp/about-us/tutors-working/) (student staff) who are available at the main terminal locations.
-</If>
+<Support lang="en" show={props.support}>If this procedure does not work, please consult the [ECCS tutors](https://www.sodan.ecc.u-tokyo.ac.jp/about-us/tutors-working/) (student staff) who are available at the main terminal locations.</Support>
diff --git a/src/components/en/systems/eccs/index.mdx b/src/components/en/systems/eccs/index.mdx
diff --git a/src/components/en/systems/eccs_cloud_email/index.mdx b/src/components/en/systems/eccs_cloud_email/index.mdx
diff --git a/src/components/en/systems/microsoft/index.mdx b/src/components/en/systems/microsoft/index.mdx
diff --git a/src/components/en/systems/utas/index.mdx b/src/components/en/systems/utas/index.mdx
diff --git a/src/components/en/systems/utokyo_account/index.mdx b/src/components/en/systems/utokyo_account/index.mdx
diff --git a/src/components/en/systems/utokyo_wifi/Apply.mdx b/src/components/en/systems/utokyo_wifi/Apply.mdx
@@ -7,7 +7,7 @@ import ApplyHelpMFA from "./ApplyHelpMFA.mdx";
 
 {/**
   * @typedef {object} Props
-  * @property {boolean} support
+  * @property {boolean} [support]
   * @property {boolean} [blockLink]
   * @property {boolean} [inlineHelp]
   * @property {boolean} [utasOnly]

diff --git a/src/components/en/systems/utokyo_wifi/Connect.mdx b/src/components/en/systems/utokyo_wifi/Connect.mdx
@@ -2,20 +2,24 @@ import Help from "@components/utils/Help.astro";
 
 {/**
   * @typedef {object} Props
-  * @property {boolean} support
-  * @property {string} deviceDescription
+  * @property {boolean} [support]
   * @property {string} applyStep
   * @property {JSX.Element} connectConfiguration
   */}
 
-- This process can only be done in the place where UTokyo Wi-Fi (Wi-Fi with SSID `0000UTokyo`) is visible on the Wi-Fi setting menu of your own devices.
+This process can only be done in the place where UTokyo Wi-Fi (Wi-Fi with SSID `0000UTokyo`) is visible on the Wi-Fi setting menu of your own devices.
+{:.additional-info}
 
-1. Select `0000UTokyo` on the Wi-Fi connection settings screen of {props.deviceDescription}.
+1. Select `0000UTokyo` on the Wi-Fi connection settings screen of the device you want to connect.
 2. Enter the user ID and password of your UTokyo Wi-Fi account (not of your UTokyo Account). You can find your user ID and password in the notification email you received in {props.applyStep}. If you have just finished your application, you can also find them on the application completion screen of the account menu.
 3. Once you establish a connection, you can use it just like any normal Wi-Fi.
 
-- When connecting, you may be asked to verify your certificate or to enter the information described in the {props.connectConfiguration}.
-- Please refer to [ECCS Tutor’s page](https://www.sodan.ecc.u-tokyo.ac.jp/en/faq/utokyo-wifi-en/) as well if you are unsure. There are detailed connection instructions for each device. You may also refer to [the "User's Guide" on the page of the Wi-Fi system called "eduroam"](https://www.eduroam.jp/for_users/), which has a similar connection method (replace `eduroam` with UTokyo Wi-Fi SSID when you read the page).
+When connecting, you may be asked to verify your certificate or to enter the information described in the {props.connectConfiguration}.
+{:.additional-info}
+
+Please refer to [ECCS Tutor’s page](https://www.sodan.ecc.u-tokyo.ac.jp/en/faq/utokyo-wifi-en/) as well if you are unsure. There are detailed connection instructions for each device. You may also refer to [the "User's Guide" on the page of the Wi-Fi system called "eduroam"](https://www.eduroam.jp/for_users/), which has a similar connection method (replace `eduroam` with UTokyo Wi-Fi SSID when you read the page).
+{:.additional-info}
+
 <Help lang="en" support={props.support}>
   - If the signal is weak, the connection may be interrupted. Try different locations or times of the day.
   - When you enter your user ID, please include the alphabetical part as well.

diff --git a/src/components/en/systems/utokyo_wifi/index.mdx b/src/components/en/systems/utokyo_wifi/index.mdx
diff --git a/src/components/en/systems/utol/index.mdx b/src/components/en/systems/utol/index.mdx
diff --git a/src/components/en/systems/zoom/index.mdx b/src/components/en/systems/zoom/index.mdx
diff --git a/src/components/ja/systems/eccs/Login.mdx b/src/components/ja/systems/eccs/Login.mdx
@@ -1,4 +1,4 @@
-import If from "@components/utils/If.astro";
+import Support from "@components/utils/Support.astro";
 
 {/**
   * @typedef {object} Props
@@ -10,6 +10,4 @@ import If from "@components/utils/If.astro";
 1. 設置されているECCS端末の電源ボタンを押して電源を入れてください．
 2. しばらく待つとログイン画面が表示されます．UTokyo Accountのユーザ名（10桁の数字）とパスワードを入力してください．
 
-<If cond={props.support}>
-- この手順がうまくいかないときは，主要な端末設置場所に配置されている学生スタッフの[ECCS相談員](https://www.sodan.ecc.u-tokyo.ac.jp/about-us/tutors-working/)に相談してください．
-</If>
+<Support lang="ja" show={props.support}>この手順がうまくいかないときは，主要な端末設置場所に配置されている学生スタッフの[ECCS相談員](https://www.sodan.ecc.u-tokyo.ac.jp/about-us/tutors-working/)に相談してください．</Support>
diff --git a/src/components/ja/systems/eccs/index.mdx b/src/components/ja/systems/eccs/index.mdx
diff --git a/src/components/ja/systems/eccs_cloud_email/Configure.mdx b/src/components/ja/systems/eccs_cloud_email/Configure.mdx
@@ -5,7 +5,6 @@ import Support from "@components/utils/Support.astro";
   * @typedef {object} Props
   * @property {boolean} [support]
   * @property {boolean} [img]
-  * @property {boolean} [detailsLink]
   */}
 
 1. [UTokyo Account利用者メニュー](https://utacm.adm.u-tokyo.ac.jp/webmtn/LoginServlet)にアクセスし，UTokyo Accountのユーザ名（10桁の数字のみ）とパスワードを入力してログインしてください．
@@ -14,8 +13,4 @@ import Support from "@components/utils/Support.astro";
       ![](./change-localpart.png){:.medium}
     </If>
 
-<If cond={props.detailsLink}>
-  - ECCSクラウドメールの基本的な使い方（ログイン方法・メールの確認方法等）は下の[「ECCSクラウドメール」の項](#google)をご覧ください．
-</If>
-
 <Support lang="ja" show={props.support} />