From d1633ce61af0a3f6f4cba30f8d1a93fe18184804 Mon Sep 17 00:00:00 2001 From: thkim Date: Tue, 2 Jan 2024 10:27:03 +0900 Subject: [PATCH 1/3] update git ignore --- .idea/kcscDev.iml | 9 ++++ .idea/misc.xml | 6 +++ .idea/modules.xml | 8 ++++ .idea/vcs.xml | 6 +++ .idea/workspace.xml | 43 +++++++++++++++++++ .../.vscode/launch.json | 15 +++++++ kcsc-back-end/.gitignore | 4 ++ 7 files changed, 91 insertions(+) create mode 100644 .idea/kcscDev.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 egovframe-template-simple-react-contribution/.vscode/launch.json diff --git a/.idea/kcscDev.iml b/.idea/kcscDev.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/kcscDev.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..373e70b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..017a708 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + 1703206321951 + + + + \ No newline at end of file diff --git a/egovframe-template-simple-react-contribution/.vscode/launch.json b/egovframe-template-simple-react-contribution/.vscode/launch.json new file mode 100644 index 0000000..f6b35a0 --- /dev/null +++ b/egovframe-template-simple-react-contribution/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "chrome", + "request": "launch", + "name": "Launch Chrome against localhost", + "url": "http://localhost:3000", + "webRoot": "${workspaceFolder}" + } + ] +} \ No newline at end of file diff --git a/kcsc-back-end/.gitignore b/kcsc-back-end/.gitignore index c2065bc..d51ab2f 100644 --- a/kcsc-back-end/.gitignore +++ b/kcsc-back-end/.gitignore @@ -35,3 +35,7 @@ out/ ### VS Code ### .vscode/ + + +**/.idea +**/.vscode \ No newline at end of file From ce07c3015723db00560dca63e4e1ab57e3682945 Mon Sep 17 00:00:00 2001 From: "Lim\\jun" Date: Tue, 2 Jan 2024 13:43:45 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=99=BC=EC=AA=BD=EB=A9=94=EB=89=B4=20css?= =?UTF-8?q?=20=EA=B8=80=EC=9E=90=20=ED=81=AC=EA=B8=B0=20=EB=B0=8F=20?= =?UTF-8?q?=EA=B3=B5=EA=B0=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/css/layout.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/css/layout.css b/egovframe-template-simple-react-contribution/src/css/layout.css index 3d5c478..70f5296 100644 --- a/egovframe-template-simple-react-contribution/src/css/layout.css +++ b/egovframe-template-simple-react-contribution/src/css/layout.css @@ -52,11 +52,11 @@ body {min-width: 1400px;} /* sub navigation */ .c_wrap .layout .nav {display: table-cell; width: 260px; vertical-align: top;} .c_wrap .layout .nav .inner {border: 1px solid #dde2e5; border-radius: 10px;} -.nav_title{padding: 35px 30px 26px 30px; border-bottom: 4px solid #dde2e5;} +.nav_title{padding: 35px 30px 26px 30px;} /* border-bottom: 4px solid #dde2e5; changed by lim*/ .c_wrap .layout .nav h2 {color: #222; font-size: 24px;} .c_wrap .layout .nav ul {}/*padding: 26px 30px 27px 30px;*/ -.c_wrap .layout .nav ul li + li {margin-top: 27px;} -.c_wrap .layout .nav ul li a {display: block; position: relative; color: #666; font-size: 18px;} +.c_wrap .layout .nav ul li + li {margin-top: 18px;} /* margin-top: 27px; changed by lim*/ +.c_wrap .layout .nav ul li a {display: block; position: relative; color: #666; font-size: 14px;} /* font-size: 18px; changed by lim*/ .c_wrap .layout .nav ul li a:hover::after {content: ""; display: block; position: absolute; right: 0px; top: 50%; transform: translateY(-50%); width: 9px; height: 15px; background: url(css/images/ico_arrow_r_gray_9x15.png) no-repeat;} .c_wrap .layout .nav ul li a.cur {color: #222; font-weight: 700;} From d005366d8f471a42076093ee5ead9d2ccea7f1d6 Mon Sep 17 00:00:00 2001 From: thkim Date: Tue, 2 Jan 2024 16:27:42 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EB=84=A4=EB=B9=84=EA=B2=8C?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=88=98=EC=A0=95=20=EA=B1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit K) 관리자 - 컨텐츠관리 - 팝업관리 K) 관리자 - 컨텐츠관리 - 건설기준연구 관리 K) 관리자 - 환경 설정 - 위원회 코드관리 K) 관리자 - 위원회관리 - 진행현황 관리 K) 관리자 - 위원회관리 - 위원회 일정관리 K) 관리자 - 컨텐츠관리 - 설문관리 --- .../pages/admin/committee/ProgressStatus.jsx | 8 ++-- .../src/pages/admin/committee/Schedules.jsx | 8 ++-- .../pages/admin/config/CommitteeCodeMgt.jsx | 39 ++++++++++++++++++- .../src/pages/admin/contents/PopUp.jsx | 8 ++-- .../admin/contents/StandardsResearch.jsx | 8 ++-- .../src/pages/admin/contents/Survey.jsx | 8 ++-- 6 files changed, 54 insertions(+), 25 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus.jsx index a5efcf3..e6fa567 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus.jsx @@ -13,8 +13,8 @@ function ProgressStatus(props) {
  • Home
    • -
  • 위원회 관리
    • -
  • 진행현황 관리
    • +
  • 사이트 관리
    • +
  • 위원회 관리
) @@ -35,11 +35,9 @@ function ProgressStatus(props) {
{/* */}
-

위원회 관리

+

진행현황 관리

-

진행현황 관리

- 여기에 구현해주세요. {/* */}
diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx index 5d16d9b..5796c83 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx @@ -185,8 +185,8 @@ function Schedules(props) {
  • Home
    • -
  • 위원회 관리
    • -
  • 위원회 일정 관리
    • +
  • 사이트 관리
    • +
  • 위원회 관리
) @@ -220,10 +220,10 @@ function Schedules(props) {
{/* */}
-

위원회 관리

+

위원회 일정 관리

-

위원회 일정 관리

+

{/* */}
    diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx index 922422b..33829f9 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx @@ -1,11 +1,48 @@ import React from 'react'; +import { Link } from 'react-router-dom'; + +import URL from 'constants/url'; + +import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin'; function CommitteeCodeMgt(props) { + const Location = React.memo(function Location() { + return ( +
    +
      +
    • Home
      • +
    • 사이트 관리
      • +
    • 환경 설정
      • +
    +
    + ) + }); + return (
    - CommitteeCodeMgt +
    + {/* */} + + {/* */} + +
    + {/* */} + + {/* */} + +
    + {/* */} +
    +

    위원회 코드 관리

    +
    + + 여기에 구현해주세요. + {/* */} +
    +
    +
    ); } diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx index 648f037..fe632f3 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx @@ -14,8 +14,8 @@ function PopUp(props) {
    • Home
      • -
    • 컨텐츠 관리
      • -
    • 팝업 관리
      • +
    • 사이트 관리
      • +
    • 컨텐츠 관리
    ) @@ -37,11 +37,9 @@ function PopUp(props) { {/* */}
    -

    컨텐츠 관리

    +

    팝업 관리

    -

    팝업 관리

    -
    diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardsResearch.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardsResearch.jsx index 11797ee..22a1e63 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardsResearch.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardsResearch.jsx @@ -13,8 +13,8 @@ function StandardsResearch(props) {
    • Home
      • -
    • 컨텐츠 관리
      • -
    • 건설기준연구 관리
      • +
    • 사이트 관리
      • +
    • 컨텐츠 관리
    ) @@ -35,11 +35,9 @@ function StandardsResearch(props) {
    {/* */}
    -

    컨텐츠 관리

    +

    건설기준연구 관리

    -

    건설기준연구 관리

    - 여기에 구현해주세요. {/* */}
    diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/Survey.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/Survey.jsx index 6994d4a..2cf2681 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/Survey.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/Survey.jsx @@ -13,8 +13,8 @@ function Survey(props) {
    • Home
      • -
    • 컨텐츠 관리
      • -
    • 설문 관리
      • +
    • 사이트 관리
      • +
    • 컨텐츠 관리
    ) @@ -35,11 +35,9 @@ function Survey(props) {
    {/* */}
    -

    컨텐츠 관리

    +

    설문 관리

    -

    설문 관리

    - 여기에 구현해주세요. {/* */}