From 79c62396f3f826aa97e6d242c8c6d15df8762d28 Mon Sep 17 00:00:00 2001 From: thkim Date: Wed, 12 Jun 2024 10:04:38 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20?= =?UTF-8?q?=EC=9C=84=EC=9B=90=ED=9A=8C=EA=B4=80=EB=A6=AC=20-=20=EC=9C=84?= =?UTF-8?q?=EC=9B=90=ED=9A=8C=20=EC=9D=BC=EC=A0=95=20=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=96=B4=EA=B8=8B=EB=82=98=EB=8A=94=20?= =?UTF-8?q?=EA=B1=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package.json | 3 + .../admin/committee/Schedules/Detail.jsx | 16 +++++- .../pages/admin/committee/Schedules/Edit.jsx | 7 +++ .../yarn.lock | 55 +++++++++++++++++++ .../resources/application-local.properties | 41 ++++++++++++++ 5 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 kcsc-back-end/src/main/resources/application-local.properties diff --git a/egovframe-template-simple-react-contribution/package.json b/egovframe-template-simple-react-contribution/package.json index 40a1158..455de13 100644 --- a/egovframe-template-simple-react-contribution/package.json +++ b/egovframe-template-simple-react-contribution/package.json @@ -23,6 +23,7 @@ "react-apexcharts": "^1.4.0", "react-bootstrap": "^2.9.0", "react-copy-to-clipboard": "^5.1.0", + "react-countup": "^6.5.3", "react-csv": "^2.2.2", "react-datepicker": "^4.8.0", "react-dom": "^18.2.0", @@ -33,8 +34,10 @@ "react-quill": "^2.0.0", "react-router-dom": "^6.4.0", "react-scripts": "5.0.1", + "react-slick": "^0.30.2", "react-syntax-highlighter": "^15.5.0", "recharts": "^2.10.3", + "slick-carousel": "^1.8.1", "styled-components": "^6.0.9", "web-vitals": "^2.1.4" }, diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Detail.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Detail.jsx index af8a6aa..e1b8549 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Detail.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Detail.jsx @@ -1,12 +1,24 @@ import React, { useState, useEffect } from 'react'; import { Link, useLocation, useNavigate } from 'react-router-dom'; +import styled from "styled-components"; + + import * as EgovNet from 'api/egovFetch'; import URL from 'constants/url'; import CODE from 'constants/code'; import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin'; +const StyledDiv = styled.div` + .right_col { + position: absolute; + right: 0px; + top: 0px; + text-align: right; + } +`; + function SchedulesDetail(props) { console.group("EgovAdminScheduleDetail"); console.log("[Start] EgovAdminScheduleDetail ------------------------------"); @@ -90,7 +102,7 @@ function SchedulesDetail(props) { console.log("------------------------------EgovAdminScheduleDetail [End]"); console.groupEnd("EgovAdminScheduleDetail"); return ( -
+
{/* */}
@@ -167,7 +179,7 @@ function SchedulesDetail(props) {
- + ); } diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Edit.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Edit.jsx index b5b570b..1838b0c 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Edit.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Edit.jsx @@ -31,6 +31,7 @@ const useStyles = makeStyles(() => ({ })); const StyledDiv = styled.div` + margin-bottom: 70px; .org-under-id { margin-left: 20px; @media only screen and (max-width: 768px) { @@ -51,6 +52,12 @@ const StyledDiv = styled.div` width: 100%; } } + .right_col { + position: absolute; + right: 0px; + top: 0px; + text-align: right; + } `; function SchedulesEdit(props) { diff --git a/egovframe-template-simple-react-contribution/yarn.lock b/egovframe-template-simple-react-contribution/yarn.lock index 6edd4bf..dc0e75d 100644 --- a/egovframe-template-simple-react-contribution/yarn.lock +++ b/egovframe-template-simple-react-contribution/yarn.lock @@ -3650,6 +3650,11 @@ cjs-module-lexer@^1.0.0: resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz" integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== +classnames@^2.2.5: + version "2.5.1" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b" + integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow== + classnames@^2.2.6, classnames@^2.3.2: version "2.3.2" resolved "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz" @@ -3904,6 +3909,11 @@ cosmiconfig@^7.0.0: path-type "^4.0.0" yaml "^1.10.0" +countup.js@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/countup.js/-/countup.js-2.8.0.tgz#64951f2df3ede28839413d654d8fef28251c32a8" + integrity sha512-f7xEhX0awl4NOElHulrl4XRfKoNH3rB+qfNSZZyjSZhaAoUk6elvhH+MNxMmlmuUJ2/QNTWPSA7U4mNtIAKljQ== + cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" @@ -4620,6 +4630,11 @@ enhanced-resolve@^5.10.0: graceful-fs "^4.2.4" tapable "^2.2.0" +enquire.js@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/enquire.js/-/enquire.js-2.1.6.tgz#3e8780c9b8b835084c3f60e166dbc3c2a3c89814" + integrity sha512-/KujNpO+PT63F7Hlpu4h3pE3TokKRHN26JYmQpPyjkRD/N57R7bPDNojMXdi7uveAKjYB7yQnartCxZnFWr0Xw== + entities@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz" @@ -6875,6 +6890,13 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz" integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== +json2mq@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/json2mq/-/json2mq-0.2.0.tgz#b637bd3ba9eabe122c83e9720483aeb10d2c904a" + integrity sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA== + dependencies: + string-convert "^0.2.0" + json5@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz" @@ -8563,6 +8585,13 @@ react-copy-to-clipboard@^5.1.0: copy-to-clipboard "^3.3.1" prop-types "^15.8.1" +react-countup@^6.5.3: + version "6.5.3" + resolved "https://registry.yarnpkg.com/react-countup/-/react-countup-6.5.3.tgz#e892aa3eab2d6ba9c3cdba30bf4ed6764826d848" + integrity sha512-udnqVQitxC7QWADSPDOxVWULkLvKUWrDapn5i53HE4DPRVgs+Y5rr4bo25qEl8jSh+0l2cToJgGMx+clxPM3+w== + dependencies: + countup.js "^2.8.0" + react-csv@^2.2.2: version "2.2.2" resolved "https://registry.npmjs.org/react-csv/-/react-csv-2.2.2.tgz" @@ -8781,6 +8810,17 @@ react-scripts@5.0.1: optionalDependencies: fsevents "^2.3.2" +react-slick@^0.30.2: + version "0.30.2" + resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.30.2.tgz#b28e992f9c519bb516a0af8d37e82cb59fee08ce" + integrity sha512-XvQJi7mRHuiU3b9irsqS9SGIgftIfdV5/tNcURTb5LdIokRA5kIIx3l4rlq2XYHfxcSntXapoRg/GxaVOM1yfg== + dependencies: + classnames "^2.2.5" + enquire.js "^2.1.6" + json2mq "^0.2.0" + lodash.debounce "^4.0.8" + resize-observer-polyfill "^1.5.0" + react-smooth@^2.0.5: version "2.0.5" resolved "https://registry.npmjs.org/react-smooth/-/react-smooth-2.0.5.tgz" @@ -9006,6 +9046,11 @@ requires-port@^1.0.0: resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz" integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== +resize-observer-polyfill@^1.5.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" + integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== + resolve-cwd@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz" @@ -9351,6 +9396,11 @@ slash@^4.0.0: resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz" integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== +slick-carousel@^1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/slick-carousel/-/slick-carousel-1.8.1.tgz#a4bfb29014887bb66ce528b90bd0cda262cc8f8d" + integrity sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA== + sockjs@^0.3.24: version "0.3.24" resolved "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz" @@ -9481,6 +9531,11 @@ stop-iteration-iterator@^1.0.0: dependencies: internal-slot "^1.0.4" +string-convert@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97" + integrity sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A== + string-length@^4.0.1: version "4.0.2" resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz" diff --git a/kcsc-back-end/src/main/resources/application-local.properties b/kcsc-back-end/src/main/resources/application-local.properties new file mode 100644 index 0000000..4c0c55c --- /dev/null +++ b/kcsc-back-end/src/main/resources/application-local.properties @@ -0,0 +1,41 @@ +# ??? ? ?? ?? properties ?? ?? ? ?? ??. + +# Access-Control-Allow-Origin +Globals.Allow.Origin = https://back.dbnt.co.kr + +server.port=50688 + +spring.devtools.livereload.enabled=false +server.error.path=/errors + +logging.level.org.apache.tomcat: info +logging.level.org.apache.catalina: info + +#Datasource Configuration +spring.sql.init.encoding=utf-8 +#maximum-pool-size: CPU core count +spring.datasource.hikari.maximum-pool-size=4 +#postgresql +spring.datasource.driverClassName=org.postgresql.Driver +spring.datasource.url=jdbc:postgresql://118.219.150.34:50503/kcsc +spring.datasource.username=dbnt0031 +spring.datasource.password=dbnt0928! + +#jpa +spring.jpa.show-sql=false +spring.jpa.generate-ddl=false +spring.jpa.hibernate.naming.physical-strategy = org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl +spring.jpa.properties.hibernate.proc.param_null_passing=true + +# MyBatis +mybatis.mapper-locations: mybatisMapper/*.xml +mybatis.configuration.map-underscore-to-camel-case=true +mybatis.type-aliases-package=com.dbnt.kcscbackend.**.entity +logging.level.com.atoz_develop.mybatissample.repository=info + +# File Config +Globals.posblAtchFileSize=5242880 +Globals.fileStorePath=/kcscUploadFiles +Globals.addedOptions=false + +kcsc.opensearch.url=http://192.168.0.89:8090 \ No newline at end of file