Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

17 hours ago · 6b93fe2466
7 changed files with 24 additions and 24 deletions
--- a/public/index.html
+++ b/public/index.html
@ -71,7 +71,7 @@
      href="https://unpkg.com/leaflet@1.5.1/dist/leaflet.css"
      crossorigin=""
    />
-    <title>Drone Control System</title>
+    <title>PAV Monitoring System</title>
  </head>
  <body>
    <div id="root"></div>
--- a/src/@core/layouts/components/menu/vertical-menu/VerticalMenuHeader.js
+++ b/src/@core/layouts/components/menu/vertical-menu/VerticalMenuHeader.js
@ -54,22 +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 }}>
-            <div className='brand-logo-box'>
+            {/* <div className='brand-logo-box'>
              <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>
-            {/* <div className='brand-logo-box itp'>
+            </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> */}
+            </div>
          </NavLink>
        </li>
        <li className='nav-item nav-toggle'>
--- a/src/@core/layouts/components/navbar/NavbarUser.js
+++ b/src/@core/layouts/components/navbar/NavbarUser.js
@ -102,7 +102,7 @@ const NavbarUser = props => {
            // }}
          >
            {/* {user?.cstmrSno === 27 ? 'UAM 관제 시스템' : '드론 관제 시스템'} */}
-            UAM 관제 시스템
+            PAV 모니터링 시스템
          </NavLink>
        </NavItem>
        <NavItem>
@ -132,7 +132,7 @@ const NavbarUser = props => {
            날씨 정보
          </NavLink>
        </NavItem>
-        <NavItem>
+        {/* <NavItem>
          <NavLink
            onClick={e => handlerTopMenu('reservation')}
            active={topMenuCd === 'reservation'}
@ -143,7 +143,7 @@ const NavbarUser = props => {
          >
            도심항공교통(UAM) 예약
          </NavLink>
-        </NavItem>
+        </NavItem> */}
      </Nav>
      {/* <div className='bookmark-wrapper d-flex align-items-center'>
        <NavItem className='d-none d-lg-block'>
--- a/src/components/account/login/AccountLogin.js
+++ b/src/components/account/login/AccountLogin.js
@ -28,7 +28,7 @@ export const AccountLogin = ({ props }) => {
  const { isLogin, message } = useSelector(state => state.authState);

  const [loginForm, setLoginForm] = useState({
-    userId: 'palnet',
+    userId: '',
    userPswd: ''
    // userPswd: 'palnet5909!'
  });
@ -93,19 +93,19 @@ export const AccountLogin = ({ props }) => {
    <>
      <div className='login'>
        {/* <div className='login-logo'>Drone Control System</div> */}
-        <div className='login-logo'>UAM 항공교통 모니터링 시스템</div>
+        <div className='login-logo'>PAV 모니터링 시스템</div>
        <div className='login-img'>
          <img src={loginImg} />
        </div>
        <div className='login-form'>
          <div className='login-txt'>
            {/* <h2>Welcome to Drone Control System</h2> */}
-            <h2>Welcome to UAM 항공교통 모니터링 시스템</h2>
+            <h2>PAV 모니터링 시스템</h2>
            <p>
              control system is a web system that provides
              <br />
              {/* convenient control and monitoring of drones! */}
-              convenient control and monitoring of UAM!
+              convenient control and monitoring of PAV!
            </p>
          </div>
          <Form>
--- a/src/components/dashboard/DashboardMenu.js
+++ b/src/components/dashboard/DashboardMenu.js
@ -9,7 +9,7 @@ export const DashboardMenu = props => {
        <Card className='menu-list01'>
          <a href='#' onClick={() => window.open('/control', '_blank')}>
            {/* {user?.cstmrSno === 27 ? 'UAM 관제 시스템' : '드론 관제 시스템'} */}
-            UAM 관제 시스템
+            PAV 모니터링 시스템
          </a>
        </Card>
      </Col>
--- a/src/configs/themeConfig.js
+++ b/src/configs/themeConfig.js
@ -3,11 +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
-    // appName: '인천테크노파크',
-    // appLogoImage: require('../assets/images/itp_logo_wh_icon.png').default
+    //  appLogoImage: require('../assets/images/pal_logo.png').default
+    appName: '인천테크노파크',
+    appLogoImage: require('../assets/images/itp_logo_wh_icon.png').default
  },
  layout: {
    isRTL: false,
--- a/src/views/control/main/ControlMain.js
+++ b/src/views/control/main/ControlMain.js
@ -169,14 +169,14 @@ const ControlMain = () => {
      <ControlAlarmNotice />

      <div className='left-menu'>
-        <h1 className='logo'>
+        {/* <h1 className='logo'>
          <img src={logo} width='80' />
          <span>{user?.cstmrSno === 27 ? 'FLYTO' : 'PAL'}</span>
-        </h1>
-        {/* <h1 className='logo itp'>
+        </h1> */}
+        <h1 className='logo itp'>
          <img src={itp_logo} width='80' />
          <span>{user?.cstmrSno === 27 ? 'FLYTO' : '인천테크노파크'}</span>
-        </h1> */}
+        </h1>

        <ul className='left-menu-nav'>
          <li>
@ -226,8 +226,8 @@ const ControlMain = () => {
              </li>
              <li>
                <img src={ongjin_logo} width='60' />
-              </li>            
-              <li>
+              </li>
+              {/* <li>
                <img src={nam_logo} width='50' />
              </li>
              <li>
@ -235,7 +235,7 @@ const ControlMain = () => {
              </li>
              <li>
                <img src={kiast_logo} width='80' />
-              </li>
+              </li> */}
            </>
          )}
          <li>