Skip to content
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.

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

Replacing the old ConnectWalletOptions for the current EVMLoginButtons #516

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
57 changes: 49 additions & 8 deletions src/components/evm/AppNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import InlineSvg from 'vue-inline-svg';

import UserInfo from 'components/evm/UserInfo.vue';
import { getAntelope, useChainStore } from 'src/antelope';
import ConnectWalletOptions from 'pages/home/ConnectWalletOptions.vue';
import EVMLoginButtons from 'pages/home/EVMLoginButtons.vue';
import { getShortenedHash } from 'src/antelope/stores/utils';

const ant = getAntelope();
Expand All @@ -14,7 +14,7 @@ const chainStore = useChainStore();
export default defineComponent({
name: 'AppNav',
components: {
ConnectWalletOptions,
EVMLoginButtons,
UserInfo,
InlineSvg,
},
Expand Down Expand Up @@ -84,6 +84,9 @@ export default defineComponent({
(this.$refs['logo-image'] as HTMLElement)?.focus();
});
},
closeLoginMenu() {
this.showWalletOptions = false;
},
closeMenu() {
this.menuIsOpen = false;
},
Expand Down Expand Up @@ -342,21 +345,59 @@ export default defineComponent({
</div>
</nav>
<q-dialog v-model="showWalletOptions">
<ConnectWalletOptions
:showWalletConnect="false"
@wallet-connect-button-clicked="showWalletOptions = false"
@close-wallet-options="showWalletOptions = false"
/>
<div class="c-app-nav__login-bg">
<div class="c-app-nav__login-header">
<span class="c-app-nav__login-header-text">
{{ $t('home.sign_in_with') }}
</span>
<q-btn
class="c-app-nav__login-close"
icon="close"
flat
round
dense
@click="closeLoginMenu()"
/>
</div>
<EVMLoginButtons/>
</div>
</q-dialog>

</template>

<style lang="scss">

.c-app-nav {
color: white;
color: $white;
$this: &;

&__login-bg {
background: $dark;
padding: 24px;
}

&__login-header {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-bottom: 24px;
}

&__login-close {
color: $white;
padding: 0;
min-height: 2.4em;
min-width: 2.4em;
margin-top: -8px;
margin-right: -10px;
}

&__login-header-text {
@include text--header-5;
color: $white;
}

&__back-button {
@include text--header-5;
height: 32px;
Expand Down
293 changes: 0 additions & 293 deletions src/pages/home/ConnectWalletOptions.vue

This file was deleted.

Loading
Loading