Skip to content

Commit 22dbf22

Browse files
xmonaderxmonader
authored
Merge pull request #3368 from threefoldtech/development
bump to 11.5b13
2 parents d5aaf5d + 49021c2 commit 22dbf22

File tree

29 files changed

+257
-237
lines changed

29 files changed

+257
-237
lines changed

‎jumpscale/clients/stellar/balance.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ def from_horizon_response(response_balance):
1515
if response_balance["asset_type"] == "native":
1616
asset_code = "XLM"
1717
asset_issuer = None
18+
elif response_balance["asset_type"] == "liquidity_pool_shares":
19+
return None
1820
else:
1921
asset_code = response_balance["asset_code"]
2022
asset_issuer = response_balance["asset_issuer"]

‎jumpscale/clients/stellar/stellar.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@ def _get_free_balances(self, address=None):
9191
balances = AccountBalances(address)
9292
response = self._get_horizon_server().accounts().account_id(address).call()
9393
for response_balance in response["balances"]:
94-
balances.add_balance(Balance.from_horizon_response(response_balance))
94+
balance = Balance.from_horizon_response(response_balance)
95+
if balance is not None:
96+
balances.add_balance(balance)
9597
return balances
9698

9799
def load_account(self):

‎jumpscale/packages/admin/frontend/components/legal/License.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<v-card-text>
55
<markdown-view
66
base-url="https://legal.threefold.io/#/"
7-
url="https://raw.githubusercontent.com/threefoldfoundation/legal/master/src/terms_conditions_all.md"
7+
url="https://raw.githubusercontent.com/threefoldfoundation/info_legal/development/wiki/terms_conditions_all.md"
88
></markdown-view>
99
</v-card-text>
1010
<v-divider></v-divider>

‎jumpscale/packages/admin/frontend/components/legal/Terms.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<template>
22
<markdown-view
33
base-url="https://legal.threefold.io/#/"
4-
url="https://raw.githubusercontent.com/threefoldfoundation/legal/master/src/terms_conditions_all.md"
4+
url="https://raw.githubusercontent.com/threefoldfoundation/info_legal/development/wiki/terms_conditions_all.md"
55
></markdown-view>
66
</template>
7-

‎jumpscale/packages/admin/frontend/index.html‎

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,48 @@
11
<html lang="en">
2-
<head>
3-
<link href="https://cdn.jsdelivr.net/npm/@mdi/[email protected]/css/materialdesignicons.min.css" rel="stylesheet">
4-
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/vuetify.min.css" rel="stylesheet">
5-
<link href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/codemirror.min.css" rel="stylesheet">
6-
<link href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/addon/scroll/simplescrollbars.css" rel="stylesheet">
7-
<link href="style.css" rel="stylesheet"></link>
8-
<title>3Bot Admin</title>
9-
<link rel="icon" type="image/png" href="assets/3bot.png"/>
102

11-
<style>
12-
.v-data-table-header th {
13-
white-space: nowrap;
14-
}
15-
</style>
16-
</head>
3+
<head>
4+
<link href="https://cdn.jsdelivr.net/npm/@mdi/[email protected]/css/materialdesignicons.min.css" rel="stylesheet">
5+
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/vuetify.min.css" rel="stylesheet">
6+
<link href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/codemirror.min.css" rel="stylesheet">
7+
<link href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/addon/scroll/simplescrollbars.css"
8+
rel="stylesheet">
9+
<link href="style.css" rel="stylesheet">
10+
</link>
11+
<title>3Bot Admin</title>
12+
<link rel="icon" type="image/png" href="assets/3bot.png" />
1713

18-
<body>
19-
<div id="app"><App></App></div>
20-
<script src="https://unpkg.com/vue"></script>
21-
<script src="https://unpkg.com/vuex"></script>
22-
<script src="https://unpkg.com/[email protected]"></script>
23-
<script src="https://unpkg.com/vue-router/dist/vue-router.js"></script>
24-
<script src="https://unpkg.com/http-vue-loader"></script>
25-
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
26-
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/codemirror.min.js"></script>
27-
<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.js"></script>
28-
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/vue-codemirror.min.js"></script>
29-
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/mode/python/python.min.js"></script>
30-
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/addon/scroll/simplescrollbars.js"></script>
31-
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/mode/python/python.min.js"></script>
32-
<script src="https://unpkg.com/[email protected]/dist/json-tree.js"></script>
33-
<script src="https://unpkg.com/[email protected]/vue-cookies.js"></script>
34-
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
14+
<style>
15+
.v-data-table-header th {
16+
white-space: nowrap;
17+
}
18+
</style>
19+
</head>
20+
21+
<body>
22+
<div id="app">
23+
<App></App>
24+
</div>
25+
<script src="https://unpkg.com/[email protected]/dist/vue.js"></script>
26+
<script src="https://unpkg.com/[email protected]/dist/vue-router.js"></script>
27+
<script src="https://unpkg.com/vuex"></script>
28+
<script src="https://unpkg.com/[email protected]"></script>
29+
<script src="https://unpkg.com/http-vue-loader"></script>
30+
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
31+
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/codemirror.min.js"></script>
32+
<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.js"></script>
33+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/vue-codemirror.min.js"></script>
34+
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/mode/python/python.min.js"></script>
35+
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/addon/scroll/simplescrollbars.js"></script>
36+
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/mode/python/python.min.js"></script>
37+
<script src="https://unpkg.com/[email protected]/dist/json-tree.js"></script>
38+
<script src="https://unpkg.com/[email protected]/vue-cookies.js"></script>
39+
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
40+
41+
<script src="api.js"></script>
42+
<script src="data.js"></script>
43+
<script src="index.js"></script>
44+
<script src="./mixins/base.js"></script>
45+
<script src="./mixins/dialog.js"></script>
46+
</body>
3547

