Merge branch 'main' into feat/tag-multiselect-dropdown

sparcs-kaist · Sep 19, 2023 · d0f5b77 · d0f5b77
2 parents b5e4341 + 2263c18
commit d0f5b77
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 61 deletions.
diff --git a/client/src/components/atoms/TextArea.tsx b/client/src/components/atoms/TextArea.tsx
@@ -1,33 +1,34 @@
 import styled from "@emotion/styled";
 import TextareaAutosize from "react-textarea-autosize";
+import { w, h, text, padding } from "@/styles";
 
 export const TextAreaFixedsize = styled.textarea`
-  width: 100%;
-  height: 100%;
-  padding: 10px 15px;
+  ${w("fill")}
+  ${h("fill")}
+  ${padding.vertical(10)}
+  ${padding.horizontal(15)}
   resize: none;
   border: none;
   background: transparent;
-  font-size: 11px;
-  font-weight: 500;
-  color: ${props => props.theme.colors.black};
+  ${text.subtitle}
+  ${text.black}
   ::placeholder {
     font-family: "Noto Sans KR", sans-serif;
-    color: ${props => props.theme.colors.gray300};
+    ${text.gray300}
   }
 `;
 
 export const TextAreaAutosize = styled(TextareaAutosize)`
-  width: 100%;
+  ${w("fill")}
+  max-height: 100%;
   outline: none;
   resize: none;
   border: none;
   background: transparent;
-  font-size: 12px;
-  font-weight: 500;
-  color: ${props => props.theme.colors.black};
+  ${text.body}
+  ${text.black}
   ::placeholder {
     font-family: "Noto Sans KR", sans-serif;
-    color: ${props => props.theme.colors.gray300};
+    ${text.gray300}
   }
 `;
diff --git a/client/src/components/molecules/ChatInput.tsx b/client/src/components/molecules/ChatInput.tsx
@@ -1,20 +1,49 @@
 import React, { useCallback, useMemo } from "react";
-import styled from "@emotion/styled";
+import { css } from "@emotion/react";
 
 import { EmoticonIcon, SendIcon } from "@/assets";
-import { Box, Divider, TextAreaAutosize } from "@/components/atoms";
+import { Divider, TextAreaAutosize } from "@/components/atoms";
 import { useInput } from "@/common/hooks";
+import {
+  w,
+  h,
+  padding,
+  scroll,
+  scrollBar,
+  bg,
+  justify,
+  align,
+  row,
+  gap,
+  border,
+  round,
+} from "@/styles";
 
