visualpython · minjk-bl · Jul 20, 2021 · Jun 18, 2021 · Jun 18, 2021 · Jun 18, 2021
diff --git a/bin/visualpy b/bin/visualpy
@@ -4,21 +4,24 @@
 # Filename : visualpy
 # function : control visualpython for Mac/Linux
 # Creator  : BlackLogic  - LJ
-# version  : 2.1
+# version  : 2.2
 # License  :
 # Date     : 2020 07.27
-# Mdate    : 2020 12.29
+# Mdate    : 2021 07.20
 #============================================================================
 
-v_path1=`pip show visualpython | grep Location | awk -F': ' '{print $2}'`
+v_pip=pip
+which pip3 > /dev/null 2>&1 && v_pip=pip3
+
+v_path1=`${v_pip} show visualpython | grep Location | awk -F': ' '{print $2}'`
 v_prod='visualpython'
 v_str1='jupyter nbextension'
 v_str2='visualpython/src/main'
-v_unst='pip uninstall '${v_prod}
-v_upgr='pip install '${v_prod}' --upgrade'
-#v_srch='pip search '${v_prod}
-v_str3='pip list -o '
-v_str4='pip show '${v_prod}
+v_unst=${v_pip}' uninstall '${v_prod}
+v_upgr=${v_pip}' install '${v_prod}' --upgrade'
+#v_srch=${v_pip}' search '${v_prod}
+v_str3=${v_pip}' list -o '
+v_str4=${v_pip}' show '${v_prod}
 #v_list=`${v_str3} | grep -i ${v_prod}`
 v_curt=`${v_str4} | grep 'Version' | cut -d ' ' -f 2`
 v_option=$1
@@ -294,7 +297,7 @@ f_prt_extensiondir() {
     echo "jupyter contrib nbextension install --user"
     f_prt_line2
     echo "for pip"
-    echo "pip install -e jupyter_contrib_nbextensions"
+    echo ${v_pip}" install -e jupyter_contrib_nbextensions"
     echo "jupyter contrib nbextension install --user"
     f_prt_line1
 }

diff --git a/bin/visualpy.bat b/bin/visualpy.bat
@@ -4,28 +4,31 @@ rem #==========================================================================
 rem # Filename : visualpy.bat
 rem # function : control Visual Python for windows
 rem # Creator  : BlackLogic - LJ
-rem # version  : 2.1
+rem # version  : 2.2
 rem # License  : GPLv3
 rem # Date     : 2020 07.30
-rem # MDate    : 2020 12.29
+rem # MDate    : 2020 07.20
 rem #==========================================================================
 
 rem ## setting variables
 
+set v_pip=pip
+where pip3 > nul 2>&1 && set v_pip=pip3
+
 set v_prod=visualpython
 (echo "%v_prod%" & echo.) | findstr /O . | more +1 | (set /P RESULT= & call exit /B %%RESULT%%)
 set /A v_prd_length=%ERRORLEVEL%-5
 set v_option=%1
