Skip to content

Commit 4cb9a9a

Browse files
minjk-blminjk-bl
authored
Merge pull request #52 from minjk-bl/devops
for v1.1.6 update
2 parents 7bc338c + 098e536 commit 4cb9a9a

29 files changed

Lines changed: 1882 additions & 528 deletions

‎bin/visualpy‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@
44
# Filename : visualpy
55
# function : control visualpython for Mac/Linux
66
# Creator : BlackLogic - LJ
7-
# version : 2.1
7+
# version : 2.2
88
# License :
99
# Date : 2020 07.27
10-
# Mdate : 2020 12.29
10+
# Mdate : 2021 07.20
1111
#============================================================================
1212

13-
v_path1=`pip show visualpython | grep Location | awk -F': ' '{print $2}'`
13+
v_pip=pip
14+
which pip3 > /dev/null 2>&1 && v_pip=pip3
15+
16+
v_path1=`${v_pip} show visualpython | grep Location | awk -F': ' '{print $2}'`
1417
v_prod='visualpython'
1518
v_str1='jupyter nbextension'
1619
v_str2='visualpython/src/main'
17-
v_unst='pip uninstall '${v_prod}
18-
v_upgr='pip install '${v_prod}' --upgrade'
19-
#v_srch='pip search '${v_prod}
20-
v_str3='pip list -o '
21-
v_str4='pip show '${v_prod}
20+
v_unst=${v_pip}' uninstall '${v_prod}
21+
v_upgr=${v_pip}' install '${v_prod}' --upgrade'
22+
#v_srch=${v_pip}' search '${v_prod}
23+
v_str3=${v_pip}' list -o '
24+
v_str4=${v_pip}' show '${v_prod}
2225
#v_list=`${v_str3} | grep -i ${v_prod}`
2326
v_curt=`${v_str4} | grep 'Version' | cut -d ' ' -f 2`
2427
v_option=$1
@@ -294,7 +297,7 @@ f_prt_extensiondir() {
294297
echo "jupyter contrib nbextension install --user"
295298
f_prt_line2
296299
echo "for pip"
297-
echo "pip install -e jupyter_contrib_nbextensions"
300+
echo ${v_pip}" install -e jupyter_contrib_nbextensions"
298301
echo "jupyter contrib nbextension install --user"
299302
f_prt_line1
300303
}

‎bin/visualpy.bat‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,31 @@ rem #==========================================================================
44
rem # Filename : visualpy.bat
55
rem # function : control Visual Python for windows
66
rem # Creator : BlackLogic - LJ
7-
rem # version : 2.1
7+
rem # version : 2.2
88
rem # License : GPLv3
99
rem # Date : 2020 07.30
10-
rem # MDate : 2020 12.29
10+
rem # MDate : 2020 07.20
1111
rem #==========================================================================
1212

1313
rem ## setting variables
1414

