他の親のミーティングを見ようとする場合、404エラー処理機能を追加しました。
このコミットが含まれているのは:
コミット
aca92d83f7
ファイル差分が大きすぎるため省略します
差分を読み込み
|
@ -1,6 +1,6 @@
|
|||
import React, { useEffect, useState } from 'react';
|
||||
import axios from 'axios';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { Link, useHistory } from 'react-router-dom';
|
||||
import { CircularProgress } from '@material-ui/core';
|
||||
|
||||
import Notification from '../notification';
|
||||
|
@ -12,6 +12,7 @@ import ModalConfirm from '../../component/modal_confirm';
|
|||
|
||||
const MeetingDetail = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
const [meeting, setMeeting] = useState(null);
|
||||
|
@ -23,6 +24,7 @@ const MeetingDetail = (props) => {
|
|||
const [show_confirm_modal, setShowConfirmMoal] = useState(false);
|
||||
const [submit, setSubmit] = useState(false);
|
||||
const [_400error, set400Error] = useState('');
|
||||
const [_404error, set404Error] = useState('');
|
||||
const [_success, setSuccess] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
|
@ -45,6 +47,13 @@ const MeetingDetail = (props) => {
|
|||
set400Error("失敗しました。");
|
||||
}
|
||||
})
|
||||
.catch(err=>{
|
||||
setLoaded(true);
|
||||
setNotice(err.response.data.notice);
|
||||
if(err.response.status==404){
|
||||
set404Error(err.response.data.message);
|
||||
}
|
||||
})
|
||||
},[]);
|
||||
|
||||
|
||||
|
@ -192,8 +201,18 @@ const MeetingDetail = (props) => {
|
|||
handleClose={()=>setShowConfirmMoal(false)}
|
||||
handleAccept={handleApprovalRegister}
|
||||
loading={submit}/>
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _404error &&
|
||||
<Alert type="fail" hide={()=>{
|
||||
set404Error('');
|
||||
history.push({
|
||||
pathname: "/c-account/meeting"
|
||||
});
|
||||
}}>
|
||||
{_404error}
|
||||
</Alert>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
|
|
@ -29,8 +29,9 @@ const ProfileEdit = () => {
|
|||
tel:'',
|
||||
company:''
|
||||
})
|
||||
const [_400error, set400Error] = useState('');
|
||||
const [_success, setSuccess] = useState('');
|
||||
const [_400error, set400Error] = useState('');
|
||||
const [_404error, set404Error] = useState('');
|
||||
|
||||
const [submit, setSubmit] = useState(false);
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
|
@ -56,6 +57,13 @@ const ProfileEdit = () => {
|
|||
set400Error("失敗しました。");
|
||||
}
|
||||
})
|
||||
.catch(err=>{
|
||||
setLoaded(true);
|
||||
setNotice(err.response.data.notice);
|
||||
if(err.response.status==404){
|
||||
set404Error(err.response.data.message);
|
||||
}
|
||||
})
|
||||
},[]);
|
||||
|
||||
|
||||
|
@ -209,6 +217,15 @@ const ProfileEdit = () => {
|
|||
}
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
|
||||
{ _404error &&
|
||||
<Alert type="fail" hide={()=>{
|
||||
history.push({
|
||||
pathname: "/c-account/profile"
|
||||
});
|
||||
}}>
|
||||
{_404error}
|
||||
</Alert>
|
||||
}
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -10,12 +10,14 @@ import Notification from '../notification';
|
|||
|
||||
const Profile = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
||||
|
||||
const [image, setImage] = useState('');
|
||||
const [profile, setProfile] = useState(null)
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
const [_400error, set400Error] = useState('');
|
||||
const [_404error, set404Error] = useState('');
|
||||
const [_422errors, set422Errors] = useState({ image: '' });
|
||||
const [_success, setSuccess] = useState(props.history.location.state);
|
||||
|
||||
|
@ -27,12 +29,20 @@ const Profile = (props) => {
|
|||
.then(response => {
|
||||
setLoaded(true);
|
||||
setNotice(response.data.notice);
|
||||
if(response.data.status_code==200){
|
||||
setProfile(response.data.params);
|
||||
setImage(response.data.params.image);
|
||||
switch(response.data.status_code){
|
||||
case 200:{
|
||||
setProfile(response.data.params);
|
||||
setImage(response.data.params.image);
|
||||
break;
|
||||
}
|
||||
case 400: set400Error("失敗しました。"); break;
|
||||
}
|
||||
else {
|
||||
set400Error("失敗しました。");
|
||||
})
|
||||
.catch(err=>{
|
||||
setLoaded(true);
|
||||
setNotice(err.response.data.notice);
|
||||
if(err.response.status==404){
|
||||
set404Error(err.response.data.message);
|
||||
}
|
||||
})
|
||||
},[]);
|
||||
|
@ -173,8 +183,17 @@ const Profile = (props) => {
|
|||
</div>
|
||||
</div>
|
||||
}
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _404error &&
|
||||
<Alert type="fail" hide={()=>{
|
||||
history.push({
|
||||
pathname: "/c-account/profile"
|
||||
});
|
||||
}}>
|
||||
{_404error}
|
||||
</Alert>
|
||||
}
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -35,7 +35,6 @@ const MeetingAdd = (props) => {
|
|||
setLoaded(false);
|
||||
const state = props.history.location.state;
|
||||
if(state){
|
||||
console.log(state);
|
||||
setLoaded(true);
|
||||
setTitle(state?.title);
|
||||
setMemo(state?.memo);
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
import React, { useEffect, useState } from 'react';
|
||||
import moment from 'moment';
|
||||
import axios from 'axios';
|
||||
import { ToastContainer, toast } from 'react-toastify';
|
||||
import { useHistory, Link } from 'react-router-dom';
|
||||
import { CircularProgress } from '@material-ui/core';
|
||||
|
||||
|
@ -22,6 +21,7 @@ const MeetingDetail = (props) => {
|
|||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
const [_success, setSuccess] = useState(props.history.location.state);
|
||||
const [_400error, set400Error] = useState('');
|
||||
const [_404error, set404Error] = useState('');
|
||||
|
||||
const [show_delete_modal, setShowDeleteModal] = useState(false);
|
||||
const [show_notify_all_modal, setShowNotifyAllModal] = useState(false);
|
||||
|
@ -53,7 +53,14 @@ const MeetingDetail = (props) => {
|
|||
else {
|
||||
set400Error("失敗しました。");
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(err=>{
|
||||
setLoaded(true);
|
||||
setNotice(err.response.data.notice);
|
||||
if(err.response.status==404){
|
||||
set404Error(err.response.data.message);
|
||||
}
|
||||
})
|
||||
}, []);
|
||||
|
||||
//-------------------------------------------------------------
|
||||
|
@ -283,6 +290,16 @@ const MeetingDetail = (props) => {
|
|||
</div>
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
|
||||
{ _404error &&
|
||||
<Alert type="fail" hide={()=>{
|
||||
set404Error('');
|
||||
history.push({
|
||||
pathname: "/p-account/meeting"
|
||||
});
|
||||
}}>
|
||||
{_404error}
|
||||
</Alert>
|
||||
}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -30,6 +30,7 @@ const MeetingEdit = (props) => {
|
|||
|
||||
const [_422errors, set422Errors] = useState({title:'', text:'', memo:'', pdf:'', image:''})
|
||||
const [_400error, set400Error] = useState('');
|
||||
const [_404error, set404Error] = useState('');
|
||||
const [_success, setSuccess] = useState('');
|
||||
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
|
@ -68,7 +69,14 @@ const MeetingEdit = (props) => {
|
|||
else{
|
||||
set400Error("失敗しました。");
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(err=>{
|
||||
setLoaded(true);
|
||||
setNotice(err.response.data.notice);
|
||||
if(err.response.status==404){
|
||||
set404Error(err.response.data.message);
|
||||
}
|
||||
})
|
||||
}, []);
|
||||
|
||||
//-------------------------------------------------------------
|
||||
|
@ -393,6 +401,16 @@ useEffect(()=>{
|
|||
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
|
||||
{ _404error &&
|
||||
<Alert type="fail" hide={()=>{
|
||||
set404Error('');
|
||||
history.push({
|
||||
pathname: "/p-account/meeting"
|
||||
});
|
||||
}}>
|
||||
{_404error}
|
||||
</Alert>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -19,6 +19,7 @@ const ProfileEdit = () => {
|
|||
|
||||
const [_success, setSuccess] = useState('');
|
||||
const [_400error, set400Error] = useState('');
|
||||
const [_404error, set404Error] = useState('');
|
||||
const [_422errors, set422Errors] = useState({
|
||||
company: '',
|
||||
email:'',
|
||||
|
@ -44,7 +45,14 @@ const ProfileEdit = () => {
|
|||
else {
|
||||
set400Error("失敗しました。");
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(err=>{
|
||||
setLoaded(true);
|
||||
setNotice(err.response.data.notice);
|
||||
if(err.response.status==404){
|
||||
set404Error(err.response.data.message);
|
||||
}
|
||||
})
|
||||
}, []);
|
||||
|
||||
const handleSubmit = (e) => {
|
||||
|
@ -161,6 +169,16 @@ const ProfileEdit = () => {
|
|||
}
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('') }>{_success}</Alert> }
|
||||
{ _404error &&
|
||||
<Alert type="fail" hide={()=>{
|
||||
set404Error('');
|
||||
history.push({
|
||||
pathname: "/p-account/profile"
|
||||
});
|
||||
}}>
|
||||
{_404error}
|
||||
</Alert>
|
||||
}
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -9,32 +9,40 @@ import Alert from '../../component/alert';
|
|||
import Notification from '../notification';
|
||||
|
||||
const Profile = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
||||
const [image, setImage] = useState('');
|
||||
const [profile, setProfile] = useState({});
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
const [_400error, set400Error] = useState('');
|
||||
const [_404error, set404Error] = useState('');
|
||||
const [_422errors, set422Errors] = useState({ image: '' });
|
||||
const [_success, setSuccess] = useState(props.history.location.state);
|
||||
|
||||
const father_id = document.getElementById('father_id').value;
|
||||
|
||||
useEffect(() => {
|
||||
setLoaded(false);
|
||||
axios.get('/api/fathers/detail/'+father_id)
|
||||
.then(response => {
|
||||
setLoaded(true);
|
||||
setNotice(response.data.notice);
|
||||
if(response.data.status_code==200){
|
||||
setProfile(response.data.params);
|
||||
setImage(response.data.params.image);
|
||||
}
|
||||
else {
|
||||
set400Error("失敗しました。");
|
||||
}
|
||||
})
|
||||
setLoaded(false);
|
||||
axios.get('/api/fathers/detail/'+father_id)
|
||||
.then(response => {
|
||||
setLoaded(true);
|
||||
setNotice(response.data.notice);
|
||||
if(response.data.status_code==200){
|
||||
setProfile(response.data.params);
|
||||
setImage(response.data.params.image);
|
||||
}
|
||||
else {
|
||||
set400Error("失敗しました。");
|
||||
}
|
||||
})
|
||||
.catch(err=>{
|
||||
setLoaded(true);
|
||||
setNotice(err.response.data.notice);
|
||||
if(err.response.status==404){
|
||||
set404Error(err.response.data.message);
|
||||
}
|
||||
})
|
||||
},[]);
|
||||
|
||||
useEffect(() => {
|
||||
|
@ -166,6 +174,16 @@ const Profile = (props) => {
|
|||
}
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('') }>{_success}</Alert> }
|
||||
{ _404error &&
|
||||
<Alert type="fail" hide={()=>{
|
||||
set404Error('');
|
||||
history.push({
|
||||
pathname: "/p-account/profile"
|
||||
});
|
||||
}}>
|
||||
{_404error}
|
||||
</Alert>
|
||||
}
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
|
新しいイシューから参照