-const InputForm = styled.form`
-  display: flex;
-  flex-direction: row;
-  gap: 10px;
-  width: 100%;
-  height: 100%;
-  padding: 10px 15px;
-  background-color: ${props => props.theme.colors.white};
-  border: solid 1px ${props => props.theme.colors.gray300};
-  border-radius: 5px;
+const inputBoxStyle = css`
+  ${w("fill")}
+  max-height: 30%;
+  ${padding(10)}
+  ${bg.white100}
+  ${justify.start}
+  ${align.start}
+`;
+
+const formStyle = css`
+  ${row}
+  ${gap(10)}
+  ${w("fill")}
+  ${h("fill")}
+  ${padding.vertical(10)}
+  ${padding.horizontal(15)}
+  ${bg.white}
+  ${border.gray300}
+  ${round.md}
+`;
+
+const textAreaScrollStyle = css`
+  ${scroll.y}
+  ${scrollBar}
+  overflow-y: scroll;
 `;
 
 interface Props {
@@ -24,37 +53,44 @@ interface Props {
 export const ChatInput: React.FC<Props> = ({ send }) => {
   const { input, setValue } = useInput();
 
-  // TODO: disable send button based on `validated`
+  /** TODO: disable send button based on `validated` */
   const validated = useMemo(() => input.value.trim().length > 0, [input.value]);
 
+  /** @constant 클라이언트와 서버에서 사용하는 채팅 메시지의 최대 길이를 지정합니다. */
+  const maxMessageLength = 500;
+
   const sendCurrent = useCallback(() => {
     if (!validated) return;
     send(input.value.trim());
     setValue("");
   }, [input.value, validated]);
 
   return (
-    <Box w="fill" pad={10} bg="white100">
-      <InputForm>
-        <TextAreaAutosize
-          onKeyDown={e => {
-            if (
-              e.key === "Enter" &&
-              !e.shiftKey &&
-              !e.nativeEvent.isComposing
-            ) {
-              e.preventDefault();
-              sendCurrent();
-            }
-          }}
-          value={input.value}
-          onChange={input.onChange}
-        />
-        <Divider dir="vertical" />
+    <div css={inputBoxStyle}>
+      <form css={formStyle}>
+        <div css={[row, w("fill"), h("fill")]}>
+          <TextAreaAutosize
+            css={textAreaScrollStyle}
+            onKeyDown={e => {
+              if (
+                e.key === "Enter" &&
+                !e.shiftKey &&
+                !e.nativeEvent.isComposing
+              ) {
+                e.preventDefault();
+                sendCurrent();
+              }
+            }}
+            value={input.value}
+            maxLength={maxMessageLength}
+            onChange={input.onChange}
+          />
+          <Divider dir="vertical" />
+        </div>
         <EmoticonIcon />
         <SendIcon onClick={sendCurrent} />
         {/* TODO: Replace with button / add hover, actove effect */}
-      </InputForm>
-    </Box>
+      </form>
+    </div>
   );
 };
diff --git a/client/src/components/organisms/EditUserTagModal.tsx b/client/src/components/organisms/EditUserTagModal.tsx
@@ -77,11 +77,13 @@ export const EditUserTagModal: React.FC = () => {
           <Box w={300} h={101} dir="column" justify="space-between">
             <ModalInner title="태그 대상 보기" count={taggers.length}>
               <ModalInner.TaggerBox>
-                {filteredUsers.map(user => (
-                  <ModalInner.TagChoice key={user.id}>
-                    {user.username}
-                  </ModalInner.TagChoice>
-                ))}
+                {filteredUsers
+                  .sort((a, b) => (a.username < b.username ? -1 : 1))
+                  .map(user => (
+                    <ModalInner.TagChoice key={user.id}>
+                      {user.username}
+                    </ModalInner.TagChoice>
+                  ))}
               </ModalInner.TaggerBox>
             </ModalInner>
           </Box>

diff --git a/interface/src/admin/agenda/common.ts b/interface/src/admin/agenda/common.ts
@@ -32,10 +32,10 @@ export type AdminAgenda = z.infer<typeof AdminAgenda>;
  * some description about admin agenda create schema goes here
  */
 export const AdminAgendaCreate = z.object({
-  title: z.string().min(1),
-  content: z.string().min(1),
-  resolution: z.string().min(1),
-  choices: z.array(z.string().min(1)).min(1),
+  title: z.string().min(1).max(255),
+  content: z.string().min(1).max(255),
+  resolution: z.string().min(1).max(255),
+  choices: z.array(z.string().min(1).max(255)).min(1),
   voters: z.object({
     total: z.array(z.number()),
   }),

diff --git a/interface/src/agenda/template/common.ts b/interface/src/agenda/template/common.ts
@@ -20,11 +20,11 @@ export type AgendaTemplate = z.infer<typeof AgendaTemplate>;
  * some description about agenda template create schema goes here
  */
 export const AgendaTemplateCreate = z.object({
-  templateName: z.string(),
-  title: z.string(),
-  content: z.string(),
-  resolution: z.string(),
-  choices: z.array(z.string()),
+  templateName: z.string().min(1).max(255),
+  title: z.string().min(1).max(255),
+  content: z.string().min(1).max(255),
+  resolution: z.string().min(1).max(255),
+  choices: z.array(z.string().min(1).max(255)),
 });
 export type AgendaTemplateCreate = z.infer<typeof AgendaTemplateCreate>;
 

diff --git a/interface/src/chat/client.ts b/interface/src/chat/client.ts
@@ -7,7 +7,7 @@ import { Message } from "./common";
  * description
  */
 export const Send = z.object({
-  message: z.string().min(1),
+  message: z.string().min(1).max(500),
 });
 export type Send = z.infer<typeof Send>;
 export const SendCb = Message;

diff --git a/interface/src/user/tag/common.ts b/interface/src/user/tag/common.ts
@@ -18,8 +18,8 @@ export type UserTag = z.infer<typeof UserTag>;
  * some description about user tag create schema goes here
  */
 export const UserTagCreate = z.object({
-  title: z.string(),
-  description: z.string(),
+  title: z.string().min(1).max(255),
+  description: z.string().min(1).max(255),
   users: z.array(z.number()),
 });
 export type UserTagCreate = z.infer<typeof UserTagCreate>;