Skip to content

US-338: Upgrade vue to version 3 in neo-savant #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 14 commits into from
Closed

US-338: Upgrade vue to version 3 in neo-savant #648

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3db637f
Upgrade vue to version 3 in neo-savant
saeed-zil Apr 11, 2024
4726164
Fix event-bus
saeed-zil Apr 11, 2024
1030a09
Update main.js
saeed-zil Apr 11, 2024
1037257
Fix tooltip
saeed-zil Apr 11, 2024
44145f2
Fix network and account selector
saeed-zil Apr 11, 2024
27ea045
Move to vue3 composition api
saeed-zil Apr 11, 2024
802bff9
Fix Delete/rename contracts
saeed-zil Apr 11, 2024
7f801f2
Minor changes
saeed-zil Apr 11, 2024
e1943bb
Update dependencies
saeed-zil Apr 11, 2024
5d5574f
Update vite
saeed-zil Apr 11, 2024
6bd90d0
Update dependencies.
saeed-zil Apr 12, 2024
8f906a2
use element+ ui framework
saeed-zil Apr 12, 2024
ee6cf3c
Use el-tooltip
saeed-zil Apr 12, 2024
098065a
Fix/update tools ui
saeed-zil Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix network and account selector
  • Loading branch information
@saeed-zil
saeed-zil committed Apr 11, 2024
commit 44145f292ce0376baca3a50321392b4cc4c38fae
20 changes: 11 additions & 9 deletions products/neo-savant/src/components/TopBar/AccountSelector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="account-selector d-flex" v-if="selected && selected.type === 'zilpay'">
<v-popover trigger="click" class="d-flex align-items-center">
<VDropdown :triggers="['click']" class="d-flex align-items-center">
<!-- This will be the popover target (for the events and position) -->
<div class="selected-account">
<div class="selected-item d-flex align-items-center" v-if="selected !== undefined">
Expand All @@ -12,13 +12,15 @@
<img src="@/assets/user.svg" height="24px" class="mr-5" /> Select an account
</div>
</div>
<template slot="popover" class="text-center">
Accounts and Networks are managed by ZilPay Extension.
<br />
<br />
<button class="btn btn-success" @click="handleAccountManagerSwitch">Switch back to IDE Account Manager</button>
<template #popper class="text-center">
<div class="p-3">
Accounts and Networks are managed by ZilPay Extension.
<br />
<br />
<button class="btn btn-success" @click="handleAccountManagerSwitch">Switch back to IDE Account Manager</button>
</div>
</template>
</v-popover>
</VDropdown>
</div>
<div class="account-selector d-flex align-items-center mr-4" v-else>
<div class="selected-account">
Expand Down Expand Up @@ -49,7 +51,7 @@
<address-display
class="select-account"
:address="account.address"
@click.native="handleSelect(account)"
@click="handleSelect(account)"
title="Click to select account"
></address-display>
</div>
Expand Down Expand Up @@ -157,4 +159,4 @@ export default {
}
}
}
</style>
</style>
22 changes: 12 additions & 10 deletions products/neo-savant/src/components/TopBar/NetworkSelector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,23 @@
class="network-selector d-flex"
v-if="account && account.type === 'zilpay'"
>
<v-popover trigger="click" class="d-flex align-items-center">
<VDropdown :triggers="['click']" class="d-flex align-items-center">
<!-- This will be the popover target (for the events and position) -->
<div class="selected-network d-flex align-items-center">
<img src="@/assets/server.svg" height="24px" class="mr-2" />
{{ selected.name }}
</div>
<template slot="popover" class="text-center">
Accounts and Networks are managed by ZilPay Extension.
<br />
<br />
<button class="btn btn-success" @click="handleAccountManagerSwitch">
Switch back to IDE Account Manager
</button>
<template #popper class="text-center">
<div class="p-3">
Accounts and Networks are managed by ZilPay Extension.
<br />
<br />
<button class="btn btn-success" @click="handleAccountManagerSwitch">
Switch back to IDE Account Manager
</button>
</div>
</template>
</v-popover>
</VDropdown>
</div>
<div class="network-selector not-zilpay d-flex" v-else>
<div class="selected-network d-flex align-items-center">
Expand Down Expand Up @@ -121,4 +123,4 @@ export default {
}
}
}
</style>
</style>