Merge branch 'master' of http://118.219.150.34:50501/DBNT/kcscDev

.idea/kcscDev.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/kcscDev.iml" filepath="$PROJECT_DIR$/.idea/kcscDev.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="cbd5a5a9-c605-4176-9f67-f130dc5cafd5" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/egovframe-template-simple-react-contribution/yarn.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/kcsc-back-end/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/kcsc-back-end/src/main/resources/application.properties" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 3
+}]]></component>
+  <component name="ProjectId" id="2ZsMR0eqQ4kriuFhAPE5h7h5XZA" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "thkim",
+    "last_opened_file_path": "C:/Users/dbnt/git/dbnt/kcscDev"
+  }
+}]]></component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="cbd5a5a9-c605-4176-9f67-f130dc5cafd5" name="Changes" comment="" />
+      <created>1703206321951</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1703206321951</updated>
+    </task>
+    <servers />
+  </component>
+</project>

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}"
+        }
+    ]
+}

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 + 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: 18px;}
+.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;}
 

egovframe-template-simple-react-contribution/src/pages/admin/committee/ProgressStatus.jsx

@@ -13,8 +13,8 @@ function ProgressStatus(props) {
             <div className="location">
                 <ul>
                     <li><Link to={URL.MAIN} className="home">Home</Link></li>
-                    <li><Link to={URL.ADMIN}>위원회 관리</Link></li>
+                    <li><Link to={URL.ADMIN}>사이트 관리</Link></li>
-                    <li>진행현황 관리</li>
+                    <li>위원회 관리</li>
                 </ul>
             </div>
         )
@@ -35,11 +35,9 @@ function ProgressStatus(props) {
                     <div className="contents " id="contents">
                         {/* <!-- 본문 --> */}
                         <div className="top_tit">
-                            <h1 className="tit_1">위원회 관리</h1>
+                            <h1 className="tit_1">진행현황 관리</h1>
                         </div>
 
-                        <h2 className="tit_2">진행현황 관리</h2>
-
                         여기에 구현해주세요.
                         {/* <!--// 본문 --> */}
                     </div>

egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx

@@ -185,8 +185,8 @@ function Schedules(props) {
             <div className="location">
                 <ul>
                     <li><Link to={URL.MAIN} className="home">Home</Link></li>
-                    <li><Link to={URL.ADMIN}>위원회 관리</Link></li>
+                    <li><Link to={URL.ADMIN}>사이트 관리</Link></li>
-                    <li>위원회 일정 관리</li>
+                    <li>위원회 관리</li>
                 </ul>
             </div>
         )
@@ -220,10 +220,10 @@ function Schedules(props) {
                     <div className="contents " id="contents">
                         {/* <!-- 본문 --> */}
                         <div className="top_tit">
-                            <h1 className="tit_1">위원회 관리</h1>
+                            <h1 className="tit_1">위원회 일정 관리</h1>
                         </div>
 
-                        <h2 className="tit_2">위원회 일정 관리</h2>
+                        <h2 className="tit_2"></h2>
                         {/* <!-- 검색조건 --> */}
                         <div className="condition">
                             <ul>

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 (
+            <div className="location">
+                <ul>
+                    <li><Link to={URL.MAIN} className="home">Home</Link></li>
+                    <li><Link to={URL.ADMIN}>사이트 관리</Link></li>
+                    <li>환경 설정</li>
+                </ul>
+            </div>
+        )
+    });
+
     return (
         <div className="container">
-            CommitteeCodeMgt
+             <div className="c_wrap">
+                {/* <!-- Location --> */}
+                <Location />
+                {/* <!--// Location --> */}
+
+                <div className="layout">
+                    {/* <!-- Navigation --> */}
+                    <EgovLeftNav></EgovLeftNav>
+                    {/* <!--// Navigation --> */}
+
+                    <div className="contents " id="contents">
+                        {/* <!-- 본문 --> */}
+                        <div className="top_tit">
+                            <h1 className="tit_1">위원회 코드 관리</h1>
+                        </div>
+
+                        여기에 구현해주세요.
+                        {/* <!--// 본문 --> */}
+                    </div>
+                </div>
+            </div>
         </div>
     );
 }

egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx

@@ -14,8 +14,8 @@ function PopUp(props) {
             <div className="location">
                 <ul>
                     <li><Link to={URL.MAIN} className="home">Home</Link></li>
-                    <li><Link to={URL.ADMIN}>컨텐츠 관리</Link></li>
+                    <li><Link to={URL.ADMIN}>사이트 관리</Link></li>
-                    <li>팝업 관리</li>
+                    <li>컨텐츠 관리</li>
                 </ul>
             </div>
         )
@@ -37,11 +37,9 @@ function PopUp(props) {
                         {/* <!-- 본문 --> */}
 
                         <div className="top_tit">
-                            <h1 className="tit_1">컨텐츠 관리</h1>
+                            <h1 className="tit_1">팝업 관리</h1>
                         </div>
 
-                        <h2 className="tit_2">팝업 관리</h2>
-
 
                         <div id="scope-popupMng" class="row admin-main-content-wrapper">
                             <div class="row">

egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardsResearch.jsx

@@ -13,8 +13,8 @@ function StandardsResearch(props) {
             <div className="location">
                 <ul>
                     <li><Link to={URL.MAIN} className="home">Home</Link></li>
-                    <li><Link to={URL.ADMIN}>컨텐츠 관리</Link></li>
+                    <li><Link to={URL.ADMIN}>사이트 관리</Link></li>
-                    <li>건설기준연구 관리</li>
+                    <li>컨텐츠 관리</li>
                 </ul>
             </div>
         )
@@ -35,11 +35,9 @@ function StandardsResearch(props) {
                     <div className="contents " id="contents">
                         {/* <!-- 본문 --> */}
                         <div className="top_tit">
-                            <h1 className="tit_1">컨텐츠 관리</h1>
+                            <h1 className="tit_1">건설기준연구 관리</h1>
                         </div>
 
-                        <h2 className="tit_2">건설기준연구 관리</h2>
-
                         여기에 구현해주세요.
                         {/* <!--// 본문 --> */}
                     </div>

egovframe-template-simple-react-contribution/src/pages/admin/contents/Survey.jsx

@@ -13,8 +13,8 @@ function Survey(props) {
             <div className="location">
                 <ul>
                     <li><Link to={URL.MAIN} className="home">Home</Link></li>
-                    <li><Link to={URL.ADMIN}>컨텐츠 관리</Link></li>
+                    <li><Link to={URL.ADMIN}>사이트 관리</Link></li>
-                    <li>설문 관리</li>
+                    <li>컨텐츠 관리</li>
                 </ul>
             </div>
         )
@@ -35,11 +35,9 @@ function Survey(props) {
                     <div className="contents " id="contents">
                         {/* <!-- 본문 --> */}
                         <div className="top_tit">
-                            <h1 className="tit_1">컨텐츠 관리</h1>
+                            <h1 className="tit_1">설문 관리</h1>
                         </div>
 
-                        <h2 className="tit_2">설문 관리</h2>
-
                         여기에 구현해주세요.
                         {/* <!--// 본문 --> */}
                     </div>

kcsc-back-end/.gitignore

@@ -35,3 +35,7 @@ out/
 
 ### VS Code ###
 .vscode/
+
+
+**/.idea
+**/.vscode