Merge pull request #10 from tmax-cloud/dev

Dev

Author: seonghoon-jeong

CHANGELOG.md

@@ -1,3 +1,20 @@
+# v4.1.4 (2020.11.12)
+### Features
+ - Rook Ceph 설치 시, 입력 값 추가
+   - OSD, MON, MGR, MDS의 CPU, Memory 입력
+   - OSD 설치 할 Disk 입력 (IMS: 242409)
+ - Prometheus 설치 시, 입력 값 추가
+   - PVC 사용 여부 선택
+   - Service type, port 입력
+ - HyperCloud 설치 시, 입력 값 추가
+   - Ingress Controller 설치 옵션 선택
+   - admin계정 ID/PW 입력 (IMS: 243092) 
+ 
+### Fixes
+ - No changes
+
+---
+
 # v4.1.3 (2020.11.05)
 ### Features
  - Node 추가 시, HostName 미입력 시 자동 생성 기능 추가 (IMS: 242540)

app/app.global.css

@@ -5,6 +5,16 @@
 @import '~@fortawesome/fontawesome-free/css/all.css';
 @import url(http://fonts.googleapis.com/earlyaccess/notosanskr.css);
 
+@import 'css/button.css';
+@import 'css/div.css';
+@import 'css/font.css';
+@import 'css/image.css';
+@import 'css/removeMaterialGlobalCSS.css';
+@import 'css/span.css';
+@import 'css/table.css';
+@import 'css/textfiled.css';
+@import 'css/titlebar.css';
+
 /*
 h2 {
   margin: 0;
@@ -29,8 +39,6 @@ a:hover {
   cursor: pointer;
 } */
 
-
-
 body {
   background-color: #ebebf730;
   position: relative;
@@ -86,289 +94,3 @@ svg{
 .hidden{
   visibility : none !important;
 }
-
-/*
-img
-*/
-img.small {
-  width: 50px;
-  height: 50px;
-}
-img.medium {
-  width: 100px;
-  height: 100px;
-}
-img.large {
-  width: 200px;
-  height: 200px;
-}
-
-/*
-div
-*/
-div.left {
-  float: left;
-}
-div.right {
-  float: right;
-}
-div.clear {
-  clear: both;
-}
-/* full size */
-div.fullHeight {
-  height: 100%;
-}
-div.fullWidth {
-  width: 100%;
-}
-/* child 상하 정렬 */
-div.childUpDownUP {
-  display: flex;
-  align-items: flex-start;
-}
-div.childUpDownCenter {
-  display: flex;
-  align-items: center;
-}
-div.childUpDownDown {
-  display: flex;
-  align-items: flex-end;
-}
-/* child 좌우 정렬 */
-div.childLeftRightLeft {
-  display: flex;
-  justify-content: flex-start;
-}
-div.childLeftRightCenter {
-  display: flex;
-  justify-content: center;
-}
-div.childLeftRightRight {
-  display: flex;
-  justify-content: flex-end;
-}
-
-/*
-span
-*/
-/* child 왼쪽 정렬 */
-span.left{
-  text-align: left;
-}
-/* child 오른쪽 정렬 */
-span.right{
-  text-align: right;
-}
-
-/*
-title bar
-*/
-/* title bar 설정*/
-.titlebar {
-  background-color: #28384F !important;
-  /* background-image: url("../resources/assets/lnb_logo_bg_mint.png"); */
-  background-image: url("../resources/assets/lnb_logo_bg_blue.svg");
-  background-repeat: no-repeat;
-  height: 60px !important;
-  position: relative !important;
-}
-/* title bar icon 설정*/
-.titlebar > .window-appicon {
-  width: 250px !important;
-  height: inherit !important;
-  background-size: auto !important;
-}
-/* 최소화, 최대화, 닫기 높이 설정 */
-.titlebar .window-controls-container {
-  height: inherit !important;
-}
-/* title bar 밑에서 부터 container 설정*/
-.container-after-titlebar{
-  top: 0px !important;
-  height: calc(100vh - 60px);
-  position: relative !important;
-}
-
-/*
-font
-*/
-/* size */
-.veryLarge {
-  font-size: 22px;
-}
-.large {
-  font-size: 20px;
-}
-.medium {
-  font-size: 16px;
-}
-.small {
-  font-size: 14px;
-}
-.verySmall {
-  font-size: 12px;
-}
-/* brightness */
-.dark {
-  color:#4F5257;
-}
-.lightDark {
-  color:#6A6A6A;
-}
-.indicator{
-  color: #0992AC
-}
-/* weight */
-.thick {
-  font-weight: bold;
-}
-.thin {
-  font-weight: lighter;
-}
-
-/*
-button
-*/
-/* size */
-button.veryLarge {
-}
-button.large {
-}
-button.medium {
-}
-button.small {
-}
-button.verySmall {
-}
-/* color */
-button.primary {
-  background-color: #EC3854;
-  color:#FFFFFF;
-}
-button.primary:hover {
-  background-color: #D22D46;
-  color:#FFFFFF;
-}
-button.primary:active {
-  background-color:#BA2E44;
-  color:#FFFFFF;
-}
-/* button.primary {
-  background-color: #0992AC;
-  color:#FFFFFF;
-}
-button.primary:hover {
-  background-color: #067C92;
-  color:#FFFFFF;
-}
-button.primary:active {
-  background-color: #046A7D;
-  color:#FFFFFF;
-} */
-
-button.secondary {
-  background-color: #1E6CB9;
-  color:#FFFFFF;
-}
-button.secondary:hover {
-  background-color: #175B9E;
-  color:#FFFFFF;
-}
-button.secondary:active {
-  background-color: #0F4B86;
-  color:#FFFFFF;
-}
-/* button.secondary {
-  background-color: #FFFFFF;
-  color: #536882;
-  border: 1px solid #536882;
-}
-button.secondary:hover {
-  background-color: #E9F0F8;
-  color: #536882;
-  border: 1px solid #536882;
-}
-button.secondary:active {
-  background-color: #DDE8F7;
-  color: #536882;
-  border: 1px solid #536882;
-} */
-
-
-/*
-table
-*/
-/* header */
-thead.primary {
-  background-color: #31475E;
-}
-thead.primary span{
-  color: white !important;
-}
-thead.primary svg{
-  color: white !important;
-}
-
-/*
-textfiled
-*/
-.long input {
-  width: 400px;
-  padding: 8px 0 8px 5px;
-}
-.long > div {
-  width: 400px;
-  border-radius: 0px;
-}
-.medium input {
-  width: 200px;
-  padding: 8px 0 8px 5px;
-}
-.medium > div {
-  width: 200px;
-  border-radius: 0px;
-}
-.short input {
-  width: 100px;
-  padding: 8px 0 8px 5px;
-}
-.short > div {
-  width: 100px;
-  border-radius: 0px;
-}
-
-/*
-radio
-*/
-/* .MuiRadio-colorSecondary.Mui-checked {
-  color: #0992AC;
-} */
-.MuiRadio-colorSecondary.Mui-checked {
-  color: #EC3854;
-}
-
-
-/*
-checkbox
-*/
-/* .MuiCheckbox-colorSecondary.Mui-checked {
-  color: #0992AC !important;
-} */
-.MuiCheckbox-colorSecondary.Mui-checked {
-  color: #EC3854 !important;
-}
-
-/*
-button disabled
-*/
-.MuiButton-contained.Mui-disabled {
-  color: #C4C4C4 !important;
-  background-color: rgba(255, 255, 255, 0.5) !important;
-  border: 1px solid #C4C4C4 !important;
-}
-
-
-.MuiStepLabel-label.MuiStepLabel-active{
-  color: white !important;
-}

app/components/env/EnvContentsAdd.tsx

@@ -21,7 +21,6 @@ import {
   Button,
   TextField,
   InputAdornment,
-  CircularProgress,
   IconButton,
   FormControl,
   RadioGroup,
@@ -30,12 +29,9 @@ import {
 } from '@material-ui/core';
 import VisibilityIcon from '@material-ui/icons/Visibility';
 import VisibilityOffIcon from '@material-ui/icons/VisibilityOff';
-import AddIcon from '@material-ui/icons/Add';
 import RemoveIcon from '@material-ui/icons/Remove';
 import { green } from '@material-ui/core/colors';
 import CloseIcon from '@material-ui/icons/Close';
-import * as Common from '../../utils/common/common';
-import * as Script from '../../utils/common/script';
 import styles from './EnvContentsAdd.css';
 import * as env from '../../utils/common/env';
 import * as ssh from '../../utils/common/ssh';
@@ -88,7 +84,6 @@ function EnvContentsAdd(props: any) {
 
   const { history, match } = props;
 
-  const classes = useStyles();
 
   const appContext = useContext(AppContext);
   const { appState, dispatchAppState } = appContext;

app/components/install/InstallContents2.css

@@ -7,7 +7,7 @@
 }
 
 .titleBox {
-  width:150px;
+  width: 250px;
 }
 
 .select > div {

app/components/install/InstallContentsMain.tsx

@@ -177,14 +177,14 @@ function InstallContentsMain(props: any) {
                   >
                     <div
                       // kubernetes 미설치시, disabled
-                      style={
-                        !disabled
-                          ? {}
-                          : {
-                              pointerEvents: 'none',
-                              opacity: '0.4'
-                            }
-                      }
+                      // style={
+                      //   !disabled
+                      //     ? {}
+                      //     : {
+                      //         pointerEvents: 'none',
+                      //         opacity: '0.4'
+                      //       }
+                      // }
                       className={[
                         '',
                         'childLeftRightCenter',