diff --git a/backend/public/js/app.js b/backend/public/js/app.js
index bdf6d45b..c35bc085 100644
--- a/backend/public/js/app.js
+++ b/backend/public/js/app.js
@@ -40338,7 +40338,7 @@ var ChildForgotPasswordComplete = function ChildForgotPasswordComplete() {
var gotoLogin = function gotoLogin() {
history.push({
- pathname: '/login/c-account',
+ pathname: '/c-account/login',
state: {}
});
};
@@ -40702,7 +40702,7 @@ var ChildForgotPasswordReset = function ChildForgotPasswordReset(props) {
type: "success",
hide: function hide() {
return history.push({
- pathname: '/forgot-password/c-account/complete',
+ pathname: '/c-account/forgot-password/complete',
state: {}
});
},
@@ -41033,7 +41033,7 @@ var ChildLogin = function ChildLogin() {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)("div", {
className: "mt-5 text-center",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_4__.Link, {
- to: "/forgot-password/c-account",
+ to: "/c-account/forgot-password",
className: "ft-16 text-black text-decoration-none",
children: "\u30D1\u30B9\u30EF\u30FC\u30C9\u7D1B\u5931\u306E\u65B9\u306F\u30B3\u30C1\u30E9"
})
@@ -41080,7 +41080,7 @@ var ChildSignUpComplete = function ChildSignUpComplete() {
var gotoLogin = function gotoLogin() {
history.push({
- pathname: '/login/c-account',
+ pathname: '/c-account/login',
state: {}
});
};
@@ -41124,28 +41124,30 @@ __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_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-dom */ "./node_modules/react-dom/index.js");
-/* harmony import */ var _component_alert__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../component/alert */ "./resources/js/component/alert.jsx");
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
-
-
+/* harmony import */ var react_router__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router */ "./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 ChildSignUpError = function ChildSignUpError() {
+ var history = (0,react_router__WEBPACK_IMPORTED_MODULE_2__.useHistory)();
+
var gotoLogin = function gotoLogin() {
- window.location.href = "/login/c-account/";
+ history.push({
+ pathname: '/c-account/login',
+ state: {}
+ });
};
- return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", {
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("p", {
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("div", {
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("p", {
className: "text-center font-weight-bold ft-25",
children: "\u672C\u767B\u9332\u30A8\u30E9\u30FC"
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("span", {
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxs)("span", {
className: "mt-80-px l-alert__text--error ft-18 ft-md-16",
- children: ["\u767B\u9332\u306E\u7D4C\u904E\u6642\u9593\u304C\u904E\u304E\u3066\u304A\u308A\u307E\u3059\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("br", {}), "\u304A\u624B\u6570\u3067\u3059\u304C\u518D\u5EA6\u62DB\u5F85\u30E6\u30FC\u30B6\u30FC\u306B\u9023\u7D61\u3057\u3001\u518D\u767B\u9332 \u306E\u624B\u7D9A\u304D\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002"]
+ children: ["\u767B\u9332\u306E\u7D4C\u904E\u6642\u9593\u304C\u904E\u304E\u3066\u304A\u308A\u307E\u3059\u3002", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)("br", {}), "\u304A\u624B\u6570\u3067\u3059\u304C\u518D\u5EA6\u62DB\u5F85\u30E6\u30FC\u30B6\u30FC\u306B\u9023\u7D61\u3057\u3001\u518D\u767B\u9332 \u306E\u624B\u7D9A\u304D\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002"]
})]
});
};
@@ -41276,7 +41278,7 @@ var ChildSignUp = function ChildSignUp() {
switch (response.data.status_code) {
case 200:
history.push({
- pathname: '/register/c-account/complete',
+ pathname: '/c-account/register/complete',
state: {}
});
break;
@@ -41287,7 +41289,7 @@ var ChildSignUp = function ChildSignUp() {
case 400:
history.push({
- pathname: '/register/c-account/error',
+ pathname: '/c-account/register/error',
state: {}
});
break;
diff --git a/backend/resources/js/child/auth/forgot_password/complete.jsx b/backend/resources/js/child/auth/forgot_password/complete.jsx
index eddb8fcf..665c404d 100644
--- a/backend/resources/js/child/auth/forgot_password/complete.jsx
+++ b/backend/resources/js/child/auth/forgot_password/complete.jsx
@@ -7,7 +7,7 @@ const ChildForgotPasswordComplete = () => {
const history = useHistory();
const gotoLogin = () => {
- history.push({pathname: '/login/c-account', state: {}});
+ history.push({pathname: '/c-account/login', state: {}});
}
return (
diff --git a/backend/resources/js/child/auth/forgot_password/reset.jsx b/backend/resources/js/child/auth/forgot_password/reset.jsx
index d6c65980..785f4ed2 100644
--- a/backend/resources/js/child/auth/forgot_password/reset.jsx
+++ b/backend/resources/js/child/auth/forgot_password/reset.jsx
@@ -90,7 +90,7 @@ const ChildForgotPasswordReset = (props) => {
{
_success &&
- history.push({pathname: '/forgot-password/c-account/complete', state: {}})
+ history.push({pathname: '/c-account/forgot-password/complete', state: {}})
}> {_success}
}
diff --git a/backend/resources/js/child/auth/login/index.jsx b/backend/resources/js/child/auth/login/index.jsx
index 68660b22..69218f38 100644
--- a/backend/resources/js/child/auth/login/index.jsx
+++ b/backend/resources/js/child/auth/login/index.jsx
@@ -87,7 +87,7 @@ const ChildLogin = () => {
-
パスワード紛失の方はコチラ
diff --git a/backend/resources/js/child/auth/register/complete.jsx b/backend/resources/js/child/auth/register/complete.jsx
index c908c24e..acd396d3 100644
--- a/backend/resources/js/child/auth/register/complete.jsx
+++ b/backend/resources/js/child/auth/register/complete.jsx
@@ -7,7 +7,7 @@ const ChildSignUpComplete = () => {
const history = useHistory();
const gotoLogin = () => {
- history.push({pathname: '/login/c-account', state: {}});
+ history.push({pathname: '/c-account/login', state: {}});
}
return (
diff --git a/backend/resources/js/child/auth/register/error.jsx b/backend/resources/js/child/auth/register/error.jsx
index b395ebda..efa3ccc5 100644
--- a/backend/resources/js/child/auth/register/error.jsx
+++ b/backend/resources/js/child/auth/register/error.jsx
@@ -1,13 +1,13 @@
import React, { useEffect, useState } from 'react';
-import ReactDOM from 'react-dom';
-import { Button } from '@material-ui/core';
-import Alert from '../../../component/alert';
+import { useHistory } from 'react-router';
const ChildSignUpError = () => {
+ const history = useHistory();
+
const gotoLogin = () => {
- window.location.href = "/login/c-account/";
+ history.push({pathname: '/c-account/login', state: {}});
}
return (
diff --git a/backend/resources/js/child/auth/register/index.jsx b/backend/resources/js/child/auth/register/index.jsx
index 17a21fcf..4fdc276b 100644
--- a/backend/resources/js/child/auth/register/index.jsx
+++ b/backend/resources/js/child/auth/register/index.jsx
@@ -54,9 +54,9 @@ const ChildSignUp = () => {
.then(response => {
setSubmit(false);
switch(response.data.status_code){
- case 200: history.push({pathname: '/register/c-account/complete', state: {}}); break;
+ case 200: history.push({pathname: '/c-account/register/complete', state: {}}); break;
case 422: set422Errors(response.data.error_messages); break;
- case 400: history.push({pathname: '/register/c-account/error', state: {}}); break;
+ case 400: history.push({pathname: '/c-account/register/error', state: {}}); break;
};
})
.catch(err=>console.log(err))