Skip to content

Commit

Permalink
Merge pull request #3368 from threefoldtech/development
Browse files Browse the repository at this point in the history 
bump to 11.5b13
  • Loading branch information
@xmonader
xmonader committed Mar 29, 2022
2 parents d5aaf5d + 49021c2 commit 22dbf22
Show file tree
Hide file tree
Showing 29 changed files with 257 additions and 237 deletions.
2 changes: 2 additions & 0 deletions jumpscale/clients/stellar/balance.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ def from_horizon_response(response_balance):
if response_balance["asset_type"] == "native":
asset_code = "XLM"
asset_issuer = None
elif response_balance["asset_type"] == "liquidity_pool_shares":
return None
else:
asset_code = response_balance["asset_code"]
asset_issuer = response_balance["asset_issuer"]
Expand Down
4 changes: 3 additions & 1 deletion jumpscale/clients/stellar/stellar.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ def _get_free_balances(self, address=None):
balances = AccountBalances(address)
response = self._get_horizon_server().accounts().account_id(address).call()
for response_balance in response["balances"]:
balances.add_balance(Balance.from_horizon_response(response_balance))
balance = Balance.from_horizon_response(response_balance)
if balance is not None:
balances.add_balance(balance)
return balances

def load_account(self):
Expand Down
2 changes: 1 addition & 1 deletion jumpscale/packages/admin/frontend/components/legal/License.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<v-card-text>
<markdown-view
base-url="https://legal.threefold.io/#/"
url="https://raw.githubusercontent.com/threefoldfoundation/legal/master/src/terms_conditions_all.md"
url="https://raw.githubusercontent.com/threefoldfoundation/info_legal/development/wiki/terms_conditions_all.md"
></markdown-view>
</v-card-text>
<v-divider></v-divider>
Expand Down
3 changes: 1 addition & 2 deletions jumpscale/packages/admin/frontend/components/legal/Terms.vue
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<template>
<markdown-view
base-url="https://legal.threefold.io/#/"
url="https://raw.githubusercontent.com/threefoldfoundation/legal/master/src/terms_conditions_all.md"
url="https://raw.githubusercontent.com/threefoldfoundation/info_legal/development/wiki/terms_conditions_all.md"
></markdown-view>
</template>

80 changes: 43 additions & 37 deletions jumpscale/packages/admin/frontend/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,48 @@
<html lang="en">
<head>
<link href="https://cdn.jsdelivr.net/npm/@mdi/[email protected]/css/materialdesignicons.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/vuetify.min.css" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/codemirror.min.css" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/addon/scroll/simplescrollbars.css" rel="stylesheet">
<link href="style.css" rel="stylesheet"></link>
<title>3Bot Admin</title>
<link rel="icon" type="image/png" href="assets/3bot.png"/>

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

<body>
<div id="app"><App></App></div>
<script src="https://unpkg.com/vue"></script>
<script src="https://unpkg.com/vuex"></script>
<script src="https://unpkg.com/[email protected]"></script>
<script src="https://unpkg.com/vue-router/dist/vue-router.js"></script>
<script src="https://unpkg.com/http-vue-loader"></script>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/codemirror.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/vue-codemirror.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/mode/python/python.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/addon/scroll/simplescrollbars.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/mode/python/python.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/json-tree.js"></script>
<script src="https://unpkg.com/[email protected]/vue-cookies.js"></script>
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
<style>
.v-data-table-header th {
white-space: nowrap;
}
</style>
</head>

<body>
<div id="app">
<App></App>
</div>
<script src="https://unpkg.com/[email protected]/dist/vue.js"></script>
<script src="https://unpkg.com/[email protected]/dist/vue-router.js"></script>
<script src="https://unpkg.com/vuex"></script>
<script src="https://unpkg.com/[email protected]"></script>
<script src="https://unpkg.com/http-vue-loader"></script>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/codemirror.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/vue-codemirror.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/mode/python/python.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/addon/scroll/simplescrollbars.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/mode/python/python.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/json-tree.js"></script>
<script src="https://unpkg.com/[email protected]/vue-cookies.js"></script>
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>

<script src="api.js"></script>
<script src="data.js"></script>
<script src="index.js"></script>
<script src="./mixins/base.js"></script>
<script src="./mixins/dialog.js"></script>
</body>

