diff --git a/.env.production b/.env.production
index eaebfff..b49e885 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,6 @@
NODE_PATH=src
REACT_APP_MODE=production
REACT_APP_VERSION = v0.0.1
-REACT_APP_API_URL=http://211.119.124.9:8090
-#REACT_APP_API_URL=http://localhost:8090
+#REACT_APP_API_URL=http://211.119.124.9:8090
+REACT_APP_API_URL=http://localhost:8090
REACT_APP_SERVER_TIMEOUT=6000
\ No newline at end of file
diff --git a/src/commons/ApiUrl.js b/src/commons/ApiUrl.js
index 1ba05f1..a4dfe59 100644
--- a/src/commons/ApiUrl.js
+++ b/src/commons/ApiUrl.js
@@ -2,22 +2,21 @@
// console.log(process.env.NODE_ENV)
export const LOGIN_URL = '/api/v1/ctgy/account/login';
export const GET_CMM_CODE_LIST = '/api/v1/biz/cmm/combo';
-export const GET_FILE_DOWNLOAD = '/api/v1/ctgy/file/download/';
+export const GET_FILE_DOWNLOAD = '/api/v2/ctgy/file/download/';
export const GET_DASHBOARD = '/api/v1/ctgy/dashboard';
// 공지사항
-export const GET_PUBLIC_BOARD_LIST = '/api/v1/ctgy/pboard';
-export const SAVE_PUBLIC_BOARD_HIT_CNT = '/api/v1/ctgy/pboard/hit/';
-export const SAVE_PUBLIC_BOARD = '/api/v1/ctgy/file/pboard';
+export const GET_PUBLIC_BOARD_LIST = '/api/v2/ctgy/pboard';
+export const SAVE_PUBLIC_BOARD_HIT_CNT = '/api/v2/ctgy/pboard/hit/';
+export const SAVE_PUBLIC_BOARD = '/api/v2/ctgy/file/pboard';
export const REMOVE_PUBLIC_BOARD = '/api/v1/ctgy/file/pboard/';
// 게시판
-export const GET_BOARD_LIST = '/api/v1/ctgy/board';
+export const GET_BOARD_LIST = '/api/v2/ctgy/board';
export const SAVE_BOARD_HIT_CNT = '/api/v1/ctgy/board/hit/';
export const SAVE_BOARD = '/api/v1/ctgy/board';
export const REMOVE_BOARD = '/api/v1/ctgy/board/';
-export const GET_BOARD_LIST2 = '/api/v2/ctgy/board/';
// 주정차 의견 진술
export const GET_PARKING_LIST = '/api/v1/ctgy/parking';
diff --git a/src/menu-items/admin.js b/src/menu-items/admin.js
index 60a9d2b..86ef0b3 100644
--- a/src/menu-items/admin.js
+++ b/src/menu-items/admin.js
@@ -166,14 +166,6 @@ const admin = {
type: 'item',
url: '/board',
icon: icons.IconClipboardList
- },
- {
- /* 게시판 관리 */
- id: 'admin-8',
- title: ,
- type: 'item',
- url: '/board2',
- icon: icons.IconClipboardList
}
]
};
diff --git a/src/routes/MainRoutes.js b/src/routes/MainRoutes.js
index 222d2a6..62711c4 100755
--- a/src/routes/MainRoutes.js
+++ b/src/routes/MainRoutes.js
@@ -13,8 +13,6 @@ const Dashboard = Loadable(lazy(() => import('views/dashboard')));
const PublicBoard = Loadable(lazy(() => import('views/biz/pboard/PublicBoard')));
const Board = Loadable(lazy(() => import('views/biz/board/Board')));
-const Board2 = Loadable(lazy(() => import('views/biz/board/Board2')));
-
// parking
const ParkingRegister = Loadable(lazy(() => import('views/biz/admin/parking/ParkingRegister')));
const ParkingUserByJudgeReview = Loadable(lazy(() => import('views/biz/judge/ParkingJudgeByUserReview')));
@@ -102,10 +100,7 @@ const MainRoutes = {
path: '/board',
element:
},
- {
- path: '/board2',
- element:
- },
+
// ----------------------------------------
{
path: '/judge/parking/review',
diff --git a/src/views/biz/board/Board2.jsx b/src/views/biz/board/Board2.jsx
deleted file mode 100644
index 0179410..0000000
--- a/src/views/biz/board/Board2.jsx
+++ /dev/null
@@ -1,260 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-
-// material-ui
-import { Button, Divider, FormControl, Grid, InputAdornment, InputLabel, Link, MenuItem, OutlinedInput, Select } from '@mui/material';
-
-// assets
-import { IconSearch } from '@tabler/icons';
-
-// berry ui
-import MainCard from 'ui-component/cards/MainCard';
-
-// project imports
-import MuiDataGrid from 'views/cmm/mui-grid/MuiDataGrid';
-import { findBoards2, modifyBoardHitCount, removeBoard, saveBoard } from 'apis/board2';
-import { useAlert } from 'react-alert';
-import CmmModal from 'views/cmm/CmmModal';
-import ModifyBoardForm from './ModifyBoardForm';
-import useAuth from 'hooks/useAuth';
-import { Save } from '@mui/icons-material';
-import NewBoardForm from './NewBoardForm';
-
-const Board = () => {
- const { user } = useAuth();
- const [owner, setOwner] = useState(false);
- const [category, setCategory] = useState('ciTitle');
- const [searchTxt, setSearchTxt] = useState('');
-
- const [totalCount, setTotalCount] = useState(0);
- const [rowsState, setRowsState] = useState({
- page: 0,
- pageSize: 20,
- rows: []
- // loading: false
- });
- const [open, setOpen] = useState(false);
- const [newBoard, setNewBoard] = useState(false);
- const [selectedRow, setSelectedRow] = useState({});
- const [create, setCreate] = useState(false);
- const [title, setTitle] = useState();
- const alert = useAlert();
-
- const columns = [
- { headerName: '글번호', headerAlign: 'center', field: 'ciContentno', align: 'center' },
- {
- headerName: '제목',
- headerAlign: 'center',
- field: 'ciTitle',
- editable: true,
- width: 400,
- renderCell: (params) => {
- let prefix = '';
- // eslint-disable-next-line no-plusplus
- for (let idx = 0; idx < params.row.ciStep; idx++) {
- prefix += ' ';
- }
- if (params.row.ciStep > 0) prefix += '↳ ';
- return (
-
- {prefix}
- {params.value}
-
- );
- }
- },
- { headerName: '작성자', headerAlign: 'center', field: 'ciName', align: 'center' },
- { headerName: '작성일', headerAlign: 'center', field: 'ciNalja', align: 'center' },
- { headerName: '조회수', headerAlign: 'center', field: 'ciHit', align: 'center' },
- { headerName: '게시판코드', headerAlign: 'center', field: 'ciCode', hide: true },
- { headerName: '작성자ID', headerAlign: 'center', field: 'ciId', hide: true },
- { headerName: '등록시간', headerAlign: 'center', field: 'ciTime', hide: true },
- { headerName: 'ref', headerAlign: 'center', field: 'ciRef', hide: true },
- { headerName: 'step', headerAlign: 'center', field: 'ciStep', hide: true },
- { headerName: '비번', headerAlign: 'center', field: 'ciPass', hide: true },
- { headerName: '내용', headerAlign: 'center', field: 'ciContents', hide: true },
- { headerName: 'IP', headerAlign: 'center', field: `ciIp`, hide: true },
- { headerName: 'level', headerAlign: 'center', field: 'ciRevel', hide: true }
- ];
-
- const search = useCallback(() => {
- let params = {
- page: rowsState.page,
- size: rowsState.pageSize
- };
-
- if (searchTxt) {
- params = {
- ...params,
- [category]: searchTxt
- };
- }
-
- findBoards2(params).then((response) => {
- if (response && response.data) {
- setTotalCount(response.count);
- setRowsState((prevState) => ({ ...prevState, rows: response.data }));
- }
- });
- }, [rowsState.page, rowsState.pageSize, category, searchTxt]);
-
- const handleSearch = async (event) => {
- if (event.type === 'keydown' && event.key === 'Enter') {
- const newString = event?.target.value;
- setSearchTxt(newString);
- }
- };
-
- const handleOnCellClick = (e) => {
- if (e?.field === 'ciTitle') {
- setOwner(user.id === e?.row.ciId);
- setNewBoard(false);
- setCreate(false);
- setTitle('게시판 상세');
- setSelectedRow(e?.row);
- if (user.id !== e?.row.ciId) modifyBoardHitCount(e?.row?.ciCode);
- setOpen(true);
- }
- };
-
- const submitBoard = (type, payload) => {
- switch (type) {
- case 'SAVE':
- if (window.confirm('저장 하시겠습니까?')) {
- saveBoard(payload).then((res) => {
- if (res?.success) {
- search();
- setOpen(false);
- } else {
- alert.show(`${res?.data.message}`);
- }
- }); // .then((res) => {
- } else {
- window.close();
- }
- break;
- case 'DELETE':
- if (window.confirm('삭제 하시겠습니까?')) {
- removeBoard(payload).then((res) => {
- if (res?.success) {
- search();
- setOpen(false);
- } else {
- alert.show(`${res?.data.message}`);
- }
- }); // .then((res) => {
- } else {
- window.close();
- }
- break;
- default:
- }
- };
-
- /**
- * 댓글인 경우 부모 댓글 번호를 ciRef, ciStep set
- * @param parentCiCode
- */
- const onNewBoard = (e, parentCiCode, parentCiRef) => {
- let title = '';
- if (parentCiCode) {
- setSelectedRow({
- ciName: user.name,
- ciRef: parentCiRef ?? parentCiCode,
- ciStep: 1,
- ciRevel: 1
- });
- title = '게시판 댓글 등록';
- } else {
- setSelectedRow({
- ciName: user.name,
- ciStep: 0,
- ciRevel: 0
- });
- title = '게시판 새글 등록';
- }
- setNewBoard(true);
- setTitle(title);
- setOpen(true);
- };
-
- useEffect(() => {
- search();
- }, [search]); // rowsState.page, rowsState.pageSize, rowsState.rows]);
-
- return (
-
-
-
-
-
-
- 구분
-
-
-
-
-
-
-
- }
- />
- {/* */}
-
-
- } onClick={onNewBoard}>
- 글쓰기
-
-
-
-
-
-
-
-
-
-
- {newBoard && }
- {!newBoard && (
-
- )}
-
-
- );
-};
-export default Board;
diff --git a/src/views/biz/pboard/PublicBoard.jsx b/src/views/biz/pboard/PublicBoard.jsx
index c915f29..c573656 100644
--- a/src/views/biz/pboard/PublicBoard.jsx
+++ b/src/views/biz/pboard/PublicBoard.jsx
@@ -39,6 +39,13 @@ const PublicBoard = () => {
const columns = [
{ headerName: 'No.', headerAlign: 'center', field: 'rowId', align: 'center', width: 80 },
+ {
+ headerName: '공지사항코드',
+ headerAlign: 'center',
+ field: 'inCode',
+ align: 'center',
+ width: 120
+ },
{
headerName: '업무구분',
headerAlign: 'center',