From 81c865efaf84b85624fbb65ba96e9a4967ce49c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Fri, 12 Nov 2021 11:31:06 +0900 Subject: [PATCH 01/10] =?UTF-8?q?SMS=E3=82=82=E3=83=80=E3=82=A4=E3=83=8A?= =?UTF-8?q?=E3=83=9F=E3=83=83=E3=82=AF=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/Http/Controllers/Api/ChildrenController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/app/Http/Controllers/Api/ChildrenController.php b/backend/app/Http/Controllers/Api/ChildrenController.php index c3ba41e3..5915cc29 100644 --- a/backend/app/Http/Controllers/Api/ChildrenController.php +++ b/backend/app/Http/Controllers/Api/ChildrenController.php @@ -69,7 +69,7 @@ class ChildrenController extends Controller { $message = 'KIKI承知システムの招待URLが届きました。 ▼招待URLはコチラ -https://kikikan.jp/c-account/register/'.$token.' +'.url('/').'/c-account/register/'.$token.' KIKI承知システムを使って「聞いてない！」「言ってない！」などの問題を解決しよう。'; \Notification::route('nexmo', '81'.substr($r->tel, 1))->notify(new SmsNotification($message)); @@ -208,7 +208,7 @@ KIKI承知システムを使って「聞いてない！」「言ってない！ $message = 'パスワード再発行用URLです。 有効期限は8時間以内です。 -https://kikikan.jp/c-account/forgot-password/reset/'.$token; +'.url('/').'/c-account/forgot-password/reset/'.$token; \Notification::route('nexmo', '81'.substr($r->tel, 1))->notify(new SmsNotification($message)); } catch (\Throwable $e) { // 失敗 From 878b8d8aea95e192849c613551f5bff21cedc196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Fri, 12 Nov 2021 11:31:25 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=E8=A6=AA=E3=81=AE=E8=A9=B3=E7=B4=B0API?= =?UTF-8?q?=E3=81=AEURL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/routes/api.php | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/routes/api.php b/backend/routes/api.php index fc0042df..4e6be926 100644 --- a/backend/routes/api.php +++ b/backend/routes/api.php @@ -84,6 +84,7 @@ Route::group(['prefix' => 'fathers'], function () { Route::put('/updateImage/{father_id}', '\App\Http\Controllers\Api\FathersController@updateImage'); Route::put('/updateProfile/{father_id}', '\App\Http\Controllers\Api\FathersController@updateProfile'); Route::delete('/withdrawal', '\App\Http\Controllers\Api\FathersController@withdrawal'); + Route::get('/detail/{father_id}', '\App\Http\Controllers\Api\FathersController@detail'); // ChildrenController Route::group(['prefix' => 'children'], function () { From 3334e7011d81f418eb4119df5715d75d8000dbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Fri, 12 Nov 2021 11:35:15 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E5=BE=8C=E3=81=AE=E7=A7=BB=E8=BB=A2=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/Http/Controllers/Api/AuthorizationTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/Http/Controllers/Api/AuthorizationTrait.php b/backend/app/Http/Controllers/Api/AuthorizationTrait.php index 862f0f85..b4b24e72 100644 --- a/backend/app/Http/Controllers/Api/AuthorizationTrait.php +++ b/backend/app/Http/Controllers/Api/AuthorizationTrait.php @@ -7,7 +7,7 @@ use Illuminate\Http\Request; trait AuthorizationTrait { public function checkLogin () { - $viewpath = str_replace('-', '_', request()->route()->action['prefix']); + $viewpath = request()->route()->action['prefix']; $loginpage = $viewpath.'/'.($this->getGuard() == 'admins' ? 'login' : 'auth'); if (Session::has($this->getGuard())) { From c179f8fc81e2f414539b27542e104ac789665698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Fri, 12 Nov 2021 16:24:48 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=E3=82=84=E3=82=8C=E3=82=84=E3=82=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/Http/Controllers/Api/AuthorizationTrait.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/app/Http/Controllers/Api/AuthorizationTrait.php b/backend/app/Http/Controllers/Api/AuthorizationTrait.php index b4b24e72..b00fec7e 100644 --- a/backend/app/Http/Controllers/Api/AuthorizationTrait.php +++ b/backend/app/Http/Controllers/Api/AuthorizationTrait.php @@ -7,11 +7,11 @@ use Illuminate\Http\Request; trait AuthorizationTrait { public function checkLogin () { - $viewpath = request()->route()->action['prefix']; + $viewpath = str_replace('-', '_', request()->route()->action['prefix']); $loginpage = $viewpath.'/'.($this->getGuard() == 'admins' ? 'login' : 'auth'); if (Session::has($this->getGuard())) { - return redirect($viewpath.'/meeting'); + return redirect(request()->route()->action['prefix'].'/meeting'); } return view($loginpage); From d3bcb540f6825f911a59f5af12c3e068a8ce1964 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Fri, 12 Nov 2021 17:31:58 +0900 Subject: [PATCH 05/10] add notification action c-account --- backend/public/js/app.js | 55 +++++++++++++++------ backend/resources/js/child/notification.jsx | 13 ++++- backend/resources/js/child/side.jsx | 43 +++++++--------- 3 files changed, 70 insertions(+), 41 deletions(-) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index d49b9f89..f47abb40 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -42663,15 +42663,34 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__) /* harmony export */ }); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js"); +/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js"); /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); + var Notification = function Notification(_ref) { var notice = _ref.notice; + var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_2__.useHistory)(); + + var handleClick = function handleClick() { + var navbar_list = document.getElementsByClassName("mypage-nav-list__item"); + + for (var i = 0; i < navbar_list.length; i++) { + navbar_list[i].classList.remove('nav-active'); + } + + document.getElementsByClassName("-meeting")[0].classList.add('nav-active'); + history.push({ + pathname: "/c-account/meeting/", + state: {} + }); + }; + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { className: "p-notification", + onClick: handleClick, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { className: "p-notification-icon", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { @@ -44612,6 +44631,17 @@ function Side() { }); }; + var handleSelected = function handleSelected(id) { + var navbar_list = document.getElementsByClassName("mypage-nav-list__item"); + + for (var i = 0; i < navbar_list.length; i++) { + navbar_list[i].classList.remove('nav-active'); + } + + document.getElementsByClassName(id)[0].classList.add('nav-active'); + setSelected(id); + }; + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", { className: "l-side", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("div", { @@ -44628,10 +44658,9 @@ function Side() { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("ul", { className: "mypage-nav-list", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("li", { - className: "mypage-nav-list__item -meeting ".concat((selected == 'meeting' || selected == '' && document.getElementById('c_router').value == 'meeting') && "nav-active"), + className: "mypage-nav-list__item -meeting ".concat(selected == '' && document.getElementById('c_router').value == 'meeting' && "nav-active"), onClick: function onClick(e) { - e.preventDefault(); - setSelected('meeting'); + return handleSelected("-meeting"); }, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", @@ -44643,10 +44672,9 @@ function Side() { })] }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("li", { - className: "mypage-nav-list__item -search ".concat((selected == 'search' || selected == '' && document.getElementById('c_router').value == 'search') && "nav-active"), + className: "mypage-nav-list__item -search ".concat(selected == '' && document.getElementById('c_router').value == 'search' && "nav-active"), onClick: function onClick(e) { - e.preventDefault(); - setSelected('search'); + return handleSelected("-search"); }, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", @@ -44658,10 +44686,9 @@ function Side() { })] }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("li", { - className: "mypage-nav-list__item -parentinfo ".concat((selected == 'parent' || selected == '' && document.getElementById('c_router').value == 'parent') && "nav-active"), + className: "mypage-nav-list__item -parentinfo ".concat(selected == '' && document.getElementById('c_router').value == 'parent' && "nav-active"), onClick: function onClick(e) { - e.preventDefault(); - setSelected('parent'); + return handleSelected("-parentinfo"); }, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "mypage-nav-list__link", @@ -44673,10 +44700,9 @@ function Side() { })] }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("li", { - className: "mypage-nav-list__item -profile ".concat((selected == 'profile' || selected == '' && document.getElementById('c_router').value == 'profile') && "nav-active"), + className: "mypage-nav-list__item -profile ".concat(selected == '' && document.getElementById('c_router').value == 'profile' && "nav-active"), onClick: function onClick(e) { - e.preventDefault(); - setSelected('profile'); + return handleSelected("-profile"); }, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_2__.Link, { className: "user-icon mypage-nav-list__link", @@ -44694,10 +44720,9 @@ function Side() { })] }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("li", { - className: "mypage-nav-list__item -logout ".concat(selected == 'logout' && "nav-active"), + className: "mypage-nav-list__item -logout ".concat(selected == '-logout' && "nav-active"), onClick: function onClick(e) { - e.preventDefault(); - setSelected('logout'); + return handleSelected("-logout"); }, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("a", { className: "mypage-nav-list__link", diff --git a/backend/resources/js/child/notification.jsx b/backend/resources/js/child/notification.jsx index f195f1b2..4b0d779f 100644 --- a/backend/resources/js/child/notification.jsx +++ b/backend/resources/js/child/notification.jsx @@ -1,9 +1,20 @@ import React, { useEffect, useState } from 'react'; +import { useHistory, Link } from 'react-router-dom'; const Notification = ({ notice }) => { + + const history = useHistory(); + + const handleClick = () => { + var navbar_list = document.getElementsByClassName("mypage-nav-list__item"); + for(let i=0; i +
{ diff --git a/backend/resources/js/child/side.jsx b/backend/resources/js/child/side.jsx index 1f25e7b9..0cd40086 100644 --- a/backend/resources/js/child/side.jsx +++ b/backend/resources/js/child/side.jsx @@ -11,6 +11,14 @@ export default function Side() { .then(() => location.href = '/c-account/login') } + const handleSelected = (id) => { + var navbar_list = document.getElementsByClassName("mypage-nav-list__item"); + for(let i=0; i
@@ -19,42 +27,30 @@ export default function Side() {