diff --git a/apps/client/public/images/home/banner-2026.jpeg b/apps/client/public/images/home/banner-2026.jpeg new file mode 100644 index 00000000..d89bfda1 Binary files /dev/null and b/apps/client/public/images/home/banner-2026.jpeg differ diff --git a/apps/client/public/images/logo-2026.png b/apps/client/public/images/logo-2026.png new file mode 100644 index 00000000..9a8fd7df Binary files /dev/null and b/apps/client/public/images/logo-2026.png differ diff --git a/apps/client/src/components/about/leadership/ministerList.tsx b/apps/client/src/components/about/leadership/ministerList.tsx index 1883cf4e..9e9de54d 100644 --- a/apps/client/src/components/about/leadership/ministerList.tsx +++ b/apps/client/src/components/about/leadership/ministerList.tsx @@ -7,7 +7,7 @@ const ministerProfiles = [ name: "표명성", description: "", image: "/images/leader/myung-seong.png", - position: "행정, 교구, 신혼가정, 예배위원회, 찬양위원회", + position: "행정, 교구, 예배위원회, 찬양위원회", tabType: "minister", officerType: "associate", greeting: "하나님과 성도들 앞에서 진중하지만, 늘 유쾌한 목회자가 되고 싶은 표명성 목사입니다.", @@ -16,7 +16,7 @@ const ministerProfiles = [ name: "이현준", description: "", image: "/images/leader/hyun-jun.png", - position: "청년 디렉터, 전도위원회, 체육친교위원회", + position: "청년 디렉터, 전도위원회, 선교위원회, 체육친교위원회", tabType: "minister", officerType: "associate", greeting: "주님께서 맡겨주신 교회를 사랑하고, 보배로운 청년들을 주님의 마음으로 섬기겠습니다.", @@ -35,7 +35,7 @@ const ministerProfiles = [ name: "김규보", description: "", image: "/images/leader/gyu-bo.png", - position: "상담사역 (총신대 상담학 교수)", + position: "목양위원회, 상담사역 (총신대 상담학 교수)", tabType: "minister", officerType: "associate", greeting: "오직 하나님의 영광만 드러나기를 소망합니다.", @@ -44,7 +44,7 @@ const ministerProfiles = [ name: "박매실", description: "", image: "/images/leader/mae-sil.png", - position: "교구, 신혼부부, 차량위원회", + position: "교구, 차량위원회", tabType: "minister", officerType: "evangelist", greeting: @@ -54,7 +54,7 @@ const ministerProfiles = [ name: "이능옥", image: "/images/leader/neung-oak.png", description: "", - position: "시니어 아카데미, 새가족위원회", + position: "시니어 아카데미, 새가족위원회, 사회복지위원회", tabType: "minister", officerType: "evangelist", greeting: "진실한 사랑은 예수님 안에서 이루어지는 사랑입니다.", @@ -72,7 +72,7 @@ const ministerProfiles = [ name: "장은경", description: "", image: "/images/leader/eun-kyung.png", - position: "영아부, 엄마QT학교", + position: "영아부, 엄마QT학교, 가정사역위원회", tabType: "minister", officerType: "evangelist", greeting: "오직 예수님 안에 머무는 다음세대, 영아부를 최선을 다해 섬기겠습니다.", diff --git a/apps/client/src/components/about/leadership/profileList.tsx b/apps/client/src/components/about/leadership/profileList.tsx index edc7c6fa..fc54ec4b 100644 --- a/apps/client/src/components/about/leadership/profileList.tsx +++ b/apps/client/src/components/about/leadership/profileList.tsx @@ -22,7 +22,7 @@ const staffProfiles = [ name: "표명성", description: "", image: "/images/leader/myung-seong.png", - position: "2교구, 1청년부, 예배위원회, 찬양위원회", + position: "2교구", tabType: "minister", officerType: "associate", greeting: "하나님과 성도들 앞에서 진중하지만, 늘 유쾌한 목회자가 되고 싶은 표명성 목사입니다.", @@ -31,7 +31,7 @@ const staffProfiles = [ name: "이현준", description: "", image: "/images/leader/hyun-jun.png", - position: "청년부, 미디어위원회, 체육친교위원회", + position: "청년부", tabType: "minister", officerType: "associate", greeting: @@ -41,7 +41,7 @@ const staffProfiles = [ name: "장건진", description: "", image: "/images/leader/geon-jin.png", - position: "유초등부, 사회복지위원회", + position: "유초등부", tabType: "minister", officerType: "associate", greeting: @@ -60,7 +60,7 @@ const staffProfiles = [ name: "박매실", description: "", image: "/images/leader/mae-sil.png", - position: "1교구, 신혼부부, 차량위원회", + position: "1교구", tabType: "minister", officerType: "evangelist", greeting: @@ -70,7 +70,7 @@ const staffProfiles = [ name: "이능옥", image: "/images/leader/neung-oak.png", description: "", - position: "2교구, 실버구역, 새가족부, 새가족위원회", + position: "2교구, 실버구역, 새가족부", tabType: "minister", officerType: "evangelist", greeting: "진실한 사랑은 예수님 안에서 이루어지는 사랑입니다.", @@ -79,20 +79,11 @@ const staffProfiles = [ name: "순현주", description: "", image: "/images/leader/hyun-ju.png", - position: "유치부, 교육디렉터, 교육위원회", + position: "유치부, 교육디렉터", tabType: "minister", officerType: "evangelist", greeting: "하나님을 경외하는 다음세대를 세우는 일에 온 마음을 다하겠습니다.", }, - { - name: "김화선", - description: "", - image: "/images/leader/hwa-seon.png", - position: "영아부, 엄마QT학교", - tabType: "minister", - officerType: "evangelist", - greeting: "오직 예수님 안에 머무는 다음세대, 영아부를 최선을 다해 섬기겠습니다.", - }, { name: "김종란", image: "/images/missionary/kim_jl.png", @@ -180,122 +171,119 @@ const staffProfiles = [ { name: "김용출", image: "/images/elder/kim_yc.png", - position: "협력위원회 위원장", - tabType: "elder", - officerType: "elder", + tabType: "retiredElder", + officerType: "retiredElder", }, { name: "오태희", image: "/images/elder/oh_th.png", - position: "교회발전위원회 위원장", tabType: "elder", + position: "소통위원회", officerType: "elder", }, { name: "최정만", image: "/images/elder/choi_jm.png", - position: "", + position: "소통위원회", tabType: "elder", officerType: "elder", }, { name: "박광재", image: "/images/elder/park_gj.png", - position: "재정위원회 위원장", tabType: "elder", + position: "재정위원회, 목양위원회", officerType: "elder", }, { name: "최형돈", image: "/images/elder/choi_hd.png", - position: "선교위원회 위원장", - tabType: "elder", - officerType: "elder", - }, - { - name: "이수만", - image: "/images/elder/lee_sm.png", - position: "찬양위원회 위원장", + position: "목양위원회", tabType: "elder", officerType: "elder", }, + // { + // name: "이수만", + // image: "/images/elder/lee_sm.png", + // position: "찬양위원회 위원장", + // tabType: "elder", + // officerType: "elder", + // }, { name: "이관용", image: "/images/elder/lee_gy.png", - position: "새가족위원회 위원장", tabType: "elder", + position: "목양위원회", officerType: "elder", }, { name: "이병곤", image: "/images/elder/lee_bg.png", - position: "예배위원회 위원장", tabType: "elder", officerType: "elder", }, { name: "박종균", image: "/images/elder/park_jg.png", - position: "사회복지위원회 위원장", - tabType: "elder", - officerType: "elder", - }, - { - name: "구유택", - image: "/images/elder/koo_yt.png", - position: "목양위원회 위원장", - tabType: "elder", - officerType: "elder", - }, - { - name: "김회국", - image: "/images/elder/kim_hg.png", - position: "차량위원회 위원장", tabType: "elder", + position: "목양위원회", officerType: "elder", }, + // { + // name: "구유택", + // image: "/images/elder/koo_yt.png", + // position: "목양위원회 위원장", + // tabType: "elder", + // officerType: "elder", + // }, + // { + // name: "김회국", + // image: "/images/elder/kim_hg.png", + // position: "차량위원회 위원장", + // tabType: "elder", + // officerType: "elder", + // }, { name: "조윤형", image: "/images/elder/jo_yh.png", - position: "시설위원회 위원장", tabType: "elder", + position: "목양위원회", officerType: "elder", }, { name: "최균섭", image: "/images/elder/choi_gs.png", - position: "전도위원회 위원장", tabType: "elder", + position: "목양위원회", officerType: "elder", }, { name: "이중관", image: "/images/elder/lee_jg.png", - position: "미디어위원회 위원장", tabType: "elder", + position: "소통위원회", officerType: "elder", }, { name: "송순섭", image: "/images/elder/song_ss.png", - position: "장례,혼인위원회 위원장", tabType: "elder", officerType: "elder", }, { name: "박종일 ", image: "/images/elder/park_ji.png", - position: "교육위원회 위원장", tabType: "elder", + position: "소통위원회", officerType: "elder", }, - { - name: "정성환", - image: "/images/elder/jung_sh.png", - position: "체육,친교위원회 위원장", - tabType: "elder", - officerType: "otherElder", - }, + // { + // name: "정성환", + // image: "/images/elder/jung_sh.png", + // position: "체육,친교위원회 위원장", + // tabType: "elder", + // officerType: "otherElder", + // }, { name: "조동욱", image: "/images/elder/jo_dw1.png", @@ -308,7 +296,7 @@ const staffProfiles = [ image: "/images/elder/jo_mh.png", position: "시설관리", tabType: "staff", - officerType: "elder", + officerType: "manager", }, { name: "김해봄", diff --git a/apps/client/src/components/home/banner/index.tsx b/apps/client/src/components/home/banner/index.tsx index fc076547..5fcfacd5 100644 --- a/apps/client/src/components/home/banner/index.tsx +++ b/apps/client/src/components/home/banner/index.tsx @@ -60,15 +60,15 @@ const HomeBanner = () => { return (
- banner + banner
-
+

- 보라 + 일어나라
- 내가 반드시 길을 내리라 + 빛을 발하라

-

이사야 43:19

+

이사야 60:1

{
{currentBanner === HomeBannerEnum.Live && ( - + )} {currentBanner === HomeBannerEnum.Bible && ( { image="bible" />
- +
{

직분

-
+
{menus.map((menu) => (
push(menu.path)} diff --git a/apps/client/src/constants/innerMenus/about.ts b/apps/client/src/constants/innerMenus/about.ts index dfd039f7..4f0107ff 100644 --- a/apps/client/src/constants/innerMenus/about.ts +++ b/apps/client/src/constants/innerMenus/about.ts @@ -42,6 +42,7 @@ export const officerTypeMap: Record = { otherElder: "협동장로", deacon: "집사", staff: "간사", + manager: "관리장", }; export const aboutHistoryMenus: IInnerMenu[] = [ diff --git a/apps/client/src/constants/innerMenus/types.ts b/apps/client/src/constants/innerMenus/types.ts index be127ac5..d0702b2f 100644 --- a/apps/client/src/constants/innerMenus/types.ts +++ b/apps/client/src/constants/innerMenus/types.ts @@ -8,6 +8,7 @@ export type OfficerLabel = | "retiredElder" | "otherElder" | "deacon" + | "manager" | "staff"; export interface IInnerMenu { diff --git a/apps/client/src/pages/about/directions.tsx b/apps/client/src/pages/about/directions.tsx index 9e1eeb75..985b9bba 100644 --- a/apps/client/src/pages/about/directions.tsx +++ b/apps/client/src/pages/about/directions.tsx @@ -7,7 +7,7 @@ const AboutDirectionsPage = () => { { { { { { { - return ( - - -
-
- intro -
-
-

- 보라! -
- 내가 반드시 길을 내리라! -

-

명문교회에 오신 것을 환영합니다.

-

{"자세히 보기 >"}

-
-
- -
- {menuList.map((menu) => ( -
-
-
- {menu.title} -
-
-

{menu.title}

-
- ))} -
-
- ); -}; - -export default AboutMainPage; diff --git a/apps/client/src/pages/discipleship/faith/bibleReading/[id].tsx b/apps/client/src/pages/discipleship/faith/bibleReading/[id].tsx index dbbbb89d..2292398d 100644 --- a/apps/client/src/pages/discipleship/faith/bibleReading/[id].tsx +++ b/apps/client/src/pages/discipleship/faith/bibleReading/[id].tsx @@ -25,7 +25,7 @@ const DiscipleshipFaithReadingDetailContent = () => { diff --git a/apps/client/src/pages/discipleship/faith/bibleReading/index.tsx b/apps/client/src/pages/discipleship/faith/bibleReading/index.tsx index f6ccc64a..ad810bd6 100644 --- a/apps/client/src/pages/discipleship/faith/bibleReading/index.tsx +++ b/apps/client/src/pages/discipleship/faith/bibleReading/index.tsx @@ -26,7 +26,7 @@ const DiscipleshipFaithReadingContent = () => { diff --git a/apps/client/src/pages/discipleship/faith/panorama.tsx b/apps/client/src/pages/discipleship/faith/panorama.tsx index 836cee8a..aee1ab97 100644 --- a/apps/client/src/pages/discipleship/faith/panorama.tsx +++ b/apps/client/src/pages/discipleship/faith/panorama.tsx @@ -26,7 +26,7 @@ const DiscipleshipFaithPanorama = () => { diff --git a/apps/client/src/pages/discipleship/faith/qt.tsx b/apps/client/src/pages/discipleship/faith/qt.tsx index c122a1d9..b1cc93bc 100644 --- a/apps/client/src/pages/discipleship/faith/qt.tsx +++ b/apps/client/src/pages/discipleship/faith/qt.tsx @@ -26,7 +26,7 @@ const DiscipleshipFaithQt = () => { diff --git a/apps/client/src/pages/discipleship/faith/reading.tsx b/apps/client/src/pages/discipleship/faith/reading.tsx index f9adf79a..c1ab8861 100644 --- a/apps/client/src/pages/discipleship/faith/reading.tsx +++ b/apps/client/src/pages/discipleship/faith/reading.tsx @@ -26,7 +26,7 @@ const DiscipleshipFaithReadingContent = () => { diff --git a/apps/client/src/pages/discipleship/homeworship/index.tsx b/apps/client/src/pages/discipleship/homeworship/index.tsx index 9228b2ef..c52f12bf 100644 --- a/apps/client/src/pages/discipleship/homeworship/index.tsx +++ b/apps/client/src/pages/discipleship/homeworship/index.tsx @@ -39,7 +39,7 @@ const HomeworshipMain = () => {
diff --git a/apps/client/src/pages/discipleship/newFamilly.tsx b/apps/client/src/pages/discipleship/newFamilly.tsx index 5383773c..fbe7dbf4 100644 --- a/apps/client/src/pages/discipleship/newFamilly.tsx +++ b/apps/client/src/pages/discipleship/newFamilly.tsx @@ -25,7 +25,7 @@ const DiscipleshipNewFamilly = () => { diff --git a/apps/client/src/pages/discipleship/training/3040.tsx b/apps/client/src/pages/discipleship/training/3040.tsx index 79aa1abe..ff2594b2 100644 --- a/apps/client/src/pages/discipleship/training/3040.tsx +++ b/apps/client/src/pages/discipleship/training/3040.tsx @@ -26,7 +26,7 @@ const DiscipleshipTraining3040Content = () => { diff --git a/apps/client/src/pages/discipleship/training/newlyweds.tsx b/apps/client/src/pages/discipleship/training/newlyweds.tsx index 474b5531..6a975f35 100644 --- a/apps/client/src/pages/discipleship/training/newlyweds.tsx +++ b/apps/client/src/pages/discipleship/training/newlyweds.tsx @@ -26,7 +26,7 @@ const DiscipleshipTrainingNewlywedsContent = () => { diff --git a/apps/client/src/pages/discipleship/training/senior.tsx b/apps/client/src/pages/discipleship/training/senior.tsx index fc0ae1d5..69262d85 100644 --- a/apps/client/src/pages/discipleship/training/senior.tsx +++ b/apps/client/src/pages/discipleship/training/senior.tsx @@ -26,7 +26,7 @@ const DiscipleshipTrainingSeniorContent = () => { diff --git a/apps/client/src/pages/education/elementary.tsx b/apps/client/src/pages/education/elementary.tsx index 676cef20..d6acc2b6 100644 --- a/apps/client/src/pages/education/elementary.tsx +++ b/apps/client/src/pages/education/elementary.tsx @@ -9,7 +9,7 @@ const EducationElementaryPage = () => { diff --git a/apps/client/src/pages/education/high.tsx b/apps/client/src/pages/education/high.tsx index 36e24d5d..ce9ed243 100644 --- a/apps/client/src/pages/education/high.tsx +++ b/apps/client/src/pages/education/high.tsx @@ -9,7 +9,7 @@ const EducationHighPage = () => { diff --git a/apps/client/src/pages/education/index.tsx b/apps/client/src/pages/education/index.tsx index 2513c447..267383e1 100644 --- a/apps/client/src/pages/education/index.tsx +++ b/apps/client/src/pages/education/index.tsx @@ -9,7 +9,9 @@ import { Icon } from "ui"; const EducationMenuTitle = () => { return (
-

다음세대

+

+ 다음세대 +

{/* FIXME: 앨범 넘어가야 함 */}
); @@ -28,7 +35,7 @@ const EducationPage = () => { diff --git a/apps/client/src/pages/education/infants.tsx b/apps/client/src/pages/education/infants.tsx index 7e7f7170..13f8cf30 100644 --- a/apps/client/src/pages/education/infants.tsx +++ b/apps/client/src/pages/education/infants.tsx @@ -6,7 +6,7 @@ import { educationInfantsMenus, educationInnerMenus } from "@/constants/innerMen const EducationInfantsPage = () => { return ( - +
diff --git a/apps/client/src/pages/education/middle.tsx b/apps/client/src/pages/education/middle.tsx index 29005d17..a110ecac 100644 --- a/apps/client/src/pages/education/middle.tsx +++ b/apps/client/src/pages/education/middle.tsx @@ -7,7 +7,7 @@ const EducationMiddlePage = () => { { { { diff --git a/apps/client/src/pages/news/photos.tsx b/apps/client/src/pages/news/photos.tsx index 234c53f2..4b552cad 100644 --- a/apps/client/src/pages/news/photos.tsx +++ b/apps/client/src/pages/news/photos.tsx @@ -7,7 +7,7 @@ const PhotosPage = () => { { diff --git a/apps/client/src/pages/policy/index.tsx b/apps/client/src/pages/policy/index.tsx index 736e0dad..8d063972 100644 --- a/apps/client/src/pages/policy/index.tsx +++ b/apps/client/src/pages/policy/index.tsx @@ -7,7 +7,7 @@ const PolicyPage = () => { diff --git a/apps/client/src/pages/sermons/friday.tsx b/apps/client/src/pages/sermons/friday.tsx index 8c3b49e9..cd966422 100644 --- a/apps/client/src/pages/sermons/friday.tsx +++ b/apps/client/src/pages/sermons/friday.tsx @@ -14,7 +14,7 @@ const SermonsFridayPage = () => { { { diff --git a/apps/client/src/pages/sermons/wednesday.tsx b/apps/client/src/pages/sermons/wednesday.tsx index f212ad48..e31df683 100644 --- a/apps/client/src/pages/sermons/wednesday.tsx +++ b/apps/client/src/pages/sermons/wednesday.tsx @@ -13,7 +13,7 @@ const SermonsWednesdayPage = () => { { {
push("/")} - src="/images/LogoBlue.png" - className="ui-cursor-pointer ui-w-[115px] ui-h-[34px]" + src="/images/logo-2026.png" + className="ui-cursor-pointer ui-w-[115px] ui-h-[35px]" alt="myungmoon" />
-
+