diff --git a/backend/public/assets/img/icon/icon-copy.svg b/backend/public/assets/img/icon/icon-copy.svg
new file mode 100644
index 00000000..3c5f3a83
--- /dev/null
+++ b/backend/public/assets/img/icon/icon-copy.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/backend/public/assets/img/icon/icon-line.svg b/backend/public/assets/img/icon/icon-line.svg
new file mode 100644
index 00000000..f74a94f2
--- /dev/null
+++ b/backend/public/assets/img/icon/icon-line.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/backend/public/js/index.js b/backend/public/js/index.js
index 665f6b05..1e541220 100644
--- a/backend/public/js/index.js
+++ b/backend/public/js/index.js
@@ -34948,13 +34948,13 @@ function ModalEditMemo(_ref) {
borderBottom: '1px solid rgb(239 236 236)'
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", {
- className: "ft-18 text-center font-weight-bold",
+ className: "ft-16 text-center font-weight-bold",
children: "\u30E1\u30E2"
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_mui_material__WEBPACK_IMPORTED_MODULE_5__["default"], {
sx: {
- p: '15px',
- pb: '15px'
+ p: '10px',
+ pb: '10px'
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_mui_material__WEBPACK_IMPORTED_MODULE_5__["default"], {
id: "alert-dialog-slide-description",
@@ -34967,7 +34967,8 @@ function ModalEditMemo(_ref) {
height: '300px',
borderRadius: 5,
background: '#F0F0F0',
- padding: '12px'
+ padding: '12px',
+ fontSize: '15px'
}
})
})
@@ -35028,13 +35029,13 @@ function ModalMemo(_ref) {
borderBottom: '1px solid rgb(239 236 236)'
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("span", {
- className: "ft-18 text-center font-weight-bold",
+ className: "ft-16 text-center font-weight-bold",
children: "\u30E1\u30E2"
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_mui_material__WEBPACK_IMPORTED_MODULE_5__["default"], {
sx: {
- p: '15px',
- pb: '15px'
+ p: '10px',
+ pb: '10px'
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_mui_material__WEBPACK_IMPORTED_MODULE_5__["default"], {
id: "alert-dialog-slide-description",
@@ -35046,7 +35047,7 @@ function ModalMemo(_ref) {
bgcolor: '#F0F0F0',
p: '15px'
},
- className: "ft-16 text-black",
+ className: "ft-15 text-black",
children: content ? content : '未入力'
})
})
@@ -38091,12 +38092,17 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
/* harmony export */ });
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js");
-/* harmony import */ var _material_ui_lab__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.js");
+/* harmony import */ var _material_ui_lab__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.js");
/* harmony import */ var _component_alert__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../component/alert */ "./resources/js/component/alert.jsx");
/* harmony import */ var _component_notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../component/notification */ "./resources/js/component/notification.jsx");
/* harmony import */ var _component_page_loader__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../component/page_loader */ "./resources/js/component/page_loader.jsx");
/* harmony import */ var copy_to_clipboard__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! copy-to-clipboard */ "./node_modules/copy-to-clipboard/index.js");
/* harmony import */ var copy_to_clipboard__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(copy_to_clipboard__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _mui_material__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @mui/material */ "./node_modules/@mui/material/Slide/Slide.js");
+/* harmony import */ var _mui_material__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @mui/material */ "./node_modules/@mui/material/Dialog/Dialog.js");
+/* harmony import */ var _mui_material__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @mui/material */ "./node_modules/@mui/material/DialogTitle/DialogTitle.js");
+/* harmony import */ var _mui_material__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @mui/material */ "./node_modules/@mui/material/Box/Box.js");
+/* harmony import */ var _mui_material__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @mui/material */ "./node_modules/@mui/material/Typography/Typography.js");
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -38110,6 +38116,11 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -38119,6 +38130,68 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var Transition = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.forwardRef(function Transition(props, ref) {
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_mui_material__WEBPACK_IMPORTED_MODULE_6__["default"], _objectSpread({
+ direction: "up",
+ ref: ref
+ }, props));
+});
+
+var LineModal = function LineModal(_ref) {
+ var show = _ref.show,
+ handleClose = _ref.handleClose;
+ var inviteurl = '「KIKI」の招待が届いています。' + '\n' + 'まずは以下より仮登録を行ってください。' + '\n' + '※スマホ本体を最新の状態にアップデートしてからURLをクリックしてください。' + '\n\n' + document.getElementById('inviteurl').value + '\n\n' + '▼公式サイトはこちら' + '\n' + 'https://kikikan.jp';
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_mui_material__WEBPACK_IMPORTED_MODULE_7__["default"], {
+ open: show,
+ TransitionComponent: Transition,
+ keepMounted: true,
+ "aria-describedby": "alert-dialog-slide-description",
+ onClose: handleClose,
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_mui_material__WEBPACK_IMPORTED_MODULE_8__["default"], {
+ sx: {
+ padding: '20px 10px',
+ textAlign: 'center',
+ borderBottom: '1px solid rgb(239 236 236)'
+ },
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
+ className: "ft-16 text-center font-weight-bold",
+ children: "\u30E1\u30C3\u30BB\u30FC\u30B8"
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_mui_material__WEBPACK_IMPORTED_MODULE_9__["default"], {
+ sx: {
+ p: '15px',
+ pb: '15px'
+ },
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_mui_material__WEBPACK_IMPORTED_MODULE_10__["default"], {
+ component: "p",
+ sx: {
+ minHeight: '175px',
+ whiteSpace: 'pre-wrap',
+ bgcolor: '#F0F0F0',
+ p: '10px'
+ },
+ className: "ft-14 text-black",
+ children: inviteurl
+ })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_mui_material__WEBPACK_IMPORTED_MODULE_9__["default"], {
+ sx: {
+ borderTopColor: '1px solid rgb(239 236 236)'
+ },
+ children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("ul", {
+ className: "invite-btn-bar",
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("li", {
+ className: "copy-btn",
+ children: "\u30B3\u30D4\u30FC"
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("li", {
+ className: "line-btn",
+ children: "\u9001\u4FE1"
+ })]
+ })
+ })]
+ });
+};
+
var ParentChildAdd = function ParentChildAdd() {
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(localStorage.getItem('notice')),
_useState2 = _slicedToArray(_useState, 2),
@@ -38169,6 +38242,11 @@ var ParentChildAdd = function ParentChildAdd() {
_copyFlag = _useState18[0],
setCopyFlag = _useState18[1];
+ var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
+ _useState20 = _slicedToArray(_useState19, 2),
+ show_lineModal = _useState20[0],
+ setShowLineModal = _useState20[1];
+
var isMountedRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(true);
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
isMountedRef.current = false;
@@ -38236,7 +38314,9 @@ var ParentChildAdd = function ParentChildAdd() {
switch (response.data.status_code) {
case 200:
{
- if (type == "invite") setSuccess('招待用URLをコピーしました。');else if (type == 'line') sendLineMsg();
+ // if(type == "invite") setSuccess('招待用URLをコピーしました。');
+ // else if(type=='line') sendLineMsg();
+ setShowLineModal(true);
break;
}
@@ -38292,9 +38372,9 @@ var ParentChildAdd = function ParentChildAdd() {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_notification__WEBPACK_IMPORTED_MODULE_2__["default"], {
notice: notice
})]
- }), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_page_loader__WEBPACK_IMPORTED_MODULE_3__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
+ }), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_page_loader__WEBPACK_IMPORTED_MODULE_3__["default"], {}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "l-content-wrap",
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("section", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("section", {
className: "edit-container",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "edit-wrap",
@@ -38333,7 +38413,7 @@ var ParentChildAdd = function ParentChildAdd() {
className: "l-alert__text--error ft-16 ft-md-14",
children: _422errors.identity
})]
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_6__["default"], {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_11__["default"], {
type: "submit",
fullWidth: true,
loading: submit,
@@ -38377,7 +38457,12 @@ var ParentChildAdd = function ParentChildAdd() {
})]
})
})
- })
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(LineModal, {
+ show: show_lineModal,
+ handleClose: function handleClose() {
+ return setShowLineModal(false);
+ }
+ })]
})]
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_1__["default"], {
type: "success",
@@ -40699,7 +40784,7 @@ var ParentMeetingDetail = function ParentMeetingDetail() {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", {
children: "\u3053\u306E\u6848\u4EF6\u306EURL\u3092\u30B3\u30D4\u30FC\u3059\u308B"
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("img", {
- src: "/assets/img/icon/icon-copy.png",
+ src: "/assets/img/icon/icon-copy.svg",
alt: "kiki"
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("ul", {
diff --git a/backend/resources/js/component/modal_edit_memo.jsx b/backend/resources/js/component/modal_edit_memo.jsx
index 5fe28509..9a96708e 100644
--- a/backend/resources/js/component/modal_edit_memo.jsx
+++ b/backend/resources/js/component/modal_edit_memo.jsx
@@ -29,11 +29,11 @@ export default function ModalEditMemo({ show, content, handleClose, handleUpdate
onClose={handleClose}
>
- メモ
+ メモ
-
+
-
diff --git a/backend/resources/js/component/modal_memo.jsx b/backend/resources/js/component/modal_memo.jsx
index 7aeccdbb..eea38896 100644
--- a/backend/resources/js/component/modal_memo.jsx
+++ b/backend/resources/js/component/modal_memo.jsx
@@ -23,11 +23,11 @@ export default function ModalMemo({ show, content, handleClose}){
onClose={handleClose}
>
- メモ
+ メモ
-
+
-
+
{content ? content : '未入力'}
diff --git a/backend/resources/js/parent/child/add.jsx b/backend/resources/js/parent/child/add.jsx
index b5721c5a..b947e535 100644
--- a/backend/resources/js/parent/child/add.jsx
+++ b/backend/resources/js/parent/child/add.jsx
@@ -4,6 +4,53 @@ import Alert from '../../component/alert';
import Notification from '../../component/notification';
import PageLoader from '../../component/page_loader';
import copy from 'copy-to-clipboard';
+import {
+ Box,
+ Dialog,
+ DialogTitle,
+ Slide,
+ Typography
+} from '@mui/material';
+
+const Transition = React.forwardRef(function Transition(props, ref) {
+ return ;
+});
+
+
+const LineModal = ({ show, handleClose }) => {
+
+ const inviteurl = '「KIKI」の招待が届いています。' + '\n' +
+ 'まずは以下より仮登録を行ってください。' + '\n' +
+ '※スマホ本体を最新の状態にアップデートしてからURLをクリックしてください。' + '\n\n' +
+ document.getElementById('inviteurl').value + '\n\n' +
+ '▼公式サイトはこちら' + '\n' +
+ 'https://kikikan.jp';
+
+ return (
+
+ )
+}
const ParentChildAdd = () => {
@@ -20,6 +67,8 @@ const ParentChildAdd = () => {
const [submit, setSubmit] = useState(false);
const [_copyFlag, setCopyFlag] = useState(false);
+ const [show_lineModal, setShowLineModal] = useState(false);
+
const isMountedRef = useRef(true);
useEffect(() => {
@@ -78,8 +127,9 @@ const ParentChildAdd = () => {
switch(response.data.status_code){
case 200: {
- if(type == "invite") setSuccess('招待用URLをコピーしました。');
- else if(type=='line') sendLineMsg();
+ // if(type == "invite") setSuccess('招待用URLをコピーしました。');
+ // else if(type=='line') sendLineMsg();
+ setShowLineModal(true);
break;
}
case 400: set400Error(response.data.error_messages); break;
@@ -178,6 +228,10 @@ const ParentChildAdd = () => {
+ setShowLineModal(false)}
+ />
{ _success && setSuccess('')}>{_success} }
diff --git a/backend/resources/js/parent/meeting/detail.jsx b/backend/resources/js/parent/meeting/detail.jsx
index 38e3b229..e7b46a4b 100644
--- a/backend/resources/js/parent/meeting/detail.jsx
+++ b/backend/resources/js/parent/meeting/detail.jsx
@@ -239,7 +239,7 @@ const ParentMeetingDetail = () => {