Skip to content

BottomBar replaced with BottomToolBar #4351

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 2 commits into from
Closed

BottomBar replaced with BottomToolBar #4351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86ce530
BottomBar replaced with BottomToolBar
cerdo03 Dec 7, 2023
53357b4
removed bottomBar.vue file
cerdo03 Dec 8, 2023
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/channelEdit/components/edit/EditModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</template>
</Uploader>
</VCard>
<BottomBar v-if="!loading && !loadError && !showFileUploadDefault">
<BottomToolBar v-if="!loading && !loadError && !showFileUploadDefault">
<VLayout row align-center fill-height class="px-2">
<VFlex v-if="showStorage" shrink>
<FileStorage />
Expand All @@ -121,7 +121,7 @@
</VBtn>
</VFlex>
</VLayout>
</BottomBar>
</BottomToolBar>
</VDialog>

<!-- Dialog for catching unsaved changes -->
Expand Down Expand Up @@ -193,7 +193,7 @@
import FormatPresets from 'shared/leUtils/FormatPresets';
import OfflineText from 'shared/views/OfflineText';
import ToolBar from 'shared/views/ToolBar';
import BottomBar from 'shared/views/BottomBar';
import BottomToolBar from '../../../shared/views/BottomToolBar.vue';
import FileDropzone from 'shared/views/files/FileDropzone';
import { isNodeComplete } from 'shared/utils/validation';
import { DELAYED_VALIDATION } from 'shared/constants';
Expand All @@ -215,7 +215,7 @@
FileDropzone,
SavingIndicator,
ToolBar,
BottomBar,
BottomToolBar,
},
mixins: [fileSizeMixin, routerMixin],
props: {
Expand Down
8 changes: 4 additions & 4 deletions contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
</VLayout>
</VContent>

<BottomBar app>
<BottomToolBar app>
<VLayout align-center justify-space-between row fill-height wrap>
<VFlex>
<span class="pl-2" data-test="bottom-bar-stats-resources-count">
Expand Down Expand Up @@ -187,7 +187,7 @@
</VBtn>
</VFLex>
</VLayout>
</BottomBar>
</BottomToolBar>

<KModal
v-if="displaySummaryDetailsDialog"
Expand Down Expand Up @@ -250,7 +250,7 @@
import Diff from './Diff';
import { fileSizeMixin, titleMixin, routerMixin } from 'shared/mixins';
import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
import BottomBar from 'shared/views/BottomBar';
import BottomToolBar from '../../../shared/views/BottomToolBar.vue';
Copy link
Copy Markdown
Contributor

@AllanOXDi AllanOXDi Dec 8, 2023

Choose a reason for hiding this comment

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

Thanks @cerdo03 , The changes looks good to me, after the deleting BottomBar.vue file we should be able to merge it.

Copy link
Copy Markdown
Contributor Author

@cerdo03 cerdo03 Dec 8, 2023

Choose a reason for hiding this comment

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

@AllanOXDi I have deleted the BottomBar.vue file. Please review if this is ready to merge.

import Breadcrumbs from 'shared/views/Breadcrumbs';
import IconButton from 'shared/views/IconButton';
import LoadingText from 'shared/views/LoadingText';
Expand All @@ -263,7 +263,7 @@
export default {
name: 'StagingTreePage',
components: {
BottomBar,
BottomToolBar,
Breadcrumbs,
ContentNodeListItem,
Diff,
Expand Down
27 changes: 0 additions & 27 deletions contentcuration/contentcuration/frontend/shared/views/BottomBar.vue
View file
Open in desktop

This file was deleted.