36-
<script src="api.js"></script>
37-
<script src="data.js"></script>
38-
<script src="index.js"></script>
39-
<script src="./mixins/base.js"></script>
40-
<script src="./mixins/dialog.js"></script>
41-
</body>
4248
</html>

‎jumpscale/packages/chatflows/frontend/index.html‎

Lines changed: 113 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,125 @@
11
<html lang="en">
2-
<head>
3-
<link href="https://cdn.jsdelivr.net/npm/@mdi/[email protected]/css/materialdesignicons.min.css" rel="stylesheet">
4-
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/vuetify.min.css" rel="stylesheet">
5-
<link href='https://api.mapbox.com/mapbox-gl-js/v1.10.0/mapbox-gl.css' rel='stylesheet' />
6-
<link href="/chatflows/static/style.css" rel="stylesheet">
7-
</head>
82

9-
<body>
10-
<div id="app"><router-view></router-view></div>
11-
<script src="/chatflows/static/mixins/field.js"></script>
12-
<script src="https://unpkg.com/vue"></script>
13-
<script src="https://unpkg.com/vuex"></script>
14-
<script src="https://unpkg.com/[email protected]"></script>
15-
<script src="https://unpkg.com/vue-router/dist/vue-router.js"></script>
16-
<script src="https://unpkg.com/http-vue-loader"></script>
17-
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
18-
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
19-
<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.js"></script>
20-
<script src='https://api.mapbox.com/mapbox-gl-js/v1.10.0/mapbox-gl.js'></script>
21-
<script src="https://www.unpkg.com/[email protected]/dist/md5.min.js"></script>
22-
<script type="text/javascript">
3+
<head>
4+
<link href="https://cdn.jsdelivr.net/npm/@mdi/[email protected]/css/materialdesignicons.min.css" rel="stylesheet">
5+
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/vuetify.min.css" rel="stylesheet">
6+
<link href='https://api.mapbox.com/mapbox-gl-js/v1.10.0/mapbox-gl.css' rel='stylesheet' />
7+
<link href="/chatflows/static/style.css" rel="stylesheet">
8+
</head>
239

24-
Vue.use(Vuex)
25-
Vue.use(Vuetify)
10+
<body>
11+
<div id="app">
12+
<router-view></router-view>
13+
</div>
14+
<script src="/chatflows/static/mixins/field.js"></script>
15+
<script src="https://unpkg.com/[email protected]/dist/vue.js"></script>
16+
<script src="https://unpkg.com/[email protected]/dist/vue-router.js"></script>
17+
<script src="https://unpkg.com/vuex"></script>
18+
<script src="https://unpkg.com/[email protected]"></script>
19+
<script src="https://unpkg.com/http-vue-loader"></script>
20+
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
21+
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
22+
<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.js"></script>
23+
<script src='https://api.mapbox.com/mapbox-gl-js/v1.10.0/mapbox-gl.js'></script>
24+
<script src="https://www.unpkg.com/[email protected]/dist/md5.min.js"></script>
25+
<script type="text/javascript">
2626

27-
const baseUrl = '/chatflows/static/'
28-
const PACKAGE = '{{ package }}'
29-
const CHAT = '{{ chat }}'
30-
const QS = '{{ qs }}'
31-
const USERNAME = '{{ username }}'
32-
const EMAIL = '{{ email }}'
33-
const CLIENT_IP = '{{ client_ip }}'
34-
const NOHEADER = '{{ noheader }}'
27+
Vue.use(Vuex)
28+
Vue.use(Vuetify)
3529

