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
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<body>
<div id="root"></div>
<script
defer
type="module"
src="/src/main.tsx"></script>
</body>
Expand Down
184 changes: 184 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"globals": "^15.14.0",
"import-fresh": "^3.3.1",
"prettier": "^3.4.2",
"rollup-plugin-visualizer": "^5.14.0",
"sass": "^1.55.0",
"stylelint": "^16.12.0",
"stylelint-config-prettier-scss": "^1.0.0",
Expand Down
6 changes: 5 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { routes } from './routes';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
import { ToastProvider } from './contexts/toastContext';
import { Suspense } from 'react';
import LoadingPage from './pages/loading/LoadingPage';

function App() {
const queryClient = new QueryClient();
Expand All @@ -11,7 +13,9 @@ function App() {
<QueryClientProvider client={queryClient}>
<ReactQueryDevtools initialIsOpen={false} />
<ToastProvider>
<RouterProvider router={routes}></RouterProvider>;
<Suspense fallback={<LoadingPage />}>
<RouterProvider router={routes}></RouterProvider>;
</Suspense>
</ToastProvider>
</QueryClientProvider>
);
Expand Down
22 changes: 5 additions & 17 deletions src/components/preview/PreviewThumbnail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import classNames from 'classnames';
import { useNavigate } from 'react-router-dom';
import Bookmark from '../../assets/icons/bookmark.svg?react';
import UnclickBookmark from '../../assets/icons/unclickBookmark.svg?react';
import DefaultImage from '../../assets/icons/defaultImage.svg?react';
import styles from './previewThumbnail.module.scss';
import { Image } from '../common/image/Image';

Expand Down Expand Up @@ -106,22 +105,11 @@ const PreviewThumbnail: React.FC<PreviewThumbnailProps> = ({ data }) => {
className={styles.thumbnailImage}
onClick={handleImageClick}
style={{ cursor: 'pointer' }}>
{imageUrl && imageUrl.trim() !== '' && imageUrl !== 'string' ? (
<Image
src={imageUrl}
alt={description}
/>
) : (
<DefaultImage
style={{
width: '100%',
height: '100%',
objectFit: 'cover',
display: 'block',
}}
preserveAspectRatio='none'
/>
)}
<Image
src={imageUrl}
alt={description}
/>

<div className={styles.overlay}>
<div className={styles.overlayTags}>
<span className={classNames(styles.postAuth, authClass)}>
Expand Down
3 changes: 2 additions & 1 deletion src/pages/collaboration/CollaborationMain.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ interface CollaborationData {
isSavedPost: boolean;
}

export const CollaborationMain = () => {
const CollaborationMain = () => {
const navigate = useNavigate();
const [isDropdownOpen, setIsDropdownOpen] = useState(false);
const [collaborationData, setCollaborationData] = useState<
Expand Down Expand Up @@ -268,3 +268,4 @@ export const CollaborationMain = () => {
</>
);
};
export default CollaborationMain;
4 changes: 3 additions & 1 deletion src/pages/collaboration/CollaborationRegister.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const OPTIONS = [
// numberOfPeople: number;
// }

export const CollaborationRegister = () => {
const CollaborationRegister = () => {
const navigate = useNavigate();
const [category, setCategory] = useState<string>('');
const [isDropdownOpen, setIsDropdownOpen] = useState<boolean>(false);
Expand Down Expand Up @@ -790,3 +790,5 @@ export const CollaborationRegister = () => {
</div>
);
};

export default CollaborationRegister;
3 changes: 2 additions & 1 deletion src/pages/collaboration/PostDetailWithLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { getCollaborationDetail } from '../../apis/detailPageAPI';
import { CollaborationDetail } from '../../types/detailPageType';
import { getUserIdFromToken } from '../../utils/auth';

export const PostDetailWithLink = () => {
const PostDetailWithLink = () => {
const { collaborationId } = useParams<{ collaborationId: string }>();

const { data, isLoading, error } = useQuery<CollaborationDetail, Error>({
Expand Down Expand Up @@ -120,3 +120,4 @@ export const PostDetailWithLink = () => {
</>
);
};
export default PostDetailWithLink;
3 changes: 2 additions & 1 deletion src/pages/errorPage/ErrorPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import PageErrorIcon from '../../assets/icons/pageError.svg?react';
import styles from './errorPage.module.scss';
import { useNavigate } from 'react-router-dom';

export const ErrorPage = () => {
const ErrorPage = () => {
const navigate = useNavigate();

const goBackTwice = () => {
Expand Down Expand Up @@ -30,3 +30,4 @@ export const ErrorPage = () => {
</div>
);
};
export default ErrorPage;
4 changes: 3 additions & 1 deletion src/pages/idea-market/IdeaMarketMain.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const sortMap: Record<string, SortType> = {
lowView: 'LOWEST_PRICE',
};

export const IdeaMarketMain = () => {
const IdeaMarketMain = () => {
const queryClient = useQueryClient();
const navigate = useNavigate();
const [isDropdownOpen, setIsDropdownOpen] = useState(false);
Expand Down Expand Up @@ -359,3 +359,5 @@ export const IdeaMarketMain = () => {
</>
);
};

export default IdeaMarketMain;
4 changes: 3 additions & 1 deletion src/pages/idea-market/IdeaMarketMarketPlace.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const sortMap: Record<string, SortType> = {
lowView: 'LOWEST_PRICE',
};

export const IdeaMarketMarketPlace = () => {
const IdeaMarketMarketPlace = () => {
const queryClient = useQueryClient();
const navigate = useNavigate();
const [isDropdownOpen, setIsDropdownOpen] = useState(false);
Expand Down Expand Up @@ -359,3 +359,5 @@ export const IdeaMarketMarketPlace = () => {
</>
);
};

export default IdeaMarketMarketPlace;
Loading