{ansPstn > 0 && (
>(new Map());
+ const [tableSort, setTableSort] = useState("");
const [postParams, setPostParams] = useState({
keywordType: "title",
keyword: "",
@@ -77,12 +78,14 @@ function PostPage({ bbsId }: { bbsId: string }) {
isLoading,
refetch,
} = useQuery({
- queryKey: [ENDPOINT.BOARD_SERVICE.POSTS_USER, bbsId, pagination],
+ queryKey: [ENDPOINT.BOARD_SERVICE.POSTS_USER, bbsId, pagination, tableSort],
queryFn: () =>
PostApi.getPostList(parseInt(bbsId), {
...postParams,
+ ansUseYn: bbsInfo?.ansUseYn,
page: pagination.pageIndex,
size: pagination.pageSize,
+ sort: tableSort,
}),
});
@@ -200,6 +203,24 @@ function PostPage({ bbsId }: { bbsId: string }) {
))}
+
diff --git a/apps/common/features/src/widgets/post/ui/post.tsx b/apps/common/features/src/widgets/post/ui/post.tsx
index bd8db7c21..8033938cf 100644
--- a/apps/common/features/src/widgets/post/ui/post.tsx
+++ b/apps/common/features/src/widgets/post/ui/post.tsx
@@ -125,7 +125,7 @@ function Post({ bbsId, pstNo }: { bbsId: string; pstNo: string }) {
return (
<>
-
diff --git a/apps/common/features/src/widgets/post/ui/post-action.tsx b/apps/common/features/src/widgets/post/ui/post-action.tsx
index 4eaa960cb..afc614bc1 100644
--- a/apps/common/features/src/widgets/post/ui/post-action.tsx
+++ b/apps/common/features/src/widgets/post/ui/post-action.tsx
@@ -1,22 +1,25 @@
import { useRouter, usePathname } from "next/navigation";
import { useConfirm } from "@frontend-opensource/use-react-hooks";
import { Button } from "@common/components";
+import { AuthorityButton } from "@/entities/menu-authority";
import { useMenuStore, useUserStore } from "@/shared/lib";
type PostActionProps = {
- bbsId: string;
- pstNo: string;
+ registerId?: string;
children: React.ReactNode;
handleDelete: () => Promise;
};
-function PostAction({ children, handleDelete }: PostActionProps) {
+function PostAction({ registerId, children, handleDelete }: PostActionProps) {
const router = useRouter();
const pathname = usePathname();
const { confirm } = useConfirm();
const bbsInfo = useMenuStore((state) => state.bbsInfo);
const userInfo = useUserStore((state) => state.userInfo);
+ const actionButtonAuthrt =
+ userInfo?.adminRoleYn === "Y" || userInfo?.userUnqId === registerId;
+
const onDelete = async () => {
if (await confirm("삭제하시겠습니까?")) handleDelete();
};
@@ -46,15 +49,19 @@ function PostAction({ children, handleDelete }: PostActionProps) {
>
목록
-
+ {actionButtonAuthrt && (
+ router.push(`${pathname}/modify`)}
+ >
+ 수정
+
+ )}
{bbsInfo?.ansUseYn === "Y" && (
-
+
+ )}
+ {actionButtonAuthrt && (
+
+ 삭제
+
)}
-
);
diff --git a/apps/common/features/src/widgets/post/ui/post-page.tsx b/apps/common/features/src/widgets/post/ui/post-page.tsx
index f53af0ee8..5a459835f 100644
--- a/apps/common/features/src/widgets/post/ui/post-page.tsx
+++ b/apps/common/features/src/widgets/post/ui/post-page.tsx
@@ -42,6 +42,7 @@ function PostPage({ bbsId }: { bbsId: string }) {
const { bbsInfo, pageMenuAuthority } = useMenuStore((state) => state);
const thumbRefs = useRef
{postData?.pstTtl}
diff --git a/apps/cs/app/(with-base-layout)/apilog/page.tsx b/apps/cs/app/(with-base-layout)/apilog/page.tsx
new file mode 100644
index 000000000..374ebf4ae
--- /dev/null
+++ b/apps/cs/app/(with-base-layout)/apilog/page.tsx
@@ -0,0 +1,2 @@
+import { ApiLogPage } from "@/pages/apilog";
+export default ApiLogPage;
diff --git a/apps/cs/app/(with-base-layout)/privacylog/page.tsx b/apps/cs/app/(with-base-layout)/privacylog/page.tsx
new file mode 100644
index 000000000..4b543f360
--- /dev/null
+++ b/apps/cs/app/(with-base-layout)/privacylog/page.tsx
@@ -0,0 +1,2 @@
+import { PrivacyLogPage } from "@/pages/privacylog";
+export default PrivacyLogPage;
diff --git a/apps/cs/app/api/auth/logout/route.ts b/apps/cs/app/api/auth/logout/route.ts
new file mode 100644
index 000000000..fdcc9df7c
--- /dev/null
+++ b/apps/cs/app/api/auth/logout/route.ts
@@ -0,0 +1,17 @@
+import { cookies } from "next/headers";
+import { NextResponse } from "next/server";
+import {
+ ACCESS_TOKEN,
+ AUTH_USER_ID,
+ CLAIM_NAME,
+ REFRESH_TOKEN,
+} from "@/shared/config";
+
+export async function POST() {
+ const cookieStore = await cookies();
+ cookieStore.delete(ACCESS_TOKEN);
+ cookieStore.delete(REFRESH_TOKEN);
+ cookieStore.delete(AUTH_USER_ID);
+ cookieStore.delete(CLAIM_NAME);
+ return NextResponse.json({ message: "Logged out" }, { status: 200 });
+}
diff --git a/apps/cs/app/api/getClientIp/route.ts b/apps/cs/app/api/getClientIp/route.ts
deleted file mode 100644
index ec9ff72d5..000000000
--- a/apps/cs/app/api/getClientIp/route.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-
-export async function GET(request: NextRequest) {
- const ipAddress =
- request.headers.get("x-forwarded-for")?.split(",")[0] || "unknown";
-
- const ipv4Regex = /^::ffff:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/;
- const match = ipAddress.match(ipv4Regex);
-
- const normalizedIp = match ? match[1] : ipAddress;
-
- return NextResponse.json({
- originalIp: ipAddress,
- normalizedIp: normalizedIp,
- });
-}
diff --git a/apps/cs/middleware.ts b/apps/cs/middleware.ts
index 6bdfd9545..61d38c071 100644
--- a/apps/cs/middleware.ts
+++ b/apps/cs/middleware.ts
@@ -7,11 +7,16 @@ const serverApiUrl =
export function middleware(req: NextRequest) {
const pathname = req.nextUrl.pathname;
const searchParams = req.nextUrl.searchParams;
+
if (pathname.startsWith("/server")) {
- const queryParams = searchParams.toString();
+
+ const decodedParams = Array.from(searchParams.entries())
+ .map(([key, value]) => `${key}=${decodeURIComponent(value)}`)
+ .join("&");
+
const newUrl = `${serverApiUrl}${pathname.replace("/server", "")}${
- queryParams ? `?${queryParams}` : ""
+ decodedParams ? `?${decodedParams}` : ""
}`;
return NextResponse.rewrite(new URL(newUrl));
}
diff --git a/apps/cs/next.config.ts b/apps/cs/next.config.ts
index 3b3038b09..ad1ec7949 100644
--- a/apps/cs/next.config.ts
+++ b/apps/cs/next.config.ts
@@ -15,15 +15,15 @@ const nextConfig: NextConfig = {
{
type: "header",
key: "referer",
- value: "(.*)/pst(.*)",
+ value: "(.*)/cms(.*)",
},
],
},
],
afterFiles: [
{
- source: "/pst/:path*",
- destination: `${subDomain}/pst/:path*`,
+ source: "/cms/:path*",
+ destination: `${subDomain}/cms/:path*`,
},
],
fallback: [],
diff --git a/apps/cs/src/entities/apilog/api/apilog-service.ts b/apps/cs/src/entities/apilog/api/apilog-service.ts
new file mode 100644
index 000000000..d7167950c
--- /dev/null
+++ b/apps/cs/src/entities/apilog/api/apilog-service.ts
@@ -0,0 +1,20 @@
+import { client } from "@/shared/api";
+import { ENDPOINT } from "@/shared/config";
+import type {
+ ApiLogList,
+ ApiLogParams,
+ ApiLogService,
+} from "../model/apilog-interface";
+
+export class ApiLogApiService implements ApiLogService {
+ public async getApiLogList(params: ApiLogParams): Promise {
+ const response = await client.get(
+ `${ENDPOINT.USER_SERVICE.APILOG}`,
+ { params },
+ );
+ return response.data;
+ }
+
+}
+
+export const ApiLogApi = new ApiLogApiService();
diff --git a/apps/cs/src/entities/apilog/index.ts b/apps/cs/src/entities/apilog/index.ts
new file mode 100644
index 000000000..38733364f
--- /dev/null
+++ b/apps/cs/src/entities/apilog/index.ts
@@ -0,0 +1,6 @@
+export { ApiLogApi } from "./api/apilog-service";
+export type {
+ ApiLog,
+ ApiLogParams,
+} from "./model/apilog-interface";
+
diff --git a/apps/cs/src/entities/apilog/model/apilog-interface.ts b/apps/cs/src/entities/apilog/model/apilog-interface.ts
new file mode 100644
index 000000000..f00e583ad
--- /dev/null
+++ b/apps/cs/src/entities/apilog/model/apilog-interface.ts
@@ -0,0 +1,30 @@
+import type { PageableList, PageableParams } from "@/shared/model";
+
+export interface ApiLogParams extends PageableParams {
+ siteId?: string;
+ userId?: string;
+ userNm?: string;
+ apiHttpPmhd?: string;
+ dmndUrl?: string;
+ ipAddr?: string;
+ dmndDtStart?: string;
+ dmndDtEnd?: string;
+}
+
+export interface ApiLog {
+ logId: string;
+ siteId: string;
+ siteNm: string;
+ userId: string;
+ userNm: string;
+ apiHttpPmhd: string;
+ dmndUrl: string;
+ ipAddr: string;
+ dmndDt: string;
+}
+
+export type ApiLogList = PageableList;
+
+export interface ApiLogService {
+ getApiLogList: (params: ApiLogParams) => Promise;
+}
diff --git a/apps/cs/src/entities/board/model/board-interface.ts b/apps/cs/src/entities/board/model/board-interface.ts
index 60ed9f743..8b7859223 100644
--- a/apps/cs/src/entities/board/model/board-interface.ts
+++ b/apps/cs/src/entities/board/model/board-interface.ts
@@ -56,6 +56,7 @@ export interface Board {
popupUseYn: string;
delYn: string;
useYn: string;
+ prvcIndctYn: string;
mdfcnDt: string;
mdfrNm: string;
}
@@ -81,6 +82,7 @@ export const boardFormSchema = z.object({
pstgPrdUseYn: z.string(),
popupUseYn: z.string(),
useYn: z.string(),
+ prvcIndctYn: z.string(),
});
export type BoardList = PageableList;
diff --git a/apps/cs/src/entities/group-user/model/group-user-interface.ts b/apps/cs/src/entities/group-user/model/group-user-interface.ts
index 38daf6fe0..8935bfacc 100644
--- a/apps/cs/src/entities/group-user/model/group-user-interface.ts
+++ b/apps/cs/src/entities/group-user/model/group-user-interface.ts
@@ -10,6 +10,7 @@ export interface GroupUserListResponseDto {
mode: string;
groupId: string;
userUnqId: string;
+ userId: string;
userName: string;
ogdpSeCd: string;
ogdpSeNm: string;
diff --git a/apps/cs/src/entities/ip/index.ts b/apps/cs/src/entities/ip/index.ts
index ef1c5be33..2d244138d 100644
--- a/apps/cs/src/entities/ip/index.ts
+++ b/apps/cs/src/entities/ip/index.ts
@@ -7,4 +7,3 @@ export {
type IpList,
type IP,
} from "./model/ip-interface";
-export { ClientIpGuard } from "./lib/client-ip-guard";
diff --git a/apps/cs/src/entities/ip/lib/client-ip-guard.tsx b/apps/cs/src/entities/ip/lib/client-ip-guard.tsx
deleted file mode 100644
index f3ae452ce..000000000
--- a/apps/cs/src/entities/ip/lib/client-ip-guard.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useEffect, useState } from "react";
-import { useQueryClient } from "@tanstack/react-query";
-import { SiteApi } from "@/entities/site/@x/ip";
-import { ENDPOINT, SITE_ID } from "@/shared/config";
-import { IpApi } from "../api/ip-service";
-
-type ClientIpResponse = {
- originalIp: string;
- normalizedIp: string;
-};
-
-const ClientIpGuard = ({ children }: { children: React.ReactNode }) => {
- const queryClient = useQueryClient();
- const [isAllowed, setIsAllowed] = useState(true);
-
- useEffect(() => {
- (async () => {
- const response = await fetch("/api/getClientIp");
- const { normalizedIp } = (await response.json()) as ClientIpResponse;
-
- if (!normalizedIp || !SITE_ID) return;
-
- const siteInfo = await queryClient.ensureQueryData({
- queryKey: [ENDPOINT.CMS_SERVICE.SITES, SITE_ID],
- queryFn: () => SiteApi.siteDetail(SITE_ID),
- });
-
- if (siteInfo.siteKndCd === "O") return;
-
- const { content: ipList } = await IpApi.getIpList({
- siteId: SITE_ID,
- prmYn: "Y",
- });
-
- const allowedClientIp = ipList.some((ip) => ip.ipAddr === normalizedIp);
- setIsAllowed(allowedClientIp);
- })();
- }, []);
-
- if (!isAllowed) {
- alert("허용되지 않은 IP로 접근하였습니다.");
- return <>;
- }
-
- return <>{children};
-};
-
-export { ClientIpGuard };
diff --git a/apps/cs/src/entities/loginlog/api/loginlog-service.ts b/apps/cs/src/entities/loginlog/api/loginlog-service.ts
index c115aebcb..17cb2ea01 100644
--- a/apps/cs/src/entities/loginlog/api/loginlog-service.ts
+++ b/apps/cs/src/entities/loginlog/api/loginlog-service.ts
@@ -1,7 +1,6 @@
import { client } from "@/shared/api";
import { ENDPOINT } from "@/shared/config";
import type {
- LoginlogInfo,
LoginlogList,
LoginlogParams,
LoginlogService,
@@ -16,12 +15,6 @@ export class LoginlogApiService implements LoginlogService {
return response.data;
}
- public async getLoginlogInfo(lgnSn: string): Promise {
- const response = await client.get(
- `${ENDPOINT.USER_SERVICE.LOGINLOG}/${lgnSn}`,
- );
- return response.data;
- }
}
export const LoginlogApi = new LoginlogApiService();
diff --git a/apps/cs/src/entities/loginlog/index.ts b/apps/cs/src/entities/loginlog/index.ts
index 72032d92d..d03672226 100644
--- a/apps/cs/src/entities/loginlog/index.ts
+++ b/apps/cs/src/entities/loginlog/index.ts
@@ -1,5 +1,6 @@
-export { LoginlogApiService } from "./api/loginlog-service";
+export { LoginlogApi } from "./api/loginlog-service";
export type {
Loginlog,
LoginlogParams,
} from "./model/loginlog-interface";
+
diff --git a/apps/cs/src/entities/loginlog/model/loginlog-interface.ts b/apps/cs/src/entities/loginlog/model/loginlog-interface.ts
index 850b6ce5d..f35fe2444 100644
--- a/apps/cs/src/entities/loginlog/model/loginlog-interface.ts
+++ b/apps/cs/src/entities/loginlog/model/loginlog-interface.ts
@@ -1,37 +1,29 @@
import type { PageableList, PageableParams } from "@/shared/model";
export interface LoginlogParams extends PageableParams {
- lgnSn?: string;
- userId?: string;
siteId?: string;
+ userId?: string;
+ errOcrnYn?: string;
+ remoteIp?: string;
+ lgnMthd?: string;
+ lgnErrCd?: string;
+ searchDateFrom?: string;
+ searchDateTo?: string;
}
export interface Loginlog {
- lgnSn: string;
- lgnDt: string;
- userId: string;
- lgnIp: string;
- lgnMethodCd: string;
- errOcrnYn: string;
- lgnErrCd: string;
+ id: string;
siteId: string;
-}
-
-export interface LoginlogInfo {
- lgnSn: string;
- lgnDt: string;
userId: string;
- lgnIp: string;
- lgnMethodCd: string;
errOcrnYn: string;
+ remoteIp: string;
+ lgnMthd: string;
lgnErrCd: string;
- siteId: string;
+ lgnDt: string;
}
export type LoginlogList = PageableList;
export interface LoginlogService {
- getLoginlogList: (params: LoginlogParams) => Promise;
- getLoginlogInfo: (lgnSn: string) => Promise;
-
+ getLoginlogList: (params: LoginlogParams) => Promise;
}
diff --git a/apps/cs/src/entities/menu/lib/menu-wrapper.tsx b/apps/cs/src/entities/menu/lib/menu-wrapper.tsx
index 7ecf2e6dd..1f1080cac 100644
--- a/apps/cs/src/entities/menu/lib/menu-wrapper.tsx
+++ b/apps/cs/src/entities/menu/lib/menu-wrapper.tsx
@@ -43,7 +43,7 @@ const MenuWrapper = ({ children }: { children: React.ReactNode }) => {
const response = await getPageMenuAuthority();
if (response?.length) setPageMenuAuthority(response[0]!);
})();
- }, []);
+ }, [pathname]);
useEffect(() => {
if (!pageMenuAuthority) return;
diff --git a/apps/cs/src/entities/post/model/post-interface.ts b/apps/cs/src/entities/post/model/post-interface.ts
index 86e27afd5..783053dd7 100644
--- a/apps/cs/src/entities/post/model/post-interface.ts
+++ b/apps/cs/src/entities/post/model/post-interface.ts
@@ -9,6 +9,7 @@ export interface PostParams extends PageableParams {
prdPstgYn?: string;
siteId?: string;
bbsTypeCd?: string;
+ ansUseYn?: string;
}
export interface RecentPostParams extends PageableParams {
diff --git a/apps/cs/src/entities/privacylog/api/privacylog-service.ts b/apps/cs/src/entities/privacylog/api/privacylog-service.ts
new file mode 100644
index 000000000..4082af038
--- /dev/null
+++ b/apps/cs/src/entities/privacylog/api/privacylog-service.ts
@@ -0,0 +1,20 @@
+import { client } from "@/shared/api";
+import { ENDPOINT } from "@/shared/config";
+import type {
+ PrivacyLogList,
+ PrivacyLogParams,
+ PrivacyLogService,
+} from "../model/privacylog-interface";
+
+export class PrivacyLogPrivacyService implements PrivacyLogService {
+ public async getPrivacyLogList(params: PrivacyLogParams): Promise {
+ const response = await client.get(
+ `${ENDPOINT.USER_SERVICE.PRIVACYLOG}`,
+ { params },
+ );
+ return response.data;
+ }
+
+}
+
+export const PrivacyLogPrivacy = new PrivacyLogPrivacyService();
diff --git a/apps/cs/src/entities/privacylog/index.ts b/apps/cs/src/entities/privacylog/index.ts
new file mode 100644
index 000000000..8f0898922
--- /dev/null
+++ b/apps/cs/src/entities/privacylog/index.ts
@@ -0,0 +1,6 @@
+export { PrivacyLogPrivacy } from "./api/privacylog-service";
+export type {
+ PrivacyLog,
+ PrivacyLogParams,
+} from "./model/privacylog-interface";
+
diff --git a/apps/cs/src/entities/privacylog/model/privacylog-interface.ts b/apps/cs/src/entities/privacylog/model/privacylog-interface.ts
new file mode 100644
index 000000000..d28388445
--- /dev/null
+++ b/apps/cs/src/entities/privacylog/model/privacylog-interface.ts
@@ -0,0 +1,27 @@
+import type { PageableList, PageableParams } from "@/shared/model";
+
+export interface PrivacyLogParams extends PageableParams {
+ siteId?: string;
+ rqstrIp?: string;
+ inqInfoKeywordType?: string;
+ inqInfoKeyword?: string;
+ inqDtStart?: string;
+ inqDtEnd?: string;
+}
+
+export interface PrivacyLog {
+ inqSn: number;
+ siteId: string;
+ siteNm: string;
+ inqDt: string;
+ rqstrIp: string;
+ rqstrId: string;
+ rqstrNm: string;
+ inqInfoSummary: string;
+}
+
+export type PrivacyLogList = PageableList;
+
+export interface PrivacyLogService {
+ getPrivacyLogList: (params: PrivacyLogParams) => Promise;
+}
diff --git a/apps/cs/src/pages/apilog/index.ts b/apps/cs/src/pages/apilog/index.ts
new file mode 100644
index 000000000..564b8ae8f
--- /dev/null
+++ b/apps/cs/src/pages/apilog/index.ts
@@ -0,0 +1 @@
+export { ApiLogPage } from "./ui/apilog-page";
diff --git a/apps/cs/src/pages/apilog/model/table-columns.tsx b/apps/cs/src/pages/apilog/model/table-columns.tsx
new file mode 100644
index 000000000..554abb544
--- /dev/null
+++ b/apps/cs/src/pages/apilog/model/table-columns.tsx
@@ -0,0 +1,59 @@
+import dayjs from "dayjs";
+import type { ColumnDef } from "@tanstack/react-table";
+import type { ApiLog } from "@/entities/apilog";
+
+
+export const columns: ColumnDef[] = [
+ {
+ id: "no",
+ header: "NO",
+ cell: ({ row, table }) => {
+ const totalRows = table.getRowCount();
+ const { pageIndex, pageSize } = table.getState().pagination;
+ return totalRows - (pageIndex * pageSize + row.index);
+ },
+ },
+ {
+ accessorKey: "dmndDt",
+ header: "요청일시",
+ cell: ({ row }) => {
+ const date = dayjs(row.original.dmndDt);
+ return date.format("YYYY-MM-DD HH:mm:ss");
+ },
+ },
+ {
+ accessorKey: "userId",
+ header: "사용자ID",
+ },
+ {
+ accessorKey: "ipAddr",
+ header: "요청IP",
+ },
+ {
+ accessorKey: "apiHttpPmhd",
+ header: "요청방식",
+ cell: ({ row }) => {
+ const val = row.original.apiHttpPmhd;
+ if (val === "POST") {
+ return "저장";
+ } else if (val === "PUT") {
+ return "수정";
+ } else if (val === "DELETE") {
+ return "삭제";
+ } else if (val === "GET") {
+ return "조회";
+ } else {
+ return "기타";
+ }
+ },
+ },
+ {
+ accessorKey: "dmndUrl",
+ header: "요청URL",
+ },
+ {
+ accessorKey: "siteId",
+ header: "사이트ID",
+ }
+];
+
diff --git a/apps/cs/src/pages/apilog/ui/apilog-page.tsx b/apps/cs/src/pages/apilog/ui/apilog-page.tsx
new file mode 100644
index 000000000..51cc960f3
--- /dev/null
+++ b/apps/cs/src/pages/apilog/ui/apilog-page.tsx
@@ -0,0 +1,209 @@
+"use client";
+
+import dayjs from "dayjs";
+import { useState } from "react";
+import { keepPreviousData, useQuery } from "@tanstack/react-query";
+import { getCoreRowModel, type PaginationState } from "@tanstack/react-table";
+import {
+ Button,
+ DateRangePicker,
+ Input,
+ Label,
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@common/components";
+import { ApiLogApi } from "@/entities/apilog";
+import { type ApiLogParams } from "@/entities/apilog/model/apilog-interface";
+import { useDataTable } from "@/shared/lib";
+import { ENDPOINT } from "@/shared/config";
+import { columns } from "@/pages/apilog/model/table-columns";
+
+type DateRange = {
+ from: Date | undefined;
+ to?: Date | undefined;
+};
+
+function ApiLogPage({}) {
+ // 1주일 전부터 오늘까지 기본 날짜 설정
+ const defaultDateRange: DateRange = {
+ from: dayjs().subtract(7, "day").toDate(),
+ to: dayjs().toDate(),
+ };
+
+ const [dateRange, setDateRange] = useState(defaultDateRange);
+
+ const [pagination, setPagination] = useState({
+ pageIndex: 0,
+ pageSize: 10,
+ });
+
+ const [loginlogPostQuery, setLoginlogPostQuery] = useState({
+ userId: "",
+ siteId: "",
+ apiHttpPmhd: "",
+ dmndUrl: "",
+ ipAddr: "",
+ dmndDtStart: dayjs().subtract(7, "day").format("YYYY-MM-DD"),
+ dmndDtEnd: dayjs().format("YYYY-MM-DD"),
+ sort: "lgnDt,asc",
+ });
+
+ const query = useQuery({
+ queryKey: [ENDPOINT.USER_SERVICE.LOGINLOG, pagination],
+ queryFn: () =>
+ ApiLogApi.getApiLogList({
+ ...loginlogPostQuery,
+ page: pagination.pageIndex,
+ size: pagination.pageSize,
+ }),
+ placeholderData: keepPreviousData,
+ });
+
+ const { tableComponent, tableInstance: table } = useDataTable({
+ query,
+ tableOptions: {
+ columns,
+ state: {
+ pagination,
+ },
+ manualPagination: true,
+ enableMultiRowSelection: true,
+ getCoreRowModel: getCoreRowModel(),
+ onPaginationChange: setPagination,
+ },
+ dataTableOptions: {
+ viewPagination: true,
+ },
+ });
+
+ const handleSubmit = (e: React.FormEvent) => {
+ e.preventDefault();
+ query.refetch();
+ };
+
+ const handleLoginlogParamsChange =
+ (key: keyof ApiLogParams) => (value: unknown) => {
+ setLoginlogPostQuery({ ...loginlogPostQuery, [key]: value });
+ };
+
+ const handlePresetDateRange = (value: string) => {
+ let presetDateRange: DateRange | undefined;
+ switch (value) {
+ case "1W":
+ presetDateRange = {
+ from: dayjs().subtract(7, "day").toDate(),
+ to: dayjs().toDate(),
+ };
+ break;
+ case "1M":
+ presetDateRange = {
+ from: dayjs().subtract(30, "day").toDate(),
+ to: dayjs().toDate(),
+ };
+ break;
+ case "3M":
+ presetDateRange = {
+ from: dayjs().subtract(90, "day").toDate(),
+ to: dayjs().toDate(),
+ };
+ break;
+ default:
+ presetDateRange = undefined;
+ }
+ handleDateRangeChange(presetDateRange);
+ };
+
+ const handleDateRangeChange = (value: DateRange | undefined) => {
+ setDateRange(value || defaultDateRange);
+ setLoginlogPostQuery({
+ ...loginlogPostQuery,
+ dmndDtStart:
+ dayjs(value?.from).format("YYYY-MM-DD") ??
+ dayjs().subtract(7, "day").format("YYYY-MM-DD"),
+ dmndDtEnd:
+ dayjs(value?.to).format("YYYY-MM-DD") ?? dayjs().format("YYYY-MM-DD"),
+ });
+ };
+
+ return (
+
+
+
+
+
+
+
+ 로그인로그 목록
+
+
+
+
+
+ {tableComponent}
+
+
+ );
+}
+
+export { ApiLogPage };
diff --git a/apps/cs/src/pages/bbs/ui/bbs-form.tsx b/apps/cs/src/pages/bbs/ui/bbs-form.tsx
index f0b1d7ea2..3d7482bce 100644
--- a/apps/cs/src/pages/bbs/ui/bbs-form.tsx
+++ b/apps/cs/src/pages/bbs/ui/bbs-form.tsx
@@ -478,6 +478,35 @@ function BbsForm({ form, bbsId, ...props }: BbsFormProps) {
/>
+
+ 개인정보 표시 여부
+
+ (
+
+
+
+
+
+
+
+ )}
+ />
+
+
사용 여부
diff --git a/apps/cs/src/pages/bbs/ui/create-page.tsx b/apps/cs/src/pages/bbs/ui/create-page.tsx
index e5b8b2c21..50a23e57a 100644
--- a/apps/cs/src/pages/bbs/ui/create-page.tsx
+++ b/apps/cs/src/pages/bbs/ui/create-page.tsx
@@ -38,6 +38,7 @@ function CreatePage() {
pstgPrdUseYn: "Y",
popupUseYn: "Y",
useYn: "Y",
+ prvcIndctYn: "Y",
},
});
diff --git a/apps/cs/src/pages/groups/model/group-users-table-columns.tsx b/apps/cs/src/pages/groups/model/group-users-table-columns.tsx
index 8d1054aac..e525ac7ab 100644
--- a/apps/cs/src/pages/groups/model/group-users-table-columns.tsx
+++ b/apps/cs/src/pages/groups/model/group-users-table-columns.tsx
@@ -26,7 +26,7 @@ export const columns: ColumnDef[] = [
enableHiding: false,
},
{
- accessorKey: "groupId",
+ accessorKey: "userId",
header: "사용자ID",
},
{
diff --git a/apps/cs/src/pages/image/ui/image-page.tsx b/apps/cs/src/pages/image/ui/image-page.tsx
index 0128c0462..3515cfbef 100644
--- a/apps/cs/src/pages/image/ui/image-page.tsx
+++ b/apps/cs/src/pages/image/ui/image-page.tsx
@@ -26,7 +26,10 @@ function ImagePage() {
const [rowSelection, setRowSelection] = useState({});
const [postingTargets, setPostingTargets] = useState([]);
- const [imageQuery, setImageQuery] = useState({ keyword: "" });
+ const [imageQuery, setImageQuery] = useState({
+ keyword: "" ,
+ sort:"regDt,desc"
+ });
const [pagination, setPagination] = useState({
pageIndex: 0,
pageSize: 5,
diff --git a/apps/cs/src/pages/loginlog/model/table-columns.tsx b/apps/cs/src/pages/loginlog/model/table-columns.tsx
index dbe19f044..4119e0600 100644
--- a/apps/cs/src/pages/loginlog/model/table-columns.tsx
+++ b/apps/cs/src/pages/loginlog/model/table-columns.tsx
@@ -18,7 +18,7 @@ export const columns: ColumnDef[] = [
header: "등록일",
cell: ({ row }) => {
const date = dayjs(row.original.lgnDt);
- return date.format("YYYY-MM-DD HH24:mi:ss");
+ return date.format("YYYY-MM-DD HH:mm:ss");
},
},
{
@@ -26,24 +26,24 @@ export const columns: ColumnDef[] = [
header: "사용자ID",
},
{
- accessorKey: "로그인IP",
- header: "remoteIp",
+ accessorKey: "remoteIp",
+ header: "로그인IP",
},
{
accessorKey: "lgnMthd",
header: "접속방식",
},
{
- accessorKey: "오류여부",
- header: "errOcrnYn",
+ accessorKey: "errOcrnYn",
+ header: "오류여부",
},
{
- accessorKey: "오류코드",
- header: "lgnErrCd",
+ accessorKey: "lgnErrCd",
+ header: "오류코드",
},
{
- accessorKey: "사이트ID",
- header: "siteId",
+ accessorKey: "siteId",
+ header: "사이트ID",
}
];
diff --git a/apps/cs/src/pages/loginlog/ui/loginlog-page.tsx b/apps/cs/src/pages/loginlog/ui/loginlog-page.tsx
index 598eacee2..1672a5bd8 100644
--- a/apps/cs/src/pages/loginlog/ui/loginlog-page.tsx
+++ b/apps/cs/src/pages/loginlog/ui/loginlog-page.tsx
@@ -1,88 +1,227 @@
"use client";
+import dayjs from "dayjs";
import { useState } from "react";
import { keepPreviousData, useQuery } from "@tanstack/react-query";
+import { getCoreRowModel, type PaginationState } from "@tanstack/react-table";
import {
- getCoreRowModel,
- useReactTable,
- type PaginationState,
-} from "@tanstack/react-table";
-import { Button, DataTable, Input, Label } from "@common/components";
-import { LoginlogApi} from "../../../entities/loginlog/api/loginlog-service";
-import { type LoginlogParams} from "../../../entities/loginlog/model/loginlog-interface";
-
+ Button,
+ DateRangePicker,
+ Input,
+ Label,
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+ LoadingWithImage,
+} from "@common/components";
+import { LoginlogApi } from "@/entities/loginlog";
+import { type LoginlogParams } from "@/entities/loginlog/model/loginlog-interface";
+import { useDataTable } from "@/shared/lib";
import { ENDPOINT } from "@/shared/config";
-import { columns } from "../model/table-columns";
+import { columns } from "@/pages/loginlog/model/table-columns";
-type LoginlogPageProps = {
- lgnSn?: string;
+type DateRange = {
+ from: Date | undefined;
+ to?: Date | undefined;
};
-function LoginlogPage({ }: LoginlogPageProps) {
- const [loginlogQuery, setLoginlogQuery] = useState({
- userId: "",
- siteId: "",
- });
+function LoginlogPage({}) {
+ // 1주일 전부터 오늘까지 기본 날짜 설정
+ const defaultDateRange: DateRange = {
+ from: dayjs().subtract(7, "day").toDate(),
+ to: dayjs().toDate(),
+ };
+
+ const [dateRange, setDateRange] = useState(defaultDateRange);
+ const [isManualLoading, setIsManualLoading] = useState(false);
+
const [pagination, setPagination] = useState({
pageIndex: 0,
pageSize: 10,
});
- const { data: loginlogList, refetch } = useQuery({
- queryKey: [ENDPOINT.USER_SERVICE.LOGINLOG, , pagination],
- queryFn: () =>
- LoginlogApi.getLoginlogList({
- ...loginlogQuery,
- page: pagination.pageIndex,
- size: pagination.pageSize,
- }),
- placeholderData: keepPreviousData,
+ const [loginlogPostQuery, setLoginlogPostQuery] = useState({
+ userId: "",
+ siteId: "",
+ errOcrnYn: "N",
+ remoteIp: "",
+ lgnMthd: "",
+ lgnErrCd: "",
+ searchDateFrom: dayjs().subtract(7, "day").format("YYYY-MM-DD"),
+ searchDateTo: dayjs().format("YYYY-MM-DD"),
+ sort: "lgnDt,desc",
});
- const table = useReactTable({
- data: loginlogList?.content ?? [],
- columns,
- rowCount: loginlogList?.totalElements ?? 0,
- state: { pagination },
- manualPagination: true,
- enableMultiRowSelection: false,
- getCoreRowModel: getCoreRowModel(),
- onPaginationChange: setPagination,
+ const query = useQuery({
+ queryKey: [ENDPOINT.USER_SERVICE.LOGINLOG, pagination],
+ queryFn: () =>
+ LoginlogApi.getLoginlogList({
+ ...loginlogPostQuery,
+ page: pagination.pageIndex,
+ size: pagination.pageSize,
+ }),
+ placeholderData: keepPreviousData,
+ });
+
+ const { tableComponent, tableInstance: table } = useDataTable({
+ query,
+ tableOptions: {
+ columns,
+ state: {
+ pagination,
+ },
+ manualPagination: true,
+ enableMultiRowSelection: true,
+ getCoreRowModel: getCoreRowModel(),
+ onPaginationChange: setPagination,
+ },
+ dataTableOptions: {
+ viewPagination: true,
+ },
});
const handleSubmit = (e: React.FormEvent) => {
e.preventDefault();
- refetch();
+ setIsManualLoading(true);
+ query.refetch().finally(() => {
+ setIsManualLoading(false);
+ });
+ };
+
+ const handleLoginlogParamsChange =
+ (key: keyof LoginlogParams) => (value: unknown) => {
+ setLoginlogPostQuery({ ...loginlogPostQuery, [key]: value });
+ };
+
+ const handlePresetDateRange = (value: string) => {
+ let presetDateRange: DateRange | undefined;
+ switch (value) {
+ case "1W":
+ presetDateRange = {
+ from: dayjs().subtract(7, "day").toDate(),
+ to: dayjs().toDate(),
+ };
+ break;
+ case "1M":
+ presetDateRange = {
+ from: dayjs().subtract(30, "day").toDate(),
+ to: dayjs().toDate(),
+ };
+ break;
+ case "3M":
+ presetDateRange = {
+ from: dayjs().subtract(90, "day").toDate(),
+ to: dayjs().toDate(),
+ };
+ break;
+ default:
+ presetDateRange = undefined;
+ }
+ handleDateRangeChange(presetDateRange);
+ };
+
+ const handleDateRangeChange = (value: DateRange | undefined) => {
+ setDateRange(value || defaultDateRange);
+ setLoginlogPostQuery({
+ ...loginlogPostQuery,
+ searchDateFrom:
+ dayjs(value?.from).format("YYYY-MM-DD") ??
+ dayjs().subtract(7, "day").format("YYYY-MM-DD"),
+ searchDateTo:
+ dayjs(value?.to).format("YYYY-MM-DD") ?? dayjs().format("YYYY-MM-DD"),
+ });
};
return (
- 로그인로그 목록
+
+ 로그인로그 목록
+
+
+
+
-
- [] = [
+ {
+ id: "no",
+ header: "NO",
+ cell: ({ row, table }) => {
+ const totalRows = table.getRowCount();
+ const { pageIndex, pageSize } = table.getState().pagination;
+ return totalRows - (pageIndex * pageSize + row.index);
+ },
+ },
+ {
+ accessorKey: "inqDt",
+ header: "요청일시",
+ cell: ({ row }) => {
+ const date = dayjs(row.original.inqDt);
+ return date.format("YYYY-MM-DD HH:mm:ss");
+ },
+ },
+ {
+ accessorKey: "siteNm",
+ header: "사이트명",
+ },
+ {
+ accessorKey: "rqstrNm",
+ header: "조회자명",
+ },
+ {
+ accessorKey: "rqstrIp",
+ header: "조회IP",
+ },
+ {
+ accessorKey: "inqInfoSummary",
+ header: "조회정보",
+ }
+];
+
diff --git a/apps/cs/src/pages/privacylog/ui/privacylog-page.tsx b/apps/cs/src/pages/privacylog/ui/privacylog-page.tsx
new file mode 100644
index 000000000..5cb8bf13d
--- /dev/null
+++ b/apps/cs/src/pages/privacylog/ui/privacylog-page.tsx
@@ -0,0 +1,206 @@
+"use client";
+
+import dayjs from "dayjs";
+import { useState } from "react";
+import { keepPreviousData, useQuery } from "@tanstack/react-query";
+import {
+ getCoreRowModel,
+ type PaginationState,
+} from "@tanstack/react-table";
+import {
+ Button,
+ DateRangePicker,
+ Input,
+ Label,
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+ } from "@common/components";
+import { PrivacyLogPrivacy } from "@/entities/privacylog";
+import { type PrivacyLogParams} from "@/entities/privacylog/model/privacylog-interface";
+import { useDataTable } from "@/shared/lib";
+import { ENDPOINT } from "@/shared/config";
+import { columns } from "@/pages/privacylog/model/table-columns";
+
+
+
+type DateRange = {
+ from: Date | undefined;
+ to?: Date | undefined;
+};
+
+function PrivacyLogPage({ }) {
+
+ // 1주일 전부터 오늘까지 기본 날짜 설정
+ const defaultDateRange: DateRange = {
+ from: dayjs().subtract(7, "day").toDate(),
+ to: dayjs().toDate(),
+ };
+
+ const [dateRange, setDateRange] = useState(defaultDateRange);
+
+ const [pagination, setPagination] = useState({
+ pageIndex: 0,
+ pageSize: 10,
+ });
+
+ const [privacylogPostQuery, setprivacylogPostQuery] = useState< PrivacyLogParams>({
+ siteId: "",
+ inqInfoKeywordType: "userName",
+ inqInfoKeyword: "",
+ rqstrIp: "",
+ inqDtStart: dayjs().subtract(7, "day").format("YYYY-MM-DD"),
+ inqDtEnd: dayjs().format("YYYY-MM-DD"),
+ sort:"inqDt,asc"
+ });
+
+
+ const query = useQuery({
+ queryKey: [ENDPOINT.USER_SERVICE.PRIVACYLOG, pagination],
+ queryFn: () =>
+ PrivacyLogPrivacy.getPrivacyLogList({
+ ...privacylogPostQuery,
+ page: pagination.pageIndex,
+ size: pagination.pageSize,
+ }),
+ placeholderData: keepPreviousData,
+ });
+
+ const { tableComponent, tableInstance: table } = useDataTable({
+ query,
+ tableOptions: {
+ columns,
+ state: {
+ pagination,
+ },
+ manualPagination: true,
+ enableMultiRowSelection: true,
+ getCoreRowModel: getCoreRowModel(),
+ onPaginationChange: setPagination,
+ },
+ dataTableOptions: {
+ viewPagination: true,
+ },
+ });
+
+ const handleSubmit = (e: React.FormEvent) => {
+ e.preventDefault();
+ query.refetch();
+ };
+
+ const handleprivacylogParamsChange =
+ (key: keyof PrivacyLogParams) => (value: unknown) => {
+ setprivacylogPostQuery({ ...privacylogPostQuery, [key]: value });
+ };
+
+ const handlePresetDateRange = (value: string) => {
+ let presetDateRange: DateRange | undefined;
+ switch (value) {
+ case "1W":
+ presetDateRange = {
+ from: dayjs().subtract(7, "day").toDate(),
+ to: dayjs().toDate(),
+ };
+ break;
+ case "1M":
+ presetDateRange = {
+ from: dayjs().subtract(30, "day").toDate(),
+ to: dayjs().toDate(),
+ };
+ break;
+ case "3M":
+ presetDateRange = {
+ from: dayjs().subtract(90, "day").toDate(),
+ to: dayjs().toDate(),
+ };
+ break;
+ default:
+ presetDateRange = undefined;
+ }
+ handleDateRangeChange(presetDateRange);
+ };
+
+
+
+ const handleDateRangeChange = (value: DateRange | undefined) => {
+ setDateRange(value || defaultDateRange);
+ setprivacylogPostQuery({
+ ...privacylogPostQuery,
+ inqDtStart: dayjs(value?.from).format("YYYY-MM-DD") ?? dayjs().subtract(7, "day").format("YYYY-MM-DD"),
+ inqDtEnd: dayjs(value?.to).format("YYYY-MM-DD") ?? dayjs().format("YYYY-MM-DD"),
+ });
+ };
+
+
+
+
+ return (
+
+
+
+
+
+
+
+ 로그인로그 목록
+
+
+
+
+
+ {tableComponent}
+
+
+ );
+}
+
+export { PrivacyLogPage };
diff --git a/apps/cs/src/pages/recent/ui/recent-page.tsx b/apps/cs/src/pages/recent/ui/recent-page.tsx
index 681c25e34..ec9fec78a 100644
--- a/apps/cs/src/pages/recent/ui/recent-page.tsx
+++ b/apps/cs/src/pages/recent/ui/recent-page.tsx
@@ -62,6 +62,7 @@ function RecentPage() {
delYn: "N",
frDateYmd: "",
toDateYmd: "",
+ sort:"regDt,desc"
});
const [isDeletePostData, setIsDeletePostData] = useState(false);
diff --git a/apps/cs/src/pages/site/ui/ip-management-dialog.tsx b/apps/cs/src/pages/site/ui/ip-management-dialog.tsx
index c2a2c2702..43e2c2155 100644
--- a/apps/cs/src/pages/site/ui/ip-management-dialog.tsx
+++ b/apps/cs/src/pages/site/ui/ip-management-dialog.tsx
@@ -46,7 +46,7 @@ function IPManagementDialog({
const { data: ipList } = useQuery({
queryKey: [ENDPOINT.CMS_SERVICE.IPS, props.open],
- queryFn: () => IpApi.getIpList({ siteId, sort: [] }),
+ queryFn: () => IpApi.getIpList({ siteId, sort: "" }),
select: (data) => {
const ips = data.content.map((item) => ({
...item,
diff --git a/apps/cs/src/pages/site/ui/site-page.tsx b/apps/cs/src/pages/site/ui/site-page.tsx
index 6d0041a65..734ba7658 100644
--- a/apps/cs/src/pages/site/ui/site-page.tsx
+++ b/apps/cs/src/pages/site/ui/site-page.tsx
@@ -17,6 +17,7 @@ function SitePage() {
const [siteQuery, setSiteQuery] = useState({
siteNm: "",
+ sort:"regDt,desc"
});
const [pagination, setPagination] = useState({
pageIndex: 0,
diff --git a/apps/cs/src/pages/template/ui/template-page.tsx b/apps/cs/src/pages/template/ui/template-page.tsx
index dc90b69ff..59e8c8b01 100644
--- a/apps/cs/src/pages/template/ui/template-page.tsx
+++ b/apps/cs/src/pages/template/ui/template-page.tsx
@@ -18,6 +18,7 @@ function TemplatePage() {
const [templateQuery, setTemplateQuery] = useState({
tmpltSeCd: "",
keyword: "",
+ sort:"regDt,desc"
});
const [pagination, setPagination] = useState({
pageIndex: 0,
diff --git a/apps/cs/src/pages/terms/ui/terms-page.tsx b/apps/cs/src/pages/terms/ui/terms-page.tsx
index 8cb6a911e..617d4eff6 100644
--- a/apps/cs/src/pages/terms/ui/terms-page.tsx
+++ b/apps/cs/src/pages/terms/ui/terms-page.tsx
@@ -17,7 +17,8 @@ function TermsPage() {
const [termsQuery, setTermsQuery] = useState({
trmsSeCd: "",
- keyword: "",
+ keyword: "",
+ sort:"regDt,desc"
});
const [pagination, setPagination] = useState({
pageIndex: 0,
diff --git a/apps/cs/src/pages/users/ui/users-page.tsx b/apps/cs/src/pages/users/ui/users-page.tsx
index d6f77deb5..2ffe05eb4 100644
--- a/apps/cs/src/pages/users/ui/users-page.tsx
+++ b/apps/cs/src/pages/users/ui/users-page.tsx
@@ -51,7 +51,7 @@ function UsersPage() {
grpId: "",
frDateYmd: "",
toDateYmd: "",
- sort: ["aprvYmd,desc"],
+ sort: "regDt,desc"
},
});
@@ -288,9 +288,9 @@ function UsersPage() {
회원 목록
diff --git a/apps/cs/src/widgets/post/ui/post.tsx b/apps/cs/src/widgets/post/ui/post.tsx
index a7f3cb43a..040262218 100644
--- a/apps/cs/src/widgets/post/ui/post.tsx
+++ b/apps/cs/src/widgets/post/ui/post.tsx
@@ -5,14 +5,21 @@ import Image from "next/image";
import { useEffect, useState } from "react";
import { useRouter } from "next/navigation";
import { useQuery } from "@tanstack/react-query";
-import { Button, Skeleton } from "@common/components";
+import {
+ Button,
+ Label,
+ RadioGroup,
+ RadioGroupItem,
+ Skeleton,
+} from "@common/components";
import { AttachmentApi } from "@/entities/attachment";
import { PostApi } from "@/entities/post";
-import { useAlertStore, useMutationWrapper, useMenuStore } from "@/shared/lib";
+import { BoardApi } from "@/entities/board";
import { ENDPOINT } from "@/shared/config";
+import { useAlertStore, useMutationWrapper, useMenuStore } from "@/shared/lib";
import { PostAction } from "./post-action";
import { PostComment } from "./post-comment";
-import { BoardApi } from "@/entities/board";
+import { PostEvaluationApi } from "../api/post-evaluation-service";
function Post({ bbsId, pstNo }: { bbsId: string; pstNo: string }) {
const router = useRouter();
@@ -20,6 +27,7 @@ function Post({ bbsId, pstNo }: { bbsId: string; pstNo: string }) {
const { bbsInfo, setBbsInfo } = useMenuStore((state) => state);
const [filename, setFilename] = useState("");
+ const [evlScr, setEvlScr] = useState(5);
const { data: boardInfo } = useQuery({
queryKey: [ENDPOINT.BOARD_SERVICE.BBS, bbsId],
@@ -72,6 +80,17 @@ function Post({ bbsId, pstNo }: { bbsId: string; pstNo: string }) {
},
});
+ const { mutate: postEvaluation } = useMutationWrapper({
+ mutationFn: (evlScr: number) =>
+ PostEvaluationApi.postEvaluation({
+ pstNo: parseInt(pstNo),
+ evlScr,
+ }),
+ onSuccess: () => {
+ alert("게시물 평가가 완료되었습니다.");
+ },
+ });
+
const handleDownload = async () => {
if (!downloadResponse) return;
try {
@@ -187,6 +206,53 @@ function Post({ bbsId, pstNo }: { bbsId: string; pstNo: string }) {
)
)}
+ {bbsInfo?.dgstfnEvlUseYn === "Y" && (
+ <>
+
+
+
+ 이 페이지에서 제공하는
+
+ 정보에 대하여 만족하시나요?
+
+
+ setEvlScr(parseInt(value))}
+ className="flex items-center space-x-4"
+ >
+
+
+
+
+
+
+ )}
- })
+ {mounted ? (
+
+ ) : (
+
접속 IP
- 로그아웃
+ 로그아웃
diff --git a/packages/common/components/src/ui/lnb/index.tsx b/packages/common/components/src/ui/lnb/index.tsx
index 80d9ad87d..552a7d67a 100644
--- a/packages/common/components/src/ui/lnb/index.tsx
+++ b/packages/common/components/src/ui/lnb/index.tsx
@@ -3,7 +3,6 @@
import { useState, useEffect, useRef } from "react";
import { useQuery } from "@tanstack/react-query";
import { ChevronRight } from "lucide-react";
-import { getConfig } from "@common/config";
import { ENDPOINT } from "../../config";
import { cn, setCookie } from "../../lib";
import { getMenuList, type MenuItem } from "../../api";
@@ -24,8 +23,9 @@ import {
CollapsibleTrigger,
} from "../collapsible";
import { getParentIds } from "./lib";
+import { getCookie } from "../../lib";
-const { SITE_ID } = getConfig();
+const siteId = getCookie("site-id-key") ?? "";
export function LNB({
viewOnly,
@@ -38,7 +38,7 @@ export function LNB({
}) {
const { data: menuList } = useQuery({
queryKey: [ENDPOINT.CMS_SERVICE.MENU_ROLES],
- queryFn: () => getMenuList(SITE_ID ?? ""),
+ queryFn: () => getMenuList(siteId),
enabled: !viewOnly,
});
@@ -134,17 +134,18 @@ export function LNB({
function MenuGroup({ item }: { item: MenuItem }) {
const { open: isSidebarOpen } = useSidebar();
+ const [isOpen, setIsOpen] = useState(
+ defaultOpenMenuIds.includes(item.menuCd),
+ );
return (
-
+
+
+ );
+}
+
+export { ApiLogPage };
diff --git a/apps/cs/src/pages/bbs/ui/bbs-form.tsx b/apps/cs/src/pages/bbs/ui/bbs-form.tsx
index f0b1d7ea2..3d7482bce 100644
--- a/apps/cs/src/pages/bbs/ui/bbs-form.tsx
+++ b/apps/cs/src/pages/bbs/ui/bbs-form.tsx
@@ -478,6 +478,35 @@ function BbsForm({ form, bbsId, ...props }: BbsFormProps) {
/>
+
+
+
+
+
+
+
+
+
+ 로그인로그 목록
+
+
+
+ {tableComponent}
+
+
+
+
+
-
- 로그인로그 목록
+
+
로그인로그 목록
+
+
+
+
-
+ {/* Debug: 로딩 상태 표시 */}
+ {(query.isLoading || query.isPending || isManualLoading) && (
+
+
+ )}
+ {tableComponent}
+
+
+
+
+
+ );
+}
+
+export { PrivacyLogPage };
diff --git a/apps/cs/src/pages/recent/ui/recent-page.tsx b/apps/cs/src/pages/recent/ui/recent-page.tsx
index 681c25e34..ec9fec78a 100644
--- a/apps/cs/src/pages/recent/ui/recent-page.tsx
+++ b/apps/cs/src/pages/recent/ui/recent-page.tsx
@@ -62,6 +62,7 @@ function RecentPage() {
delYn: "N",
frDateYmd: "",
toDateYmd: "",
+ sort:"regDt,desc"
});
const [isDeletePostData, setIsDeletePostData] = useState(false);
diff --git a/apps/cs/src/pages/site/ui/ip-management-dialog.tsx b/apps/cs/src/pages/site/ui/ip-management-dialog.tsx
index c2a2c2702..43e2c2155 100644
--- a/apps/cs/src/pages/site/ui/ip-management-dialog.tsx
+++ b/apps/cs/src/pages/site/ui/ip-management-dialog.tsx
@@ -46,7 +46,7 @@ function IPManagementDialog({
const { data: ipList } = useQuery({
queryKey: [ENDPOINT.CMS_SERVICE.IPS, props.open],
- queryFn: () => IpApi.getIpList({ siteId, sort: [] }),
+ queryFn: () => IpApi.getIpList({ siteId, sort: "" }),
select: (data) => {
const ips = data.content.map((item) => ({
...item,
diff --git a/apps/cs/src/pages/site/ui/site-page.tsx b/apps/cs/src/pages/site/ui/site-page.tsx
index 6d0041a65..734ba7658 100644
--- a/apps/cs/src/pages/site/ui/site-page.tsx
+++ b/apps/cs/src/pages/site/ui/site-page.tsx
@@ -17,6 +17,7 @@ function SitePage() {
const [siteQuery, setSiteQuery] = useState
+
+
+
+
+
+
+
+
+ 로그인로그 목록
+
+
+
+ {tableComponent}
+ 회원 목록
+
+
+
+ )}
+ 이 페이지에서 제공하는
+
+ 정보에 대하여 만족하시나요?
+
+ setEvlScr(parseInt(value))}
+ className="flex items-center space-x-4"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ {mounted ? (
+
+ ) : (
+
접속 IP