Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions web/app/chat/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"use client";

import { Typography } from "@mui/material";
import { useSearchParams } from "next/navigation";
import { Suspense } from "react";
import { useRoomsOverview } from "~/api/chat/hooks";
Expand Down Expand Up @@ -31,7 +30,7 @@ function ChatListContent() {
) : state.current === "loading" ? (
<FullScreenCircularProgress />
) : state.current === "error" ? (
<Typography color="error">Error: {state.error.message}</Typography>
<p color="error">Error: {state.error.message}</p>
) : (
<RoomList roomsData={state.data} />
);
Expand Down
31 changes: 9 additions & 22 deletions web/app/signup/steps/step4_course.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { Typography } from "@mui/material";
import { Box } from "@mui/system";
import Link from "next/link";
import { useMyID } from "~/api/user";
import FullScreenCircularProgress from "~/components/common/FullScreenCircularProgress";
Expand All @@ -9,37 +7,26 @@ export default function Step4() {
const { state } = useMyID();
return (
<>
<Box>
<div>
{state.current === "loading" ? (
<FullScreenCircularProgress />
) : state.current === "error" ? (
<p>Error: {state.error.message}</p>
) : (
<Box mt={2} mx={2} display="flex" flexDirection="column" gap={2}>
<Typography variant="h6" component="h1">
授業情報の登録 (スキップ可)
</Typography>
<Box>
<div className="mx-4 mt-4 flex flex-col gap-4">
<h1>授業情報の登録 (スキップ可)</h1>
<div>
<EditableCoursesTable userId={state.data} />
</Box>
</Box>
</div>
</div>
)}
</Box>
<Box
p={3}
sx={{
position: "fixed",
display: "flex",
justifyContent: "space-between",
bottom: 0,
width: "100%",
}}
>
</div>
<div className="b-0 fixed flex w-full justify-between p-6">
<span />
<Link href="/tutorial" className="btn btn-primary">
次へ
</Link>
</Box>
</div>
</>
);
}