Skip to content

Commit 1c2fd5e

Browse files
minjk-blminjk-bl
authored
Merge pull request #39 from visualpython/devops
Devops
2 parents fd3293f + 2e14664 commit 1c2fd5e

35 files changed

Lines changed: 1443 additions & 432 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 06.04
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: 11 additions & 8 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 : 2021 06.04
1111
rem #==========================================================================
1212

1313
rem ## setting variables
1414

15+
set v_pip=pip
16+
where pip3 > /dev/null 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%
25-
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%
27+
set v_srch=%v_pip% search %v_prod%
28+
set v_upgr=%v_pip% install %v_prod% --upgrade
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: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454

5555
.vp-apiblock-menu-search-container {
5656
position: relative;
57+
display: inline-block;
58+
width: 160px;
5759
}
5860

5961
.vp-menu-search-box {
@@ -68,6 +70,65 @@
6870
top: 7px;
6971
}
7072

73+
.vp-apiblock-menu-apps {
74+
display: inline-block;
75+
width: 18px;
76+
height: 27px;
77+
vertical-align: middle;
78+
79+
cursor: pointer;
80+
}
81+
.vp-apiblock-menu-apps-container {
82+
display: none;
83+
position: absolute;
84+
top: 0px;
85+
left: 200px;
86+
width: 210px;
87+
height: 210px;
88+
z-index: 15;
89+
background: rgba(255, 255, 255, 0.8);
90+
grid-template-columns: 60px 60px 60px;
91+
grid-template-rows: 60px 60px 60px;
92+
grid-column-gap: 5px;
93+
grid-row-gap: 5px;
94+
padding: 10px;
95+
box-sizing: border-box;
96+
box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.1);
97+
/* border: 0.25px solid #C4C4C4; */
98+
border: 0.25px solid var(--border-gray-color);
99+
border-radius: 5px;
100+
}
101+
.vp-apiblock-menu-apps-container.show {
102+
display: grid !important;
103+
}
104+
105+
.vp-apiblock-menu-apps-item {
106+
width: 60px;
107+
height: 60px;
108+
text-align: center;
109+
border: 0.25px solid #C4C4C4;
110+
box-sizing: border-box;
111+
box-shadow: 2px 2px 1px rgba(0, 0, 0, 0.1);
112+
border-radius: 2px;
113+
padding: 8px 0px;
114+
}
115+
.vp-apiblock-menu-apps-item.line1 {
116+
background: #F9B52A;
117+
}
118+
.vp-apiblock-menu-apps-item.line2 {
119+
background: #EF8F3C
120+
}
121+
.vp-apiblock-menu-apps-item.line3 {
122+
background: #EB773C;
123+
}
124+
.vp-apiblock-menu-apps-item img {
125+
width: 24px;
126+
height: 24px;
127+
}
128+
.vp-apiblock-menu-apps-name {
129+
color: #FFFFFF;
130+
}
131+
71132
.vp-apiblock-menu-box {
72133
background: #FFFFFF;
73134
border: 0.25px solid #E4E4E4;

‎css/common/snippets.css‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
.vp-sn {
2+
position: absolute;
3+
top: 0;
4+
left: 0;
5+
width: 100%;
6+
height: 100%;
7+
8+
z-index: 1200;
9+
10+
background-color: rgba(0,0,0,.4);
11+
}
12+
13+
.vp-sn-container {
14+
position: relative;
15+
left: 50%;
16+
top: 50%;
17+
transform:translate(-50%, -50%);
18+
19+
min-width: 400px;
20+
min-height: 400px;
21+
width: 95%;
22+
height: 95%;
23+
24+
background-color: white;
25+
}
26+
27+
.vp-sn-title {
28+
height: 30px;
29+
padding: 5px 0px 5px 10px;
30+
31+
background-color: #EEE;
32+
border: 1px solid #ddd;;
33+
display: flex;
34+
flex-direction: row;
35+
position: relative;
36+
37+
font-weight: 700;
38+
}
39+
40+
.vp-sn-close {
41+
position: fixed;
42+
z-index: 3;
43+
right: 5px;
44+
width: 20px;
45+
height: 20px;
46+
line-height: 20px;
47+
top: 5px;
48+
text-align: center;
49+
}
50+
51+
.vp-sn-body {
52+
width: 100%;
53+
height: calc(100% - 30px);
54+
padding: 10px;
55+
display: grid;
56+
grid-row-gap: 5px;
57+
grid-template-rows: 35px 30px 60% calc(40% - 80px);
58+
}

‎css/file_io/udf.css‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,171 @@
107107
.vp-cm-popup-menu {
108108
min-height: 20px;
109109
cursor: pointer;
110+
}
111+
112+
113+
/** new */
114+
.vp-sn-body {
115+
padding: 10px;
116+
}
117+
.vp-sn-header {
118+
height: 30px;
119+
}
120+
.vp-sn-header label {
121+
font-weight: bold;
122+
font-size: 13px;
123+
line-height: 16px;
124+
}
125+
.vp-sn-menu {
126+
float: right;
127+
cursor: pointer;
128+
}
129+
.vp-sn-menu-box {
130+
display: none;
131+
position: absolute;
132+
top: 0px;
133+
right: 40px;
134+
width: 70px;
135+
height: 50px;
136+
border: 0.25px solid var(--border-gray-color);
137+
background: #FFFFFF;
138+
}
139+
.vp-sn-menu-item {
140+
height: 25px;
141+
line-height: 25px;
142+
padding: 0px 5px;
143+
cursor: pointer;
144+
}
145+
146+
.vp-sn-search-box {
147+
148+
}
149+
.vp-sn-search {
150+
width: 100%;
151+
height: 30px;
152+
}
153+
.vp-sn-search-box i {
154+
position: absolute;
155+
color: #C4C4C4;
156+
right: 20px;
157+
padding-top: 8px;
158+
}
159+
.vp-sn-func-box {
160+
height: 50px;
161+
padding: 10px 0px;
162+
}
163+
.vp-sn-func-left {
164+
float: left;
165+
}
166+
.vp-sn-func-right {
167+
float: right;
168+
}
169+
.vp-sn-filter {
170+
cursor: pointer;
171+
}
172+
.vp-sn-filter-menu-box {
173+
display: none;
174+
position: absolute;
175+
width: 80px;
176+
height: 50px;
177+
border: 0.25px solid var(--border-gray-color);
178+
background: #FFFFFF;
179+
}
180+
.vp-sn-filter-menu-item {
181+
height: 25px;
182+
line-height: 25px;
183+
padding: 0px 5px;
184+
cursor: pointer;
185+
}
186+
187+
.vp-sn-func-export-mode {
188+
display: none;
189+
}
190+
191+
.vp-sn-item-check {
192+
display: none;
193+
float: right;
194+
margin: 7px 7px !important;
195+
}
196+
197+
/* export mode */
198+
.vp-sn-export-mode .vp-sn-menu {
199+
display: none;
200+
}
201+
.vp-sn-export-mode .vp-sn-func-export-mode {
202+
display: block;
203+
}
204+
.vp-sn-export-mode .vp-sn-func-default-mode {
205+
display: none;
206+
}
207+
.vp-sn-export-mode .vp-sn-item-menu {
208+
display: none;
209+
}
210+
#vp-wrapper .vp-sn-export-mode input.vp-sn-checkbox {
211+
display: inline-block;
212+
position: relative !important;
213+
width: 13px;
214+
height: 13px;
215+
border: 1px solid #828282;
216+
margin: 0px 15px;
217+
}
218+
219+
220+
/* if snippets list empty */
221+
.vp-sn-table:empty::after {
222+
content: '(No saved snippets)';
223+
color: #C4C4C4;
224+
}
225+
.vp-sn-item {
226+
min-height: 30px;
227+
}
228+
.vp-sn-item.selected {
229+
background: #F5F5F5;
230+
}
231+
.vp-sn-item-header {
232+
height: 30px;
233+
line-height: 30px;
234+
padding: 0px 7px;
235+
border: 0.25px solid var(--border-gray-color);
236+
box-sizing: border-box;
237+
}
238+
.vp-sn-item-header .vp-sn-indicator {
239+
display: inline-block;
240+
cursor: pointer;
241+
background-image: url(../../resource/chevron_big_right.svg);
242+
background-size: contain;
243+
background-repeat: no-repeat;
244+
width: 10px;
245+
height: 10px;
246+
}
247+
.vp-sn-item-header .vp-sn-indicator.open {
248+
background-image: url(../../resource/chevron_big_down.svg) !important;
249+
}
250+
.vp-sn-item-title {
251+
width: calc(100% - 80px);
252+
outline: none;
253+
border: 0.5px solid white !important;
254+
}
255+
.vp-sn-item.selected .vp-sn-item-title {
256+
background: #F5F5F5;
257+
color: var(--font-hightlight);
258+
}
259+
.vp-sn-item-title:focus {
260+
transition: 0.7s;
261+
border: 1px solid #FFCF73;
262+
border: 0.5px solid var(--hightlight-color) !important;
263+
}
264+
.vp-sn-imported-item {
265+
color: var(--hightlight-color);
266+
}
267+
.vp-sn-item-menu {
268+
float: right;
269+
}
270+
.vp-sn-item-menu-item {
271+
display: inline-block;
272+
cursor: pointer;
273+
}
274+
.vp-sn-item-code {
275+
display: none;
276+
border: 0.25px solid var(--border-gray-color);
110277
}

0 commit comments

Comments
 (0)