logo img 추가, itp 관련 추가 후 주석

src/@core/layouts/components/menu/vertical-menu/VerticalMenuHeader.js

@@ -54,12 +54,22 @@ const VerticalMenuHeader = props => {
       <ul className='nav navbar-nav flex-row'>
         <li className='nav-item mr-auto'>
           <NavLink to='/' className='navbar-brand' style={{ marginRight: 0 }}>
-            <span className='brand-logo'>
+            <div className='brand-logo-box'>
-              <img src={themeConfig.app.appLogoImage} alt='logo' />
+              <span className='brand-logo'>
-            </span>
+                <img src={themeConfig.app.appLogoImage} alt='logo' />
-            <h2 className='brand-text mb-0'>
+              </span>
-              {user?.cstmrSno === 27 ? 'FLYTO' : themeConfig.app.appName}
+              <h2 className='brand-text mb-0'>
-            </h2>
+                {user?.cstmrSno === 27 ? 'FLYTO' : themeConfig.app.appName}
+              </h2>
+            </div>
+            {/* <div className='brand-logo-box itp'>
+              <span className='brand-logo'>
+                <img src={themeConfig.app.appLogoImage} alt='logo' />
+              </span>
+              <h2 className='brand-text mb-0'>
+                {user?.cstmrSno === 27 ? 'FLYTO' : themeConfig.app.appName}
+              </h2>
+            </div> */}
           </NavLink>
         </li>
         <li className='nav-item nav-toggle'>

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 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", serif;font-size:1.125rem;font-weight:normal;text-align: center;margin-top:20px;}
+.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;}
+.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}

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';

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,

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 = () => {
           <img src={logo} width='80' />
           <span>{user?.cstmrSno === 27 ? 'FLYTO' : 'PAL'}</span>
         </h1>
+        {/* <h1 className='logo itp'>
+          <img src={itp_logo} width='80' />
+          <span>{user?.cstmrSno === 27 ? 'FLYTO' : '인천테크노파크'}</span>
+        </h1> */}
 
         <ul className='left-menu-nav'>
           <li>
@@ -214,6 +221,12 @@ const ControlMain = () => {
             <></>
           ) : (
             <>
+              <li>
+                <img src={incheon_logo} width='60' />
+              </li>
+              <li>
+                <img src={ongjin_logo} width='60' />
+              </li>            
               <li>
                 <img src={nam_logo} width='50' />
               </li>

src/views/control/setting/ControlReservation.js

@@ -41,7 +41,7 @@ export default function ControlReservation({ modal, handler }) {
             <span>여정1 선택완료</span>
             <span>여정2 선택완료</span>
           </div>
-          <div></div>
+          <div>TEST</div>
         </div>
       ),
       content: (