suwako
/
kikikan
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

fixed size & color & css in child

このコミットが含まれているのは:
dragon1211 2021-11-17 19:14:22 -08:00
親 9326f516bd
コミット 95bc09c6eb
20個のファイルの変更、346行の追加、253行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

9
backend/public/css/app.css vendored
ファイルの表示

@ -12305,6 +12305,15 @@ a {
-webkit-line-clamp: 2;
}
.profile-name, .profile-info {
font-size: 18px !important;
}
@media (max-width: 575.98px) {
.profile-name, .profile-info {
font-size: 16px !important;
}
}
@media screen and (min-width: 1068px) {
.p-meetingAdd-btn {
width: 200px !important;

287
backend/public/js/app.js vendored
ファイルの表示

@ -34669,7 +34669,7 @@ var ChildDetail = function ChildDetail(props) {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("section", {
className: "profile-container",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "profile-wrap position-relative",
className: "profile-wrap",
style: {
minHeight: '500px'
},
@ -34715,10 +34715,10 @@ var ChildDetail = function ChildDetail(props) {
children: _422errors.image
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("p", {
className: "profile-name ft-18 ft-xs-16",
className: "profile-name",
children: "".concat(child.first_name, " ").concat(child.last_name)
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "profile-info ft-18 ft-xs-16",
className: "profile-info",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "profile-info__item",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("p", {
@ -35166,21 +35166,21 @@ var ChildEdit = function ChildEdit(props) {
className: "ft-18 ft-xs-16 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB\u3092\u66F4\u65B0"
})
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
type: "fail",
hide: function hide() {
return set400Error('');
},
children: [" ", _400error, " "]
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
type: "success",
hide: function hide() {
return setSuccess('');
},
children: [" ", _success, " "]
})]
})
})
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
type: "fail",
hide: function hide() {
return set400Error('');
},
children: [" ", _400error, " "]
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
type: "success",
hide: function hide() {
return setSuccess('');
},
children: [" ", _success, " "]
})]
})
})]
@ -35383,7 +35383,7 @@ var Child = function Child(props) {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "search-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
className: "search-content position-relative",
className: "search-content",
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_7__.default, {
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_infinite_scroll_component__WEBPACK_IMPORTED_MODULE_2__.default, {
@ -36086,7 +36086,7 @@ var MeetingDetail = function MeetingDetail(props) {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", {
className: "p-article",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
className: "p-article-wrap position-relative",
className: "p-article-wrap",
style: {
minHeight: '700px'
},
@ -36680,7 +36680,7 @@ var MeetingEdit = function MeetingEdit(props) {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "p-article",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "p-article-wrap position-relative",
className: "p-article-wrap",
style: {
minHeight: '500px'
},
@ -37002,17 +37002,22 @@ var Meeting = function Meeting(props) {
fetch_meeting_list = _useState8[0],
setFetchMeetingList = _useState8[1];
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState10 = _slicedToArray(_useState9, 2),
_400error = _useState10[0],
set400Error = _useState10[1];
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
keyword: ''
}),
_useState10 = _slicedToArray(_useState9, 2),
_422errors = _useState10[0],
set422errors = _useState10[1];
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.history.location.state),
_useState12 = _slicedToArray(_useState11, 2),
_success = _useState12[0],
setSuccess = _useState12[1];
_422errors = _useState12[0],
set422errors = _useState12[1];
var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.history.location.state),
_useState14 = _slicedToArray(_useState13, 2),
_success = _useState14[0],
setSuccess = _useState14[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
if (localStorage.getItem("from_login")) {
@ -37165,7 +37170,7 @@ var Meeting = function Meeting(props) {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "search-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "search-content position-relative",
className: "search-content",
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_8__.default, {
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(react_infinite_scroll_component__WEBPACK_IMPORTED_MODULE_3__.default, {
@ -37246,6 +37251,12 @@ var Meeting = function Meeting(props) {
})
})]
})
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, {
type: "fail",
hide: function hide() {
return set400Error('');
},
children: _400error
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, {
type: "success",
hide: function hide() {
@ -37478,7 +37489,7 @@ var ParentDetail = function ParentDetail(props) {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("section", {
className: "profile-container",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "profile-wrap position-relative",
className: "profile-wrap",
style: {
minHeight: '500px'
},
@ -37524,10 +37535,10 @@ var ParentDetail = function ParentDetail(props) {
children: _422errors.image
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("p", {
className: "profile-name ft-18 ft-xs-16",
className: "profile-name",
children: parent.company
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "profile-info ft-18 ft-xs-16",
className: "profile-info",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "profile-info__item",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("a", {
@ -38118,7 +38129,7 @@ var Parent = function Parent(props) {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "search-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
className: "search-content position-relative",
className: "search-content",
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_7__.default, {
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_infinite_scroll_component__WEBPACK_IMPORTED_MODULE_2__.default, {
@ -40361,18 +40372,18 @@ var MeetingDetail = function MeetingDetail(props) {
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState12 = _slicedToArray(_useState11, 2),
showPdf = _useState12[0],
setShowPdf = _useState12[1];
show_pdf_modal = _useState12[0],
setShowPDFMoal = _useState12[1];
var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState14 = _slicedToArray(_useState13, 2),
showMemo = _useState14[0],
setShowMemo = _useState14[1];
show_memo_modal = _useState14[0],
setShowMemoModal = _useState14[1];
var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState16 = _slicedToArray(_useState15, 2),
showConfirm = _useState16[0],
setShowConfirm = _useState16[1];
show_confirm_modal = _useState16[0],
setShowConfirmMoal = _useState16[1];
var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState18 = _slicedToArray(_useState17, 2),
@ -40410,6 +40421,8 @@ var MeetingDetail = function MeetingDetail(props) {
if (meeting.approval.approval_at != null) {
setApprovalRegister(true);
}
} else {
set400error("失敗しました。");
}
});
}, []);
@ -40421,7 +40434,7 @@ var MeetingDetail = function MeetingDetail(props) {
formdata.append('meeting_id', props.match.params.meeting_id);
axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/children/meeting/approvals/registerApproval', formdata).then(function (response) {
setSubmit(false);
setShowConfirm(false);
setShowConfirmMoal(false);
setNotice(response.data.notice);
switch (response.data.status_code) {
@ -40454,7 +40467,7 @@ var MeetingDetail = function MeetingDetail(props) {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("button", {
className: "btn-default btn-yellow btn-consent btn-shadow btn-r8 btn-h42",
onClick: function onClick(e) {
return setShowConfirm(true);
return setShowConfirmMoal(true);
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", {
children: "\u627F\u8A8D"
@ -40554,7 +40567,7 @@ var MeetingDetail = function MeetingDetail(props) {
}) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("a", {
className: "btn-default btn-pdf btn-r8 btn-h50 btn-yellow",
onClick: function onClick() {
return setShowPdf(true);
return setShowPDFMoal(true);
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", {
children: "PDF\u3092\u78BA\u8A8D\u3059\u308B"
@ -40570,7 +40583,7 @@ var MeetingDetail = function MeetingDetail(props) {
}) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("a", {
className: "btn-default btn-pdf btn-r8 btn-h50 btn-yellow",
onClick: function onClick() {
return setShowMemo(true);
return setShowMemoModal(true);
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", {
children: "\u30E1\u30E2\u3092\u78BA\u8A8D\u3059\u308B"
@ -40584,17 +40597,17 @@ var MeetingDetail = function MeetingDetail(props) {
})]
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_component_modal_memo__WEBPACK_IMPORTED_MODULE_6__.default, {
show: showMemo,
show: show_memo_modal,
title: "メモ",
content: meeting === null || meeting === void 0 ? void 0 : meeting.memo,
handleClose: function handleClose() {
return setShowMemo(false);
return setShowMemoModal(false);
}
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_component_pdf_modal_pdf__WEBPACK_IMPORTED_MODULE_5__.default, {
show: showPdf,
show: show_pdf_modal,
pdfPath: (_meeting$pdf = meeting.pdf) !== null && _meeting$pdf !== void 0 ? _meeting$pdf : '/pdf/test.pdf',
handleClose: function handleClose() {
return setShowPdf(false);
return setShowPDFMoal(false);
}
})]
})
@ -40603,10 +40616,10 @@ var MeetingDetail = function MeetingDetail(props) {
className: "text-center mt-5 ft-18",
children: "\u30C7\u30FC\u30BF\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002"
})), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_component_modal_confirm__WEBPACK_IMPORTED_MODULE_7__.default, {
show: showConfirm,
show: show_confirm_modal,
message: "一度承知したら元に戻せません。\nよろしいでしょうか。",
handleClose: function handleClose() {
return setShowConfirm(false);
return setShowConfirmMoal(false);
},
handleAccept: handleApprovalRegister,
loading: submit
@ -40729,6 +40742,11 @@ var Meeting = function Meeting() {
_success = _useState20[0],
setSuccess = _useState20[1];
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState22 = _slicedToArray(_useState21, 2),
_400error = _useState22[0],
set400Error = _useState22[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
if (localStorage.getItem("from_login")) {
setSuccess("ログインに成功しました!");
@ -40753,6 +40771,8 @@ var Meeting = function Meeting() {
setMettingListNonApproval(response.data.params);
var len = response.data.params.length;
if (len > INFINITE) setFetchMettingListNonApproval(response.data.params.slice(0, INFINITE));else setFetchMettingListNonApproval(response.data.params.slice(0, len));
} else {
set400error("失敗しました。");
}
});
axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/children/meetings/listOfApprovalOfChild', {
@ -40767,6 +40787,8 @@ var Meeting = function Meeting() {
setMettingListApproval(response.data.params);
var len = response.data.params.length;
if (len > INFINITE) setFetchMettingListApproval(response.data.params.slice(0, INFINITE));else setFetchMettingListApproval(response.data.params.slice(0, len));
} else {
set400error("失敗しました。");
}
});
}, []);
@ -41003,8 +41025,17 @@ var Meeting = function Meeting() {
})]
})]
})
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, {
type: "fail",
hide: function hide() {
return set400Error('');
},
children: _400error
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, {
type: "success",
hide: function hide() {
return setSuccess('');
},
children: _success
})]
});
@ -41160,6 +41191,16 @@ var ParentDetail = function ParentDetail(props) {
parent = _useState6[0],
setParent = _useState6[1];
var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState8 = _slicedToArray(_useState7, 2),
_400error = _useState8[0],
set400Error = _useState8[1];
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState10 = _slicedToArray(_useState9, 2),
_success = _useState10[0],
setSuccess = _useState10[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(false);
axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/children/fathers/detail/' + props.match.params.father_id).then(function (response) {
@ -41168,6 +41209,8 @@ var ParentDetail = function ParentDetail(props) {
if (response.data.status_code == 200) {
setParent(response.data.params);
} else {
set400error("失敗しました。");
}
});
}, []);
@ -41187,13 +41230,13 @@ var ParentDetail = function ParentDetail(props) {
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", {
className: "l-content-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("section", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("section", {
className: "profile-container",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", {
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_4__.default, {
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", {
className: "profile-wrap",
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_4__.default, {
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", {
className: "profile-content",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", {
className: "profile-thumb",
@ -41203,10 +41246,10 @@ var ParentDetail = function ParentDetail(props) {
alt: "parent-image"
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("p", {
className: "profile-name ft-xs-16",
className: "profile-name",
children: parent.company
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", {
className: "profile-info ft-xs-17",
className: "profile-info",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", {
className: "profile-info__item",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("a", {
@ -41245,8 +41288,20 @@ var ParentDetail = function ParentDetail(props) {
})
})]
})]
})]
})
})
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(Alert, {
type: "fail",
hide: function hide() {
return set400Error('');
},
children: _400error
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(Alert, {
type: "success",
hide: function hide() {
return setSuccess('');
},
children: _success
})]
})
})]
})
@ -41323,6 +41378,16 @@ var Parent = function Parent() {
loaded = _useState8[0],
setLoaded = _useState8[1];
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState10 = _slicedToArray(_useState9, 2),
_400error = _useState10[0],
set400Error = _useState10[1];
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState12 = _slicedToArray(_useState11, 2),
_success = _useState12[0],
setSuccess = _useState12[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(false);
var child_id = document.getElementById('child_id').value;
@ -41338,6 +41403,8 @@ var Parent = function Parent() {
setParentList(response.data.params);
var len = response.data.params.length;
if (len > INFINITE) setFetchParentList(response.data.params.slice(0, INFINITE));else setFetchParentList(response.data.params.slice(0, len));
} else {
set400error("失敗しました。");
}
});
}, []);
@ -41417,6 +41484,18 @@ var Parent = function Parent() {
})
})
})
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(Alert, {
type: "fail",
hide: function hide() {
return set400Error('');
},
children: _400error
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(Alert, {
type: "success",
hide: function hide() {
return setSuccess('');
},
children: _success
})]
})]
});
@ -41590,8 +41669,13 @@ var ProfileEdit = function ProfileEdit() {
switch (response.data.status_code) {
case 200:
setSuccess(response.data.success_messages);
break;
{
history.push({
pathname: "/c-account/profile",
state: response.data.success_messages
});
break;
}
case 400:
set400Error(response.data.error_messages);
@ -41621,16 +41705,16 @@ var ProfileEdit = function ProfileEdit() {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "l-content-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("section", {
className: "profile-container",
className: "edit-container",
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {
className: "css-loader"
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "profile-wrap",
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "edit-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "profile-content",
className: "edit-content",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("form", {
onSubmit: handleSubmit,
noValidate: true,
className: "edit-form",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
className: "edit-set",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", {
@ -41745,17 +41829,14 @@ var ProfileEdit = function ProfileEdit() {
className: "l-alert__text--error ft-16 ft-md-14",
children: _422errors.company
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "mt-5",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_7__.default, {
type: "submit",
loading: submit,
fullWidth: true,
className: "btn-edit btn-default btn-h75 bg-yellow rounded-20",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-16 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB\u3092\u66F4\u65B0"
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_7__.default, {
type: "submit",
loading: submit,
fullWidth: true,
className: "btn-edit btn-default btn-h75 bg-yellow rounded-20",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-16 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB\u3092\u66F4\u65B0"
})
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, {
type: "fail",
@ -41766,10 +41847,7 @@ var ProfileEdit = function ProfileEdit() {
}), _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: "/c-account/profile",
state: {}
});
return setSuccess('');
},
children: _success
})]
@ -41830,7 +41908,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
var Profile = function Profile() {
var Profile = function Profile(props) {
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(localStorage.getItem('notice')),
_useState2 = _slicedToArray(_useState, 2),
notice = _useState2[0],
@ -41871,7 +41949,7 @@ var Profile = function Profile() {
_422errors = _useState12[0],
set422Errors = _useState12[1];
var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.history.location.state),
_useState14 = _slicedToArray(_useState13, 2),
_success = _useState14[0],
setSuccess = _useState14[1];
@ -41999,10 +42077,10 @@ var Profile = function Profile() {
children: _422errors.image
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", {
className: "profile-name ft-xs-16",
className: "profile-name",
children: "".concat(profile.first_name, " ").concat(profile.last_name)
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
className: "profile-info ft-xs-17",
className: "profile-info",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
className: "profile-info__item",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", {
@ -42219,8 +42297,13 @@ var ProfilePasswordEdit = function ProfilePasswordEdit() {
switch (response.data.status_code) {
case 200:
setSuccess(response.data.success_messages);
break;
{
history.push({
pathname: "/c-account/profile",
state: response.data.success_messages
});
break;
}
case 400:
set400Error(response.data.error_messages);
@ -42250,14 +42333,14 @@ var ProfilePasswordEdit = function ProfilePasswordEdit() {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "l-content-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("section", {
className: "profile-container",
className: "edit-container",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "profile-wrap",
className: "edit-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "profile-content",
className: "edit-content",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("form", {
onSubmit: handleSubmit,
noValidate: true,
className: "edit-form",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
className: "edit-set",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", {
@ -42297,17 +42380,14 @@ var ProfilePasswordEdit = function ProfilePasswordEdit() {
className: "l-alert__text--error ft-16 ft-md-14",
children: _422errors.password_confirmation
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "mt-5",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_6__.default, {
type: "submit",
fullWidth: true,
loading: submit,
className: "btn-edit btn-default btn-h75 bg-yellow rounded-20",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-16 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u66F4\u65B0"
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_6__.default, {
type: "submit",
fullWidth: true,
loading: submit,
className: "btn-edit btn-default btn-h75 bg-yellow rounded-20",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-16 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u66F4\u65B0"
})
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, {
type: "fail",
@ -42318,10 +42398,7 @@ var ProfilePasswordEdit = function ProfilePasswordEdit() {
}), _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: "/c-account/profile/",
state: {}
});
return setSuccess('');
},
children: _success
})]
@ -49930,10 +50007,10 @@ var Profile = function Profile(props) {
children: _422errors.image
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", {
className: "profile-name ft-xs-16",
className: "profile-name",
children: profile.company
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
className: "profile-info ft-xs-17",
className: "profile-info",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "profile-info__item",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("a", {

16
backend/resources/js/admin/child/detail.jsx
ファイルの表示

@ -93,7 +93,7 @@ const ChildDetail = (props) => {
<div className="l-content-wrap">
<section className="profile-container">
<div className="profile-wrap position-relative" style={{ minHeight:'500px'}}>
<div className="profile-wrap" style={{ minHeight:'500px'}}>
{
!loaded &&
<CircularProgress className="css-loader"/>
@ -120,8 +120,8 @@ const ChildDetail = (props) => {
</span>
}
</div>
<p className="profile-name ft-18 ft-xs-16">{`${child.first_name} ${child.last_name}`}</p>
<div className="profile-info ft-18 ft-xs-16">
<p className="profile-name">{`${child.first_name} ${child.last_name}`}</p>
<div className="profile-info">
<div className="profile-info__item">
<p className="profile-info__icon">
<img src="/assets/img/icon/person-pin.svg" alt="Person"/>
@ -191,14 +191,8 @@ const ChildDetail = (props) => {
handleAccept={handleAcceptDelete}
loading={submit}
/>
{
_400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert>
}
{ _success &&
<Alert type="success" hide={()=>setSuccess('')}>
{_success}
</Alert>
}
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
</div>
)
}

5
backend/resources/js/admin/child/edit.jsx
ファイルの表示

@ -186,13 +186,12 @@ const ChildEdit = (props) => {
className="btn-edit btn-default btn-h75 bg-yellow rounded-20">
<span className={`ft-18 ft-xs-16 font-weight-bold ${!submit && 'text-black'}`}>プロフィールを更新</span>
</LoadingButton>
{ _400error && <Alert type="fail" hide={()=>set400Error('')}> {_400error} </Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}> {_success} </Alert> }
</form>
</div>
</div>
}
{ _400error && <Alert type="fail" hide={()=>set400Error('')}> {_400error} </Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}> {_success} </Alert> }
</section>
</div>
</div>

2
backend/resources/js/admin/child/index.jsx
ファイルの表示

@ -101,7 +101,7 @@ const Child = (props) => {
</div>
<div className="search-wrap">
<div className="search-content position-relative">
<div className="search-content">
{
!loaded &&
<CircularProgress className="css-loader"/>

2
backend/resources/js/admin/meeting/detail.jsx
ファイルの表示

@ -79,7 +79,7 @@ const MeetingDetail = (props) => {
<div className="l-content-wrap">
<div className="p-article">
<div className="p-article-wrap position-relative" style={{ minHeight:'700px'}}>
<div className="p-article-wrap" style={{ minHeight:'700px'}}>
{
!loaded &&
<CircularProgress className="css-loader"/>

2
backend/resources/js/admin/meeting/edit.jsx
ファイルの表示

@ -212,7 +212,7 @@ const MeetingEdit = (props) => {
<div className="l-content-wrap">
<div className="p-article">
<div className="p-article-wrap position-relative" style={{ minHeight:'500px'}}>
<div className="p-article-wrap" style={{ minHeight:'500px'}}>
{
!loaded &&
<CircularProgress className="css-loader"/>

7
backend/resources/js/admin/meeting/index.jsx
ファイルの表示

@ -17,6 +17,8 @@ const Meeting = (props) => {
const [loaded, setLoaded] = useState(false);
const [meeting_list, setMeetingList ] = useState([]);
const [fetch_meeting_list, setFetchMeetingList ] = useState([]);
const [_400error, set400Error] = useState('');
const [_422errors, set422errors] = useState({keyword:''});
const [_success, setSuccess] = useState(props.history.location.state);
@ -131,7 +133,7 @@ const Meeting = (props) => {
</form>
</div>
<div className="search-wrap">
<div className="search-content position-relative">
<div className="search-content">
{
!loaded &&
<CircularProgress className="css-loader"/>
@ -193,7 +195,8 @@ const Meeting = (props) => {
}
</div>
</div>
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
</section>
</div>
</div>

6
backend/resources/js/admin/parent/detail.jsx
ファイルの表示

@ -98,7 +98,7 @@ const ParentDetail = (props) => {
<div className="l-content-wrap">
<section className="profile-container">
<div className="profile-wrap position-relative" style={{ minHeight:'500px'}}>
<div className="profile-wrap" style={{ minHeight:'500px'}}>
{
!loaded &&
<CircularProgress className="css-loader"/>
@ -125,8 +125,8 @@ const ParentDetail = (props) => {
</span>
}
</div>
<p className="profile-name ft-18 ft-xs-16">{parent.company}</p>
<div className="profile-info ft-18 ft-xs-16">
<p className="profile-name">{parent.company}</p>
<div className="profile-info">
<div className="profile-info__item">
<a href={`mailto:${parent.email}`}>
<p className="profile-info__icon">

2
backend/resources/js/admin/parent/index.jsx
ファイルの表示

@ -99,7 +99,7 @@ const Parent = (props) => {
</div>
<div className="search-wrap">
<div className="search-content position-relative">
<div className="search-content">
{
!loaded &&
<CircularProgress className="css-loader"/>

8
backend/resources/js/admin/parent/register.jsx
ファイルの表示

@ -69,12 +69,8 @@ const ParentRegister = () => {
<span className={`ft-18 ft-xs-16 font-weight-bold ${!submit && 'text-black'}`}>親追加</span>
</LoadingButton>
</div>
{
_400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert>
}
{
_success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert>
}
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
</form>
</div>

37
backend/resources/js/child/meeting/detail.jsx
ファイルの表示

@ -18,9 +18,9 @@ const MeetingDetail = (props) => {
const [thumbnail, setThumbnail] = useState('');
const [_approval_register, setApprovalRegister] = useState(false);
const [showPdf, setShowPdf] = useState(false);
const [showMemo, setShowMemo] = useState(false);
const [showConfirm, setShowConfirm] = useState(false);
const [show_pdf_modal, setShowPDFMoal] = useState(false);
const [show_memo_modal, setShowMemoModal] = useState(false);
const [show_confirm_modal, setShowConfirmMoal] = useState(false);
const [submit, setSubmit] = useState(false);
const [_400error, set400Error] = useState('');
const [_success, setSuccess] = useState('');
@ -41,6 +41,9 @@ const MeetingDetail = (props) => {
setApprovalRegister(true);
}
}
else {
set400error("失敗しました。");
}
})
},[]);
@ -53,7 +56,7 @@ const MeetingDetail = (props) => {
axios.post('/api/children/meeting/approvals/registerApproval', formdata)
.then(response => {
setSubmit(false);
setShowConfirm(false);
setShowConfirmMoal(false);
setNotice(response.data.notice);
switch(response.data.status_code){
case 200: {
@ -78,7 +81,7 @@ const MeetingDetail = (props) => {
loaded && _approval_register == false &&
<div className="p-consent-btn">
<button className="btn-default btn-yellow btn-consent btn-shadow btn-r8 btn-h42"
onClick={e=>setShowConfirm(true)}>
onClick={e=>setShowConfirmMoal(true)}>
<span>承認</span>
</button>
</div>
@ -153,7 +156,7 @@ const MeetingDetail = (props) => {
<span>PDFを確認する</span>
</a>
:<a className="btn-default btn-pdf btn-r8 btn-h50 btn-yellow"
onClick={()=>setShowPdf(true)}>
onClick={()=>setShowPDFMoal(true)}>
<span>PDFを確認する</span>
</a>
}
@ -165,7 +168,7 @@ const MeetingDetail = (props) => {
<span>メモを確認する</span>
</a>
:<a className="btn-default btn-pdf btn-r8 btn-h50 btn-yellow"
onClick={()=>setShowMemo(true)}>
onClick={()=>setShowMemoModal(true)}>
<span>メモを確認する</span>
</a>
}
@ -177,14 +180,14 @@ const MeetingDetail = (props) => {
</div>
</article>
<ModalMemo
show={showMemo}
show={show_memo_modal}
title={"メモ"}
content={meeting?.memo}
handleClose={()=>setShowMemo(false)} />
handleClose={()=>setShowMemoModal(false)} />
<ModalPdf
show={showPdf}
show={show_pdf_modal}
pdfPath={meeting.pdf ?? '/pdf/test.pdf'}
handleClose={()=>setShowPdf(false)} />
handleClose={()=>setShowPDFMoal(false)} />
</div>
</div>
</div>
@ -192,17 +195,13 @@ const MeetingDetail = (props) => {
)
}
<ModalConfirm
show={showConfirm}
show={show_confirm_modal}
message={"一度承知したら元に戻せません。\nよろしいでしょうか。"}
handleClose={()=>setShowConfirm(false)}
handleClose={()=>setShowConfirmMoal(false)}
handleAccept={handleApprovalRegister}
loading={submit}/>
{
_400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert>
}
{
_success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert>
}
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
</div>
</div>
)

12
backend/resources/js/child/meeting/index.jsx
ファイルの表示

@ -23,6 +23,7 @@ const Meeting = () => {
const [fetch_meeting_list_non_approval, setFetchMettingListNonApproval] = useState([]);
const [fetch_meeting_list_approval, setFetchMettingListApproval] = useState([]);
const [_success, setSuccess] = useState('');
const [_400error, set400Error] = useState('');
useEffect(()=>{
if(localStorage.getItem("from_login")){
@ -52,6 +53,9 @@ const Meeting = () => {
setFetchMettingListNonApproval(response.data.params.slice(0, INFINITE));
else setFetchMettingListNonApproval(response.data.params.slice(0, len));
}
else {
set400error("失敗しました。");
}
})
axios.get('/api/children/meetings/listOfApprovalOfChild', {params:{child_id: child_id}})
@ -65,6 +69,9 @@ const Meeting = () => {
setFetchMettingListApproval(response.data.params.slice(0, INFINITE));
else setFetchMettingListApproval(response.data.params.slice(0, len));
}
else {
set400error("失敗しました。");
}
})
},[]
);
@ -232,9 +239,8 @@ const Meeting = () => {
}
</section>
</div>
{
_success && <Alert type="success">{_success}</Alert>
}
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
</div>
)

74
backend/resources/js/child/parent/detail.jsx
ファイルの表示

@ -10,6 +10,9 @@ const ParentDetail = (props) => {
const [loaded, setLoaded] = useState(false);
const [parent, setParent] = useState({image:'', email:'', profile:'', tel:'', company:''});
const [_400error, set400Error] = useState('');
const [_success, setSuccess] = useState('');
useEffect(
() => {
setLoaded(false);
@ -20,6 +23,9 @@ const ParentDetail = (props) => {
if(response.data.status_code==200){
setParent(response.data.params);
}
else {
set400error("失敗しました。");
}
})
},[]
);
@ -36,42 +42,44 @@ const ParentDetail = (props) => {
<div className="l-content-wrap">
<section className="profile-container">
{
!loaded &&
<CircularProgress className="css-loader"/>
}
{
loaded &&
<div className="profile-wrap">
{
!loaded &&
<CircularProgress className="css-loader"/>
}
{
loaded &&
<div className="profile-content">
<div className="profile-thumb">
<img src={parent.image} className="profile-image" alt="parent-image" />
</div>
<p className="profile-name ft-xs-16">{parent.company}</p>
<div className="profile-info ft-xs-17">
<div className="profile-info__item">
<a href={`mailto:${parent.email}`}>
<p className="profile-info__icon">
<img src="/assets/img/icon/mail.svg" alt="メール"/>
</p>
<p className="txt">{parent.email}</p>
</a>
</div>
<div className="profile-info__item">
<a href={`tel:${parent.tel}`}>
<p className="profile-info__icon">
<img src="/assets/img/icon/phone.svg" alt="電話" />
</p>
<p className="txt">{parent.tel}</p>
</a>
</div>
<div className="profile-info__item txt-long">
<p className="txt">{parent.profile}</p>
</div>
</div>
<div className="profile-content">
<div className="profile-thumb">
<img src={parent.image} className="profile-image" alt="parent-image" />
</div>
<p className="profile-name">{parent.company}</p>
<div className="profile-info">
<div className="profile-info__item">
<a href={`mailto:${parent.email}`}>
<p className="profile-info__icon">
<img src="/assets/img/icon/mail.svg" alt="メール"/>
</p>
<p className="txt">{parent.email}</p>
</a>
</div>
}
<div className="profile-info__item">
<a href={`tel:${parent.tel}`}>
<p className="profile-info__icon">
<img src="/assets/img/icon/phone.svg" alt="電話" />
</p>
<p className="txt">{parent.tel}</p>
</a>
</div>
<div className="profile-info__item txt-long">
<p className="txt">{parent.profile}</p>
</div>
</div>
</div>
</div>
}
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
</section>
</div>
</div>

9
backend/resources/js/child/parent/index.jsx
ファイルの表示

@ -16,7 +16,9 @@ const Parent = () => {
const [parent_list, setParentList] = useState([]);
const [fetch_parent_list, setFetchParentList] = useState([]);
const [loaded, setLoaded] = useState(false);
const [_400error, set400Error] = useState('');
const [_success, setSuccess] = useState('');
useEffect(() => {
setLoaded(false);
@ -32,6 +34,9 @@ const Parent = () => {
setFetchParentList(response.data.params.slice(0, INFINITE));
else setFetchParentList(response.data.params.slice(0, len));
}
else {
set400error("失敗しました。");
}
})
}, []);
@ -104,6 +109,8 @@ const Parent = () => {
</div>
</section>
}
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
</div>
</div>

59
backend/resources/js/child/profile/edit.jsx
ファイルの表示

@ -89,7 +89,12 @@ const ProfileEdit = () => {
setSubmit(false);
setNotice(response.data.notice);
switch(response.data.status_code){
case 200: setSuccess(response.data.success_messages); break;
case 200: {
history.push({
pathname: "/c-account/profile",
state: response.data.success_messages});
break;
}
case 400: set400Error(response.data.error_messages); break;
case 422: set422Errors(response.data.error_messages); break;
}
@ -109,14 +114,16 @@ const ProfileEdit = () => {
</div>
<div className="l-content-wrap">
<section className="profile-container">
{
!loaded &&
<CircularProgress className="css-loader"/>
}
<div className="profile-wrap">
<div className="profile-content">
<form onSubmit={handleSubmit} noValidate>
<section className="edit-container">
{
!loaded &&
<CircularProgress className="css-loader"/>
}
{
loaded &&
<div className="edit-wrap">
<div className="edit-content">
<form onSubmit={handleSubmit} className="edit-form">
<div className="edit-set">
<label htmlFor="first_name" className="control-label ft-12"> 姓 </label>
@ -184,32 +191,20 @@ const ProfileEdit = () => {
}
</div>
<div className="mt-5">
<LoadingButton type="submit"
loading={submit}
fullWidth
className="btn-edit btn-default btn-h75 bg-yellow rounded-20">
<span className={`ft-16 font-weight-bold ${!submit && 'text-black'}`}>
プロフィールを更新
</span>
</LoadingButton>
</div>
{
_400error &&
<Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert>
}
{
_success &&
<Alert type="success"
hide={()=>
history.push({
pathname: `/c-account/profile`,
state: {}
})}>{_success}</Alert>
}
<LoadingButton type="submit"
loading={submit}
fullWidth
className="btn-edit btn-default btn-h75 bg-yellow rounded-20">
<span className={`ft-16 font-weight-bold ${!submit && 'text-black'}`}>
プロフィールを更新
</span>
</LoadingButton>
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
</form>
</div>
</div>
}
</section>
</div>
</div>

8
backend/resources/js/child/profile/index.jsx
ファイルの表示

@ -8,7 +8,7 @@ import PhotoCameraOutlinedIcon from '@mui/icons-material/PhotoCameraOutlined';
import Alert from '../../component/alert';
import Notification from '../notification';
const Profile = () => {
const Profile = (props) => {
const [notice, setNotice] = useState(localStorage.getItem('notice'));
@ -17,7 +17,7 @@ const Profile = () => {
const [loaded, setLoaded] = useState(false);
const [_400error, set400Error] = useState('');
const [_422errors, set422Errors] = useState({ image: '' });
const [_success, setSuccess] = useState('');
const [_success, setSuccess] = useState(props.history.location.state);
useEffect(() => {
@ -106,8 +106,8 @@ const Profile = () => {
</span>
}
</div>
<p className="profile-name ft-xs-16">{`${profile.first_name} ${profile.last_name}`}</p>
<div className="profile-info ft-xs-17">
<p className="profile-name">{`${profile.first_name} ${profile.last_name}`}</p>
<div className="profile-info">
<div className="profile-info__item">
<p className="profile-info__icon">
<img src="/assets/img/icon/person-pin.svg" alt="person"/>

42
backend/resources/js/child/profile/password_edit.jsx
ファイルの表示

@ -40,7 +40,12 @@ const ProfilePasswordEdit = () => {
setSubmit(false);
setNotice(response.data.notice);
switch(response.data.status_code){
case 200: setSuccess(response.data.success_messages); break;
case 200: {
history.push({
pathname: "/c-account/profile",
state: response.data.success_messages});
break;
}
case 400: set400Error(response.data.error_messages); break;
case 422: set422Errors(response.data.error_messages); break;
}
@ -60,10 +65,10 @@ const ProfilePasswordEdit = () => {
</div>
<div className="l-content-wrap">
<section className="profile-container">
<div className="profile-wrap">
<div className="profile-content">
<form onSubmit={handleSubmit} noValidate>
<section className="edit-container">
<div className="edit-wrap">
<div className="edit-content">
<form onSubmit={handleSubmit} className="edit-form">
<div className="edit-set">
<label htmlFor="password" className="control-label ft-14 ft-md-12">
@ -93,26 +98,13 @@ const ProfilePasswordEdit = () => {
}
</div>
<div className="mt-5">
<LoadingButton type="submit" fullWidth
loading = {submit}
className="btn-edit btn-default btn-h75 bg-yellow rounded-20">
<span className={`ft-16 font-weight-bold ${!submit && 'text-black'}`}>パスワードを更新</span>
</LoadingButton>
</div>
{
_400error &&
<Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert>
}
{
_success &&
<Alert type="success"
hide={()=>
history.push({
pathname: `/c-account/profile/`,
state: {}
})}>{_success}</Alert>
}
<LoadingButton type="submit" fullWidth
loading = {submit}
className="btn-edit btn-default btn-h75 bg-yellow rounded-20">
<span className={`ft-16 font-weight-bold ${!submit && 'text-black'}`}>パスワードを更新</span>
</LoadingButton>
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
</form>
</div>

4
backend/resources/js/parent/profile/index.jsx
ファイルの表示

@ -106,8 +106,8 @@ const Profile = (props) => {
</span>
}
</div>
<p className="profile-name ft-xs-16">{ profile.company }</p>
<div className="profile-info ft-xs-17">
<p className="profile-name">{ profile.company }</p>
<div className="profile-info">
<div className="profile-info__item">
<a href={`mailto:${profile.email}`}>
<p className="profile-info__icon">

8
backend/resources/sass/layouts/_main.scss vendored
ファイルの表示

@ -181,6 +181,14 @@ a{
-webkit-line-clamp: 2;
}
.profile-name, .profile-info{
font-size: 18px !important;
@include media-breakpoint-down(xs){
font-size: 16px !important;
}
}
/////////////////////////////////////////////////////////////////////////
@media screen and (min-width: 1068px){