Skip to content

fix: The forgot password page displays an error #2948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wxg0103 merged 1 commit into from
Apr 22, 2025
Merged

fix: The forgot password page displays an error #2948

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions ui/src/views/login/forgot-password/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<template>
<login-layout>
<LoginContainer :subTitle="$t('views.system.theme.defaultSlogan')">
<LoginContainer
:subTitle="
user.themeInfo?.slogan ? user.themeInfo?.slogan : $t('views.system.theme.defaultSlogan')
"
>
<h2 class="mb-24">{{ $t('views.login.forgotPassword') }}</h2>
<el-form
class="register-form"
Expand Down Expand Up @@ -41,15 +45,15 @@
isDisabled
? `${$t('views.login.verificationCode.resend')}（${time}s）`
: $t('views.login.verificationCode.getVerificationCode')
}}</el-button
>
}}
</el-button>
</div>
</el-form-item>
</div>
</el-form>
<el-button size="large" type="primary" class="w-full" @click="checkCode">{{
$t('views.login.buttons.checkCode')
}}</el-button>
<el-button size="large" type="primary" class="w-full" @click="checkCode"
>{{ $t('views.login.buttons.checkCode') }}
</el-button>
<div class="operate-container mt-12">
<el-button
class="register"
Expand All @@ -72,7 +76,10 @@ import type { FormInstance, FormRules } from 'element-plus'
import UserApi from '@/api/user'
import { MsgSuccess } from '@/utils/message'
import { t } from '@/locales'
import useStore from '@/stores'

const router = useRouter()
const { user } = useStore()
const CheckEmailForm = ref<CheckCodeRequest>({
email: '',
code: '',
Copy link
Copy Markdown
Contributor Author

@shaohuzhang1 shaohuzhang1 Apr 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The provided code has a few areas that can be improved:

  1. Template Optimization: The template contains two consecutive <br> tags at lines 3 and 48. Instead of using </br>, which is not standard HTML syntax, you should use line breaks for readability.

  2. Component Props Handling: In the <LoginContainer> component, the sub-title is set based on user.themeInfo.slogan if it exists, otherwise it defaults to $t('views.system.theme.defaultSlogan'). This handling ensures that no error occurs if themeInfo or its properties do not exist.

  3. Button Disabled State: It appears there might be an issue with how the button's disabled state is updated, especially related to the timing (time) variable. Ensure this logic updates correctly to prevent unexpected behavior when resendTime expires.

  4. Dynamic Content Handling: When displaying dynamic content such as verification messages or buttons, consider using proper Vue.js directives like v-if and other controls to handle their visibility dynamically without resorting to conditional statements inside strings.

  5. Globalization Considerations: If internationalization (i18n) is handled through external libraries like i18next or vue-i18n, ensure consistency across all usage of translations, including static texts within elements' text nodes like headings and button captions. Using consistent data structure patterns for storing translated information can help maintain clarity and reduce errors during localization efforts.

Here is a slightly reformatted version with these considerations incorporated:

<template>
  <login-layout>
    <LoginContainer :subTitle="getSubtitle">
      <h2 class="mb-24"> {{ t('views.login.forgotPassword') }} </h2>

      <el-form class="register-form">
        ...

        <button-size large type="primary" class="w-full" @click="checkCode">
          {{ $t('views.login.buttons.checkCode') }}
        </button-size>

        ...
        
      </el-form>
  
      <!-- Other components -->
      
    </LoginContainer>
  </login-layout>
</template>

<script lang="ts">

// Assuming getSubtitle() function calculates the subtitle string

setup () {
  // Your setup code here...

  return {
    t,
    checkCode,
    sendAgain,
    resendTimer: undefined,
    formRef,

    calculatedSubtitle: computed(() => (
      user.themeInfo && user.themeInfo.slogan !== null &&
      typeof user.themeInfo.slogan === 'string'
        ? user.themeInfo.slogan
        : t('views.system.theme.defaultSlogan')
    ))
  }
}

</script>

<style scoped>
/* Your styles here */
</style>

This refactoring helps maintain better organization and avoids several common pitfalls in Vue.js development practices. Make sure to adjust getSubtitle() according to your actual implementation if needed.

Expand Down