rename SPA routes
このコミットが含まれているのは:
コミット
8f440854f4
ファイル差分が大きすぎるため省略します
差分を読み込み
|
@ -10,7 +10,7 @@ import ModalConfirm from '../../component/modal_confirm';
|
|||
|
||||
|
||||
|
||||
const ChildDetail = (props) => {
|
||||
const AdminChildDetail = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
|
||||
|
@ -200,4 +200,4 @@ const ChildDetail = (props) => {
|
|||
}
|
||||
|
||||
|
||||
export default ChildDetail;
|
||||
export default AdminChildDetail;
|
||||
|
|
|
@ -6,7 +6,7 @@ import Alert from '../../component/alert';
|
|||
import PageLoader from '../../component/page_loader';
|
||||
|
||||
|
||||
const ChildEdit = (props) => {
|
||||
const AdminChildEdit = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
|
||||
|
@ -203,4 +203,4 @@ const ChildEdit = (props) => {
|
|||
}
|
||||
|
||||
|
||||
export default ChildEdit;
|
||||
export default AdminChildEdit;
|
|
@ -10,7 +10,7 @@ import PageLoader from '../../component/page_loader';
|
|||
const INFINITE = 10;
|
||||
const SCROLL_DELAY_TIME = 1500;
|
||||
|
||||
const Child = (props) => {
|
||||
const AdminChilds = (props) => {
|
||||
|
||||
const [keyword, setKeyword] = useState('')
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
|
@ -154,4 +154,4 @@ const Child = (props) => {
|
|||
)
|
||||
}
|
||||
|
||||
export default Child;
|
||||
export default AdminChilds;
|
|
@ -5,7 +5,7 @@ import { LoadingButton } from '@material-ui/lab';
|
|||
import Alert from '../../component/alert';
|
||||
|
||||
|
||||
const ChildPasswordEdit = (props) => {
|
||||
const AdminChildPasswordEdit = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
|
||||
|
@ -114,4 +114,4 @@ const ChildPasswordEdit = (props) => {
|
|||
}
|
||||
|
||||
|
||||
export default ChildPasswordEdit;
|
||||
export default AdminChildPasswordEdit;
|
||||
|
|
|
@ -2,22 +2,22 @@ import React, { Component } from 'react';
|
|||
import ReactDOM from 'react-dom';
|
||||
import { BrowserRouter, Route, Switch } from 'react-router-dom';
|
||||
|
||||
import Meeting from './meeting';
|
||||
import MeetingDetail from './meeting/detail';
|
||||
import MeetingEdit from './meeting/edit';
|
||||
import AdminMeetings from './meeting';
|
||||
import AdminMeetingDetail from './meeting/detail';
|
||||
import AdminMeetingEdit from './meeting/edit';
|
||||
|
||||
import Child from './child';
|
||||
import ChildDetail from './child/detail';
|
||||
import ChildEdit from './child/edit';
|
||||
import ChildPasswordEdit from './child/password_edit';
|
||||
import AdminChilds from './child';
|
||||
import AdminChildDetail from './child/detail';
|
||||
import AdminChildEdit from './child/edit';
|
||||
import AdminChildPasswordEdit from './child/password_edit';
|
||||
|
||||
import Parent from './parent';
|
||||
import ParentDetail from './parent/detail';
|
||||
import ParentEdit from './parent/edit';
|
||||
import ParentPasswordEdit from './parent/password_edit';
|
||||
import ParentRegister from './parent/register';
|
||||
import AdminParents from './parent';
|
||||
import AdminParentDetail from './parent/detail';
|
||||
import AdminParentEdit from './parent/edit';
|
||||
import AdminParentPasswordEdit from './parent/password_edit';
|
||||
import AdminParentAdd from './parent/add';
|
||||
|
||||
import Side from './side';
|
||||
import AdminSide from './side';
|
||||
import PageChangeHandler from '../component/page_change_handler';
|
||||
import ScrollToTop from '../component/scroll_top';
|
||||
|
||||
|
@ -29,22 +29,22 @@ export default class AdminApp extends Component {
|
|||
<ScrollToTop />
|
||||
<PageChangeHandler />
|
||||
<Switch>
|
||||
<Route exact path='/admin/meeting' component={Meeting} />
|
||||
<Route exact path='/admin/meeting/detail/:meeting_id' component={MeetingDetail} />
|
||||
<Route exact path='/admin/meeting/edit/:meeting_id' component={MeetingEdit} />
|
||||
<Route exact path='/admin/meeting' component={AdminMeetings} />
|
||||
<Route exact path='/admin/meeting/detail/:meeting_id' component={AdminMeetingDetail} />
|
||||
<Route exact path='/admin/meeting/edit/:meeting_id' component={AdminMeetingEdit} />
|
||||
|
||||
<Route exact path='/admin/child' component={Child} />
|
||||
<Route exact path='/admin/child/detail/:child_id' component={ChildDetail} />
|
||||
<Route exact path='/admin/child/edit/:child_id' component={ChildEdit} />
|
||||
<Route exact path='/admin/child/edit/password/:child_id' component={ChildPasswordEdit} />
|
||||
<Route exact path='/admin/child' component={AdminChilds} />
|
||||
<Route exact path='/admin/child/detail/:child_id' component={AdminChildDetail} />
|
||||
<Route exact path='/admin/child/edit/:child_id' component={AdminChildEdit} />
|
||||
<Route exact path='/admin/child/edit/password/:child_id' component={AdminChildPasswordEdit} />
|
||||
|
||||
<Route exact path='/admin/parent' component={Parent} />
|
||||
<Route exact path='/admin/parent/detail/:father_id' component={ParentDetail} />
|
||||
<Route exact path='/admin/parent/edit/:father_id' component={ParentEdit} />
|
||||
<Route exact path='/admin/parent/edit/password/:father_id' component={ParentPasswordEdit} />
|
||||
<Route exact path='/admin/parent/register' component={ParentRegister} />
|
||||
<Route exact path='/admin/parent' component={AdminParents} />
|
||||
<Route exact path='/admin/parent/detail/:father_id' component={AdminParentDetail} />
|
||||
<Route exact path='/admin/parent/edit/:father_id' component={AdminParentEdit} />
|
||||
<Route exact path='/admin/parent/edit/password/:father_id' component={AdminParentPasswordEdit} />
|
||||
<Route exact path='/admin/parent/register' component={AdminParentAdd} />
|
||||
</Switch>
|
||||
<Side />
|
||||
<AdminSide />
|
||||
</BrowserRouter>
|
||||
</main>
|
||||
);
|
||||
|
|
|
@ -9,7 +9,7 @@ import ModalConfirm from '../../component/modal_confirm';
|
|||
import Thumbnail from '../../component/thumbnail';
|
||||
import PageLoader from '../../component/page_loader';
|
||||
|
||||
const MeetingDetail = (props) => {
|
||||
const AdminMeetingDetail = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
|
@ -219,4 +219,4 @@ const MeetingDetail = (props) => {
|
|||
)
|
||||
}
|
||||
|
||||
export default MeetingDetail;
|
||||
export default AdminMeetingDetail;
|
|
@ -9,7 +9,7 @@ import PageLoader from '../../component/page_loader';
|
|||
import UploadingProgress from '../../component/modal_uploading';
|
||||
|
||||
|
||||
const MeetingEdit = (props) => {
|
||||
const AdminMeetingEdit = (props) => {
|
||||
const meeting_id = props.match.params.meeting_id;
|
||||
const history = useHistory();
|
||||
const [meeting, setMeeting] = useState(null);
|
||||
|
@ -391,4 +391,4 @@ const MeetingEdit = (props) => {
|
|||
)
|
||||
}
|
||||
|
||||
export default MeetingEdit;
|
||||
export default AdminMeetingEdit;
|
|
@ -10,7 +10,7 @@ import PageLoader from '../../component/page_loader';
|
|||
const INFINITE = 10;
|
||||
const SCROLL_DELAY_TIME = 1500;
|
||||
|
||||
const Meeting = (props) => {
|
||||
const AdminMeetings = (props) => {
|
||||
|
||||
const [keyword, setKeyword] = useState('')
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
|
@ -210,4 +210,4 @@ const Meeting = (props) => {
|
|||
)
|
||||
}
|
||||
|
||||
export default Meeting;
|
||||
export default AdminMeetings;
|
|
@ -5,7 +5,7 @@ import { LoadingButton } from '@material-ui/lab';
|
|||
import Alert from '../../component/alert';
|
||||
|
||||
|
||||
const ParentRegister = () => {
|
||||
const AdminParentAdd = () => {
|
||||
|
||||
const history = useHistory();
|
||||
|
||||
|
@ -91,4 +91,4 @@ const ParentRegister = () => {
|
|||
}
|
||||
|
||||
|
||||
export default ParentRegister;
|
||||
export default AdminParentAdd;
|
|
@ -15,7 +15,7 @@ const Transition = React.forwardRef(function Transition(props, ref) {
|
|||
|
||||
|
||||
|
||||
const ParentDetail = (props) => {
|
||||
const AdminParentDetail = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
|
||||
|
@ -201,4 +201,4 @@ const ParentDetail = (props) => {
|
|||
}
|
||||
|
||||
|
||||
export default ParentDetail;
|
||||
export default AdminParentDetail;
|
||||
|
|
|
@ -4,7 +4,7 @@ import { LoadingButton } from '@material-ui/lab';
|
|||
import Alert from '../../component/alert';
|
||||
import PageLoader from '../../component/page_loader';
|
||||
|
||||
const ParentEdit = (props) => {
|
||||
const AdminParentEdit = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
|
||||
|
@ -187,4 +187,4 @@ const ParentEdit = (props) => {
|
|||
}
|
||||
|
||||
|
||||
export default ParentEdit;
|
||||
export default AdminParentEdit;
|
|
@ -10,7 +10,7 @@ const INFINITE = 10;
|
|||
const SCROLL_DELAY_TIME = 1500;
|
||||
|
||||
|
||||
const Parent = (props) => {
|
||||
const AdminParents = (props) => {
|
||||
|
||||
const [keyword, setKeyword] = useState('')
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
|
@ -161,4 +161,4 @@ const Parent = (props) => {
|
|||
)
|
||||
}
|
||||
|
||||
export default Parent;
|
||||
export default AdminParents;
|
|
@ -5,7 +5,7 @@ import { LoadingButton } from '@material-ui/lab';
|
|||
import Alert from '../../component/alert';
|
||||
|
||||
|
||||
const ParentPasswordEdit = (props) => {
|
||||
const AdminParentPasswordEdit = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
|
||||
|
@ -112,4 +112,4 @@ const ParentPasswordEdit = (props) => {
|
|||
}
|
||||
|
||||
|
||||
export default ParentPasswordEdit;
|
||||
export default AdminParentPasswordEdit;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import React, { useState } from 'react';
|
||||
import { Link } from 'react-router-dom'
|
||||
|
||||
export default function Side() {
|
||||
export default function AdminSide() {
|
||||
const [selected, setSelected] = useState('');
|
||||
|
||||
const handleLogout = async () => {
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
import React, { Component } from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import Side from './side';
|
||||
import ChildSide from './side';
|
||||
|
||||
import Meeting from './meeting';
|
||||
import MeetingDetail from './meeting/detail';
|
||||
import ChildMeetings from './meeting';
|
||||
import ChildMeetingDetail from './meeting/detail';
|
||||
|
||||
import Parent from './parent';
|
||||
import ParentDetail from './parent/detail';
|
||||
import ChildParents from './parent';
|
||||
import ChildParentDetail from './parent/detail';
|
||||
|
||||
import Profile from './profile';
|
||||
import ProfileEdit from './profile/edit';
|
||||
import ProfilePasswordEdit from './profile/password_edit';
|
||||
import ProfileWithdrawal from './profile/withdrawal';
|
||||
import ChildProfileDetail from './profile';
|
||||
import ChildProfileEdit from './profile/edit';
|
||||
import ChildProfilePasswordEdit from './profile/password_edit';
|
||||
import ChildProfileWithdrawal from './profile/withdrawal';
|
||||
|
||||
import Search from './search';
|
||||
import ChildSearch from './search';
|
||||
|
||||
import { BrowserRouter, Route, Switch } from 'react-router-dom';
|
||||
import PageChangeHandler from '../component/page_change_handler';
|
||||
|
@ -28,18 +28,18 @@ export default class ChildApp extends Component {
|
|||
<PageChangeHandler />
|
||||
<ScrollToTop />
|
||||
<Switch>
|
||||
<Route exact path="/c-account/meeting" component = {Meeting} />
|
||||
<Route exact path="/c-account/meeting/detail/:meeting_id" component = {MeetingDetail} />
|
||||
<Route exact path="/c-account/search" component = {Search} />
|
||||
<Route exact path="/c-account/parent" component = {Parent} />
|
||||
<Route exact path="/c-account/parent/detail/:father_id" component = {ParentDetail} />
|
||||
<Route exact path="/c-account/meeting" component = {ChildMeetings} />
|
||||
<Route exact path="/c-account/meeting/detail/:meeting_id" component = {ChildMeetingDetail} />
|
||||
<Route exact path="/c-account/search" component = {ChildSearch} />
|
||||
<Route exact path="/c-account/parent" component = {ChildParents} />
|
||||
<Route exact path="/c-account/parent/detail/:father_id" component = {ChildParentDetail} />
|
||||
|
||||
<Route exact path="/c-account/profile" component = {Profile} />
|
||||
<Route exact path="/c-account/profile/edit/:child_id" component = {ProfileEdit} />
|
||||
<Route exact path="/c-account/profile/password-edit/:child_id" component = {ProfilePasswordEdit} />
|
||||
<Route exact path="/c-account/profile/withdrawal" component = {ProfileWithdrawal} />
|
||||
<Route exact path="/c-account/profile" component = {ChildProfileDetail} />
|
||||
<Route exact path="/c-account/profile/edit/:child_id" component = {ChildProfileEdit} />
|
||||
<Route exact path="/c-account/profile/password-edit/:child_id" component = {ChildProfilePasswordEdit} />
|
||||
<Route exact path="/c-account/profile/withdrawal" component = {ChildProfileWithdrawal} />
|
||||
</Switch>
|
||||
<Side />
|
||||
<ChildSide />
|
||||
</BrowserRouter>
|
||||
</main>
|
||||
);
|
||||
|
|
|
@ -10,7 +10,7 @@ import ModalConfirm from '../../component/modal_confirm';
|
|||
import Thumbnail from '../../component/thumbnail';
|
||||
import PageLoader from '../../component/page_loader';
|
||||
|
||||
const MeetingDetail = (props) => {
|
||||
const ChildMeetingDetail = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const child_id = localStorage.getItem('kiki_acc_id');
|
||||
|
@ -216,4 +216,4 @@ const MeetingDetail = (props) => {
|
|||
|
||||
|
||||
|
||||
export default MeetingDetail;
|
||||
export default ChildMeetingDetail;
|
||||
|
|
|
@ -10,7 +10,7 @@ import InfiniteScroll from "react-infinite-scroll-component";
|
|||
const INFINITE = 10;
|
||||
const SCROLL_DELAY_TIME = 1500;
|
||||
|
||||
const Meeting = () => {
|
||||
const ChildMeetings = () => {
|
||||
|
||||
const child_id = localStorage.getItem('kiki_acc_id');
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
@ -248,4 +248,4 @@ const Meeting = () => {
|
|||
|
||||
|
||||
|
||||
export default Meeting;
|
||||
export default ChildMeetings;
|
|
@ -5,7 +5,7 @@ import Notification from '../../component/notification';
|
|||
import Alert from '../../component/alert';
|
||||
import PageLoader from '../../component/page_loader';
|
||||
|
||||
const ParentDetail = (props) => {
|
||||
const ChildParentDetail = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
@ -115,4 +115,4 @@ const ParentDetail = (props) => {
|
|||
|
||||
|
||||
|
||||
export default ParentDetail;
|
||||
export default ChildParentDetail;
|
|
@ -9,7 +9,7 @@ import InfiniteScroll from "react-infinite-scroll-component";
|
|||
const INFINITE = 10;
|
||||
const SCROLL_DELAY_TIME = 1500;
|
||||
|
||||
const Parent = () => {
|
||||
const ChildParents = () => {
|
||||
|
||||
const history = useHistory();
|
||||
const child_id = localStorage.getItem('kiki_acc_id');
|
||||
|
@ -122,4 +122,4 @@ const Parent = () => {
|
|||
|
||||
|
||||
|
||||
export default Parent;
|
||||
export default ChildParents;
|
|
@ -7,7 +7,7 @@ import Alert from '../../component/alert';
|
|||
import PageLoader from '../../component/page_loader';
|
||||
|
||||
|
||||
const ProfileEdit = () => {
|
||||
const ChildProfileEdit = () => {
|
||||
|
||||
const history = useHistory();
|
||||
const child_id = localStorage.getItem('kiki_acc_id');
|
||||
|
@ -235,4 +235,4 @@ const ProfileEdit = () => {
|
|||
}
|
||||
|
||||
|
||||
export default ProfileEdit;
|
||||
export default ChildProfileEdit;
|
|
@ -9,7 +9,7 @@ import Notification from '../../component/notification';
|
|||
import copy from 'clipboard-copy';
|
||||
|
||||
|
||||
const Profile = (props) => {
|
||||
const ChildProfileDetail = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const child_id = localStorage.getItem('kiki_acc_id');
|
||||
|
@ -231,4 +231,4 @@ const Profile = (props) => {
|
|||
}
|
||||
|
||||
|
||||
export default Profile;
|
||||
export default ChildProfileDetail;
|
||||
|
|
|
@ -6,7 +6,7 @@ import Notification from '../../component/notification';
|
|||
import Alert from '../../component/alert';
|
||||
|
||||
|
||||
const ProfilePasswordEdit = () => {
|
||||
const ChildProfilePasswordEdit = () => {
|
||||
|
||||
const history = useHistory();
|
||||
const child_id = localStorage.getItem('kiki_acc_id');
|
||||
|
@ -117,4 +117,4 @@ const ProfilePasswordEdit = () => {
|
|||
}
|
||||
|
||||
|
||||
export default ProfilePasswordEdit;
|
||||
export default ChildProfilePasswordEdit;
|
||||
|
|
|
@ -4,7 +4,7 @@ import { LoadingButton } from '@material-ui/lab';
|
|||
import Notification from '../../component/notification';
|
||||
import Alert from '../../component/alert';
|
||||
|
||||
const ProfileWithdrawal = () => {
|
||||
const ChildProfileWithdrawal = () => {
|
||||
|
||||
const child_id = localStorage.getItem('kiki_acc_id');
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
@ -65,4 +65,4 @@ const ProfileWithdrawal = () => {
|
|||
}
|
||||
|
||||
|
||||
export default ProfileWithdrawal;
|
||||
export default ChildProfileWithdrawal;
|
|
@ -12,7 +12,7 @@ import InfiniteScroll from "react-infinite-scroll-component";
|
|||
const INFINITE = 10;
|
||||
const SCROLL_DELAY_TIME = 1500;
|
||||
|
||||
const Search = () => {
|
||||
const ChildSearch = () => {
|
||||
const [keyword, setKeyword] = useState('');
|
||||
const [tab_status, setTabStatus] = useState(false);
|
||||
const [meeting_list_non_approval, setMettingListNonApproval] = useState([]);
|
||||
|
@ -246,4 +246,4 @@ const Search = () => {
|
|||
)
|
||||
}
|
||||
|
||||
export default Search;
|
||||
export default ChildSearch;
|
|
@ -1,7 +1,7 @@
|
|||
import React, { useState } from 'react';
|
||||
import { Link } from 'react-router-dom'
|
||||
|
||||
export default function Side() {
|
||||
export default function ChildSide() {
|
||||
const [selected, setSelected] = useState('');
|
||||
|
||||
const child_img = document.getElementById('child_image').value;
|
||||
|
|
|
@ -5,7 +5,7 @@ import Notification from '../../component/notification';
|
|||
import copy from 'clipboard-copy';
|
||||
|
||||
|
||||
const ChildAdd = () => {
|
||||
const ParentChildAdd = () => {
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
const father_id = localStorage.getItem('kiki_acc_id');
|
||||
|
||||
|
@ -117,4 +117,4 @@ const ChildAdd = () => {
|
|||
)
|
||||
}
|
||||
|
||||
export default ChildAdd;
|
||||
export default ParentChildAdd;
|
||||
|
|
|
@ -7,7 +7,7 @@ import ModalConfirm from '../../component/modal_confirm';
|
|||
import Alert from '../../component/alert';
|
||||
import PageLoader from '../../component/page_loader';
|
||||
|
||||
const ChildDetail = (props) => {
|
||||
const ParentChildDetail = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
@ -170,4 +170,4 @@ const ChildDetail = (props) => {
|
|||
|
||||
|
||||
|
||||
export default ChildDetail;
|
||||
export default ParentChildDetail;
|
|
@ -10,7 +10,7 @@ import Alert from '../../component/alert';
|
|||
import PageLoader from '../../component/page_loader';
|
||||
import { useHistory } from 'react-router';
|
||||
|
||||
const ChildEdit = (props) => {
|
||||
const ParentChildEdit = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
@ -147,4 +147,4 @@ const ChildEdit = (props) => {
|
|||
)
|
||||
}
|
||||
|
||||
export default ChildEdit;
|
||||
export default ParentChildEdit;
|
|
@ -9,7 +9,7 @@ import InfiniteScroll from "react-infinite-scroll-component";
|
|||
const INFINITE = 10;
|
||||
const SCROLL_DELAY_TIME = 1500;
|
||||
|
||||
const Child = (props) => {
|
||||
const ParentChilds = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
@ -131,4 +131,4 @@ const Child = (props) => {
|
|||
|
||||
|
||||
|
||||
export default Child;
|
||||
export default ParentChilds;
|
||||
|
|
|
@ -12,7 +12,7 @@ import InfiniteScroll from "react-infinite-scroll-component";
|
|||
const INFINITE = 10;
|
||||
const SCROLL_DELAY_TIME = 1500;
|
||||
|
||||
const Favorite = (props) => {
|
||||
const ParentFavorite = (props) => {
|
||||
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
const father_id = localStorage.getItem('kiki_acc_id');
|
||||
|
@ -331,4 +331,4 @@ const Favorite = (props) => {
|
|||
|
||||
|
||||
|
||||
export default Favorite;
|
||||
export default ParentFavorite;
|
|
@ -1,24 +1,25 @@
|
|||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import Side from './side';
|
||||
|
||||
import Meeting from './meeting';
|
||||
import MeetingDetail from './meeting/detail';
|
||||
import MeetingAdd from './meeting/add';
|
||||
import MeetingEdit from './meeting/edit';
|
||||
import ParentSide from './side';
|
||||
|
||||
import Favorite from './favorite';
|
||||
import Search from './search';
|
||||
import ParentMeetings from './meeting';
|
||||
import ParentMeetingDetail from './meeting/detail';
|
||||
import ParentMeetingAdd from './meeting/add';
|
||||
import ParentMeetingEdit from './meeting/edit';
|
||||
|
||||
import Child from './child';
|
||||
import ChildAdd from './child/add';
|
||||
import ChildEdit from './child/edit';
|
||||
import ChildDetail from './child/detail';
|
||||
import ParentFavorite from './favorite';
|
||||
import ParentSearch from './search';
|
||||
|
||||
import Profile from './profile';
|
||||
import ProfileEdit from './profile/edit';
|
||||
import ProfilePasswordEdit from './profile/password_edit';
|
||||
import ProfileWithdrawal from './profile/withdrawal';
|
||||
import ParentChilds from './child';
|
||||
import ParentChildAdd from './child/add';
|
||||
import ParentChildEdit from './child/edit';
|
||||
import ParentChildDetail from './child/detail';
|
||||
|
||||
import ParentProfileDetail from './profile';
|
||||
import ParentProfileEdit from './profile/edit';
|
||||
import ParentProfilePasswordEdit from './profile/password_edit';
|
||||
import ParentProfileWithdrawal from './profile/withdrawal';
|
||||
|
||||
import { BrowserRouter, Route, Switch } from 'react-router-dom';
|
||||
import PageChangeHandler from '../component/page_change_handler';
|
||||
|
@ -31,26 +32,26 @@ export const App = () => {
|
|||
<ScrollToTop />
|
||||
<PageChangeHandler/>
|
||||
<Switch>
|
||||
<Route exact path='/p-account' component={Meeting} />
|
||||
<Route exact path='/p-account/meeting' component={Meeting} />
|
||||
<Route exact path='/p-account/meeting/detail/:meeting_id' component={MeetingDetail} />
|
||||
<Route exact path='/p-account/meeting/new' component={MeetingAdd} />
|
||||
<Route exact path='/p-account/meeting/edit/:meeting_id' component={MeetingEdit} />
|
||||
<Route exact path='/p-account' component={ParentMeetings} />
|
||||
<Route exact path='/p-account/meeting' component={ParentMeetings} />
|
||||
<Route exact path='/p-account/meeting/detail/:meeting_id' component={ParentMeetingDetail} />
|
||||
<Route exact path='/p-account/meeting/new' component={ParentMeetingAdd} />
|
||||
<Route exact path='/p-account/meeting/edit/:meeting_id' component={ParentMeetingEdit} />
|
||||
|
||||
<Route exact path='/p-account/favorite' component={Favorite} />
|
||||
<Route exact path='/p-account/search' component={Search} />
|
||||
<Route exact path='/p-account/favorite' component={ParentFavorite} />
|
||||
<Route exact path='/p-account/search' component={ParentSearch} />
|
||||
|
||||
<Route exact path='/p-account/child' component={Child} />
|
||||
<Route exact path='/p-account/child/add' component={ChildAdd} />
|
||||
<Route exact path='/p-account/child/edit/hire-date/:child_id' component={ChildEdit} />
|
||||
<Route exact path='/p-account/child/detail/:child_id' component={ChildDetail} />
|
||||
<Route exact path='/p-account/child' component={ParentChilds} />
|
||||
<Route exact path='/p-account/child/add' component={ParentChildAdd} />
|
||||
<Route exact path='/p-account/child/edit/hire-date/:child_id' component={ParentChildEdit} />
|
||||
<Route exact path='/p-account/child/detail/:child_id' component={ParentChildDetail} />
|
||||
|
||||
<Route exact path='/p-account/profile' component={Profile} />
|
||||
<Route exact path='/p-account/profile/edit/:father_id' component={ProfileEdit} />
|
||||
<Route exact path='/p-account/profile/edit/password/:father_id' component={ProfilePasswordEdit} />
|
||||
<Route exact path='/p-account/profile/withdrawal' component={ProfileWithdrawal} />
|
||||
<Route exact path='/p-account/profile' component={ParentProfileDetail} />
|
||||
<Route exact path='/p-account/profile/edit/:father_id' component={ParentProfileEdit} />
|
||||
<Route exact path='/p-account/profile/edit/password/:father_id' component={ParentProfilePasswordEdit} />
|
||||
<Route exact path='/p-account/profile/withdrawal' component={ParentProfileWithdrawal} />
|
||||
</Switch>
|
||||
<Side />
|
||||
<ParentSide />
|
||||
</BrowserRouter>
|
||||
</main>
|
||||
);
|
||||
|
|
|
@ -10,7 +10,7 @@ import PageLoader from '../../component/page_loader';
|
|||
import UploadingProgress from '../../component/modal_uploading';
|
||||
|
||||
|
||||
const MeetingAdd = (props) => {
|
||||
const ParentMeetingAdd = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const father_id = localStorage.getItem('kiki_acc_id');
|
||||
|
@ -389,4 +389,4 @@ const MeetingAdd = (props) => {
|
|||
)
|
||||
}
|
||||
|
||||
export default MeetingAdd;
|
||||
export default ParentMeetingAdd;
|
|
@ -11,7 +11,7 @@ import Alert from '../../component/alert';
|
|||
import Thumbnail from '../../component/thumbnail';
|
||||
import PageLoader from '../../component/page_loader';
|
||||
|
||||
const MeetingDetail = (props) => {
|
||||
const ParentMeetingDetail = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
@ -320,4 +320,4 @@ const MeetingDetail = (props) => {
|
|||
)
|
||||
}
|
||||
|
||||
export default MeetingDetail;
|
||||
export default ParentMeetingDetail;
|
|
@ -13,7 +13,7 @@ import UploadingProgress from '../../component/modal_uploading';
|
|||
|
||||
|
||||
|
||||
const MeetingEdit = (props) => {
|
||||
const ParentMeetingEdit = (props) => {
|
||||
|
||||
const history = useHistory();
|
||||
const father_id = localStorage.getItem('kiki_acc_id');
|
||||
|
@ -434,4 +434,4 @@ useEffect(()=>{
|
|||
)
|
||||
}
|
||||
|
||||
export default MeetingEdit;
|
||||
export default ParentMeetingEdit;
|
|
@ -11,7 +11,7 @@ import InfiniteScroll from "react-infinite-scroll-component";
|
|||
const INFINITE = 10;
|
||||
const SCROLL_DELAY_TIME = 1500;
|
||||
|
||||
const Meeting = (props) => {
|
||||
const ParentMeetings = (props) => {
|
||||
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
const father_id = localStorage.getItem('kiki_acc_id');
|
||||
|
@ -338,4 +338,4 @@ const Meeting = (props) => {
|
|||
|
||||
|
||||
|
||||
export default Meeting;
|
||||
export default ParentMeetings;
|
|
@ -5,7 +5,7 @@ import Alert from '../../component/alert';
|
|||
import PageLoader from '../../component/page_loader';
|
||||
import { useHistory } from 'react-router';
|
||||
|
||||
const ProfileEdit = () => {
|
||||
const ParentProfileEdit = () => {
|
||||
|
||||
const history = useHistory();
|
||||
const father_id = localStorage.getItem('kiki_acc_id');
|
||||
|
@ -188,4 +188,4 @@ const ProfileEdit = () => {
|
|||
)
|
||||
}
|
||||
|
||||
export default ProfileEdit;
|
||||
export default ParentProfileEdit;
|
|
@ -7,7 +7,7 @@ import Alert from '../../component/alert';
|
|||
import PageLoader from '../../component/page_loader';
|
||||
import Notification from '../../component/notification';
|
||||
|
||||
const Profile = (props) => {
|
||||
const ParentProfileDetail = (props) => {
|
||||
const history = useHistory();
|
||||
const father_id = localStorage.getItem('kiki_acc_id');
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
@ -214,4 +214,4 @@ const Profile = (props) => {
|
|||
}
|
||||
|
||||
|
||||
export default Profile;
|
||||
export default ParentProfileDetail;
|
||||
|
|
|
@ -5,7 +5,7 @@ import Notification from '../../component/notification';
|
|||
import Alert from '../../component/alert';
|
||||
|
||||
|
||||
const ProfilePasswordEdit = () => {
|
||||
const ParentProfilePasswordEdit = () => {
|
||||
const history = useHistory();
|
||||
const father_id = localStorage.getItem('kiki_acc_id');
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
@ -116,4 +116,4 @@ const ProfilePasswordEdit = () => {
|
|||
}
|
||||
|
||||
|
||||
export default ProfilePasswordEdit;
|
||||
export default ParentProfilePasswordEdit;
|
||||
|
|
|
@ -3,7 +3,7 @@ import { LoadingButton } from '@material-ui/lab';
|
|||
import Notification from '../../component/notification';
|
||||
import Alert from '../../component/alert';
|
||||
|
||||
const ProfileWithdrawal = () => {
|
||||
const ParentProfileWithdrawal = () => {
|
||||
|
||||
const father_id = localStorage.getItem('kiki_acc_id');
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
@ -63,4 +63,4 @@ const ProfileWithdrawal = () => {
|
|||
}
|
||||
|
||||
|
||||
export default ProfileWithdrawal;
|
||||
export default ParentProfileWithdrawal;
|
|
@ -12,7 +12,7 @@ import InfiniteScroll from "react-infinite-scroll-component";
|
|||
const INFINITE = 10;
|
||||
const SCROLL_DELAY_TIME = 1500;
|
||||
|
||||
const Search = (props) => {
|
||||
const ParentSearch = (props) => {
|
||||
|
||||
const father_id = localStorage.getItem('kiki_acc_id');
|
||||
const [notice, setNotice] = useState(localStorage.getItem('notice'));
|
||||
|
@ -341,4 +341,4 @@ const Search = (props) => {
|
|||
|
||||
|
||||
|
||||
export default Search;
|
||||
export default ParentSearch;
|
|
@ -1,7 +1,7 @@
|
|||
import React, { useState } from 'react';
|
||||
import { Link } from 'react-router-dom'
|
||||
|
||||
export default function Side() {
|
||||
export default function ParentSide() {
|
||||
const [selected, setSelected] = useState('');
|
||||
|
||||
const father_image = document.getElementById('father_image').value;
|
||||
|
|
新しいイシューから参照