<script src="api.js"></script>
<script src="data.js"></script>
<script src="index.js"></script>
<script src="./mixins/base.js"></script>
<script src="./mixins/dialog.js"></script>
</body>
</html>
222 changes: 113 additions & 109 deletions jumpscale/packages/chatflows/frontend/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,121 +1,125 @@
<html lang="en">
<head>
<link href="https://cdn.jsdelivr.net/npm/@mdi/[email protected]/css/materialdesignicons.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/vuetify.min.css" rel="stylesheet">
<link href='https://api.mapbox.com/mapbox-gl-js/v1.10.0/mapbox-gl.css' rel='stylesheet' />
<link href="/chatflows/static/style.css" rel="stylesheet">
</head>

<body>
<div id="app"><router-view></router-view></div>
<script src="/chatflows/static/mixins/field.js"></script>
<script src="https://unpkg.com/vue"></script>
<script src="https://unpkg.com/vuex"></script>
<script src="https://unpkg.com/[email protected]"></script>
<script src="https://unpkg.com/vue-router/dist/vue-router.js"></script>
<script src="https://unpkg.com/http-vue-loader"></script>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.js"></script>
<script src='https://api.mapbox.com/mapbox-gl-js/v1.10.0/mapbox-gl.js'></script>
<script src="https://www.unpkg.com/[email protected]/dist/md5.min.js"></script>
<script type="text/javascript">
<head>
<link href="https://cdn.jsdelivr.net/npm/@mdi/[email protected]/css/materialdesignicons.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/vuetify.min.css" rel="stylesheet">
<link href='https://api.mapbox.com/mapbox-gl-js/v1.10.0/mapbox-gl.css' rel='stylesheet' />
<link href="/chatflows/static/style.css" rel="stylesheet">
</head>

Vue.use(Vuex)
Vue.use(Vuetify)
<body>
<div id="app">
<router-view></router-view>
</div>
<script src="/chatflows/static/mixins/field.js"></script>
<script src="https://unpkg.com/[email protected]/dist/vue.js"></script>
<script src="https://unpkg.com/[email protected]/dist/vue-router.js"></script>
<script src="https://unpkg.com/vuex"></script>
<script src="https://unpkg.com/[email protected]"></script>
<script src="https://unpkg.com/http-vue-loader"></script>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.js"></script>
<script src='https://api.mapbox.com/mapbox-gl-js/v1.10.0/mapbox-gl.js'></script>
<script src="https://www.unpkg.com/[email protected]/dist/md5.min.js"></script>
<script type="text/javascript">

const baseUrl = '/chatflows/static/'
const PACKAGE = '{{ package }}'
const CHAT = '{{ chat }}'
const QS = '{{ qs }}'
const USERNAME = '{{ username }}'
const EMAIL = '{{ email }}'
const CLIENT_IP = '{{ client_ip }}'
const NOHEADER = '{{ noheader }}'
Vue.use(Vuex)
Vue.use(Vuetify)

httpVueLoader.register(Vue, `${baseUrl}/components/Message.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/String.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Number.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Secret.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/TextArea.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/DateTime.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/SingleChoice.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/MultipleChoices.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/DropDown.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/MultipleListChoices.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/UploadFile.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/DownloadFile.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/QRCode.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Markdown.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Form.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Loading.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/InfiniteLoading.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Confirm.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/TimeDelta.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Location.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Error.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/MultiValues.vue`)
const baseUrl = '/chatflows/static/'
const PACKAGE = '{{ package }}'
const CHAT = '{{ chat }}'
const QS = '{{ qs }}'
const USERNAME = '{{ username }}'
const EMAIL = '{{ email }}'
const CLIENT_IP = '{{ client_ip }}'
const NOHEADER = '{{ noheader }}'

