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.

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

Jump to bottom

fix: fix gap in proposal sidebar bottom #1003

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

fix: fix gap in proposal sidebar bottom #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3ff3de8
fix: fix gap in proposal sidebar bottom
wa0x6e Nov 28, 2024
f06a472
Merge branch 'master' into fix-gap-in-affix-bottom
wa0x6e Nov 28, 2024
33ac6d7
Merge branch 'master' into fix-gap-in-affix-bottom
ChaituVR Nov 28, 2024
046277b
Merge branch 'master' into fix-gap-in-affix-bottom
ChaituVR Nov 28, 2024
9a57a80
fix: move global bottom padding to each view
wa0x6e Nov 29, 2024
0da3b5a
Merge branch 'master' into fix-gap-in-affix-bottom
wa0x6e Nov 29, 2024
e718f92
fix: fix gap in votes page bottom
wa0x6e Dec 2, 2024
f6a3786
Merge branch 'master' into fix-gap-in-affix-bottom
wa0x6e Dec 2, 2024
132153a
Merge branch 'master' into fix-gap-in-affix-bottom
ChaituVR Dec 2, 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
8 changes: 2 additions & 6 deletions apps/ui/src/components/Layout/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ const hasTopNav = computed(() => {
return 'space-editor' !== String(route.matched[1]?.name);
});

const bottomPadding = computed(
() => !['space-proposal-votes'].includes(String(route.name))
);