15+
set v_pip=pip
16+
where pip3 > nul 2>&1 && set v_pip=pip3
17+
1518
set v_prod=visualpython
1619
(echo "%v_prod%" & echo.) | findstr /O . | more +1 | (set /P RESULT= & call exit /B %%RESULT%%)
1720
set /A v_prd_length=%ERRORLEVEL%-5
1821
set v_option=%1
19-
for /f "delims=, tokens=1*" %%i in ('pip show %v_prod% 2^>^&1 ^| find "Location"') do (
22+
for /f "delims=, tokens=1*" %%i in ('%v_pip% show %v_prod% 2^>^&1 ^| find "Location"') do (
2023
set v_1=%%i)
2124
set v_path1=%v_1:~10%
2225
set v_str1=jupyter nbextension
2326
set v_str2=%v_prod%/src/main
24-
set v_srch=pip search %v_prod%
27+
set v_srch=%v_pip% search %v_prod%
2528
set v_upgr=pip install %v_prod% --upgrade
26-
set v_unst=pip uninstall %v_prod%
27-
set v_ckup=pip list -o
28-
set v_show=pip show %v_prod%
29+
set v_unst=%v_pip% uninstall %v_prod%
30+
set v_ckup=%v_pip% list -o
31+
set v_show=%v_pip% show %v_prod%
2932

3033
rem check env & setting path2
3134
where /q conda-env

‎css/api_block/index.css‎

Lines changed: 116 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,54 @@
2020
.vp-apiblock-board-body {
2121
position: relative;
2222
overflow: hidden auto;
23-
height: 100%;
23+
height: calc(100% - 100px);
24+
}
25+
26+
.vp-apiblock-tab-container {
27+
28+
}
29+
30+
.vp-apiblock-tab-header {
31+
height: 40px;
32+
line-height: 40px;
33+
background: white;
34+
/* padding: 0px 20px; */
35+
36+
display: grid;
37+
grid-template-columns: repeat(2, 50%);
38+
}
39+
40+
.vp-apiblock-tab-button {
41+
display: inline-block;
42+
height: 40px;
43+
background: var(--light-gray-color);
44+
border: 0.25px solid #E4E4E4;
45+
text-align: center;
46+
font-weight: bold;
47+
}
48+
.vp-apiblock-tab-button.selected {
49+
color: var(--hightlight-color);
50+
background: white;
51+
border-bottom: 2px solid var(--hightlight-color);
52+
}
53+
.vp-apiblock-tab-button:hover {
54+
background: var(--light-gray-color);
2455
}
2556

57+
58+
.vp-apiblock-tab-box {
59+
height: calc(100% - 90px);
60+
}
61+
62+
2663
.vp-apiblock-left {
2764
/* padding: 1.5rem; */
2865
/* padding: 5px; */
2966
background-color: white;
3067

3168
/* 수정 */
32-
width: 200px;
69+
/* width: 200px; */
70+
width: 100%;
3371
height: 100%;
3472
overflow: hidden auto;
3573

@@ -38,12 +76,14 @@
3876

3977
.vp-apiblock-right {
4078
position: relative;
41-
margin-left: 5px;
42-
margin-right: 5px;
79+
/* margin-left: 5px;
80+
margin-right: 5px; */
4381

4482
/* min-width: 282px; */
4583
min-width: 265px;
4684

85+
height: 100%;
86+
4787
color: #000;
4888
background-size: 5px 5px;
4989
/* 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 @@
63103
.vp-menu-search-box {
64104
width: 100%;
65105
height: 30px;
106+
107+
border: 0.25px solid #E4E4E4;
108+
box-sizing: border-box;
109+
box-shadow: 2px 2px 1px rgb(0 0 0 / 10%);
110+
border-radius: 2px;
66111
}
67112

68113
.vp-menu-search-icon {
@@ -108,8 +153,8 @@
108153
}
109154
.vp-apiblock-menu-apps-grid {
110155
display: grid;
111-
grid-template-columns: repeat(3, 58px);
112-
grid-template-rows: repeat(3, 58px);
156+
grid-template-columns: repeat(auto-fill, 58px);
157+
grid-template-rows: repeat(auto-fill, 58px);
113158
grid-column-gap: 5px;
114159
grid-row-gap: 5px;
115160

@@ -119,7 +164,7 @@
119164
width: 58;
120165
height: 58px;
121166
text-align: center;
122-
border: 0.25px solid #C4C4C4;
167+
/* border: 0.25px solid #C4C4C4; */
123168
box-sizing: border-box;
124169
box-shadow: 2px 2px 1px rgba(0, 0, 0, 0.1);
125170
border-radius: 2px;
@@ -185,6 +230,8 @@
185230
left: unset !important;
186231
z-index: 12;
187232

233+
margin-left: 5px;
234+
188235
border: 0.25px solid var(--border-gray-color);
189236
}
190237

@@ -259,7 +306,7 @@
259306
.vp-apiblock-option-buttons-container {
260307
position: sticky;
261308
bottom: 0;
262-
height: 52px;
309+
height: 50px;
263310
width: 100%;
264311
background: #FFFFFF;
265312
border-top: 0.25px solid #E4E4E4;
@@ -282,9 +329,46 @@
282329
right: 105px;
283330
}
284331

285-
.vp-apiblock-option-apply-button {
332+
/* .vp-apiblock-option-apply-button {
286333
top: 11px;
287334
right: 15px;
335+
} */
336+
.vp-apiblock-option-addrun-button {
337+
top: 11px;
338+
right: 15px;
339+
width: fit-content;
340+
height: 30px;
341+
background: #F38504;
342+
border-radius: 2px;
343+
}
344+
.vp-apiblock-option-run-button {
345+
display: inline-block;
346+
width: 60px;
347+
border-radius: 2px 0px 0px 2px;
348+
border-right: 0.25px solid white !important;
349+
}
350+
.vp-apiblock-option-detail-button {
351+
display: inline-block;
352+
width: 20px;
353+
border-radius: 0px 2px 2px 0px;
354+
}
355+
.vp-apiblock-option-detail-box {
356+
background: white;
357+
border: 0.25px solid var(--border-gray-color);
358+
position: absolute;
359+
bottom: 35px;
360+
right: 1px;
361+
width: 84px;
362+
height: 30px;
363+
text-align: center;
364+
line-height: 30px;
365+
}
366+
.vp-apiblock-option-detail-item {
367+
color: var(--font-primary);
368+
}
369+
.vp-apiblock-option-detail-item:hover {
370+
color: var(--font-hightlight);
371+
background: var(--light-gray-color);
288372
}
289373

290374
.vp-block-container {
@@ -351,23 +435,23 @@
351435
}
352436

353437
.vp-block-class-def {
354-
background-color: rgba(47, 133, 90, 0.2);
438+
/* background-color: rgba(47, 133, 90, 0.2); */
355439
}
356440

357441
.vp-block-control {
358-
background-color: rgba(246, 173, 85, 0.2);
442+
/* background-color: rgba(246, 173, 85, 0.2); */
359443
}
360444

361445
.vp-block-text div {
362446
white-space: normal;
363447
}
364448

365449
.vp-block-api {
366-
background-color: rgba(255, 165, 112, 0.2);
450+
/* background-color: rgba(255, 165, 112, 0.2); */
367451
}
368452
.vp-apiblock-tab-navigation-node-block-body-btn.api.vp-block-api {
369-
width: 100% !important;
370-
max-width: 130px !important;
453+
/* width: 100% !important;
454+
max-width: 130px !important; */
371455
overflow: hidden;
372456
text-overflow: ellipsis;
373457
}
@@ -417,7 +501,7 @@
417501
background-color:rgb(253, 239, 221);
418502
}
419503
.vp-block-blockcodelinetype-code {
420-
background-color: rgb(229, 229, 229);
504+
/* background-color: rgb(229, 229, 229); */
421505
}
422506

423507
.vp-block-name {
@@ -441,6 +525,7 @@
441525
.vp-apiblock-category {
442526
cursor: pointer;
443527
background: var(--light-gray-color);
528+
border-radius: 2px;
444529
/* padding: 7px 0px 7px 0px !important; */
445530
padding: 7px 7px !important; /* 수정 */
446531
margin-top: 5px;
@@ -461,6 +546,11 @@
461546
font-size: 10px;
462547
}
463548

549+
.vp-apiblock-group-list:empty::after {
550+
content: 'Work In Progress...';
551+
color: var(--gray-color);
552+
}
553+
464554

465555
.vp-apiblock-tab-title {
466556
font-size: 16px;
@@ -484,7 +574,7 @@
484574
padding-left: 15px;
485575

486576
overflow: auto;
487-
height: calc(100% - 102px);
577+
height: calc(100% - 100px);
488578
}
489579

490580
.vp-apiblock-tab-navigation-node-block-title {
@@ -501,9 +591,11 @@
501591
.vp-apiblock-tab-navigation-node-block-body-btn {
502592

503593
position: relative;
504-
text-align: center;
594+
/* text-align: center; */
595+
596+
/* width: 130px; */
597+
width: 95%;
505598

506-
width: 130px;
507599

508600
padding: 0.25rem 0.5rem;
509601
z-index: 1000;
@@ -516,7 +608,7 @@
516608

517609
display: flex;
518610
flex-direction: row;
519-
justify-content: space-around;
611+
/* justify-content: space-around; */
520612

521613
color: #777;
522614
}
@@ -547,7 +639,7 @@
547639
transition: mask-position 0.3s, -webkit-mask-position 0.3s; */
548640

549641
overflow-y: auto;
550-
-webkit-mask-position: left top;
642+
--webkit-mask-position: left top;
551643
}
552644

553645
/* .vp-apiblock-scrollbar:hover {
@@ -559,9 +651,9 @@
559651
width: 5px;
560652
height: 5px;
561653
}
562-
.vp-apiblock-scrollbar::-webkit-scrollbar-track {
654+
/* .vp-apiblock-scrollbar::-webkit-scrollbar-track {
563655
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.3);
564-
}
656+
} */
565657
.vp-apiblock-scrollbar::-webkit-scrollbar-thumb {
566658
border: 0.3px solid #C4C4C4;
567659
background: #C4C4C4;
@@ -1290,8 +1382,8 @@
12901382

12911383
.vp-apiblock-board-button-container {
12921384
width: 100%;
1293-
height: 52px;
1294-
position: absolute;
1385+
height: 50px;
1386+
/* position: absolute; */
12951387
bottom: 0;
12961388
background: #FFFFFF;
12971389
border-top: 0.25px solid #E4E4E4;

0 commit comments

Comments
 (0)