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
168 changes: 168 additions & 0 deletions package-lock.json

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

8 changes: 8 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,19 @@
"preview": "vite preview"
},
"dependencies": {
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/modifiers": "^9.0.0",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@faker-js/faker": "^9.4.0",
"@reduxjs/toolkit": "^2.5.0",
"@tailwindcss/vite": "^4.0.0",
"@tinymce/tinymce-react": "^5.1.1",
"axios": "^1.7.9",
"dompurify": "^3.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-icons": "^5.4.0",
"react-redux": "^9.2.0",
"react-router-dom": "^7.1.3",
"tailwindcss": "^4.0.0"
Expand Down
Binary file added public/kakao-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/kakao_login_medium_wide.png
Binary file not shown.
Binary file removed public/logo-black.png
Binary file not shown.
Binary file added public/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {RouterProvider} from 'react-router-dom'
import root from './router/root'
import root from './common/router/root'

function App() {

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

const axiosApi = axios.create({
Expand Down
File renamed without changes.
Binary file added src/common/assets/fonts/Jalnan2.otf
Binary file not shown.
Binary file added src/common/assets/fonts/s-core/SCDream1.otf
Binary file not shown.
Binary file added src/common/assets/fonts/s-core/SCDream2.otf
Binary file not shown.
Binary file added src/common/assets/fonts/s-core/SCDream3.otf
Binary file not shown.
Binary file added src/common/assets/fonts/s-core/SCDream4.otf
Binary file not shown.
Binary file added src/common/assets/fonts/s-core/SCDream5.otf
Binary file not shown.
Binary file added src/common/assets/fonts/s-core/SCDream6.otf
Binary file not shown.
Binary file added src/common/assets/fonts/s-core/SCDream7.otf
Binary file not shown.
Binary file added src/common/assets/fonts/s-core/SCDream8.otf
Binary file not shown.
Binary file added src/common/assets/fonts/s-core/SCDream9.otf
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/common/router/blogRouter.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import {Suspense} from "react";
import {Blog, Loading} from "./page.tsx";

const blogRouter = () => {

return [
{
path: ':username',
element: <Suspense fallback={Loading}><Blog/></Suspense>
},
];
}

export default blogRouter;
16 changes: 14 additions & 2 deletions src/router/page.tsx → src/common/router/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,17 @@ export const Loading =
</svg>
</div>;

export const Main = lazy(() => import('../pages/MainPage'));
export const Login = lazy(() => import('../pages/member/LoginPage'));
export const Main = lazy(() => import('../../pages/MainPage.tsx'));
export const Login = lazy(() => import('../../pages/member/LoginPage.tsx'));
export const Platform = lazy(() => import('../../pages/member/PlatformPage.tsx'));
export const Email = lazy(() => import('../../pages/member/EmailPage.tsx'));
export const Code = lazy(() => import('../../pages/member/CodePage.tsx'));
export const Signup = lazy(() => import('../../pages/member/SignupPage.tsx'));
export const Setting = lazy(() => import('../../pages/setting/SettingPage.tsx'));

export const Search = lazy(() => import('../../pages/post/SearchPage.tsx'));

export const Post = lazy(() => import('../../pages/post/PostPage.tsx'));
export const Write = lazy(() => import('../../pages/post/WritePage.tsx'));

export const Blog = lazy(() => import('../../pages/blog/BlogPage.tsx'));
14 changes: 14 additions & 0 deletions src/common/router/postRouter.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import {Suspense} from "react";
import {Loading, Post} from "./page.tsx";

const postRouter = () => {

return [
{
path: ':id',
element: <Suspense fallback={Loading}><Post/></Suspense>
},
];
}

export default postRouter;
43 changes: 43 additions & 0 deletions src/common/router/root.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
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>
},
{
path: '/login',
element: <Suspense fallback={Loading}><Login/></Suspense>
},
{
path: '/setting',
element: <Suspense fallback={Loading}><Setting/></Suspense>
},
{
path: '/search',
element: <Suspense fallback={Loading}><Search/></Suspense>
},
{
path: '/write',
element: <Suspense fallback={Loading}><Write/></Suspense>
},
{
path: '/signup',
children: signupRouter()
},
{
path: '/post',
children: postRouter()
},
{
path: '/blog',
children: blogRouter()
},
]);

export default root;
Loading