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 GCol wrapper for BCol
  • Loading branch information
itisAliRH committed Jul 15, 2023
commit a563717c8361872cf8f70f9f4af383070e70e617
7 changes: 7 additions & 0 deletions client/src/component-library/GCol.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<script setup lang="ts">
import { BCol } from "bootstrap-vue";
</script>

<template>
<BCol v-bind="$attrs" v-on="$listeners"> </BCol>
</template>
12 changes: 7 additions & 5 deletions client/src/components/Common/ExportForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,24 @@
<GInput id="name" v-model="name" :placeholder="namePlaceholder | localize" required />
</b-form-group>
<b-row align-h="end">
<b-col
><b-button class="export-button" variant="primary" :disabled="!canExport" @click.prevent="doExport">{{
exportButtonText | localize
}}</b-button></b-col
>
<GCol>
<b-button class="export-button" variant="primary" :disabled="!canExport" @click.prevent="doExport">
{{ exportButtonText | localize }}
</b-button>
</GCol>
</b-row>
</div>
</template>

<script>
import GInput from "component-library/GInput";

import GCol from "@/component-library/GCol.vue";
import FilesInput from "components/FilesDialog/FilesInput.vue";

export default {
components: {
GCol,
FilesInput,
GInput,
},
Expand Down
9 changes: 5 additions & 4 deletions client/src/components/Form/Elements/FormColor.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script setup lang="ts">
import { computed } from "vue";

import GCol from "@/component-library/GCol.vue";
import GInput from "@/component-library/GInput.vue";

export interface FormColorProps {
Expand Down Expand Up @@ -28,12 +29,12 @@ const currentValue = computed({

<template>
<b-row>
<b-col class="form-color-input">
<GCol class="form-color-input">
<GInput :id="id" v-model="currentValue" class="cursor-pointer" type="color" size="sm" />
</b-col>
<b-col class="pl-0">
</GCol>
<GCol class="pl-0">
<label class="pt-1 cursor-pointer" :for="id">Select a color</label>
</b-col>
</GCol>
</b-row>
</template>

Expand Down
11 changes: 7 additions & 4 deletions client/src/components/Form/Elements/FormNumber.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{ errorMessage }}
</GAlert>
<b-row align-v="center">
<b-col :sm="isRangeValid ? defaultInputSizeWithSlider : false">
<GCol :sm="isRangeValid ? defaultInputSizeWithSlider : false">
<!-- regular dot and dot on numpad have different codes -->
<GInput
v-model="currentValue"
Expand All @@ -15,10 +15,10 @@
@change="onInputChange"
@keydown.190.capture="onFloatInput"
@keydown.110.capture="onFloatInput" />
</b-col>
<b-col v-if="isRangeValid" class="pl-0">
</GCol>
<GCol v-if="isRangeValid" class="pl-0">
<GInput v-model="currentValue" :min="min" :max="max" :step="step" type="range" />
</b-col>
</GCol>
</b-row>
</div>
</template>
Expand All @@ -27,8 +27,11 @@
import GAlert from "component-library/GAlert";
import GInput from "component-library/GInput";

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

export default {
components: {
GCol,
GAlert,
GInput,
},
Expand Down
7 changes: 5 additions & 2 deletions client/src/components/Form/Elements/FormText.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<b-row align-v="center">
<b-col>
<GCol>
<b-form-textarea
v-if="inputArea"
:id="id"
Expand All @@ -22,15 +22,18 @@
<datalist v-if="datalist && !inputArea" :id="`${id}-datalist`">
<option v-for="data in datalist" :key="data.value" :label="data.label" :value="data.value" />
</datalist>
</b-col>
</GCol>
</b-row>
</template>

<script>
import GInput from "component-library/GInput";

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

export default {
components: {
GCol,
GInput,
},
props: {
Expand Down
9 changes: 7 additions & 2 deletions client/src/components/IconCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,24 @@
<b-card :title="title" class="mx-4 icon-card">
<b-container class="p-0">
<b-row>
<b-col>{{ description }}</b-col>
<b-col cols="auto"><i :class="icon"></i></b-col>
<GCol>{{ description }}</GCol>
<GCol cols="auto"><i :class="icon"></i></GCol>
</b-row>
</b-container>
<b-button variant="primary" @click="onButtonClick">{{ buttonText }}</b-button>
</b-card>
</template>

<script>
import GCol from "@/component-library/GCol.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: {
GCol,
},
props: {
title: {
type: String,
Expand Down
6 changes: 4 additions & 2 deletions client/src/components/InteractiveTools/InteractiveTools.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<GAlert v-for="(message, index) in messages" :key="index" :show="3" variant="danger">{{ message }}</GAlert>
<h1 id="interactive-tools-heading" class="h-lg">Active Interactive Tools</h1>
<b-row class="mb-3">
<b-col cols="6">
<GCol cols="6">
<b-input
id="interactivetool-search"
v-model="filter"
Expand All @@ -12,7 +12,7 @@
placeholder="Search Interactive Tool"
autocomplete="off"
type="text" />
</b-col>
</GCol>
</b-row>
<b-table
id="interactive-tool-table"
Expand Down Expand Up @@ -76,11 +76,13 @@ import { useEntryPointStore } from "../../stores/entryPointStore";
import { Services } from "./services";

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

library.add(faExternalLinkAlt);

export default {
components: {
GCol,
GAlert,
UtcDate,
FontAwesomeIcon,
Expand Down
11 changes: 7 additions & 4 deletions client/src/components/JobInformation/CodeRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
</td>
<td v-if="codeItem">
<b-row align-v="center">
<b-col cols="11">
<GCol cols="11">
<pre :class="codeClass">{{ codeItem }}</pre>
</b-col>
<b-col class="nopadding pointer">
</GCol>
<GCol class="nopadding pointer">
<font-awesome-icon :icon="iconClass" />
</b-col>
</GCol>
</b-row>
</td>
<td v-else><i>empty</i></td>
Expand All @@ -26,9 +26,12 @@ import { library } from "@fortawesome/fontawesome-svg-core";
import { faCompressAlt, faExpandAlt } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";

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

library.add(faCompressAlt, faExpandAlt);
export default {
components: {
GCol,
FontAwesomeIcon,
},
props: {
Expand Down
10 changes: 6 additions & 4 deletions client/src/components/Libraries/LibrariesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -147,15 +147,15 @@

<b-container>
<b-row class="justify-content-md-center">
<b-col md="auto">
<GCol md="auto">
<b-pagination
v-model="currentPage"
:total-rows="rows"
:per-page="perPage"
aria-controls="libraries_list">
</b-pagination>
</b-col>
<b-col cols="1.5">
</GCol>
<GCol cols="1.5">
<table>
<tr>
<td class="m-0 p-0">
Expand All @@ -174,7 +174,7 @@
</td>
</tr>
</table>
</b-col>
</GCol>
</b-row>
</b-container>
</div>
Expand All @@ -199,6 +199,7 @@ import { useUserStore } from "@/stores/userStore";
import { Services } from "./services";
import { fields } from "./table-fields";

import GCol from "@/component-library/GCol.vue";
import GInputGroup from "@/component-library/GInputGroup.vue";
import GLink from "@/component-library/GLink.vue";

Expand All @@ -208,6 +209,7 @@ Vue.use(BootstrapVue);

export default {
components: {
GCol,
GInputGroup,
GLink,
FontAwesomeIcon,
Expand Down
10 changes: 6 additions & 4 deletions client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
<!-- hide pagination if the table is loading-->
<b-container>
<b-row align-v="center" class="justify-content-md-center">
<b-col md="auto">
<GCol md="auto">
<div v-if="isBusy">
<b-spinner small type="grow"></b-spinner>
<b-spinner small type="grow"></b-spinner>
Expand All @@ -235,9 +235,9 @@
aria-controls="folder_list_body"
@input="changePage">
</b-pagination>
</b-col>
</GCol>

<b-col cols="1.5">
<GCol cols="1.5">
<table>
<tr>
<td class="m-0 p-0">
Expand All @@ -253,7 +253,7 @@
</td>
</tr>
</table>
</b-col>
</GCol>
</b-row>
</b-container>
</div>
Expand All @@ -280,6 +280,7 @@ import { Services } from "./services";
import { fields } from "./table-fields";
import FolderTopBar from "./TopToolbar/FolderTopBar";

import GCol from "@/component-library/GCol.vue";
import GLink from "@/component-library/GLink.vue";

initFolderTableIcons();
Expand All @@ -298,6 +299,7 @@ function initialFolderState() {
}
export default {
components: {
GCol,
GLink,
FolderTopBar,
UtcDate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{ title }}
</h2>
<b-row>
<b-col>
<GCol>
<div v-if="options && value" :class="permission_type">
<multiselect
v-model="value"
Expand All @@ -24,12 +24,12 @@
</template>
</multiselect>
</div>
</b-col>
<b-col>
</GCol>
<GCol>
<GAlert show variant="info">
<div v-html="alert" />
</GAlert>
</b-col>
</GCol>
</b-row>
</div>
</template>
Expand All @@ -43,10 +43,12 @@ import Multiselect from "vue-multiselect";
import VueObserveVisibility from "vue-observe-visibility";

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

Vue.use(VueObserveVisibility);
export default {
components: {
GCol,
GAlert,
Multiselect,
},
Expand Down
6 changes: 4 additions & 2 deletions client/src/components/NewUserWelcome/NewUserWelcome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</div>
</template>
<script>
import { BButton, BCard, BCardGroup, BCarousel, BCarouselSlide, BCol, BRow, BTab, BTabs } from "bootstrap-vue";
import { BButton, BCard, BCardGroup, BCarousel, BCarouselSlide, BRow, BTab, BTabs } from "bootstrap-vue";
import Heading from "components/Common/Heading";
import Slides from "components/NewUserWelcome/components/Slides";
import Subtopics from "components/NewUserWelcome/components/Subtopics";
Expand All @@ -38,6 +38,8 @@ import { getAppRoot } from "onload/loadConfig";

import { getResource } from "./getResource";

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

export default {
components: {
Heading,
Expand All @@ -49,7 +51,7 @@ export default {
BCarouselSlide,
BButton,
BRow,
BCol,
GCol,
Topics,
Subtopics,
Slides,
Expand Down
Loading