From 4155b5f15b1bf7ca0ab4c2a6b636704284447650 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Mon, 29 Nov 2021 18:59:49 -0800 Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=A2=E3=81=A8PDF=E3=81=AE?= =?UTF-8?q?=E7=AE=87=E6=89=80=E3=82=82=E6=9C=AA=E8=A8=AD=E5=AE=9A=E3=81=AE?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AF=E3=82=B0=E3=83=AC=E3=83=BC=E3=81=AB?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss => public}/assets/fonts/.DS_Store | Bin .../assets/fonts/GenJyuuGothic-P/.DS_Store | Bin .../GenJyuuGothic-P}/GenJyuuGothic-P-Bold.ttf | Bin .../GenJyuuGothic-P-Bold.woff | Bin .../GenJyuuGothic-P-Bold.woff2 | Bin .../GenJyuuGothic-P-Regular.ttf | Bin .../GenJyuuGothic-P-Regular.woff | Bin .../GenJyuuGothic-P-Regular.woff2 | Bin .../assets/fonts/MuseoSans/.DS_Store | Bin .../fonts/MuseoSans/MuseoSans-Black.ttf | Bin .../fonts/MuseoSans/MuseoSans-Black.woff | Bin .../fonts/MuseoSans/MuseoSans-Black.woff2 | Bin .../fonts/YakuHanJP}/YakuHanJP-Black.eot | Bin .../fonts/YakuHanJP}/YakuHanJP-Black.woff | Bin .../fonts/YakuHanJP}/YakuHanJP-Black.woff2 | Bin .../fonts/YakuHanJP}/YakuHanJP-Bold.eot | Bin .../fonts/YakuHanJP}/YakuHanJP-Bold.woff | Bin .../fonts/YakuHanJP}/YakuHanJP-Bold.woff2 | Bin .../fonts/YakuHanJP}/YakuHanJP-DemiLight.eot | Bin .../fonts/YakuHanJP}/YakuHanJP-DemiLight.woff | Bin .../YakuHanJP}/YakuHanJP-DemiLight.woff2 | Bin .../fonts/YakuHanJP}/YakuHanJP-Light.eot | Bin .../fonts/YakuHanJP}/YakuHanJP-Light.woff | Bin .../fonts/YakuHanJP}/YakuHanJP-Light.woff2 | Bin .../fonts/YakuHanJP}/YakuHanJP-Medium.eot | Bin .../fonts/YakuHanJP}/YakuHanJP-Medium.woff | Bin .../fonts/YakuHanJP}/YakuHanJP-Medium.woff2 | Bin .../fonts/YakuHanJP}/YakuHanJP-Regular.eot | Bin .../fonts/YakuHanJP}/YakuHanJP-Regular.woff | Bin .../fonts/YakuHanJP}/YakuHanJP-Regular.woff2 | Bin .../fonts/YakuHanJP}/YakuHanJP-Thin.eot | Bin .../fonts/YakuHanJP}/YakuHanJP-Thin.woff | Bin .../fonts/YakuHanJP}/YakuHanJP-Thin.woff2 | Bin .../public/assets/img/icon/file-text-gray.png | Bin 0 -> 860 bytes .../public/assets/img/icon/file-text-gray.svg | 13 ++ .../{file-text.png => file-text-yellow.png} | Bin .../{file-text.svg => file-text-yellow.svg} | 0 backend/public/css/app.css | 95 +++++++------ backend/public/images/calendar.svg | 12 -- backend/public/images/camera.svg | 1 - backend/public/images/file-text.svg | 3 - backend/public/images/list-black.svg | 15 --- backend/public/images/list-gray.svg | 19 --- backend/public/images/list-yellow.svg | 18 --- backend/public/images/log-out-black.svg | 13 -- backend/public/images/log-out-gray.svg | 16 --- backend/public/images/log-out-yellow.svg | 16 --- backend/public/images/people-black.svg | 8 -- backend/public/images/people-gray.svg | 12 -- backend/public/images/people-yellow.svg | 12 -- backend/public/images/search-black.svg | 8 -- backend/public/images/search-gray.svg | 11 -- backend/public/images/search-yellow.svg | 11 -- backend/public/images/star-outline-gray.svg | 1 - backend/public/images/star-outline-gray02.svg | 16 --- backend/public/images/star-outline-yellow.svg | 1 - .../public/images/star-outline-yellow02.svg | 12 -- backend/public/js/app.js | 127 +++++++++++------- backend/resources/js/admin/meeting/detail.jsx | 33 +++-- backend/resources/js/child/meeting/detail.jsx | 20 +-- .../resources/js/parent/meeting/detail.jsx | 69 ++++++---- .../sass/assets/img/icon/alert-triangle.svg | 1 - .../sass/assets/img/icon/building.svg | 17 --- .../sass/assets/img/icon/calendar.svg | 12 -- .../resources/sass/assets/img/icon/camera.svg | 1 - .../sass/assets/img/icon/checkmark.svg | 1 - .../sass/assets/img/icon/file-text.png | Bin 939 -> 0 bytes .../sass/assets/img/icon/file-text.svg | 3 - .../sass/assets/img/icon/list-black.svg | 15 --- .../sass/assets/img/icon/list-gray.svg | 19 --- .../sass/assets/img/icon/list-yellow.svg | 18 --- .../sass/assets/img/icon/log-out-black.svg | 13 -- .../sass/assets/img/icon/log-out-gray.svg | 16 --- .../sass/assets/img/icon/log-out-yellow.svg | 16 --- .../resources/sass/assets/img/icon/mail.svg | 10 -- .../sass/assets/img/icon/people-black.svg | 8 -- .../sass/assets/img/icon/people-gray.svg | 12 -- .../sass/assets/img/icon/people-yellow.svg | 12 -- .../sass/assets/img/icon/person-pin.png | Bin 607 -> 0 bytes .../sass/assets/img/icon/person-pin.svg | 3 - .../resources/sass/assets/img/icon/phone.svg | 11 -- .../resources/sass/assets/img/icon/plus01.svg | 1 - .../resources/sass/assets/img/icon/plus02.svg | 1 - .../sass/assets/img/icon/search-black.svg | 8 -- .../sass/assets/img/icon/search-gray.svg | 11 -- .../sass/assets/img/icon/search-yellow.svg | 11 -- .../assets/img/icon/star-outline-gray.svg | 1 - .../assets/img/icon/star-outline-gray02.svg | 16 --- .../assets/img/icon/star-outline-yellow.svg | 1 - .../assets/img/icon/star-outline-yellow02.svg | 12 -- .../GenJyuuGothic-P/GenJyuuGothic-P-Bold.ttf | Bin 1932004 -> 0 bytes .../GenJyuuGothic-P/GenJyuuGothic-P-Bold.woff | Bin 978540 -> 0 bytes .../GenJyuuGothic-P-Bold.woff2 | Bin 725956 -> 0 bytes .../GenJyuuGothic-P-Regular.ttf | Bin 1737304 -> 0 bytes .../GenJyuuGothic-P-Regular.woff | Bin 900524 -> 0 bytes .../GenJyuuGothic-P-Regular.woff2 | Bin 655516 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Black.eot | Bin 4183 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Black.woff | Bin 4112 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Black.woff2 | Bin 3524 -> 0 bytes .../assets/fonts/YakuHanJP/YakuHanJP-Bold.eot | Bin 4214 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Bold.woff | Bin 4140 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Bold.woff2 | Bin 3564 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-DemiLight.eot | Bin 4227 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-DemiLight.woff | Bin 4116 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-DemiLight.woff2 | Bin 3528 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Light.eot | Bin 4197 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Light.woff | Bin 4112 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Light.woff2 | Bin 3532 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Medium.eot | Bin 4208 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Medium.woff | Bin 4108 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Medium.woff2 | Bin 3508 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Regular.eot | Bin 4146 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Regular.woff | Bin 4080 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Regular.woff2 | Bin 3500 -> 0 bytes .../assets/fonts/YakuHanJP/YakuHanJP-Thin.eot | Bin 4148 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Thin.woff | Bin 4076 -> 0 bytes .../fonts/YakuHanJP/YakuHanJP-Thin.woff2 | Bin 3512 -> 0 bytes .../scss/assets/img/icon/alert-triangle.svg | 1 - .../sass/scss/assets/img/icon/building.svg | 17 --- .../sass/scss/assets/img/icon/calendar.svg | 12 -- .../sass/scss/assets/img/icon/camera.svg | 1 - .../sass/scss/assets/img/icon/checkmark.svg | 1 - .../sass/scss/assets/img/icon/file-text.png | Bin 939 -> 0 bytes .../sass/scss/assets/img/icon/file-text.svg | 3 - .../sass/scss/assets/img/icon/list-black.svg | 15 --- .../sass/scss/assets/img/icon/list-gray.svg | 19 --- .../sass/scss/assets/img/icon/list-yellow.svg | 18 --- .../scss/assets/img/icon/log-out-black.svg | 13 -- .../scss/assets/img/icon/log-out-gray.svg | 16 --- .../scss/assets/img/icon/log-out-yellow.svg | 16 --- .../sass/scss/assets/img/icon/mail.svg | 10 -- .../scss/assets/img/icon/people-black.svg | 8 -- .../sass/scss/assets/img/icon/people-gray.svg | 12 -- .../scss/assets/img/icon/people-yellow.svg | 12 -- .../sass/scss/assets/img/icon/person-pin.png | Bin 607 -> 0 bytes .../sass/scss/assets/img/icon/person-pin.svg | 3 - .../sass/scss/assets/img/icon/phone.svg | 11 -- .../sass/scss/assets/img/icon/plus01.svg | 1 - .../sass/scss/assets/img/icon/plus02.svg | 1 - .../scss/assets/img/icon/search-black.svg | 8 -- .../sass/scss/assets/img/icon/search-gray.svg | 11 -- .../scss/assets/img/icon/search-yellow.svg | 11 -- .../assets/img/icon/star-outline-gray.svg | 1 - .../assets/img/icon/star-outline-gray02.svg | 16 --- .../assets/img/icon/star-outline-yellow.svg | 1 - .../assets/img/icon/star-outline-yellow02.svg | 12 -- .../foundation/variable/_font-family.scss | 18 +-- backend/resources/sass/scss/layout/_side.scss | 28 ++-- .../sass/scss/object/project/_icon.scss | 31 ++++- .../sass/scss/object/project/_profile.scss | 2 +- 150 files changed, 270 insertions(+), 871 deletions(-) rename backend/{resources/sass/scss => public}/assets/fonts/.DS_Store (100%) rename backend/{resources/sass/scss => public}/assets/fonts/GenJyuuGothic-P/.DS_Store (100%) rename backend/public/{fonts => assets/fonts/GenJyuuGothic-P}/GenJyuuGothic-P-Bold.ttf (100%) rename backend/public/{fonts => assets/fonts/GenJyuuGothic-P}/GenJyuuGothic-P-Bold.woff (100%) rename backend/public/{fonts => assets/fonts/GenJyuuGothic-P}/GenJyuuGothic-P-Bold.woff2 (100%) rename backend/public/{fonts => assets/fonts/GenJyuuGothic-P}/GenJyuuGothic-P-Regular.ttf (100%) rename backend/public/{fonts => assets/fonts/GenJyuuGothic-P}/GenJyuuGothic-P-Regular.woff (100%) rename backend/public/{fonts => assets/fonts/GenJyuuGothic-P}/GenJyuuGothic-P-Regular.woff2 (100%) rename backend/{resources/sass/scss => public}/assets/fonts/MuseoSans/.DS_Store (100%) rename backend/{resources/sass/scss => public}/assets/fonts/MuseoSans/MuseoSans-Black.ttf (100%) rename backend/{resources/sass/scss => public}/assets/fonts/MuseoSans/MuseoSans-Black.woff (100%) rename backend/{resources/sass/scss => public}/assets/fonts/MuseoSans/MuseoSans-Black.woff2 (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Black.eot (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Black.woff (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Black.woff2 (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Bold.eot (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Bold.woff (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Bold.woff2 (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-DemiLight.eot (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-DemiLight.woff (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-DemiLight.woff2 (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Light.eot (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Light.woff (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Light.woff2 (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Medium.eot (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Medium.woff (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Medium.woff2 (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Regular.eot (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Regular.woff (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Regular.woff2 (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Thin.eot (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Thin.woff (100%) rename backend/public/{fonts => assets/fonts/YakuHanJP}/YakuHanJP-Thin.woff2 (100%) create mode 100644 backend/public/assets/img/icon/file-text-gray.png create mode 100644 backend/public/assets/img/icon/file-text-gray.svg rename backend/public/assets/img/icon/{file-text.png => file-text-yellow.png} (100%) rename backend/public/assets/img/icon/{file-text.svg => file-text-yellow.svg} (100%) delete mode 100644 backend/public/images/calendar.svg delete mode 100644 backend/public/images/camera.svg delete mode 100644 backend/public/images/file-text.svg delete mode 100644 backend/public/images/list-black.svg delete mode 100644 backend/public/images/list-gray.svg delete mode 100644 backend/public/images/list-yellow.svg delete mode 100644 backend/public/images/log-out-black.svg delete mode 100644 backend/public/images/log-out-gray.svg delete mode 100644 backend/public/images/log-out-yellow.svg delete mode 100644 backend/public/images/people-black.svg delete mode 100644 backend/public/images/people-gray.svg delete mode 100644 backend/public/images/people-yellow.svg delete mode 100644 backend/public/images/search-black.svg delete mode 100644 backend/public/images/search-gray.svg delete mode 100644 backend/public/images/search-yellow.svg delete mode 100644 backend/public/images/star-outline-gray.svg delete mode 100644 backend/public/images/star-outline-gray02.svg delete mode 100644 backend/public/images/star-outline-yellow.svg delete mode 100644 backend/public/images/star-outline-yellow02.svg delete mode 100644 backend/resources/sass/assets/img/icon/alert-triangle.svg delete mode 100644 backend/resources/sass/assets/img/icon/building.svg delete mode 100644 backend/resources/sass/assets/img/icon/calendar.svg delete mode 100644 backend/resources/sass/assets/img/icon/camera.svg delete mode 100644 backend/resources/sass/assets/img/icon/checkmark.svg delete mode 100644 backend/resources/sass/assets/img/icon/file-text.png delete mode 100644 backend/resources/sass/assets/img/icon/file-text.svg delete mode 100644 backend/resources/sass/assets/img/icon/list-black.svg delete mode 100644 backend/resources/sass/assets/img/icon/list-gray.svg delete mode 100644 backend/resources/sass/assets/img/icon/list-yellow.svg delete mode 100644 backend/resources/sass/assets/img/icon/log-out-black.svg delete mode 100644 backend/resources/sass/assets/img/icon/log-out-gray.svg delete mode 100644 backend/resources/sass/assets/img/icon/log-out-yellow.svg delete mode 100644 backend/resources/sass/assets/img/icon/mail.svg delete mode 100644 backend/resources/sass/assets/img/icon/people-black.svg delete mode 100644 backend/resources/sass/assets/img/icon/people-gray.svg delete mode 100644 backend/resources/sass/assets/img/icon/people-yellow.svg delete mode 100644 backend/resources/sass/assets/img/icon/person-pin.png delete mode 100644 backend/resources/sass/assets/img/icon/person-pin.svg delete mode 100644 backend/resources/sass/assets/img/icon/phone.svg delete mode 100644 backend/resources/sass/assets/img/icon/plus01.svg delete mode 100644 backend/resources/sass/assets/img/icon/plus02.svg delete mode 100644 backend/resources/sass/assets/img/icon/search-black.svg delete mode 100644 backend/resources/sass/assets/img/icon/search-gray.svg delete mode 100644 backend/resources/sass/assets/img/icon/search-yellow.svg delete mode 100644 backend/resources/sass/assets/img/icon/star-outline-gray.svg delete mode 100644 backend/resources/sass/assets/img/icon/star-outline-gray02.svg delete mode 100644 backend/resources/sass/assets/img/icon/star-outline-yellow.svg delete mode 100644 backend/resources/sass/assets/img/icon/star-outline-yellow02.svg delete mode 100644 backend/resources/sass/scss/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.ttf delete mode 100644 backend/resources/sass/scss/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.woff delete mode 100644 backend/resources/sass/scss/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.woff2 delete mode 100644 backend/resources/sass/scss/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.ttf delete mode 100644 backend/resources/sass/scss/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.woff delete mode 100644 backend/resources/sass/scss/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.woff2 delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Black.eot delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Black.woff delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Black.woff2 delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Bold.eot delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Bold.woff delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Bold.woff2 delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.eot delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.woff delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.woff2 delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Light.eot delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Light.woff delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Light.woff2 delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Medium.eot delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Medium.woff delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Medium.woff2 delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Regular.eot delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Regular.woff delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Regular.woff2 delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Thin.eot delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Thin.woff delete mode 100644 backend/resources/sass/scss/assets/fonts/YakuHanJP/YakuHanJP-Thin.woff2 delete mode 100644 backend/resources/sass/scss/assets/img/icon/alert-triangle.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/building.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/calendar.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/camera.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/checkmark.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/file-text.png delete mode 100644 backend/resources/sass/scss/assets/img/icon/file-text.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/list-black.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/list-gray.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/list-yellow.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/log-out-black.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/log-out-gray.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/log-out-yellow.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/mail.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/people-black.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/people-gray.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/people-yellow.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/person-pin.png delete mode 100644 backend/resources/sass/scss/assets/img/icon/person-pin.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/phone.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/plus01.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/plus02.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/search-black.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/search-gray.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/search-yellow.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/star-outline-gray.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/star-outline-gray02.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/star-outline-yellow.svg delete mode 100644 backend/resources/sass/scss/assets/img/icon/star-outline-yellow02.svg diff --git a/backend/resources/sass/scss/assets/fonts/.DS_Store b/backend/public/assets/fonts/.DS_Store similarity index 100% rename from backend/resources/sass/scss/assets/fonts/.DS_Store rename to backend/public/assets/fonts/.DS_Store diff --git a/backend/resources/sass/scss/assets/fonts/GenJyuuGothic-P/.DS_Store b/backend/public/assets/fonts/GenJyuuGothic-P/.DS_Store similarity index 100% rename from backend/resources/sass/scss/assets/fonts/GenJyuuGothic-P/.DS_Store rename to backend/public/assets/fonts/GenJyuuGothic-P/.DS_Store diff --git a/backend/public/fonts/GenJyuuGothic-P-Bold.ttf b/backend/public/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.ttf similarity index 100% rename from backend/public/fonts/GenJyuuGothic-P-Bold.ttf rename to backend/public/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.ttf diff --git a/backend/public/fonts/GenJyuuGothic-P-Bold.woff b/backend/public/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.woff similarity index 100% rename from backend/public/fonts/GenJyuuGothic-P-Bold.woff rename to backend/public/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.woff diff --git a/backend/public/fonts/GenJyuuGothic-P-Bold.woff2 b/backend/public/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.woff2 similarity index 100% rename from backend/public/fonts/GenJyuuGothic-P-Bold.woff2 rename to backend/public/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.woff2 diff --git a/backend/public/fonts/GenJyuuGothic-P-Regular.ttf b/backend/public/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.ttf similarity index 100% rename from backend/public/fonts/GenJyuuGothic-P-Regular.ttf rename to backend/public/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.ttf diff --git a/backend/public/fonts/GenJyuuGothic-P-Regular.woff b/backend/public/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.woff similarity index 100% rename from backend/public/fonts/GenJyuuGothic-P-Regular.woff rename to backend/public/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.woff diff --git a/backend/public/fonts/GenJyuuGothic-P-Regular.woff2 b/backend/public/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.woff2 similarity index 100% rename from backend/public/fonts/GenJyuuGothic-P-Regular.woff2 rename to backend/public/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.woff2 diff --git a/backend/resources/sass/scss/assets/fonts/MuseoSans/.DS_Store b/backend/public/assets/fonts/MuseoSans/.DS_Store similarity index 100% rename from backend/resources/sass/scss/assets/fonts/MuseoSans/.DS_Store rename to backend/public/assets/fonts/MuseoSans/.DS_Store diff --git a/backend/resources/sass/scss/assets/fonts/MuseoSans/MuseoSans-Black.ttf b/backend/public/assets/fonts/MuseoSans/MuseoSans-Black.ttf similarity index 100% rename from backend/resources/sass/scss/assets/fonts/MuseoSans/MuseoSans-Black.ttf rename to backend/public/assets/fonts/MuseoSans/MuseoSans-Black.ttf diff --git a/backend/resources/sass/scss/assets/fonts/MuseoSans/MuseoSans-Black.woff b/backend/public/assets/fonts/MuseoSans/MuseoSans-Black.woff similarity index 100% rename from backend/resources/sass/scss/assets/fonts/MuseoSans/MuseoSans-Black.woff rename to backend/public/assets/fonts/MuseoSans/MuseoSans-Black.woff diff --git a/backend/resources/sass/scss/assets/fonts/MuseoSans/MuseoSans-Black.woff2 b/backend/public/assets/fonts/MuseoSans/MuseoSans-Black.woff2 similarity index 100% rename from backend/resources/sass/scss/assets/fonts/MuseoSans/MuseoSans-Black.woff2 rename to backend/public/assets/fonts/MuseoSans/MuseoSans-Black.woff2 diff --git a/backend/public/fonts/YakuHanJP-Black.eot b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Black.eot similarity index 100% rename from backend/public/fonts/YakuHanJP-Black.eot rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Black.eot diff --git a/backend/public/fonts/YakuHanJP-Black.woff b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Black.woff similarity index 100% rename from backend/public/fonts/YakuHanJP-Black.woff rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Black.woff diff --git a/backend/public/fonts/YakuHanJP-Black.woff2 b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Black.woff2 similarity index 100% rename from backend/public/fonts/YakuHanJP-Black.woff2 rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Black.woff2 diff --git a/backend/public/fonts/YakuHanJP-Bold.eot b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Bold.eot similarity index 100% rename from backend/public/fonts/YakuHanJP-Bold.eot rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Bold.eot diff --git a/backend/public/fonts/YakuHanJP-Bold.woff b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Bold.woff similarity index 100% rename from backend/public/fonts/YakuHanJP-Bold.woff rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Bold.woff diff --git a/backend/public/fonts/YakuHanJP-Bold.woff2 b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Bold.woff2 similarity index 100% rename from backend/public/fonts/YakuHanJP-Bold.woff2 rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Bold.woff2 diff --git a/backend/public/fonts/YakuHanJP-DemiLight.eot b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.eot similarity index 100% rename from backend/public/fonts/YakuHanJP-DemiLight.eot rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.eot diff --git a/backend/public/fonts/YakuHanJP-DemiLight.woff b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.woff similarity index 100% rename from backend/public/fonts/YakuHanJP-DemiLight.woff rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.woff diff --git a/backend/public/fonts/YakuHanJP-DemiLight.woff2 b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.woff2 similarity index 100% rename from backend/public/fonts/YakuHanJP-DemiLight.woff2 rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.woff2 diff --git a/backend/public/fonts/YakuHanJP-Light.eot b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Light.eot similarity index 100% rename from backend/public/fonts/YakuHanJP-Light.eot rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Light.eot diff --git a/backend/public/fonts/YakuHanJP-Light.woff b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Light.woff similarity index 100% rename from backend/public/fonts/YakuHanJP-Light.woff rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Light.woff diff --git a/backend/public/fonts/YakuHanJP-Light.woff2 b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Light.woff2 similarity index 100% rename from backend/public/fonts/YakuHanJP-Light.woff2 rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Light.woff2 diff --git a/backend/public/fonts/YakuHanJP-Medium.eot b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Medium.eot similarity index 100% rename from backend/public/fonts/YakuHanJP-Medium.eot rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Medium.eot diff --git a/backend/public/fonts/YakuHanJP-Medium.woff b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Medium.woff similarity index 100% rename from backend/public/fonts/YakuHanJP-Medium.woff rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Medium.woff diff --git a/backend/public/fonts/YakuHanJP-Medium.woff2 b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Medium.woff2 similarity index 100% rename from backend/public/fonts/YakuHanJP-Medium.woff2 rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Medium.woff2 diff --git a/backend/public/fonts/YakuHanJP-Regular.eot b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Regular.eot similarity index 100% rename from backend/public/fonts/YakuHanJP-Regular.eot rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Regular.eot diff --git a/backend/public/fonts/YakuHanJP-Regular.woff b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Regular.woff similarity index 100% rename from backend/public/fonts/YakuHanJP-Regular.woff rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Regular.woff diff --git a/backend/public/fonts/YakuHanJP-Regular.woff2 b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Regular.woff2 similarity index 100% rename from backend/public/fonts/YakuHanJP-Regular.woff2 rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Regular.woff2 diff --git a/backend/public/fonts/YakuHanJP-Thin.eot b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Thin.eot similarity index 100% rename from backend/public/fonts/YakuHanJP-Thin.eot rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Thin.eot diff --git a/backend/public/fonts/YakuHanJP-Thin.woff b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Thin.woff similarity index 100% rename from backend/public/fonts/YakuHanJP-Thin.woff rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Thin.woff diff --git a/backend/public/fonts/YakuHanJP-Thin.woff2 b/backend/public/assets/fonts/YakuHanJP/YakuHanJP-Thin.woff2 similarity index 100% rename from backend/public/fonts/YakuHanJP-Thin.woff2 rename to backend/public/assets/fonts/YakuHanJP/YakuHanJP-Thin.woff2 diff --git a/backend/public/assets/img/icon/file-text-gray.png b/backend/public/assets/img/icon/file-text-gray.png new file mode 100644 index 0000000000000000000000000000000000000000..7bfc5d17b86f013f3dc7d739c3f3197aefdfa579 GIT binary patch literal 860 zcmV-i1Ec(jP)esEi8--NQfDUsRIi` zrt%XID-!(&Ac2@b>e!M*=`UzuNix<_KPcpb_ZYhhQHqbR-JIU)TDp>3AD`preQ&R> z)nnV5Iy#+BZZH_!OQljbr>~vG&!tky$>;M9awd`Pa*x8|!>)Tk1T!2CH*s3RSO~i*$?Jte!2{~`dP9t7)oOJ; zPJR!l-EMz_8#m?+L$xP>2DbKAN*&%LXsW<~9 zr98K;afqvwRGe{0N_lQw;}BOVsW{`1l=9rVksS)#oN^0u;#79-28g4qWK3j-Bp;Sj z+W>J?l8iA9NvhAOZ5-mLBpG8Il2o5lTgf5(>w=Rzkr;HjM9O1;BFQBXtmKfubFxbs zAhuLOfyN;r;n`)4Lu{#p0xzsX)HickNYo_D9>JkS@vh(`h^YAj$5-q#ABgvDCjmq) zXUOvq9giCx8k*6YpuCRLOGy-%bB-g_+r)HRp}HsEKH!U#EkIqxSdeN;k0M0SxP*Il z(C2d}Xt4d~>l8pW5V(pU`Z^_x^Q9<7<`E0Asd0WE;|k8-V4A(0ta}0!{L=qY#X;~~ mz8_K%0YY!Xm5o_#&wl_`FAi8`=bPIA0000 + + + + + + + + + + + + diff --git a/backend/public/assets/img/icon/file-text.png b/backend/public/assets/img/icon/file-text-yellow.png similarity index 100% rename from backend/public/assets/img/icon/file-text.png rename to backend/public/assets/img/icon/file-text-yellow.png diff --git a/backend/public/assets/img/icon/file-text.svg b/backend/public/assets/img/icon/file-text-yellow.svg similarity index 100% rename from backend/public/assets/img/icon/file-text.svg rename to backend/public/assets/img/icon/file-text-yellow.svg diff --git a/backend/public/css/app.css b/backend/public/css/app.css index ed891202..e65d8760 100644 --- a/backend/public/css/app.css +++ b/backend/public/css/app.css @@ -10968,12 +10968,12 @@ h3 { @font-face { font-family: GenJyuuGothic-P; font-weight: 400; - src: url(/fonts/GenJyuuGothic-P-Regular.woff2?0908714fff61a9145b5006671048da1d) format("woff2"), url(/fonts/GenJyuuGothic-P-Regular.woff?dc4d38bc6b04031d9dd7584d4ed3af1c) format("woff"), url(/fonts/GenJyuuGothic-P-Regular.ttf?ef31255ae22bf70d525f4180be990b8d) format("TrueType"); + src: url(/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.woff2) format("woff2"), url(/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.woff) format("woff"), url(/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.ttf) format("TrueType"); } @font-face { font-family: GenJyuuGothic-P; font-weight: 700; - src: url(/fonts/GenJyuuGothic-P-Bold.woff2?53d44f132e835809b14f46f8bff65d2b) format("woff2"), url(/fonts/GenJyuuGothic-P-Bold.woff?9de1f8813ddd80f73fd30b54c4ed9e34) format("woff"), url(/fonts/GenJyuuGothic-P-Bold.ttf?927d59ad1b7feb82d0fdec9634a00a61) format("TrueType"); + src: url(/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.woff2) format("woff2"), url(/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.woff) format("woff"), url(/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.ttf) format("TrueType"); } @font-face { font-family: AdobeBlank; @@ -10982,37 +10982,37 @@ h3 { @font-face { font-family: YakuHanJP; font-weight: 100; - src: url(/fonts/YakuHanJP-Thin.woff2?f8706e5306d9a5252d75da086e8d122d) format("woff2"), url(/fonts/YakuHanJP-Thin.woff?c0a6b47f2e150fe2a9b904c1bf57f497) format("woff"), url(/fonts/YakuHanJP-Thin.eot?6ef81d2af5ed27fb99bd6b2d5ccd8041); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-Thin.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-Thin.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-Thin.eot); } @font-face { font-family: YakuHanJP; font-weight: 200; - src: url(/fonts/YakuHanJP-Light.woff2?0b8ababac4f383c6ad8a9ab02d6fbccc) format("woff2"), url(/fonts/YakuHanJP-Light.woff?98e377e2cd6bb0ab35291192249c9d7e) format("woff"), url(/fonts/YakuHanJP-Light.eot?48a86896772cb42ab312532e5fb1a6ef); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-Light.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-Light.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-Light.eot); } @font-face { font-family: YakuHanJP; font-weight: 300; - src: url(/fonts/YakuHanJP-DemiLight.woff2?401d79d02744136f1666b742d4133fbd) format("woff2"), url(/fonts/YakuHanJP-DemiLight.woff?c7edfa735d3d4b08bfc5c78189bc7b09) format("woff"), url(/fonts/YakuHanJP-DemiLight.eot?a569268c682e10874d839b9f5e043bab); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.eot); } @font-face { font-family: YakuHanJP; font-weight: 400; - src: url(/fonts/YakuHanJP-Regular.woff2?fa89a6a409a61a7ca3f11ca630bd26ab) format("woff2"), url(/fonts/YakuHanJP-Regular.woff?3686af168611043094444da612d2014c) format("woff"), url(/fonts/YakuHanJP-Regular.eot?a5c871a280f58c01dedaa3396cc0410f); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-Regular.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-Regular.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-Regular.eot); } @font-face { font-family: YakuHanJP; font-weight: 500; - src: url(/fonts/YakuHanJP-Medium.woff2?921de89e5e14a069620bf7f0e34d0ecf) format("woff2"), url(/fonts/YakuHanJP-Medium.woff?f86078184a1d6a41418c31903ce09f93) format("woff"), url(/fonts/YakuHanJP-Medium.eot?0b3bec6520de5392d8fa9e3c040009c5); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-Medium.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-Medium.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-Medium.eot); } @font-face { font-family: YakuHanJP; font-weight: 700; - src: url(/fonts/YakuHanJP-Bold.woff2?4a19c01ca60630fe0e2e1403930874f7) format("woff2"), url(/fonts/YakuHanJP-Bold.woff?95eb71bf0690e78e09a1baf568a1738d) format("woff"), url(/fonts/YakuHanJP-Bold.eot?77e5e9f3a23cfcda7f67adb41a354ba7); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-Bold.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-Bold.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-Bold.eot); } @font-face { font-family: YakuHanJP; font-weight: 900; - src: url(/fonts/YakuHanJP-Black.woff2?c9a364c83a7aff52232f8fe87c8609ea) format("woff2"), url(/fonts/YakuHanJP-Black.woff?21712507fa10297fe63d07d5d7c5dac3) format("woff"), url(/fonts/YakuHanJP-Black.eot?9e46da322dfcf324fa76b5ac7a9e1cb0); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-Black.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-Black.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-Black.eot); } /** * VARIABLE @@ -11123,12 +11123,12 @@ h3 { @font-face { font-family: GenJyuuGothic-P; font-weight: 400; - src: url(/fonts/GenJyuuGothic-P-Regular.woff2?0908714fff61a9145b5006671048da1d) format("woff2"), url(/fonts/GenJyuuGothic-P-Regular.woff?dc4d38bc6b04031d9dd7584d4ed3af1c) format("woff"), url(/fonts/GenJyuuGothic-P-Regular.ttf?ef31255ae22bf70d525f4180be990b8d) format("TrueType"); + src: url(/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.woff2) format("woff2"), url(/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.woff) format("woff"), url(/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Regular.ttf) format("TrueType"); } @font-face { font-family: GenJyuuGothic-P; font-weight: 700; - src: url(/fonts/GenJyuuGothic-P-Bold.woff2?53d44f132e835809b14f46f8bff65d2b) format("woff2"), url(/fonts/GenJyuuGothic-P-Bold.woff?9de1f8813ddd80f73fd30b54c4ed9e34) format("woff"), url(/fonts/GenJyuuGothic-P-Bold.ttf?927d59ad1b7feb82d0fdec9634a00a61) format("TrueType"); + src: url(/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.woff2) format("woff2"), url(/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.woff) format("woff"), url(/assets/fonts/GenJyuuGothic-P/GenJyuuGothic-P-Bold.ttf) format("TrueType"); } @font-face { font-family: AdobeBlank; @@ -11137,37 +11137,37 @@ h3 { @font-face { font-family: YakuHanJP; font-weight: 100; - src: url(/fonts/YakuHanJP-Thin.woff2?f8706e5306d9a5252d75da086e8d122d) format("woff2"), url(/fonts/YakuHanJP-Thin.woff?c0a6b47f2e150fe2a9b904c1bf57f497) format("woff"), url(/fonts/YakuHanJP-Thin.eot?6ef81d2af5ed27fb99bd6b2d5ccd8041); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-Thin.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-Thin.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-Thin.eot); } @font-face { font-family: YakuHanJP; font-weight: 200; - src: url(/fonts/YakuHanJP-Light.woff2?0b8ababac4f383c6ad8a9ab02d6fbccc) format("woff2"), url(/fonts/YakuHanJP-Light.woff?98e377e2cd6bb0ab35291192249c9d7e) format("woff"), url(/fonts/YakuHanJP-Light.eot?48a86896772cb42ab312532e5fb1a6ef); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-Light.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-Light.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-Light.eot); } @font-face { font-family: YakuHanJP; font-weight: 300; - src: url(/fonts/YakuHanJP-DemiLight.woff2?401d79d02744136f1666b742d4133fbd) format("woff2"), url(/fonts/YakuHanJP-DemiLight.woff?c7edfa735d3d4b08bfc5c78189bc7b09) format("woff"), url(/fonts/YakuHanJP-DemiLight.eot?a569268c682e10874d839b9f5e043bab); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-DemiLight.eot); } @font-face { font-family: YakuHanJP; font-weight: 400; - src: url(/fonts/YakuHanJP-Regular.woff2?fa89a6a409a61a7ca3f11ca630bd26ab) format("woff2"), url(/fonts/YakuHanJP-Regular.woff?3686af168611043094444da612d2014c) format("woff"), url(/fonts/YakuHanJP-Regular.eot?a5c871a280f58c01dedaa3396cc0410f); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-Regular.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-Regular.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-Regular.eot); } @font-face { font-family: YakuHanJP; font-weight: 500; - src: url(/fonts/YakuHanJP-Medium.woff2?921de89e5e14a069620bf7f0e34d0ecf) format("woff2"), url(/fonts/YakuHanJP-Medium.woff?f86078184a1d6a41418c31903ce09f93) format("woff"), url(/fonts/YakuHanJP-Medium.eot?0b3bec6520de5392d8fa9e3c040009c5); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-Medium.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-Medium.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-Medium.eot); } @font-face { font-family: YakuHanJP; font-weight: 700; - src: url(/fonts/YakuHanJP-Bold.woff2?4a19c01ca60630fe0e2e1403930874f7) format("woff2"), url(/fonts/YakuHanJP-Bold.woff?95eb71bf0690e78e09a1baf568a1738d) format("woff"), url(/fonts/YakuHanJP-Bold.eot?77e5e9f3a23cfcda7f67adb41a354ba7); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-Bold.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-Bold.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-Bold.eot); } @font-face { font-family: YakuHanJP; font-weight: 900; - src: url(/fonts/YakuHanJP-Black.woff2?c9a364c83a7aff52232f8fe87c8609ea) format("woff2"), url(/fonts/YakuHanJP-Black.woff?21712507fa10297fe63d07d5d7c5dac3) format("woff"), url(/fonts/YakuHanJP-Black.eot?9e46da322dfcf324fa76b5ac7a9e1cb0); + src: url(/assets/fonts/YakuHanJP/YakuHanJP-Black.woff2) format("woff2"), url(/assets/fonts/YakuHanJP/YakuHanJP-Black.woff) format("woff"), url(/assets/fonts/YakuHanJP/YakuHanJP-Black.eot); } /** * Foundationレイヤーでは`html`や`body`のような広範囲にわたるベーススタイル、 @@ -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?58c753f895165d8b559b97118431078a); + background-image: url(/assets/img/icon/list-yellow.svg); } @media screen and (min-width: 1068px) { .mypage-nav-list__item.nav-active .icon.meeting:before { - background-image: url(/images/list-black.svg?bb77778dacd15a2e89c94df413b610b1); + background-image: url(/assets/img/icon/list-black.svg); } } @media screen and (max-width: 1067px) { .mypage-nav-list__item.nav-active .icon.star:before { - background-image: url(/images/star-outline-yellow02.svg?12419a0efb747f2bf657265d762cf945); + background-image: url(/assets/img/icon/star-outline-yellow02.svg); } } .mypage-nav-list__item.nav-active .icon.parents:before { - background-image: url(/images/people-yellow.svg?b09a58e795d7dae70bf454e2dd9c95dc); + background-image: url(/assets/img/icon/people-yellow.svg); } @media screen and (min-width: 1068px) { .mypage-nav-list__item.nav-active .icon.parents:before { - background-image: url(/images/people-black.svg?18cbc02573ca628a754516d565471689); + background-image: url(/assets/img/icon/people-black.svg); } } .mypage-nav-list__item.nav-active .icon.search:before { - background-image: url(/images/search-yellow.svg?0230b5a2addb282f90a11f03e1fa18b6); + background-image: url(/assets/img/icon/search-yellow.svg); } @media screen and (min-width: 1068px) { .mypage-nav-list__item.nav-active .icon.search:before { - background-image: url(/images/search-black.svg?720fc6249963ccfb199cad011367407b); + background-image: url(/assets/img/icon/search-black.svg); } } .mypage-nav-list__item.nav-active .icon.log-out:before { - background-image: url(/images/log-out-yellow.svg?1b68f7d254d3418c246ab6caf4df2a81); + background-image: url(/assets/img/icon/log-out-yellow.svg); } @media screen and (min-width: 1068px) { .mypage-nav-list__item.nav-active .icon.log-out:before { - background-image: url(/images/log-out-black.svg?84c65984fe1dc8214afbb0e6e42873c0); + background-image: url(/assets/img/icon/log-out-black.svg); } } @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?dcc142fe211efe22393797a2c9e28bf1); + background-image: url(/assets/img/icon/list-gray.svg); } .mypage-nav-list__item .icon.star:before { - background-image: url(/images/star-outline-gray02.svg?df9815f0291c30e50a5cfd1c496e155b); + background-image: url(/assets/img/icon/star-outline-gray02.svg); } .mypage-nav-list__item .icon.search:before { - background-image: url(/images/search-gray.svg?c5c7a01d0dd6ebe7e325306d6ef0ba7a); + background-image: url(/assets/img/icon/search-gray.svg); } .mypage-nav-list__item .icon.parents:before { - background-image: url(/images/people-gray.svg?acfa94944f8df8a43eef099e3a77b2fb); + background-image: url(/assets/img/icon/people-gray.svg); } .mypage-nav-list__item .icon.log-out:before { - background-image: url(/images/log-out-gray.svg?861c1a3bffcbc6494ae12c18598d3b42); + background-image: url(/assets/img/icon/log-out-gray.svg); } .mypage-nav-list__link.user-icon figure { display: flex; @@ -12990,10 +12990,10 @@ categories: [project] } .icon-star:after { - background: url(/images/star-outline-gray.svg?fb6de7c36be81c88a02cb11feadab076) no-repeat; + background: url(/assets/img/icon/star-outline-gray.svg) no-repeat; } .icon-starFill:after { - background: url(/images/star-outline-yellow.svg?61adcd7ba18d472270a83696daf142fd) no-repeat; + background: url(/assets/img/icon/star-outline-yellow.svg) no-repeat; } .icon-starFill-wrap { border: 1px solid #F0DE00; @@ -13021,16 +13021,33 @@ categories: [project] } .icon-text:after { - background: url(/images/file-text.svg?eef62fb61b190a7078a1e41813859c13) no-repeat; + background: url(/assets/img/icon/file-text-gray.svg) no-repeat; background-size: 35px 32px; } -.icon-text-wrap { +.icon-textFill:after { + background: url(/assets/img/icon/file-text-yellow.svg) no-repeat; + background-size: 35px 32px; +} +.icon-textFill-wrap { border: 1px solid #F0DE00; border-radius: 8px; min-width: 52px; height: 52px; margin-right: 10px; } +.icon-textFill-wrap:after { + position: absolute; + top: 50%; + left: 50%; + transform: translateX(-50%) translateY(-50%); +} +.icon-text-wrap { + border: 1px solid #D0D0D0; + border-radius: 8px; + min-width: 52px; + height: 52px; + margin-right: 10px; +} .icon-text-wrap:after { position: absolute; top: 50%; @@ -13056,7 +13073,7 @@ categories: [project] } } .icon-search:after { - background: url(/images/search-gray.svg?c5c7a01d0dd6ebe7e325306d6ef0ba7a) no-repeat; + background: url(/assets/img/icon/search-gray.svg) no-repeat; background-size: cover; width: 20px; height: 20px; @@ -13087,7 +13104,7 @@ categories: [project] } } .icon-calendar:after { - background: url(/images/calendar.svg?0d92b15ce0131234f89a2977b662a6c0) no-repeat; + background: url(/assets/img/icon/calendar.svg) no-repeat; background-size: cover; width: 23px; height: 25px; @@ -14939,7 +14956,7 @@ categories: [project] background-repeat: no-repeat; background-position: center center; background-size: 100% auto; - background-image: url(/images/camera.svg?3665dc7f7052cef25748da5a31a7f717); + background-image: url(/assets/img/icon/camera.svg); } .profile-name { font-weight: bold; diff --git a/backend/public/images/calendar.svg b/backend/public/images/calendar.svg deleted file mode 100644 index 37066bfb..00000000 --- a/backend/public/images/calendar.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/backend/public/images/camera.svg b/backend/public/images/camera.svg deleted file mode 100644 index 46317d49..00000000 --- a/backend/public/images/camera.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/backend/public/images/file-text.svg b/backend/public/images/file-text.svg deleted file mode 100644 index 4cc0e6a6..00000000 --- a/backend/public/images/file-text.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/backend/public/images/list-black.svg b/backend/public/images/list-black.svg deleted file mode 100644 index 6e72f336..00000000 --- a/backend/public/images/list-black.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - diff --git a/backend/public/images/list-gray.svg b/backend/public/images/list-gray.svg deleted file mode 100644 index acb46d0f..00000000 --- a/backend/public/images/list-gray.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/backend/public/images/list-yellow.svg b/backend/public/images/list-yellow.svg deleted file mode 100644 index 35740050..00000000 --- a/backend/public/images/list-yellow.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - diff --git a/backend/public/images/log-out-black.svg b/backend/public/images/log-out-black.svg deleted file mode 100644 index 200a571b..00000000 --- a/backend/public/images/log-out-black.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/backend/public/images/log-out-gray.svg b/backend/public/images/log-out-gray.svg deleted file mode 100644 index d3b45dc4..00000000 --- a/backend/public/images/log-out-gray.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/backend/public/images/log-out-yellow.svg b/backend/public/images/log-out-yellow.svg deleted file mode 100644 index e2bc6e39..00000000 --- a/backend/public/images/log-out-yellow.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/backend/public/images/people-black.svg b/backend/public/images/people-black.svg deleted file mode 100644 index b5e43885..00000000 --- a/backend/public/images/people-black.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/backend/public/images/people-gray.svg b/backend/public/images/people-gray.svg deleted file mode 100644 index d147a75b..00000000 --- a/backend/public/images/people-gray.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/backend/public/images/people-yellow.svg b/backend/public/images/people-yellow.svg deleted file mode 100644 index 8bfc0993..00000000 --- a/backend/public/images/people-yellow.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/backend/public/images/search-black.svg b/backend/public/images/search-black.svg deleted file mode 100644 index f326713f..00000000 --- a/backend/public/images/search-black.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/backend/public/images/search-gray.svg b/backend/public/images/search-gray.svg deleted file mode 100644 index 7b848bd5..00000000 --- a/backend/public/images/search-gray.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/backend/public/images/search-yellow.svg b/backend/public/images/search-yellow.svg deleted file mode 100644 index e713e848..00000000 --- a/backend/public/images/search-yellow.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/backend/public/images/star-outline-gray.svg b/backend/public/images/star-outline-gray.svg deleted file mode 100644 index 11ca2a37..00000000 --- a/backend/public/images/star-outline-gray.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/backend/public/images/star-outline-gray02.svg b/backend/public/images/star-outline-gray02.svg deleted file mode 100644 index 645e2749..00000000 --- a/backend/public/images/star-outline-gray02.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git a/backend/public/images/star-outline-yellow.svg b/backend/public/images/star-outline-yellow.svg deleted file mode 100644 index ceb83e39..00000000 --- a/backend/public/images/star-outline-yellow.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/backend/public/images/star-outline-yellow02.svg b/backend/public/images/star-outline-yellow02.svg deleted file mode 100644 index 70abcfab..00000000 --- a/backend/public/images/star-outline-yellow02.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 082f2d6c..e7a9c70f 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -36189,7 +36189,7 @@ var MeetingDetail = function MeetingDetail(props) { className: "p-article__pdf", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", { className: "p-article__pdf__btn", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("a", { + children: meeting.pdf ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("a", { "data-v-ade1d018": "", className: "btn-default btn-yellow btn-pdf btn-r8 btn-h52", onClick: function onClick(e) { @@ -36198,16 +36198,28 @@ var MeetingDetail = function MeetingDetail(props) { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", { children: "PDF\u3092\u78BA\u8A8D\u3059\u308B" }) + }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("a", { + "data-v-ade1d018": "", + className: "btn-default btn-yellow btn-pdf btn-r8 btn-h52 btn-disabled", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", { + children: "PDF\u3092\u78BA\u8A8D\u3059\u308B" + }) }) - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("button", { + }), meeting.memo ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("button", { type: "button", "aria-label": "\u304A\u6C17\u306B\u5165\u308A", "data-tooltip": "\u304A\u6C17\u306B\u5165\u308A", "aria-pressed": "false", - className: "icon a-icon like-icon icon-text icon-text-wrap a-icon-size_medium mr-0", + className: "icon a-icon like-icon icon-textFill icon-textFill-wrap a-icon-size_medium mr-0", onClick: function onClick() { return setShowMemoModal(true); } + }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("button", { + type: "button", + "aria-label": "\u304A\u6C17\u306B\u5165\u308A", + "data-tooltip": "\u304A\u6C17\u306B\u5165\u308A", + "aria-pressed": "false", + className: "icon a-icon like-icon icon-text icon-text-wrap a-icon-size_medium mr-0" })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("p", { className: "p-article__txt", @@ -40375,7 +40387,7 @@ var MeetingDetail = function MeetingDetail(props) { var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false), _useState12 = _slicedToArray(_useState11, 2), show_pdf_modal = _useState12[0], - setShowPDFMoal = _useState12[1]; + setShowPDFModal = _useState12[1]; var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false), _useState14 = _slicedToArray(_useState13, 2), @@ -40559,28 +40571,23 @@ var MeetingDetail = function MeetingDetail(props) { className: "p-article__pdf", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", { className: "p-article__pdf__btn mr-3", - children: _approval_register == false ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("a", { - className: "btn-default btn-pdf btn-r8 btn-h50 btn-disabled", + children: meeting.pdf ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("a", { + className: "btn-default btn-pdf btn-r8 btn-h50 btn-yellow", + onClick: function onClick() { + return setShowPDFModal(true); + }, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", { children: "PDF\u3092\u78BA\u8A8D\u3059\u308B" }) }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("a", { - className: "btn-default btn-pdf btn-r8 btn-h50 btn-yellow", - onClick: function onClick() { - return setShowPDFMoal(true); - }, + className: "btn-default btn-pdf btn-r8 btn-h50 btn-disabled", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", { children: "PDF\u3092\u78BA\u8A8D\u3059\u308B" }) }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", { className: "p-article__pdf__btn mr-0", - children: _approval_register == true ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("a", { - className: "btn-default btn-pdf btn-r8 btn-h50 btn-disabled", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", { - children: "\u30E1\u30E2\u3092\u78BA\u8A8D\u3059\u308B" - }) - }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("a", { + children: meeting.memo ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("a", { className: "btn-default btn-pdf btn-r8 btn-h50 btn-yellow", onClick: function onClick() { return setShowMemoModal(true); @@ -40588,6 +40595,11 @@ var MeetingDetail = function MeetingDetail(props) { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", { children: "\u30E1\u30E2\u3092\u78BA\u8A8D\u3059\u308B" }) + }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("a", { + className: "btn-default btn-pdf btn-r8 btn-h50 btn-disabled", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", { + children: "\u30E1\u30E2\u3092\u78BA\u8A8D\u3059\u308B" + }) }) })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("p", { @@ -40607,7 +40619,7 @@ var MeetingDetail = function MeetingDetail(props) { show: show_pdf_modal, pdfPath: meeting.pdf, handleClose: function handleClose() { - return setShowPDFMoal(false); + return setShowPDFModal(false); } })] }) @@ -47859,28 +47871,28 @@ var MeetingDetail = function MeetingDetail(props) { var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false), _useState14 = _slicedToArray(_useState13, 2), - showDelete = _useState14[0], - setShowDelete = _useState14[1]; + show_delete_modal = _useState14[0], + setShowDeleteModal = _useState14[1]; var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false), _useState16 = _slicedToArray(_useState15, 2), - showSettingNotify = _useState16[0], - setShowSettingNotify = _useState16[1]; + show_notify_all_modal = _useState16[0], + setShowNotifyAllModal = _useState16[1]; var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false), _useState18 = _slicedToArray(_useState17, 2), - showMemo = _useState18[0], - setShowMemo = _useState18[1]; + show_memo_modal = _useState18[0], + setShowMemoModal = _useState18[1]; var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false), _useState20 = _slicedToArray(_useState19, 2), - showNotify = _useState20[0], - setShowNotify = _useState20[1]; + show_notify_pickup_modal = _useState20[0], + setShowNotifySelectModal = _useState20[1]; var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false), _useState22 = _slicedToArray(_useState21, 2), - showPdf = _useState22[0], - setShowPdf = _useState22[1]; + show_pdf_modal = _useState22[0], + setShowPDFModal = _useState22[1]; var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null), _useState24 = _slicedToArray(_useState23, 2), @@ -47945,7 +47957,7 @@ var MeetingDetail = function MeetingDetail(props) { axios__WEBPACK_IMPORTED_MODULE_3___default().delete("/api/fathers/meetings/delete/".concat((_props$match$params2 = props.match.params) === null || _props$match$params2 === void 0 ? void 0 : _props$match$params2.meeting_id)).then(function (response) { setNotice(response.data.notice); setSubmitDelete(false); - setShowDelete(false); + setShowDeleteModal(false); switch (response.data.status_code) { case 200: @@ -48022,7 +48034,7 @@ var MeetingDetail = function MeetingDetail(props) { formdata.append('meeting_id', props.match.params.meeting_id); axios__WEBPACK_IMPORTED_MODULE_3___default().post('/api/fathers/approvalNotification', formdata).then(function (response) { setSubmitNotify(false); - setShowNotify(false); + setShowNotifySelectModal(false); switch (response.data.status_code) { case 200: @@ -48083,7 +48095,7 @@ var MeetingDetail = function MeetingDetail(props) { className: "meeting-member-list", role: "list", onClick: function onClick() { - return setShowSettingNotify(true); + return setShowNotifyAllModal(true); }, children: (_meeting$approval = meeting.approval) === null || _meeting$approval === void 0 ? void 0 : _meeting$approval.map(function (v, inx) { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("li", { @@ -48125,7 +48137,7 @@ var MeetingDetail = function MeetingDetail(props) { className: "p-article-btn__item", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", { onClick: function onClick() { - return setShowDelete(true); + return setShowDeleteModal(true); }, className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48", children: "\u524A\u9664" @@ -48146,7 +48158,7 @@ var MeetingDetail = function MeetingDetail(props) { className: "p-article-btn__item", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", { onClick: function onClick() { - return setShowNotify(true); + return setShowNotifySelectModal(true); }, className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48", children: "\u518D\u901A\u77E5" @@ -48182,22 +48194,35 @@ var MeetingDetail = function MeetingDetail(props) { className: "p-article__pdf", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("div", { className: "p-article__pdf__btn", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", { - onClick: function onClick(e) { - return setShowPdf(true); - }, + children: meeting.pdf ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", { + "data-v-ade1d018": "", className: "btn-default btn-yellow btn-pdf btn-r8 btn-h52", + onClick: function onClick(e) { + return setShowPDFModal(true); + }, + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("span", { + children: "PDF\u3092\u78BA\u8A8D\u3059\u308B" + }) + }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", { + "data-v-ade1d018": "", + className: "btn-default btn-yellow btn-pdf btn-r8 btn-h52 btn-disabled", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("span", { children: "PDF\u3092\u78BA\u8A8D\u3059\u308B" }) }) - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("button", { + }), meeting.memo ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("button", { type: "button", + "aria-label": "\u304A\u6C17\u306B\u5165\u308A", + "data-tooltip": "\u304A\u6C17\u306B\u5165\u308A", + "aria-pressed": "false", + className: "icon a-icon like-icon icon-textFill icon-textFill-wrap a-icon-size_medium", onClick: function onClick() { - return setShowMemo(true); - }, - "aria-label": "\u30E1\u30E2", - "data-tooltip": "\u30E1\u30E2", + return setShowMemoModal(true); + } + }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("button", { + type: "button", + "aria-label": "\u304A\u6C17\u306B\u5165\u308A", + "data-tooltip": "\u304A\u6C17\u306B\u5165\u308A", "aria-pressed": "false", className: "icon a-icon like-icon icon-text icon-text-wrap a-icon-size_medium" }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("button", { @@ -48219,39 +48244,39 @@ var MeetingDetail = function MeetingDetail(props) { }) }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_modal_setting_notify__WEBPACK_IMPORTED_MODULE_9__.default, { - show: showSettingNotify, + show: show_notify_all_modal, meetingId: meeting.id, handleClose: function handleClose() { - return setShowSettingNotify(false); + return setShowNotifyAllModal(false); } }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_modal_memo__WEBPACK_IMPORTED_MODULE_5__.default, { - show: showMemo, + show: show_memo_modal, title: "メモ", content: meeting === null || meeting === void 0 ? void 0 : meeting.memo, handleClose: function handleClose() { - return setShowMemo(false); + return setShowMemoModal(false); } }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_modal_confirm__WEBPACK_IMPORTED_MODULE_6__.default, { - show: showDelete, + show: show_delete_modal, message: "本当に削除しても\nよろしいでしょうか？", handleClose: function handleClose() { - return setShowDelete(false); + return setShowDeleteModal(false); }, handleAccept: handleAcceptDelete, loading: submit_delete }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_modal_confirm__WEBPACK_IMPORTED_MODULE_6__.default, { - show: showNotify, + show: show_notify_pickup_modal, message: "未承知の方に再通知しますが\nよろしいでしょうか？", handleClose: function handleClose() { - return setShowNotify(false); + return setShowNotifySelectModal(false); }, handleAccept: handleNotifyAllChild, loading: submit_notify }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_pdf_modal_pdf__WEBPACK_IMPORTED_MODULE_7__.default, { - show: showPdf, + show: show_pdf_modal, pdfPath: meeting.pdf, handleClose: function handleClose() { - return setShowPdf(false); + return setShowPDFModal(false); } })] })] diff --git a/backend/resources/js/admin/meeting/detail.jsx b/backend/resources/js/admin/meeting/detail.jsx index 8e1b901e..d18dc4cb 100644 --- a/backend/resources/js/admin/meeting/detail.jsx +++ b/backend/resources/js/admin/meeting/detail.jsx @@ -152,16 +152,31 @@ const MeetingDetail = (props) => {
-

{ meeting.text }

diff --git a/backend/resources/js/child/meeting/detail.jsx b/backend/resources/js/child/meeting/detail.jsx index 2f837877..9baf08da 100644 --- a/backend/resources/js/child/meeting/detail.jsx +++ b/backend/resources/js/child/meeting/detail.jsx @@ -18,7 +18,7 @@ const MeetingDetail = (props) => { const [thumbnail, setThumbnail] = useState(''); const [_approval_register, setApprovalRegister] = useState(false); - const [show_pdf_modal, setShowPDFMoal] = useState(false); + const [show_pdf_modal, setShowPDFModal] = useState(false); const [show_memo_modal, setShowMemoModal] = useState(false); const [show_confirm_modal, setShowConfirmMoal] = useState(false); const [submit, setSubmit] = useState(false); @@ -145,24 +145,24 @@ const MeetingDetail = (props) => {
{ - _approval_register == true ? - + meeting.memo ? + setShowMemoModal(true)}> メモを確認する - :setShowMemoModal(true)}> + : メモを確認する } @@ -181,7 +181,7 @@ const MeetingDetail = (props) => { setShowPDFMoal(false)} /> + handleClose={()=>setShowPDFModal(false)} />
diff --git a/backend/resources/js/parent/meeting/detail.jsx b/backend/resources/js/parent/meeting/detail.jsx index c0486774..5dab6bd3 100644 --- a/backend/resources/js/parent/meeting/detail.jsx +++ b/backend/resources/js/parent/meeting/detail.jsx @@ -23,11 +23,11 @@ const MeetingDetail = (props) => { const [_success, setSuccess] = useState(props.history.location.state); const [_400error, set400Error] = useState(''); - const [showDelete, setShowDelete] = useState(false); - const [showSettingNotify, setShowSettingNotify] = useState(false); - const [showMemo, setShowMemo] = useState(false); - const [showNotify, setShowNotify] = useState(false); - const [showPdf, setShowPdf] = useState(false); + const [show_delete_modal, setShowDeleteModal] = useState(false); + const [show_notify_all_modal, setShowNotifyAllModal] = useState(false); + const [show_memo_modal, setShowMemoModal] = useState(false); + const [show_notify_pickup_modal, setShowNotifySelectModal] = useState(false); + const [show_pdf_modal, setShowPDFModal] = useState(false); const [meeting, setMeeting] = useState(null); const [thumbnail, setThumbnail] = useState(null); @@ -71,7 +71,7 @@ const MeetingDetail = (props) => { .then(response => { setNotice(response.data.notice); setSubmitDelete(false); - setShowDelete(false); + setShowDeleteModal(false); switch(response.data.status_code){ case 200: { history.push({ pathname: "/p-account/meeting", @@ -114,7 +114,7 @@ const MeetingDetail = (props) => { axios.post('/api/fathers/approvalNotification', formdata) .then(response=>{ setSubmitNotify(false); - setShowNotify(false); + setShowNotifySelectModal(false); switch(response.data.status_code){ case 200: setSuccess('SMSの送信に成功しました!'); break; case 400: set400Error('SMSの送信に失敗しました。'); break; @@ -153,7 +153,7 @@ const MeetingDetail = (props) => {
  • {meeting?.denominator}
    • -