From a4540eb708231395a6053791ec80dd4aa9381a78 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 21:39:48 -0700
Subject: [PATCH] don't need extra template
---
packages/client/src/pages/settings/2fa.vue | 58 +++++++++++-----------
1 file changed, 28 insertions(+), 30 deletions(-)
diff --git a/packages/client/src/pages/settings/2fa.vue b/packages/client/src/pages/settings/2fa.vue
index bb3862b4b..acbd17480 100644
--- a/packages/client/src/pages/settings/2fa.vue
+++ b/packages/client/src/pages/settings/2fa.vue
@@ -6,41 +6,39 @@
<MkButton @click="unregister">{{ i18n.ts.unregister }}</MkButton>
</template>
- <template>
- <template v-if="supportsCredentials">
- <hr class="totp-method-sep">
+ <template v-if="supportsCredentials">
+ <hr class="totp-method-sep">
- <h2 class="heading">{{ i18n.ts.securityKey }}</h2>
- <p>{{ i18n.ts._2fa.securityKeyInfo }}</p>
- <div class="key-list">
- <div v-for="key in $i.securityKeysList" class="key">
- <h3>{{ key.name }}</h3>
- <div class="last-used">{{ i18n.ts.lastUsed }}<MkTime :time="key.lastUsed"/></div>
- <MkButton @click="unregisterKey(key)">{{ i18n.ts.unregister }}</MkButton>
- </div>
+ <h2 class="heading">{{ i18n.ts.securityKey }}</h2>
+ <p>{{ i18n.ts._2fa.securityKeyInfo }}</p>
+ <div class="key-list">
+ <div v-for="key in $i.securityKeysList" class="key">
+ <h3>{{ key.name }}</h3>
+ <div class="last-used">{{ i18n.ts.lastUsed }}<MkTime :time="key.lastUsed"/></div>
+ <MkButton @click="unregisterKey(key)">{{ i18n.ts.unregister }}</MkButton>
</div>
+ </div>
- <MkSwitch v-if="$i.securityKeysList.length > 0" v-model="usePasswordLessLogin" @update:modelValue="updatePasswordLessLogin">{{ i18n.ts.passwordLessLogin }}</MkSwitch>
+ <MkSwitch v-if="$i.securityKeysList.length > 0" v-model="usePasswordLessLogin" @update:modelValue="updatePasswordLessLogin">{{ i18n.ts.passwordLessLogin }}</MkSwitch>
- <MkInfo v-if="registration && registration.error" style="margin-bottom: 1rem;" warn>{{ i18n.ts.error }}: {{ registration.error }}</MkInfo>
- <MkButton v-if="!registration || registration.error" @click="addSecurityKey">{{ i18n.ts._2fa.registerKey }}</MkButton>
+ <MkInfo v-if="registration && registration.error" style="margin-bottom: 1rem;" warn>{{ i18n.ts.error }}: {{ registration.error }}</MkInfo>
+ <MkButton v-if="!registration || registration.error" @click="addSecurityKey">{{ i18n.ts._2fa.registerKey }}</MkButton>
- <ol v-if="registration && !registration.error">
- <li v-if="registration.stage >= 0">
- {{ i18n.ts.tapSecurityKey }}
- <i v-if="registration.saving && registration.stage == 0" class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
- </li>
- <li v-if="registration.stage >= 1">
- <MkForm :disabled="registration.stage != 1 || registration.saving">
- <MkInput v-model="keyName" :max="30">
- <template #label>{{ i18n.ts.securityKeyName }}</template>
- </MkInput>
- <MkButton :disabled="keyName.length == 0" @click="registerKey">{{ i18n.ts.registerSecurityKey }}</MkButton>
- <i v-if="registration.saving && registration.stage == 1" class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
- </MkForm>
- </li>
- </ol>
- </template>
+ <ol v-if="registration && !registration.error">
+ <li v-if="registration.stage >= 0">
+ {{ i18n.ts.tapSecurityKey }}
+ <i v-if="registration.saving && registration.stage == 0" class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
+ </li>
+ <li v-if="registration.stage >= 1">
+ <MkForm :disabled="registration.stage != 1 || registration.saving">
+ <MkInput v-model="keyName" :max="30">
+ <template #label>{{ i18n.ts.securityKeyName }}</template>
+ </MkInput>
+ <MkButton :disabled="keyName.length == 0" @click="registerKey">{{ i18n.ts.registerSecurityKey }}</MkButton>
+ <i v-if="registration.saving && registration.stage == 1" class="ph-circle-notch ph-bold ph-lg fa-pulse ph-fw ph-lg"></i>
+ </MkForm>
+ </li>
+ </ol>
</template>
<div v-if="twoFactorData && !$i.twoFactorEnabled">
<ol style="margin: 0; padding: 0 0 0 1em;">