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

#4125 mobile navbar #4483

Merged
merged 10 commits into from
Dec 16, 2022
Merged
Show file tree
Hide file tree
Changes from 4 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
172 changes: 151 additions & 21 deletions components/Navbar.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<template>
<b-navbar
fixed-top
spaced
wrapper-class="container"
:active.sync="isBurgerMenuOpened"
:class="{ 'navbar-shrink': !showTopNavbar }"
close-on-click
fixed-top
mobile-burger
:active.sync="isBurgerMenuOpened"
:class="{ 'navbar-shrink': !showTopNavbar }">
spaced
wrapper-class="container">
<template #brand>
<b-navbar-item tag="nuxt-link" :to="{ path: '/' }" class="logo">
<b-navbar-item :to="{ path: '/' }" class="logo" tag="nuxt-link">
<img
:src="logoSrc"
alt="First NFT market explorer on Kusama and Polkadot"
Expand All @@ -19,19 +19,23 @@
class="is-hidden-desktop is-flex is-flex-grow-1 is-align-items-center is-justify-content-flex-end"
@click="closeBurgerMenu">
<!-- <HistoryBrowser class="navbar-item" /> -->
<b-button
<img
v-if="showSearchOnNavbar"
icon-left="search"
class="mr-2 mobile-nav-search-btn is-flex"
@click="showMobileSearchBar">
</b-button>
class="mobile-nav-search-btn mr-2"
:src="
isDarkMode
? '/search-mobile-navbar-dark.svg'
: '/search-mobile-navbar.svg'
"
@click="showMobileSearchBar" />

<div v-show="openMobileSearchBar">
<div
class="fixed-stack is-flex is-align-items-center is-justify-content-space-between p-2">
<Search
ref="mobilSearchRef"
hide-filter
class="is-flex-grow-1 mt-5" />
class="mt-5 search-navbar-container-mobile" />
<b-button class="cancel-btn" @click="hideMobileSearchBar">
{{ $t('cancel') }}
</b-button>
Expand All @@ -42,13 +46,16 @@
<template #start>
<div v-if="showSearchOnNavbar" class="navbar-item is-expanded">
<Search
hide-filter
class="search-navbar is-flex-grow-1 pb-0 is-hidden-touch"
hide-filter
search-column-class="is-flex-grow-1" />
</div>
</template>
<template #end>
<ExploreDropdown />
<ExploreDropdown v-if="!isMobile" />
<MobileExpandableSection v-if="isMobile" :title="$t('explore')">
<NavbarExploreOptions />
</MobileExpandableSection>
<CreateDropdown
v-show="isCreateVisible"
class="navbar-create custom-navbar-item"
Expand All @@ -59,23 +66,112 @@
data-cy="stats"
:chain="chain" />
<ChainSelectDropdown
v-if="!isMobile"
id="NavChainSelect"
class="navbar-chain custom-navbar-item"
data-cy="chain-select" />
<template v-if="isMobile">
<MobileLanguageOption v-if="!account" />
<MobileExpandableSection
v-if="account"
:no-padding="true"
:title="$t('account')"
icon="user-circle"
icon-family="fa">
<b-navbar-item
:to="`/${urlPrefix}/u/${account}`"
data-cy="hot"
tag="nuxt-link">
{{ $t('profile.page') }}
</b-navbar-item>
<b-navbar-item
:to="{ name: 'identity' }"
data-cy="hot"
tag="nuxt-link">
{{ $t('identity.page') }}
</b-navbar-item>
<b-navbar-item data-cy="hot" tag="nuxt-link" to="/settings">
{{ $t('settings') }}
</b-navbar-item>
<MobileLanguageOption />
<MobileNavbarProfile id="NavProfile" />
</MobileExpandableSection>
<MobileExpandableSection
v-if="account"
:no-padding="true"
:title="$t('wallet')"
icon="wallet">
<b-navbar-item class="navbar-item--noBorder">
<div class="has-text-grey is-size-7 mt-2">
{{ $t('profileMenu.wallet') }}
</div>
<Identity
:address="account"
class="navbar__address is-size-6"
hide-identity-popover />

<hr aria-role="menuitem" class="dropdown-divider mx-4" />

