diff --git a/.github/workflows/build_docker_image.yml b/.github/workflows/build_docker_image.yml index b183e899..077c1526 100644 --- a/.github/workflows/build_docker_image.yml +++ b/.github/workflows/build_docker_image.yml @@ -2,12 +2,6 @@ name: (GitHub Actions) Build Docker Image on: push: - branches: - - main - - development - pull_request: - branches: - - development jobs: build: diff --git a/.github/workflows/build_docker_image_for_railway.yml b/.github/workflows/build_docker_image_for_railway.yml index 1622359a..5c87b212 100644 --- a/.github/workflows/build_docker_image_for_railway.yml +++ b/.github/workflows/build_docker_image_for_railway.yml @@ -2,12 +2,6 @@ name: (GitHub Actions) Build Docker Image for Railway on: push: - branches: - - main - - development - pull_request: - branches: - - development jobs: build: diff --git a/.github/workflows/build_nextjs_and_deploy_to_railway.yml b/.github/workflows/build_nextjs_and_deploy_to_railway.yml index 97d01d4f..440e0754 100644 --- a/.github/workflows/build_nextjs_and_deploy_to_railway.yml +++ b/.github/workflows/build_nextjs_and_deploy_to_railway.yml @@ -5,16 +5,13 @@ on: branches: - main - development - pull_request: - branches: - - development jobs: build: runs-on: ubuntu-latest strategy: matrix: - node-version: [16.x, 18.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 357e0044..5c8aacd5 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -2,13 +2,6 @@ name: (GitHub Actions) Cypress on: push: - branches: - - main - - development - pull_request: - branches: - - main - - development jobs: cypress_gss2022_frontend: diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 4c6c2666..741218ba 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -2,12 +2,6 @@ name: (GitHub Actions) Node.js CI on: push: - branches: - - main - - development - pull_request: - branches: - - development workflow_dispatch: jobs: @@ -15,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [16.x, 18.x] + node-version: [18.x] steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} diff --git a/components/Departments.tsx b/components/Departments.tsx index d4929713..4e3218e8 100644 --- a/components/Departments.tsx +++ b/components/Departments.tsx @@ -14,7 +14,7 @@ const Departments: NextPage = () => {
-
+
  • {locale === 'ja' @@ -29,9 +29,7 @@ const Departments: NextPage = () => {
-
- -
+

{locale === 'ja' ? '①オールキャラ部門' @@ -43,7 +41,7 @@ const Departments: NextPage = () => { : 'In this division, vote for your favorite characters.'}

-

+

{locale === 'ja' ? '投票数' : 'Number of votes'}

{locale === 'ja' ? ( @@ -91,7 +89,7 @@ const Departments: NextPage = () => {

-

+

{locale === 'ja' ? '投票用ハッシュタグ' : 'Hashtag to use for voting'} @@ -109,50 +107,14 @@ const Departments: NextPage = () => {

-
-

- {locale === 'ja' ? '②コンビ部門' : '(2) Combination division'} + {locale === 'ja' + ? '②???部門(近日発表!)' + : '(2) ??? division (Reveal soon!)'}

- {locale === 'ja' - ? '好きなキャラのコンビ(2人組)に投票する部門です。' - : '好きなキャラのコンビ(2人組)に投票する部門です。'} + {locale === 'ja' ? '???' : '???'}

- -
-

- {locale === 'ja' ? '投票数' : 'Number of votes'} -

- {locale === 'ja' ? ( -

- お一人様 1票 まで -

- ) : ( -

- 1 person has up to{' '} - 1 votes -

- )} -
-
-

- {locale === 'ja' - ? '投票用ハッシュタグ' - : 'Hashtag to use for voting'} -

-

- {' '} - - #幻水総選挙2022コンビ部門 - -

-
diff --git a/components/VoteExamples.tsx b/components/VoteExamples.tsx index afd4444a..198cc4e3 100644 --- a/components/VoteExamples.tsx +++ b/components/VoteExamples.tsx @@ -38,38 +38,13 @@ const VoteExamples: NextPage = () => { />
-
-

コンビ部門 投票例①

- コンビ部門 投票例 01 -
- -
-

コンビ部門 投票例②

- コンビ部門 投票例 02 -
-
ハッシュタグの前には半角スペースまたは改行が必要です。
- キャラやコンビがしっかりと判別できれば、書式は問いません。 + キャラがしっかりと判別できれば、書式は問いません。