Skip to content

Commit

Permalink
Merge pull request #1368 from freqtrade/dependabot/npm_and_yarn/main/…
Browse files Browse the repository at this point in the history
…bootstrap-vue-next-0.9.26

build(deps): bump bootstrap-vue-next from 0.8.15 to 0.9.26
  • Loading branch information
xmatthias authored Jul 31, 2023
2 parents 75bdbb6 + a43bab3 commit 1d94fa7
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 46 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@vueuse/integrations": "^10.2.1",
"axios": "^1.4.0",
"bootstrap": "^5.3.0",
"bootstrap-vue-next": "^0.8.13",
"bootstrap-vue-next": "^0.9.26",
"core-js": "^3.31.1",
"date-fns": "^2.30.0",
"date-fns-tz": "^2.0.0",
Expand Down
47 changes: 27 additions & 20 deletions src/components/ftbot/BotComparisonList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,41 +12,48 @@
<div class="d-flex flex-row">
<b-form-checkbox
v-if="row.item.botId && botStore.botCount > 1"
v-model="botStore.botStores[row.item.botId].isSelected"
v-model="
botStore.botStores[(row.item as unknown as ComparisonTableItems).botId ?? ''].isSelected
"
title="Show bot in Dashboard"
/>
<span>{{ row.value }}</span>
</div>
</template>
<template #cell(profitOpen)="row">
<template #cell(profitOpen)="{ item }">
<profit-pill
v-if="row.item.profitOpen && row.item.botId != 'Summary'"
:profit-ratio="row.item.profitOpenRatio"
:profit-abs="row.item.profitOpen"
:stake-currency="row.item.stakeCurrency"
v-if="item.profitOpen && item.botId != 'Summary'"
:profit-ratio="(item as unknown as ComparisonTableItems).profitOpenRatio"
:profit-abs="(item as unknown as ComparisonTableItems).profitOpen"
:stake-currency="(item as unknown as ComparisonTableItems).stakeCurrency"
/>
</template>
<template #cell(profitClosed)="row">
<template #cell(profitClosed)="{ item }">
<profit-pill
v-if="row.item.profitClosed && row.item.botId != 'Summary'"
:profit-ratio="row.item.profitClosedRatio"
:profit-abs="row.item.profitClosed"
:stake-currency="row.item.stakeCurrency"
v-if="item.profitClosed && item.botId != 'Summary'"
:profit-ratio="(item as unknown as ComparisonTableItems).profitClosedRatio"
:profit-abs="(item as unknown as ComparisonTableItems).profitClosed"
:stake-currency="(item as unknown as ComparisonTableItems).stakeCurrency"
/>
</template>
<template #cell(balance)="row">
<div v-if="row.item.balance">
<span :title="row.item.stakeCurrency"
>{{ formatPrice(row.item.balance, row.item.stakeCurrencyDecimals) }}
<template #cell(balance)="{ item }">
<div v-if="item.balance">
<span :title="(item as unknown as ComparisonTableItems).stakeCurrency"
>{{
formatPrice(
(item as unknown as ComparisonTableItems).balance ?? 0,
(item as unknown as ComparisonTableItems).stakeCurrencyDecimals,
)
}}
</span>
<span class="text-small">{{ row.item.stakeCurrency }}</span>
<span class="text-small">{{ item.stakeCurrency }}</span>
</div>
</template>
<template #cell(winVsLoss)="row">
<div v-if="row.item.losses !== undefined">
<span class="text-profit">{{ row.item.wins }}</span> /
<span class="text-loss">{{ row.item.losses }}</span>
<template #cell(winVsLoss)="{ item }">
<div v-if="item.losses !== undefined">
<span class="text-profit">{{ item.wins }}</span> /
<span class="text-loss">{{ item.losses }}</span>
</div>
</template>
</b-table>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ftbot/PairLockList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
class="btn-xs ms-1"
size="sm"
title="Delete trade"
@click="removePairLock(row.item)"
@click="removePairLock(row.item as unknown as Lock)"
>
<i-mdi-delete />
</b-button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ftbot/PairlistConfigActions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
v-model="pairlistStore.configName"
size="sm"
:options="pairlistStore.savedConfigs.map((c) => c.name)"
@change="(config) => pairlistStore.selectOrCreateConfig(config)"
@change="(config) => pairlistStore.selectOrCreateConfig(config as string)"
/>
</edit-value>
<b-button
Expand Down
14 changes: 7 additions & 7 deletions src/components/ftbot/TradeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
@row-clicked="onRowClicked"
@row-selected="onRowSelected"
>
<template #cell(actions)="row">
<template #cell(actions)="{ index, item }">
<TradeActionsPopover
:id="row.index"
:trade="row.item"
:id="index"
:trade="item as unknown as Trade"
:bot-api-version="botStore.activeBot.botApiVersion"
@delete-trade="removeTradeHandler(row.item)"
@delete-trade="removeTradeHandler(item as unknown as Trade)"
@force-exit="forceExitHandler"
@force-exit-partial="forceExitPartialHandler"
@cancel-open-order="cancelOpenOrderHandler"
Expand Down Expand Up @@ -60,13 +60,13 @@
{{ row.item.trading_mode !== 'spot' ? `(${row.item.leverage}x)` : '' }}
</template>
<template #cell(profit)="row">
<trade-profit :trade="row.item" />
<trade-profit :trade="row.item as unknown as Trade" />
</template>
<template #cell(open_timestamp)="row">
<DateTimeTZ :date="row.item.open_timestamp" />
<DateTimeTZ :date="(row.item as unknown as Trade).open_timestamp" />
</template>
<template #cell(close_timestamp)="row">
<DateTimeTZ :date="row.item.close_timestamp" />
<DateTimeTZ :date="(row.item as unknown as Trade).close_timestamp ?? 0" />
</template>
</b-table>
<div class="w-100 d-flex justify-content-between">
Expand Down
32 changes: 16 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -231,19 +231,19 @@
resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.3.1.tgz#4d795b649cc3b1cbb760d191c80dcb4353c9a366"
integrity sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g==