<div v-if="isSnek">
<div class="has-text-left has-text-grey is-size-7">
{{ $t('general.balance') }}
</div>
<SimpleAccountBalance
v-for="token in tokens"
:key="token"
:token-id="token"
class="is-size-6" />
</div>
<AccountBalance v-else class="is-size-7" />

<hr aria-role="menuitem" class="dropdown-divider mx-4" />

<div
aria-role="menuitem"
class="is-flex is-justify-content-center"
custom
paddingless>
<b-button
class="navbar__sign-out-button menu-item mb-4 is-size-7"
@click="disconnect()">
{{ $t('profileMenu.disconnect') }}
</b-button>
</div>
</b-navbar-item>
</MobileExpandableSection>
<ColorModeButton />

<div v-if="!account" id="NavProfile">
<ConnectWalletButton
class="button-connect-wallet"
@closeBurgerMenu="closeBurgerMenu" />
</div>
</template>
<ProfileDropdown
v-if="!isMobile"
id="NavProfile"
:chain="chain"
data-cy="profileDropdown"
@closeBurgerMenu="closeBurgerMenu" />
</template>
<!-- <template v-else #end>
<div class="image is-32x32 mr-2">
<BasicImage
v-show="inCollectionPage && currentCollection.image"
:alt="navBarTitle"
:src="currentCollection.image"
rounded />
</div>
<div class="title is-4">{{ navBarTitle }}</div>
</template> -->
</b-navbar>
</template>

<script lang="ts">
import { Component, Ref, Watch, mixins } from 'nuxt-property-decorator'
import { get } from 'idb-keyval'

import BasicImage from '@/components/shared/view/BasicImage.vue'
import MobileExpandableSection from '@/components/navbar/MobileExpandableSection.vue'
import NavbarExploreOptions from '@/components/navbar/NavbarExploreOptions.vue'
import Identity from '@/components/identity/IdentityIndex.vue'
import ProfileDropdown from '~/components/navbar/ProfileDropdown.vue'
import Search from '@/components/search/Search.vue'
Expand All @@ -84,37 +180,50 @@ import CreateDropdown from '~/components/navbar/CreateDropdown.vue'
import KodaBetaDark from '@/assets/Koda_Beta_dark.svg'
import KodaBeta from '@/assets/Koda_Beta.svg'
import PrefixMixin from '@/utils/mixins/prefixMixin'

import ColorModeButton from '~/components/common/ColorModeButton.vue'
import MobileLanguageOption from '~/components/navbar/MobileLanguageOption.vue'
import { createVisible } from '@/utils/config/permision.config'
import { isMobileDevice } from '@/utils/extension'
import { identityStore } from '@/utils/idbStore'
import AuthMixin from '@/utils/mixins/authMixin'
import ExperimentMixin from '@/utils/mixins/experimentMixin'
import ChainSelectDropdown from '~/components/navbar/ChainSelectDropdown.vue'
import StatsDropdown from '~/components/navbar/StatsDropdown.vue'
import MobileNavbarProfile from '~/components/navbar/MobileNavbarProfile.vue'
import ConnectWalletButton from '~/components/shared/ConnectWalletButton.vue'
import { getKusamaAssetId } from '~/utils/api/bsx/query'
import { clearSession } from '~/utils/cachingStrategy'

