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
4 changes: 2 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {RouterProvider} from 'react-router-dom'
import { RouterProvider } from 'react-router-dom'
import root from './common/router/root'

function App() {

return (
<RouterProvider router={root}/>
<RouterProvider router={root} />
)
}

Expand Down
4 changes: 2 additions & 2 deletions src/common/apis/AxiosApi.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axios from "axios";
import store from "../../store.tsx";
import {login} from "../slices/loginSlice.tsx";
import { login } from "../slices/loginSlice.tsx";

const axiosApi = axios.create({
baseURL: `${import.meta.env.VITE_SERVER_URL}/api`,
Expand All @@ -27,7 +27,7 @@ axiosApi.interceptors.response.use(
originalRequest._retry = true;

try {
const refreshResponse = await axiosApi.get('/member/refresh', {withCredentials: true});
const refreshResponse = await axiosApi.get('/member/refresh', { withCredentials: true });

if (refreshResponse.data.status === 200) {
store.dispatch(login({
Expand Down
6 changes: 3 additions & 3 deletions src/common/apis/blog.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {FolderDeleteRequest, FolderRequest, PostListMemberRequest} from "../types/blog.tsx";
import { FolderDeleteRequest, FolderRequest, PostListMemberRequest } from "../types/blog.tsx";
import axiosApi from "./AxiosApi.tsx";
import {postListMemberRequestToParameter} from "../util/url.tsx";
import { postListMemberRequestToParameter } from "../util/url.tsx";

export const getMemberPosts = (postListMemberRequest: PostListMemberRequest) =>
axiosApi.get(`/post/member${postListMemberRequestToParameter(postListMemberRequest)}`);
Expand All @@ -15,4 +15,4 @@ export const saveAndUpdateFolder = (folderRequestList: FolderRequest[]) =>
axiosApi.put("/folders", folderRequestList);

export const deleteFolder = (folderDeleteRequestList: FolderDeleteRequest[]) =>
axiosApi.delete("/folders", {data: folderDeleteRequestList});
axiosApi.delete("/folders", { data: folderDeleteRequestList });
4 changes: 2 additions & 2 deletions src/common/apis/comment.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axiosApi from "./AxiosApi.tsx";
import {CommentListRequest, CommentRequest, CommentUpdateRequest} from "../types/comment.tsx";
import {commentListRequestToParameter} from "../util/url.tsx";
import { CommentListRequest, CommentRequest, CommentUpdateRequest } from "../types/comment.tsx";
import { commentListRequestToParameter } from "../util/url.tsx";

export const getComments = async (commentListRequest: CommentListRequest) =>
await axiosApi.get(`/comment${commentListRequestToParameter(commentListRequest)}`);
Expand Down
8 changes: 4 additions & 4 deletions src/common/apis/member.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axiosApi from "./AxiosApi.tsx";
import {MemberProfileSearchRequest} from "../types/member.tsx";
import {memberProfileSearchRequestToParameter} from "../util/url.tsx";
import { MemberProfileSearchRequest } from "../types/member.tsx";
import { memberProfileSearchRequestToParameter } from "../util/url.tsx";

export const sendMail = async (email: string) =>
await axiosApi.post("/verify", {
Expand All @@ -24,12 +24,12 @@ export const loginApi = async (email: string, password: string) =>
await axiosApi.post("/member/login", {
email: email,
password: password
}, {withCredentials: true});
}, { withCredentials: true });

export const logoutApi = async (email: string) =>
await axiosApi.post("/member/logout", {
email: email
}, {withCredentials: true});
}, { withCredentials: true });

export const handleKakaoLogin = () =>
location.href = `${import.meta.env.VITE_SERVER_URL}/oauth2/authorization/kakao`;
Expand Down
12 changes: 10 additions & 2 deletions src/common/apis/post.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
PostListTagRequest,
PostRequest,
PostSearchRequest,
PostUpdateRequest
PostUpdateRequest,
} from "../types/post.tsx";
import {
postListRequestToParameter,
Expand Down Expand Up @@ -35,4 +35,12 @@ export const getMemberTagPosts = async (postListTagRequest: PostListTagRequest)
await axiosApi.get(`/post/member/tag${postListTagRequestToParameter(postListTagRequest)}`);

export const searchPost = async (postSearchRequest: PostSearchRequest) =>
await axiosApi.get(`/post/search${postListSearchRequestToParameter(postSearchRequest)}`);
await axiosApi.get(`/post/search${postListSearchRequestToParameter(postSearchRequest)}`);

export const incrementPostViewCount = async (id: string) =>
await axiosApi.post(`/post/view/increment`, {
postId: id
});

export const getPostViewCount = async (id: string) =>
await axiosApi.get(`/post/view/${id}`);
8 changes: 4 additions & 4 deletions src/common/router/blogRouter.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import {Suspense} from "react";
import {Blog, BlogTag, Loading} from "./page.tsx";
import { Suspense } from "react";
import { Blog, BlogTag, Loading } from "./page.tsx";

const blogRouter = () => {

return [
{
path: ':username',
element: <Suspense fallback={Loading}><Blog/></Suspense>
element: <Suspense fallback={Loading}><Blog /></Suspense>
},
{
path: ':username/tag',
element: <Suspense fallback={Loading}><BlogTag/></Suspense>
element: <Suspense fallback={Loading}><BlogTag /></Suspense>
},
];
}
Expand Down
10 changes: 5 additions & 5 deletions src/common/router/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import {lazy} from "react";
import { lazy } from "react";

export const Loading =
<div className="flex items-center justify-center w-screen h-screen">
<svg aria-hidden="true"
className="inline w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-gray-600 dark:fill-gray-300"
viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
className="inline w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-gray-600 dark:fill-gray-300"
viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor"/>
fill="currentColor" />
<path
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill"/>
fill="currentFill" />
</svg>
</div>;

Expand Down
8 changes: 4 additions & 4 deletions src/common/router/postRouter.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import {Suspense} from "react";
import {Loading, Post, Write} from "./page.tsx";
import { Suspense } from "react";
import { Loading, Post, Write } from "./page.tsx";

const postRouter = () => {

return [
{
path: 'edit/:id',
element: <Suspense fallback={Loading}><Write/></Suspense>
element: <Suspense fallback={Loading}><Write /></Suspense>
},
{
path: ':id',
element: <Suspense fallback={Loading}><Post/></Suspense>
element: <Suspense fallback={Loading}><Post /></Suspense>
},
];
}
Expand Down
16 changes: 8 additions & 8 deletions src/common/router/root.tsx
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
import {createBrowserRouter} from "react-router-dom";
import {Suspense} from "react";
import {Loading, Login, Main, Search, Setting, Write} from "./page.tsx";
import { createBrowserRouter } from "react-router-dom";
import { Suspense } from "react";
import { Loading, Login, Main, Search, Setting, Write } from "./page.tsx";
import postRouter from "./postRouter.tsx";
import blogRouter from "./blogRouter.tsx";
import signupRouter from "./signupRouter.tsx";

const root = createBrowserRouter([
{
path: '',
element: <Suspense fallback={Loading}><Main/></Suspense>
element: <Suspense fallback={Loading}><Main /></Suspense>
},
{
path: '/login',
element: <Suspense fallback={Loading}><Login/></Suspense>
element: <Suspense fallback={Loading}><Login /></Suspense>
},
{
path: '/setting/:section',
element: <Suspense fallback={Loading}><Setting/></Suspense>
element: <Suspense fallback={Loading}><Setting /></Suspense>
},
{
path: '/search',
element: <Suspense fallback={Loading}><Search/></Suspense>
element: <Suspense fallback={Loading}><Search /></Suspense>
},
{
path: '/write',
element: <Suspense fallback={Loading}><Write/></Suspense>
element: <Suspense fallback={Loading}><Write /></Suspense>
},
{
path: '/signup',
Expand Down
12 changes: 6 additions & 6 deletions src/common/router/signupRouter.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import {Code, Email, Loading, Platform, Signup} from "./page.tsx";
import {Suspense} from "react";
import { Code, Email, Loading, Platform, Signup } from "./page.tsx";
import { Suspense } from "react";

const signupRouter = () => {

return [
{
path: 'platform',
element: <Suspense fallback={Loading}><Platform/></Suspense>
element: <Suspense fallback={Loading}><Platform /></Suspense>
},
{
path: 'email',
element: <Suspense fallback={Loading}><Email/></Suspense>
element: <Suspense fallback={Loading}><Email /></Suspense>
},
{
path: 'code',
element: <Suspense fallback={Loading}><Code/></Suspense>
element: <Suspense fallback={Loading}><Code /></Suspense>
},
{
path: '',
element: <Suspense fallback={Loading}><Signup/></Suspense>
element: <Suspense fallback={Loading}><Signup /></Suspense>
},
];
}
Expand Down
4 changes: 2 additions & 2 deletions src/common/slices/loginSlice.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {createSlice} from "@reduxjs/toolkit";
import { createSlice } from "@reduxjs/toolkit";

const initialState = {
isLogin: false,
Expand Down Expand Up @@ -51,6 +51,6 @@ const loginSlice = createSlice({
}
});

export const {login, logout, setUsername, setProfile, setReloadedFalse} = loginSlice.actions;
export const { login, logout, setUsername, setProfile, setReloadedFalse } = loginSlice.actions;

export default loginSlice.reducer;
2 changes: 1 addition & 1 deletion src/common/types/comment.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PageResponse} from "./common.tsx";
import { PageResponse } from "./common.tsx";

export interface CommentType {
id: string,
Expand Down
3 changes: 2 additions & 1 deletion src/common/types/post.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PageResponse} from "./common.tsx";
import { PageResponse } from "./common.tsx";

export interface PostRequest {
title: string,
Expand Down Expand Up @@ -52,6 +52,7 @@ export interface PostResponse {
username: string;
folder?: PostFolderResponse;
tags: TagResponse[];
viewCount: number;
createdAt: Date;
}

Expand Down
18 changes: 9 additions & 9 deletions src/common/util/infiniteScroll.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {useEffect, useState, useMemo, useRef, MutableRefObject} from 'react';
import {PostResponse} from "../types/post.tsx";
import { useEffect, useState, useMemo, useRef, MutableRefObject } from 'react';
import { PostResponse } from "../types/post.tsx";

export interface InfiniteScrollProps {
root?: Element | null;
Expand All @@ -11,13 +11,13 @@ export interface InfiniteScrollProps {
}

const useInfiniteScroll = ({
root = null,
target,
threshold = 1,
rootMargin = '0px',
targetArray,
endPoint = 1
}: InfiniteScrollProps) => {
root = null,
target,
threshold = 1,
rootMargin = '0px',
targetArray,
endPoint = 1
}: InfiniteScrollProps) => {

const [page, setPage] = useState<number>(0);
const currentChild = useRef<Element | null>(null);
Expand Down
2 changes: 1 addition & 1 deletion src/common/util/sort.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {TagResponse} from "../types/post.tsx";
import { TagResponse } from "../types/post.tsx";

export const sortByName = (names: string[]) => {
names.sort((a: string, b: string) => {
Expand Down
8 changes: 4 additions & 4 deletions src/common/util/url.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {PostListRequest, PostListTagRequest, PostSearchRequest} from "../types/post.tsx";
import {CommentListRequest} from "../types/comment.tsx";
import {PostListMemberRequest} from "../types/blog.tsx";
import {MemberProfileSearchRequest} from "../types/member.tsx";
import { PostListRequest, PostListTagRequest, PostSearchRequest } from "../types/post.tsx";
import { CommentListRequest } from "../types/comment.tsx";
import { PostListMemberRequest } from "../types/blog.tsx";
import { MemberProfileSearchRequest } from "../types/member.tsx";

export const postListRequestToParameter = (postListRequest: PostListRequest) => {
const sorts = postListRequest.sorts.map(sort => `sorts=${sort}`).join("&");
Expand Down
2 changes: 1 addition & 1 deletion src/components/blog/BlogSearchBar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function BlogSearchBar({value, setValue}: {
function BlogSearchBar({ value, setValue }: {
value: string,
setValue: (value: string) => void,
}) {
Expand Down
Loading