36-
httpVueLoader.register(Vue, `${baseUrl}/components/Message.vue`)
37-
httpVueLoader.register(Vue, `${baseUrl}/components/String.vue`)
38-
httpVueLoader.register(Vue, `${baseUrl}/components/Number.vue`)
39-
httpVueLoader.register(Vue, `${baseUrl}/components/Secret.vue`)
40-
httpVueLoader.register(Vue, `${baseUrl}/components/TextArea.vue`)
41-
httpVueLoader.register(Vue, `${baseUrl}/components/DateTime.vue`)
42-
httpVueLoader.register(Vue, `${baseUrl}/components/SingleChoice.vue`)
43-
httpVueLoader.register(Vue, `${baseUrl}/components/MultipleChoices.vue`)
44-
httpVueLoader.register(Vue, `${baseUrl}/components/DropDown.vue`)
45-
httpVueLoader.register(Vue, `${baseUrl}/components/MultipleListChoices.vue`)
46-
httpVueLoader.register(Vue, `${baseUrl}/components/UploadFile.vue`)
47-
httpVueLoader.register(Vue, `${baseUrl}/components/DownloadFile.vue`)
48-
httpVueLoader.register(Vue, `${baseUrl}/components/QRCode.vue`)
49-
httpVueLoader.register(Vue, `${baseUrl}/components/Markdown.vue`)
50-
httpVueLoader.register(Vue, `${baseUrl}/components/Form.vue`)
51-
httpVueLoader.register(Vue, `${baseUrl}/components/Loading.vue`)
52-
httpVueLoader.register(Vue, `${baseUrl}/components/InfiniteLoading.vue`)
53-
httpVueLoader.register(Vue, `${baseUrl}/components/Confirm.vue`)
54-
httpVueLoader.register(Vue, `${baseUrl}/components/TimeDelta.vue`)
55-
httpVueLoader.register(Vue, `${baseUrl}/components/Location.vue`)
56-
httpVueLoader.register(Vue, `${baseUrl}/components/Error.vue`)
57-
httpVueLoader.register(Vue, `${baseUrl}/components/MultiValues.vue`)
30+
const baseUrl = '/chatflows/static/'
31+
const PACKAGE = '{{ package }}'
32+
const CHAT = '{{ chat }}'
33+
const QS = '{{ qs }}'
34+
const USERNAME = '{{ username }}'
35+
const EMAIL = '{{ email }}'
36+
const CLIENT_IP = '{{ client_ip }}'
37+
const NOHEADER = '{{ noheader }}'
5838

