resolve merge conflict

Author: pengyu

frontend/public/map.svg

@@ -144,9 +144,7 @@ type Project {
   projectPath: String!
   subNumber: Float!
 
-  """
-  Projects that are copies of this project
-  """
+  """Projects that are copies of this project"""
   subscribers: [Project!]
   uniqueProjectId: String!
   updatedAt: Date!
@@ -240,8 +238,7 @@ type User {
   isEmailConfirmed: Boolean!
   lastEmailSendTime: Date!
   projects: [Project!]!
-  subscribedProjects: [Project!]
-    @deprecated(reason: "Use projects with forkedFromId instead")
+  subscribedProjects: [Project!] @deprecated(reason: "Use projects with forkedFromId instead")
   updatedAt: Date!
   username: String!
 }

frontend/src/graphql/schema.gql

@@ -46,7 +46,6 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
   const [refreshTokenMutation] = useMutation(REFRESH_TOKEN_MUTATION);
   const [getUserInfo] = useLazyQuery<{ me: User }>(GET_USER_INFO);
 
-  // 验证本地 token 是否有效
   const validateToken = useCallback(async () => {
     const storedToken = localStorage.getItem(LocalStore.accessToken);
     if (!storedToken) {
@@ -69,7 +68,6 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     }
   }, [checkToken]);
 
-  // 获取当前用户信息
   const fetchUserInfo = useCallback(async () => {
     try {
       const { data } = await getUserInfo();
@@ -84,7 +82,6 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     }
   }, [getUserInfo]);
 
-  // 刷新 token
   const refreshAccessToken = useCallback(async () => {
     try {
       const refreshToken = localStorage.getItem(LocalStore.refreshToken);
@@ -117,7 +114,6 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     }
   }, [refreshTokenMutation]);
 
-  // 登录时写入 token 并获取用户信息
   const login = useCallback(
     (accessToken: string, refreshToken: string) => {
       localStorage.setItem(LocalStore.accessToken, accessToken);
@@ -133,7 +129,6 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     [fetchUserInfo]
   );
 
-  // 登出
   const logout = useCallback(() => {
     setToken(null);
     setIsAuthorized(false);
@@ -142,7 +137,6 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     localStorage.removeItem(LocalStore.refreshToken);
   }, []);
 
-  // 初始化，尝试验证或刷新 token
   useEffect(() => {
     async function initAuth() {
       setIsLoading(true);