diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ec68ae4..94702f2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,15 +8,21 @@
+
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
@@ -62,41 +68,41 @@
- {
- "keyToString": {
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "full.screen.before.presentation.mode": "false",
- "git-widget-placeholder": "develop",
- "ignore.virus.scanning.warn.message": "true",
- "javascript.nodejs.core.library.configured.version": "20.13.1",
- "javascript.nodejs.core.library.typings.version": "20.12.12",
- "last_opened_file_path": "C:/Users/qpdgo/WebStormProjects/platinalab_web",
- "list.type.of.created.stylesheet": "SCSS",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.standard": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.standard": "",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "pnpm",
- "npm.taehui > dev.executor": "Run",
- "npm.taehui > start.executor": "Run",
- "npm.taehui > start:taehui-www.executor": "Run",
- "prettierjs.PrettierConfiguration.Package": "C:\\Users\\qpdgo\\WebStormProjects\\taehui\\node_modules\\prettier",
- "run.code.analysis.last.selected.profile": "pProject Default",
- "settings.editor.selected.configurable": "preferences.lookFeel",
- "ts.external.directory.path": "C:\\Users\\qpdgo\\WebStormProjects\\taehui\\node_modules\\typescript\\lib",
- "vue.rearranger.settings.migration": "true"
+ dev.executor": "Run",
+ "npm.taehui > start.executor": "Run",
+ "npm.taehui > start:taehui-www.executor": "Run",
+ "prettierjs.PrettierConfiguration.Package": "C:\\Users\\qpdgo\\WebStormProjects\\taehui\\node_modules\\prettier",
+ "run.code.analysis.last.selected.profile": "pProject Default",
+ "settings.editor.selected.configurable": "preferences.lookFeel",
+ "ts.external.directory.path": "C:\\Users\\qpdgo\\WebStormProjects\\taehui\\node_modules\\typescript\\lib",
+ "vue.rearranger.settings.migration": "true"
}
-}
+}]]>
+
+
-
-
@@ -296,6 +302,13 @@
+
+
+
+
+
+
+
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9d3e51f..2d3bd38 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -48,8 +48,8 @@
specifier: ^3.21.2
version: 3.21.2
isomorphic-dompurify:
- specifier: ^2.12.0
- version: 2.12.0
+ specifier: ^2.13.0
+ version: 2.13.0
mobx:
specifier: ^6.13.0
version: 6.13.0
@@ -145,8 +145,8 @@
specifier: ^9.1.0
version: 9.1.0
isomorphic-dompurify:
- specifier: ^2.12.0
- version: 2.12.0
+ specifier: ^2.13.0
+ version: 2.13.0
mariadb:
specifier: ^3.3.1
version: 3.3.1
@@ -1736,8 +1736,8 @@
isexe@2.0.0:
resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
- isomorphic-dompurify@2.12.0:
- resolution: {integrity: sha512-jJm6VgJ9toBLqNUHuLudn+2Q3NBBaoPbsh5SzzO2dp9Zq9+p6fEg4Ffuq9RZsofb8OnqE6FJVVq3MRDLlmBHpA==}
+ isomorphic-dompurify@2.13.0:
+ resolution: {integrity: sha512-jVxFnyOiA3fKPkteQjfIogww9T/BIX1Basuwt5D50MB3Sqvki9yBNq96ICLHpbiDY79jc6RC555DeBbTCt6i6A==}
engines: {node: '>=18'}
iterator.prototype@1.1.2:
@@ -4285,7 +4285,7 @@
isexe@2.0.0: {}
- isomorphic-dompurify@2.12.0:
+ isomorphic-dompurify@2.13.0:
dependencies:
'@types/dompurify': 3.0.5
dompurify: 3.1.6
diff --git a/qwilight-fe/package.json b/qwilight-fe/package.json
index 86fcb70..558b1e6 100644
--- a/qwilight-fe/package.json
+++ b/qwilight-fe/package.json
@@ -18,7 +18,7 @@
"crypto-js": "^4.2.0",
"dompurify": "^3.1.6",
"google-protobuf": "^3.21.2",
- "isomorphic-dompurify": "^2.12.0",
+ "isomorphic-dompurify": "^2.13.0",
"mobx": "^6.13.0",
"mobx-react-lite": "^4.0.7",
"next": "^14.2.4",
diff --git "a/qwilight-fe/src/app/\133language\135/avatar/components/AbilityView.tsx" "b/qwilight-fe/src/app/\133language\135/avatar/components/AbilityView.tsx"
index 4c3b9f6..7315bc3 100644
--- "a/qwilight-fe/src/app/\133language\135/avatar/components/AbilityView.tsx"
+++ "b/qwilight-fe/src/app/\133language\135/avatar/components/AbilityView.tsx"
@@ -49,6 +49,9 @@
}
}}
>
+
+
+
diff --git "a/qwilight-fe/src/app/\133language\135/hall/page.tsx" "b/qwilight-fe/src/app/\133language\135/hall/page.tsx"
index 3b8c134..2bf0938 100644
--- "a/qwilight-fe/src/app/\133language\135/hall/page.tsx"
+++ "b/qwilight-fe/src/app/\133language\135/hall/page.tsx"
@@ -1,6 +1,7 @@
"use client";
import AvatarsView from "@/app/[language]/hall/components/AvatarsView";
+import useGetAbility6KHall from "@/app/[language]/hall/query/useGetAbility6KHall";
import useGetAbility5KHall from "@/app/[language]/hall/query/useGetAbility5KHall";
import useGetAbility7KHall from "@/app/[language]/hall/query/useGetAbility7KHall";
import useGetAbility9KHall from "@/app/[language]/hall/query/useGetAbility9KHall";
@@ -49,6 +50,8 @@
useGetAtStandHall();
const { data: atBandHall, isFetched: isAtBandHallLoaded } =
useGetAtBandHall();
+ const { data: ability6KHall, isFetched: isAbility6KHallLoaded } =
+ useGetAbility6KHall();
const { data: ability5KHall, isFetched: isAbility5KHallLoaded } =
useGetAbility5KHall();
const { data: ability7KHall, isFetched: isAbility7KHallLoaded } =
@@ -134,6 +137,20 @@
}
}}
>
+
+ (
+
+ )}
+ />
+
({
+ enabled:
+ tabItem === "ability" && abilityTabItem === "6K" && isPath("/hall"),
+ queryKey: ["ability6KHall"],
+ queryFn: async () => {
+ const { data } = await wwwAPI.get("/hall/ability/6K");
+ return data.map((hall) => ({
+ ...hall,
+ value: hall.value,
+ text: `${formatText(hall.value)} Point`,
+ }));
+ },
+ initialData: [],
+ });
+}
diff --git "a/qwilight-fe/src/app/\133language\135/note/components/CommentView.tsx" "b/qwilight-fe/src/app/\133language\135/note/components/CommentView.tsx"
index 7f227ac..274c67a 100644
--- "a/qwilight-fe/src/app/\133language\135/note/components/CommentView.tsx"
+++ "b/qwilight-fe/src/app/\133language\135/note/components/CommentView.tsx"
@@ -23,6 +23,7 @@
import { getDatetime } from "taehui-lib/date";
import scss from "@/app/[language]/note/components/CommentView.module.scss";
+import AvatarPlaceText from "@/components/AvatarPlaceText";
const ws = [w0, w1, w2, "", w4, w5, w6, w7, w8];
@@ -40,6 +41,7 @@
hitPointsMode,
isPaused,
handled,
+ avatarPlace,
}: GetCommentAPI["comments"][number] & {
isTargetAvatar: boolean;
}) {
@@ -56,6 +58,9 @@
className={`flex-nowrap ${isTargetAvatar ? scss.target : ""}`}
>
+
+
+
diff --git "a/qwilight-fe/src/app/\133language\135/note/components/NoteView.tsx" "b/qwilight-fe/src/app/\133language\135/note/components/NoteView.tsx"
index ea929d5..4961750 100644
--- "a/qwilight-fe/src/app/\133language\135/note/components/NoteView.tsx"
+++ "b/qwilight-fe/src/app/\133language\135/note/components/NoteView.tsx"
@@ -12,10 +12,14 @@
import AvatarPlaceText from "@/components/AvatarPlaceText";
import LevelText from "@/components/LevelText";
import { GetNoteAPI } from "@/type/wwwAPI";
-import { formatText, getGenreText } from "@/utilities/Utility";
+import {
+ formatText,
+ getDefaultAvatarID,
+ getGenreText,
+} from "@/utilities/Utility";
import { useTranslations } from "next-intl";
import Image from "next/image";
-import { useState } from "react";
+import { useMemo, useState } from "react";
import { Placeholder } from "react-bootstrap";
import Collapse from "react-bootstrap/Collapse";
import Col from "react-bootstrap/esm/Col";
@@ -24,6 +28,7 @@
import Stack from "react-bootstrap/Stack";
import { Item, Menu, useContextMenu } from "react-contexify";
import Swal from "sweetalert2";
+import { useSiteStore } from "@/state/Stores";
const ws = [w0, w1, w2, "", w4, w5, w6, w7, w8];
@@ -56,11 +61,17 @@
const { mutateAsync: postToil } = usePostToil();
+ const { siteAvatarID } = useSiteStore();
const {
- data: { comments, commentPlace, totalComments },
+ data: { comments, totalComments },
isFetched: isCommentLoaded,
} = useGetComment(noteID, isCommentOpened, wantAvatarID);
+ const avatarPlaceMe = useMemo(() => {
+ const avatarID = getDefaultAvatarID(siteAvatarID);
+ return comments.find((comment) => comment.avatarID == avatarID);
+ }, [comments, siteAvatarID])?.avatarPlace;
+
return (
<>
@@ -117,9 +128,9 @@
- {commentPlace !== -1 && (
+ {typeof avatarPlaceMe === "number" && (
)}
@@ -137,6 +148,7 @@
hitPointsMode,
isPaused,
handled,
+ avatarPlace,
}) => (
),
)}
diff --git "a/qwilight-fe/src/app/\133language\135/note/query/useGetComment.ts" "b/qwilight-fe/src/app/\133language\135/note/query/useGetComment.ts"
index e3ba7cb..dc5b7c4 100644
--- "a/qwilight-fe/src/app/\133language\135/note/query/useGetComment.ts"
+++ "b/qwilight-fe/src/app/\133language\135/note/query/useGetComment.ts"
@@ -19,6 +19,7 @@
noteID,
avatarID,
language,
+ viewUnit: 50,
},
});
@@ -26,7 +27,6 @@
},
initialData: {
comments: [],
- commentPlace: -1,
totalComments: 0,
},
});
diff --git a/qwilight-fe/src/type/wwwAPI.d.ts b/qwilight-fe/src/type/wwwAPI.d.ts
index ea1f335..edf9315 100644
--- a/qwilight-fe/src/type/wwwAPI.d.ts
+++ b/qwilight-fe/src/type/wwwAPI.d.ts
@@ -33,8 +33,8 @@
hitPointsMode: number;
isPaused: boolean;
handled: number;
+ avatarPlace: number;
}[];
- commentPlace: number;
totalComments: number;
};
diff --git a/taehui-fe/package.json b/taehui-fe/package.json
index a2cd35c..cd3d58a 100644
--- a/taehui-fe/package.json
+++ b/taehui-fe/package.json
@@ -18,7 +18,7 @@
"dayjs": "^1.11.11",
"dompurify": "^3.1.6",
"htmlparser2": "^9.1.0",
- "isomorphic-dompurify": "^2.12.0",
+ "isomorphic-dompurify": "^2.13.0",
"mariadb": "^3.3.1",
"mobx": "^6.13.0",
"mobx-react-lite": "^4.0.7",