Remove .. relative imports and replace with absolute paths

This commit is contained in:
2025-10-10 11:25:45 +03:00
Unverified
parent 32e08cdfdb
commit b3303f2aef
34 changed files with 133 additions and 121 deletions
+5 -5
View File
@@ -1,8 +1,8 @@
import type { Headers, UploadPublicKeyRequest, BackupBlob } from "../types";
import { generateX25519KeyPair } from "../../utils/crypto/asymmetric";
import { encodeBlob, encryptBackupWithPassword, decryptBackupWithPassword, decodeBlob } from "../../utils/crypto/backup";
import { b64, ub64 } from "../../utils/utils";
import { API_BASE_URL } from "../config";
import type { Headers, UploadPublicKeyRequest, BackupBlob } from "@/core/types";
import { generateX25519KeyPair } from "@/utils/crypto/asymmetric";
import { encodeBlob, encryptBackupWithPassword, decryptBackupWithPassword, decodeBlob } from "@/utils/crypto/backup";
import { b64, ub64 } from "@/utils/utils";
import { API_BASE_URL } from "@/core/config";
/**
* Generates authentication headers for API requests
+7 -7
View File
@@ -1,12 +1,12 @@
import { API_BASE_URL } from "../config";
import { API_BASE_URL } from "@/core/config";
import { getAuthHeaders } from "./authApi";
import { ecdhSharedSecret, deriveWrappingKey } from "../../utils/crypto/asymmetric";
import { importAesGcmKey, aesGcmEncrypt, aesGcmDecrypt } from "../../utils/crypto/symmetric";
import { randomBytes } from "../../utils/crypto/kdf";
import { ecdhSharedSecret, deriveWrappingKey } from "@/utils/crypto/asymmetric";
import { importAesGcmKey, aesGcmEncrypt, aesGcmDecrypt } from "@/utils/crypto/symmetric";
import { randomBytes } from "@/utils/crypto/kdf";
import { getCurrentKeys } from "./authApi";
import { request } from "../websocket";
import type { SendDMRequest, DmEnvelope, User, DMEditRequest, DmEncryptedJSON, BaseDmEnvelope } from "../types";
import { b64, ub64 } from "../../utils/utils";
import { request } from "@/core/websocket";
import type { SendDMRequest, DmEnvelope, User, DMEditRequest, DmEncryptedJSON, BaseDmEnvelope } from "@/core/types";
import { b64, ub64 } from "@/utils/utils";
export async function decryptDm(envelope: DmEnvelope, senderPublicKeyB64: string): Promise<string> {
const keys = getCurrentKeys();
+2 -2
View File
@@ -1,6 +1,6 @@
import { getAuthHeaders } from "./authApi";
import { API_BASE_URL } from "../config";
import type { UserProfile } from "../types";
import { API_BASE_URL } from "@/core/config";
import type { UserProfile } from "@/core/types";
export interface ProfileData {
profile_picture?: string;
+2 -2
View File
@@ -1,8 +1,8 @@
import type { Dialog as MduiDialog } from "mdui/components/dialog";
import { useEffect, type Ref } from "react"
import { createPortal } from "react-dom";
import { id } from "../../utils/utils";
import useCombinedRefs from "../hooks/useCombinedRefs";
import { id } from "@/utils/utils";
import useCombinedRefs from "@/core/hooks/useCombinedRefs";
export interface BaseDialogProps {
onOpenChange: (value: boolean) => void;
@@ -1,7 +1,7 @@
import { API_BASE_URL } from "../config";
import { isElectron } from "../electron/electron";
import { websocket } from "../websocket";
import type { NewMessageWebSocketMessage, WebSocketMessage } from "../types";
import { API_BASE_URL } from "@/core/config";
import { isElectron } from "@/core/electron/electron";
import { websocket } from "@/core/websocket";
import type { NewMessageWebSocketMessage, WebSocketMessage } from "@/core/types";
import serviceWorker from "./service-worker?worker&url";
export interface PushSubscriptionData {
+1 -1
View File
@@ -7,7 +7,7 @@
import { API_WS_BASE_URL } from "./config";
import type { WebSocketMessage } from "./types";
import { delay } from "../utils/utils";
import { delay } from "@/utils/utils";
/**
* Creates a new WebSocket connection to the chat server
+7 -7
View File
@@ -1,15 +1,15 @@
import { useImmer } from "use-immer";
import { AlertsContainer, type Alert, type AlertType } from "./Auth";
import { AuthContainer, AuthHeader } from "./Auth";
import type { ErrorResponse, LoginRequest, LoginResponse } from "../../core/types";
import { ensureKeysOnLogin } from "../../core/api/authApi";
import { API_BASE_URL } from "../../core/config";
import type { ErrorResponse, LoginRequest, LoginResponse } from "@/core/types";
import { ensureKeysOnLogin } from "@/core/api/authApi";
import { API_BASE_URL } from "@/core/config";
import { useRef } from "react";
import type { TextField } from "mdui/components/text-field";
import { useAppState } from "../chat/state";
import { MaterialTextField } from "../../core/components/TextField";
import { initialize, isSupported, startElectronReceiver, subscribe } from "../../core/push-notifications/push-notifications";
import { isElectron } from "../../core/electron/electron";
import { useAppState } from "@/pages/chat/state";
import { MaterialTextField } from "@/core/components/TextField";
import { initialize, isSupported, startElectronReceiver, subscribe } from "@/core/push-notifications/push-notifications";
import { isElectron } from "@/core/electron/electron";
import { useNavigate } from "react-router-dom";
import "./auth.scss";
+5 -5
View File
@@ -3,11 +3,11 @@ import { AuthContainer, AuthHeader } from "./Auth";
import { AlertsContainer, type Alert, type AlertType } from "./Auth";
import { useRef } from "react";
import { TextField } from "mdui/components/text-field";
import type { ErrorResponse, RegisterRequest, LoginResponse } from "../../core/types";
import { API_BASE_URL } from "../../core/config";
import { useAppState } from "../chat/state";
import { MaterialTextField } from "../../core/components/TextField";
import { ensureKeysOnLogin } from "../../core/api/authApi";
import type { ErrorResponse, RegisterRequest, LoginResponse } from "@/core/types";
import { API_BASE_URL } from "@/core/config";
import { useAppState } from "@/pages/chat/state";
import { MaterialTextField } from "@/core/components/TextField";
import { ensureKeysOnLogin } from "@/core/api/authApi";
import { useNavigate } from "react-router-dom";
import "./auth.scss";
+3 -3
View File
@@ -1,5 +1,5 @@
import { useState, useEffect, useCallback, useRef } from "react";
import { useAppState } from "../state";
import { useAppState } from "@/pages/chat/state";
import {
fetchUsers,
fetchUserPublicKey,
@@ -7,8 +7,8 @@ import {
decryptDm,
sendDMViaWebSocket
} from "../../../core/api/dmApi";
import type { User, Message, DmEncryptedJSON } from "../../../core/types";
import { websocket } from "../../../core/websocket";
import type { User, Message, DmEncryptedJSON } from "@/core/types";
import { websocket } from "@/core/websocket";
export interface DMUser extends User {
lastMessage?: string;
+3 -3
View File
@@ -1,7 +1,7 @@
import { useState, useCallback, useEffect } from "react";
import { useAppState } from "../state";
import { loadProfile, updateProfile, uploadProfilePicture, type ProfileData } from "../../../core/api/profileApi";
import { showSuccess, showError } from "../../../utils/notification";
import { useAppState } from "@/pages/chat/state";
import { loadProfile, updateProfile, uploadProfilePicture, type ProfileData } from "@/core/api/profileApi";
import { showSuccess, showError } from "@/utils/notification";
export default function useProfile() {
const { user } = useAppState();
+7 -7
View File
@@ -1,14 +1,14 @@
import { create } from "zustand";
import type { Message, User } from "../../core/types";
import { request } from "../../core/websocket";
import type { Message, User } from "@/core/types";
import { request } from "@/core/websocket";
import { MessagePanel } from "./ui/right/panels/MessagePanel";
import { PublicChatPanel } from "./ui/right/panels/PublicChatPanel";
import { DMPanel, type DMPanelData } from "./ui/right/panels/DMPanel";
import { getAuthHeaders } from "../../core/api/authApi";
import { restoreKeys } from "../../core/api/authApi";
import { API_BASE_URL } from "../../core/config";
import { initialize, subscribe, startElectronReceiver, isSupported } from "../../core/push-notifications/push-notifications";
import { isElectron } from "../../core/electron/electron";
import { getAuthHeaders } from "@/core/api/authApi";
import { restoreKeys } from "@/core/api/authApi";
import { API_BASE_URL } from "@/core/config";
import { initialize, subscribe, startElectronReceiver, isSupported } from "@/core/push-notifications/push-notifications";
import { isElectron } from "@/core/electron/electron";
export type ChatTabs = "chats" | "channels" | "contacts" | "dms"
+1 -1
View File
@@ -1,6 +1,6 @@
import { LeftPanel } from "./left/LeftPanel";
import { RightPanel } from "./right/RightPanel";
import "../css/chat.scss";
import "@/pages/chat/css/chat.scss";
export default function ChatPage() {
return (
@@ -1,6 +1,6 @@
import { PRODUCT_NAME } from "../../../../core/config";
import useProfile from "../../hooks/useProfile";
import defaultAvatar from "../../../resources/images/default-avatar.png";
import { PRODUCT_NAME } from "@/core/config";
import useProfile from "@/pages/chat/hooks/useProfile";
import defaultAvatar from "@/images/default-avatar.png";
import { useState } from "react";
import { ProfileDialog } from "./profile/ProfileDialog";
+1 -1
View File
@@ -1,4 +1,4 @@
import { useAppState } from "../../state";
import { useAppState } from "@/pages/chat/state";
export function ChatTabs() {
const { chat, setActiveTab, switchToPublicChat } = useAppState();
@@ -1,8 +1,8 @@
import { useEffect } from "react";
import { useDM, type DMUser } from "../../hooks/useDM";
import { useAppState } from "../../state";
import { fetchUserPublicKey } from "../../../../core/api/dmApi";
import defaultAvatar from "../../../../images/default-avatar.png";
import { useDM, type DMUser } from "@/pages/chat/hooks/useDM";
import { useAppState } from "@/pages/chat/state";
import { fetchUserPublicKey } from "@/core/api/dmApi";
import defaultAvatar from "@/images/default-avatar.png";
export function DMUsersList() {
const { dmUsers, isLoadingUsers, loadUsers } = useDM();
@@ -1,12 +1,12 @@
import { PRODUCT_NAME } from "../../../../core/config";
import { useAppState } from "../../state";
import defaultAvatar from "../../../../images/default-avatar.png";
import { PRODUCT_NAME } from "@/core/config";
import { useAppState } from "@/pages/chat/state";
import defaultAvatar from "@/images/default-avatar.png";
import { useState, type FormEvent } from "react";
import { ProfileDialog } from "./profile/ProfileDialog";
import { SettingsDialog } from "./settings/SettingsDialog";
import { DMUsersList } from "./DMUsersList";
import type { Tabs } from "mdui";
import type { ChatTabs } from "../../state";
import type { ChatTabs } from "@/pages/chat/state";
function BottomAppBar() {
const [settingsOpen, onSettingsOpenChange] = useState(false);
@@ -1,5 +1,5 @@
import { useEffect, useRef, useState } from "react";
import type { Size2D, Rect } from "../../../../../core/types";
import type { Size2D, Rect } from "@/core/types";
interface ImageCropperProps {
onCrop: (croppedImageData: string) => void;
@@ -1,11 +1,11 @@
import { useState, useEffect, useRef, type FormEvent } from "react";
import defaultAvatar from "../../../../../images/default-avatar.png";
import defaultAvatar from "@/images/default-avatar.png";
import type { TextField } from "mdui/components/text-field";
import type { DialogProps } from "../../../../../core/types";
import { MaterialDialog } from "../../../../../core/components/Dialog";
import useProfile from "../../../hooks/useProfile";
import type { DialogProps } from "@/core/types";
import { MaterialDialog } from "@/core/components/Dialog";
import useProfile from "@/pages/chat/hooks/useProfile";
import { ImageCropper } from "./ImageCropper";
import { MaterialTextField } from "../../../../../core/components/TextField";
import { MaterialTextField } from "@/core/components/TextField";
export function ProfileDialog({ isOpen, onOpenChange }: DialogProps) {
const { profileData, isLoading, isUpdating, updateProfileData, uploadProfilePictureData } = useProfile();
@@ -1,12 +1,12 @@
import { useState, useEffect } from "react";
import { PRODUCT_NAME, API_BASE_URL } from "../../../../../core/config";
import type { DialogProps } from "../../../../../core/types";
import { MaterialDialog } from "../../../../../core/components/Dialog";
import { initialize, isSupported, startElectronReceiver, stopElectronReceiver, subscribe, unsubscribe } from "../../../../../core/push-notifications/push-notifications";
import { isElectron } from "../../../../../core/electron/electron";
import { useAppState } from "../../../state";
import { PRODUCT_NAME, API_BASE_URL } from "@/core/config";
import type { DialogProps } from "@/core/types";
import { MaterialDialog } from "@/core/components/Dialog";
import { initialize, isSupported, startElectronReceiver, stopElectronReceiver, subscribe, unsubscribe } from "@/core/push-notifications/push-notifications";
import { isElectron } from "@/core/electron/electron";
import { useAppState } from "@/pages/chat/state";
import type { Switch } from "mdui/components/switch";
import { getAuthHeaders } from "../../../../../core/api/authApi";
import { getAuthHeaders } from "@/core/api/authApi";
export function SettingsDialog({ isOpen, onOpenChange }: DialogProps) {
const [activePanel, setActivePanel] = useState("notifications-settings");
@@ -1,9 +1,9 @@
import { useState, useEffect, useRef } from "react";
import { MaterialDialog } from "../../../../core/components/Dialog";
import { RichTextArea } from "../../../../core/components/RichTextArea";
import type { Message } from "../../../../core/types";
import Quote from "../../../../core/components/Quote";
import AnimatedHeight from "../../../../core/components/animations/AnimatedHeight";
import { MaterialDialog } from "@/core/components/Dialog";
import { RichTextArea } from "@/core/components/RichTextArea";
import type { Message } from "@/core/types";
import Quote from "@/core/components/Quote";
import AnimatedHeight from "@/core/components/animations/AnimatedHeight";
import { useImmer } from "use-immer";
import { EmojiMenu } from "./EmojiMenu";
@@ -1,5 +1,5 @@
import { useAppState } from "../../state";
import defaultAvatar from "../../../resources/images/default-avatar.png";
import { useAppState } from "@/pages/chat/state";
import defaultAvatar from "@/images/default-avatar.png";
export function ChatMainHeader() {
const { currentChat } = useAppState().chat;
@@ -1,15 +1,15 @@
import { Message } from "./Message";
import { useAppState } from "../../state";
import type { Message as MessageType } from "../../../../core/types";
import type { UserProfile } from "../../../../core/types";
import { useAppState } from "@/pages/chat/state";
import type { Message as MessageType } from "@/core/types";
import type { UserProfile } from "@/core/types";
import { UserProfileDialog } from "./UserProfileDialog";
import { MessageContextMenu, type ContextMenuState } from "./MessageContextMenu";
import { fetchUserProfile } from "../../../../core/api/profileApi";
import { fetchUserProfile } from "@/core/api/profileApi";
import { useEffect, useState, type ReactNode } from "react";
import { delay } from "../../../../utils/utils";
import { MaterialDialog } from "../../../../core/components/Dialog";
import { request } from "../../../../core/websocket";
import type { AddReactionRequest, AddDmReactionRequest } from "../../../../core/types";
import { delay } from "@/utils/utils";
import { MaterialDialog } from "@/core/components/Dialog";
import { request } from "@/core/websocket";
import type { AddReactionRequest, AddDmReactionRequest } from "@/core/types";
interface ChatMessagesProps {
messages?: MessageType[];
@@ -1,6 +1,6 @@
import { useState, useEffect, useRef, useCallback } from "react";
import { EMOJI_CATEGORIES, getRecentEmojis, addRecentEmoji } from "./emojiData";
import type { Size2D } from "../../../../core/types";
import type { Size2D } from "@/core/types";
interface BaseEmojiMenuProps {
isOpen: boolean;
+10 -10
View File
@@ -1,16 +1,16 @@
import { formatTime, id } from "../../../../utils/utils";
import type { Attachment, Message as MessageType, Reaction } from "../../../../core/types";
import defaultAvatar from "../../../../images/default-avatar.png";
import Quote from "../../../../core/components/Quote";
import { formatTime, id } from "@/utils/utils";
import type { Attachment, Message as MessageType, Reaction } from "@/core/types";
import defaultAvatar from "@/images/default-avatar.png";
import Quote from "@/core/components/Quote";
import { parse } from "marked";
import DOMPurify from "dompurify";
import { useEffect, useState, useRef } from "react";
import { getCurrentKeys } from "../../../../core/api/authApi";
import { ecdhSharedSecret, deriveWrappingKey } from "../../../../utils/crypto/asymmetric";
import { importAesGcmKey, aesGcmDecrypt } from "../../../../utils/crypto/symmetric";
import { getAuthHeaders } from "../../../../core/api/authApi";
import { useAppState } from "../../state";
import { ub64 } from "../../../../utils/utils";
import { getCurrentKeys } from "@/core/api/authApi";
import { ecdhSharedSecret, deriveWrappingKey } from "@/utils/crypto/asymmetric";
import { importAesGcmKey, aesGcmDecrypt } from "@/utils/crypto/symmetric";
import { getAuthHeaders } from "@/core/api/authApi";
import { useAppState } from "@/pages/chat/state";
import { ub64 } from "@/utils/utils";
import { useImmer } from "use-immer";
import { createPortal } from "react-dom";
@@ -1,5 +1,5 @@
import { useState, useEffect, useRef } from "react";
import type { Message, Size2D } from "../../../../core/types";
import type { Message, Size2D } from "@/core/types";
import { EmojiMenu } from "./EmojiMenu";
interface MessageContextMenuProps {
@@ -1,12 +1,12 @@
import { useState, useEffect, useRef } from "react";
import { useAppState } from "../../state";
import { useAppState } from "@/pages/chat/state";
import { MessagePanel, type MessagePanelState } from "./panels/MessagePanel";
import { ChatMessages } from "./ChatMessages";
import { ChatInputWrapper } from "./ChatInputWrapper";
import { setGlobalMessageHandler } from "../../../../core/websocket";
import type { Message, WebSocketMessage } from "../../../../core/types";
import defaultAvatar from "../../../../images/default-avatar.png";
import AnimatedOpacity from "../../../../core/components/animations/AnimatedOpacity";
import { setGlobalMessageHandler } from "@/core/websocket";
import type { Message, WebSocketMessage } from "@/core/types";
import defaultAvatar from "@/images/default-avatar.png";
import AnimatedOpacity from "@/core/components/animations/AnimatedOpacity";
import type { DMPanel } from "./panels/DMPanel";
interface MessagePanelRendererProps {
@@ -1,4 +1,4 @@
import { useAppState } from "../../state";
import { useAppState } from "@/pages/chat/state";
import { MessagePanelRenderer } from "./MessagePanelRenderer";
export function RightPanel() {
@@ -1,8 +1,8 @@
import type { DialogProps } from "../../../../core/types";
import type { UserProfile } from "../../../../core/types";
import { MaterialDialog } from "../../../../core/components/Dialog";
import { formatTime } from "../../../../utils/utils";
import defaultAvatar from "../../../../images/default-avatar.png";
import type { DialogProps } from "@/core/types";
import type { UserProfile } from "@/core/types";
import { MaterialDialog } from "@/core/components/Dialog";
import { formatTime } from "@/utils/utils";
import defaultAvatar from "@/images/default-avatar.png";
interface UserProfileDialogProps extends DialogProps {
userProfile: UserProfile | null;
@@ -7,8 +7,8 @@ import {
editDmEnvelope,
deleteDmEnvelope
} from "../../../../../core/api/dmApi";
import type { DmEncryptedJSON, DmEnvelope, DMWebSocketMessage, EncryptedMessageJson, Message } from "../../../../../core/types";
import type { UserState } from "../../../state";
import type { DmEncryptedJSON, DmEnvelope, DMWebSocketMessage, EncryptedMessageJson, Message } from "@/core/types";
import type { UserState } from "@/pages/chat/state";
export interface DMPanelData {
userId: number;
@@ -1,5 +1,5 @@
import type { Message, WebSocketMessage } from "../../../../../core/types";
import type { UserState } from "../../../state";
import type { Message, WebSocketMessage } from "@/core/types";
import type { UserState } from "@/pages/chat/state";
export interface MessagePanelState {
id: string;
@@ -1,9 +1,9 @@
import { MessagePanel } from "./MessagePanel";
import { API_BASE_URL } from "../../../../../core/config";
import { getAuthHeaders } from "../../../../../core/api/authApi";
import { request } from "../../../../../core/websocket";
import type { ChatWebSocketMessage, Message, SendMessageRequest, ReactionUpdateWebSocketMessage } from "../../../../../core/types";
import type { UserState } from "../../../state";
import { API_BASE_URL } from "@/core/config";
import { getAuthHeaders } from "@/core/api/authApi";
import { request } from "@/core/websocket";
import type { ChatWebSocketMessage, Message, SendMessageRequest, ReactionUpdateWebSocketMessage } from "@/core/types";
import type { UserState } from "@/pages/chat/state";
export class PublicChatPanel extends MessagePanel {
private messagesLoaded: boolean = false;
+2 -2
View File
@@ -1,6 +1,6 @@
import { Navigate, useNavigate } from "react-router-dom";
import { useAppState } from "../chat/state";
import { isElectron } from "../../core/electron/electron";
import { useAppState } from "@/pages/chat/state";
import { isElectron } from "@/core/electron/electron";
import "./home.scss";
function GitHubLink({ children }: { children: React.ReactNode }) {