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

add secure

このコミットが含まれているのは:
dragon1211 2021-11-18 01:44:21 -08:00
親 2c04e730a5
コミット b0b5444ad0
15個のファイルの変更、501行の追加、543行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

ファイル差分が大きすぎるため省略します 差分を読み込み

143
backend/resources/js/admin/child/detail.jsx
ファイルの表示

@ -99,86 +99,81 @@ const ChildDetail = (props) => {
<CircularProgress className="css-loader"/>
}
{
loaded &&
(
child ?
<div className="profile-content">
<div>
<input type="file" id="avatar" name="avatar" className="d-none" accept=".png, .jpg, .jpeg" onChange={(e) => handleImageChange(e)}/>
<div className="avatar-wrapper">
<label htmlFor="avatar" className='avatar-label'>
<IconButton color="primary" aria-label="upload picture" component="span" className="bg-yellow shadow-sm w-50-px h-50-px">
<PhotoCameraOutlinedIcon style={{width:'25px', height:'25px', color:'black'}}/>
</IconButton>
</label>
<img src={image} className="avatar-img" alt="avatar-img"/>
</div>
{
_422errors.image &&
<span className="l-alert__text--error ft-16 ft-md-14">
{_422errors.image}
</span>
}
loaded && child &&
<div className="profile-content">
<div>
<input type="file" id="avatar" name="avatar" className="d-none" accept=".png, .jpg, .jpeg" onChange={(e) => handleImageChange(e)}/>
<div className="avatar-wrapper">
<label htmlFor="avatar" className='avatar-label'>
<IconButton color="primary" aria-label="upload picture" component="span" className="bg-yellow shadow-sm w-50-px h-50-px">
<PhotoCameraOutlinedIcon style={{width:'25px', height:'25px', color:'black'}}/>
</IconButton>
</label>
<img src={image} className="avatar-img" alt="avatar-img"/>
</div>
<p className="profile-name">{`${child.first_name} ${child.last_name}`}</p>
<div className="profile-info">
<div className="profile-info__item">
{
_422errors.image &&
<span className="l-alert__text--error ft-16 ft-md-14">
{_422errors.image}
</span>
}
</div>
<p className="profile-name">{`${child.first_name} ${child.last_name}`}</p>
<div className="profile-info">
<div className="profile-info__item">
<p className="profile-info__icon">
<img src="/assets/img/icon/person-pin.svg" alt="Person"/>
</p>
<p className="txt">{child.identity}</p>
</div>
<div className="profile-info__item">
<a href={`mailto:${child.email}`}>
<p className="profile-info__icon">
<img src="/assets/img/icon/person-pin.svg" alt="Person"/>
<img src="/assets/img/icon/mail.svg" alt="メール"/>
</p>
<p className="txt">{child.identity}</p>
</div>
<div className="profile-info__item">
<a href={`mailto:${child.email}`}>
<p className="profile-info__icon">
<img src="/assets/img/icon/mail.svg" alt="メール"/>
</p>
<p className="txt">{child.email}</p>
</a>
</div>
<div className="profile-info__item">
<a href={`tel:${child.tel}`}>
<p className="profile-info__icon">
<img src="/assets/img/icon/phone.svg" alt="電話" />
</p>
<p className="txt">{child.tel}</p>
</a>
</div>
<div className="profile-info__item">
<p className="profile-info__icon">
<img src="/assets/img/icon/building.svg" alt="会社名"/>
</p>
<p className="txt">{child.company}</p>
</div>
</div>
<div className="p-profile-btn">
<Link className="btn-default btn-yellow btn-profile btn-r8 btn-h52"
to = {`/admin/child/edit/${props.match.params?.child_id}`}
>
<span className="ft-18 ft-xs-16">プロフィールを変更する</span>
</Link>
</div>
<div className="p-profile-btn">
<Link className="btn-default btn-yellow btn-password btn-r8 btn-h52"
to = {`/admin/child/edit/password/${props.match.params?.child_id}`}
>
<span className="ft-18 ft-xs-16">パスワードを変更する</span>
</Link>
</div>
<div className="p-profile-txtLink">
<a className="btn-default btn-password btn-r8 btn-h52"
onClick={()=>setShowConfirmModal(true)}
>
<span className="ft-xs-16">削除する</span>
<p className="txt">{child.email}</p>
</a>
</div>
<div className="profile-info__item">
<a href={`tel:${child.tel}`}>
<p className="profile-info__icon">
<img src="/assets/img/icon/phone.svg" alt="電話" />
</p>
<p className="txt">{child.tel}</p>
</a>
</div>
<div className="profile-info__item">
<p className="profile-info__icon">
<img src="/assets/img/icon/building.svg" alt="会社名"/>
</p>
<p className="txt">{child.company}</p>
</div>
</div>
: <p className="text-center py-5">データが存在していません。</p>
)
<div className="p-profile-btn">
<Link className="btn-default btn-yellow btn-profile btn-r8 btn-h52"
to = {`/admin/child/edit/${props.match.params?.child_id}`}
>
<span className="ft-18 ft-xs-16">プロフィールを変更する</span>
</Link>
</div>
<div className="p-profile-btn">
<Link className="btn-default btn-yellow btn-password btn-r8 btn-h52"
to = {`/admin/child/edit/password/${props.match.params?.child_id}`}
>
<span className="ft-18 ft-xs-16">パスワードを変更する</span>
</Link>
</div>
<div className="p-profile-txtLink">
<a className="btn-default btn-password btn-r8 btn-h52"
onClick={()=>setShowConfirmModal(true)}
>
<span className="ft-xs-16">削除する</span>
</a>
</div>
</div>
}
</div>
</section>

