|
|
@@ -12,23 +12,23 @@
|
|
|
/* harmony export */ });
|
|
|
/* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @tarojs/taro */ "webpack/container/remote/@tarojs/taro");
|
|
|
/* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_tarojs_taro__WEBPACK_IMPORTED_MODULE_0__);
|
|
|
-/* harmony import */ var _features_auth_components_Auth__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../features/auth/components/Auth */ "./src/features/auth/components/Auth.tsx");
|
|
|
-/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
|
|
|
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
|
|
|
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__);
|
|
|
+/* harmony import */ var _features_auth_components_Auth__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @features/auth/components/Auth */ "./src/features/auth/components/Auth.tsx");
|
|
|
+/* harmony import */ var _features_auth_components_CreatePassword__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @features/auth/components/CreatePassword */ "./src/features/auth/components/CreatePassword.tsx");
|
|
|
+/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
|
|
|
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
|
|
|
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__);
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function Page() {
|
|
|
- _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().setBackgroundColor({
|
|
|
- backgroundColor: '#000000'
|
|
|
- });
|
|
|
- return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.View, {
|
|
|
+ var router = (0,_tarojs_taro__WEBPACK_IMPORTED_MODULE_0__.useRouter)();
|
|
|
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.View, {
|
|
|
style: {
|
|
|
backgroundColor: '#000'
|
|
|
},
|
|
|
- children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_features_auth_components_Auth__WEBPACK_IMPORTED_MODULE_1__["default"], {})
|
|
|
+ children: router.params.type === 'createPassword' ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_features_auth_components_CreatePassword__WEBPACK_IMPORTED_MODULE_2__["default"], {}) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_features_auth_components_Auth__WEBPACK_IMPORTED_MODULE_1__["default"], {})
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -51,7 +51,7 @@ function Page() {
|
|
|
|
|
|
function Component(props) {
|
|
|
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_1__.View, {
|
|
|
- className: "container",
|
|
|
+ className: "box-container",
|
|
|
children: props.child
|
|
|
});
|
|
|
}
|
|
|
@@ -67,7 +67,7 @@ function Component(props) {
|
|
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
|
/* harmony export */ "default": function() { return /* binding */ Component; }
|
|
|
/* harmony export */ });
|
|
|
-/* harmony import */ var _Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
|
|
|
+/* harmony import */ var _Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
|
|
|
/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
|
|
|
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "webpack/container/remote/react");
|
|
|
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
|
|
|
@@ -82,13 +82,14 @@ function Component(_ref) {
|
|
|
var placeholder = _ref.placeholder,
|
|
|
value = _ref.value,
|
|
|
onChange = _ref.onChange,
|
|
|
- disabled = _ref.disabled;
|
|
|
+ disabled = _ref.disabled,
|
|
|
+ isSecure = _ref.isSecure;
|
|
|
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(value ? value : ''),
|
|
|
- _useState2 = (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__["default"])(_useState, 2),
|
|
|
+ _useState2 = (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__["default"])(_useState, 2),
|
|
|
inputValue = _useState2[0],
|
|
|
setInputValue = _useState2[1];
|
|
|
var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
|
|
|
- _useState4 = (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__["default"])(_useState3, 2),
|
|
|
+ _useState4 = (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__["default"])(_useState3, 2),
|
|
|
isFocus = _useState4[0],
|
|
|
setIsFocus = _useState4[1];
|
|
|
var handleInputChange = function handleInputChange(e) {
|
|
|
@@ -101,6 +102,7 @@ function Component(_ref) {
|
|
|
className: isFocus ? "input input_focus" : "input",
|
|
|
placeholder: placeholder ? placeholder : '',
|
|
|
value: inputValue,
|
|
|
+ type: isSecure ? 'password' : 'text',
|
|
|
onInput: handleInputChange,
|
|
|
disabled: disabled ? disabled : false,
|
|
|
onFocus: function onFocus() {
|
|
|
@@ -124,8 +126,8 @@ function Component(_ref) {
|
|
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
|
/* harmony export */ "default": function() { return /* binding */ Auth; }
|
|
|
/* harmony export */ });
|
|
|
-/* harmony import */ var _Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
|
|
|
-/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
|
|
|
+/* harmony import */ var _Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
|
|
|
+/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
|
|
|
/* harmony import */ var _components_Texts__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @components/Texts */ "./src/components/Texts.tsx");
|
|
|
/* harmony import */ var _utils_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @utils/types */ "./src/utils/types.ts");
|
|
|
/* harmony import */ var _components_Box__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @components/Box */ "./src/components/Box.tsx");
|
|
|
@@ -138,12 +140,10 @@ function Component(_ref) {
|
|
|
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_7__);
|
|
|
/* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react-redux */ "webpack/container/remote/react-redux");
|
|
|
/* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_8__);
|
|
|
-/* harmony import */ var _store_user__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @/store/user */ "./src/store/user.tsx");
|
|
|
-/* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @tarojs/taro */ "webpack/container/remote/@tarojs/taro");
|
|
|
-/* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(_tarojs_taro__WEBPACK_IMPORTED_MODULE_10__);
|
|
|
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
|
|
|
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__);
|
|
|
-
|
|
|
+/* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @tarojs/taro */ "webpack/container/remote/@tarojs/taro");
|
|
|
+/* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_tarojs_taro__WEBPACK_IMPORTED_MODULE_9__);
|
|
|
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
|
|
|
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -163,67 +163,108 @@ function Auth() {
|
|
|
var _useTranslation = (0,react_i18next__WEBPACK_IMPORTED_MODULE_6__.useTranslation)(),
|
|
|
t = _useTranslation.t;
|
|
|
var dispatch = (0,react_redux__WEBPACK_IMPORTED_MODULE_8__.useDispatch)();
|
|
|
- var _useState = (0,react__WEBPACK_IMPORTED_MODULE_7__.useState)(''),
|
|
|
- _useState2 = (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_12__["default"])(_useState, 2),
|
|
|
- name = _useState2[0],
|
|
|
- setName = _useState2[1];
|
|
|
+ var _useState = (0,react__WEBPACK_IMPORTED_MODULE_7__.useState)(true),
|
|
|
+ _useState2 = (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_11__["default"])(_useState, 2),
|
|
|
+ isSignup = _useState2[0],
|
|
|
+ setIsSignup = _useState2[1];
|
|
|
var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_7__.useState)(''),
|
|
|
- _useState4 = (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_12__["default"])(_useState3, 2),
|
|
|
- email = _useState4[0],
|
|
|
- setEmail = _useState4[1];
|
|
|
+ _useState4 = (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_11__["default"])(_useState3, 2),
|
|
|
+ name = _useState4[0],
|
|
|
+ setName = _useState4[1];
|
|
|
+ var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_7__.useState)(''),
|
|
|
+ _useState6 = (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_11__["default"])(_useState5, 2),
|
|
|
+ email = _useState6[0],
|
|
|
+ setEmail = _useState6[1];
|
|
|
+ var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_7__.useState)(''),
|
|
|
+ _useState8 = (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_11__["default"])(_useState7, 2),
|
|
|
+ password = _useState8[0],
|
|
|
+ setPassword = _useState8[1];
|
|
|
var handleNameChange = function handleNameChange(value) {
|
|
|
setName(value);
|
|
|
};
|
|
|
var handleEmailChange = function handleEmailChange(value) {
|
|
|
setEmail(value);
|
|
|
};
|
|
|
+ var handlePasswordChange = function handlePasswordChange(value) {
|
|
|
+ setPassword(value);
|
|
|
+ };
|
|
|
var isButtonDisabled = name === '' || email === '';
|
|
|
- function loginComponent() {
|
|
|
- return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
|
|
|
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_3__["default"], {
|
|
|
+ var isLoginButtonDisabled = email === '' || password === '';
|
|
|
+ function signupComponent() {
|
|
|
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_12__.View, {
|
|
|
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_3__["default"], {
|
|
|
value: name,
|
|
|
onChange: handleNameChange,
|
|
|
placeholder: t('feature.auth.create_account.input_username_placeholder')
|
|
|
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_12__.View, {
|
|
|
style: {
|
|
|
height: 20
|
|
|
}
|
|
|
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_3__["default"], {
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_3__["default"], {
|
|
|
value: email,
|
|
|
onChange: handleEmailChange,
|
|
|
placeholder: t('feature.auth.create_account.input_email_placeholder')
|
|
|
})]
|
|
|
});
|
|
|
}
|
|
|
+ function loginComponent() {
|
|
|
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_12__.View, {
|
|
|
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_3__["default"], {
|
|
|
+ value: email,
|
|
|
+ onChange: handleEmailChange,
|
|
|
+ placeholder: t('feature.auth.login.input_account_placeholder')
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_12__.View, {
|
|
|
+ style: {
|
|
|
+ height: 20
|
|
|
+ }
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_3__["default"], {
|
|
|
+ value: password,
|
|
|
+ isSecure: true,
|
|
|
+ onChange: handlePasswordChange,
|
|
|
+ placeholder: t('feature.auth.login.input_password_placeholder')
|
|
|
+ })]
|
|
|
+ });
|
|
|
+ }
|
|
|
function registerF() {
|
|
|
if (isButtonDisabled) {
|
|
|
return;
|
|
|
}
|
|
|
- dispatch((0,_store_user__WEBPACK_IMPORTED_MODULE_9__.register)(name, email, '123456'));
|
|
|
setTimeout(function () {
|
|
|
- _tarojs_taro__WEBPACK_IMPORTED_MODULE_10___default().navigateBack();
|
|
|
- _tarojs_taro__WEBPACK_IMPORTED_MODULE_10___default().redirectTo({
|
|
|
- url: '/pages/ChooseScenario'
|
|
|
+ _tarojs_taro__WEBPACK_IMPORTED_MODULE_9___default().navigateTo({
|
|
|
+ url: "/pages/Auth?type=createPassword&name=".concat(name, "&email=").concat(email)
|
|
|
});
|
|
|
}, 1000);
|
|
|
+
|
|
|
+ // setTimeout(() => {
|
|
|
+ // Taro.navigateBack()
|
|
|
+ // Taro.redirectTo({
|
|
|
+ // url: '/pages/ChooseScenario'
|
|
|
+ // })
|
|
|
+ // },1000)
|
|
|
}
|
|
|
- return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
|
|
|
+
|
|
|
+ function changeLogin() {
|
|
|
+ setIsSignup(false);
|
|
|
+ console.log(isSignup);
|
|
|
+ }
|
|
|
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_12__.View, {
|
|
|
style: {
|
|
|
backgroundColor: '#000',
|
|
|
flex: 1,
|
|
|
flexDirection: 'column',
|
|
|
display: 'flex',
|
|
|
+ width: '100vw',
|
|
|
height: '100vh'
|
|
|
},
|
|
|
- children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_0__["default"], {
|
|
|
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_0__["default"], {
|
|
|
text: t('feature.auth.create_account.title'),
|
|
|
type: _utils_types__WEBPACK_IMPORTED_MODULE_1__.TextType.primary
|
|
|
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_0__["default"], {
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_0__["default"], {
|
|
|
text: t('feature.auth.create_account.sub_title'),
|
|
|
type: _utils_types__WEBPACK_IMPORTED_MODULE_1__.TextType.secondary
|
|
|
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Box__WEBPACK_IMPORTED_MODULE_2__["default"], {
|
|
|
- child: loginComponent()
|
|
|
- }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Buttons__WEBPACK_IMPORTED_MODULE_4__["default"], {
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_components_Box__WEBPACK_IMPORTED_MODULE_2__["default"], {
|
|
|
+ child: isSignup ? signupComponent() : loginComponent()
|
|
|
+ }), isSignup ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_components_Buttons__WEBPACK_IMPORTED_MODULE_4__["default"], {
|
|
|
onClick: registerF,
|
|
|
title: t('feature.auth.create_account.btn_next'),
|
|
|
style: {
|
|
|
@@ -233,11 +274,175 @@ function Auth() {
|
|
|
marginBottom: 20
|
|
|
},
|
|
|
status: isButtonDisabled ? _utils_types__WEBPACK_IMPORTED_MODULE_1__.ComponentStatus.disable : _utils_types__WEBPACK_IMPORTED_MODULE_1__.ComponentStatus.enable
|
|
|
+ }) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_components_Buttons__WEBPACK_IMPORTED_MODULE_4__["default"], {
|
|
|
+ onClick: registerF,
|
|
|
+ title: t('feature.auth.create_account.btn_next'),
|
|
|
+ style: {
|
|
|
+ marginLeft: 23,
|
|
|
+ marginRight: 23,
|
|
|
+ marginTop: 20,
|
|
|
+ marginBottom: 20
|
|
|
+ },
|
|
|
+ status: isLoginButtonDisabled ? _utils_types__WEBPACK_IMPORTED_MODULE_1__.ComponentStatus.disable : _utils_types__WEBPACK_IMPORTED_MODULE_1__.ComponentStatus.enable
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_12__.View, {
|
|
|
+ className: "agree_view",
|
|
|
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_12__.Image, {
|
|
|
+ style: "width:12px;height:12px;",
|
|
|
+ src: _assets_svg_check_svg__WEBPACK_IMPORTED_MODULE_5__
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_12__.Text, {
|
|
|
+ className: "agree_text",
|
|
|
+ children: t('page.auth.agreement')
|
|
|
+ })]
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_12__.View, {
|
|
|
+ style: {
|
|
|
+ flex: 1
|
|
|
+ }
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_12__.View, {
|
|
|
+ className: "footer",
|
|
|
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_12__.Text, {
|
|
|
+ className: "have_account",
|
|
|
+ children: t('feature.auth.create_account.footer_desc')
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_12__.Text, {
|
|
|
+ className: "login",
|
|
|
+ onClick: function onClick() {
|
|
|
+ return setIsSignup(!isSignup);
|
|
|
+ },
|
|
|
+ children: t('feature.auth.create_account.footer_login')
|
|
|
+ })]
|
|
|
+ })]
|
|
|
+ });
|
|
|
+}
|
|
|
+
|
|
|
+/***/ }),
|
|
|
+
|
|
|
+/***/ "./src/features/auth/components/CreatePassword.tsx":
|
|
|
+/*!*********************************************************!*\
|
|
|
+ !*** ./src/features/auth/components/CreatePassword.tsx ***!
|
|
|
+ \*********************************************************/
|
|
|
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
|
|
|
+
|
|
|
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
|
+/* harmony export */ "default": function() { return /* binding */ Component; }
|
|
|
+/* harmony export */ });
|
|
|
+/* harmony import */ var _Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
|
|
|
+/* harmony import */ var _components_Box__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @/components/Box */ "./src/components/Box.tsx");
|
|
|
+/* harmony import */ var _components_Buttons__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @/components/Buttons */ "./src/components/Buttons.tsx");
|
|
|
+/* harmony import */ var _components_Inputs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @/components/Inputs */ "./src/components/Inputs.tsx");
|
|
|
+/* harmony import */ var _components_Texts__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @/components/Texts */ "./src/components/Texts.tsx");
|
|
|
+/* harmony import */ var _store_user__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @/store/user */ "./src/store/user.tsx");
|
|
|
+/* harmony import */ var _utils_types__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @/utils/types */ "./src/utils/types.ts");
|
|
|
+/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
|
|
|
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! react */ "webpack/container/remote/react");
|
|
|
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_6__);
|
|
|
+/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! react-i18next */ "webpack/container/remote/react-i18next");
|
|
|
+/* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(react_i18next__WEBPACK_IMPORTED_MODULE_7__);
|
|
|
+/* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react-redux */ "webpack/container/remote/react-redux");
|
|
|
+/* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_8__);
|
|
|
+/* harmony import */ var _assets_svg_check_svg__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @assets/svg/check.svg */ "./src/assets/svg/check.svg");
|
|
|
+/* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @tarojs/taro */ "webpack/container/remote/@tarojs/taro");
|
|
|
+/* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(_tarojs_taro__WEBPACK_IMPORTED_MODULE_10__);
|
|
|
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
|
|
|
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+function Component(prop) {
|
|
|
+ var _useTranslation = (0,react_i18next__WEBPACK_IMPORTED_MODULE_7__.useTranslation)(),
|
|
|
+ t = _useTranslation.t;
|
|
|
+ var dispatch = (0,react_redux__WEBPACK_IMPORTED_MODULE_8__.useDispatch)();
|
|
|
+ var _useState = (0,react__WEBPACK_IMPORTED_MODULE_6__.useState)(''),
|
|
|
+ _useState2 = (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_12__["default"])(_useState, 2),
|
|
|
+ password = _useState2[0],
|
|
|
+ setPassword = _useState2[1];
|
|
|
+ var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_6__.useState)(''),
|
|
|
+ _useState4 = (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_12__["default"])(_useState3, 2),
|
|
|
+ repeat = _useState4[0],
|
|
|
+ setRepeat = _useState4[1];
|
|
|
+ var handlePasswordChange = function handlePasswordChange(value) {
|
|
|
+ setPassword(value);
|
|
|
+ };
|
|
|
+ var handleRepeatChange = function handleRepeatChange(value) {
|
|
|
+ setRepeat(value);
|
|
|
+ };
|
|
|
+ var isButtonDisabled = password === '' || repeat === '';
|
|
|
+ function loginComponent() {
|
|
|
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
|
|
|
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_2__["default"], {
|
|
|
+ value: password,
|
|
|
+ isSecure: true,
|
|
|
+ onChange: handlePasswordChange,
|
|
|
+ placeholder: t('feature.auth.create_password.input_password_placeholder')
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
|
|
|
+ style: {
|
|
|
+ height: 20
|
|
|
+ }
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_2__["default"], {
|
|
|
+ value: repeat,
|
|
|
+ isSecure: true,
|
|
|
+ onChange: handleRepeatChange,
|
|
|
+ placeholder: t('feature.auth.create_password.input_password_confirm_placeholder')
|
|
|
+ })]
|
|
|
+ });
|
|
|
+ }
|
|
|
+ function registerF() {
|
|
|
+ if (isButtonDisabled) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ dispatch((0,_store_user__WEBPACK_IMPORTED_MODULE_4__.register)(prop.name, prop.email, password));
|
|
|
+ setTimeout(function () {
|
|
|
+ _tarojs_taro__WEBPACK_IMPORTED_MODULE_10___default().navigateBack({
|
|
|
+ delta: 2
|
|
|
+ });
|
|
|
+ _tarojs_taro__WEBPACK_IMPORTED_MODULE_10___default().redirectTo({
|
|
|
+ url: '/pages/ChooseScenario'
|
|
|
+ });
|
|
|
+ }, 1000);
|
|
|
+ }
|
|
|
+ return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
|
|
|
+ style: {
|
|
|
+ backgroundColor: '#000',
|
|
|
+ flex: 1,
|
|
|
+ flexDirection: 'column',
|
|
|
+ display: 'flex',
|
|
|
+ width: '100vw',
|
|
|
+ height: '100vh'
|
|
|
+ },
|
|
|
+ children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_3__["default"], {
|
|
|
+ text: t('feature.auth.create_password.title'),
|
|
|
+ type: _utils_types__WEBPACK_IMPORTED_MODULE_5__.TextType.primary
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_3__["default"], {
|
|
|
+ text: t('feature.auth.create_password.sub_title'),
|
|
|
+ type: _utils_types__WEBPACK_IMPORTED_MODULE_5__.TextType.secondary
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Box__WEBPACK_IMPORTED_MODULE_0__["default"], {
|
|
|
+ child: loginComponent()
|
|
|
+ }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Buttons__WEBPACK_IMPORTED_MODULE_1__["default"], {
|
|
|
+ onClick: registerF,
|
|
|
+ title: t('feature.auth.create_password.btn_next'),
|
|
|
+ style: {
|
|
|
+ marginLeft: 23,
|
|
|
+ marginRight: 23,
|
|
|
+ marginTop: 20,
|
|
|
+ marginBottom: 20
|
|
|
+ },
|
|
|
+ status: isButtonDisabled ? _utils_types__WEBPACK_IMPORTED_MODULE_5__.ComponentStatus.disable : _utils_types__WEBPACK_IMPORTED_MODULE_5__.ComponentStatus.enable
|
|
|
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
|
|
|
className: "agree_view",
|
|
|
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.Image, {
|
|
|
style: "width:12px;height:12px;",
|
|
|
- src: _assets_svg_check_svg__WEBPACK_IMPORTED_MODULE_5__
|
|
|
+ src: _assets_svg_check_svg__WEBPACK_IMPORTED_MODULE_9__
|
|
|
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.Text, {
|
|
|
className: "agree_text",
|
|
|
children: t('page.auth.agreement')
|
|
|
@@ -250,10 +455,10 @@ function Auth() {
|
|
|
className: "footer",
|
|
|
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.Text, {
|
|
|
className: "have_account",
|
|
|
- children: t('feature.auth.create_account.footer_desc')
|
|
|
+ children: t('feature.auth.create_password.footer_desc')
|
|
|
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.Text, {
|
|
|
className: "login",
|
|
|
- children: t('feature.auth.create_account.footer_login')
|
|
|
+ children: t('feature.auth.create_password.footer_login')
|
|
|
})]
|
|
|
})]
|
|
|
});
|
leon