-for /f "delims=, tokens=1*" %%i in ('pip show %v_prod% 2^>^&1 ^| find "Location"') do (
+for /f "delims=, tokens=1*" %%i in ('%v_pip% show %v_prod% 2^>^&1 ^| find "Location"') do (
 set v_1=%%i)
 set v_path1=%v_1:~10%
 set v_str1=jupyter nbextension
 set v_str2=%v_prod%/src/main
-set v_srch=pip search %v_prod%
+set v_srch=%v_pip% search %v_prod%
 set v_upgr=pip install %v_prod% --upgrade
-set v_unst=pip uninstall %v_prod%
-set v_ckup=pip list -o
-set v_show=pip show %v_prod%
+set v_unst=%v_pip% uninstall %v_prod%
+set v_ckup=%v_pip% list -o
+set v_show=%v_pip% show %v_prod%
 
 rem check env & setting path2
 where /q conda-env

diff --git a/css/api_block/index.css b/css/api_block/index.css
@@ -20,16 +20,54 @@
 .vp-apiblock-board-body {
     position: relative;
     overflow: hidden auto;
-    height: 100%;
+    height: calc(100% - 100px);
+}
+
+.vp-apiblock-tab-container {
+
+}
+
+.vp-apiblock-tab-header {
+    height: 40px;
+    line-height: 40px;
+    background: white;
+    /* padding: 0px 20px; */
+
+    display: grid;
+    grid-template-columns: repeat(2, 50%);
+}
+
+.vp-apiblock-tab-button {
+    display: inline-block;
+    height: 40px;
+    background: var(--light-gray-color);
+    border: 0.25px solid #E4E4E4;
+    text-align: center;
+    font-weight: bold;
+}
+.vp-apiblock-tab-button.selected {
+    color: var(--hightlight-color);
+    background: white;
+    border-bottom: 2px solid var(--hightlight-color);
+}
+.vp-apiblock-tab-button:hover {
+    background: var(--light-gray-color);
 }
 
+
+.vp-apiblock-tab-box {
+    height: calc(100% - 90px);
+}
+
+
 .vp-apiblock-left {
     /* padding: 1.5rem; */
     /* padding: 5px; */
     background-color: white;
 
     /* 수정 */
-    width: 200px;
+    /* width: 200px; */
+    width: 100%;
     height: 100%;
     overflow: hidden auto;
 
@@ -38,12 +76,14 @@
 
 .vp-apiblock-right {
     position: relative;
-    margin-left: 5px;
-    margin-right: 5px;
+    /* margin-left: 5px;
+    margin-right: 5px; */
 
     /* min-width: 282px; */
     min-width: 265px;
 
+    height: 100%;
+
     color: #000;
     background-size: 5px 5px;
     /* background-image: repeating-linear-gradient( to right, #F5F5F5 0, #F5F5F5 0.25px, transparent 1px, transparent 50px ), repeating-linear-gradient( to bottom, #F5F5F5 0, #F5F5F5 0.25px, transparent 1px, transparent 50px ); */
@@ -63,6 +103,11 @@
 .vp-menu-search-box {
     width: 100%;
     height: 30px;
+
+    border: 0.25px solid #E4E4E4;
+    box-sizing: border-box;
+    box-shadow: 2px 2px 1px rgb(0 0 0 / 10%);
+    border-radius: 2px;
 }
 
 .vp-menu-search-icon {
@@ -108,8 +153,8 @@
 }
 .vp-apiblock-menu-apps-grid {
     display: grid;
-    grid-template-columns: repeat(3, 58px);
-    grid-template-rows: repeat(3, 58px);
+    grid-template-columns: repeat(auto-fill, 58px);
+    grid-template-rows: repeat(auto-fill, 58px);
     grid-column-gap: 5px;
     grid-row-gap: 5px;
 
@@ -119,7 +164,7 @@
     width: 58;
     height: 58px;
     text-align: center;
-    border: 0.25px solid #C4C4C4;
+    /* border: 0.25px solid #C4C4C4; */
     box-sizing: border-box;
     box-shadow: 2px 2px 1px rgba(0, 0, 0, 0.1);
     border-radius: 2px;
@@ -185,6 +230,8 @@
     left: unset !important;
     z-index: 12;
 
+    margin-left: 5px;
+
     border: 0.25px solid var(--border-gray-color);
 }
 
@@ -259,7 +306,7 @@
 .vp-apiblock-option-buttons-container {
     position: sticky;
     bottom: 0;
-    height: 52px;
+    height: 50px;
     width: 100%;
     background: #FFFFFF;
     border-top: 0.25px solid #E4E4E4;
@@ -282,9 +329,46 @@
     right: 105px;
 }
 
-.vp-apiblock-option-apply-button {
+/* .vp-apiblock-option-apply-button {
     top: 11px;
     right: 15px;
+} */
+.vp-apiblock-option-addrun-button {
+    top: 11px;
+    right: 15px;
+    width: fit-content;
+    height: 30px;
+    background: #F38504;
+    border-radius: 2px;
+}
+.vp-apiblock-option-run-button {
+    display: inline-block;
+    width: 60px;
+    border-radius: 2px 0px 0px 2px;
+    border-right: 0.25px solid white !important;
+}
+.vp-apiblock-option-detail-button {
+    display: inline-block;
+    width: 20px;
+    border-radius: 0px 2px 2px 0px;
+}
+.vp-apiblock-option-detail-box {
+    background: white;
+    border: 0.25px solid var(--border-gray-color);
+    position: absolute;
+    bottom: 35px;
+    right: 1px;
+    width: 84px;
+    height: 30px;
+    text-align: center;
+    line-height: 30px;
+}
+.vp-apiblock-option-detail-item {
+    color: var(--font-primary);
+}
+.vp-apiblock-option-detail-item:hover {
+    color: var(--font-hightlight);
+    background: var(--light-gray-color);
 }
 
 .vp-block-container {
@@ -351,23 +435,23 @@
 }
 
 .vp-block-class-def {
-    background-color: rgba(47, 133, 90, 0.2);
+    /* background-color: rgba(47, 133, 90, 0.2); */
 }
 
 .vp-block-control {
-    background-color: rgba(246, 173, 85, 0.2);
+    /* background-color: rgba(246, 173, 85, 0.2); */
 }
 
 .vp-block-text div {
     white-space: normal;
 }
 
 .vp-block-api {
-    background-color: rgba(255, 165, 112, 0.2);
+    /* background-color: rgba(255, 165, 112, 0.2); */
 }
 .vp-apiblock-tab-navigation-node-block-body-btn.api.vp-block-api {
-    width: 100% !important;
-    max-width: 130px !important;
+    /* width: 100% !important;
+    max-width: 130px !important; */
     overflow: hidden;
     text-overflow: ellipsis;
 }
@@ -417,7 +501,7 @@
     background-color:rgb(253, 239, 221);
 }
 .vp-block-blockcodelinetype-code {
-    background-color: rgb(229, 229, 229);
+    /* background-color: rgb(229, 229, 229); */
 }
 
 .vp-block-name {
@@ -441,6 +525,7 @@
 .vp-apiblock-category {
     cursor: pointer;
     background: var(--light-gray-color);
+    border-radius: 2px;
     /* padding: 7px 0px 7px 0px !important; */
     padding: 7px 7px !important; /* 수정 */
     margin-top: 5px;
@@ -461,6 +546,11 @@
     font-size: 10px;
 }
 
+.vp-apiblock-group-list:empty::after {
+    content: 'Work In Progress...';
+    color: var(--gray-color);
+}
+
 
 .vp-apiblock-tab-title {
     font-size: 16px;
@@ -484,7 +574,7 @@
     padding-left: 15px;
 
     overflow: auto;
-    height: calc(100% - 102px);
+    height: calc(100% - 100px);
 }
 
 .vp-apiblock-tab-navigation-node-block-title {
@@ -501,9 +591,11 @@
 .vp-apiblock-tab-navigation-node-block-body-btn {
 
     position: relative;
-    text-align: center;
+    /* text-align: center; */
+
+    /* width: 130px; */
+    width: 95%;
 
-    width: 130px;
 
     padding: 0.25rem 0.5rem;
     z-index: 1000;
@@ -516,7 +608,7 @@
 
     display: flex;
     flex-direction: row;
-    justify-content: space-around;
+    /* justify-content: space-around; */
 
     color: #777;
 }
@@ -547,7 +639,7 @@
     transition: mask-position 0.3s, -webkit-mask-position 0.3s; */
 
     overflow-y: auto;
-    -webkit-mask-position: left top;
+    --webkit-mask-position: left top;
 }
 
 /* .vp-apiblock-scrollbar:hover {
@@ -559,9 +651,9 @@
     width: 5px;
     height: 5px;
 } 
-.vp-apiblock-scrollbar::-webkit-scrollbar-track {
+/* .vp-apiblock-scrollbar::-webkit-scrollbar-track {
     box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.3);
-}  
+}   */
 .vp-apiblock-scrollbar::-webkit-scrollbar-thumb {
     border: 0.3px solid #C4C4C4;
     background: #C4C4C4;
@@ -1290,8 +1382,8 @@
 
 .vp-apiblock-board-button-container {
     width: 100%;
-    height: 52px;
-    position: absolute;
+    height: 50px;
+    /* position: absolute; */
     bottom: 0;
     background: #FFFFFF;
     border-top: 0.25px solid #E4E4E4;