From e0bdd08d6410f12c71de9280ab5766f5656fe716 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Mon, 20 Dec 2021 18:26:35 -0800 Subject: [PATCH 1/3] fixed register checkRegisterMain in FE --- backend/public/js/app.js | 27 ++++++++++++------- .../resources/js/child/auth/login/index.jsx | 8 +++--- .../js/child/auth/register/index.jsx | 2 +- .../resources/js/parent/auth/login/index.jsx | 4 +-- .../js/parent/auth/register/index.jsx | 2 +- 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index d5a0c005..8a1b3857 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) { @@ -45646,6 +45652,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 +45883,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 +45907,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 +46281,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 +46430,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 +51637,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 && set400Error(null)}>{_400error} - } + { _400error && set400Error(null)}>{_400error} } diff --git a/backend/resources/js/child/auth/register/index.jsx b/backend/resources/js/child/auth/register/index.jsx index 634d4f38..7a20682b 100644 --- a/backend/resources/js/child/auth/register/index.jsx +++ b/backend/resources/js/child/auth/register/index.jsx @@ -38,7 +38,7 @@ const ChildSignUp = (props) => { .then(response=>{ switch(response.data.status_code){ case 200: setLoaded(true); break; - case 400: history.push({pathname: '/c-account/register/error/'+props.match.params.token, state: response.data.error_messages}); break; + case 400: history.push({pathname: '/c-account/login', state: ''}); break; }; }) },[]) diff --git a/backend/resources/js/parent/auth/login/index.jsx b/backend/resources/js/parent/auth/login/index.jsx index 9415a4eb..0cce135a 100644 --- a/backend/resources/js/parent/auth/login/index.jsx +++ b/backend/resources/js/parent/auth/login/index.jsx @@ -5,7 +5,7 @@ import axios from 'axios'; import Alert from '../../../component/alert'; -const ParentLogin = () => { +const ParentLogin = (props) => { const [submit, setSubmit] = useState(false); @@ -13,7 +13,7 @@ const ParentLogin = () => { const [password, setPassword] = useState(''); const [_422errors, set422Errors] = useState({email: '', password: ''}); - const [_400error, set400Error] = useState(''); + const [_400error, set400Error] = useState(props.history.location.state); const handleSubmit = (e) => { diff --git a/backend/resources/js/parent/auth/register/index.jsx b/backend/resources/js/parent/auth/register/index.jsx index 34707ba6..b09b113e 100644 --- a/backend/resources/js/parent/auth/register/index.jsx +++ b/backend/resources/js/parent/auth/register/index.jsx @@ -37,7 +37,7 @@ const ParentSignUp = (props) => { .then(response=>{ switch(response.data.status_code){ case 200: setLoaded(true); break; - case 400: history.push({pathname: '/p-account/register/error/'+props.match.params.token, state: response.data.error_messages}); break; + case 400: history.push({pathname: '/p-account/login', state: ''}); break; }; }) },[]) From d20c5e5c08e234e4e5a62571834dcaebe25357c7 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Mon, 20 Dec 2021 19:27:44 -0800 Subject: [PATCH 2/3] add object-fit:contain in image-upload --- backend/public/css/app.css | 25 +++---------------- backend/resources/sass/layouts/_main.scss | 3 --- .../sass/scss/object/project/_article.scss | 18 ++----------- 3 files changed, 5 insertions(+), 41 deletions(-) diff --git a/backend/public/css/app.css b/backend/public/css/app.css index e33ce66b..b0fd1704 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%; diff --git a/backend/resources/sass/layouts/_main.scss b/backend/resources/sass/layouts/_main.scss index e064859b..ec1b6337 100644 --- a/backend/resources/sass/layouts/_main.scss +++ b/backend/resources/sass/layouts/_main.scss @@ -75,9 +75,6 @@ a{ } } -.p-file-image figure.image-upload:after{ - display: none !important; -} .avatar-img, .father-img{ width: 100%; diff --git a/backend/resources/sass/scss/object/project/_article.scss b/backend/resources/sass/scss/object/project/_article.scss index 6b53a532..0b20a09c 100644 --- a/backend/resources/sass/scss/object/project/_article.scss +++ b/backend/resources/sass/scss/object/project/_article.scss @@ -191,22 +191,8 @@ categories: [project] } &.image-upload{ cursor: pointer; - &: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 rgb(0 0 0 / 30%); - @include sp{ - width: 18px; - height: 18px; - border-radius: 9px; - } + img{ + object-fit: contain; } } From e7eda01905d0cbdfaad2eda34c70789adf112d06 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Mon, 20 Dec 2021 19:44:42 -0800 Subject: [PATCH 3/3] add object-fit:contain in pdf-preview. --- backend/public/css/app.css | 13 ++++++++ backend/public/js/app.js | 10 ++++--- .../resources/js/component/preview_pdf.jsx | 5 ++-- backend/resources/sass/layouts/_main.scss | 30 ++++++++++++++++++- 4 files changed, 50 insertions(+), 8 deletions(-) diff --git a/backend/public/css/app.css b/backend/public/css/app.css index b0fd1704..0fa97e94 100644 --- a/backend/public/css/app.css +++ b/backend/public/css/app.css @@ -17570,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 { @@ -17617,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 8a1b3857..9ff3d991 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -44561,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 }) }) }); diff --git a/backend/resources/js/component/preview_pdf.jsx b/backend/resources/js/component/preview_pdf.jsx index ae886698..9a69319e 100644 --- a/backend/resources/js/component/preview_pdf.jsx +++ b/backend/resources/js/component/preview_pdf.jsx @@ -18,16 +18,15 @@ const PreviewPDF = ({pdf_url}) => { return ( -
+
{ pdf_url && }> } renderMode='svg' + height={height-3} /> } diff --git a/backend/resources/sass/layouts/_main.scss b/backend/resources/sass/layouts/_main.scss index ec1b6337..f58ad77a 100644 --- a/backend/resources/sass/layouts/_main.scss +++ b/backend/resources/sass/layouts/_main.scss @@ -281,8 +281,23 @@ a{ .react-pdf__Page__svg{ margin: auto; + width: 100% !important; + height: 100% !important; + svg{ + width: 100%; + height: 100%; + object-fit: contain; + } } + + + + + + + + .mobile__pdf__container #viewerContainer { #viewer{ height: calc( 100% - 30px ) !important; @@ -295,6 +310,14 @@ a{ } } + + + + + + + + .rpv-page-navigation__current-page-input{ width: 50px !important; .rpv-core__textbox{ @@ -331,4 +354,9 @@ a{ .rpv-search__popover-counter--ltr{ padding-right: 10px !important; } -} \ No newline at end of file +} + + +.object-contain{ + object-fit: contain; +}