diff --git a/client/src/assets/styles/global-styles.ts b/client/src/assets/styles/global-styles.ts
index c2eff74f..7223f4e3 100644
--- a/client/src/assets/styles/global-styles.ts
+++ b/client/src/assets/styles/global-styles.ts
@@ -36,6 +36,11 @@ const GlobalStyle = createGlobalStyle`
overflow: hidden;
}
+ a {
+ text-decoration: none;
+ color: black;
+ }
+
#root {
position: relative;
height: 100vh;
diff --git a/client/src/components/common/default-button/index.tsx b/client/src/components/common/default-button/index.tsx
index dccd2fa9..201f4af0 100644
--- a/client/src/components/common/default-button/index.tsx
+++ b/client/src/components/common/default-button/index.tsx
@@ -2,26 +2,24 @@ import React from 'react';
import { CustomDefaultButton, DefaultButtonProps } from './style';
-function DefaultButton({
+const DefaultButton = React.memo(({
buttonType,
children,
size,
isDisabled,
onClick,
font,
-}: DefaultButtonProps) {
- return (
-
- {children}
-
- );
-}
+}: DefaultButtonProps) => (
+
+ {children}
+
+));
export default DefaultButton;
diff --git a/client/src/components/event/card-list/index.tsx b/client/src/components/event/card-list/index.tsx
index db76690d..2e1a1e1f 100644
--- a/client/src/components/event/card-list/index.tsx
+++ b/client/src/components/event/card-list/index.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEvent } from 'react';
+import React from 'react';
import styled from 'styled-components';
import EventCard from '@components/event/card';
@@ -34,6 +34,6 @@ export const makeEventToCard = (event: EventCardProps) => (
/>
);
-export default function EventCardList({ eventList, setEventModal }: { eventList: EventCardProps[], setEventModal: ((e: MouseEvent) => void) }) {
- return {eventList.map(makeEventToCard)};
+export default function EventCardList({ eventList }: { eventList: EventCardProps[] }) {
+ return {eventList.map(makeEventToCard)};
}
diff --git a/client/src/components/event/index.tsx b/client/src/components/event/index.tsx
index 1420a0c8..8aa2e3c2 100644
--- a/client/src/components/event/index.tsx
+++ b/client/src/components/event/index.tsx
@@ -6,7 +6,6 @@ import LoadingSpinner from '@styles/loading-spinner';
import EventCardList from '@components/event/card-list';
import useFetchItems from '@hooks/useFetchItems';
import useItemFecthObserver from '@hooks/useItemFetchObserver';
-import useSetEventModal from '@hooks/useSetEventModal';
import ObserverBlock from './style';
interface EventUser {
@@ -28,7 +27,6 @@ function EventView() {
const [loading, setLoading] = useState(true);
const nowFetching = useRecoilValue(nowFetchingState);
const [targetRef] = useItemFecthObserver(loading);
- const setEventModal = useSetEventModal();
useEffect(() => {
if (nowItemList && nowItemType === 'event') {
@@ -42,7 +40,7 @@ function EventView() {
return (
<>
-
+
{nowFetching && }
diff --git a/client/src/components/event/register-modal/style.ts b/client/src/components/event/register-modal/style.ts
index ecb444b2..712ac54f 100644
--- a/client/src/components/event/register-modal/style.ts
+++ b/client/src/components/event/register-modal/style.ts
@@ -4,16 +4,16 @@ import { ModalBox } from '@styles/modal';
export const CustomEventRegisterModal = styled(ModalBox)`
top: 15vh;
- flex-grow: 3;
display: flex;
flex-direction: column;
align-items: center;
- min-width: 500px;
+ min-width: min(80vw,600px);
min-height: 500px;
padding: 0px;
background-color:white;
border-radius: 30px;
background-color: #F1F0E4;
+ margin-left: calc(50% - min(40vw, 300px));
`;
export const ModalHeader = styled.div`
diff --git a/client/src/components/main/left-sidebar/index.tsx b/client/src/components/main/left-sidebar/index.tsx
index 97829fe9..56e00843 100644
--- a/client/src/components/main/left-sidebar/index.tsx
+++ b/client/src/components/main/left-sidebar/index.tsx
@@ -20,7 +20,7 @@ interface IActiveFollowingUser {
isActive: boolean,
}
-function LeftSideBar() {
+const LeftSideBar = React.memo(() => {
const user = useRecoilValue(userState);
const followingList = useRecoilValue(followingListState);
const setToastList = useSetRecoilState(toastListSelector);
@@ -100,6 +100,6 @@ function LeftSideBar() {
))}
);
-}
+});
export default LeftSideBar;
diff --git a/client/src/components/main/right-sidebar/index.tsx b/client/src/components/main/right-sidebar/index.tsx
index 202d2410..6aa4f16f 100644
--- a/client/src/components/main/right-sidebar/index.tsx
+++ b/client/src/components/main/right-sidebar/index.tsx
@@ -27,7 +27,7 @@ const RoomModalLayout = styled.div`
`;
-function RightSideBar() {
+const RightSideBar = React.memo(() => {
const roomView = useRecoilValue(roomViewType);
if (roomView === 'createRoomView') {
@@ -69,6 +69,6 @@ function RightSideBar() {
}
return (
Error
);
-}
+});
export default RightSideBar;
diff --git a/client/src/components/room/new-view/index.tsx b/client/src/components/room/new-view/index.tsx
index 944125c1..f1d89d17 100644
--- a/client/src/components/room/new-view/index.tsx
+++ b/client/src/components/room/new-view/index.tsx
@@ -1,5 +1,6 @@
+/* eslint-disable react/jsx-no-bind */
/* eslint-disable object-shorthand */
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useCallback } from 'react';
import { useSetRecoilState, useRecoilValue } from 'recoil';
import roomDocumentIdState from '@atoms/room-document-id';
@@ -29,7 +30,7 @@ function RoomModal() {
const [isAnonymous, setIsAnonymous] = useState(false);
const inputRef = useRef(null);
- const submitButtonHandler = async () => {
+ const submitButtonHandler = useCallback(async () => {
try {
const roomInfo = {
type: roomType,
@@ -50,7 +51,7 @@ function RoomModal() {
if (error.name === 'NotAllowedError') setToastList(toastMessage.roomAllowMicDanger());
else setToastList(toastMessage.roomCreateDanger());
}
- };
+ }, [roomType]);
const inputHandler = () => {
setIsDisabled(!inputRef.current?.value);
@@ -64,7 +65,7 @@ function RoomModal() {
setRoomType(checkBoxName);
};
- const randomlyAssignedHandler = async () => {
+ const randomlyAssignedHandler = useCallback(async () => {
const roomDocumentId = await getRandomRoomDocumentId();
if (roomDocumentId === 'NO_ROOM') {
setToastList(toastMessage.roomMatchingDanger());
@@ -72,30 +73,36 @@ function RoomModal() {
setRoomDocumentId(roomDocumentId);
setRoomView('selectModeView');
}
- };
+ }, []);
+
+ const CheckBoxs = React.memo(() => (
+
+
+
+
+ ));
+
+ const Buttons = React.memo(() => (
+
+
+ Let's Go
+
+
+ Randomly assigned
+
+
+ ));
return (
<>
Let's have fun together!
-
- {/* eslint-disable-next-line react/jsx-no-bind */}
-
- {/* eslint-disable-next-line react/jsx-no-bind */}
-
-
+
Add a Room Title
-
-
- Let's Go
-
-
- Randomly assigned
-
-
+
>
);
}
diff --git a/client/src/components/sign/common/style.ts b/client/src/components/sign/common/style.ts
index 8026e03c..5d6ee7ed 100644
--- a/client/src/components/sign/common/style.ts
+++ b/client/src/components/sign/common/style.ts
@@ -5,11 +5,14 @@ export const SignBody = styled.div`
position: relative;
display: flex;
flex-direction: column;
- justify-content: space-evenly;
align-items: center;
width: 100%;
height: calc(100vh - 100px);
${scrollbarStyle};
+
+ button {
+ margin-top: 30px;
+ }
`;
export const TitleDiv = styled.div`