-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[release] dev -> main 브랜치 merge / 1.0.1version upgrade (#24)
* 🔨 refactor: Docker 이미지 최적화를 위한 코드 리팩토링 * 🙀 chore: 오타 수정 * 🐛 fix: COPY 경로 수정 * 🐛 fix: swagger-auto 명령어 추가 * 🙀 chore: 오타수정 * 🐛 fix: backend 이미지가 base-image를 사용하지 않으므로 새로운 패키지 매니저 설치 및 추가 파일 복사하는 로직 추가 * 🐛 fix: pnpm-lock 복사 코드 추가 * 🐛 fix: 서버 패키지 설치 안되는 오류 해결하기 위해 코드 수정 * 🐛 fix: eslint 경로 체크용 package 폴더 추가 복사 * 🐛 fix: 의존성을 복사해오고 dev용을 지우는 방식으로 수정 * 🐛 fix: pnpm-workspace 파일 복사 * 🙀 chore: cicd 스크립트 오타 수정 * 🙀 chore: copy 명령어 합침 * 🙀 chore: 코드 구조 변경 * 🐛 fix: COPY 경로 수정 * 🙀 chore: 경로 오타 수정 * 🔨 refactor: 배포시 swagger-auto 안 하게 로직 수정 및 prod 종속성에 필요한 패키지 dev 종속성에서 이동 * 🙀 chore: 경로 오타 수정 * 🙀 chore: 안쓰는 라이브러리 삭제 * 🚨 !HOTFIX!: env 설정 누락된 코드 추가 * 🚨 !HOTFIX!: env 설정 누락된 코드 추가 * [#10] 홈페이지 가상스크롤 적용 (#14) * ✨ feat: scroll의 Y 좌표를 리턴하는 useScroll 커스텀 훅 추가 * 🚚 rename: hooks/css에 있던 useWindowSize 훅 폴더 위치 변경 * ✨ feat: 가상스크롤 구현 중 * 🙀 chore: 함수명 오타 수정 * ✨ feat: 가상스크롤 커스텀훅 추가 * ✨ feat: WorkspaceGrid 컴포넌트에 가상스크롤 적용 * 🙀 chore: grid의 총 높이 계산할 때 반올림 적용 * [#11] Google Analytics 적용 (#15) * ✨ feat: ga4 코드 추가 * 🔨 refactor: 로컬 환경 디버깅용 코드로 전환 * 🙀 chore: GA 디버깅 코드 삭제 * ✨ feat: 이벤트 트레이싱 * Update boolock-dev-cicd.yml * Update boolock-dev-cicd.yml * [#18] useQuery, useInfiniteQuery -> useSuspenseQuery, useSuspenseInfiniteQuery 교체 (#19) * 🔨 refactor: useQuery를 useSuspenseQuery로 교체 및 error 처러 코드 삭제 * 🔨 refactor: 로딩 UI 및 에러 처리 코드 삭제 * 🔨 refactor: suspense 적용 및 error boundy fallback에 workspace 에러 페이지 설정 * 🔨 refactor: useInfinityQuery -> useSuspenseQuery로 교체 * 🙀 chore: 400 에러와 404에러의 에러 코드 및 상태 메세지가 잘못 설정 되어 있어 올바르게 수정 * 🐛 fix: 기존 에러 발생 시 500 에러로만 응답하는 문제 해결 * 🔨 refactor: workspaceContainer에서 워크스페이스 데이터를 렌더링하고 페칭하는 부분을 분리함 * 🙀 chore: 컴포넌트 분리에 따른 코드 수정 * 🙀 chore: github action 에서 파일명 변경을 감지하지 못한 문제로 인해 파일명 변경 * 🙀 chore: 불필요한 console.log 삭제 * [#21] 홈페이지 로딩 시 스켈레톤UI에 그리드가 적용되지 않는 문제 해결, 워크스페이스 로딩 화면 조건부 렌더링 (#22) * 🐛 fix: 스켈레톤UI에 그리드가 안되는 문제 해결 * ✨ feat: 워크스페이스 로딩 시간이 0.05초 이상일 때만 로딩 화면이 렌더링되도록 변경 * 🚨 !HOTFIX!: error가 발생할 때 return 해야하는데 그렇지 않을 때 return 하여 workspace가 초기화되지않는 문제 해결 * 🚨 !HOTFIX!: workflow on 설정 main push 일 경우로 수정 --------- Co-authored-by: YEONGJAE LEE <[email protected]> Co-authored-by: Gyeungil Choi <[email protected]> Co-authored-by: Yujin <[email protected]> Co-authored-by: lee0jae330 <[email protected]>
- Loading branch information
5 people
authored
Jan 17, 2025
1 parent
dcd92f6
commit f2d576c
Showing
39 changed files
with
507 additions
and
174 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,20 @@ | ||
| FROM base-image AS frontend-build | ||
|
|
||
| WORKDIR /app/apps/client | ||
| COPY ./apps/client . | ||
| COPY --from=base-image /app/packages /app/packages | ||
| RUN pnpm install --offline --frozen-lockfile | ||
| RUN pnpm run build | ||
| RUN pnpm install --offline --frozen-lockfile &&\ | ||
| pnpm run build | ||
|
|
||
| FROM nginx:alpine AS frontend | ||
| COPY --from=frontend-build /app/apps/client/dist /usr/share/nginx/html | ||
|
|
||
| COPY /apps/client/nginx.conf /etc/nginx/conf.d/default.conf | ||
| COPY /apps/client/ssl /etc/nginx/ssl | ||
| RUN chmod 644 /etc/nginx/ssl/fullchain.pem &&\ | ||
| chmod 600 /etc/nginx/ssl/privkey.pem &&\ | ||
| chown -R nginx:nginx /usr/share/nginx/html /etc/nginx/ssl | ||
|
|
||
| RUN chmod -R 755 /usr/share/nginx/html | ||
| RUN chmod 644 /etc/nginx/ssl/fullchain.pem | ||
| RUN chmod 600 /etc/nginx/ssl/privkey.pem | ||
| RUN chown -R nginx:nginx /usr/share/nginx/html /etc/nginx/ssl | ||
| COPY --from=frontend-build /app/apps/client/dist /usr/share/nginx/html/ | ||
| RUN chmod -R 755 /usr/share/nginx/html | ||
|
|
||
| EXPOSE 80 443 | ||
| CMD ["nginx", "-g", "daemon off;"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
apps/client/src/pages/WorkspaceErrorPage/WorkspaceErrorPage.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import { ErrorPage, NotFound } from '@/pages'; | ||
|
|
||
| import toast from 'react-hot-toast'; | ||
| import { useRouteError } from 'react-router-dom'; | ||
|
|
||
| export const WorkspaceErrorPage = () => { | ||
| const error: any = useRouteError(); | ||
| const statusCode = error?.response?.statusCode || error?.status; | ||
| if (statusCode === 404) { | ||
| toast.error('워크스페이스 정보 불러오기 실패'); | ||
| return <NotFound />; | ||
| } | ||
| return <ErrorPage />; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| export { HomePage } from './HomePage/HomePage'; | ||
| export { NotFound } from './NotFound/NotFound'; | ||
| export { WorkspacePage } from './Workspacepage/WorkspacePage'; | ||
| export { ErrorPage } from './ErrorPage/ErrorPage'; | ||
| export { WorkspaceErrorPage } from './WorkspaceErrorPage/WorkspaceErrorPage'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { useEffect, useRef, useState } from 'react'; | ||
|
|
||
| export const useScrollPosition = () => { | ||
| const [scrollPosition, setScrollPosition] = useState<number>(0); | ||
| const ticking = useRef(false); | ||
|
|
||
| useEffect(() => { | ||
| const onScroll = () => { | ||
| if (!ticking.current) { | ||
| requestAnimationFrame(() => { | ||
| setScrollPosition(window.scrollY); | ||
| ticking.current = false; | ||
| }); | ||
| ticking.current = true; | ||
| } | ||
| }; | ||
| window.addEventListener('scroll', onScroll); | ||
|
|
||
| return () => { | ||
| window.removeEventListener('scroll', onScroll); | ||
| }; | ||
| }, []); | ||
|
|
||
| return { scrollPosition }; | ||
| }; |
Oops, something went wrong.