From 606f83fdad30234f5f4f35b4331893f8a54faeb0 Mon Sep 17 00:00:00 2001
From: dragon1211 <inddev0807@gmail.com>
Date: Wed, 17 Nov 2021 14:30:44 -0800
Subject: [PATCH] modified pre

---
 backend/public/css/app.css                    |  4 ++++
 backend/public/js/app.js                      | 15 ++++++---------
 backend/resources/js/component/modal_memo.jsx |  4 ++--
 backend/resources/js/parent/meeting/add.jsx   |  3 ++-
 backend/resources/sass/layouts/_main.scss     |  4 ++++
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/backend/public/css/app.css b/backend/public/css/app.css
index b9924ecb..0af9c815 100644
--- a/backend/public/css/app.css
+++ b/backend/public/css/app.css
@@ -12294,6 +12294,10 @@ a {
   height: 30px !important;
 }
 
+.p-article__txt {
+  white-space: pre-wrap;
+}
+
 @media screen and (min-width: 1068px) {
   .p-meetingAdd-btn {
     width: 200px !important;
diff --git a/backend/public/js/app.js b/backend/public/js/app.js
index e3026d7f..cbec1b5a 100644
--- a/backend/public/js/app.js
+++ b/backend/public/js/app.js
@@ -43406,13 +43406,11 @@ function ModalMemo(_ref) {
       children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_mui_material_DialogContentText__WEBPACK_IMPORTED_MODULE_6__.default, {
         id: "alert-dialog-slide-description",
         style: {
-          minHeight: '200px'
+          minHeight: '200px',
+          whiteSpace: 'pre-wrap'
         },
-        className: "pt-4",
-        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", {
-          className: "ft-18 ft-xs-16 text-black",
-          children: content
-        })
+        className: "ft-18 ft-xs-16 text-black pt-4",
+        children: content
       })
     })]
   });
@@ -47411,14 +47409,13 @@ var MeetingAdd = function MeetingAdd(props) {
     axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/fathers/meetings/register', formdata).then(function (response) {
       setSubmit(false);
       setNotice(response.data.notice);
+      console.log(response.data.params);
 
       switch (response.data.status_code) {
         case 200:
           {
-            var _props$match$params;
-
             history.push({
-              pathname: "/p-account/meeting/detail/".concat((_props$match$params = props.match.params) === null || _props$match$params === void 0 ? void 0 : _props$match$params.meeting_id),
+              pathname: "/p-account/meeting/detail/".concat(response.data.params.meeting_id),
               state: "登録成功しました"
             });
             break;
diff --git a/backend/resources/js/component/modal_memo.jsx b/backend/resources/js/component/modal_memo.jsx
index 12857b85..38cf4e40 100644
--- a/backend/resources/js/component/modal_memo.jsx
+++ b/backend/resources/js/component/modal_memo.jsx
@@ -26,8 +26,8 @@ export default function ModalMemo({ show, content, handleClose }){
                     <span className="ft-18 text-center font-weight-bold">メモ</span>
                 </DialogTitle>
                 <DialogContent>
-                    <DialogContentText id="alert-dialog-slide-description" style={{minHeight:'200px'}} className="pt-4">
-                        <span className="ft-18 ft-xs-16 text-black">{content}</span>
+                    <DialogContentText id="alert-dialog-slide-description" style={{minHeight:'200px', whiteSpace:'pre-wrap'}} className="ft-18 ft-xs-16 text-black pt-4">
+                        {content}
                     </DialogContentText>
                 </DialogContent>
             </Dialog>
diff --git a/backend/resources/js/parent/meeting/add.jsx b/backend/resources/js/parent/meeting/add.jsx
index 8ef726f0..fa87e769 100644
--- a/backend/resources/js/parent/meeting/add.jsx
+++ b/backend/resources/js/parent/meeting/add.jsx
@@ -111,10 +111,11 @@ const MeetingAdd = (props) => {
         .then(response => {
             setSubmit(false);
             setNotice(response.data.notice);
+            console.log(response.data.params)
             switch(response.data.status_code){
                 case 200: {
                     history.push({
-                    pathname: `/p-account/meeting/detail/${props.match.params?.meeting_id}`,
+                    pathname: `/p-account/meeting/detail/${response.data.params.meeting_id}`,
                     state: "登録成功しました"});
                     break;
                 }
diff --git a/backend/resources/sass/layouts/_main.scss b/backend/resources/sass/layouts/_main.scss
index 3263034e..34c7596b 100644
--- a/backend/resources/sass/layouts/_main.scss
+++ b/backend/resources/sass/layouts/_main.scss
@@ -170,6 +170,10 @@ a{
   }
 }
 
+.p-article__txt{
+  white-space: pre-wrap;
+}
+
 /////////////////////////////////////////////////////////////////////////
 
 @media screen and (min-width: 1068px){