From 2fa49a6038ee86b6cfa507a4abb8bbd3eff7bce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Mon, 1 Nov 2021 21:26:37 +0900 Subject: [PATCH 01/13] .. --- .../Controllers/Api/MeetingsController.php | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/backend/app/Http/Controllers/Api/MeetingsController.php b/backend/app/Http/Controllers/Api/MeetingsController.php index b9fd33bf..c3cc2ea1 100644 --- a/backend/app/Http/Controllers/Api/MeetingsController.php +++ b/backend/app/Http/Controllers/Api/MeetingsController.php @@ -523,27 +523,42 @@ class MeetingsController extends Controller { if (isset($r->memo)) $update['memo'] = $r->memo; try { + // リクエストでPDFがある場合 if (isset($r->pdf)) { $filename = uniqid() . '.pdf'; - $pdf = base64_decode(substr($r->pdf, strpos($r->pdf, ',') + 1)); + // DBにミーティングがある場合 if ($chk = Meeting::select('pdf')->where('id', (int)$meeting_id)->first()) { - $opdf = str_replace('/storage/', '', $chk->pdf); - if (strcmp(Storage::disk('public')->get($opdf), $pdf) !== 0) { - if (Storage::disk('public')->exists($opdf)) { - Storage::disk('public')->delete($opdf); - } - $update['pdf'] = '/storage/'.$filename; - Storage::disk('public')->put($filename, $pdf); + // base64の場合（ファイルパスだったら、スキップ） + if (preg_match('\/storage\/(.*).pdf', $r->pdf)) { + // もう存在しているPDFのファイル名からパスを外します。 + $opdf = str_replace('/storage/', '', $chk->pdf); + + // PDFのbase64をGETします。 + $pdf = base64_decode(substr($r->pdf, strpos($r->pdf, ',') + 1)); + + // 既にPDFが存在する場合（なければ、スキップ） + if (Storage::disk('public')->exists($opdf)) { + // 既に存在しているPDFとアップロードしているPDFを比べてみます。異なる場合、存在しているPDFを削除します。 + if (strcmp(Storage::disk('public')->get($opdf), $pdf) !== 0) { + Storage::disk('public')->delete($opdf); + } + + // アップロードします。 + $update['pdf'] = '/storage/'.$filename; + Storage::disk('public')->put($filename, $pdf); + } } } + // なければ、そのままストレージに保存します。 else { $update['pdf'] = '/storage/'.$filename; Storage::disk('public')->put($filename, $pdf); } } + // データベースに保存します。 Meeting::where('id', (int)$meeting_id)->update($update); } catch (\Throwable $e) { Log::critical($e->getMessage()); From 8c91f765fd844912a9ccedea93139c2adde7b2c1 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Mon, 1 Nov 2021 21:40:07 +0900 Subject: [PATCH 02/13] add user-avatar-image object-fit --- backend/public/css/app.css | 8 ++ backend/public/js/app.js | 8 +- backend/resources/js/admin/child/index.jsx | 2 +- backend/resources/js/admin/meeting/detail.jsx | 2 +- backend/resources/js/admin/meeting/index.jsx | 2 +- backend/resources/js/admin/parent/index.jsx | 2 +- backend/resources/sass/layouts/_main.scss | 111 ++++++++++-------- 7 files changed, 75 insertions(+), 60 deletions(-) diff --git a/backend/public/css/app.css b/backend/public/css/app.css index b70db9b5..5ca77f17 100644 --- a/backend/public/css/app.css +++ b/backend/public/css/app.css @@ -12189,3 +12189,11 @@ a { .p-file-image figure.image-upload:after { display: none !important; } + +.avatar-img { + width: 100%; + height: 100%; + -o-object-fit: cover; + object-fit: cover; + border-radius: 50%; +} diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 75fb07dc..74ed78c6 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -36804,7 +36804,7 @@ var Child = function Child() { className: "user-avatar", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("img", { alt: "name", - className: "avatar-img rounded-circle", + className: "avatar-img", src: child.image }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("div", { @@ -37570,7 +37570,7 @@ var MeetingDetail = function MeetingDetail(props) { className: "avatar", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("img", { alt: "name", - className: "avatar-img rounded-circle", + className: "avatar-img", src: x.child.image }) }) @@ -38591,7 +38591,7 @@ var Meeting = function Meeting() { className: "avatar", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("img", _defineProperty({ alt: "name", - className: "avatar-img rounded-circle", + className: "avatar-img", src: x.child.image }, "alt", x.child.image)) }) @@ -39599,7 +39599,7 @@ var Parent = function Parent() { className: "user-avatar", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("img", { alt: "name", - className: "avatar-img rounded-circle", + className: "avatar-img", src: father.image }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("div", { diff --git a/backend/resources/js/admin/child/index.jsx b/backend/resources/js/admin/child/index.jsx index 69484c41..1418c29b 100644 --- a/backend/resources/js/admin/child/index.jsx +++ b/backend/resources/js/admin/child/index.jsx @@ -98,7 +98,7 @@ const Child = () => {
- name + name

{ child.last_name } { child.first_name }

diff --git a/backend/resources/js/admin/meeting/detail.jsx b/backend/resources/js/admin/meeting/detail.jsx index 5612cc4d..e5a931b7 100644 --- a/backend/resources/js/admin/meeting/detail.jsx +++ b/backend/resources/js/admin/meeting/detail.jsx @@ -125,7 +125,7 @@ const MeetingDetail = (props) => { meeting.approval?.map((x, k)=>
  • - name + name
    • ) diff --git a/backend/resources/js/admin/meeting/index.jsx b/backend/resources/js/admin/meeting/index.jsx index 3e7e03b7..4856dd53 100644 --- a/backend/resources/js/admin/meeting/index.jsx +++ b/backend/resources/js/admin/meeting/index.jsx @@ -148,7 +148,7 @@ const Meeting = () => { item.approval?.map((x, kj)=>
  • - name + name
    • ) diff --git a/backend/resources/js/admin/parent/index.jsx b/backend/resources/js/admin/parent/index.jsx index 9f42fb4f..215f7639 100644 --- a/backend/resources/js/admin/parent/index.jsx +++ b/backend/resources/js/admin/parent/index.jsx @@ -96,7 +96,7 @@ const Parent = () => {
    - name + name

    { father.company }

    diff --git a/backend/resources/sass/layouts/_main.scss b/backend/resources/sass/layouts/_main.scss index 23fcdeba..5cecaa9e 100644 --- a/backend/resources/sass/layouts/_main.scss +++ b/backend/resources/sass/layouts/_main.scss @@ -32,69 +32,69 @@ a{ @include media-breakpoint-down(xs){ - .l-content__ttl h2{ - font-size: 20px !important; - } - - .meeting-tab{ - height: 45px !important; - font-size: 15px; - } + .l-content__ttl h2{ + font-size: 20px !important; + } + + .meeting-tab{ + height: 45px !important; + font-size: 15px; + } - .meeting-ttl{ - font-size: 15px !important; - } - - .meeting-txt{ - font-size: 14px !important; - } - - .user-date span{ - font-size: 14px !important; - } + .meeting-ttl{ + font-size: 15px !important; + } + + .meeting-txt{ + font-size: 14px !important; + } + + .user-date span{ + font-size: 14px !important; + } - .count{ - width: 18px !important; - height: 18px !important; - } + .count{ + width: 18px !important; + height: 18px !important; + } - .meeting-label{ - font-size: 15px !important; - } + .meeting-label{ + font-size: 15px !important; + } - .user-name{ - font-size: 13px !important; - } + .user-name{ + font-size: 13px !important; + } - .user-advice-btn span{ - font-size: 14px !important; - } + .user-advice-btn span{ + font-size: 14px !important; + } - .meeting-date{ - font-size: 13px !important; - } + .meeting-date{ + font-size: 13px !important; + } - .p-article__pdf__btn span{ - font-size: 14px !important; - } + .p-article__pdf__btn span{ + font-size: 14px !important; + } - .p-article__txt{ - font-size: 13.5px !important; - } + .p-article__txt{ + font-size: 13.5px !important; + } - .p-consent-btn span{ - font-size: 15px !important; - } + .p-consent-btn span{ + font-size: 15px !important; + } - .search-item .user-avatar{ - min-width: 50px !important; - width: 50px !important; - height: 50px !important; - } + .search-item .user-avatar{ + min-width: 50px !important; + width: 50px !important; + height: 50px !important; + } - .profile-info__item{ - padding: 10px 20px 10px 15px !important; - } + .profile-info__item{ + padding: 10px 20px 10px 15px !important; + } } @@ -169,4 +169,11 @@ a{ .p-file-image figure.image-upload:after{ display: none !important; +} + +.avatar-img{ + width: 100%; + height: 100%; + object-fit: cover; + border-radius: 50%; } \ No newline at end of file From e1f0249af6f62cd1fc91f07abd8e29ddc2d02b46 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Mon, 1 Nov 2021 21:59:30 +0900 Subject: [PATCH 03/13] add user-avatar-image object-fit --- backend/public/js/app.js | 16 ++++------------ backend/resources/js/admin/child/detail.jsx | 2 +- backend/resources/js/admin/parent/detail.jsx | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 74ed78c6..cedc13dd 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -36077,12 +36077,8 @@ var ChildDetail = function ChildDetail(props) { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("img", { src: image, - alt: "", - width: "100%", - height: "100%", - style: { - borderRadius: '50%' - } + className: "avatar-img", + alt: "avatar-img" })] }), _422errors.image && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { className: "l-alert__text--error ft-16 ft-md-14", @@ -38947,12 +38943,8 @@ var ParentDetail = function ParentDetail(props) { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("img", { src: image, - alt: "", - width: "100%", - height: "100%", - style: { - borderRadius: '50%' - } + className: "avatar-img", + alt: "avatar-img" })] }), _422errors.image && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { className: "l-alert__text--error ft-16 ft-md-14", diff --git a/backend/resources/js/admin/child/detail.jsx b/backend/resources/js/admin/child/detail.jsx index 4c3513e8..0513555b 100644 --- a/backend/resources/js/admin/child/detail.jsx +++ b/backend/resources/js/admin/child/detail.jsx @@ -141,7 +141,7 @@ const ChildDetail = (props) => { {/* */} - + avatar-img
    { _422errors.image && diff --git a/backend/resources/js/admin/parent/detail.jsx b/backend/resources/js/admin/parent/detail.jsx index c0bdb375..6d805e97 100644 --- a/backend/resources/js/admin/parent/detail.jsx +++ b/backend/resources/js/admin/parent/detail.jsx @@ -141,7 +141,7 @@ const ParentDetail = (props) => { {/* */} - + avatar-img
    { _422errors.image && From c51b076c6d24c6405f2dcca80f1abdea5ab36b5e Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Mon, 1 Nov 2021 22:38:21 +0900 Subject: [PATCH 04/13] show login success modal in admin-meeting-index --- backend/public/js/app.js | 29 +++++++++----------- backend/resources/js/admin/login/index.jsx | 13 ++------- backend/resources/js/admin/meeting/index.jsx | 13 +++++++-- 3 files changed, 26 insertions(+), 29 deletions(-) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index cedc13dd..17087e0d 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -37153,8 +37153,8 @@ var AdminLogin = function AdminLogin() { init_error(); axios__WEBPACK_IMPORTED_MODULE_2___default().post('/api/admin/login', formdata).then(function (response) { if (response.data.status_code == 200) { - setSuccess('ログインに成功しました。'); - window.location.href = '/admin/meeting'; + localStorage.setItem("from_login", true); + window.location.href = "/admin/meeting"; } else if (response.data.status_code == 422) { set422Errors(response.data.error_messages); } else if (response.data.status_code == 400) { @@ -37245,15 +37245,6 @@ var AdminLogin = function AdminLogin() { return set400Error(null); }, children: _400error - }), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, { - type: "success", - hide: function hide() { - return history.push({ - pathname: "/admin/meeting", - state: {} - }); - }, - children: _success })] }); }; // ---------------------------------------------------------------------- @@ -38386,9 +38377,15 @@ var Meeting = function Meeting() { var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), _useState10 = _slicedToArray(_useState9, 2), - _400error = _useState10[0], - set400error = _useState10[1]; + _success = _useState10[0], + setSuccess = _useState10[1]; + (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { + if (localStorage.getItem("from_login")) { + setSuccess("ログインに成功しました!"); + localStorage.removeItem("from_login"); + } + }, []); (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { setLoaded(false); axios__WEBPACK_IMPORTED_MODULE_2___default().get('/api/admin/meetings/list').then(function (response) { @@ -38604,9 +38601,9 @@ var Meeting = function Meeting() { children: "\u30C7\u30FC\u30BF\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u305B\u3093\u3002" }))] }) - }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, { - type: "fail", - children: _400error + }), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, { + type: "success", + children: _success })] }) })] diff --git a/backend/resources/js/admin/login/index.jsx b/backend/resources/js/admin/login/index.jsx index b7e42559..33788356 100644 --- a/backend/resources/js/admin/login/index.jsx +++ b/backend/resources/js/admin/login/index.jsx @@ -33,8 +33,8 @@ const AdminLogin = () => { axios.post('/api/admin/login', formdata) .then(response => { if(response.data.status_code == 200){ - setSuccess('ログインに成功しました。'); - window.location.href = '/admin/meeting'; + localStorage.setItem("from_login", true); + window.location.href = "/admin/meeting"; } else if(response.data.status_code == 422){ set422Errors(response.data.error_messages); @@ -98,15 +98,6 @@ const AdminLogin = () => { { _400error && set400Error(null)}>{_400error} } - { - _success && - - history.push({ - pathname: "/admin/meeting", - state: {} - })}>{_success} - } ) diff --git a/backend/resources/js/admin/meeting/index.jsx b/backend/resources/js/admin/meeting/index.jsx index 4856dd53..9395d0ac 100644 --- a/backend/resources/js/admin/meeting/index.jsx +++ b/backend/resources/js/admin/meeting/index.jsx @@ -16,7 +16,16 @@ const Meeting = () => { const [loaded, setLoaded] = useState(false); const [meeting_list, setMeetingList ] = useState(null); const [_422errors, set422errors] = useState({keyword:''}); - const [_400error, set400error] = useState(''); + const [_success, setSuccess] = useState(''); + + + useEffect(()=>{ + if(localStorage.getItem("from_login")){ + setSuccess("ログインに成功しました!"); + localStorage.removeItem("from_login"); + } + },[]); + useEffect(() => { setLoaded(false); @@ -166,7 +175,7 @@ const Meeting = () => {
    { - _400error && {_400error} + _success && {_success} } From 065e8436f2b70d342beffc69eee167f046353ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Mon, 1 Nov 2021 22:43:32 +0900 Subject: [PATCH 05/13] =?UTF-8?q?=E3=81=94=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/Http/Controllers/Api/MeetingsController.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/backend/app/Http/Controllers/Api/MeetingsController.php b/backend/app/Http/Controllers/Api/MeetingsController.php index c3cc2ea1..dbc8eccb 100644 --- a/backend/app/Http/Controllers/Api/MeetingsController.php +++ b/backend/app/Http/Controllers/Api/MeetingsController.php @@ -529,9 +529,8 @@ class MeetingsController extends Controller { // DBにミーティングがある場合 if ($chk = Meeting::select('pdf')->where('id', (int)$meeting_id)->first()) { - // base64の場合（ファイルパスだったら、スキップ） - if (preg_match('\/storage\/(.*).pdf', $r->pdf)) { + if (!preg_match('/\/storage\/(.*).pdf/', $r->pdf)) { // もう存在しているPDFのファイル名からパスを外します。 $opdf = str_replace('/storage/', '', $chk->pdf); @@ -540,14 +539,12 @@ class MeetingsController extends Controller { // 既にPDFが存在する場合（なければ、スキップ） if (Storage::disk('public')->exists($opdf)) { - // 既に存在しているPDFとアップロードしているPDFを比べてみます。異なる場合、存在しているPDFを削除します。 + // 既に存在しているPDFとアップロードしているPDFを比べてみます。異なる場合、存在しているPDFを削除しアップロードします。 if (strcmp(Storage::disk('public')->get($opdf), $pdf) !== 0) { + $update['pdf'] = '/storage/'.$filename; Storage::disk('public')->delete($opdf); + Storage::disk('public')->put($filename, $pdf); } - - // アップロードします。 - $update['pdf'] = '/storage/'.$filename; - Storage::disk('public')->put($filename, $pdf); } } } From 44674d81880602c64c998441570eacab50192f10 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Mon, 1 Nov 2021 22:45:08 +0900 Subject: [PATCH 06/13] =?UTF-8?q?=E7=94=BB=E5=83=8F=E3=81=8C=E4=BD=95?= =?UTF-8?q?=E3=82=82=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AF=E6=AD=A3?= =?UTF-8?q?=E6=96=B9=E5=BD=A2=E3=81=A7=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/public/js/app.js | 16 +++++++++++++--- backend/resources/js/admin/meeting/detail.jsx | 5 +++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 17087e0d..281f079c 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -37289,6 +37289,14 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); +function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); } + +function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } + +function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); } + +function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); } + function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } @@ -37613,16 +37621,18 @@ var MeetingDetail = function MeetingDetail(props) { alt: meeting.meeting_image[0].image }) }) - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)("div", { className: "p-file-nav", - children: (_meeting$meeting_imag = meeting.meeting_image) === null || _meeting$meeting_imag === void 0 ? void 0 : _meeting$meeting_imag.map(function (x, k) { + children: [(_meeting$meeting_imag = meeting.meeting_image) === null || _meeting$meeting_imag === void 0 ? void 0 : _meeting$meeting_imag.map(function (x, k) { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("figure", { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("img", { src: x.image, alt: x.image }) }, k); - }) + }), _toConsumableArray(Array(10 - meeting.meeting_image.length)).map(function (x, k) { + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("figure", {}, k); + })] })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)("div", { className: "p-article__pdf", diff --git a/backend/resources/js/admin/meeting/detail.jsx b/backend/resources/js/admin/meeting/detail.jsx index e5a931b7..a3774920 100644 --- a/backend/resources/js/admin/meeting/detail.jsx +++ b/backend/resources/js/admin/meeting/detail.jsx @@ -172,6 +172,11 @@ const MeetingDetail = (props) => {
    {x.image}
    ) } + { + [...Array(10-meeting.meeting_image.length)].map((x, k)=> +
    + ) + } From 10b57b20eaa6e3f9f2793772a2354cb1c51e9892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Mon, 1 Nov 2021 23:15:48 +0900 Subject: [PATCH 07/13] a --- backend/app/Http/Controllers/Api/MeetingsController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/app/Http/Controllers/Api/MeetingsController.php b/backend/app/Http/Controllers/Api/MeetingsController.php index dbc8eccb..6363015f 100644 --- a/backend/app/Http/Controllers/Api/MeetingsController.php +++ b/backend/app/Http/Controllers/Api/MeetingsController.php @@ -541,11 +541,12 @@ class MeetingsController extends Controller { if (Storage::disk('public')->exists($opdf)) { // 既に存在しているPDFとアップロードしているPDFを比べてみます。異なる場合、存在しているPDFを削除しアップロードします。 if (strcmp(Storage::disk('public')->get($opdf), $pdf) !== 0) { - $update['pdf'] = '/storage/'.$filename; Storage::disk('public')->delete($opdf); - Storage::disk('public')->put($filename, $pdf); } } + + $update['pdf'] = '/storage/'.$filename; + Storage::disk('public')->put($filename, $pdf); } } // なければ、そのままストレージに保存します。 From 9cd7f43959238a6a5c3ba1e4aaaa09337c809bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Mon, 1 Nov 2021 23:17:07 +0900 Subject: [PATCH 08/13] a --- backend/app/Http/Controllers/Api/MeetingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/Http/Controllers/Api/MeetingsController.php b/backend/app/Http/Controllers/Api/MeetingsController.php index 6363015f..2ef37060 100644 --- a/backend/app/Http/Controllers/Api/MeetingsController.php +++ b/backend/app/Http/Controllers/Api/MeetingsController.php @@ -539,7 +539,7 @@ class MeetingsController extends Controller { // 既にPDFが存在する場合（なければ、スキップ） if (Storage::disk('public')->exists($opdf)) { - // 既に存在しているPDFとアップロードしているPDFを比べてみます。異なる場合、存在しているPDFを削除しアップロードします。 + // 既に存在しているPDFとアップロードしているPDFを比べてみます。異なる場合、存在しているPDFを削除します。 if (strcmp(Storage::disk('public')->get($opdf), $pdf) !== 0) { Storage::disk('public')->delete($opdf); } From 1863990c4c3d0853b837402dc6aa02a4c36235be Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Mon, 1 Nov 2021 23:24:42 +0900 Subject: [PATCH 09/13] =?UTF-8?q?=E7=94=BB=E5=83=8F=E3=81=8C=E4=BD=95?= =?UTF-8?q?=E3=82=82=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AF=E6=AD=A3?= =?UTF-8?q?=E6=96=B9=E5=BD=A2=E3=81=A7=E3=81=99=E3=80=82=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E3=81=AFbackground-size:contain;=E3=81=A8=E5=90=8C=E3=81=98?= =?UTF-8?q?=E6=8C=99=E5=8B=95=E3=81=AB=E3=81=AA=E3=82=8A=E3=81=BE=E3=81=99?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/public/js/app.js | 55 ++++++++++++++----- backend/resources/js/admin/meeting/detail.jsx | 16 ++++-- 2 files changed, 52 insertions(+), 19 deletions(-) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 281f079c..5c43eb7e 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -37337,6 +37337,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope + var Transition = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.forwardRef(function Transition(props, ref) { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_mui_material_Slide__WEBPACK_IMPORTED_MODULE_8__.default, _objectSpread({ direction: "up", @@ -37371,23 +37372,28 @@ var MeetingDetail = function MeetingDetail(props) { var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''), _useState10 = _slicedToArray(_useState9, 2), - _400error = _useState10[0], - set400Error = _useState10[1]; + thumbnail = _useState10[0], + setThumbnail = _useState10[1]; var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''), _useState12 = _slicedToArray(_useState11, 2), - _success = _useState12[0], - setSuccess = _useState12[1]; + _400error = _useState12[0], + set400Error = _useState12[1]; - var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false), + var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''), _useState14 = _slicedToArray(_useState13, 2), - showPdf = _useState14[0], - setShowPdf = _useState14[1]; + _success = _useState14[0], + setSuccess = _useState14[1]; var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false), _useState16 = _slicedToArray(_useState15, 2), - showMemo = _useState16[0], - setShowMemo = _useState16[1]; + showPdf = _useState16[0], + setShowPdf = _useState16[1]; + + var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false), + _useState18 = _slicedToArray(_useState17, 2), + showMemo = _useState18[0], + setShowMemo = _useState18[1]; (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () { var _props$match$params; @@ -37413,6 +37419,7 @@ var MeetingDetail = function MeetingDetail(props) { denominator: total, numerator: num })); + if (list.meeting_image.length > 0) setThumbnail(list.meeting_image[0].image); } else if (response.data.status_code == 400) {//TODO } }); @@ -37615,23 +37622,41 @@ var MeetingDetail = function MeetingDetail(props) { className: "p-file-list", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("div", { className: "p-file-for", - children: meeting.meeting_image[0] && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("figure", { - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("img", { - src: meeting.meeting_image[0].image, - alt: meeting.meeting_image[0].image + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("figure", { + style: { + height: '300px' + }, + children: thumbnail && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("img", { + src: thumbnail, + alt: "thumbnail", + style: { + width: '100%', + height: '100%', + objectFit: 'contain' + } }) }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)("div", { className: "p-file-nav", children: [(_meeting$meeting_imag = meeting.meeting_image) === null || _meeting$meeting_imag === void 0 ? void 0 : _meeting$meeting_imag.map(function (x, k) { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("figure", { + style: { + minWidth: '100px' + }, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("img", { src: x.image, - alt: x.image + alt: x.image, + onClick: function onClick(e) { + return setThumbnail(x.image); + } }) }, k); }), _toConsumableArray(Array(10 - meeting.meeting_image.length)).map(function (x, k) { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("figure", {}, k); + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("figure", { + style: { + minWidth: '100px' + } + }, k); })] })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsxs)("div", { diff --git a/backend/resources/js/admin/meeting/detail.jsx b/backend/resources/js/admin/meeting/detail.jsx index a3774920..08b26884 100644 --- a/backend/resources/js/admin/meeting/detail.jsx +++ b/backend/resources/js/admin/meeting/detail.jsx @@ -17,6 +17,7 @@ import Slide from '@mui/material/Slide'; import Alert from '../../component/alert'; import ModalPdf from '../../component/admin/pdf_modal_admin'; import ModalMemo from '../../component/admin/modal_memo'; +import { minWidth } from '@material-ui/system'; const Transition = React.forwardRef(function Transition(props, ref) { @@ -32,6 +33,7 @@ const MeetingDetail = (props) => { const [loaded, setLoaded] = useState(false); const [submit, setSubmit] = useState(false); const [meeting, setMeeting] = useState(null); + const [thumbnail, setThumbnail] = useState(''); const [_400error, set400Error] = useState(''); const [_success, setSuccess] = useState(''); @@ -57,6 +59,7 @@ const MeetingDetail = (props) => { } } setMeeting({...list, denominator:total, numerator:num}); + if(list.meeting_image.length > 0) setThumbnail(list.meeting_image[0].image); } else if(response.data.status_code==400){ //TODO } @@ -161,20 +164,25 @@ const MeetingDetail = (props) => {
    +
    { - meeting.meeting_image[0] && -
    {meeting.meeting_image[0].image}
    + thumbnail && + thumbnail } +
    { meeting.meeting_image?.map((x, k)=> -
    {x.image}
    +
    + {x.image}setThumbnail(x.image)}/> +
    ) } { [...Array(10-meeting.meeting_image.length)].map((x, k)=> -
    +
    ) }
    From d9c1ade8fd7ee9d11c61803cec452f0e105bc071 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Mon, 1 Nov 2021 23:57:34 +0900 Subject: [PATCH 10/13] =?UTF-8?q?=E3=80=8C=E3=83=A1=E3=83=A2=E3=82=A2?= =?UTF-8?q?=E3=82=A4=E3=82=B3=E3=83=B3=E3=80=8D=E3=82=92=E6=8A=BC=E3=81=99?= =?UTF-8?q?=E3=81=A8=E5=B0=91=E3=81=97=E6=A8=AA=E3=81=AB=E3=81=9A=E3=82=8C?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E3=81=AE=E3=81=A7=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=82=92=E3=81=8A=E9=A1=98=E3=81=84=E3=81=84=E3=81=9F?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/public/css/app.css | 4 ++++ backend/resources/sass/_variables.scss | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/backend/public/css/app.css b/backend/public/css/app.css index 5ca77f17..1337dc8a 100644 --- a/backend/public/css/app.css +++ b/backend/public/css/app.css @@ -10,6 +10,10 @@ background-color: #F0DE00 !important; } +body { + padding: 0 !important; +} + /*! * Bootstrap v4.6.0 (https://getbootstrap.com/) * Copyright 2011-2021 The Bootstrap Authors diff --git a/backend/resources/sass/_variables.scss b/backend/resources/sass/_variables.scss index 8689fe5a..fc9df4a1 100644 --- a/backend/resources/sass/_variables.scss +++ b/backend/resources/sass/_variables.scss @@ -47,4 +47,8 @@ $grid-breakpoints: ( lg: 992px, xl: 1200px, xxl: 1400px -); \ No newline at end of file +); + +body{ + padding: 0 !important; +} \ No newline at end of file From 9dabee5c33aa5e54b8b28d39e0fad82e484532d2 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Tue, 2 Nov 2021 00:23:43 +0900 Subject: [PATCH 11/13] =?UTF-8?q?=E3=80=8C=E5=85=A8=E5=93=A1=E3=81=AB?= =?UTF-8?q?=E9=80=81=E4=BF=A1=E3=80=8D=E5=8F=8A=E3=81=B3=E3=80=8C=E9=81=B8?= =?UTF-8?q?=E3=82=93=E3=81=A7=E9=80=81=E4=BF=A1=E3=80=8D=E3=81=AF=E3=80=81?= =?UTF-8?q?radio=E3=81=AB=E3=81=AA=E3=82=8A=E3=81=BE=E3=81=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/public/js/app.js | 46 ++++++++------------- backend/resources/js/admin/meeting/edit.jsx | 37 +++++++---------- 2 files changed, 32 insertions(+), 51 deletions(-) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 5c43eb7e..e1494ad8 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -37900,18 +37900,13 @@ var MeetingEdit = function MeetingEdit(props) { var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false), _useState24 = _slicedToArray(_useState23, 2), - check_all = _useState24[0], - setCheckAll = _useState24[1]; + check_radio = _useState24[0], + setCheckRadio = _useState24[1]; - var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false), + var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]), _useState26 = _slicedToArray(_useState25, 2), - check_some = _useState26[0], - setCheckSome = _useState26[1]; - - var _useState27 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]), - _useState28 = _slicedToArray(_useState27, 2), - selectedIndex = _useState28[0], - setSelectedIndex = _useState28[1]; + selectedIndex = _useState26[0], + setSelectedIndex = _useState26[1]; (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { var _props$match$params; @@ -37934,12 +37929,6 @@ var MeetingEdit = function MeetingEdit(props) { } }); }, []); - (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { - if (check_all) setCheckSome(false); - }, [check_all]); - (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { - if (check_some) setCheckAll(false); - }, [check_some]); var handleSubmit = function handleSubmit(e) { e.preventDefault(); @@ -38249,12 +38238,13 @@ var MeetingEdit = function MeetingEdit(props) { htmlFor: "allmember_send", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", { className: "boolean optional", - type: "checkbox", - name: "allmember_send", + type: "radio", id: "allmember_send", - checked: check_all, - onChange: function onChange(e) { - return setCheckAll(!check_all); + name: "check_radio", + value: false, + onClick: function onClick(e) { + setCheckRadio(e.target.value); + console.log(e.target.value); } }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { children: "\u5168\u54E1\u306B\u9001\u4FE1" @@ -38266,19 +38256,20 @@ var MeetingEdit = function MeetingEdit(props) { htmlFor: "pickup_send", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", { className: "boolean optional", - type: "checkbox", - name: "pickup_send", + type: "radio", id: "pickup_send", - checked: check_some, - onChange: function onChange(e) { - return setCheckSome(!check_some); + name: "check_radio", + value: true, + onClick: function onClick(e) { + setCheckRadio(e.target.value); + console.log(e.target.value); } }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { children: "\u9078\u3093\u3067\u9001\u4FE1" })] }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { - className: "checkbox-wrap edit-bg ".concat(approval_list.length == 0 && 'd-none'), + className: "checkbox-wrap edit-bg ".concat((approval_list.length == 0 || check_radio != "true") && 'd-none'), children: approval_list === null || approval_list === void 0 ? void 0 : approval_list.map(function (item, k) { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { className: "checkbox", @@ -38288,7 +38279,6 @@ var MeetingEdit = function MeetingEdit(props) { className: "boolean optional", type: "checkbox", id: "user_name".concat(k), - disabled: !check_some, onChange: handleApproval }), "".concat(item.child.first_name, " ").concat(item.child.last_name)] }) diff --git a/backend/resources/js/admin/meeting/edit.jsx b/backend/resources/js/admin/meeting/edit.jsx index 0b9bd5e6..1846fe35 100644 --- a/backend/resources/js/admin/meeting/edit.jsx +++ b/backend/resources/js/admin/meeting/edit.jsx @@ -29,8 +29,7 @@ const MeetingEdit = (props) => { const [loaded, setLoaded] = useState(false); const [submit, setSubmit] = useState(false); - const [check_all, setCheckAll] = useState(false); - const [check_some, setCheckSome] = useState(false); + const [check_radio, setCheckRadio] = useState(false); const [selectedIndex, setSelectedIndex] = useState([]); @@ -55,15 +54,6 @@ const MeetingEdit = (props) => { }, []); - useEffect(()=>{ - if(check_all) setCheckSome(false); - }, [check_all]) - - useEffect(()=>{ - if(check_some) setCheckAll(false); - }, [check_some]) - - const handleSubmit = (e) => { e.preventDefault(); set422Errors({title:'',memo:'',text:'',pdf:'',image:''}); @@ -265,11 +255,12 @@ const MeetingEdit = (props) => {
    @@ -277,16 +268,17 @@ const MeetingEdit = (props) => {
    -
    +
    { approval_list?.map((item, k)=>
    @@ -294,7 +286,6 @@ const MeetingEdit = (props) => { {`${item.child.first_name} ${item.child.last_name}`} From 1cef943289f76bb24284d4ed45b53fd3e9698668 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Tue, 2 Nov 2021 01:36:41 +0900 Subject: [PATCH 12/13] remove console.log() --- backend/public/js/app.js | 12 ++---------- backend/resources/js/admin/meeting/detail.jsx | 1 - backend/resources/js/admin/meeting/edit.jsx | 7 ++----- backend/resources/js/admin/meeting/index.jsx | 1 - 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index e1494ad8..0ff2c897 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -37404,7 +37404,6 @@ var MeetingDetail = function MeetingDetail(props) { if (response.data.status_code == 200) { var list = response.data.params; - console.log(list); var total = 0, num = 0; @@ -37918,7 +37917,6 @@ var MeetingEdit = function MeetingEdit(props) { if (response.data.status_code == 200) { var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4, _response$data$params5, _response$data$params6; - console.log(response.data.params); setTitle((_response$data$params = response.data.params) === null || _response$data$params === void 0 ? void 0 : _response$data$params.title); setMemo((_response$data$params2 = response.data.params) === null || _response$data$params2 === void 0 ? void 0 : _response$data$params2.memo); setText((_response$data$params3 = response.data.params) === null || _response$data$params3 === void 0 ? void 0 : _response$data$params3.text); @@ -37952,7 +37950,6 @@ var MeetingEdit = function MeetingEdit(props) { setSubmit(true); axios__WEBPACK_IMPORTED_MODULE_1___default().put("/api/admin/meetings/update/".concat((_props$match$params2 = props.match.params) === null || _props$match$params2 === void 0 ? void 0 : _props$match$params2.meeting_id), request).then(function (response) { setSubmit(false); - console.log(response.data); switch (response.data.status_code) { case 200: @@ -37987,8 +37984,6 @@ var MeetingEdit = function MeetingEdit(props) { meeting_id: props.match.params.meeting_id } }).then(function (response) { - console.log(response.data); - switch (response.data.status_code) { case 200: setMeetingImages(response.data.params); @@ -38243,8 +38238,7 @@ var MeetingEdit = function MeetingEdit(props) { name: "check_radio", value: false, onClick: function onClick(e) { - setCheckRadio(e.target.value); - console.log(e.target.value); + return setCheckRadio(e.target.value); } }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { children: "\u5168\u54E1\u306B\u9001\u4FE1" @@ -38261,8 +38255,7 @@ var MeetingEdit = function MeetingEdit(props) { name: "check_radio", value: true, onClick: function onClick(e) { - setCheckRadio(e.target.value); - console.log(e.target.value); + return setCheckRadio(e.target.value); } }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { children: "\u9078\u3093\u3067\u9001\u4FE1" @@ -38419,7 +38412,6 @@ var Meeting = function Meeting() { if (response.data.status_code == 200) { //------------Calculate Numerator & Denominator-------------- var list = response.data.params; - console.log(list); var arr = []; for (var i in list) { diff --git a/backend/resources/js/admin/meeting/detail.jsx b/backend/resources/js/admin/meeting/detail.jsx index 08b26884..867c2266 100644 --- a/backend/resources/js/admin/meeting/detail.jsx +++ b/backend/resources/js/admin/meeting/detail.jsx @@ -49,7 +49,6 @@ const MeetingDetail = (props) => { setLoaded(true); if(response.data.status_code==200){ var list = response.data.params; - console.log(list); var total=0, num=0; if(list.approval){ for(var i in list.approval) diff --git a/backend/resources/js/admin/meeting/edit.jsx b/backend/resources/js/admin/meeting/edit.jsx index 1846fe35..d716a860 100644 --- a/backend/resources/js/admin/meeting/edit.jsx +++ b/backend/resources/js/admin/meeting/edit.jsx @@ -39,7 +39,6 @@ const MeetingEdit = (props) => { .then(response => { setLoaded(true); if(response.data.status_code==200){ - console.log(response.data.params); setTitle(response.data.params?.title); setMemo(response.data.params?.memo); setText(response.data.params?.text); @@ -63,7 +62,6 @@ const MeetingEdit = (props) => { axios.put(`/api/admin/meetings/update/${props.match.params?.meeting_id}`, request) .then(response => { setSubmit(false); - console.log(response.data) switch(response.data.status_code){ case 200: setSuccess("更新成功しました!"); break; case 400: set400Error("更新失敗しました。"); break; @@ -86,7 +84,6 @@ const MeetingEdit = (props) => { formdata.append('image', reader.result); axios.post(`/api/admin/meeting/images/register`, formdata, {params:{meeting_id: props.match.params.meeting_id}}) .then(response => { - console.log(response.data) switch(response.data.status_code){ case 200: setMeetingImages(response.data.params); notify_save(); break; case 400: set400Error(response.data.error_messages); break; @@ -259,7 +256,7 @@ const MeetingEdit = (props) => { id="allmember_send" name="check_radio" value={false} - onClick={e=>{setCheckRadio(e.target.value);console.log(e.target.value)}} + onClick={e=>setCheckRadio(e.target.value)} /> 全員に送信 @@ -272,7 +269,7 @@ const MeetingEdit = (props) => { id="pickup_send" name="check_radio" value={true} - onClick={e=>{setCheckRadio(e.target.value); console.log(e.target.value)}} + onClick={e=>setCheckRadio(e.target.value)} /> 選んで送信 diff --git a/backend/resources/js/admin/meeting/index.jsx b/backend/resources/js/admin/meeting/index.jsx index 9395d0ac..22ba551e 100644 --- a/backend/resources/js/admin/meeting/index.jsx +++ b/backend/resources/js/admin/meeting/index.jsx @@ -36,7 +36,6 @@ const Meeting = () => { //------------Calculate Numerator & Denominator-------------- var list = response.data.params; - console.log(list); var arr = []; for(var i in list){ var total=0, num=0; From 901d05dbb41b9d758581423f86907a9ad5092376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Tue, 2 Nov 2021 10:43:59 +0900 Subject: [PATCH 13/13] =?UTF-8?q?=E3=83=91=E3=82=B9=E3=83=AF=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=81=AE=E3=82=A2=E3=83=A9=E3=83=BC=E3=83=88=E3=82=92?= =?UTF-8?q?=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=81=AB=E7=BF=BB=E8=A8=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/resources/lang/ja/validation.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/resources/lang/ja/validation.php b/backend/resources/lang/ja/validation.php index ed8043a1..527f687f 100644 --- a/backend/resources/lang/ja/validation.php +++ b/backend/resources/lang/ja/validation.php @@ -81,16 +81,16 @@ return [ 'max' => [ 'numeric' => 'The :attribute must not be greater than :max.', 'file' => 'プロフィール画像は最大1M以内です。', - 'string' => '本文は最大 :attribute 文字以内です。', + 'string' => ':attribute は最大 :max 文字以内です。', 'array' => 'The :attribute must not have more than :max items.', ], 'mimes' => 'ファイル形式は :values のみです。', 'mimetypes' => 'The :attribute must be a file of type: :values.', 'min' => [ - 'numeric' => 'The :attribute must be at least :min.', - 'file' => 'The :attribute must be at least :min kilobytes.', - 'string' => 'The :attribute must be at least :min characters.', - 'array' => 'The :attribute must have at least :min items.', + 'numeric' => ':attribute は最低 :min 数字以上です。', + 'file' => ':attribute は最低 :min kB以上です。', + 'string' => ':attribute は最低 :min 文字以上です。', + 'array' => ':attribute は最低 :min 配列要素以上です。', ], 'multiple_of' => 'The :attribute must be a multiple of :value.', 'not_in' => 'The selected :attribute is invalid.',