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

add term checkbox register FE

このコミットが含まれているのは:
dragon1211 2021-12-30 00:09:45 -08:00
親 8d25fc9115
コミット 99d32976eb
6個のファイルの変更、69行の追加、0行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

@ -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;

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

@ -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:

7
backend/resources/js/child/auth/register/index.jsx
ファイルの表示

@ -200,6 +200,13 @@ const ChildSignUp = (props) => {
}
</div>
<div className="edit-set text-center mt-5">
<label htmlFor="remember_me">
<input id="remember_me" name="remember" type="checkbox" value="remember"/>
<span className="lbl padding-16"><a href="/terms" target='_blank' className='term-link'>規約</a>に同意する</span>
</label>
</div>
<LoadingButton type="submit" fullWidth
className="btn-edit btn-default btn-h75 bg-yellow rounded-20"
loading={submit}>

7
backend/resources/js/parent/auth/register/index.jsx
ファイルの表示

@ -174,6 +174,13 @@ const ParentSignUp = (props) => {
}
</div>
<div className="edit-set text-center mt-5">
<label htmlFor="remember_me">
<input id="remember_me" name="remember" type="checkbox" value="remember"/>
<span className="lbl padding-16"><a href="/terms" target='_blank' className='term-link'>規約</a>に同意する</span>
</label>
</div>
<LoadingButton type="submit" fullWidth
className="btn-edit btn-default btn-h75 bg-yellow rounded-20"
loading={submit}>

2
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 = () => {

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

@ -209,6 +209,12 @@ a{
}
.term-link{
color: #002bff;
text-decoration: underline !important;
}
/////////////////////////////////////////////////////////////////////////
@media screen and (min-width: 1068px){