Skip to content

Commit 16e9f85

Browse files
committed
Merge branch 'master' into next_release/actix_migration
2 parents 6629601 + c5f7b51 commit 16e9f85

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

atcoder-problems-frontend/src/pages/TablePage/index.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,15 @@ export const TablePage: React.FC<OuterProps> = (props) => {
101101
}}
102102
/>
103103
<TableTabButtons active={activeTab} setActive={setActiveTab} />
104-
{["ABC", "ARC", "AGC", "ABC-Like", "ARC-Like", "AGC-Like"].includes(
105-
activeTab
106-
) ? (
104+
{[
105+
"ABC",
106+
"ARC",
107+
"AGC",
108+
"ABC-Like",
109+
"ARC-Like",
110+
"AGC-Like",
111+
"PAST",
112+
].includes(activeTab) ? (
107113
<AtCoderRegularTable
108114
showDifficulty={showDifficulty}
109115
hideCompletedContest={hideCompletedContest}
@@ -116,6 +122,8 @@ export const TablePage: React.FC<OuterProps> = (props) => {
116122
? "AtCoder Regular Contest"
117123
: activeTab === "AGC"
118124
? "AtCoder Grand Contest"
125+
: activeTab === "PAST"
126+
? "PAST"
119127
: `${activeTab} Contest`
120128
}
121129
contestToProblems={contestToProblems}

atcoder-problems-frontend/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6151,9 +6151,9 @@ flush-write-stream@^1.0.0:
61516151
readable-stream "^2.3.6"
61526152

61536153
follow-redirects@^1.0.0:
6154-
version "1.14.4"
6155-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
6156-
integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
6154+
version "1.14.7"
6155+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
6156+
integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
61576157

61586158
for-in@^1.0.2:
61596159
version "1.0.2"

docker-compose.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ services:
1414
- "15432:5432"
1515

1616
backend-development:
17-
build:
18-
context: ./atcoder-problems-backend
19-
target: development
17+
image: rust:1.57
2018
environment:
2119
SQL_URL: postgres://db_user:db_pass@postgresql:5432/test_db
20+
DATABASE_URL: postgres://db_user:db_pass@postgresql:5432/test_db
2221
RUST_LOG: info
2322
ports:
2423
- "8080:8080"

0 commit comments

Comments
 (0)