diff --git a/backend/public/css/app.css b/backend/public/css/app.css
index e33ce66b..0fa97e94 100644
--- a/backend/public/css/app.css
+++ b/backend/public/css/app.css
@@ -14590,24 +14590,9 @@ categories: [project]
.p-file-image figure.image-upload {
cursor: pointer;
}
-.p-file-image figure.image-upload:after {
- display: block;
- content: "";
- width: 22px;
- height: 22px;
- border-radius: 11px;
- background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 21 21'%3E%3Ccircle cx='10.5' cy='10.5' r='10.5' style='fill:%23d82828'/%3E%3Cline x1='4' y1='10.5' x2='17' y2='10.5' style='fill:none;stroke:%23fff'/%3E%3C/svg%3E");
- position: absolute;
- right: 2px;
- bottom: 2px;
- box-shadow: 0 0px 4px rgba(0, 0, 0, 0.3);
-}
-@media screen and (max-width: 1067px) {
- .p-file-image figure.image-upload:after {
- width: 18px;
- height: 18px;
- border-radius: 9px;
- }
+.p-file-image figure.image-upload img {
+ -o-object-fit: contain;
+ object-fit: contain;
}
/* #Modal
@@ -17375,10 +17360,6 @@ a {
border-bottom: none;
}
-.p-file-image figure.image-upload:after {
- display: none !important;
-}
-
.avatar-img, .father-img {
width: 100%;
height: 100%;
@@ -17589,6 +17570,14 @@ a {
}
.react-pdf__Page__svg {
margin: auto;
+ width: 100% !important;
+ height: 100% !important;
+}
+.react-pdf__Page__svg svg {
+ width: 100%;
+ height: 100%;
+ -o-object-fit: contain;
+ object-fit: contain;
}
.mobile__pdf__container #viewerContainer #viewer {
@@ -17636,6 +17625,11 @@ a {
padding-right: 10px !important;
}
+.object-contain {
+ -o-object-fit: contain;
+ object-fit: contain;
+}
+
.react-datepicker__month-container {
width: 250px;
font-size: 13px;
diff --git a/backend/public/js/app.js b/backend/public/js/app.js
index d5a0c005..9ff3d991 100644
--- a/backend/public/js/app.js
+++ b/backend/public/js/app.js
@@ -35917,6 +35917,7 @@ var ChildPasswordEdit = function ChildPasswordEdit(props) {
type: "password",
name: "password",
id: "password",
+ placeholder: "\u534A\u89D2\u82F1\u6570\u5B578\u6587\u5B57\u4EE5\u4E0A",
className: "input-default input-h60 ".concat(_422errors.password && "is-invalid c-input__target"),
value: password,
onChange: function onChange(e) {
@@ -38762,6 +38763,7 @@ var ParentPasswordEdit = function ParentPasswordEdit(props) {
type: "password",
name: "password",
id: "password",
+ placeholder: "\u534A\u89D2\u82F1\u6570\u5B578\u6587\u5B57\u4EE5\u4E0A",
className: "input-default input-h60 ".concat(_422errors.password && "is-invalid c-input__target"),
value: password,
onChange: function onChange(e) {
@@ -39556,6 +39558,7 @@ var ChildForgotPasswordReset = function ChildForgotPasswordReset(props) {
type: "password",
name: "password",
id: "password",
+ placeholder: "\u534A\u89D2\u82F1\u6570\u5B578\u6587\u5B57\u4EE5\u4E0A",
className: "input-default input-h60 input-w480 ".concat(_422errors.password && "is-invalid c-input__target"),
value: password,
onChange: function onChange(e) {
@@ -39791,7 +39794,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-var ChildLogin = function ChildLogin() {
+var ChildLogin = function ChildLogin(props) {
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState2 = _slicedToArray(_useState, 2),
submit = _useState2[0],
@@ -39815,7 +39818,7 @@ var ChildLogin = function ChildLogin() {
_422errors = _useState8[0],
set422Errors = _useState8[1];
- var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
+ var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.history.location.state),
_useState10 = _slicedToArray(_useState9, 2),
_400error = _useState10[0],
set400Error = _useState10[1];
@@ -40194,8 +40197,8 @@ var ChildSignUp = function ChildSignUp(props) {
case 400:
history.push({
- pathname: '/c-account/register/error/' + props.match.params.token,
- state: response.data.error_messages
+ pathname: '/c-account/login',
+ state: ''
});
break;
}
@@ -40381,6 +40384,7 @@ var ChildSignUp = function ChildSignUp(props) {
type: "email",
name: "email",
id: "email",
+ placeholder: "\u534A\u89D2\u82F1\u6570\u5B578\u6587\u5B57\u4EE5\u4E0A",
className: "input-default input-nameSei input-h60 input-w480 ".concat(_422errors.email && "is-invalid c-input__target"),
value: email,
onChange: function onChange(e) {
@@ -40400,6 +40404,7 @@ var ChildSignUp = function ChildSignUp(props) {
type: "password",
name: "password",
id: "password",
+ placeholder: "\u534A\u89D2\u82F1\u6570\u5B578\u6587\u5B57\u4EE5\u4E0A",
className: "input-default input-nameSei input-h60 input-w480 ".concat(_422errors.password && "is-invalid c-input__target"),
value: password,
onChange: function onChange(e) {
@@ -40433,7 +40438,7 @@ var ChildSignUp = function ChildSignUp(props) {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("label", {
htmlFor: "company",
className: "control-label",
- children: " \u6240\u5C48\u3057\u3066\u3044\u308B\u4F1A\u793E\u540D\u3092\u8A18\u8F09 "
+ children: " \u6240\u5C5E\u3057\u3066\u3044\u308B\u4F1A\u793E\u540D\u3092\u8A18\u8F09 "
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("input", {
type: "text",
name: "company",
@@ -42982,6 +42987,7 @@ var ProfilePasswordEdit = function ProfilePasswordEdit() {
type: "password",
name: "password",
id: "password",
+ placeholder: "\u534A\u89D2\u82F1\u6570\u5B578\u6587\u5B57\u4EE5\u4E0A",
className: "input-default input-h60 ".concat(_422errors.password && "is-invalid c-input__target"),
value: password,
onChange: function onChange(e) {
@@ -44555,17 +44561,19 @@ var PreviewPDF = function PreviewPDF(_ref) {
className: "p-file-for",
style: {
height: height,
- marginTop: '15px'
+ marginTop: '15px',
+ display: 'flex',
+ alignItems: 'center',
+ justifyContent: 'center'
},
children: pdf_url && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_pdf__WEBPACK_IMPORTED_MODULE_1__.Document, {
file: pdf_url,
loading: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.Fragment, {}),
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_pdf__WEBPACK_IMPORTED_MODULE_1__.Page, {
- className: 'position-relative',
pageNumber: 1,
- height: height - 2,
loading: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.Fragment, {}),
- renderMode: "svg"
+ renderMode: "svg",
+ height: height - 3
})
})
});
@@ -45646,6 +45654,7 @@ var ParentForgotPasswordReset = function ParentForgotPasswordReset(props) {
type: "password",
name: "password",
id: "password",
+ placeholder: "\u534A\u89D2\u82F1\u6570\u5B578\u6587\u5B57\u4EE5\u4E0A",
className: "input-default input-h60 input-w480 ".concat(_422errors.password && "is-invalid c-input__target"),
value: password,
onChange: function onChange(e) {
@@ -45876,7 +45885,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-var ParentLogin = function ParentLogin() {
+var ParentLogin = function ParentLogin(props) {
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState2 = _slicedToArray(_useState, 2),
submit = _useState2[0],
@@ -45900,7 +45909,7 @@ var ParentLogin = function ParentLogin() {
_422errors = _useState8[0],
set422Errors = _useState8[1];
- var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
+ var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.history.location.state),
_useState10 = _slicedToArray(_useState9, 2),
_400error = _useState10[0],
set400Error = _useState10[1];
@@ -46274,8 +46283,8 @@ var ParentSignUp = function ParentSignUp(props) {
case 400:
history.push({
- pathname: '/p-account/register/error/' + props.match.params.token,
- state: response.data.error_messages
+ pathname: '/p-account/login',
+ state: ''
});
break;
}
@@ -46423,6 +46432,7 @@ var ParentSignUp = function ParentSignUp(props) {
type: "password",
name: "password",
id: "password",
+ placeholder: "\u534A\u89D2\u82F1\u6570\u5B578\u6587\u5B57\u4EE5\u4E0A",
className: "input-default input-nameSei input-h60 input-w480 ".concat(_422errors.password && "is-invalid c-input__target"),
value: password,
onChange: function onChange(e) {
@@ -51629,6 +51639,7 @@ var ProfilePasswordEdit = function ProfilePasswordEdit() {
type: "password",
name: "password",
id: "password",
+ placeholder: "\u534A\u89D2\u82F1\u6570\u5B578\u6587\u5B57\u4EE5\u4E0A",
className: "input-default input-h60 ".concat(_422errors.password && "is-invalid c-input__target"),
value: password,
onChange: function onChange(e) {
diff --git a/backend/resources/js/child/auth/login/index.jsx b/backend/resources/js/child/auth/login/index.jsx
index 753c5f22..621e9e25 100644
--- a/backend/resources/js/child/auth/login/index.jsx
+++ b/backend/resources/js/child/auth/login/index.jsx
@@ -5,7 +5,7 @@ import axios from 'axios';
import Alert from '../../../component/alert';
-const ChildLogin = () => {
+const ChildLogin = (props) => {
const [submit, setSubmit] = useState(false);
@@ -13,7 +13,7 @@ const ChildLogin = () => {
const [password, setPassword] = useState('');
const [_422errors, set422Errors] = useState({tel: '', password: ''});
- const [_400error, set400Error] = useState(null);
+ const [_400error, set400Error] = useState(props.history.location.state);
const handleSubmit = (e) => {
@@ -92,9 +92,7 @@ const ChildLogin = () => {
パスワード紛失の方はコチラ
- {
- _400error &&