async function handleTransactionAccept() {
if (
!walletConnectSpaceKey.value ||
Expand Down Expand Up @@ -165,7 +161,7 @@ router.afterEach(() => {
:class="{ 'overflow-clip': scrollDisabled }"
>
<UiLoading v-if="app.loading || !app.init" class="overlay big" />
<div v-else :class="['flex min-h-screen', { 'pb-6': bottomPadding }]">
<div v-else :class="['flex min-h-screen']">
<AppBottomNav
v-if="web3.account && !isWhiteLabel"
:class="[
Expand Down Expand Up @@ -209,7 +205,7 @@ router.afterEach(() => {
/>
<main class="flex-auto w-full flex">
<div class="flex-auto w-0 mt-[72px]">
<router-view />
<router-view class="pb-6" />
</div>
<div
v-if="hasPlaceHolderSidebar"
Expand Down
126 changes: 64 additions & 62 deletions apps/ui/src/views/My/Explore.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,70 +144,72 @@ onMounted(() => {
</script>

<template>
<div class="flex justify-between p-4 gap-2 gap-y-3 flex-row">
<div class="flex flex-row flex-wrap gap-2">
<UiSelectDropdown
v-model="protocol"
class="min-h-[46px]"
title="Protocol"
gap="12"
placement="start"
:items="protocols"
/>
<Combobox
v-model="network"
class="mb-0"
inline
:gap="12"
:definition="{
type: 'string',
title: 'Network',
enum: networks.map(c => c.id),
options: networks
}"
/>
<UiSelectDropdown
v-if="protocol === 'snapshot'"
v-model="category"
class="min-h-[46px]"
title="Category"
gap="12"
placement="start"
:items="categories"
/>
</div>
<UiTooltip title="Create new space">
<UiButton
:to="
protocol === 'snapshot' ? 'https://snapshot.org/#/setup' : 'create'
"
class="!px-0 w-[46px]"
>
<IH-plus-sm />
</UiButton>
</UiTooltip>
</div>
<div>
<UiLabel label="Spaces" sticky />
<UiLoading v-if="spacesStore.loading" class="block m-4" />
<div v-else-if="spacesStore.loaded">
<UiContainerInfiniteScroll
v-if="spacesStore.explorePageSpaces.length"
:loading-more="spacesStore.loadingMore"
class="justify-center max-w-screen-md 2xl:max-w-screen-xl 3xl:max-w-screen-2xl mx-auto p-4 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-explore-3 2xl:grid-cols-explore-4 3xl:grid-cols-explore-5 gap-3"
@end-reached="
spacesStore.fetchMore({ searchQuery: route.query.q as string })
"
>
<SpacesListItem
v-for="space in spacesStore.explorePageSpaces"
:key="space.id"
:space="space"
<div class="flex justify-between p-4 gap-2 gap-y-3 flex-row">
<div class="flex flex-row flex-wrap gap-2">
<UiSelectDropdown
v-model="protocol"
class="min-h-[46px]"
title="Protocol"
gap="12"
placement="start"
:items="protocols"
/>
<Combobox
v-model="network"
class="mb-0"
inline
:gap="12"
:definition="{
type: 'string',
title: 'Network',
enum: networks.map(c => c.id),
options: networks
}"
/>
</UiContainerInfiniteScroll>
<div v-else class="px-4 py-3 flex items-center space-x-2">
<IH-exclamation-circle class="inline-block shrink-0" />
<span>No results found for your search</span>
<UiSelectDropdown
v-if="protocol === 'snapshot'"
v-model="category"
class="min-h-[46px]"
title="Category"
gap="12"
placement="start"
:items="categories"
/>
</div>
<UiTooltip title="Create new space">
<UiButton
:to="
protocol === 'snapshot' ? 'https://snapshot.org/#/setup' : 'create'
"
class="!px-0 w-[46px]"
>
<IH-plus-sm />
</UiButton>
</UiTooltip>
</div>
<div>
<UiLabel label="Spaces" sticky />
<UiLoading v-if="spacesStore.loading" class="block m-4" />
<div v-else-if="spacesStore.loaded">
<UiContainerInfiniteScroll
v-if="spacesStore.explorePageSpaces.length"
:loading-more="spacesStore.loadingMore"
class="justify-center max-w-screen-md 2xl:max-w-screen-xl 3xl:max-w-screen-2xl mx-auto p-4 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-explore-3 2xl:grid-cols-explore-4 3xl:grid-cols-explore-5 gap-3"
@end-reached="
spacesStore.fetchMore({ searchQuery: route.query.q as string })
"
>
<SpacesListItem
v-for="space in spacesStore.explorePageSpaces"
:key="space.id"
:space="space"
/>
</UiContainerInfiniteScroll>
<div v-else class="px-4 py-3 flex items-center space-x-2">
<IH-exclamation-circle class="inline-block shrink-0" />
<span>No results found for your search</span>
</div>
</div>
</div>
</div>
Expand Down
86 changes: 44 additions & 42 deletions apps/ui/src/views/My/Home.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,48 +125,50 @@ onUnmounted(() => {
</script>

<template>
<Onboarding />
<div class="flex justify-between">
<div class="flex flex-row p-4 space-x-2">
<UiSelectDropdown
v-model="state"
title="Status"
gap="12"
placement="start"
:items="[
{
key: 'any',
label: 'Any'
},
{
key: 'pending',
label: 'Pending',
component: ProposalIconStatus,
componentProps: { ...selectIconBaseProps, state: 'pending' }
},
{
key: 'active',
label: 'Active',
component: ProposalIconStatus,
componentProps: { ...selectIconBaseProps, state: 'active' }
},
{
key: 'closed',
label: 'Closed',
component: ProposalIconStatus,
componentProps: { ...selectIconBaseProps, state: 'passed' }
}
]"
/>
<div>
<Onboarding />
<div class="flex justify-between">
<div class="flex flex-row p-4 space-x-2">
<UiSelectDropdown
v-model="state"
title="Status"
gap="12"
placement="start"
:items="[
{
key: 'any',
label: 'Any'
},
{
key: 'pending',
label: 'Pending',
component: ProposalIconStatus,
componentProps: { ...selectIconBaseProps, state: 'pending' }
},
{
key: 'active',
label: 'Active',
component: ProposalIconStatus,
componentProps: { ...selectIconBaseProps, state: 'active' }
},
{
key: 'closed',
label: 'Closed',
component: ProposalIconStatus,
componentProps: { ...selectIconBaseProps, state: 'passed' }
}
]"
/>
</div>
</div>
<ProposalsList
title="Proposals"
limit="off"
:loading="!followedSpacesStore.followedSpacesLoaded || !loaded"
:loading-more="loadingMore"
:proposals="proposals"
show-space
@end-reached="handleEndReached"
/>
</div>
<ProposalsList
title="Proposals"
limit="off"
:loading="!followedSpacesStore.followedSpacesLoaded || !loaded"
:loading-more="loadingMore"
:proposals="proposals"
show-space
@end-reached="handleEndReached"
/>
</template>
16 changes: 14 additions & 2 deletions apps/ui/src/views/Proposal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ const currentVote = computed(
votes.value[`${proposal.value.network}:${proposal.value.id}`]
);

const withoutBottomPadding = computed(
() => 'space-proposal-votes' === String(route.name)
);

async function handleVoteClick(choice: Choice) {
if (!web3.value.account) {
modalAccountOpen.value = true;
Expand Down Expand Up @@ -126,7 +130,12 @@ watchEffect(() => {
</script>

<template>
<div class="flex items-stretch md:flex-row flex-col w-full md:h-full">
<div
:class="[
'flex items-stretch md:flex-row flex-col w-full md:h-full',
{ '!pb-0': withoutBottomPadding }
]"
>
<UiLoading v-if="!proposal" class="ml-4 mt-3" />
<template v-else>
<div class="flex-1 grow min-w-0">
Expand Down Expand Up @@ -203,7 +212,10 @@ watchEffect(() => {
<Affix
:class="[
'shrink-0 md:w-[340px] border-l-0 md:border-l',
{ 'hidden md:block': route.name === 'space-proposal-votes' }
{
'hidden md:block': route.name === 'space-proposal-votes',
'-mb-6': !withoutBottomPadding
}
]"
:top="72"
:bottom="64"
Expand Down
2 changes: 1 addition & 1 deletion apps/ui/src/views/Proposal/Votes.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ watch([sortBy, choiceFilter], () => {
@end-reached="handleEndReached"
>
<template #loading>
<UiLoading class="px-4 py-3 block absolute" />
<UiLoading class="px-4 py-3 block" />
</template>
<div
v-for="(vote, i) in votes"
Expand Down
14 changes: 7 additions & 7 deletions apps/ui/src/views/Settings/Contacts.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ function handleContactEdit(contact) {
<IH-exclamation-circle />
<span v-text="'There are no contacts here.'" />
</div>
<teleport to="#modal">
<ModalEditContact
:open="modalOpen.editContact"
:initial-state="modalState.editContact"
@close="modalOpen.editContact = false"
/>
</teleport>
</div>
<teleport to="#modal">
<ModalEditContact
:open="modalOpen.editContact"
:initial-state="modalState.editContact"
@close="modalOpen.editContact = false"
/>
</teleport>
</template>
Loading