@Component({
components: {
Search,
Identity,
BasicImage,
MobileExpandableSection,
ProfileDropdown,
ExploreDropdown,
CreateDropdown,
ChainSelectDropdown,
StatsDropdown,
MobileNavbarProfile,
NavbarExploreOptions,
ConnectWalletButton,
ColorModeButton,
MobileLanguageOption,
},
})
export default class NavbarMenu extends mixins(
PrefixMixin,
AuthMixin,
ExperimentMixin
) {
public showTopNavbar = true
public openMobileSearchBar = false
private fixedTitleNavAppearDistance = 85
private lastScrollPosition = 0
private artistName = ''
public isBurgerMenuOpened = false
private isMobile = isMobileDevice

@Ref('mobilSearchRef') readonly mobilSearchRef
@Watch('isBurgerMenuOpened') onDisableScroll() {
if (this.isBurgerMenuOpened) {
Expand All @@ -124,10 +233,18 @@ export default class NavbarMenu extends mixins(
}
}

get account() {
return this.$store.getters.getAuthAddress
}

get chain(): string {
return this.urlPrefix
}

get tokens() {
return ['', getKusamaAssetId(this.urlPrefix)]
}

get inCollectionPage(): boolean {
return this.$route.name === 'rmrk-collection-id'
}
Expand Down Expand Up @@ -196,6 +313,18 @@ export default class NavbarMenu extends mixins(
return title
}

public disconnect() {
this.$store.dispatch('setAuth', { address: '' }) // null not working
clearSession()
}

@Watch('isBurgerMenuOpened')
onBurgerMenuOpenedChanged() {
document.documentElement.style.overflow = this.isBurgerMenuOpened
? 'hidden'
: 'auto'
}

async fetchArtistIdentity(address) {
const identity = await get(address, identityStore)
if (identity && identity.display) {
Expand Down Expand Up @@ -236,9 +365,10 @@ export default class NavbarMenu extends mixins(
}

closeBurgerMenu() {
if (this.isBurgerMenuOpened) {
this.isBurgerMenuOpened = false
}
console.log('emittt')
prachi00 marked this conversation as resolved.
Show resolved Hide resolved
// if (this.isBurgerMenuOpened) {
this.isBurgerMenuOpened = false
// }
}

mounted() {
Expand Down
58 changes: 7 additions & 51 deletions components/navbar/ExploreDropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,59 +19,15 @@
</div>
</nuxt-link>
</template>
<b-dropdown-item custom aria-role="menuitem" class="is-size-6">
<nuxt-link
:to="`/${urlPrefix}/explore?tab=GALLERY`"
class="menu-item mr-2">
{{ $t('gallery') }}
</nuxt-link>
<nuxt-link
:to="`/${urlPrefix}/explore?tab=COLLECTION`"
class="menu-item mr-2">
{{ $t('collections') }}
</nuxt-link>
<span class="menu-item is-disabled">
{{ $t('users') }}
<span class="small-size-text">
{{ $t('soon') }}
</span>
</span>
<hr class="dropdown-divider my-4" aria-role="menuitem" />
<span
v-for="option in options.slice(0, 3)"
:key="option.value"
:value="option.value"
:class="['menu-item', 'mr-2']"
@click="setSelectedChain(option.value)">
{{ option.text }}
</span>
<b-dropdown-item aria-role="menuitem" class="is-size-6" custom>
<NavbarExploreOptions />
</b-dropdown-item>
</b-dropdown>
</template>

<script lang="ts">
import { Component, mixins } from 'nuxt-property-decorator'
import { getChainTestList } from '~/utils/constants'
import PrefixMixin from '@/utils/mixins/prefixMixin'

import AuthMixin from '~~/utils/mixins/authMixin'

@Component({})
export default class NavbarExplore extends mixins(PrefixMixin, AuthMixin) {
get options() {
const availableUrlPrefixes = this.$store.getters['availableUrlPrefixes']

if (!this.$config.dev) {
return availableUrlPrefixes.filter(
(urlPrefix) => !getChainTestList().includes(urlPrefix.value as string)
)
}
return availableUrlPrefixes
}

setSelectedChain(value) {
this.$store.dispatch('setUrlPrefix', value)
this.$router.push({ path: `/${value}/explore?tab=COLLECTION` })
}
}
<script lang="ts" setup>
const NavbarExploreOptions = defineAsyncComponent(
() => import('./NavbarExploreOptions.vue')
)
const { urlPrefix } = usePrefix()
</script>
39 changes: 39 additions & 0 deletions components/navbar/MobileExpandableSection.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<template>
<div v-if="!isOpened" class="navbar-item" @click.stop="isOpened = !isOpened">
<span>
{{ title }}
<b-icon v-if="icon" :icon="icon" :pack="iconFamily" />
</span>
<b-icon class="icon--right" icon="chevron-right" pack="fas" />
</div>
<div v-else class="navbar-item--fullpage">
<div class="navbar-item navbar-item--reverse" @click.stop="close">
<b-icon icon="chevron-left" pack="fas" />
{{ title }}
</div>
<div :class="{ 'navbar-item': !noPadding }" class="navbar-item-body">
<slot />
</div>
</div>
</template>

<script lang="ts" setup>
const props = defineProps({
title: String,
icon: String,
iconFamily: {
type: String,
default: 'fas',
},
noPadding: {
type: Boolean,
default: false,
},
})

const isOpened = ref(false)

const close = (): void => {
isOpened.value = false
}
</script>
Loading