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

「姓と名のバリデーションが逆です。」を修正しました。

このコミットが含まれているのは:
dragon1211 2021-11-29 15:06:29 -08:00
親 9f8ce8e7b2
コミット 3cd4543295
15個のファイルの変更、2087行の追加、2095行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

@ -12247,40 +12247,40 @@ categories: [layout]
border: 1px solid #ccc;
}
.mypage-nav-list__item.nav-active .icon.meeting:before {
background-image: url(/images/list-yellow.svg?f77e0fb433bb69740fc317b0414dc007);
background-image: url(/images/list-yellow.svg?58c753f895165d8b559b97118431078a);
}
@media screen and (min-width: 1068px) {
.mypage-nav-list__item.nav-active .icon.meeting:before {
background-image: url(/images/list-black.svg?d13673b557a3ce5f515465bbc0382ccc);
background-image: url(/images/list-black.svg?bb77778dacd15a2e89c94df413b610b1);
}
}
@media screen and (max-width: 1067px) {
.mypage-nav-list__item.nav-active .icon.star:before {
background-image: url(/images/star-outline-yellow02.svg?fc74213935152ab025965d2ea953220c);
background-image: url(/images/star-outline-yellow02.svg?12419a0efb747f2bf657265d762cf945);
}
}
.mypage-nav-list__item.nav-active .icon.parents:before {
background-image: url(/images/people-yellow.svg?942852f93104b853b1a948d7db69e92d);
background-image: url(/images/people-yellow.svg?b09a58e795d7dae70bf454e2dd9c95dc);
}
@media screen and (min-width: 1068px) {
.mypage-nav-list__item.nav-active .icon.parents:before {
background-image: url(/images/people-black.svg?a094fbee9d04a1a3ac4b4290f7ca6338);
background-image: url(/images/people-black.svg?18cbc02573ca628a754516d565471689);
}
}
.mypage-nav-list__item.nav-active .icon.search:before {
background-image: url(/images/search-yellow.svg?740d4d0369b20d1929632e61a6e71458);
background-image: url(/images/search-yellow.svg?0230b5a2addb282f90a11f03e1fa18b6);
}
@media screen and (min-width: 1068px) {
.mypage-nav-list__item.nav-active .icon.search:before {
background-image: url(/images/search-black.svg?2e280c091d73db5c9791df49c1f3f6a7);
background-image: url(/images/search-black.svg?720fc6249963ccfb199cad011367407b);
}
}
.mypage-nav-list__item.nav-active .icon.log-out:before {
background-image: url(/images/log-out-yellow.svg?c091212a55df240e3ee17c47f30de8d7);
background-image: url(/images/log-out-yellow.svg?1b68f7d254d3418c246ab6caf4df2a81);
}
@media screen and (min-width: 1068px) {
.mypage-nav-list__item.nav-active .icon.log-out:before {
background-image: url(/images/log-out-black.svg?aa97b225ee056b66292320fb70727064);
background-image: url(/images/log-out-black.svg?84c65984fe1dc8214afbb0e6e42873c0);
}
}
@media screen and (max-width: 1067px) {
@ -12354,19 +12354,19 @@ categories: [layout]
background-size: 100%;
}
.mypage-nav-list__item .icon.meeting:before {
background-image: url(/images/list-gray.svg?272f97137cb0e069d94c90328c05810b);
background-image: url(/images/list-gray.svg?dcc142fe211efe22393797a2c9e28bf1);
}
.mypage-nav-list__item .icon.star:before {
background-image: url(/images/star-outline-gray02.svg?e1634811818fa0ea4d70eef1d6d94abc);
background-image: url(/images/star-outline-gray02.svg?df9815f0291c30e50a5cfd1c496e155b);
}
.mypage-nav-list__item .icon.search:before {
background-image: url(/images/search-gray.svg?8b2fb9457f03685273f66fb075949f53);
background-image: url(/images/search-gray.svg?c5c7a01d0dd6ebe7e325306d6ef0ba7a);
}
.mypage-nav-list__item .icon.parents:before {
background-image: url(/images/people-gray.svg?5bc684c73506aa485236862c0a82ee2f);
background-image: url(/images/people-gray.svg?acfa94944f8df8a43eef099e3a77b2fb);
}
.mypage-nav-list__item .icon.log-out:before {
background-image: url(/images/log-out-gray.svg?f73705fcfa66a7d2e633fb9e7559814e);
background-image: url(/images/log-out-gray.svg?861c1a3bffcbc6494ae12c18598d3b42);
}
.mypage-nav-list__link.user-icon figure {
display: flex;
@ -12929,7 +12929,7 @@ categories: [project]
@font-face {
font-family: "iconfont";
src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2);
src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2) format("eot"), url(/fonts/iconfont.woff?72290a51f520574be856b3621acc29a1) format("woff"), url(/fonts/iconfont.ttf?e240ce427caf7549e576c77b39a1d3f1) format("truetype"), url(/fonts/iconfont.svg?d812f238f7ec32f5cb5ebd322f320a02) format("svg");
src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2) format("eot"), url(/fonts/iconfont.woff?72290a51f520574be856b3621acc29a1) format("woff"), url(/fonts/iconfont.ttf?e240ce427caf7549e576c77b39a1d3f1) format("truetype"), url(/fonts/iconfont.svg?9e48c54f8bbb472c1c286234fdd6636f) format("svg");
font-weight: normal;
font-style: normal;
}
@ -13021,7 +13021,7 @@ categories: [project]
}
.icon-text:after {
background: url(/images/file-text.svg?8f97b8f8d94fb7edaf64c9378f4d499f) no-repeat;
background: url(/images/file-text.svg?eef62fb61b190a7078a1e41813859c13) no-repeat;
background-size: 35px 32px;
}
.icon-text-wrap {
@ -13056,7 +13056,7 @@ categories: [project]
}
}
.icon-search:after {
background: url(/images/search-gray.svg?8b2fb9457f03685273f66fb075949f53) no-repeat;
background: url(/images/search-gray.svg?c5c7a01d0dd6ebe7e325306d6ef0ba7a) no-repeat;
background-size: cover;
width: 20px;
height: 20px;
@ -13087,7 +13087,7 @@ categories: [project]
}
}
.icon-calendar:after {
background: url(/images/calendar.svg?7327232fcbb1cf046214d32574276d7b) no-repeat;
background: url(/images/calendar.svg?0d92b15ce0131234f89a2977b662a6c0) no-repeat;
background-size: cover;
width: 23px;
height: 25px;

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

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

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

@ -119,7 +119,7 @@ const ChildDetail = (props) => {
</span>
}
</div>
<p className="profile-name">{`${child.first_name} ${child.last_name}`}</p>
<p className="profile-name">{`${child.last_name} ${child.first_name}`}</p>
<div className="profile-info">
<div className="profile-info__item">
<p className="profile-info__icon">

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

@ -129,23 +129,23 @@ const ChildEdit = (props) => {
</div>
<div className="edit-set">
<label htmlFor="first_name" className="control-label ft-12"> 姓 </label>
<input type="text" name="first_name" id="first_name" className={`input-default input-nameSei input-h60 ${ _422errors.first_name && "is-invalid c-input__target" }`} value={first_name} onChange={e=>setFirstName(e.target.value)}/>
<label htmlFor="last_name" className="control-label ft-12"> 姓 </label>
<input type="text" name="last_name" id="last_name" className={`input-default input-nameSei input-h60 ${ _422errors.last_name && "is-invalid c-input__target" }`} value={last_name} onChange={e=>setLastName(e.target.value)}/>
{
_422errors.first_name &&
_422errors.last_name &&
<span className="l-alert__text--error ft-16 ft-md-14">
{ _422errors.first_name }
{ _422errors.last_name }
</span>
}
</div>
<div className="edit-set">
<label htmlFor="last_name" className="control-label ft-12"> 名 </label>
<input type="text" name="last_name" id="last_name" className={`input-default input-nameSei input-h60 ${ _422errors.last_name && "is-invalid c-input__target" }`} value={last_name} onChange={e=>setLastName(e.target.value)}/>
<label htmlFor="first_name" className="control-label ft-12"> 名 </label>
<input type="text" name="first_name" id="first_name" className={`input-default input-nameSei input-h60 ${ _422errors.first_name && "is-invalid c-input__target" }`} value={first_name} onChange={e=>setFirstName(e.target.value)}/>
{
_422errors.last_name &&
_422errors.first_name &&
<span className="l-alert__text--error ft-16 ft-md-14">
{ _422errors.last_name }
{ _422errors.first_name }
</span>
}
</div>

2
backend/resources/js/admin/child/index.jsx
ファイルの表示

@ -132,7 +132,7 @@ const Child = (props) => {
<img alt="name" className="avatar-img" src={ child.image } />
</div>
<div className="user-info">
<p className="user-name mb-1 font-weight-bold">{`${child.first_name} ${child.last_name}`}</p>
<p className="user-name mb-1 font-weight-bold">{`${child.last_name} ${child.first_name}`}</p>
<p className="user-tel">{ child.tel }</p>
</div>
</div>

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

@ -352,7 +352,7 @@ const MeetingEdit = (props) => {
id={`user_name${k}`}
checked = {item.checked}
onChange={e=>handleCheck(e, k)}/>
<span className="lbl padding-16">{`${item.first_name} ${item.last_name}`}</span>
<span className="lbl padding-16">{`${item.last_name} ${item.first_name}`}</span>
</label>
</div>
)

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

@ -104,23 +104,23 @@ const ChildSignUp = (props) => {
</div>
<div className="edit-set">
<label htmlFor="first_name" className="control-label"> 姓 </label>
<input type="text" name="first_name" id="first_name" className={`input-default input-nameSei input-h60 input-w480 ${ _422errors.first_name && "is-invalid c-input__target" }`} value={first_name} onChange={e=>setFirstName(e.target.value)}/>
<label htmlFor="last_name" className="control-label ft-12"> 姓 </label>
<input type="text" name="last_name" id="last_name" className={`input-default input-nameSei input-h60 ${ _422errors.last_name && "is-invalid c-input__target" }`} value={last_name} onChange={e=>setLastName(e.target.value)}/>
{
_422errors.first_name &&
_422errors.last_name &&
<span className="l-alert__text--error ft-16 ft-md-14">
{ _422errors.first_name }
{ _422errors.last_name }
</span>
}
</div>
<div className="edit-set">
<label htmlFor="last_name" className="control-label"> 名 </label>
<input type="text" name="last_name" id="last_name" className={`input-default input-nameSei input-h60 input-w480 ${ _422errors.last_name && "is-invalid c-input__target" }`} value={last_name} onChange={e=>setLastName(e.target.value)}/>
<label htmlFor="first_name" className="control-label ft-12"> 名 </label>
<input type="text" name="first_name" id="first_name" className={`input-default input-nameSei input-h60 ${ _422errors.first_name && "is-invalid c-input__target" }`} value={first_name} onChange={e=>setFirstName(e.target.value)}/>
{
_422errors.last_name &&
_422errors.first_name &&
<span className="l-alert__text--error ft-16 ft-md-14">
{ _422errors.last_name }
{ _422errors.first_name }
</span>
}
</div>

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

@ -130,23 +130,23 @@ const ProfileEdit = () => {
<form onSubmit={handleSubmit} className="edit-form">
<div className="edit-set">
<label htmlFor="first_name" className="control-label ft-12"> 姓 </label>
<input type="text" name="first_name" id="first_name" className={`input-default input-nameSei ${ _422errors.first_name && "is-invalid c-input__target" }`} value={first_name} onChange={e=>setFirstName(e.target.value)}/>
<label htmlFor="last_name" className="control-label ft-12"> 姓 </label>
<input type="text" name="last_name" id="last_name" className={`input-default input-nameSei input-h60 ${ _422errors.last_name && "is-invalid c-input__target" }`} value={last_name} onChange={e=>setLastName(e.target.value)}/>
{
_422errors.first_name &&
_422errors.last_name &&
<span className="l-alert__text--error ft-16 ft-md-14">
{ _422errors.first_name }
{ _422errors.last_name }
</span>
}
</div>
<div className="edit-set">
<label htmlFor="last_name" className="control-label ft-12"> 名 </label>
<input type="text" name="last_name" id="last_name" className={`input-default input-nameSei ${ _422errors.last_name && "is-invalid c-input__target" }`} value={last_name} onChange={e=>setLastName(e.target.value)}/>
<label htmlFor="first_name" className="control-label ft-12"> 名 </label>
<input type="text" name="first_name" id="first_name" className={`input-default input-nameSei input-h60 ${ _422errors.first_name && "is-invalid c-input__target" }`} value={first_name} onChange={e=>setFirstName(e.target.value)}/>
{
_422errors.last_name &&
_422errors.first_name &&
<span className="l-alert__text--error ft-16 ft-md-14">
{ _422errors.last_name }
{ _422errors.first_name }
</span>
}
</div>

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

@ -110,7 +110,7 @@ const Profile = (props) => {
</span>
}
</div>
<p className="profile-name">{`${profile.first_name} ${profile.last_name}`}</p>
<p className="profile-name">{`${profile.last_name} ${profile.first_name}`}</p>
<div className="profile-info">
<div className="profile-info__item">
<p className="profile-info__icon">

2
backend/resources/js/component/modal_setting_notify.jsx
ファイルの表示

@ -100,7 +100,7 @@ export default function ModalSettingNotify({show, handleClose, meetingId}){
<div className="user-avatar">
<img alt="name" className="avatar-img" src={item.child.image} />
</div>
<p className="user-name">{item.child.first_name}　{item.child.last_name}</p>
<p className="user-name">{item.child.last_name}　{item.child.first_name}</p>
</Link>
</div>
<div className="p-notification-btn">

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

@ -86,7 +86,7 @@ const ChildDetail = (props) => {
<div className="profile-thumb">
<img src={child.image} className="profile-image" alt="child-image" />
</div>
<p className="profile-name ft-xs-16">{`${child.first_name} ${child.last_name}`}</p>
<p className="profile-name ft-xs-16">{`${child.last_name} ${child.first_name}`}</p>
<div className="profile-info ft-xs-17">
<div className="profile-info__item">
<a href={`mailto:${child.email}`}>

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

@ -105,7 +105,7 @@ const Child = (props) => {
<img alt="name" className="avatar-img" src={item.image}/>
</div>
<div className="user-info">
<p className="user-name">{ item.first_name } { item.last_name }</p>
<p className="user-name">{ item.last_name } { item.first_name }</p>
<p className="user-tel">{ item.company }</p>
</div>
</div>

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

@ -332,7 +332,7 @@ const MeetingAdd = (props) => {
checked = {item.checked}
onChange={e=>handleCheck(e, k)}/>
<span className="lbl padding-16">
{`${item.first_name} ${item.last_name}`}
{`${item.last_name} ${item.first_name}`}
</span>
</label>
</div>

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

@ -370,7 +370,7 @@ useEffect(()=>{
checked = {item.checked}
onChange={e=>handleCheck(e, k)}/>
<span className="lbl padding-16">
{`${item.first_name} ${item.last_name}`}
{`${item.last_name} ${item.first_name}`}
</span>
</label>
</div>

2
backend/resources/js/parent/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({});
const [loaded, setLoaded] = useState(false);
const [_400error, set400Error] = useState('');
const [_422errors, set422Errors] = useState({ image: '' });