pav
/
pav-home
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

변경 요청사항 적용

master
김장현 23 hours ago
parent
ebfe6e9fcb
commit
f8beb8ed98
7 changed files with 24 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      public/index.html
  2. 8
      src/@core/layouts/components/menu/vertical-menu/VerticalMenuHeader.js
  3. 6
      src/@core/layouts/components/navbar/NavbarUser.js
  4. 8
      src/components/account/login/AccountLogin.js
  5. 2
      src/components/dashboard/DashboardMenu.js
  6. 8
      src/configs/themeConfig.js
  7. 12
      src/views/control/main/ControlMain.js

2
public/index.html
Unescape View File

@ -71,7 +71,7 @@
href="https://unpkg.com/leaflet@1.5.1/dist/leaflet.css" href="https://unpkg.com/leaflet@1.5.1/dist/leaflet.css"
crossorigin="" crossorigin=""
/> />
<title>Drone Control System</title> <title>PAV Monitoring System</title>
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>

8
src/@core/layouts/components/menu/vertical-menu/VerticalMenuHeader.js
Unescape View File

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

6
src/@core/layouts/components/navbar/NavbarUser.js
Unescape View File

@ -102,7 +102,7 @@ const NavbarUser = props => {
// }} // }}
> >
{/* {user?.cstmrSno === 27 ? 'UAM 관제 시스템' : '드론 관제 시스템'} */} {/* {user?.cstmrSno === 27 ? 'UAM 관제 시스템' : '드론 관제 시스템'} */}
UAM 관제 시스템 PAV 모니터링 시스템
</NavLink> </NavLink>
</NavItem> </NavItem>
<NavItem> <NavItem>
@ -132,7 +132,7 @@ const NavbarUser = props => {
날씨 정보 날씨 정보
</NavLink> </NavLink>
</NavItem> </NavItem>
<NavItem> {/* <NavItem>
<NavLink <NavLink
onClick={e => handlerTopMenu('reservation')} onClick={e => handlerTopMenu('reservation')}
active={topMenuCd === 'reservation'} active={topMenuCd === 'reservation'}
@ -143,7 +143,7 @@ const NavbarUser = props => {
> >
도심항공교통(UAM) 예약 도심항공교통(UAM) 예약
</NavLink> </NavLink>
</NavItem> </NavItem> */}
</Nav> </Nav>
{/* <div className='bookmark-wrapper d-flex align-items-center'> {/* <div className='bookmark-wrapper d-flex align-items-center'>
<NavItem className='d-none d-lg-block'> <NavItem className='d-none d-lg-block'>

8
src/components/account/login/AccountLogin.js
Unescape View File

@ -28,7 +28,7 @@ export const AccountLogin = ({ props }) => {
const { isLogin, message } = useSelector(state => state.authState); const { isLogin, message } = useSelector(state => state.authState);
const [loginForm, setLoginForm] = useState({ const [loginForm, setLoginForm] = useState({
userId: 'palnet', userId: '',
userPswd: '' userPswd: ''
// userPswd: 'palnet5909!' // userPswd: 'palnet5909!'
}); });
@ -93,19 +93,19 @@ export const AccountLogin = ({ props }) => {
<> <>
<div className='login'> <div className='login'>
{/* <div className='login-logo'>Drone Control System</div> */} {/* <div className='login-logo'>Drone Control System</div> */}
<div className='login-logo'>UAM 항공교통 모니터링 시스템</div> <div className='login-logo'>PAV 모니터링 시스템</div>
<div className='login-img'> <div className='login-img'>
<img src={loginImg} /> <img src={loginImg} />
</div> </div>
<div className='login-form'> <div className='login-form'>
<div className='login-txt'> <div className='login-txt'>
{/* <h2>Welcome to Drone Control System</h2> */} {/* <h2>Welcome to Drone Control System</h2> */}
<h2>Welcome to UAM 항공교통 모니터링 시스템</h2> <h2>PAV 모니터링 시스템</h2>
<p> <p>
control system is a web system that provides control system is a web system that provides
<br /> <br />
{/* convenient control and monitoring of drones! */} {/* convenient control and monitoring of drones! */}
convenient control and monitoring of UAM! convenient control and monitoring of PAV!
</p> </p>
</div> </div>
<Form> <Form>

2
src/components/dashboard/DashboardMenu.js
Unescape View File

@ -9,7 +9,7 @@ export const DashboardMenu = props => {
<Card className='menu-list01'> <Card className='menu-list01'>
<a href='#' onClick={() => window.open('/control', '_blank')}> <a href='#' onClick={() => window.open('/control', '_blank')}>
{/* {user?.cstmrSno === 27 ? 'UAM 관제 시스템' : '드론 관제 시스템'} */} {/* {user?.cstmrSno === 27 ? 'UAM 관제 시스템' : '드론 관제 시스템'} */}
UAM 관제 시스템 PAV 모니터링 시스템
</a> </a>
</Card> </Card>
</Col> </Col>

8
src/configs/themeConfig.js
Unescape View File

@ -3,11 +3,11 @@
//Template config options //Template config options
const themeConfig = { const themeConfig = {
app: { app: {
appName: 'DRONESYS', // appName: 'DRONESYS',
// appLogoImage: require('@src/assets/images/logo/logo.svg').default, // 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: '인천테크노파크', appName: '인천테크노파크',
// appLogoImage: require('../assets/images/itp_logo_wh_icon.png').default appLogoImage: require('../assets/images/itp_logo_wh_icon.png').default
}, },
layout: { layout: {
isRTL: false, isRTL: false,

12
src/views/control/main/ControlMain.js
Unescape View File

@ -169,14 +169,14 @@ const ControlMain = () => {
<ControlAlarmNotice /> <ControlAlarmNotice />
<div className='left-menu'> <div className='left-menu'>
<h1 className='logo'> {/* <h1 className='logo'>
<img src={logo} width='80' /> <img src={logo} width='80' />
<span>{user?.cstmrSno === 27 ? 'FLYTO' : 'PAL'}</span> <span>{user?.cstmrSno === 27 ? 'FLYTO' : 'PAL'}</span>
</h1> </h1> */}
{/* <h1 className='logo itp'> <h1 className='logo itp'>
<img src={itp_logo} width='80' /> <img src={itp_logo} width='80' />
<span>{user?.cstmrSno === 27 ? 'FLYTO' : '인천테크노파크'}</span> <span>{user?.cstmrSno === 27 ? 'FLYTO' : '인천테크노파크'}</span>
</h1> */} </h1>
<ul className='left-menu-nav'> <ul className='left-menu-nav'>
<li> <li>
@ -227,7 +227,7 @@ const ControlMain = () => {
<li> <li>
<img src={ongjin_logo} width='60' /> <img src={ongjin_logo} width='60' />
</li> </li>
<li> {/* <li>
<img src={nam_logo} width='50' /> <img src={nam_logo} width='50' />
</li> </li>
<li> <li>
@ -235,7 +235,7 @@ const ControlMain = () => {
</li> </li>
<li> <li>
<img src={kiast_logo} width='80' /> <img src={kiast_logo} width='80' />
</li> </li> */}
</> </>
)} )}
<li> <li>

Write Preview
Loading…
Cancel
Save