"@floating-ui/dom@^1.2.9":
version "1.4.4"
resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.4.4.tgz#cf859dde33995a4e7b6ded16c98cb73b2ebfffd0"
integrity sha512-21hhDEPOiWkGp0Ys4Wi6Neriah7HweToKra626CIK712B5m9qkdz54OP9gVldUg+URnBTpv/j/bi/skmGdstXQ==
"@floating-ui/dom@^1.4.5":
version "1.4.5"
resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.4.5.tgz#336dfb9870c98b471ff5802002982e489b8bd1c5"
integrity sha512-96KnRWkRnuBSSFbj0sFGwwOUd8EkiecINVl0O9wiZlZ64EkpyAOG3Xc2vKKNJmru0Z7RqWNymA+6b8OZqjgyyw==
dependencies:
"@floating-ui/core" "^1.3.1"

"@floating-ui/vue@^1.0.0":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@floating-ui/vue/-/vue-1.0.1.tgz#b20ea07f0cf3fb1374cdb04aeba9c06d886d2261"
integrity sha512-HZmmNWaztKYKOQxXvMzJYCYtfgG07cL/bPQvZ92AFG3Ktw71bvvLKXsZDAyIxGpqRo9WiTPsYknnSuLV2H/riA==
"@floating-ui/vue@^1.0.1":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@floating-ui/vue/-/vue-1.0.2.tgz#ebd704843c2f3b780c1ce6652a7245873278563f"
integrity sha512-sImlAl9mAoCKZLNlwWz2P2ZMJIDlOEDXrRD6aD2sIHAka1LPC+nWtB+D3lPe7IE7FGWSbwBPTnlSdlABa3Fr0A==
dependencies:
"@floating-ui/dom" "^1.2.9"
"@floating-ui/dom" "^1.4.5"
vue-demi ">=0.13.0"

"@humanwhocodes/config-array@^0.11.10":
Expand Down Expand Up @@ -853,7 +853,7 @@
date-fns "^2.30.0"
date-fns-tz "^1.3.7"

"@vueuse/[email protected]", "@vueuse/core@^10.1.2", "@vueuse/core@^10.2.1":
"@vueuse/[email protected]", "@vueuse/core@^10.2.1":
version "10.2.1"
resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-10.2.1.tgz#a62b54cdaf1496138a9f8a7df7f9d644892b421f"
integrity sha512-c441bfMbkAwTNwVRHQ0zdYZNETK//P84rC01aP2Uy/aRFCiie9NE/k9KdIXbno0eDYP5NPUuWv0aA/I4Unr/7w==
Expand Down Expand Up @@ -1077,13 +1077,13 @@ boolbase@^1.0.0:
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==

bootstrap-vue-next@^0.8.13:
version "0.8.15"
resolved "https://registry.yarnpkg.com/bootstrap-vue-next/-/bootstrap-vue-next-0.8.15.tgz#93ac8313c06c37fd83314c5e7ed293aab0ff967b"
integrity sha512-X8eGDMx+Xa6g5UIfDxg1NcH+UmGAzFbCMFqlG9ETW5bGr5hKQbCODVUG8yoF6EBoWTW6IRsmL8hQiVhmaxqmFw==
bootstrap-vue-next@^0.9.26:
version "0.9.26"
resolved "https://registry.yarnpkg.com/bootstrap-vue-next/-/bootstrap-vue-next-0.9.26.tgz#db4038beb4a1c49ad046ad027bc88aa53e4b45cd"
integrity sha512-3kikLOCNfFPRZ5zdPVlXRK7tusQcgmipEwEM0cucAWbZcxnhIRf4u/0wy4T7OpF28SB0/Mfb6xCf+9Sfu9p9zA==
dependencies:
"@floating-ui/vue" "^1.0.0"
"@vueuse/core" "^10.1.2"
"@floating-ui/vue" "^1.0.1"
"@vueuse/core" "^10.2.1"

bootstrap@^5.3.0:
version "5.3.0"
Expand Down

0 comments on commit 1d94fa7

Please sign in to comment.