Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import ReplyList from '@/components/common/Post/ReplyList';
import { getComments, type CommentData } from '@/api/comments/getComments';
import { postReply } from '@/api/comments/postReply';
import { useReplyActions } from '@/hooks/useReplyActions';
import { useReplyStore } from '@/stores/useReplyStore';
import { useCommentBottomSheetStore } from '@/stores/useCommentBottomSheetStore';
import { useReplyStore } from '@/stores/replyStore';
import { useCommentBottomSheetStore } from '@/stores/commentBottomSheetStore';
import { usePopupActions } from '@/hooks/usePopupActions';
import { getRoomPlaying } from '@/api/rooms/getRoomPlaying';
import { isRoomCompleted } from '@/utils/roomStatus';
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Outlet, useLocation } from 'react-router-dom';
import { useEffect } from 'react';
import ScrollToTop from './ScrollToTop';
import AsideDecoration from './AsideDecoration';
import { sendPageView } from '@/lib/ga';
import { sendPageView } from '@/shared/lib/analytics/ga';

const Layout = () => {
const location = useLocation();
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/MainHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import bellExistLogo from '../../assets/header/exist-bell.svg';
import styled from '@emotion/styled';
import { IconButton } from './IconButton';
import { getNotificationExist } from '@/api/notifications/getNotificationExist';
import { useAuthReadyStore } from '@/stores/useAuthReadyStore';
import { useAuthReadyStore } from '@/stores/authReadyStore';

interface MainHeaderProps {
type: 'home' | 'group';
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Modal/ConfirmModal.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from '@emotion/styled';
import { colors, typography } from '@/styles/global/global';
import type { ConfirmModalProps } from '@/stores/usePopupStore';
import type { ConfirmModalProps } from '@/stores/popupStore';

const ConfirmModal = ({
title,
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Modal/MoreMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from '@emotion/styled';
import { colors, typography } from '@/styles/global/global';
import type { MoreMenuProps } from '@/stores/usePopupStore';
import type { MoreMenuProps } from '@/stores/popupStore';

const MoreMenu = ({ onEdit, onDelete, onClose, onReport, isWriter, type }: MoreMenuProps) => {
return (
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/Modal/PopupContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect } from 'react';
import { usePopupStore } from '@/stores/usePopupStore';
import { usePopupStore } from '@/stores/popupStore';
import ConfirmModal from './ConfirmModal';
import MoreMenu from './MoreMenu';
import Snackbar from './Snackbar';
Expand All @@ -12,7 +12,7 @@ import type {
SnackbarProps,
ReplyModalProps,
CountingBarProps,
} from '@/stores/usePopupStore';
} from '@/stores/popupStore';

const PopupContainer = () => {
const { popupType, popupProps, isOpen, closePopup } = usePopupStore();
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Modal/ReplyModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import styled from '@emotion/styled';
import { colors, typography } from '@/styles/global/global';
import { deleteComment } from '@/api/comments/deleteComment';
import { usePopupActions } from '@/hooks/usePopupActions';
import type { ReplyModalProps } from '@/stores/usePopupStore';
import type { ReplyModalProps } from '@/stores/popupStore';

const ReplyModal = ({ isOpen, userId, commentId, position, onClose }: ReplyModalProps) => {
const [currentUserId, setCurrentUserId] = useState<number | null>(null);
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Modal/Snackbar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from '@emotion/styled';
import { colors, typography } from '@/styles/global/global';
import type { SnackbarProps } from '@/stores/usePopupStore';
import type { SnackbarProps } from '@/stores/popupStore';
import { useEffect, useState } from 'react';

const Snackbar = ({ message, actionText, variant, isError, onActionClick, onClose }: SnackbarProps) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/feed/Profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState, useEffect } from 'react';
import styled from '@emotion/styled';
import MyFollower from './MyFollower';
import { postFollow } from '@/api/users/postFollow';
import { usePopupStore } from '@/stores/usePopupStore';
import { usePopupStore } from '@/stores/popupStore';

export interface ProfileProps {
showFollowButton?: boolean;
Expand Down
2 changes: 1 addition & 1 deletion src/components/feed/UserProfileItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import rightArrow from '../../assets/feed/rightArrow.svg';
import type { UserProfileItemProps } from '@/types/user';
import { colors, typography } from '@/styles/global/global';
import { postFollow } from '@/api/users/postFollow';
import { usePopupStore } from '@/stores/usePopupStore';
import { usePopupStore } from '@/stores/popupStore';

const UserProfileItem = ({
profileImageUrl,
Expand Down
2 changes: 1 addition & 1 deletion src/components/memory/RecordItem/RecordItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useParams, useNavigate } from 'react-router-dom';
import type { Record } from '../../../types/memory';
import TextRecord from './TextRecord';
import PollRecord from './PollRecord';
import { useCommentBottomSheetStore } from '@/stores/useCommentBottomSheetStore';
import { useCommentBottomSheetStore } from '@/stores/commentBottomSheetStore';
import heartIcon from '../../../assets/memory/heart.svg';
import heartFilledIcon from '../../../assets/memory/heart-filled.svg';
import commentIcon from '../../../assets/memory/comment.svg';
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/usePopupActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import type {
MoreMenuProps,
SnackbarProps,
ReplyModalProps,
} from '@/stores/usePopupStore';
import { usePopupStore } from '@/stores/usePopupStore';
} from '@/stores/popupStore';
import { usePopupStore } from '@/stores/popupStore';

export const usePopupActions = () => {
const { openPopup, closePopup } = usePopupStore();
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useReplyActions.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useReplyStore } from '@/stores/useReplyStore';
import { useReplyStore } from '@/stores/replyStore';
import { postReply } from '@/api/comments/postReply';

interface SubmitCommentProps {
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useSocialLoginToken.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useEffect, useRef, useCallback } from 'react';
import { useLocation } from 'react-router-dom';
import { getToken } from '@/api/auth';
import { useAuthReadyStore } from '@/stores/useAuthReadyStore';
import { useAuthReadyStore } from '@/stores/authReadyStore';

export const useSocialLoginToken = () => {
const location = useLocation();
Expand Down
2 changes: 1 addition & 1 deletion src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createRoot } from 'react-dom/client';
import './main.css';
import App from './App.tsx';
import { initGA } from './lib/ga.ts';
import { initGA } from './shared/lib/analytics/ga';

initGA();

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/pages/feed/FeedDetailPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { useReplyActions } from '@/hooks/useReplyActions';
import { getFeedDetail, type FeedDetailData } from '@/api/feeds/getFeedDetail';
import { getComments, type CommentData } from '@/api/comments/getComments';
import { deleteFeedPost } from '@/api/feeds/deleteFeedPost';
import { useReplyStore } from '@/stores/useReplyStore';
import { useReplyStore } from '@/stores/replyStore';

const FeedDetailPage = () => {
const navigate = useNavigate();
Expand Down
2 changes: 1 addition & 1 deletion src/pages/groupDetail/GroupDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import type { Group } from '@/components/group/MyGroupBox';
import bookCoverLargeImg from '../../assets/books/bookCoverLarge.svg';

import PasswordModal from '@/components/group/PasswordModal';
import { usePopupStore } from '@/stores/usePopupStore';
import { usePopupStore } from '@/stores/popupStore';

const GroupDetail = () => {
const { roomId } = useParams<{ roomId: string }>();
Expand Down
2 changes: 1 addition & 1 deletion src/pages/memory/Memory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import MemoryContent from '../../components/memory/MemoryContent/MemoryContent';
import MemoryAddButton from '../../components/memory/MemoryAddButton/MemoryAddButton';
import Snackbar from '../../components/common/Modal/Snackbar';
import GlobalCommentBottomSheet from '../../components/common/CommentBottomSheet/GlobalCommentBottomSheet';
import { useCommentBottomSheetStore } from '@/stores/useCommentBottomSheetStore';
import { useCommentBottomSheetStore } from '@/stores/commentBottomSheetStore';
import { Container, FixedHeader, ScrollableContent, FloatingElements } from './Memory.styled';
import { getMemoryPosts } from '../../api/memory/getMemoryPosts';
import { getRoomPlaying } from '../../api/rooms/getRoomPlaying';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/searchBook/SearchBook.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import FeedPost from '@/components/feed/FeedPost';
import styled from '@emotion/styled';
import { colors, typography } from '@/styles/global/global';
import { getFeedsByIsbn, type FeedItem, type FeedSort } from '@/api/feeds/getFeedsByIsbn';
import { usePopupStore } from '@/stores/usePopupStore';
import { usePopupStore } from '@/stores/popupStore';
import LoadingSpinner from '@/components/common/LoadingSpinner';

const FILTER = ['최신순', '인기순'] as const;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.