Skip to content

Removed BottomToolBar with BottomBar #4359

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
cerdo03 wants to merge 1 commit into from
Closed

Removed BottomToolBar with BottomBar #4359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
</VLayout>
</VFlex>
</VLayout>
<BottomToolBar
<BottomBar
Copy link
Copy Markdown
Member

@AlexVelezLl AlexVelezLl Dec 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! @cerdo03. We need to be careful because the implementation of BottomToolBar and BottomBar are slightly different, for example BottomBar does not recieve any props, but BottomToolBar does. So all places where BottomToolBar receives props are likely to have errors. I let you an example for the CalatogList component:

Before the change:
image

After the change:
image

The views should remain the same after the change to avoid unintended behaviours.

v-if="selecting"
clipped-left
color="white"
Expand Down Expand Up @@ -99,7 +99,7 @@
</VFlex>
</VLayout>

</BottomToolBar>
</BottomBar>
</VContainer>
</div>

Expand All @@ -118,7 +118,7 @@
import ChannelItem from './ChannelItem';
import LoadingText from 'shared/views/LoadingText';
import Pagination from 'shared/views/Pagination';
import BottomToolBar from 'shared/views/BottomToolBar';
import BottomBar from 'shared/views/BottomBar';
import Checkbox from 'shared/views/form/Checkbox';
import ToolBar from 'shared/views/ToolBar';
import OfflineText from 'shared/views/OfflineText';
Expand All @@ -132,7 +132,7 @@
LoadingText,
CatalogFilters,
Pagination,
BottomToolBar,
BottomBar,
Checkbox,
ToolBar,
OfflineText,
Expand Down
24 changes: 0 additions & 24 deletions contentcuration/contentcuration/frontend/shared/views/BottomToolBar.vue
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions contentcuration/contentcuration/frontend/shared/views/FullscreenModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
<VContainer :style="`margin-top: ${contentOffset}px;`" fluid class="pa-0">
<slot></slot>
</VContainer>
<BottomToolBar v-if="$slots.bottom" color="white" flat clipped-left clipped-right>
<BottomBar v-if="$slots.bottom" color="white" flat clipped-left clipped-right>
Copy link
Copy Markdown
Member

@AlexVelezLl AlexVelezLl Dec 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we also have a different view:

Before:
image

image

After:
image

image

<slot name="bottom"></slot>
</BottomToolBar>
</BottomBar>
</VCard>
</VDialog>

Expand All @@ -59,14 +59,14 @@

import { mapState } from 'vuex';
import OfflineText from './OfflineText';
import BottomToolBar from './BottomToolBar';
import BottomBar from './BottomBar';
import Tabs from './Tabs';

export default {
name: 'FullscreenModal',
components: {
OfflineText,
BottomToolBar,
BottomBar,
Tabs,
},
props: {
Expand Down