Skip to content

Commit d1d5206

Browse files
committed
編集ページの不具合を修正
1 parent db0ab69 commit d1d5206

File tree

5 files changed

+21
-23
lines changed

5 files changed

+21
-23
lines changed

server/src/seeds/test-data/data.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,27 +73,27 @@ export const courses = [
7373
{
7474
id: "10001",
7575
name: "国語八列",
76-
teacher: "足助太郎",
76+
teacher: "八十島漕郎",
7777
},
7878
{
7979
id: "10002",
8080
name: "数学八列",
81-
teacher: "足助太郎",
81+
teacher: "八十島漕郎",
8282
},
8383
{
8484
id: "10003",
8585
name: "英語八列",
86-
teacher: "足助太郎",
86+
teacher: "八十島漕郎",
8787
},
8888
{
8989
id: "10004",
9090
name: "理科八列",
91-
teacher: "足助太郎",
91+
teacher: "八十島漕郎",
9292
},
9393
{
9494
id: "10005",
9595
name: "社会八列",
96-
teacher: "足助太郎",
96+
teacher: "八十島漕郎",
9797
},
9898
];
9999

web/app/edit/courses/page.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ export default function EditCourses() {
1212
const error = state.current === "error" ? state.error : null;
1313

1414
return (
15-
<div className="mx-auto my-0 flex h-full max-w-[350] flex-col p-5 text-center">
15+
<div className="mx-auto my-0 flex h-full max-w-[350] flex-col p-2 text-center">
1616
<h1 className="mb-2 text-xl">授業編集</h1>
1717
{loading ? (
1818
<FullScreenCircularProgress />
1919
) : error ? (
2020
<p>Error: {error.message}</p>
2121
) : data ? (
22-
<>
22+
<div className="flex-1 p-2">
2323
<EditableCoursesTable userId={data.id} />
24-
</>
24+
</div>
2525
) : (
2626
<p>データがありません。</p>
2727
)}

web/app/edit/layout.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ export default function EditPageLayout({
88
}) {
99
return (
1010
<NavigateByAuthState type="toLoginForUnauthenticated">
11-
<Header title="編集/Edit" />
12-
<div className="absolute top-14 right-0 left-0 overflow-y-auto sm:top-16">
13-
{children}
11+
<div className="flex h-screen flex-col">
12+
<Header title="編集/Edit" />
13+
<div className="mt-14 flex-1 sm:mt-16">{children}</div>
1414
</div>
1515
</NavigateByAuthState>
1616
);

web/components/course/components/CoursesTableCore/index.tsx

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { ACTIVE_DAYS, DAY_TO_JAPANESE_MAP } from "common/consts";
22
import type { Course, Day } from "common/types";
33
import { useCallback, useEffect, useState } from "react";
4-
import { truncateStr } from "./lib";
54

65
type Props =
76
| {
@@ -164,12 +163,12 @@ function Cell({
164163
overflow: "hidden",
165164
display: "-webkit-box",
166165
WebkitBoxOrient: "vertical",
167-
WebkitLineClamp: 2,
168-
lineClamp: 2,
166+
WebkitLineClamp: 3,
167+
lineClamp: 3,
169168
textOverflow: "ellipsis",
170169
}}
171170
>
172-
{courseName ? truncateStr(courseName ?? "", 16) : ""}
171+
{courseName}
173172
</span>
174173
<span
175174
style={{
@@ -182,27 +181,29 @@ function Cell({
182181
textOverflow: "ellipsis",
183182
}}
184183
>
185-
{teacherName ? truncateStr(teacherName ?? "", 6) : ""}
184+
{teacherName}
186185
</span>
187186
</>
188187
);
189188

190189
return (
191190
<span
192-
className={`inline-flex flex-1 items-center justify-center rounded-sm p-0.5 text-xs ${
191+
className={`inline-flex h-full w-full flex-1 items-center justify-center rounded-sm p-0.5 text-xs ${
193192
!courseName
194-
? "bg-transparent"
193+
? "bg-gray-50"
195194
: isOverlapping
196195
? "bg-[#FFF1BF]"
197196
: "bg-[#F7FCFF]"
198197
}`}
199198
>
200199
{isButton ? (
201-
<button type="button" onClick={onClick}>
200+
<button type="button" onClick={onClick} className="h-full w-full">
202201
{content}
203202
</button>
204203
) : (
205-
<span className="inline-flex flex-col justify-between">{content}</span>
204+
<span className="inline-flex h-full w-full flex-col justify-around text-center">
205+
{content}
206+
</span>
206207
)}
207208
</span>
208209
);

web/components/course/components/CoursesTableCore/lib.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)