Vue.mixin({
data: function() {
return {
categories: {
string_ask: 'String',
int_ask: 'Number',
secret_ask: 'Secret',
text_ask: 'TextArea',
single_choice: 'SingleChoice',
multi_choice: 'MultipleChoices',
multi_list_choice: 'MultipleListChoices',
drop_down_choice: 'DropDown',
datetime_picker: 'DateTime',
time_delta: 'TimeDelta',
location_ask: 'Location',
upload_file: 'UploadFile',
download_file: 'DownloadFile',
qrcode_show: 'QRCode',
md_show: 'Markdown',
confirm: 'Confirm',
loading: 'Loading',
infinite_loading: 'InfiniteLoading',
ask_multi_values: 'MultiValues',
form: 'Form',
error: 'Error'
}
httpVueLoader.register(Vue, `${baseUrl}/components/Message.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/String.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Number.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Secret.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/TextArea.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/DateTime.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/SingleChoice.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/MultipleChoices.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/DropDown.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/MultipleListChoices.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/UploadFile.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/DownloadFile.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/QRCode.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Markdown.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Form.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Loading.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/InfiniteLoading.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Confirm.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/TimeDelta.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Location.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/Error.vue`)
httpVueLoader.register(Vue, `${baseUrl}/components/MultiValues.vue`)

Vue.mixin({
data: function () {
return {
categories: {
string_ask: 'String',
int_ask: 'Number',
secret_ask: 'Secret',
text_ask: 'TextArea',
single_choice: 'SingleChoice',
multi_choice: 'MultipleChoices',
multi_list_choice: 'MultipleListChoices',
drop_down_choice: 'DropDown',
datetime_picker: 'DateTime',
time_delta: 'TimeDelta',
location_ask: 'Location',
upload_file: 'UploadFile',
download_file: 'DownloadFile',
qrcode_show: 'QRCode',
md_show: 'Markdown',
confirm: 'Confirm',
loading: 'Loading',
infinite_loading: 'InfiniteLoading',
ask_multi_values: 'MultiValues',
form: 'Form',
error: 'Error'
}
}
})
}
})

const vuetify = new Vuetify({
icons: {
iconfont: 'mdi'
},
theme: {
themes: {
light: {
primary: '#1B4F72',
secondary: '#F39C12',
accent: '#F4F6F7',
error: '#EC7063',
},
const vuetify = new Vuetify({
icons: {
iconfont: 'mdi'
},
theme: {
themes: {
light: {
primary: '#1B4F72',
secondary: '#F39C12',
accent: '#F4F6F7',
error: '#EC7063',
},
}
})

const app = httpVueLoader('/chatflows/static/App.vue')
const router = new VueRouter({
routes: [
{ path: '/', component: app},
]
})
new Vue({
el: '#app',
components: {
App: app,
},
router,
vuetify
})
</script>
</body>
}
})

const app = httpVueLoader('/chatflows/static/App.vue')
const router = new VueRouter({
routes: [
{ path: '/', component: app },
]
})
new Vue({
el: '#app',
components: {
App: app,
},
router,
vuetify
})
</script>
</body>

</html>
2 changes: 1 addition & 1 deletion jumpscale/packages/marketplace/frontend/components/License.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<v-card-text>
<markdown-view
base-url="https://legal.threefold.io/#/"
url="https://raw.githubusercontent.com/threefoldfoundation/legal/master/src/terms_conditions_all.md"
url="https://raw.githubusercontent.com/threefoldfoundation/info_legal/development/wiki/terms_conditions_all.md"
></markdown-view>
</v-card-text>
<v-divider></v-divider>
Expand Down
3 changes: 1 addition & 2 deletions jumpscale/packages/marketplace/frontend/components/Terms.vue
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<template>
<markdown-view
base-url="https://legal.threefold.io/#/"
url="https://raw.githubusercontent.com/threefoldfoundation/legal/master/src/terms_conditions_all.md"
url="https://raw.githubusercontent.com/threefoldfoundation/info_legal/development/wiki/terms_conditions_all.md"
></markdown-view>
</template>

4 changes: 2 additions & 2 deletions jumpscale/packages/marketplace/frontend/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<div id="app">
<App></App>
</div>
<script src="https://unpkg.com/vue"></script>
<script src="https://unpkg.com/[email protected]/dist/vue.js"></script>
<script src="https://unpkg.com/[email protected]/dist/vue-router.js"></script>
<script src="https://unpkg.com/vuex"></script>
<script src="https://unpkg.com/[email protected]"></script>
<script src="https://unpkg.com/vue-router/dist/vue-router.js"></script>
<script src="https://unpkg.com/http-vue-loader"></script>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.55.0/codemirror.min.js"></script>
Expand Down
Loading

0 comments on commit 22dbf22

Please sign in to comment.