From d537b99309e80eb4572c159deae532e454b7a5a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=88=E3=83=A9=E3=83=B3=E3=82=AE=E3=83=A3=E3=83=BC?= Date: Sun, 3 Oct 2021 00:08:39 +0700 Subject: [PATCH] =?UTF-8?q?p-account=E3=81=AESPA=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E3=80=81=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=81=AEAPI=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/package.json | 15 +- backend/resources/js/app.js | 19 +- backend/resources/js/parent/app.js | 62 +++ backend/resources/js/parent/child/add.jsx | 107 ++--- backend/resources/js/parent/child/detail.jsx | 124 +++--- backend/resources/js/parent/child/edit.jsx | 78 ++-- backend/resources/js/parent/child/index.jsx | 182 ++++---- .../resources/js/parent/favorite/index.jsx | 376 ++++++++-------- backend/resources/js/parent/meeting/add.jsx | 158 ++++--- .../resources/js/parent/meeting/detail.jsx | 12 +- backend/resources/js/parent/meeting/edit.jsx | 12 +- backend/resources/js/parent/meeting/index.jsx | 160 ++++--- backend/resources/js/parent/profile/edit.jsx | 102 ++--- backend/resources/js/parent/profile/index.jsx | 186 ++++---- .../js/parent/profile/password_edit.jsx | 84 ++-- .../js/parent/profile/withdrawal.jsx | 74 ++-- .../js/parent/profile/withdrawal_complete.jsx | 74 ++-- backend/resources/js/parent/search/index.jsx | 403 +++++++++--------- .../views/p_account/child/add.blade.php | 2 +- .../views/p_account/child/detail.blade.php | 2 +- .../views/p_account/child/edit.blade.php | 2 +- .../views/p_account/child/index.blade.php | 2 +- .../views/p_account/favorite/index.blade.php | 2 +- .../views/p_account/meeting/add.blade.php | 2 +- .../views/p_account/meeting/detail.blade.php | 2 +- .../views/p_account/meeting/edit.blade.php | 2 +- .../views/p_account/meeting/index.blade.php | 2 +- .../views/p_account/profile/edit.blade.php | 3 +- .../views/p_account/profile/index.blade.php | 2 +- .../p_account/profile/password_edit.blade.php | 2 +- .../p_account/profile/withdrawal.blade.php | 2 +- .../profile/withdrawal_complete.blade.php | 2 +- .../views/p_account/search/index.blade.php | 2 +- 33 files changed, 1082 insertions(+), 1177 deletions(-) create mode 100644 backend/resources/js/parent/app.js diff --git a/backend/package.json b/backend/package.json index 725ce79d..e68bdd61 100644 --- a/backend/package.json +++ b/backend/package.json @@ -10,7 +10,7 @@ "production": "mix --production" }, "dependencies": { - "@emotion/react": "^11.4.0", + "@emotion/react": "^11.4.1", "@emotion/styled": "^11.3.0", "@iconify/icons-ant-design": "^1.1.0", "@iconify/icons-eva": "^1.1.0", @@ -21,6 +21,7 @@ "@material-ui/styles": "^5.0.0-beta.1", "@material-ui/utils": "^5.0.0-beta.0", "@mui/icons-material": "^5.0.1", + "@mui/material": "^5.0.2", "@testing-library/jest-dom": "^5.14.1", "apexcharts": "^3.27.3", "change-case": "^4.1.2", @@ -41,7 +42,7 @@ "react-helmet-async": "^1.0.9", "react-image-crop-component": "^1.1.2", "react-paginate": "^7.1.3", - "react-router-dom": "^6.0.0-beta.0", + "react-router-dom": "^5.2.1", "react-scripts": "4.0.0", "react-select": "^4.3.1", "react-simple-star-rating": "^3.0.0", @@ -52,10 +53,10 @@ "yup": "^0.32.9" }, "devDependencies": { - "@babel/core": "^7.14.8", + "@babel/core": "^7.15.5", "@babel/eslint-parser": "^7.14.7", "@babel/preset-react": "^7.0.0", - "axios": "^0.21", + "axios": "^0.21.4", "bootstrap": "^4.0.0", "eslint": "^7.31.0", "eslint-config-airbnb": "^18.2.1", @@ -65,13 +66,13 @@ "eslint-plugin-import": "^2.23.4", "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-prettier": "^3.4.0", - "eslint-plugin-react": "^7.24.0", + "eslint-plugin-react": "^7.26.1", "eslint-plugin-react-hooks": "^4.2.0", "jquery": "^3.2", - "laravel-mix": "^6.0.6", + "laravel-mix": "^6.0.31", "lodash": "^4.17.19", "popper.js": "^1.12", - "postcss": "^8.1.14", + "postcss": "^8.3.8", "prettier": "^2.3.1", "resolve-url-loader": "^3.1.2", "sass": "^1.42.1", diff --git a/backend/resources/js/app.js b/backend/resources/js/app.js index 903b88b1..1135d438 100644 --- a/backend/resources/js/app.js +++ b/backend/resources/js/app.js @@ -1,23 +1,6 @@ require('./bootstrap'); -require('./parent/meeting'); -require('./parent/meeting/add'); -require('./parent/meeting/edit'); -require('./parent/meeting/detail'); - -require('./parent/favorite'); -require('./parent/search'); - -require('./parent/child'); -require('./parent/child/add'); -require('./parent/child/edit'); -require('./parent/child/detail'); - -require('./parent/profile'); -require('./parent/profile/password_edit'); -require('./parent/profile/edit'); -require('./parent/profile/withdrawal'); -require('./parent/profile/withdrawal_complete'); +require('./parent/app'); require('./pages/contact'); require('./pages/contact/complete'); diff --git a/backend/resources/js/parent/app.js b/backend/resources/js/parent/app.js new file mode 100644 index 00000000..f714518b --- /dev/null +++ b/backend/resources/js/parent/app.js @@ -0,0 +1,62 @@ +import React, { Component } from 'react'; +import ReactDOM from 'react-dom'; +import Side from '../component/side'; + +import Meeting from '../parent/meeting'; +import MeetingDetail from '../parent/meeting/detail'; +import MeetingAdd from '../parent/meeting/add'; +import MeetingEdit from '../parent/meeting/edit'; + +import Favorite from '../parent/favorite'; +import Search from '../parent/search'; + +import Child from '../parent/child'; +import ChildAdd from '../parent/child/add'; +import ChildEdit from '../parent/child/edit'; +import ChildDetail from '../parent/child/detail'; + +import Profile from '../parent/profile'; +import ProfileEdit from '../parent/profile/edit'; +import ProfilePasswordEdit from '../parent/profile/password_edit'; +import ProfileWithdrawal from '../parent/profile/withdrawal'; +import ProfileWithdrawalComplete from '../parent/profile/withdrawal_complete'; + +import { BrowserRouter, Route, Switch } from 'react-router-dom' +export default class App extends Component { + render() { + return ( +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ ); + } +} + +if(document.getElementById('p-app')){ + ReactDOM.render( + , + document.getElementById('p-app') + ) +} \ No newline at end of file diff --git a/backend/resources/js/parent/child/add.jsx b/backend/resources/js/parent/child/add.jsx index ff95eb83..5537de44 100644 --- a/backend/resources/js/parent/child/add.jsx +++ b/backend/resources/js/parent/child/add.jsx @@ -1,88 +1,45 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; const ChildAdd = () => { return ( -
-
-
-
-
-

子詳細

-
-
-
-
-
1
-
- -
-
-
+
+
+
+
+

子追加

- -
-
-
-
-
- {/* */} -
-

田中 達也

-
-
-

- メール -

-

chankan77@gmail.com

-
-
-

- 電話 -

-

08012927104

-
-
-

- 会社名 -

-

株式会社ZOTMAN

-
-
-

- 日付 -

-

2021/7/12

-
-
- - - -
- -
-
+
+
+
+
1
+
+
+ +
+
+
+
+ +
+
+ + +
+ + +
+ +
+
+
+
- -
+ ) } -if(document.getElementById('p-child-add')){ - ReactDOM.render( - , - document.getElementById('p-child-add') - ) -} \ No newline at end of file +export default ChildAdd; \ No newline at end of file diff --git a/backend/resources/js/parent/child/detail.jsx b/backend/resources/js/parent/child/detail.jsx index b5e0f851..ea1f68ef 100644 --- a/backend/resources/js/parent/child/detail.jsx +++ b/backend/resources/js/parent/child/detail.jsx @@ -4,85 +4,77 @@ import Side from '../../component/side'; const ChildDetail = () => { return ( -
-
-
-
-
-

子詳細

-
-
-
-
-
1
-
- -
+
+
+
+
+

子詳細

+
+
+
+
+
1
+
+
- -
-
-
-
-
- {/* */} +
+ +
+
+
+
+
+ {/* */} +
+

田中 達也

+
+
+

+ メール +

+

chankan77@gmail.com

-

田中 達也

-
-
-

- メール -

-

chankan77@gmail.com

-
-
-

- 電話 -

-

08012927104

-
-
-

- 会社名 -

-

株式会社ZOTMAN

-
-
-

- 日付 -

-

2021/7/12

-
+
+

+ 電話 +

+

08012927104

- -
- - 入社日を変更 - +
+

+ 会社名 +

+

株式会社ZOTMAN

- -
- +
+

+ 日付 +

+

2021/7/12

+ + + +
+ +
- -
+ ) } -if(document.getElementById('p-child-detail')){ - ReactDOM.render( - , - document.getElementById('p-child-detail') - ) -} \ No newline at end of file +export default ChildDetail; \ No newline at end of file diff --git a/backend/resources/js/parent/child/edit.jsx b/backend/resources/js/parent/child/edit.jsx index 101c69ba..36926cf5 100644 --- a/backend/resources/js/parent/child/edit.jsx +++ b/backend/resources/js/parent/child/edit.jsx @@ -1,56 +1,46 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; const ChildEdit = () => { return ( -
-
-
-
-
-

入社日を変更

-
-
-
-
-
1
-
- -
-
-
+
+
+
+
+

入社日を変更

- -
-
-
-
- -
-
- - - -
- - -
- -
+
+
+
+
1
+
+
-
+
+ +
+
+
+
+ +
+
+ + + +
+ + +
+ +
+
+
+
- -
+ ) } -if(document.getElementById('p-child-edit')){ - ReactDOM.render( - , - document.getElementById('p-child-edit') - ) -} \ No newline at end of file +export default ChildEdit; \ No newline at end of file diff --git a/backend/resources/js/parent/child/index.jsx b/backend/resources/js/parent/child/index.jsx index df37edbe..bc52cd5d 100644 --- a/backend/resources/js/parent/child/index.jsx +++ b/backend/resources/js/parent/child/index.jsx @@ -4,105 +4,97 @@ import Side from '../../component/side'; const Child = () => { return ( -
-
+ + + ) } -if(document.getElementById('p-child')){ - ReactDOM.render( - , - document.getElementById('p-child') - ) -} \ No newline at end of file +export default Child; \ No newline at end of file diff --git a/backend/resources/js/parent/favorite/index.jsx b/backend/resources/js/parent/favorite/index.jsx index 6fb5be9c..f97b0e21 100644 --- a/backend/resources/js/parent/favorite/index.jsx +++ b/backend/resources/js/parent/favorite/index.jsx @@ -1,220 +1,210 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; const Favorite = () => { return ( -
-
-
-
-

お気に入り

-
-
-
-
-
1
-
- -
+
+
+
+

お気に入り

+
+
+
+
+
1
+
+
+
-
-
-
-
- - - -
- - -
+
+
+
+
+ + + +
+ +
- -
-
-
- -

ミーティングタイトルミーティングタイトルミーテ

-

ミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティングミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティング

- -
-
-
-
    -
  • 3
    • -
  • 4
    • -
- -
    -
  • -
    - name -
    -
    • -
  • -
    - name -
    -
    • -
  • -
    - name -
    -
    • -
-
+
+ +
+ -
- -

ミーティングタイトルミーティングタイトルミーテ

-

ミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティングミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティング

- -
-
-
-
    -
  • 3
    • -
  • 4
    • -
- -
    -
  • -
    - name -
    -
    • -
  • -
    - name -
    -
    • -
  • -
    - name -
    -
    • -
-
+ +
+ +

ミーティングタイトルミーティングタイトルミーテ

+

ミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティングミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティング詳細ミーティング

+ + - - - - +
+ + +
+ -
- -
+ ) } -if(document.getElementById('p-favorite')){ - ReactDOM.render( - , - document.getElementById('p-favorite') - ) -} \ No newline at end of file +export default Favorite; \ No newline at end of file diff --git a/backend/resources/js/parent/meeting/add.jsx b/backend/resources/js/parent/meeting/add.jsx index d0068db0..ec4940aa 100644 --- a/backend/resources/js/parent/meeting/add.jsx +++ b/backend/resources/js/parent/meeting/add.jsx @@ -1,96 +1,86 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; const MeetingAdd = () => { return ( -
-
-
-
-
-

ミーティング作成

-
-
-
-
-
1
-
- -
-
-
+
+
+
+
+

ミーティング作成

- -
-
-
-
-
-
-
-
- - -
-
- - -
-
- -
-
- -
- -
-
-
-
-
-
-
-
-
-
-
-
- -
- -
- -
- -
- - -
-
-
-
+
+
+
+
1
+
+
-
- -
+ +
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+ +
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+ +
+ +
+ +
+ + +
+
+
+
+
+
+
+ + ) } -if(document.getElementById('p-meeting-add')){ - ReactDOM.render( - , - document.getElementById('p-meeting-add') - ) -} \ No newline at end of file +export default MeetingAdd; \ No newline at end of file diff --git a/backend/resources/js/parent/meeting/detail.jsx b/backend/resources/js/parent/meeting/detail.jsx index 1ae5b2d3..aae4fa24 100644 --- a/backend/resources/js/parent/meeting/detail.jsx +++ b/backend/resources/js/parent/meeting/detail.jsx @@ -1,10 +1,7 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; const MeetingDetail = () => { return ( -
@@ -140,14 +137,7 @@ const MeetingDetail = () => {
- -
) } -if(document.getElementById('p-meeting-detail')){ - ReactDOM.render( - , - document.getElementById('p-meeting-detail') - ) -} \ No newline at end of file +export default MeetingDetail; \ No newline at end of file diff --git a/backend/resources/js/parent/meeting/edit.jsx b/backend/resources/js/parent/meeting/edit.jsx index e91a3f2f..a011d08f 100644 --- a/backend/resources/js/parent/meeting/edit.jsx +++ b/backend/resources/js/parent/meeting/edit.jsx @@ -1,10 +1,7 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; const MeetingEdit = () => { return ( -
@@ -104,14 +101,7 @@ const MeetingEdit = () => {
- -
) } -if(document.getElementById('p-meeting-edit')){ - ReactDOM.render( - , - document.getElementById('p-meeting-edit') - ) -} \ No newline at end of file +export default MeetingEdit; \ No newline at end of file diff --git a/backend/resources/js/parent/meeting/index.jsx b/backend/resources/js/parent/meeting/index.jsx index fa00e9af..c7eaee28 100644 --- a/backend/resources/js/parent/meeting/index.jsx +++ b/backend/resources/js/parent/meeting/index.jsx @@ -1,105 +1,95 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; const Meeting = () => { return ( -
-
-
-
-

ミーティング一覧

- +
+
+
+

ミーティング一覧

+ -
-
-
-
1
-
- - - -
+
+
+
+
+
1
+
+ + +
+
-
-
-
-
- - - -
- - -
+
+
+
+
+ + + +
+ +
- -
- -
- -
+ + ) } -if(document.getElementById('p-meeting')){ - ReactDOM.render( - , - document.getElementById('p-meeting') - ) -} \ No newline at end of file +export default Meeting; \ No newline at end of file diff --git a/backend/resources/js/parent/profile/edit.jsx b/backend/resources/js/parent/profile/edit.jsx index 491c8771..177ef83a 100644 --- a/backend/resources/js/parent/profile/edit.jsx +++ b/backend/resources/js/parent/profile/edit.jsx @@ -1,71 +1,61 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; const ProfileEdit = () => { return ( -
-
-
-
-
-

プロフィール編集

-
-
-
-
-
1
-
- -
+
+
+
+
+

プロフィール編集

+
+
+
+
+
1
+
+
- -
-
-
-
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- - -
- -
+
+ +
+
+
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + +
+
- -
+ ) } -if(document.getElementById('p-profile-edit')){ - ReactDOM.render( - , - document.getElementById('p-profile-edit') - ) -} \ No newline at end of file +export default ProfileEdit; \ No newline at end of file diff --git a/backend/resources/js/parent/profile/index.jsx b/backend/resources/js/parent/profile/index.jsx index 3025cf8a..a87e16f1 100644 --- a/backend/resources/js/parent/profile/index.jsx +++ b/backend/resources/js/parent/profile/index.jsx @@ -1,96 +1,126 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; +import axios from 'axios'; +import { useHistory } from 'react-router-dom' const Profile = () => { + const [child, setChild] = useState(null); + const history = useHistory(); + useEffect(() => { + axios.get('/api/children/detail/1', {params: { father_id: 1 }}).then((response) => { + if(response.data.status_code==200){ + console.log(response.data.params[0]); + setChild(response.data.params[0]); + } else if(response.data.status_code==400){ + //TODO + } + + }); + }, []); + + if (!child) return null; + return ( -
-
-
-
-
-

プロフィール

-
-
-
-
-
1
-
- -
+
+
+
+
+

プロフィール

+
+
+
+
+
1
+
+ + + + + +
- -
-
-
-
-
- {/*
+ +
+
+
+
+
+ {/* */} +
+ */} -
- -
+ +
-

田中 達也

-
-
-

- メール -

-

chankan77@gmail.com

-
-
-

- 電話 -

-

08012927104

-
-
-

ああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああああ

-
-
- - - - - -
- -
- -
- -
-
+

{ child.last_name }　{ child.first_name }

+
+
+

+ メール +

+

{ child.email }

+
+
+

+ 電話 +

+

{ child.tel }

+
+
+

{ child.company }

+
+
+ + + + +
+ +
+ +
+ +
+
- -
+ ) } -if(document.getElementById('p-profile')){ - ReactDOM.render( - , - document.getElementById('p-profile') - ) -} \ No newline at end of file +export default Profile; \ No newline at end of file diff --git a/backend/resources/js/parent/profile/password_edit.jsx b/backend/resources/js/parent/profile/password_edit.jsx index 57dc5d8b..3c0fc50d 100644 --- a/backend/resources/js/parent/profile/password_edit.jsx +++ b/backend/resources/js/parent/profile/password_edit.jsx @@ -1,59 +1,49 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; const ProfilePasswordEdit = () => { return ( -
-
-
-
-
-

パスワード編集

-
-
-
-
-
1
-
- -
-
-
+
+
+
+
+

パスワード編集

- -
-
-
-
- -
-
- - -
-
- - -
- - -
- -
+
+
+
+
1
+
+
-
+
+ +
+
+
+
+ +
+
+ + +
+
+ + +
+ + +
+ +
+
+
+
- -
+ ) } -if(document.getElementById('p-profile-password-edit')){ - ReactDOM.render( - , - document.getElementById('p-profile-password-edit') - ) -} \ No newline at end of file +export default ProfilePasswordEdit; \ No newline at end of file diff --git a/backend/resources/js/parent/profile/withdrawal.jsx b/backend/resources/js/parent/profile/withdrawal.jsx index 47b2d5b2..db782251 100644 --- a/backend/resources/js/parent/profile/withdrawal.jsx +++ b/backend/resources/js/parent/profile/withdrawal.jsx @@ -1,54 +1,44 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; const ProfileWithdrawal = () => { return ( -
-
-
-
-
-

退会確認

-
-
-
-
-
1
-
- -
-
-
+
+
+
+
+

退会確認

- -
-
-
-
- -
-
-

本当に退会してもよろしいでしょうか？

-
- - -
- -
+
+
+
+
1
+
+
-
+
+ +
+
+
+
+ +
+
+

本当に退会してもよろしいでしょうか？

+
+ + +
+ +
+
+
+
- -
+ ) } -if(document.getElementById('p-profile-withdrawal')){ - ReactDOM.render( - , - document.getElementById('p-profile-withdrawal') - ) -} \ No newline at end of file +export default ProfileWithdrawal; \ No newline at end of file diff --git a/backend/resources/js/parent/profile/withdrawal_complete.jsx b/backend/resources/js/parent/profile/withdrawal_complete.jsx index 67103f9c..a83e36ef 100644 --- a/backend/resources/js/parent/profile/withdrawal_complete.jsx +++ b/backend/resources/js/parent/profile/withdrawal_complete.jsx @@ -1,54 +1,44 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; const ProfileWithdrawalComplete = () => { return ( -
-
-
-
-
-

退会完了

-
-
-
-
-
1
-
- -
-
-
+
+
+
+
+

退会完了

- -
-
-
-
- -
-

退会完了しました。
今後とも、危機管理をよろしくお願いいたします。

-
- -
- -
- -
+
+
+
+
1
+
+
-
+
+ +
+
+
+
+ +
+

退会完了しました。
今後とも、危機管理をよろしくお願いいたします。

+
+ +
+ +
+ +
+
+
+
- -
+ ) } -if(document.getElementById('p-profile-withdrawal-complete')){ - ReactDOM.render( - , - document.getElementById('p-profile-withdrawal-complete') - ) -} \ No newline at end of file +export default ProfileWithdrawalComplete; \ No newline at end of file diff --git a/backend/resources/js/parent/search/index.jsx b/backend/resources/js/parent/search/index.jsx index 92c9437a..00c997dd 100644 --- a/backend/resources/js/parent/search/index.jsx +++ b/backend/resources/js/parent/search/index.jsx @@ -1,219 +1,208 @@ import React, { useEffect, useState } from 'react'; -import ReactDOM from 'react-dom'; -import Side from '../../component/side'; const Search = () => { return ( -
-
-
-
-

検索

-
-
-
-
-
1
-
- -
-
-
+
+
+
+

検索

- -
-
-
-
-
- - - -
- - - - -
- - -
-
- -
- - - -
+
+
+
+
1
+
+
-
+
- -
+
+
+
+
+
+ + + +
+ + + + +
+ + +
+
+ +
+ + + +
+
+
+
+ ) } -if(document.getElementById('p-search')){ - ReactDOM.render( - , - document.getElementById('p-search') - ) -} \ No newline at end of file +export default Search; \ No newline at end of file diff --git a/backend/resources/views/p_account/child/add.blade.php b/backend/resources/views/p_account/child/add.blade.php index 3f16899e..9f075751 100644 --- a/backend/resources/views/p_account/child/add.blade.php +++ b/backend/resources/views/p_account/child/add.blade.php @@ -3,5 +3,5 @@ @section('title', '子追加') @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/child/detail.blade.php b/backend/resources/views/p_account/child/detail.blade.php index c3437060..94240c91 100644 --- a/backend/resources/views/p_account/child/detail.blade.php +++ b/backend/resources/views/p_account/child/detail.blade.php @@ -3,5 +3,5 @@ @section('title', '子詳細') @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/child/edit.blade.php b/backend/resources/views/p_account/child/edit.blade.php index c90f9511..cad95663 100644 --- a/backend/resources/views/p_account/child/edit.blade.php +++ b/backend/resources/views/p_account/child/edit.blade.php @@ -3,5 +3,5 @@ @section('title', '入社日を変更') @section('content') -
+
@endsection diff --git a/backend/resources/views/p_account/child/index.blade.php b/backend/resources/views/p_account/child/index.blade.php index c633ecf4..bcede4d9 100644 --- a/backend/resources/views/p_account/child/index.blade.php +++ b/backend/resources/views/p_account/child/index.blade.php @@ -3,5 +3,5 @@ @section('title', '子一覧') @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/favorite/index.blade.php b/backend/resources/views/p_account/favorite/index.blade.php index 385fab4e..4d617012 100644 --- a/backend/resources/views/p_account/favorite/index.blade.php +++ b/backend/resources/views/p_account/favorite/index.blade.php @@ -3,5 +3,5 @@ @section('title', 'お気に入り') @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/meeting/add.blade.php b/backend/resources/views/p_account/meeting/add.blade.php index 3c556e08..e582441f 100644 --- a/backend/resources/views/p_account/meeting/add.blade.php +++ b/backend/resources/views/p_account/meeting/add.blade.php @@ -3,5 +3,5 @@ @section('title', 'ミーティング作成') @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/meeting/detail.blade.php b/backend/resources/views/p_account/meeting/detail.blade.php index 28ec6f72..69cdb508 100644 --- a/backend/resources/views/p_account/meeting/detail.blade.php +++ b/backend/resources/views/p_account/meeting/detail.blade.php @@ -3,5 +3,5 @@ @section('title', 'ミーティング詳細') @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/meeting/edit.blade.php b/backend/resources/views/p_account/meeting/edit.blade.php index 96445d00..e582441f 100644 --- a/backend/resources/views/p_account/meeting/edit.blade.php +++ b/backend/resources/views/p_account/meeting/edit.blade.php @@ -3,5 +3,5 @@ @section('title', 'ミーティング作成') @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/meeting/index.blade.php b/backend/resources/views/p_account/meeting/index.blade.php index 62014abd..b500597f 100644 --- a/backend/resources/views/p_account/meeting/index.blade.php +++ b/backend/resources/views/p_account/meeting/index.blade.php @@ -3,5 +3,5 @@ @section('title', 'ミーティング一覧') @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/profile/edit.blade.php b/backend/resources/views/p_account/profile/edit.blade.php index 2e050774..3b1c7b5f 100644 --- a/backend/resources/views/p_account/profile/edit.blade.php +++ b/backend/resources/views/p_account/profile/edit.blade.php @@ -1,7 +1,6 @@ @extends('p_account.layout') @section('title', 'プロフィール編集') - @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/profile/index.blade.php b/backend/resources/views/p_account/profile/index.blade.php index 0fd113be..7d831476 100644 --- a/backend/resources/views/p_account/profile/index.blade.php +++ b/backend/resources/views/p_account/profile/index.blade.php @@ -3,5 +3,5 @@ @section('title', 'プロフィール') @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/profile/password_edit.blade.php b/backend/resources/views/p_account/profile/password_edit.blade.php index 814dcd00..6683c90e 100644 --- a/backend/resources/views/p_account/profile/password_edit.blade.php +++ b/backend/resources/views/p_account/profile/password_edit.blade.php @@ -3,5 +3,5 @@ @section('title', 'パスワード編集') @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/profile/withdrawal.blade.php b/backend/resources/views/p_account/profile/withdrawal.blade.php index 763dce56..640fb82c 100644 --- a/backend/resources/views/p_account/profile/withdrawal.blade.php +++ b/backend/resources/views/p_account/profile/withdrawal.blade.php @@ -3,5 +3,5 @@ @section('title', '退会確認') @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/profile/withdrawal_complete.blade.php b/backend/resources/views/p_account/profile/withdrawal_complete.blade.php index a6346407..0ad657e9 100644 --- a/backend/resources/views/p_account/profile/withdrawal_complete.blade.php +++ b/backend/resources/views/p_account/profile/withdrawal_complete.blade.php @@ -3,5 +3,5 @@ @section('title', '退会完了') @section('content') -
+
@endsection \ No newline at end of file diff --git a/backend/resources/views/p_account/search/index.blade.php b/backend/resources/views/p_account/search/index.blade.php index f63c8a4c..9626d84d 100644 --- a/backend/resources/views/p_account/search/index.blade.php +++ b/backend/resources/views/p_account/search/index.blade.php @@ -3,5 +3,5 @@ @section('title', 'ミーティング検索') @section('content') - +
@endsection \ No newline at end of file