From 3e0a0e4bd51a34ca5f0482d0a28da9e1ccfffd75 Mon Sep 17 00:00:00 2001
From: YeaJin Ha <hyj1004mu@naver.com>
Date: Wed, 4 Nov 2020 03:48:03 +0900
Subject: [PATCH] =?UTF-8?q?RBS=20=ED=99=94=EC=9D=B4=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/client/src/Components/Card.js |  4 ++-
 server/client/src/Pages/ApplyPage.js | 39 ++++++++++++++--------------
 server/client/src/Pages/HomePage.js  | 16 +++++-------
 server/schemas/index.js              |  2 +-
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/server/client/src/Components/Card.js b/server/client/src/Components/Card.js
index afbd8f1..91d43fb 100644
--- a/server/client/src/Components/Card.js
+++ b/server/client/src/Components/Card.js
@@ -53,7 +53,9 @@ function Notice({ card_index, title, date, content }) {
                 <Col md={2} xs={4} className="p-0" >{dateForm(date)}</Col>
             </Card.Header>
             <Accordion.Collapse eventKey={card_index + 1}>
-                <Text><pre className="text-overflow-ellipsis w-100 whiteSpace-initial">{content}</pre></Text>
+                <Text>{content.split("\n").map((i, key) => {
+                    return <div key={key}>{i}</div>;
+                })}</Text>
             </Accordion.Collapse>
         </Card >
     )
diff --git a/server/client/src/Pages/ApplyPage.js b/server/client/src/Pages/ApplyPage.js
index cddcfd5..c1102e9 100644
--- a/server/client/src/Pages/ApplyPage.js
+++ b/server/client/src/Pages/ApplyPage.js
@@ -190,25 +190,26 @@ function Apply(props) {
                                                 {({ insert, remove, push }) => (
                                                     <div>
                                                         <div className={touched.date && errors.date ? "text-danger" : ""}>이용자</div>
-                                                        {values.students.map((student, index) => (
-                                                            <Row key={index}>
-                                                                <Field
-                                                                    name={`students.${index}.member`}
-                                                                    placeholder="이용자 성함을 입력하세요."
-                                                                    type="text"
-                                                                />
-                                                                <ErrorMessage
-                                                                    name={`friends.${index}.name`}
-                                                                    component="div"
-                                                                    className="field-error"
-                                                                />
-                                                                <button
-                                                                    type="button"
-                                                                    className="secondary"
-                                                                    onClick={() => remove(index)}
-                                                                >X</button>
-                                                            </Row>
-                                                        ))}
+                                                            {values.students.map((student, index) => (
+                                                                <div key={index}>
+                                                                    <Field
+                                                                        name={`students.${index}.member`}
+                                                                        placeholder="이용자 성함을 입력하세요."
+                                                                        type="text"
+                                                                    />
+                                                                    <ErrorMessage
+                                                                        name={`friends.${index}.name`}
+                                                                        component="div"
+                                                                        className="field-error"
+                                                                    />
+                                                                    <button
+                                                                        type="button"
+                                                                        className="secondary"
+                                                                        onClick={() => remove(index)}
+                                                                    >X</button>
+                                                                </div>
+                                                            ))}
+
                                                         <button
                                                             type="button"
                                                             className="btn btn-primary"
diff --git a/server/client/src/Pages/HomePage.js b/server/client/src/Pages/HomePage.js
index db05aa0..7384ad0 100644
--- a/server/client/src/Pages/HomePage.js
+++ b/server/client/src/Pages/HomePage.js
@@ -14,33 +14,31 @@ function Home() {
                 <h2>대관 현황</h2>
                 <p>
                     <strong>대관 가능 시간</strong>
-                    <ul>
+                    <ul className="pl-4">
                         <li>평일: 9시 - 22시/ 예약가능 시간 이후 폐쇄</li>
                         <li>주말: 이용 불가</li>
                     </ul>
                 </p>
                 <Tabs defaultActiveKey="9-116" id="uncontrolled-tab-example" onSelect={(k) => setKey(k)}>
                     <Tab eventKey="9-116" title="9-116">
-                        <Schedule room={key}/>
+                        <Schedule room={key} />
                     </Tab>
                     <Tab eventKey="7-234" title="7-234">
-                        <Schedule room={key}/>
+                        <Schedule room={key} />
                     </Tab>
                     <Tab eventKey="25-101" title="25-101">
-                        <Schedule room={key}/>
+                        <Schedule room={key} />
                     </Tab>
                 </Tabs>
-                <h3>유의사항</h3>
+
                 <p>
-                    <ul>
+                    <strong>유의사항</strong>
+                    <ul className="pl-4">
                         <li>강의실을 대관하는 대표자를 기준으로 최대 주 6시간까지 대관이 가능합니다.</li>
                         <li>1회 대관시 최대 3시간까지 이용이 가능합니다. (1시간 단위로 대관 가능)</li>
                         <li><strong style={{ color: "red" }}>대관 시간 이외 강의실을 이용하다 적발될 경우 한달 간 강의실 이용이 불가합니다.</strong></li>
                     </ul>
                 </p>
-                <div className="bg-white">
-                    <h6>고려대학교 대관시스템</h6>
-                </div>
             </div>
         </div>
     )
diff --git a/server/schemas/index.js b/server/schemas/index.js
index 92fa933..f6e943a 100644
--- a/server/schemas/index.js
+++ b/server/schemas/index.js
@@ -5,7 +5,7 @@ module.exports = () => {
         if (process.env.NODE_ENV !== 'production') {
             mongoose.set('debug', true);
         }
-        mongoose.connect('mongodb://cherry:1q2w3e4r@localhost:27017/admin', {
+        mongoose.connect('mongodb://hyj:hyj3657@localhost:27017/admin', {
             dbName: 'ku_rental', useNewUrlParser: true, useUnifiedTopology: true,
         }, (error) => {
             if (error) {
-- 
GitLab