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

Component wrapper - tab - part 3 #54

Open
wants to merge 49 commits into
base: component-wrappers
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
4da2e13
Add g-input wrapper for b-input
dannon Jul 12, 2023
a77420b
Add g-input wrapper for b-input
dannon Jul 12, 2023
3a8d3a4
Add GAlert wrapper for BAlert
itisAliRH Jul 14, 2023
85a7618
Add GLink wrapper for BLink
itisAliRH Jul 14, 2023
3dce2f1
Change all `b-form-input`s to `GInput`s
ahmedhamidawan Jul 14, 2023
b61901a
Change all `b-form-input`s to `GInput`s
ahmedhamidawan Jul 14, 2023
5d2fb72
Add GInputGroup, GInputGroupAppend, GInputGroupPrepend and GInputGrou…
itisAliRH Jul 14, 2023
871d845
add `<slot>` to G component wrappers
ahmedhamidawan Jul 15, 2023
ee59748
fix GAlert default colour
itisAliRH Jul 15, 2023
a563717
Add GCol wrapper for BCol
itisAliRH Jul 15, 2023
1465c37
fix slots for GCol, GInputGroupPrepend and GInputGroupText
itisAliRH Jul 15, 2023
0e60036
Add GRow wrapper for BRow
itisAliRH Jul 15, 2023
aa293d9
Add GCardTitle wrapper for BCardTitle
itisAliRH Jul 15, 2023
e35f6e0
Add GCardText wrapper for BCardText
itisAliRH Jul 15, 2023
5c20202
Initial commit; new component file
hujambo-dunia Jul 15, 2023
0a5bdf3
Add GCardBody wrapper for BCardBody
itisAliRH Jul 15, 2023
0bf7b63
Updated references to new component
hujambo-dunia Jul 15, 2023
f8bd74e
Add GCardFooter wrapper for BCardFooter
itisAliRH Jul 15, 2023
4b28279
Add GCardHeader wrapper for BCardHeader
itisAliRH Jul 15, 2023
cc9ebc9
Initial commit; new component file
hujambo-dunia Jul 15, 2023
e3884ec
Add GCardGroup wrapper for BCardGroup
itisAliRH Jul 15, 2023
ba83acc
Add GCardImg wrapper for BCardImg
itisAliRH Jul 15, 2023
12f171f
Updated references to new component
hujambo-dunia Jul 15, 2023
a35dfce
Merge pull request #50 from hujambo-dunia/component-wrapper-tooltip
dannon Jul 15, 2023
96ca79c
Merge branch 'component-wrappers' into component-wrapper-tab
dannon Jul 15, 2023
bb7872e
Merge pull request #51 from hujambo-dunia/component-wrapper-tab
dannon Jul 15, 2023
69a71b8
Add GCard wrapper for BCard
itisAliRH Jul 15, 2023
3dbddb3
Add GProgressBar wrapper for BProgressBar
itisAliRH Jul 15, 2023
acad193
Add GCollapse wrapper for BCollapse
itisAliRH Jul 15, 2023
de283e5
fix slot for GCollapse
itisAliRH Jul 15, 2023
5480216
Add GPagination wrapper for BPagination
itisAliRH Jul 15, 2023
0d2dc3b
Add GContainer wrapper for BContainer
itisAliRH Jul 15, 2023
634b407
Add GBreadcrumbItem wrapper for BBreadcrumbItem
itisAliRH Jul 15, 2023
68e64f8
Add GBreadcrumb wrapper for BBreadcrumb
itisAliRH Jul 15, 2023
f0d475f
Add GBadge wrapper for BBadge
itisAliRH Jul 15, 2023
f203bd7
Add GDropdownText wrapper for BDropdownText
itisAliRH Jul 15, 2023
37d3dfc
Add GDropdownItem wrapper for BDropdownItem
itisAliRH Jul 15, 2023
e6a176d
Add GDropdownDivider wrapper for BDropdownDivider
itisAliRH Jul 15, 2023
ebd7934
Add GDropdownGroup wrapper for BDropdownGroup
itisAliRH Jul 15, 2023
9c14bd5
Add GDropdownForm wrapper for BDropdownForm
itisAliRH Jul 15, 2023
ea51477
Add GDropdown wrapper for BDropdown
itisAliRH Jul 15, 2023
fa02a19
Add GEmbed wrapper for BEmbed
itisAliRH Jul 15, 2023
b8fe262
Add GImg wrapper for BImg
itisAliRH Jul 15, 2023
98e8841
Add GNavItemDropdown wrapper for BNavItemDropdown
itisAliRH Jul 15, 2023
8f6d349
Add GNavItem wrapper for BNavItem
itisAliRH Jul 15, 2023
b2ea0b1
Add GNavbarNav wrapper for BNavbarNav
itisAliRH Jul 15, 2023
5f4d576
Fixed missing import calls; deprecated import calls to Bootstrap-vue
hujambo-dunia Jul 15, 2023
4f97efc
Fixed missing import calls; deprecated import calls to Bootstrap-vue
hujambo-dunia Jul 15, 2023
06563e3
Eslint
hujambo-dunia Jul 15, 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
Prev Previous commit
Next Next commit
Add GContainer wrapper for BContainer
  • Loading branch information
