Skip to content

Commit

Permalink
Merge pull request #121 from Onion-City/dev
Browse files Browse the repository at this point in the history
Feat: 더보기, 게시글 수정
  • Loading branch information
hhbb0081 authored Aug 2, 2024
2 parents 0ab1423 + 0164d5d commit 3df31e6
Show file tree
Hide file tree
Showing 259 changed files with 5,350 additions and 1,472 deletions.
31 changes: 31 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
- 제목 : feat(issue 번호): 기능명

## 🔘Part

- 작업한 부분 (ex. 더보기 - 공결 신청 내역)

<br/>

## 🔎 작업 내용

- 작업한 내용

<br/>

## 이미지 첨부

<img src="파일주소" width="50%" height="50%"/>

<br/>

## 🔧 앞으로의 과제

- 해당 부분의 남은 과제 작성

<br/>

## ➕ 이슈 링크

- [레포 이름 #이슈번호](이슈 주소)

<br/>
9 changes: 9 additions & 0 deletions .idea/Whatssue_FE_v2.iml

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

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

61 changes: 61 additions & 0 deletions .idea/workspace.xml

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

1 change: 1 addition & 0 deletions next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
const nextConfig = {
images: {
domains: ["whatssue.s3.ap-northeast-2.amazonaws.com"],
// remotePatterns: ["https://whatssue.s3.ap-northeast-2.amazonaws.com/*"],
},
webpack: (config) => {
config.module.rules.push({
Expand Down
108 changes: 108 additions & 0 deletions package-lock.json

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

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"build-storybook": "storybook build"
},
"dependencies": {
"@reduxjs/toolkit": "^2.2.6",
"@svgr/webpack": "^8.1.0",
"@tanstack/react-query": "^5.40.1",
"@toss/utils": "^1.5.0",
Expand All @@ -23,14 +24,18 @@
"dayjs": "^1.11.10",
"moment": "^2.30.1",
"next": "14.1.4",
"next-redux-wrapper": "^8.1.0",
"prop-types": "^15.8.1",
"react": "^18",
"react-calendar": "^4.8.0",
"react-datepicker": "^6.9.0",
"react-dom": "^18",
"react-hook-form": "^7.51.2",
"react-query": "^3.39.3",
"react-redux": "^9.1.2",
"react-toastify": "^10.0.5",
"redux": "^5.0.1",
"redux-persist": "^6.0.0",
"rsuite": "^5.58.1",
"styled-components": "^6.1.8"
},
Expand Down
9 changes: 5 additions & 4 deletions src/apis/http.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ import axios from "axios";
import { AxiosInstance, AxiosRequestConfig } from "axios";

const axiosInstance = axios.create({
baseURL: process.env.NEXT_PUBLIC_API_URL,
baseURL: process.env.NEXT_PUBLIC_LOCAL_URL,
withCredentials: true,

});
});

export interface HttpClient extends AxiosInstance {
get<T = unknown>(url: string, config?: AxiosRequestConfig): Promise<T>;
Expand Down Expand Up @@ -58,7 +57,9 @@ axiosInstance.interceptors.response.use(
console.log(err);
// access token 만료 시
if (response?.status && response?.status === 403) {
window.location.href = "/user/login";
if (typeof window !== 'undefined') {
window.location.href = "/user/login";
}
localStorage.clear();
return config;
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions src/app/club/board/notice/[boardId]/modify/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
"use client";
import SetupModifyBoard from "@/features/board/SetupModifyBoard";

const NoticeBoardDetail = () => {
return <SetupModifyBoard />;
};

export default NoticeBoardDetail;
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"use client";
import SetupUserBoardList from "@/features/board/SetupUserBoardList";

const Board = () => {
return <SetupUserBoardList />;
}
Expand Down
Loading

0 comments on commit 3df31e6

Please sign in to comment.