perf: dev api and multi

bigcommerce · Jul 20, 2022 · c2a6e2d · c2a6e2d
1 parent 283dfb0
commit c2a6e2d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/apps/storefront/.env.development b/apps/storefront/.env.development
@@ -1,3 +1,3 @@
 VITE_NODE_ENV=development
-VITE_B2B_BASIC_URL=https://dev-v2.bundleb2b.net
+VITE_B2B_BASIC_URL=https://dev-v2.bundleb2b.net/api
 VITE_B2B_STOREHASH='rtmh8fqr05'
diff --git a/apps/storefront/src/locales/en-US/users.ts b/apps/storefront/src/locales/en-US/users.ts
@@ -20,6 +20,7 @@ export default {
 
   'intl.user.register.registeredAccount.loginLeft': 'It appears you may already have an account. Please',
   'intl.user.register.registeredAccount.loginFirst': 'first',
+  'intl.user.register.registeredAccount.loginBtn': 'login',
   'intl.user.register.registeredAccount.loginb2b': 'to apply for a business account',
 
   'intl.user.register.registeredAccount.accountType': 'Account Type',

diff --git a/apps/storefront/src/locales/zh-CN/users.ts b/apps/storefront/src/locales/zh-CN/users.ts
@@ -20,6 +20,7 @@ export default {
 
   'intl.user.register.registeredAccount.loginLeft': '看来你可能已经有一个帐户了。请',
   'intl.user.register.registeredAccount.loginFirst': '第一',
+  'intl.user.register.registeredAccount.loginBtn': '登录',
   'intl.user.register.registeredAccount.loginb2b': '申请企业账户',
 
   'intl.user.register.registeredAccount.accountType': '账户类型',
@@ -28,6 +29,11 @@ export default {
   'intl.user.register.registeredAccount.contactInformation': '联系信息',
   'intl.user.register.registeredAccount.additionalInformation': '附加信息',
 
+  'intl.user.register.validatorRules.email': '请输入正确的电子邮件地址',
+  'intl.user.register.validatorRules.phoneNumber': '请输入正确的电话号码',
+  'intl.user.register.validatorRules.max': '请不要超过 {max}',
+  'intl.user.register.validatorRules.passwords': '密码必须至少为 7 个字符，并且包含字母和数字字符。',
+
   'intl.user.register.label.companyName': '公司名称',
   'intl.user.register.label.companyEmail': '公司邮箱',
   'intl.user.register.label.companyPhoneNumber': '公司电话号码',

diff --git a/apps/storefront/src/pages/registered/RegisterComplete.tsx b/apps/storefront/src/pages/registered/RegisterComplete.tsx
@@ -74,7 +74,7 @@ export default function RegisterComplete(props: RegisterCompleteProps) {
       id: 'Confirm Password',
       fieldType: 'password',
       xs: 12,
-      validate: (v: string) => validatorRules(v, ['password']),
+      validate: validatorRules(['password']),
     })
 
     setPersonalInfo(newPasswordInformation)

diff --git a/apps/storefront/src/pages/registered/RegisteredAccount.tsx b/apps/storefront/src/pages/registered/RegisteredAccount.tsx
@@ -91,6 +91,7 @@ export default function RegisteredAccount(props: RegisteredAccountProps) {
               return item
             })
           }
+          setEmailStateType(0)
           dispatch({
             type: 'all',
             payload: {
@@ -143,7 +144,7 @@ export default function RegisteredAccount(props: RegisteredAccountProps) {
               <TipLogin
                 onClick={gotoLigin}
               >
-                login
+                {b3Lang('intl.user.register.registeredAccount.loginBtn')}
               </TipLogin>
             </Box>
             {

diff --git a/apps/storefront/src/shared/service/request/b3Fetch.ts b/apps/storefront/src/shared/service/request/b3Fetch.ts
@@ -49,7 +49,7 @@ interceptors.response.use(async (response: Response) => {
 })
 
 function request<T>(path: string, config?: T, type?: string) {
-  const url = RequestType.B2BRest === type ? `${B2B_BASIC_URL}/api${path}` : path
+  const url = RequestType.B2BRest === type ? `${B2B_BASIC_URL}${path}` : path
   const init = {
     headers: {
       'content-type': 'application/json',
@@ -68,7 +68,7 @@ function graphqlRequest<T, Y>(type: string, data: T, config?: Y) {
     ...config,
     body: JSON.stringify(data),
   }
-  const graphqlB2BUrl = `${B2B_BASIC_URL}/api/graphql`
+  const graphqlB2BUrl = `${B2B_BASIC_URL}/graphql`
 
   const url = type === RequestType.B2BGraphql ? graphqlB2BUrl : ''
 
@@ -96,7 +96,7 @@ export const B3Request = {
     }, type)
   },
   fileUpload: function fileUpload<T, Y>(url: string, formData: T, config?: Y) {
-    return request(`${B2B_BASIC_URL}/api${url}`, {
+    return request(`${B2B_BASIC_URL}${url}`, {
       method: 'POST',
       body: formData,
       headers: {},