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
22 changes: 11 additions & 11 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/logo-white.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>DIGLOG</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/logo-white.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>DIGLOG</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
11 changes: 4 additions & 7 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { RouterProvider } from 'react-router-dom'
import root from './common/router/root'
import { RouterProvider } from 'react-router-dom';
import root from './common/router/root';

function App() {

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

export default App
export default App;
36 changes: 19 additions & 17 deletions src/common/apis/AxiosApi.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
import axios from "axios";
import store from "../../store.tsx";
import { login } from "../slices/loginSlice.tsx";
import axios from 'axios';
import store from '../../store.tsx';
import { login } from '../slices/loginSlice.tsx';

const axiosApi = axios.create({
baseURL: `${import.meta.env.VITE_SERVER_URL}/api`,
});

axiosApi.interceptors.request.use(
(config) => {
config.headers['Authorization'] = store.getState().loginSlice.accessToken
config => {
config.headers['Authorization'] = store.getState().loginSlice.accessToken;
return config;
},
(error) => {
error => {
return Promise.reject(error);
}
},
);

axiosApi.interceptors.response.use(
(response) => {
response => {
return response;
},
async (error) => {
async error => {
const originalRequest = error.config;

if (error.response && error.response.status >= 401 && error.response.status <= 403 && !originalRequest._retry) {
Expand All @@ -30,12 +30,14 @@ axiosApi.interceptors.response.use(
const refreshResponse = await axiosApi.get('/member/refresh', { withCredentials: true });

if (refreshResponse.data.status === 200) {
store.dispatch(login({
email: refreshResponse.data.email,
username: refreshResponse.data.username,
roles: refreshResponse.data.roles,
accessToken: refreshResponse.headers.authorization,
}));
store.dispatch(
login({
email: refreshResponse.data.email,
username: refreshResponse.data.username,
roles: refreshResponse.data.roles,
accessToken: refreshResponse.headers.authorization,
}),
);
} else {
return Promise.reject();
}
Expand All @@ -49,7 +51,7 @@ axiosApi.interceptors.response.use(
}

return Promise.reject(error);
}
},
);

export default axiosApi;
export default axiosApi;
17 changes: 7 additions & 10 deletions src/common/apis/blog.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
import { FolderDeleteRequest, FolderRequest, PostListMemberRequest } from "../types/blog.tsx";
import axiosApi from "./AxiosApi.tsx";
import { postListMemberRequestToParameter } from "../util/url.tsx";
import { FolderDeleteRequest, FolderRequest, PostListMemberRequest } from '../types/blog.tsx';
import axiosApi from './AxiosApi.tsx';
import { postListMemberRequestToParameter } from '../util/url.tsx';

export const getMemberPosts = (postListMemberRequest: PostListMemberRequest) =>
axiosApi.get(`/post/member${postListMemberRequestToParameter(postListMemberRequest)}`);

export const getMemberFolders = (username: string) =>
axiosApi.get(`/folders/${username}`);
export const getMemberFolders = (username: string) => axiosApi.get(`/folders/${username}`);

export const getMemberTags = (username: string) =>
axiosApi.get(`/tag/${username}`);
export const getMemberTags = (username: string) => axiosApi.get(`/tag/${username}`);

export const saveAndUpdateFolder = (folderRequestList: FolderRequest[]) =>
axiosApi.put("/folders", folderRequestList);
export const saveAndUpdateFolder = (folderRequestList: FolderRequest[]) => axiosApi.put('/folders', folderRequestList);

export const deleteFolder = (folderDeleteRequestList: FolderDeleteRequest[]) =>
axiosApi.delete("/folders", { data: folderDeleteRequestList });
axiosApi.delete('/folders', { data: folderDeleteRequestList });
16 changes: 7 additions & 9 deletions src/common/apis/comment.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import axiosApi from "./AxiosApi.tsx";
import { CommentListRequest, CommentRequest, CommentUpdateRequest } from "../types/comment.tsx";
import { commentListRequestToParameter } from "../util/url.tsx";
import axiosApi from './AxiosApi.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)}`);

export const saveComment = async (commentRequest: CommentRequest) =>
await axiosApi.post("/comment", commentRequest);
export const saveComment = async (commentRequest: CommentRequest) => await axiosApi.post('/comment', commentRequest);

export const updateComment = async (commentUpdateRequest: CommentUpdateRequest) => {
await axiosApi.patch("/comment", commentUpdateRequest);
}
await axiosApi.patch('/comment', commentUpdateRequest);
};

export const deleteComment = async (id: string) =>
await axiosApi.patch(`/comment/delete/${id}`);
export const deleteComment = async (id: string) => await axiosApi.patch(`/comment/delete/${id}`);
8 changes: 4 additions & 4 deletions src/common/apis/image.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import axiosApi from "./AxiosApi.tsx";
import axiosApi from './AxiosApi.tsx';

export const uploadImage = async (blogInfo: any) => {
const formData = new FormData();
formData.append("file", blogInfo.blob());
formData.append('file', blogInfo.blob());

return await axiosApi.post("/image", formData);
}
return await axiosApi.post('/image', formData);
};
57 changes: 31 additions & 26 deletions src/common/apis/member.tsx
Original file line number Diff line number Diff line change
@@ -1,56 +1,61 @@
import axiosApi from "./AxiosApi.tsx";
import { MemberProfileSearchRequest } from "../types/member.tsx";
import { memberProfileSearchRequestToParameter } from "../util/url.tsx";
import axiosApi from './AxiosApi.tsx';
import { MemberProfileSearchRequest } from '../types/member.tsx';
import { memberProfileSearchRequestToParameter } from '../util/url.tsx';

export const sendMail = async (email: string) =>
await axiosApi.post("/verify", {
email: email
await axiosApi.post('/verify', {
email: email,
});

export const checkCode = async (email: string, code: string) =>
await axiosApi.post("/verify/code", {
await axiosApi.post('/verify/code', {
email: email,
code: code
code: code,
});

export const signup = async (email: string, password: string, code: string) =>
await axiosApi.post("/verify/signup", {
await axiosApi.post('/verify/signup', {
email: email,
password: password,
code: code,
});

export const loginApi = async (email: string, password: string) =>
await axiosApi.post("/member/login", {
email: email,
password: password
}, { withCredentials: true });
await axiosApi.post(
'/member/login',
{
email: email,
password: password,
},
{ withCredentials: true },
);

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

export const handleKakaoLogin = () =>
location.href = `${import.meta.env.VITE_SERVER_URL}/oauth2/authorization/kakao`;
export const handleKakaoLogin = () => (location.href = `${import.meta.env.VITE_SERVER_URL}/oauth2/authorization/kakao`);

export const getProfile = async () =>
await axiosApi.get("/member/profile");
export const getProfile = async () => await axiosApi.get('/member/profile');

export const getProfileByUsername = async (username: string) =>
await axiosApi.get(`/member/profile/${username}`);
export const getProfileByUsername = async (username: string) => await axiosApi.get(`/member/profile/${username}`);

export const updateUsername = async (username: string) =>
await axiosApi.post("/member/username", {
await axiosApi.post('/member/username', {
username: username,
});

export const updateProfileImage = async (image: File) => {
const formData = new FormData();
formData.append("file", image);
formData.append('file', image);

return await axiosApi.post("/member/image", formData);
}
return await axiosApi.post('/member/image', formData);
};

export const searchProfile = async (memberProfileSearchRequest: MemberProfileSearchRequest) =>
await axiosApi.get(`/member/profile/search${memberProfileSearchRequestToParameter(memberProfileSearchRequest)}`);
await axiosApi.get(`/member/profile/search${memberProfileSearchRequestToParameter(memberProfileSearchRequest)}`);
26 changes: 11 additions & 15 deletions src/common/apis/post.tsx
Original file line number Diff line number Diff line change
@@ -1,32 +1,29 @@
import axiosApi from "./AxiosApi.tsx";
import axiosApi from './AxiosApi.tsx';
import {
PostFolderRequest,
PostListRequest,
PostListTagRequest,
PostRequest,
PostSearchRequest,
PostUpdateRequest,
} from "../types/post.tsx";
} from '../types/post.tsx';
import {
postListRequestToParameter,
postListSearchRequestToParameter,
postListTagRequestToParameter
} from "../util/url.tsx";
postListTagRequestToParameter,
} from '../util/url.tsx';

export const createPost = async (postRequest: PostRequest) =>
await axiosApi.post("/post", postRequest);
export const createPost = async (postRequest: PostRequest) => await axiosApi.post('/post', postRequest);

export const updatePost = async (postUpdateRequest: PostUpdateRequest) =>
await axiosApi.patch("/post", postUpdateRequest);
await axiosApi.patch('/post', postUpdateRequest);

export const updatePostFolder = async (postFolderRequest: PostFolderRequest) =>
await axiosApi.patch("/post/folder", postFolderRequest);
await axiosApi.patch('/post/folder', postFolderRequest);

export const deletePost = async (id: string) =>
await axiosApi.patch(`/post/delete/${id}`);
export const deletePost = async (id: string) => await axiosApi.patch(`/post/delete/${id}`);

export const getPost = async (id: string) =>
await axiosApi.get(`/post/${id}`);
export const getPost = async (id: string) => await axiosApi.get(`/post/${id}`);

export const getPosts = async (postListRequest: PostListRequest) =>
await axiosApi.get(`/post${postListRequestToParameter(postListRequest)}`);
Expand All @@ -39,8 +36,7 @@ export const searchPost = async (postSearchRequest: PostSearchRequest) =>

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

export const getPostViewCount = async (id: string) =>
await axiosApi.get(`/post/view/${id}`);
export const getPostViewCount = async (id: string) => await axiosApi.get(`/post/view/${id}`);
21 changes: 14 additions & 7 deletions src/common/router/blogRouter.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
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>
),
},
];
}
};

export default blogRouter;
export default blogRouter;
29 changes: 18 additions & 11 deletions src/common/router/page.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
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">
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'
>
<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" />
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'
/>
<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" />
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'
/>
</svg>
</div>;
</div>
);

export const Main = lazy(() => import('../../pages/MainPage.tsx'));
export const Login = lazy(() => import('../../pages/member/LoginPage.tsx'));
Expand Down
Loading