From 3b228bf31f41b4aaa70e690f4fdf4577b7b376c8 Mon Sep 17 00:00:00 2001 From: KaichiManabe <154493010+KaichiManabe@users.noreply.github.com> Date: Sun, 10 Nov 2024 19:07:59 +0900 Subject: [PATCH 01/22] delete typo --- web/app/chat/page.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/app/chat/page.tsx b/web/app/chat/page.tsx index b6ced666..5412e532 100644 --- a/web/app/chat/page.tsx +++ b/web/app/chat/page.tsx @@ -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"; @@ -31,7 +30,7 @@ function ChatListContent() { ) : state.current === "loading" ? ( ) : state.current === "error" ? ( - Error: {state.error.message} +

Error: {state.error.message}

) : ( ); From bb42a3308201ea0d66823f835c1fb1e7bb509014 Mon Sep 17 00:00:00 2001 From: KaichiManabe <154493010+KaichiManabe@users.noreply.github.com> Date: Sun, 10 Nov 2024 19:10:35 +0900 Subject: [PATCH 02/22] delete typo home --- web/app/home/layout.tsx | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/web/app/home/layout.tsx b/web/app/home/layout.tsx index 5a9eb8f3..9dca6bd3 100644 --- a/web/app/home/layout.tsx +++ b/web/app/home/layout.tsx @@ -1,4 +1,3 @@ -import { Box } from "@mui/material"; import BottomBar from "~/components/BottomBar"; import Header from "~/components/Header"; @@ -10,21 +9,9 @@ export default function HomePageLayout({ return ( <>
- +
{children} - +
); From 7e4f14c39de0abf0ae76fab530264decdc154c0d Mon Sep 17 00:00:00 2001 From: KaichiManabe <154493010+KaichiManabe@users.noreply.github.com> Date: Sun, 10 Nov 2024 19:15:17 +0900 Subject: [PATCH 03/22] =?UTF-8?q?box=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/app/login/page.tsx | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/web/app/login/page.tsx b/web/app/login/page.tsx index f4e73469..ac6f462b 100644 --- a/web/app/login/page.tsx +++ b/web/app/login/page.tsx @@ -1,6 +1,6 @@ "use client"; -import { Box, Button, Link, Typography } from "@mui/material"; +import { Button, Link, Typography } from "@mui/material"; import { GoogleAuthProvider, signInWithPopup } from "firebase/auth"; import { useRouter } from "next/navigation"; import { useSnackbar } from "notistack"; @@ -125,24 +125,11 @@ export default function Login() { return (
- - +
+
- - +
+
CourseMateを使って
@@ -150,9 +137,9 @@ export default function Login() {
友達になろう - +
- +
+
); } From 169f58b43fd0f73943a9dfacfde9a634409268ce Mon Sep 17 00:00:00 2001 From: KaichiManabe <154493010+KaichiManabe@users.noreply.github.com> Date: Sun, 10 Nov 2024 19:20:12 +0900 Subject: [PATCH 04/22] =?UTF-8?q?login=E3=81=AEdaisyUI=E7=A7=BB=E8=A1=8C?= =?UTF-8?q?=E3=82=92=E5=AE=8C=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/app/login/page.tsx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/web/app/login/page.tsx b/web/app/login/page.tsx index ac6f462b..327ebae2 100644 --- a/web/app/login/page.tsx +++ b/web/app/login/page.tsx @@ -1,6 +1,5 @@ "use client"; -import { Button, Link, Typography } from "@mui/material"; import { GoogleAuthProvider, signInWithPopup } from "firebase/auth"; import { useRouter } from "next/navigation"; import { useSnackbar } from "notistack"; @@ -130,13 +129,13 @@ export default function Login() {
- +

CourseMateを使って
同じ授業の人と
友達になろう - +

@@ -206,14 +205,13 @@ export default function Login() {

- 初めての方はこちら - + From b547bb0c5471f8dd0015b555ee193bfde548411d Mon Sep 17 00:00:00 2001 From: KaichiManabe <154493010+KaichiManabe@users.noreply.github.com> Date: Sun, 17 Nov 2024 10:43:02 +0900 Subject: [PATCH 05/22] =?UTF-8?q?=E8=89=B2=E3=82=92=E3=81=A1=E3=82=83?= =?UTF-8?q?=E3=82=93=E3=81=A8=E5=BD=93=E3=81=A6=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/app/chat/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app/chat/page.tsx b/web/app/chat/page.tsx index 5412e532..66a344ed 100644 --- a/web/app/chat/page.tsx +++ b/web/app/chat/page.tsx @@ -30,7 +30,7 @@ function ChatListContent() { ) : state.current === "loading" ? ( ) : state.current === "error" ? ( -

Error: {state.error.message}

+

Error: {state.error.message}

) : ( ); From 5394fbd5d621dfaae2889fa224d4eac6e55ff6ea Mon Sep 17 00:00:00 2001 From: KaichiManabe <154493010+KaichiManabe@users.noreply.github.com> Date: Sun, 17 Nov 2024 11:03:10 +0900 Subject: [PATCH 06/22] =?UTF-8?q?=E7=99=BB=E9=8C=B2=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=AEmui=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/app/signup/page.tsx | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/web/app/signup/page.tsx b/web/app/signup/page.tsx index 4bb9bce5..bc96ff21 100644 --- a/web/app/signup/page.tsx +++ b/web/app/signup/page.tsx @@ -1,6 +1,5 @@ "use client"; -import { Box } from "@mui/material"; import { useSnackbar } from "notistack"; import { useState } from "react"; @@ -78,19 +77,10 @@ function Registration() { export default function RegistrationPage() { return ( - +
- +
); } From 329a6bf76cbd2aebb12e24f8aad37014f5bfab25 Mon Sep 17 00:00:00 2001 From: KaichiManabe <154493010+KaichiManabe@users.noreply.github.com> Date: Sun, 17 Nov 2024 11:28:27 +0900 Subject: [PATCH 07/22] =?UTF-8?q?=E3=83=81=E3=83=A5=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=83=AB=E3=81=AEdaisyUI=E7=A7=BB=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/app/tutorial/page.tsx | 55 ++++++++------------------------------- 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/web/app/tutorial/page.tsx b/web/app/tutorial/page.tsx index bf0c6491..7982323d 100644 --- a/web/app/tutorial/page.tsx +++ b/web/app/tutorial/page.tsx @@ -1,6 +1,5 @@ "use client"; -import { Box, Typography } from "@mui/material"; import { Navigation, Pagination } from "swiper/modules"; import { Swiper, SwiperSlide } from "swiper/react"; import "swiper/css"; @@ -42,68 +41,36 @@ const tutorialSteps = [ export default function Tutorial() { return ( - +
- +
{tutorialSteps.map((step) => ( - - - {step.label} - +
+

{step.label}

{step.label} - +
))} - +
ホーム画面へ - - - +
+
+
); } From cee339493901afe8b52ee374a94911fb6976ebe3 Mon Sep 17 00:00:00 2001 From: KaichiManabe <154493010+KaichiManabe@users.noreply.github.com> Date: Sun, 17 Nov 2024 12:08:39 +0900 Subject: [PATCH 08/22] =?UTF-8?q?Header=E3=81=AEdaisyUI=E7=A7=BB=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/components/Header.tsx | 45 ++++++++++++++------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/web/components/Header.tsx b/web/components/Header.tsx index 4a2c3bf1..f8c39270 100644 --- a/web/components/Header.tsx +++ b/web/components/Header.tsx @@ -1,6 +1,5 @@ -import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined"; -import { AppBar, Box, IconButton, Toolbar, Typography } from "@mui/material"; import Link from "next/link"; +import { MdInfoOutline } from "react-icons/md"; import { CourseMateIcon } from "./common/CourseMateIcon"; type Props = { @@ -10,32 +9,20 @@ type Props = { export default function Header(props: Props) { const { title } = props; return ( - <> - - - - - - - - - {title} - - - - - - - +
+
+ + + + +

+ {title} +

+ + + + +
+
); } From 4d058678eea4033e7ae1aad1d67c236436390427 Mon Sep 17 00:00:00 2001 From: KaichiManabe <154493010+KaichiManabe@users.noreply.github.com> Date: Sun, 17 Nov 2024 12:15:40 +0900 Subject: [PATCH 09/22] =?UTF-8?q?=E3=82=AF=E3=83=AD=E3=83=83=E3=83=91?= =?UTF-8?q?=E3=83=BC=E3=81=AEdaisyUI=E7=A7=BB=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/components/ImageCropper.tsx | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/web/components/ImageCropper.tsx b/web/components/ImageCropper.tsx index c3b6f0da..24be6a06 100644 --- a/web/components/ImageCropper.tsx +++ b/web/components/ImageCropper.tsx @@ -1,4 +1,3 @@ -import { Slider } from "@mui/material"; import { useState } from "react"; import Cropper from "react-easy-crop"; @@ -11,6 +10,10 @@ export function ImageCropper({ sameOriginURL: url, onImageChange }: Props) { const [crop, setCrop] = useState({ x: 0, y: 0 }); const [zoom, setZoom] = useState(1); + const handleSliderChange = (event: React.ChangeEvent) => { + setZoom(Number(event.target.value)); + }; + return ( <>
- { - setZoom(Number(newVal) || 1); - }} - /> +
+ + {zoom.toFixed(2)} +
); } From 486766e5d90cba5a693dcc76807ff17d40034636 Mon Sep 17 00:00:00 2001 From: KaichiManabe <154493010+KaichiManabe@users.noreply.github.com> Date: Sun, 17 Nov 2024 12:26:30 +0900 Subject: [PATCH 10/22] =?UTF-8?q?messageinput=E3=81=AEdaisyUI=E7=A7=BB?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/components/chat/MessageInput.tsx | 39 ++++++++++++---------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/web/components/chat/MessageInput.tsx b/web/components/chat/MessageInput.tsx index da8e7fe0..9e359ccf 100644 --- a/web/components/chat/MessageInput.tsx +++ b/web/components/chat/MessageInput.tsx @@ -1,6 +1,5 @@ -import SendIcon from "@mui/icons-material/Send"; -import { Box, IconButton, Stack, TextField, Typography } from "@mui/material"; import { useEffect, useState } from "react"; +import { MdSend } from "react-icons/md"; import type { DMOverview, SendMessage, UserID } from "~/common/types"; import { parseContent } from "~/common/zod/methods"; @@ -58,34 +57,30 @@ export function MessageInput({ send, room }: Props) { } return ( - +
- - +