summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-09-15 14:28:29 +0900
committerGitHub <noreply@github.com>2023-09-15 14:28:29 +0900
commit6cf466e5d1d423aec8ec06f65644c73c7e9a8ecd (patch)
treeb3623e27ae94471fa4d58dda9e9296b21afbd20e /packages/frontend/src
parentenhance nodeinfo by prpoagate the standart keys for homepage and repository (... (diff)
downloadmisskey-6cf466e5d1d423aec8ec06f65644c73c7e9a8ecd.tar.gz
misskey-6cf466e5d1d423aec8ec06f65644c73c7e9a8ecd.tar.bz2
misskey-6cf466e5d1d423aec8ec06f65644c73c7e9a8ecd.zip
update deps (#11820)
* update deps * fix * wip * wip * wip * Update docker-compose.yml.example * Delete reviewer-lottery.yml * Update RepositoryModule.ts * wip * wip * clean up * update deps * wip * wip
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/components/MkSignupDialog.form.vue25
-rw-r--r--packages/frontend/src/pages/user/home.vue16
2 files changed, 39 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkSignupDialog.form.vue b/packages/frontend/src/components/MkSignupDialog.form.vue
index de9b320da2..60541b256b 100644
--- a/packages/frontend/src/components/MkSignupDialog.form.vue
+++ b/packages/frontend/src/components/MkSignupDialog.form.vue
@@ -77,7 +77,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { } from 'vue';
-import getPasswordStrength from 'syuilo-password-strength';
import { toUnicode } from 'punycode/';
import MkButton from './MkButton.vue';
import MkInput from './MkInput.vue';
@@ -132,6 +131,30 @@ const shouldDisableSubmitting = $computed((): boolean => {
passwordRetypeState !== 'match';
});
+function getPasswordStrength(source: string): number {
+ let strength = 0;
+ let power = 0.018;
+
+ // 英数字
+ if (/[a-zA-Z]/.test(source) && /[0-9]/.test(source)) {
+ power += 0.020;
+ }
+
+ // 大文字と小文字が混ざってたら
+ if (/[a-z]/.test(source) && /[A-Z]/.test(source)) {
+ power += 0.015;
+ }
+
+ // 記号が混ざってたら
+ if (/[!\x22\#$%&@'()*+,-./_]/.test(source)) {
+ power += 0.02;
+ }
+
+ strength = power * source.length;
+
+ return Math.max(0, Math.min(1, strength));
+}
+
function onChangeUsername(): void {
if (username === '') {
usernameState = null;
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index a8720e1050..8bc6c72440 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -143,7 +143,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { defineAsyncComponent, computed, onMounted, onUnmounted, nextTick, watch } from 'vue';
-import calcAge from 's-age';
import * as Misskey from 'misskey-js';
import MkNote from '@/components/MkNote.vue';
import MkFollowButton from '@/components/MkFollowButton.vue';
@@ -167,6 +166,21 @@ import MkNotes from '@/components/MkNotes.vue';
import { api } from '@/os';
import { isFfVisibleForMe } from '@/scripts/isFfVisibleForMe';
+function calcAge(birthdate: string): number {
+ const date = new Date(birthdate);
+ const now = new Date();
+
+ let yearDiff = now.getFullYear() - date.getFullYear();
+ const monthDiff = now.getMonth() - date.getMonth();
+ const pastDate = now.getDate() < date.getDate();
+
+ if (monthDiff < 0 || (monthDiff === 0 && pastDate)) {
+ yearDiff--;
+ }
+
+ return yearDiff;
+}
+
const XPhotos = defineAsyncComponent(() => import('./index.photos.vue'));
const XActivity = defineAsyncComponent(() => import('./index.activity.vue'));