fixed css&size in p_account
このコミットが含まれているのは:
コミット
810b4a2c8b
|
@ -45930,6 +45930,8 @@ var ChildDetail = function ChildDetail(props) {
|
|||
|
||||
if (response.data.status_code == 200) {
|
||||
setChild(response.data.params);
|
||||
} else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
}, []); //-------------------------------------------------------------
|
||||
|
@ -46223,6 +46225,8 @@ var ChildEdit = function ChildEdit(props) {
|
|||
var _hire_at = moment__WEBPACK_IMPORTED_MODULE_5___default()((_response$data$params = response.data.params.father_relations) === null || _response$data$params === void 0 ? void 0 : _response$data$params.hire_at).toDate();
|
||||
|
||||
setHireAt(_hire_at);
|
||||
} else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
|
@ -46426,6 +46430,11 @@ var Child = function Child(props) {
|
|||
_success = _useState10[0],
|
||||
setSuccess = _useState10[1];
|
||||
|
||||
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
|
||||
_useState12 = _slicedToArray(_useState11, 2),
|
||||
_400error = _useState12[0],
|
||||
set400Error = _useState12[1];
|
||||
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
setLoaded(false);
|
||||
var father_id = document.getElementById('father_id').value;
|
||||
|
@ -46441,6 +46450,8 @@ var Child = function Child(props) {
|
|||
setChildrenList(response.data.params);
|
||||
var len = response.data.params.length;
|
||||
if (len > INFINITE) setFetchChildrenList(response.data.params.slice(0, INFINITE));else setFetchChildrenList(response.data.params.slice(0, len));
|
||||
} else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
|
@ -46550,6 +46561,12 @@ var Child = function Child(props) {
|
|||
return setSuccess('');
|
||||
},
|
||||
children: _success
|
||||
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, {
|
||||
type: "fail",
|
||||
hide: function hide() {
|
||||
return set400Error('');
|
||||
},
|
||||
children: _400error
|
||||
})]
|
||||
});
|
||||
};
|
||||
|
@ -46674,6 +46691,11 @@ var Favorite = function Favorite(props) {
|
|||
_success = _useState20[0],
|
||||
setSuccess = _useState20[1];
|
||||
|
||||
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''),
|
||||
_useState22 = _slicedToArray(_useState21, 2),
|
||||
_400error = _useState22[0],
|
||||
set400Error = _useState22[1];
|
||||
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
|
||||
setLoaded(loaded1 && loaded2);
|
||||
}, [loaded1, loaded2]);
|
||||
|
@ -46710,6 +46732,8 @@ var Favorite = function Favorite(props) {
|
|||
setMeetingListOfNonFavorite(arr);
|
||||
var len = arr.length;
|
||||
if (len > INFINITE) setFetchMeetingListOfNonFavorite(arr.slice(0, INFINITE));else setFetchMeetingListOfNonFavorite(arr.slice(0, len));
|
||||
} else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
axios__WEBPACK_IMPORTED_MODULE_2___default().get('/api/fathers/meetings/listOfFavoriteOfFather', {
|
||||
|
@ -46742,6 +46766,8 @@ var Favorite = function Favorite(props) {
|
|||
setMeetingListOfFavorite(arr);
|
||||
var len = arr.length;
|
||||
if (len > INFINITE) setFetchMeetingListOfFavorite(arr.slice(0, INFINITE));else setFetchMeetingListOfFavorite(arr.slice(0, len));
|
||||
} else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
|
@ -47088,6 +47114,12 @@ var Favorite = function Favorite(props) {
|
|||
return setSuccess('');
|
||||
},
|
||||
children: _success
|
||||
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_5__.default, {
|
||||
type: "fail",
|
||||
hide: function hide() {
|
||||
return set400Error('');
|
||||
},
|
||||
children: _400error
|
||||
})]
|
||||
});
|
||||
};
|
||||
|
@ -47274,6 +47306,8 @@ var MeetingAdd = function MeetingAdd(props) {
|
|||
}
|
||||
|
||||
setChildrenList(arr);
|
||||
} else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -47829,6 +47863,8 @@ var MeetingDetail = function MeetingDetail(props) {
|
|||
numerator: num
|
||||
}));
|
||||
setThumbnail((_response$data$params = response.data.params.meeting_image[0]) === null || _response$data$params === void 0 ? void 0 : _response$data$params.image);
|
||||
} else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
}, []); //-------------------------------------------------------------
|
||||
|
@ -48373,6 +48409,8 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
}
|
||||
|
||||
setChildrenList(arr);
|
||||
} else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
}, []); //-------------------------------------------------------------
|
||||
|
@ -48841,6 +48879,12 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
return set400Error('');
|
||||
},
|
||||
children: _400error
|
||||
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, {
|
||||
type: "success",
|
||||
hide: function hide() {
|
||||
return setSuccess('');
|
||||
},
|
||||
children: _success
|
||||
})]
|
||||
})
|
||||
})
|
||||
|
@ -48975,6 +49019,11 @@ var Meeting = function Meeting(props) {
|
|||
_success = _useState20[0],
|
||||
setSuccess = _useState20[1];
|
||||
|
||||
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''),
|
||||
_useState22 = _slicedToArray(_useState21, 2),
|
||||
_400error = _useState22[0],
|
||||
set400Error = _useState22[1];
|
||||
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
|
||||
if (localStorage.getItem("from_login")) {
|
||||
setSuccess("ログインに成功しました!");
|
||||
|
@ -49398,6 +49447,12 @@ var Meeting = function Meeting(props) {
|
|||
})]
|
||||
})]
|
||||
})
|
||||
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_5__.default, {
|
||||
type: "fail",
|
||||
hide: function hide() {
|
||||
return set400Error('');
|
||||
},
|
||||
children: _400error
|
||||
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_5__.default, {
|
||||
type: "success",
|
||||
hide: function hide() {
|
||||
|
@ -49612,6 +49667,8 @@ var ProfileEdit = function ProfileEdit() {
|
|||
setEmail((_response$data$params2 = response.data.params) === null || _response$data$params2 === void 0 ? void 0 : _response$data$params2.email);
|
||||
setTel((_response$data$params3 = response.data.params) === null || _response$data$params3 === void 0 ? void 0 : _response$data$params3.tel);
|
||||
setProfile((_response$data$params4 = response.data.params) === null || _response$data$params4 === void 0 ? void 0 : _response$data$params4.profile);
|
||||
} else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
|
@ -49894,6 +49951,8 @@ var Profile = function Profile(props) {
|
|||
if (response.data.status_code == 200) {
|
||||
setProfile(response.data.params);
|
||||
setImage(response.data.params.image);
|
||||
} else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
|
|
|
@ -30,6 +30,9 @@ const ChildDetail = (props) => {
|
|||
if(response.data.status_code==200){
|
||||
setChild(response.data.params);
|
||||
}
|
||||
else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
})
|
||||
},[]);
|
||||
|
||||
|
|
|
@ -36,6 +36,9 @@ const ChildEdit = (props) => {
|
|||
let hire_at = moment(response.data.params.father_relations?.hire_at).toDate();
|
||||
setHireAt(hire_at);
|
||||
}
|
||||
else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
})
|
||||
},[]);
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@ const Child = (props) => {
|
|||
const [fetch_children_list, setFetchChildrenList] = useState([]);
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
const [_success, setSuccess] = useState(props.history.location.state);
|
||||
const [_400error, set400Error] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
setLoaded(false);
|
||||
|
@ -33,6 +34,9 @@ const Child = (props) => {
|
|||
setFetchChildrenList(response.data.params.slice(0, INFINITE));
|
||||
else setFetchChildrenList(response.data.params.slice(0, len));
|
||||
}
|
||||
else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
})
|
||||
}, []);
|
||||
|
||||
|
@ -117,6 +121,7 @@ const Child = (props) => {
|
|||
}
|
||||
</div>
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ const Favorite = (props) => {
|
|||
const [fetch_meeting_list_non_favorite, setFetchMeetingListOfNonFavorite] = useState([]);
|
||||
const [fetch_meeting_list_favorite, setFetchMeetingListOfFavorite] = useState([]);
|
||||
const [_success, setSuccess] = useState(props.history.location.state);
|
||||
|
||||
const [_400error, set400Error] = useState('');
|
||||
|
||||
useEffect(()=>{
|
||||
setLoaded(loaded1 && loaded2);
|
||||
|
@ -57,6 +57,9 @@ const Favorite = (props) => {
|
|||
setFetchMeetingListOfNonFavorite(arr.slice(0, INFINITE));
|
||||
else setFetchMeetingListOfNonFavorite(arr.slice(0, len));
|
||||
}
|
||||
else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
})
|
||||
axios.get('/api/fathers/meetings/listOfFavoriteOfFather', {params:{father_id: father_id}})
|
||||
.then(response => {
|
||||
|
@ -79,7 +82,10 @@ const Favorite = (props) => {
|
|||
if(len > INFINITE)
|
||||
setFetchMeetingListOfFavorite(arr.slice(0, INFINITE));
|
||||
else setFetchMeetingListOfFavorite(arr.slice(0, len));
|
||||
}
|
||||
}
|
||||
else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
})
|
||||
},[]);
|
||||
|
||||
|
@ -310,6 +316,7 @@ const Favorite = (props) => {
|
|||
</section>
|
||||
</div>
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
</div>
|
||||
|
||||
)
|
||||
|
|
|
@ -56,13 +56,16 @@ const MeetingAdd = (props) => {
|
|||
setLoaded(true);
|
||||
setNotice(response.data.notice);
|
||||
if(response.data.status_code == 200){
|
||||
var list = response.data.params;
|
||||
var arr = [];
|
||||
for(var i in list){
|
||||
arr.push({...list[i], checked: false})
|
||||
var list = response.data.params;
|
||||
var arr = [];
|
||||
for(var i in list)
|
||||
arr.push({...list[i], checked: false})
|
||||
setChildrenList(arr);
|
||||
}
|
||||
setChildrenList(arr);
|
||||
}})
|
||||
else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
})
|
||||
}
|
||||
},[])
|
||||
|
||||
|
@ -328,9 +331,7 @@ const MeetingAdd = (props) => {
|
|||
className="btn-edit btn-default btn-h75 bg-yellow rounded-15">
|
||||
<span className={`ft-20 ft-xs-16 font-weight-bold ${!submit && 'text-black'}`}>ミーティングを登録</span>
|
||||
</LoadingButton>
|
||||
{
|
||||
_400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert>
|
||||
}
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -49,6 +49,9 @@ const MeetingDetail = (props) => {
|
|||
}
|
||||
setMeeting({...list, denominator:total, numerator:num});
|
||||
setThumbnail(response.data.params.meeting_image[0]?.image);
|
||||
}
|
||||
else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
|
|
|
@ -60,7 +60,10 @@ const MeetingEdit = (props) => {
|
|||
else arr.push({...list[i], checked: false});
|
||||
}
|
||||
setChildrenList(arr);
|
||||
}
|
||||
}
|
||||
else{
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
|
||||
|
@ -384,9 +387,8 @@ useEffect(()=>{
|
|||
className="btn-edit btn-default btn-h75 bg-yellow rounded-15">
|
||||
<span className={`ft-20 ft-xs-16 font-weight-bold ${!submit && 'text-black'}`}>ミーティングを更新</span>
|
||||
</LoadingButton>
|
||||
{
|
||||
_400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert>
|
||||
}
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -25,6 +25,7 @@ const Meeting = (props) => {
|
|||
const [fetch_meeting_list_incomplete, setFetchMeetingListOfIncomplete] = useState([]);
|
||||
const [fetch_meeting_list_complete, setFetchMeetingListOfComplete] = useState([]);
|
||||
const [_success, setSuccess] = useState(props.history.location?.state);
|
||||
const [_400error, set400Error] = useState('');
|
||||
|
||||
useEffect(()=>{
|
||||
if(localStorage.getItem("from_login")){
|
||||
|
@ -320,7 +321,8 @@ const Meeting = (props) => {
|
|||
}
|
||||
</section>
|
||||
</div>
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
|
||||
</div>
|
||||
|
||||
)
|
||||
|
|
|
@ -38,7 +38,10 @@ const ProfileEdit = () => {
|
|||
setEmail(response.data.params?.email);
|
||||
setTel(response.data.params?.tel);
|
||||
setProfile(response.data.params?.profile);
|
||||
}
|
||||
}
|
||||
else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
});
|
||||
}, []);
|
||||
|
||||
|
|
|
@ -31,6 +31,9 @@ const Profile = (props) => {
|
|||
setProfile(response.data.params);
|
||||
setImage(response.data.params.image);
|
||||
}
|
||||
else {
|
||||
set400error("失敗しました。");
|
||||
}
|
||||
})
|
||||
},[]);
|
||||
|
||||
|
|
新しいイシューから参照