Skip to content
This repository has been archived by the owner on Jan 15, 2024. It is now read-only.

Commit

Permalink
Merge pull request #972 from true-runes/development
Browse files Browse the repository at this point in the history
v21.0.0
  • Loading branch information
nikukyugamer authored Apr 27, 2023
2 parents 704f115 + e604988 commit 5b0db0a
Show file tree
Hide file tree
Showing 10 changed files with 1,318 additions and 992 deletions.
18 changes: 0 additions & 18 deletions .circleci/config.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
node-version: ["18.x"]
steps:
- name: Checkout
uses: actions/checkout@v3.0.2
uses: actions/checkout@v3.5.2
- name: Node.js のセットアップ
uses: actions/setup-node@v3
with:
Expand All @@ -38,7 +38,7 @@ jobs:
run: |
npx cypress info
- name: Cypress を実行する
uses: cypress-io/github-action@v4.1.0
uses: cypress-io/github-action@v5.6.1
with:
build: npx next build
start: npx next start --port 3100
Expand All @@ -53,13 +53,13 @@ jobs:
env:
DEPLOYMENT_ENVIRONMENT: production
- name: Cypress のスクリーンショットをアップロードする
uses: actions/[email protected].0
uses: actions/[email protected].2
if: always()
with:
name: cypress_screenshots
path: cypress/screenshots/
- name: Cypress の動画をアップロードする
uses: actions/[email protected].0
uses: actions/[email protected].2
if: always()
with:
name: cypress_videos
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/danger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Danger
uses: danger/danger-js@11.0.7
uses: danger/danger-js@11.2.6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DANGER_DISABLE_TRANSPILATION: true
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.2.0
18.16.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.16.0
FROM alpine:3.17.3

WORKDIR /tmp

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.railway
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.4.0
FROM node:20.0.0

WORKDIR /app
ARG EnvironmentVariable
Expand Down
58 changes: 58 additions & 0 deletions components/common/RankingTableAndTweetSummary.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import type { NextPage } from 'next'

export const RankingTableAndTweetSummary: NextPage = () => {
return (
<div className="bg-white text-black">
<div className="hero">
<div className="hero-content text-center w-full">
<div className="pb-0 w-full">
<div className="card bg-white shadow-2xl">
<div className="items-center card-body bg-white text-black">
<h2 className="card-title text-2xl">結果</h2>

<div className="my-1" />

<div className="text-left">
<p className="text-center">
<a
href="https://gensosenkyo.booth.pm/items/4262247"
className="underline underline-offset-4 text-blue-500 hover:text-blue-900"
target="_blank"
rel="noreferrer"
>
順位表 (PDF on Booth)
</a>
</p>
<div className="mb-4" />
<p>
<a
href="https://min.togetter.com/oMpk1RZ"
className="underline underline-offset-4 text-blue-500 hover:text-blue-900"
target="_blank"
rel="noreferrer"
>
第一部 開票ツイート まとめ
</a>
</p>
<div className="mb-2" />
<p>
<a
href="https://min.togetter.com/OG4JD89"
className="underline underline-offset-4 text-blue-500 hover:text-blue-900"
target="_blank"
rel="noreferrer"
>
第二部 開票ツイート まとめ
</a>
</p>
</div>

<div className="my-1" />
</div>
</div>
</div>
</div>
</div>
</div>
)
}
72 changes: 36 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,43 @@
"react-dom": "18.2.0"
},
"devDependencies": {
"@bugsnag/js": "7.17.0",
"@bugsnag/plugin-react": "7.17.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.3.0",
"@types/node": "17.0.23",
"@types/react": "18.0.14",
"@types/react-burger-menu": "^2.8.3",
"@types/react-copy-to-clipboard": "^5.0.2",
"@types/styled-components": "^5.1.25",
"autoprefixer": "10.4.7",
"axios": "^0.27.2",
"cypress": "10.2.0",
"daisyui": "2.17.0",
"dayjs": "^1.11.3",
"eslint": "8.18.0",
"@bugsnag/js": "7.20.2",
"@bugsnag/plugin-react": "7.19.0",
"@testing-library/jest-dom": "5.16.5",
"@testing-library/react": "14.0.0",
"@types/node": "18.16.1",
"@types/react": "18.0.26",
"@types/react-burger-menu": "2.8.3",
"@types/react-copy-to-clipboard": "5.0.4",
"@types/styled-components": "5.1.26",
"autoprefixer": "10.4.14",
"axios": "1.3.6",
"cypress": "12.11.0",
"daisyui": "2.51.6",
"dayjs": "1.11.7",
"eslint": "8.39.0",
"eslint-config-next": "12.1.6",
"eslint-config-prettier": "^8.5.0",
"gridjs": "^5.0.2",
"gridjs-react": "^5.0.2",
"jest": "^28.1.1",
"jest-environment-jsdom": "^28.1.1",
"next-translate": "^1.4.0",
"npm-run-all": "^4.1.5",
"postcss": "8.4.14",
"prettier": "2.7.1",
"react-burger-menu": "3.0.8",
"react-copy-to-clipboard": "^5.1.0",
"react-twitter-embed": "^4.0.4",
"sass": "1.53.0",
"sharp": "0.30.7",
"styled-components": "^5.3.5",
"stylelint": "14.9.1",
"stylelint-config-standard": "26.0.0",
"stylelint-order": "^5.0.0",
"tailwindcss": "3.1.4",
"typescript": "4.7.4",
"wait-on": "^6.0.1"
"eslint-config-prettier": "8.8.0",
"gridjs": "6.0.6",
"gridjs-react": "6.0.1",
"jest": "29.5.0",
"jest-environment-jsdom": "29.5.0",
"next-translate": "1.6.0",
"npm-run-all": "4.1.5",
"postcss": "8.4.23",
"prettier": "2.8.8",
"react-burger-menu": "3.0.9",
"react-copy-to-clipboard": "5.1.0",
"react-twitter-embed": "4.0.4",
"sass": "1.62.1",
"sharp": "0.32.0",
"styled-components": "5.3.10",
"stylelint": "15.6.0",
"stylelint-config-standard": "33.0.0",
"stylelint-order": "6.0.3",
"tailwindcss": "3.3.2",
"typescript": "5.0.4",
"wait-on": "7.0.1"
},
"main": "index.ts",
"private": true,
Expand Down
5 changes: 5 additions & 0 deletions pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { HallOfFame } from '@/components/votes/HallOfFame'
import { Onegai } from '@/components/votes/Onegai'
import { EventsInEventIndex } from '@/components/events-in-event/index'

import { RankingTableAndTweetSummary } from '@/components/common/RankingTableAndTweetSummary'
import { VoteDeadLineCard } from '@/components/common/VoteDeadLineCard'
import { AboutProjectsCard } from '@/components/common/AboutProjectsCard'
import { AboutCheckVoteCard } from '@/components/common/AboutCheckVoteCard'
Expand Down Expand Up @@ -77,6 +78,10 @@ const Home: NextPage = () => {
)}

<div className="max-w-lg mx-auto">
<div id="ranking-table-and-tweet-summary" className="-mt-32 pt-32">
<RankingTableAndTweetSummary />
</div>

<div id="vote-dead-line-card" className="-mt-32 pt-32">
<VoteDeadLineCard />
</div>
Expand Down
Loading

0 comments on commit 5b0db0a

Please sign in to comment.