From 99d32976eb0d0d44acf341e461cc7c85595ac2b1 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Thu, 30 Dec 2021 00:09:45 -0800 Subject: [PATCH] add term checkbox register FE --- backend/public/css/app.css | 5 +++ backend/public/js/app.js | 42 +++++++++++++++++++ .../js/child/auth/register/index.jsx | 7 ++++ .../js/parent/auth/register/index.jsx | 7 ++++ backend/resources/js/parent/meeting/index.jsx | 2 + backend/resources/sass/layouts/_main.scss | 6 +++ 6 files changed, 69 insertions(+) diff --git a/backend/public/css/app.css b/backend/public/css/app.css index 49f964aa..df9ea6f3 100644 --- a/backend/public/css/app.css +++ b/backend/public/css/app.css @@ -17569,6 +17569,11 @@ a { object-fit: contain; } +.term-link { + color: #002bff; + text-decoration: underline !important; +} + @media screen and (min-width: 1068px) { .p-meetingAdd-btn { width: 200px !important; diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 9a1791b3..de76a121 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -40414,6 +40414,25 @@ var ChildSignUp = function ChildSignUp(props) { className: "l-alert__text--error ft-16 ft-md-14", children: _422errors.company })] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", { + className: "edit-set text-center mt-5", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("label", { + htmlFor: "remember_me", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("input", { + id: "remember_me", + name: "remember", + type: "checkbox", + value: "remember" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)("span", { + className: "lbl padding-16", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("a", { + href: "/terms", + target: "_blank", + className: "term-link", + children: "\u898F\u7D04" + }), "\u306B\u540C\u610F\u3059\u308B"] + })] + }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_6__["default"], { type: "submit", fullWidth: true, @@ -47120,6 +47139,25 @@ var ParentSignUp = function ParentSignUp(props) { className: "l-alert__text--error ft-16 ft-md-14", children: _422errors.profile })] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { + className: "edit-set text-center mt-5", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("label", { + htmlFor: "remember_me", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("input", { + id: "remember_me", + name: "remember", + type: "checkbox", + value: "remember" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("span", { + className: "lbl padding-16", + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("a", { + href: "/terms", + target: "_blank", + className: "term-link", + children: "\u898F\u7D04" + }), "\u306B\u540C\u610F\u3059\u308B"] + })] + }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_7__["default"], { type: "submit", fullWidth: true, @@ -51218,6 +51256,8 @@ var Meeting = function Meeting(props) { var len = arr.length; if (len > INFINITE) setFetchMeetingListOfIncomplete(arr.slice(0, INFINITE));else setFetchMeetingListOfIncomplete(arr.slice(0, len)); } + })["catch"](function (err) { + return console.log(err); }); case 5: @@ -51253,6 +51293,8 @@ var Meeting = function Meeting(props) { var len = arr.length; if (len > INFINITE) setFetchMeetingListOfComplete(arr.slice(0, INFINITE));else setFetchMeetingListOfComplete(arr.slice(0, len)); } + })["catch"](function (err) { + return console.log(err); }); case 7: diff --git a/backend/resources/js/child/auth/register/index.jsx b/backend/resources/js/child/auth/register/index.jsx index 24d24a94..9b119f6d 100644 --- a/backend/resources/js/child/auth/register/index.jsx +++ b/backend/resources/js/child/auth/register/index.jsx @@ -200,6 +200,13 @@ const ChildSignUp = (props) => { } +
+ +
+ diff --git a/backend/resources/js/parent/auth/register/index.jsx b/backend/resources/js/parent/auth/register/index.jsx index 0560167c..8df5ab1a 100644 --- a/backend/resources/js/parent/auth/register/index.jsx +++ b/backend/resources/js/parent/auth/register/index.jsx @@ -174,6 +174,13 @@ const ParentSignUp = (props) => { } +
+ +
+ diff --git a/backend/resources/js/parent/meeting/index.jsx b/backend/resources/js/parent/meeting/index.jsx index a6d97e39..0a4e6272 100644 --- a/backend/resources/js/parent/meeting/index.jsx +++ b/backend/resources/js/parent/meeting/index.jsx @@ -72,6 +72,7 @@ const Meeting = (props) => { else setFetchMeetingListOfIncomplete(arr.slice(0, len)); } }) + .catch(err=>console.log(err)); await axios.get('/api/fathers/meetings/listOfCompleteOfFather', {params:{father_id: father_id}}) .then(response => { @@ -96,6 +97,7 @@ const Meeting = (props) => { else setFetchMeetingListOfComplete(arr.slice(0, len)); } }) + .catch(err=>console.log(err)); },[]); const fetchMoreListNonApproval = () => { diff --git a/backend/resources/sass/layouts/_main.scss b/backend/resources/sass/layouts/_main.scss index 7b775e5a..8ae06a96 100644 --- a/backend/resources/sass/layouts/_main.scss +++ b/backend/resources/sass/layouts/_main.scss @@ -209,6 +209,12 @@ a{ } +.term-link{ + color: #002bff; + text-decoration: underline !important; +} + + ///////////////////////////////////////////////////////////////////////// @media screen and (min-width: 1068px){