diff --git a/src/@core/layouts/components/menu/vertical-menu/VerticalMenuHeader.js b/src/@core/layouts/components/menu/vertical-menu/VerticalMenuHeader.js
index 5b35872..e78189e 100644
--- a/src/@core/layouts/components/menu/vertical-menu/VerticalMenuHeader.js
+++ b/src/@core/layouts/components/menu/vertical-menu/VerticalMenuHeader.js
@@ -54,12 +54,22 @@ const VerticalMenuHeader = props => {
-
-
-
-
-
- {user?.cstmrSno === 27 ? 'FLYTO' : themeConfig.app.appName}
-
+
+
+
+
+
+ {user?.cstmrSno === 27 ? 'FLYTO' : themeConfig.app.appName}
+
+
+ {/*
+
+
+
+
+ {user?.cstmrSno === 27 ? 'FLYTO' : themeConfig.app.appName}
+
+
*/}
-
diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css
index a951cfb..da2fccd 100644
--- a/src/assets/css/custom.css
+++ b/src/assets/css/custom.css
@@ -229,7 +229,7 @@ h1.logo img{width:100%;}
h1.logo span{display:block;color:#f4f4f4;font-weight:bold;letter-spacing:2px;font-size:0.9375rem;}
.left-menu{width:80px;height:100vh;background:#283046;padding-top:20px;position:fixed;}
.left-menu-nav, .left-menu-footer{color:#bbb;}
-.left-menu-nav li, .left-menu-footer li{margin-top:20px;text-align:center;}
+.left-menu-nav li, .left-menu-footer li{margin-top:16px;text-align:center;}
.left-menu-footer{position:absolute;bottom:20px;left:50%;transform: translateX(-50%);}
.socket-wrap{display:flex;justify-content: center;}
.socket_on{display:block;width:32px;height:32px;border-radius:100%;background:#28C76F;position: relative;}
@@ -277,7 +277,7 @@ h1.logo span{display:block;color:#f4f4f4;font-weight:bold;letter-spacing:2px;fon
.login{display:flex;height:100vh;color:#bbb;position:relative;}
.login-logo{position:absolute;top:80px;left:100px;color:#bbb;font-weight:bold;font-size:1.8rem;width: 100%;}
.login-img, .login-form {display: flex;align-items: center;justify-content: center;}
-.login-img{flex:1.2;background:#161d31;}
+.login-img{flex:1.2;background:#161d31;cursor:inherit;user-select: none;}
.login-form{background:#283046;width:100%;flex:0.8;flex-direction: column;}
.login-form form{width:100%;padding:0 120px;}
.login-form .form-control{background:transparent;border:1px solid #404656;}
@@ -287,8 +287,8 @@ h1.logo span{display:block;color:#f4f4f4;font-weight:bold;letter-spacing:2px;fon
.login-form .form-control::placeholder{color:#bbb;}
.login-form .vx-checkbox-con .vx-checkbox{border-color: #404656;}
.login-txt{width:100%;margin-bottom:20px;}
-.login-txt h2{color:#f4f4f4;font-family: "Montserrat", serif;font-size:1.8rem;font-weight:bold;text-align: center;}
-.login-txt p{color:#bbb;font-family: "Montserrat", serif;font-size:1.125rem;font-weight:normal;text-align: center;margin-top:20px;}
+.login-txt h2{color:#f4f4f4;font-family: "Montserrat",'NotoSansKR', serif;font-size:1.8rem;font-weight:bold;text-align: center;}
+.login-txt p{color:#bbb;font-family: "Montserrat",'NotoSansKR', serif;font-size:1.125rem;font-weight:normal;text-align: center;margin-top:20px;}
.full-btn button{width:100%;margin-bottom:10px;}
.login-link{margin-top:10px;}
@media screen and (max-width:1280px){
@@ -971,4 +971,14 @@ background-size: 75% auto;
.uam-reservation-total .collapse.show{position:absolute;bottom:56px;}
.uam-reservation-total .app-collapse.card{background:#343D55}
.uam-reservation-total [class*='collapse-'] .card .card-body{padding:0}
-.uam-reservation-total-wrap{background:#fff;}
\ No newline at end of file
+.uam-reservation-total-wrap{background:#fff;}
+
+.main-menu .navbar-header .navbar-brand .brand-logo-box .brand-logo img{margin-top:-5px}
+.main-menu .navbar-header .navbar-brand .brand-logo-box .brand-text{padding-left:10px;}
+
+h1.logo.itp {margin: 10px auto;width:100%;}
+h1.logo.itp img{width:45px}
+h1.logo.itp span{font-size:0.6rem;font-weight:100;letter-spacing:0.3pt;margin-top:4px}
+.brand-logo-box{display:flex;}
+.main-menu .navbar-header .navbar-brand .brand-logo-box.itp .brand-logo img{margin-top:3px}
+.main-menu .navbar-header .navbar-brand .brand-logo-box.itp .brand-text{padding-left:10px;font-size:1.3rem;color:#fff}
\ No newline at end of file
diff --git a/src/assets/images/incheon_logo_wh.png b/src/assets/images/incheon_logo_wh.png
new file mode 100644
index 0000000..76a843e
Binary files /dev/null and b/src/assets/images/incheon_logo_wh.png differ
diff --git a/src/assets/images/itp_logo_wh.png b/src/assets/images/itp_logo_wh.png
new file mode 100644
index 0000000..5224d5e
Binary files /dev/null and b/src/assets/images/itp_logo_wh.png differ
diff --git a/src/assets/images/itp_logo_wh_icon.png b/src/assets/images/itp_logo_wh_icon.png
new file mode 100644
index 0000000..cd2322e
Binary files /dev/null and b/src/assets/images/itp_logo_wh_icon.png differ
diff --git a/src/assets/images/login_img.png b/src/assets/images/login_img.png
new file mode 100644
index 0000000..0992219
Binary files /dev/null and b/src/assets/images/login_img.png differ
diff --git a/src/assets/images/mi_logo_wh.png b/src/assets/images/mi_logo_wh.png
new file mode 100644
index 0000000..303afe7
Binary files /dev/null and b/src/assets/images/mi_logo_wh.png differ
diff --git a/src/assets/images/ongjin_logo_wh.png b/src/assets/images/ongjin_logo_wh.png
new file mode 100644
index 0000000..df5a3f1
Binary files /dev/null and b/src/assets/images/ongjin_logo_wh.png differ
diff --git a/src/components/account/login/AccountLogin.js b/src/components/account/login/AccountLogin.js
index b9a2a5d..409fcce 100644
--- a/src/components/account/login/AccountLogin.js
+++ b/src/components/account/login/AccountLogin.js
@@ -14,7 +14,7 @@ import {
} from 'reactstrap';
import { Mail, Lock, Check, Facebook, Twitter, GitHub } from 'react-feather';
-import loginImg from '../../../assets/images/login01.png';
+import loginImg from '../../../assets/images/login_img.png';
import { Link } from 'react-router-dom';
import '../../../assets/css/custom.css';
diff --git a/src/configs/themeConfig.js b/src/configs/themeConfig.js
index 44147d7..1b60aa6 100644
--- a/src/configs/themeConfig.js
+++ b/src/configs/themeConfig.js
@@ -3,9 +3,11 @@
//Template config options
const themeConfig = {
app: {
- appName: 'DRONESYS',
+ appName: 'DRONESYS',
// appLogoImage: require('@src/assets/images/logo/logo.svg').default,
- appLogoImage: require('../assets/images/pal_logo.png').default
+ appLogoImage: require('../assets/images/pal_logo.png').default
+ // appName: '인천테크노파크',
+ // appLogoImage: require('../assets/images/itp_logo_wh_icon.png').default
},
layout: {
isRTL: false,
diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js
index 92a9eed..d13793b 100644
--- a/src/views/control/main/ControlMain.js
+++ b/src/views/control/main/ControlMain.js
@@ -2,13 +2,16 @@ import React, { useEffect, useState } from 'react';
import '../../../assets/css/custom.css';
import logo from '../../../assets/images/pal_logo.png';
+import itp_logo from '../../../assets/images/itp_logo_wh_icon.png';
import finevt_logo from '../../../assets/images/finevt_logo.png';
import nam_logo from '../../../assets/images/nam_logo.png';
import future_logo from '../../../assets/images/future_logo.png';
import tp_logo from '../../../assets/images/tplogo_wh.png';
import kac_logo from '../../../assets/images/kac_logo_wh.png';
-import mi_logo from '../../../assets/images/mi_logo_wh.svg';
+import mi_logo from '../../../assets/images/mi_logo_wh.png';
import kiast_logo from '../../../assets/images/kiast_logo_wh.svg';
+import ongjin_logo from '../../../assets/images/ongjin_logo_wh.png';
+import incheon_logo from '../../../assets/images/incheon_logo_wh.png';
import {
Sun,
@@ -170,6 +173,10 @@ const ControlMain = () => {
{user?.cstmrSno === 27 ? 'FLYTO' : 'PAL'}
+ {/*
+
+ {user?.cstmrSno === 27 ? 'FLYTO' : '인천테크노파크'}
+
*/}
-
@@ -214,6 +221,12 @@ const ControlMain = () => {
<>>
) : (
<>
+
-
+
+
+ -
+
+
-
diff --git a/src/views/control/setting/ControlReservation.js b/src/views/control/setting/ControlReservation.js
index db4c1fb..78c41ba 100644
--- a/src/views/control/setting/ControlReservation.js
+++ b/src/views/control/setting/ControlReservation.js
@@ -41,7 +41,7 @@ export default function ControlReservation({ modal, handler }) {
여정1 선택완료
여정2 선택완료
-
+ TEST
),
content: (