itisAliRH committed Jul 15, 2023
commit 0d2dc3bbacdc9e6ab614c19641a19b6a095297ac
9 changes: 9 additions & 0 deletions client/src/component-library/GContainer.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<script setup lang="ts">
import { BContainer } from "bootstrap-vue";
</script>

<template>
<BContainer v-bind="$attrs" v-on="$listeners">
<slot></slot>
</BContainer>
</template>
6 changes: 4 additions & 2 deletions client/src/components/IconCard.vue
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<template>
<GCard :title="title" class="mx-4 icon-card">
<b-container class="p-0">
<GContainer class="p-0">
<GRow>
<GCol>{{ description }}</GCol>
<GCol cols="auto"><i :class="icon"></i></GCol>
</GRow>
</b-container>
</GContainer>
<b-button variant="primary" @click="onButtonClick">{{ buttonText }}</b-button>
</GCard>
</template>

<script>
import GCard from "@/component-library/GCard.vue";
import GCol from "@/component-library/GCol.vue";
import GContainer from "@/component-library/GContainer.vue";
import GRow from "@/component-library/GRow.vue";

/** A generic Card, used as a template, that displays an action button,
* an icon (font-awesome), along with a title and description.
* Clicking the button emits an "onButtonClick" event. */
export default {
components: {
GContainer,
GCard,
GRow,
GCol,
Expand Down
6 changes: 4 additions & 2 deletions client/src/components/Libraries/LibrariesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
</template>
</b-table>

<b-container>
<GContainer>
<GRow class="justify-content-md-center">
<GCol md="auto">
<GPagination
Expand Down Expand Up @@ -175,7 +175,7 @@
</table>
</GCol>
</GRow>
</b-container>
</GContainer>
</div>
</template>

Expand All @@ -201,6 +201,7 @@ import { fields } from "./table-fields";
import GCard from "@/component-library/GCard.vue";
import GCol from "@/component-library/GCol.vue";
import GCollapse from "@/component-library/GCollapse.vue";
import GContainer from "@/component-library/GContainer.vue";
import GInputGroup from "@/component-library/GInputGroup.vue";
import GLink from "@/component-library/GLink.vue";
import GPagination from "@/component-library/GPagination.vue";
Expand All @@ -212,6 +213,7 @@ Vue.use(BootstrapVue);

export default {
components: {
GContainer,
GPagination,
GCollapse,
GCard,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
</template>
</b-table>
<!-- hide pagination if the table is loading-->
<b-container>
<GContainer>
<GRow align-v="center" class="justify-content-md-center">
<GCol md="auto">
<div v-if="isBusy">
Expand Down Expand Up @@ -254,7 +254,7 @@
</table>
</GCol>
</GRow>
</b-container>
</GContainer>
</div>
</template>

Expand All @@ -280,6 +280,7 @@ import { fields } from "./table-fields";
import FolderTopBar from "./TopToolbar/FolderTopBar";

import GCol from "@/component-library/GCol.vue";
import GContainer from "@/component-library/GContainer.vue";
import GLink from "@/component-library/GLink.vue";
import GPagination from "@/component-library/GPagination.vue";
import GRow from "@/component-library/GRow.vue";
Expand All @@ -300,6 +301,7 @@ function initialFolderState() {
}
export default {
components: {
GContainer,
GPagination,
GRow,
GCol,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<b-container fluid>
<GContainer fluid>
<div v-if="dataset">
<LibraryBreadcrumb :current-id="dataset_id" :full_path="dataset.full_path" />
<b-button
Expand Down Expand Up @@ -69,7 +69,7 @@
<font-awesome-icon :icon="['far', 'save']" />
&nbsp;Save
</b-button>
</b-container>
</GContainer>
</div>
</template>

Expand All @@ -90,12 +90,15 @@ import { getAppRoot } from "onload/loadConfig";
import Vue from "vue";
import VueObserveVisibility from "vue-observe-visibility";

import GContainer from "@/component-library/GContainer.vue";

Vue.use(VueObserveVisibility);
Vue.use(BootstrapVue);
initPermissionsIcons();

export default {
components: {
GContainer,
PermissionsInputField,
FontAwesomeIcon,
LibraryBreadcrumb,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div>
<b-button variant="link" @click="onGoBack">Go back</b-button>
<PermissionsHeader v-if="folder" :name="folder.name" />
<b-container fluid>
<GContainer fluid>
<div class="dataset_table">
<h2 class="text-center">Folder permissions</h2>
<PermissionsInputField
Expand Down Expand Up @@ -35,7 +35,7 @@
&nbsp;Save
</button>
</div>
</b-container>
</GContainer>
</div>
</template>

Expand All @@ -51,11 +51,14 @@ import { Toast } from "composables/toast";
import { getAppRoot } from "onload/loadConfig";
import Vue from "vue";

import GContainer from "@/component-library/GContainer.vue";

Vue.use(BootstrapVue);
initPermissionsIcons();

export default {
components: {
GContainer,
PermissionsInputField,
PermissionsHeader,
FontAwesomeIcon,
Expand Down
6 changes: 4 additions & 2 deletions client/src/components/User/CustomBuilds.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<b-container>
<GContainer>
<GRow>
<GCol>
<h1 class="h-sm">Current Custom Builds</h1>
Expand Down Expand Up @@ -143,7 +143,7 @@ chr5 152537259</pre
</GCard>
</GCol>
</GRow>
</b-container>
</GContainer>
</template>

<script>
Expand All @@ -159,12 +159,14 @@ import Multiselect from "vue-multiselect";
import GAlert from "@/component-library/GAlert.vue";
import GCard from "@/component-library/GCard.vue";
import GCol from "@/component-library/GCol.vue";
import GContainer from "@/component-library/GContainer.vue";
import GRow from "@/component-library/GRow.vue";

Vue.use(BootstrapVue);

export default {
components: {
GContainer,
GCard,
GRow,
GCol,
Expand Down
10 changes: 6 additions & 4 deletions client/src/components/User/DiskUsage/DiskUsageSummary.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<h2 class="alert-heading h-sm">{{ errorMessageTitle }}</h2>
{{ errorMessage }}
</GAlert>
<b-container v-if="currentUser">
<GContainer v-if="currentUser">
<GRow v-if="config.enable_quotas" class="justify-content-md-center">
<QuotaUsageSummary v-if="quotaUsages" :quota-usages="quotaUsages" />
</GRow>
<h2 v-else id="basic-disk-usage-summary" class="text-center my-3">
You're using <b>{{ getTotalDiskUsage(currentUser) }}</b> of disk space.
</h2>
</b-container>
<b-container class="text-center mb-5 w-75">
</GContainer>
<GContainer class="text-center mb-5 w-75">
<button
title="Recalculate disk usage"
:disabled="isRecalculating"
Expand All @@ -34,7 +34,7 @@
@dismiss-count-down="countDownChanged">
Recalculating disk usage... this may take some time, please check back later.
</GAlert>
</b-container>
</GContainer>
</div>
</ConfigProvider>
</template>
Expand All @@ -54,10 +54,12 @@ import { useUserStore } from "@/stores/userStore";
import { QuotaUsage } from "./Quota/model";

import GAlert from "@/component-library/GAlert.vue";
import GContainer from "@/component-library/GContainer.vue";
import GRow from "@/component-library/GRow.vue";

export default {
components: {
GContainer,
GRow,
GAlert,
ConfigProvider,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import CleanupResultDialog from "./Cleanup/CleanupResultDialog.vue";
import ReviewCleanupDialog from "./Cleanup/ReviewCleanupDialog.vue";
import GAlert from "@/component-library/GAlert.vue";
import GCardGroup from "@/component-library/GCardGroup.vue";
import GContainer from "@/component-library/GContainer.vue";
import GLink from "@/component-library/GLink.vue";
import GRow from "@/component-library/GRow.vue";

Expand Down Expand Up @@ -54,7 +55,7 @@ async function onConfirmCleanupSelected(selectedItems: CleanableItem[]) {
</script>

<template>
<b-container fluid>
<GContainer fluid>
<GLink to="StorageDashboard">{{ localize("Back to Dashboard") }}</GLink>
<h2 class="text-center my-3">
<b>{{ localize("Manage your account storage") }}</b> <sup class="text-beta">(Beta)</sup>
Expand All @@ -74,7 +75,7 @@ async function onConfirmCleanupSelected(selectedItems: CleanableItem[]) {
</GRow>

<div id="categories-panel">
<b-container v-for="category in cleanupCategories" :key="category.id">
<GContainer v-for="category in cleanupCategories" :key="category.id">
<GRow class="justify-content-md-center mb-2">
<h3>
<b>{{ category.name }}</b>
Expand All @@ -90,7 +91,7 @@ async function onConfirmCleanupSelected(selectedItems: CleanableItem[]) {
@onReviewItems="onReviewItems" />
</GCardGroup>
</GRow>
</b-container>
</GContainer>
</div>

<ReviewCleanupDialog
Expand All @@ -100,7 +101,7 @@ async function onConfirmCleanupSelected(selectedItems: CleanableItem[]) {
@onConfirmCleanupSelectedItems="onConfirmCleanupSelected" />

<CleanupResultDialog ref="resultModal" :result="cleanupResult" />
</b-container>
</GContainer>
</template>

<style lang="css" scoped>
Expand Down
6 changes: 4 additions & 2 deletions client/src/components/User/UserPreferences.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<b-container fluid class="p-0">
<GContainer fluid class="p-0">
<h1 v-localize class="h-lg">User preferences</h1>
<GAlert :variant="messageVariant" :show="!!message">
{{ message }}
Expand Down Expand Up @@ -117,7 +117,7 @@
title="Sign Out"
description="Click here to sign out of all sessions."
@click="signOut" />
</b-container>
</GContainer>
</template>

<script>
Expand All @@ -144,11 +144,13 @@ import UserPreferredObjectStore from "./UserPreferredObjectStore";
import ThemeSelector from "./ThemeSelector.vue";
import GAlert from "@/component-library/GAlert.vue";
import GCollapse from "@/component-library/GCollapse.vue";
import GContainer from "@/component-library/GContainer.vue";

Vue.use(BootstrapVue);

export default {
components: {
GContainer,
GCollapse,
GAlert,
ConfigProvider,
Expand Down
6 changes: 4 additions & 2 deletions client/src/components/admin/DataManager/DataManager.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</GAlert>
</div>
<div v-else-if="dataManagers && dataTables">
<b-container fluid>
<GContainer fluid>
<GRow>
<GCol md="6">
<b-form-group description="Search for strings or regular expressions">
Expand All @@ -23,7 +23,7 @@
</b-form-group>
</GCol>
</GRow>
</b-container>
</GContainer>
<GCardGroup columns>
<GCard id="data-managers-card" no-body header="Installed Data Managers">
<b-list-group flush>
Expand Down Expand Up @@ -81,12 +81,14 @@ import GAlert from "@/component-library/GAlert.vue";
import GCard from "@/component-library/GCard.vue";
import GCardGroup from "@/component-library/GCardGroup.vue";
import GCol from "@/component-library/GCol.vue";
import GContainer from "@/component-library/GContainer.vue";
import GInputGroup from "@/component-library/GInputGroup.vue";
import GInputGroupAppend from "@/component-library/GInputGroupAppend.vue";
import GRow from "@/component-library/GRow.vue";

export default {
components: {
GContainer,
GCard,
GCardGroup,
GRow,
Expand Down
Loading