diff --git a/README.md b/README.md index e0e2acf36..ba45ad2cf 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ 광주소프트웨어마이스터고등학교 공식 홈페이지입니다. -## commands +## Commands > root `package.json` scripts에 `--filter` command를 포함하여 작성해두었습니다. @@ -12,13 +12,13 @@ $ cd official-gsm-front $ pnpm install # command of a specific package -$ pnpm +$ pnpm # example $ pnpm client dev ``` -## directory structure +## Directory structure ```bash ... @@ -36,3 +36,17 @@ $ pnpm client dev │ └── ui ... ``` + +## Skill set + +```txt +- application + Next.js - App Router + +- core library + Storybook + Typescript + emotion + @tanstack/react-query + axios +``` diff --git a/apps/admin/src/app/post/edit/[postSeq]/page.tsx b/apps/admin/src/app/post/edit/[postSeq]/page.tsx index c22272d31..65d77c5c2 100644 --- a/apps/admin/src/app/post/edit/[postSeq]/page.tsx +++ b/apps/admin/src/app/post/edit/[postSeq]/page.tsx @@ -52,7 +52,7 @@ export default function EditPage({ params: { postSeq } }: EditPageProps) { const { data } = useGetPostDetail(postSeq); const isGallery = category === 'EVENT_GALLERY'; - const gallerySubmitDisabled = isGallery && files.length === 0; + const galleryEditDisabled = isGallery && !prevFiles?.length && !files.length; const { register, @@ -240,7 +240,7 @@ export default function EditPage({ params: { postSeq } }: EditPageProps) { diff --git a/apps/admin/src/components/ApproveModal/index.tsx b/apps/admin/src/components/ApproveModal/index.tsx index 055e20ff4..5f089c83f 100644 --- a/apps/admin/src/components/ApproveModal/index.tsx +++ b/apps/admin/src/components/ApproveModal/index.tsx @@ -13,7 +13,7 @@ const ApproveModal: React.FC = ({ close }) => { const { data: unApproveList, refetch } = useGetUnapproveList(); return ( - e.stopPropagation()}> + e.stopPropagation()}> 🤝 가입 요청
@@ -29,7 +29,7 @@ const ApproveModal: React.FC = ({ close }) => { /> ))} - + ); }; diff --git a/apps/admin/src/components/ApproveModal/style.ts b/apps/admin/src/components/ApproveModal/style.ts index 6a05985ca..e7391993c 100644 --- a/apps/admin/src/components/ApproveModal/style.ts +++ b/apps/admin/src/components/ApproveModal/style.ts @@ -1,6 +1,6 @@ import styled from '@emotion/styled'; -export const ModalConatiner = styled.div` +export const ModalContainer = styled.div` display: flex; flex-direction: column; position: absolute; diff --git a/apps/admin/src/components/DeleteModal/index.tsx b/apps/admin/src/components/DeleteModal/index.tsx index 03d968427..209d15216 100644 --- a/apps/admin/src/components/DeleteModal/index.tsx +++ b/apps/admin/src/components/DeleteModal/index.tsx @@ -9,7 +9,7 @@ const DeleteModal: React.FC = ({ onClick }) => ( 게시물 삭제 정말 게시물을 삭제하실건가요? - 취소하기 + 취소하기 삭제하기 diff --git a/apps/admin/src/components/DeleteModal/style.ts b/apps/admin/src/components/DeleteModal/style.ts index bdcd89ff1..bffffba79 100644 --- a/apps/admin/src/components/DeleteModal/style.ts +++ b/apps/admin/src/components/DeleteModal/style.ts @@ -40,7 +40,7 @@ export const Button = styled.button` cursor: pointer; `; -export const CancleButton = styled(Button)` +export const CancelButton = styled(Button)` background: ${({ theme }) => theme.color.gray['040']}; color: ${({ theme }) => theme.color.gray['080']}; `; diff --git a/apps/client/public/images/policy/Copyright1.png b/apps/client/public/images/policy/Copyright1.png new file mode 100644 index 000000000..6c25ebf87 Binary files /dev/null and b/apps/client/public/images/policy/Copyright1.png differ diff --git a/apps/client/public/images/policy/Copyright2.png b/apps/client/public/images/policy/Copyright2.png new file mode 100644 index 000000000..35a49ad3d Binary files /dev/null and b/apps/client/public/images/policy/Copyright2.png differ diff --git a/apps/client/public/images/promotion/poster.png b/apps/client/public/images/promotion/poster.png new file mode 100644 index 000000000..805b6b5fe Binary files /dev/null and b/apps/client/public/images/promotion/poster.png differ diff --git a/apps/client/public/video/promotion.webm b/apps/client/public/video/promotion.webm new file mode 100644 index 000000000..6fb4ae4a2 Binary files /dev/null and b/apps/client/public/video/promotion.webm differ diff --git a/apps/client/src/app/about/location/page.tsx b/apps/client/src/app/about/location/page.tsx new file mode 100644 index 000000000..cbed0a6a0 --- /dev/null +++ b/apps/client/src/app/about/location/page.tsx @@ -0,0 +1,25 @@ +import { Location, Header, Footer } from 'client/components'; + +import type { Metadata } from 'next'; + +export const metadata: Metadata = { + description: + '광주소프트웨어마이스터고등학교 공식 홈페이지 찾아오시는 길 페이지입니다.', + title: { absolute: '찾아오시는 길' }, + openGraph: { + title: '찾아오시는 길', + description: + '광주소프트웨어마이스터고등학교 공식 홈페이지 찾아오시는 길 페이지입니다.', + url: 'https://official.hellogsm.kr/about/location', + }, +}; + +export default function LocationPage() { + return ( + <> +
+ +