4
backend/resources/js/admin/child/edit.jsx
ファイルの表示

@ -17,6 +17,7 @@ const ChildEdit = (props) => {
const [email, setEmail] = useState('');
const [tel, setTelephone] = useState('');
const [company, setCompany] = useState('');
const [child, setChild] = useState(null);
const [_422errors, set422Errors] = useState({
first_name:'',
@ -41,6 +42,7 @@ const ChildEdit = (props) => {
if(response.data.status_code==200)
{
var child = response.data.params;
setChild(child);
if(child){
setFirstName(child.first_name);
setLastName(child.last_name);
@ -110,7 +112,7 @@ const ChildEdit = (props) => {
<CircularProgress className="css-loader"/>
}
{
loaded &&
loaded && child &&
<div className="edit-wrap">
<div className="edit-content">
<form onSubmit={handleSubmit} className="edit-form">

192
backend/resources/js/admin/meeting/detail.jsx
ファイルの表示

@ -85,110 +85,106 @@ const MeetingDetail = (props) => {
<CircularProgress className="css-loader"/>
}
{
loaded &&
(
meeting ?
<article className="p-article__body">
<div className="p-article__content">
<div className="meeting-member">
<div className="meeting-member-wrap">
<div data-url="login.html" className="meeting-member-link">
<ul className="meeting-member-count">
<li className="numerator">{meeting.numerator}</li>
<li className="denominator">{meeting.denominator}</li>
</ul>
<ul className="meeting-member-list" role="list">
{
meeting.approval?.map((x, k)=>
<li className="meeting-member__item" role="listitem" key={k}>
<div className="avatar">
<img alt="name" className="avatar-img" src={x.child.image} />
</div>
</li>
)
}
</ul>
</div>
</div>
</div>
<h3 className="meeting-ttl">{ meeting.title }</h3>
<time dateTime="2021-07-30" className="meeting-time">
<span className="meeting-date">{ moment(meeting.updated_at).format('YYYY/MM/DD') || '' }</span>
</time>
<ul className="p-article-btn-list">
<li className="p-article__pdf__btn">
<Link to={`/admin/meeting/edit/${props.match.params?.meeting_id}`}
className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">
編集
</Link>
</li>
<li className="p-article__pdf__btn mr-0">
<a className="btn-default btn-yellow btn-pdf btn-r8 btn-h48"
onClick={()=>setShowConfirmModal(true)}>
削除
</a>
</li>
</ul>
<div className="p-article__context">
<div className="p-file-list">
<div className="p-file-for">
<figure>
{
thumbnail &&
<img src={thumbnail} alt="thumbnail"/>
}
</figure>
</div>
<div className="p-file-nav">
loaded && meeting &&
<article className="p-article__body">
<div className="p-article__content">
<div className="meeting-member">
<div className="meeting-member-wrap">
<div data-url="login.html" className="meeting-member-link">
<ul className="meeting-member-count">
<li className="numerator">{meeting.numerator}</li>
<li className="denominator">{meeting.denominator}</li>
</ul>
<ul className="meeting-member-list" role="list">
{
meeting.meeting_image?.map((x, k)=>
<figure key={k}>
<img src={x.image} alt={x.image} onClick={e=>setThumbnail(x.image)}/>
</figure>
meeting.approval?.map((x, k)=>
<li className="meeting-member__item" role="listitem" key={k}>
<div className="avatar">
<img alt="name" className="avatar-img" src={x.child.image} />
</div>
</li>
)
}
{
[...Array(10-meeting.meeting_image.length)].map((x, k)=>
<figure key={k}></figure>
)
}
</div>
</ul>
</div>
<div className="p-article__pdf">
<div className="p-article__pdf__btn">
<a data-v-ade1d018="" className="btn-default btn-yellow btn-pdf btn-r8 btn-h52"
onClick={e=>setShowPDFModal(true)}>
<span>PDFを確認する</span>
</a>
</div>
<button type="button"
aria-label="お気に入り" data-tooltip="お気に入り"
aria-pressed="false"
className="icon a-icon text-icon icon-text icon-starFill-wrap a-icon-size_medium"
style={{border:'1px solid #f0de00'}}
onClick = {()=>setShowMemoModal(true)} />
</div>
<p className="p-article__txt">{ meeting.text }</p>
</div>
</div>
<ModalMemo
show={show_memo_modal}
title={"メモ"}
content={meeting?.memo}
handleClose={()=>setShowMemoModal(false)}
/>
<ModalPdf
show={show_pdf_modal}
pdfPath={meeting.pdf ?? '/pdf/test.pdf'}
handleClose={()=>setShowPDFModal(false)}
/>
</article>
: <p className="text-center pt-5">データが存在していません。</p>
)
<h3 className="meeting-ttl">{ meeting.title }</h3>
<time dateTime="2021-07-30" className="meeting-time">
<span className="meeting-date">{ moment(meeting.updated_at).format('YYYY/MM/DD') || '' }</span>
</time>
<ul className="p-article-btn-list">
<li className="p-article__pdf__btn">
<Link to={`/admin/meeting/edit/${props.match.params?.meeting_id}`}
className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">
編集
</Link>
</li>
<li className="p-article__pdf__btn mr-0">
<a className="btn-default btn-yellow btn-pdf btn-r8 btn-h48"
onClick={()=>setShowConfirmModal(true)}>
削除
</a>
</li>
</ul>
<div className="p-article__context">
<div className="p-file-list">
<div className="p-file-for">
<figure>
{
thumbnail &&
<img src={thumbnail} alt="thumbnail"/>
}
</figure>
</div>
<div className="p-file-nav">
{
meeting.meeting_image?.map((x, k)=>
<figure key={k}>
<img src={x.image} alt={x.image} onClick={e=>setThumbnail(x.image)}/>
</figure>
)
}
{
[...Array(10-meeting.meeting_image.length)].map((x, k)=>
<figure key={k}></figure>
)
}
</div>
</div>
<div className="p-article__pdf">
<div className="p-article__pdf__btn">
<a data-v-ade1d018="" className="btn-default btn-yellow btn-pdf btn-r8 btn-h52"
onClick={e=>setShowPDFModal(true)}>
<span>PDFを確認する</span>
</a>
</div>
<button type="button"
aria-label="お気に入り" data-tooltip="お気に入り"
aria-pressed="false"
className="icon a-icon text-icon icon-text icon-starFill-wrap a-icon-size_medium"
style={{border:'1px solid #f0de00'}}
onClick = {()=>setShowMemoModal(true)} />
</div>
<p className="p-article__txt">{ meeting.text }</p>
</div>
</div>
<ModalMemo
show={show_memo_modal}
title={"メモ"}
content={meeting?.memo}
handleClose={()=>setShowMemoModal(false)}
/>
<ModalPdf
show={show_pdf_modal}
pdfPath={meeting.pdf ?? '/pdf/test.pdf'}
handleClose={()=>setShowPDFModal(false)}
/>
</article>
}
</div>
</div>

4
backend/resources/js/admin/meeting/edit.jsx
ファイルの表示

@ -15,6 +15,7 @@ const MeetingEdit = (props) => {
const history = useHistory();
const [meeting, setMeeting] = useState(null);
const [title, setTitle] = useState('');
const [memo, setMemo] = useState('');
const [text, setText] = useState('');
@ -60,6 +61,7 @@ const MeetingEdit = (props) => {
.then(response => {
setLoaded(true);
if(response.data.status_code==200){
setMeeting(response.data.params); //Success
setTitle(response.data.params?.title);
setMemo(response.data.params?.memo);
setText(response.data.params?.text);
@ -218,7 +220,7 @@ const MeetingEdit = (props) => {
<CircularProgress className="css-loader"/>
}
{
loaded &&
loaded && meeting &&
<article className="p-article__body">
<div className="p-article__content">
<div className="p-article__context">

129
backend/resources/js/admin/parent/detail.jsx
ファイルの表示

@ -104,77 +104,72 @@ const ParentDetail = (props) => {
<CircularProgress className="css-loader"/>
}
{
loaded &&
(
parent ?
<div className="profile-content">
<div>
<input type="file" id="avatar" name="avatar" className="d-none" accept=".png, .jpg, .jpeg" onChange={(e) => handleImageChange(e)}/>
<div className="avatar-wrapper">
<label htmlFor="avatar" className='avatar-label'>
<IconButton color="primary" aria-label="upload picture" component="span" className="bg-yellow shadow-sm w-50-px h-50-px">
<PhotoCameraOutlinedIcon style={{width:'25px', height:'25px', color:'black'}}/>
</IconButton>
</label>
<img src={image} className="avatar-img" alt="avatar-img"/>
</div>
{
_422errors.image &&
<span className="l-alert__text--error ft-16 ft-md-14">
{_422errors.image}
</span>
}
loaded && parent &&
<div className="profile-content">
<div>
<input type="file" id="avatar" name="avatar" className="d-none" accept=".png, .jpg, .jpeg" onChange={(e) => handleImageChange(e)}/>
<div className="avatar-wrapper">
<label htmlFor="avatar" className='avatar-label'>
<IconButton color="primary" aria-label="upload picture" component="span" className="bg-yellow shadow-sm w-50-px h-50-px">
<PhotoCameraOutlinedIcon style={{width:'25px', height:'25px', color:'black'}}/>
</IconButton>
</label>
<img src={image} className="avatar-img" alt="avatar-img"/>
</div>
<p className="profile-name">{parent.company}</p>
<div className="profile-info">
<div className="profile-info__item">
<a href={`mailto:${parent.email}`}>
<p className="profile-info__icon">
<img src="/assets/img/icon/mail.svg" alt="メール"/>
</p>
<p className="txt">{parent.email}</p>
</a>
</div>
<div className="profile-info__item">
<a href={`tel:${parent.tel}`}>
<p className="profile-info__icon">
<img src="/assets/img/icon/phone.svg" alt="電話" />
</p>
<p className="txt">{parent.tel}</p>
</a>
</div>
<div className="profile-info__item">
<p className="txt">{parent.profile}</p>
</div>
</div>
<div className="p-profile-btn">
<Link className="btn-default btn-yellow btn-profile btn-r8 btn-h52"
to = {`/admin/parent/edit/${props.match.params?.father_id}`}
>
<span className="ft-18 ft-xs-16">プロフィールを変更する</span>
</Link>
</div>
<div className="p-profile-btn">
<Link className="btn-default btn-yellow btn-password btn-r8 btn-h52"
to = {`/admin/parent/edit/password/${props.match.params?.father_id}`}
>
<span className="ft-18 ft-xs-16">パスワードを変更する</span>
</Link>
</div>
<div className="p-profile-txtLink">
<a className="btn-default btn-password btn-r8 btn-h52"
onClick={()=>setShowConfirmModal(true)}
>
<span className="ft-xs-16">削除する</span>
{
_422errors.image &&
<span className="l-alert__text--error ft-16 ft-md-14">
{_422errors.image}
</span>
}
</div>
<p className="profile-name">{parent.company}</p>
<div className="profile-info">
<div className="profile-info__item">
<a href={`mailto:${parent.email}`}>
<p className="profile-info__icon">
<img src="/assets/img/icon/mail.svg" alt="メール"/>
</p>
<p className="txt">{parent.email}</p>
</a>
</div>
<div className="profile-info__item">
<a href={`tel:${parent.tel}`}>
<p className="profile-info__icon">
<img src="/assets/img/icon/phone.svg" alt="電話" />
</p>
<p className="txt">{parent.tel}</p>
</a>
</div>
<div className="profile-info__item">
<p className="txt">{parent.profile}</p>
</div>
</div>
: <p className="text-center py-5">データが存在していません。</p>
)
<div className="p-profile-btn">
<Link className="btn-default btn-yellow btn-profile btn-r8 btn-h52"
to = {`/admin/parent/edit/${props.match.params?.father_id}`}
>
<span className="ft-18 ft-xs-16">プロフィールを変更する</span>
</Link>
</div>
<div className="p-profile-btn">
<Link className="btn-default btn-yellow btn-password btn-r8 btn-h52"
to = {`/admin/parent/edit/password/${props.match.params?.father_id}`}
>
<span className="ft-18 ft-xs-16">パスワードを変更する</span>
</Link>
</div>
<div className="p-profile-txtLink">
<a className="btn-default btn-password btn-r8 btn-h52"
onClick={()=>setShowConfirmModal(true)}
>
<span className="ft-xs-16">削除する</span>
</a>
</div>
</div>
}
</div>
</section>

4
backend/resources/js/admin/parent/edit.jsx
ファイルの表示

@ -13,6 +13,7 @@ const ParentEdit = (props) => {
const [email, setEmail] = useState('');
const [tel, setTelephone] = useState('');
const [profile, setProfile] = useState('');
const [parent, setParent] = useState(null);
const [_422errors, set422Errors] = useState({
company:'',
@ -34,6 +35,7 @@ const ParentEdit = (props) => {
setLoaded(true);
if(response.data.status_code==200){
var parent = response.data.params;
setParent(parent);
if(parent){
setCompany(parent?.company);
setEmail(parent.email);
@ -95,7 +97,7 @@ const ParentEdit = (props) => {
<CircularProgress className="css-loader"/>
}
{
loaded &&
loaded && parent &&
<div className="edit-wrap">
<div className="edit-content">
<form onSubmit={handleSubmit} className="edit-form">

4
backend/resources/js/child/parent/detail.jsx
ファイルの表示

@ -9,7 +9,7 @@ const ParentDetail = (props) => {
const [notice, setNotice] = useState(localStorage.getItem('notice'));
const [loaded, setLoaded] = useState(false);
const [parent, setParent] = useState({image:'', email:'', profile:'', tel:'', company:''});
const [parent, setParent] = useState(null);
const [_400error, set400Error] = useState('');
const [_success, setSuccess] = useState('');
@ -55,7 +55,7 @@ const ParentDetail = (props) => {
<CircularProgress className="css-loader"/>
}
{
loaded &&
loaded && parent &&
<div className="profile-wrap">
<div className="profile-content">
<div className="profile-thumb">

6
backend/resources/js/child/profile/edit.jsx
ファイルの表示

@ -19,6 +19,7 @@ const ProfileEdit = () => {
const [email, setEmail] = useState('');
const [tel, setTel] = useState('');
const [company, setCompany] = useState('');
const [profile, setProfile] = useState(null);
const [_422errors, set422Errors] = useState({
first_name:'',
@ -44,12 +45,15 @@ const ProfileEdit = () => {
setNotice(response.data.notice);
if(response.data.status_code==200){
let params = response.data.params;
setProfile(params);
setFirstName(params.first_name);
setLastName(params.last_name);
setEmail(params.email);
setTel(params.tel);
setIdentity(params.identity);
if(params.company)setCompany(params.company);
}else {
set400Error("失敗しました。");
}
})
},[]);
@ -120,7 +124,7 @@ const ProfileEdit = () => {
<CircularProgress className="css-loader"/>
}
{
loaded &&
loaded && profile &&
<div className="edit-wrap">
<div className="edit-content">
<form onSubmit={handleSubmit} className="edit-form">

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

@ -13,7 +13,7 @@ const Profile = (props) => {
const [notice, setNotice] = useState(localStorage.getItem('notice'));
const [image, setImage] = useState('');
const [profile, setProfile] = useState({email:'', tel:'', first_name:'', last_name:'', identity:'', company:'', image:''})
const [profile, setProfile] = useState(null)
const [loaded, setLoaded] = useState(false);
const [_400error, set400Error] = useState('');
const [_422errors, set422Errors] = useState({ image: '' });
@ -31,6 +31,9 @@ const Profile = (props) => {
setProfile(response.data.params);
setImage(response.data.params.image);
}
else {
set400Error("失敗しました。");
}
})
},[]);
@ -86,7 +89,7 @@ const Profile = (props) => {
<CircularProgress className="css-loader"/>
}
{
loaded &&
loaded && profile &&
<div className="profile-wrap">
<div className="profile-content">
<div>

4
backend/resources/js/parent/child/detail.jsx
ファイルの表示

@ -14,7 +14,7 @@ const ChildDetail = (props) => {
const [loaded, setLoaded] = useState(false);
const [show_delete, setShowDelete] = useState(false);
const [submit, setSubmit] = useState(false);
const [child, setChild] = useState({});
const [child, setChild] = useState(null);
const [_400error, set400Error] = useState('');
const [_success, setSuccess] = useState(props.history.location.state);
@ -79,7 +79,7 @@ const ChildDetail = (props) => {
<CircularProgress className="css-loader"/>
}
{
loaded &&
loaded && child &&
<section className="profile-container">
<div className="profile-wrap">
<div className="profile-content">

2
backend/resources/js/parent/child/edit.jsx
ファイルの表示

@ -83,7 +83,7 @@ const ChildEdit = (props) => {
{ !loaded &&
<CircularProgress className="css-loader"/> }
{
loaded &&
loaded && hire_at &&
<div className="edit-wrap">
<div className="edit-content">
<form className="edit-form" onSubmit={handleSubmit}>

2
backend/resources/js/parent/meeting/detail.jsx
ファイルの表示

@ -139,7 +139,7 @@ const MeetingDetail = (props) => {
<Notification notice={notice}/>
</div>
{
!loaded && !meeting &&
!loaded &&
<CircularProgress className="css-loader"/>
}
{

33
backend/resources/js/parent/meeting/edit.jsx
ファイルの表示

@ -5,7 +5,6 @@ import { CircularProgress } from '@material-ui/core';
import { LoadingButton } from '@material-ui/lab';
import IconButton from '@mui/material/IconButton';
import RemoveIcon from '@mui/icons-material/Remove';
import { ToastContainer, toast } from 'react-toastify';
import 'react-toastify/dist/ReactToastify.css';
import Alert from '../../component/alert';
@ -26,6 +25,7 @@ const MeetingEdit = (props) => {
const [meeting_image, setMeetingImages] = useState([]);
const [approval_list, setApproval] = useState([]);
const [children_list, setChildrenList] = useState([]);
const [meeting, setMeeting] = useState(null);
const [_422errors, set422Errors] = useState({title:'', text:'', memo:'', pdf:'', image:''})
const [_400error, set400Error] = useState('');
@ -44,6 +44,7 @@ const MeetingEdit = (props) => {
setLoaded(true);
setNotice(response.data.notice)
if(response.data.status_code==200){
setMeeting(response.data.params);
setTitle(response.data.params?.title);
setMemo(response.data.params?.memo);
setText(response.data.params?.text);
@ -191,33 +192,6 @@ useEffect(()=>{
}
const notify_delete = () =>
toast.success("削除成功しました。", {
position: "top-right",
autoClose: 5000,
className:"bg-danger",
hideProgressBar: true,
closeOnClick: true,
pauseOnHover: true,
draggable: false,
progress: undefined,
style:{ color: '#ffffff'}
});
const notify_save = () =>
toast.success("更新が成功しました。", {
position: "top-right",
autoClose: 5000,
className:"bg-danger",
hideProgressBar: true,
closeOnClick: true,
pauseOnHover: true,
draggable: false,
progress: undefined,
style:{ color: '#ffffff'}
});
return (
<div className="l-content">
<div className="l-content-w560">
@ -236,7 +210,7 @@ useEffect(()=>{
<CircularProgress className="css-loader"/>
}
{
loaded &&
loaded && meeting &&
<article className="p-article__body">
<div className="p-article__content">
<div className="p-article__context">
@ -399,7 +373,6 @@ useEffect(()=>{
</div>
</div>
</div>
<ToastContainer />
</div>
)
}

4
backend/resources/js/parent/profile/edit.jsx
ファイルの表示

@ -15,6 +15,7 @@ const ProfileEdit = () => {
const [email, setEmail] = useState('');
const [tel, setTel] = useState('');
const [profile, setProfile] = useState('');
const [params, setParams] = useState(null);
const [_success, setSuccess] = useState('');
const [_400error, set400Error] = useState('');
@ -34,6 +35,7 @@ const ProfileEdit = () => {
setLoaded(true);
setNotice(response.data.notice);
if(response.data.status_code==200) {
setParams(response.data.params);
setCompany(response.data.params?.company);
setEmail(response.data.params?.email);
setTel(response.data.params?.tel);
@ -91,7 +93,7 @@ const ProfileEdit = () => {
<CircularProgress className="css-loader"/>
}
{
loaded &&
loaded && params &&
<div className="edit-wrap">
<div className="edit-content">
<form className="edit-form" onSubmit={handleSubmit}>