59-
Vue.mixin({
60-
data: function() {
61-
return {
62-
categories: {
63-
string_ask: 'String',
64-
int_ask: 'Number',
65-
secret_ask: 'Secret',
66-
text_ask: 'TextArea',
67-
single_choice: 'SingleChoice',
68-
multi_choice: 'MultipleChoices',
69-
multi_list_choice: 'MultipleListChoices',
70-
drop_down_choice: 'DropDown',
71-
datetime_picker: 'DateTime',
72-
time_delta: 'TimeDelta',
73-
location_ask: 'Location',
74-
upload_file: 'UploadFile',
75-
download_file: 'DownloadFile',
76-
qrcode_show: 'QRCode',
77-
md_show: 'Markdown',
78-
confirm: 'Confirm',
79-
loading: 'Loading',
80-
infinite_loading: 'InfiniteLoading',
81-
ask_multi_values: 'MultiValues',
82-
form: 'Form',
83-
error: 'Error'
84-
}
39+
httpVueLoader.register(Vue, `${baseUrl}/components/Message.vue`)
40+
httpVueLoader.register(Vue, `${baseUrl}/components/String.vue`)
41+
httpVueLoader.register(Vue, `${baseUrl}/components/Number.vue`)
42+
httpVueLoader.register(Vue, `${baseUrl}/components/Secret.vue`)
43+
httpVueLoader.register(Vue, `${baseUrl}/components/TextArea.vue`)
44+
httpVueLoader.register(Vue, `${baseUrl}/components/DateTime.vue`)
45+
httpVueLoader.register(Vue, `${baseUrl}/components/SingleChoice.vue`)
46+
httpVueLoader.register(Vue, `${baseUrl}/components/MultipleChoices.vue`)
47+
httpVueLoader.register(Vue, `${baseUrl}/components/DropDown.vue`)
48+
httpVueLoader.register(Vue, `${baseUrl}/components/MultipleListChoices.vue`)
49+
httpVueLoader.register(Vue, `${baseUrl}/components/UploadFile.vue`)
50+
httpVueLoader.register(Vue, `${baseUrl}/components/DownloadFile.vue`)
51+
httpVueLoader.register(Vue, `${baseUrl}/components/QRCode.vue`)
52+
httpVueLoader.register(Vue, `${baseUrl}/components/Markdown.vue`)
53+
httpVueLoader.register(Vue, `${baseUrl}/components/Form.vue`)
54+
httpVueLoader.register(Vue, `${baseUrl}/components/Loading.vue`)
55+
httpVueLoader.register(Vue, `${baseUrl}/components/InfiniteLoading.vue`)
56+
httpVueLoader.register(Vue, `${baseUrl}/components/Confirm.vue`)
57+
httpVueLoader.register(Vue, `${baseUrl}/components/TimeDelta.vue`)
58+
httpVueLoader.register(Vue, `${baseUrl}/components/Location.vue`)
59+
httpVueLoader.register(Vue, `${baseUrl}/components/Error.vue`)
60+
httpVueLoader.register(Vue, `${baseUrl}/components/MultiValues.vue`)
61+
62+
Vue.mixin({
63+
data: function () {
64+
return {
65+
categories: {
66+
string_ask: 'String',
67+
int_ask: 'Number',
68+
secret_ask: 'Secret',
69+
text_ask: 'TextArea',
70+
single_choice: 'SingleChoice',
71+
multi_choice: 'MultipleChoices',
72+
multi_list_choice: 'MultipleListChoices',
73+
drop_down_choice: 'DropDown',
74+
datetime_picker: 'DateTime',
75+
time_delta: 'TimeDelta',
76+
location_ask: 'Location',
77+
upload_file: 'UploadFile',
78+
download_file: 'DownloadFile',
79+
qrcode_show: 'QRCode',
80+
md_show: 'Markdown',
81+
confirm: 'Confirm',
82+
loading: 'Loading',
83+
infinite_loading: 'InfiniteLoading',
84+
ask_multi_values: 'MultiValues',
85+
form: 'Form',
86+
error: 'Error'
8587
}
8688
}
87-
})
89+
}
90+
})
8891

89-
const vuetify = new Vuetify({
90-
icons: {
91-
iconfont: 'mdi'
92-
},
93-
theme: {
94-
themes: {
95-
light: {
96-
primary: '#1B4F72',
97-
secondary: '#F39C12',
98-
accent: '#F4F6F7',
99-
error: '#EC7063',
100-
},
92+
const vuetify = new Vuetify({
93+
icons: {
94+
iconfont: 'mdi'
95+
},
96+
theme: {
97+
themes: {
98+
light: {
99+
primary: '#1B4F72',
100+
secondary: '#F39C12',
101+
accent: '#F4F6F7',
102+
error: '#EC7063',
101103
},
102-
}
103-
})
104-
105-
const app = httpVueLoader('/chatflows/static/App.vue')
106-
const router = new VueRouter({
107-
routes: [
108-
{ path: '/', component: app},
109-
]
110-
})
111-
new Vue({
112-
el: '#app',
113-
components: {
114-
App: app,
115104
},
116-
router,
117-
vuetify
118-
})
119-
</script>
120-
</body>
105+
}
106+
})
107+
108+
const app = httpVueLoader('/chatflows/static/App.vue')
109+
const router = new VueRouter({
110+
routes: [
111+
{ path: '/', component: app },
112+
]
113+
})
114+
new Vue({
115+
el: '#app',
116+
components: {
117+
App: app,
118+
},
119+
router,
120+
vuetify
121+
})
122+
</script>
123+
</body>
124+
121125
</html>

‎jumpscale/packages/marketplace/frontend/components/License.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<v-card-text>
55
<markdown-view
66
base-url="https://legal.threefold.io/#/"
7-
url="https://raw.githubusercontent.com/threefoldfoundation/legal/master/src/terms_conditions_all.md"
7+
url="https://raw.githubusercontent.com/threefoldfoundation/info_legal/development/wiki/terms_conditions_all.md"
88
></markdown-view>
99
</v-card-text>
1010
<v-divider></v-divider>

‎jumpscale/packages/marketplace/frontend/components/Terms.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<template>
22
<markdown-view
33
base-url="https://legal.threefold.io/#/"
4-
url="https://raw.githubusercontent.com/threefoldfoundation/legal/master/src/terms_conditions_all.md"
4+
url="https://raw.githubusercontent.com/threefoldfoundation/info_legal/development/wiki/terms_conditions_all.md"
55
></markdown-view>
66
</template>
7-

‎jumpscale/packages/marketplace/frontend/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<div id="app">
1717
<App></App>
1818
</div>
19-
<script src="https://unpkg.com/vue"></script>
19+
<script src="https://unpkg.com/[email protected]/dist/vue.js"></script>
20+
<script src="https://unpkg.com/[email protected]/dist/vue-router.js"></script>
2021
<script src="https://unpkg.com/vuex"></script>
2122
<script src="https://unpkg.com/[email protected]"></script>
22-
<script src="https://unpkg.com/vue-router/dist/vue-router.js"></script>
2323
<script src="https://unpkg.com/http-vue-loader"></script>
2424
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
2525
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/codemirror.min.js"></script>

0 commit comments

Comments
 (0)