Skip to content

Commit 7e1b9e6

Browse files
cogorcogor
committed
Merge branch 'refactor-make-linting-more-strict' into fwb-rename
# Conflicts: # docs/components/PLAYGROUND/examples/SlotListenerExample.vue # docs/components/checkbox/examples/CheckboxChecked.vue # docs/components/checkbox/examples/CheckboxDefault.vue # docs/components/checkbox/examples/CheckboxDisabled.vue # docs/components/checkbox/examples/CheckboxLink.vue # docs/components/fileInput/examples/FileInpDefault.vue # docs/components/fileInput/examples/FileInpDropZone.vue # docs/components/fileInput/examples/FileInpHelper.vue # docs/components/fileInput/examples/FileInpSize.vue # docs/components/fileInput/examples/MultipleFile.vue # docs/components/flowbiteThemable/examples/button/FlowbiteThemableButtonExample.vue # docs/components/flowbiteThemable/examples/dropdown/FlowbiteThemableDropdownExample.vue # docs/components/flowbiteThemable/examples/tabs/FlowbiteThemableTabsDefaultExample.vue # docs/components/flowbiteThemable/examples/tabs/FlowbiteThemableTabsPillsExample.vue # docs/components/flowbiteThemable/examples/tabs/FlowbiteThemableTabsUnderlineExample.vue # docs/components/input.md # docs/components/input/examples/InputDisabledExample.vue # docs/components/input/examples/InputExample.vue # docs/components/input/examples/InputHelperExample.vue # docs/components/input/examples/InputPrefixExample.vue # docs/components/input/examples/InputRequiredExample.vue # docs/components/input/examples/InputSizeExample.vue # docs/components/input/examples/InputSuffixExample.vue # docs/components/input/examples/InputValidationExample.vue # docs/components/radio.md # docs/components/radio/examples/BorderedRadio.vue # docs/components/radio/examples/DefaultRadio.vue # docs/components/radio/examples/DisabledRadio.vue # docs/components/radio/examples/HorizontalListRadio.vue # docs/components/radio/examples/InlineRadio.vue # docs/components/radio/examples/LinkRadio.vue # docs/components/radio/examples/ListRadio.vue # docs/components/range.md # docs/components/range/examples/DefaultRange.vue # docs/components/range/examples/DisabledRange.vue # docs/components/range/examples/MinMaxRange.vue # docs/components/range/examples/SizeRange.vue # docs/components/range/examples/StepsRange.vue # docs/components/select.md # docs/components/select/examples/DisabledSelect.vue # docs/components/select/examples/SelectExample.vue # docs/components/select/examples/SelectSize.vue # docs/components/select/examples/UnderlinedSelect.vue # docs/components/sidebar.md # docs/components/sidebar/examples/FwbSidebarExample.vue # docs/components/textarea.md # docs/components/textarea/examples/CommentTextarea.vue # docs/components/textarea/examples/DefaultTextarea.vue # docs/components/timeline/examples/TimelineExample.vue # docs/components/timeline/examples/TimelineHorizontalExample.vue # docs/components/timeline/examples/TimelineWithIconsExample.vue # docs/components/toast/examples/ToastClosableExample.vue # docs/components/toast/examples/ToastDivideExample.vue # docs/components/toast/examples/ToastIconExample.vue # docs/components/toast/examples/ToastInteractiveExample.vue # docs/components/toast/examples/ToastMessageExample.vue # docs/components/toast/examples/ToastTypeExample.vue # docs/components/toastProvider/examples/FwbToastProviderExampleChild.vue # docs/components/toastProvider/examples/ToastProviderExample.vue # docs/components/toastProvider/examples/UpdateToast.vue # docs/components/toggle/examples/CheckedToggle.vue # docs/components/toggle/examples/ColorsToggle.vue # docs/components/toggle/examples/DefaultToggle.vue # docs/components/toggle/examples/DisabledToggle.vue # docs/components/toggle/examples/SizeToggle.vue # docs/components/tooltip/examples/TooltipExample.vue # docs/components/tooltip/examples/TooltipPositionExample.vue # docs/components/tooltip/examples/TooltipStyleExample.vue # docs/components/tooltip/examples/TooltipTriggerExample.vue # src/components/FileInput/composables/useFileInputClasses.ts # src/components/FwbAccordion/composables/useAccordionContentClasses.ts # src/components/FwbAccordion/composables/useAccordionHeaderClasses.ts # src/components/FwbBadge/FwbBadge.vue # src/components/FwbBadge/composables/useBadgeClasses.ts # src/components/FwbButton/tests/Button.spec.ts # src/components/FwbCheckbox/FwbCheckbox.vue # src/components/FwbCheckbox/composables/useCheckboxClasses.ts # src/components/FwbFileInput/FwbFileInput.vue # src/components/FwbInput/FwbInput.vue # src/components/FwbInput/composables/useInputClasses.ts # src/components/FwbInput/types.ts # src/components/FwbNavbar/FwbNavbarLink.ts # src/components/FwbRadio/FwbRadio.vue # src/components/FwbRadio/composables/useRadioClasses.ts # src/components/FwbRange/FwbRange.vue # src/components/FwbRange/composables/useRangeClasses.ts # src/components/FwbSelect/FwbSelect.vue # src/components/FwbSelect/composables/useSelectClasses.ts # src/components/FwbSidebar/FwbSidebar.vue # src/components/FwbTabs/composables/useTabClasses.ts # src/components/FwbTextarea/FwbTextarea.vue # src/components/FwbTextarea/composables/useTextareaClasses.ts # src/components/FwbTimeline/FwbTimeline.vue # src/components/FwbTimeline/FwbTimelinePoint.vue # src/components/FwbToggle/FwbToggle.vue # src/components/FwbToggle/composables/useToggleClasses.ts # src/components/Timeline/TimelineBody.vue # src/components/Timeline/TimelineTime.vue # src/components/Timeline/TimelineTitle.vue # src/components/Toast/Toast.vue # src/components/Toast/components/ToastProvider/ToastProvider.vue # src/components/Toast/components/ToastProvider/composables/useToast.ts # src/components/Toast/composables/useToastClasses.ts # src/components/utils/FlowbiteThemable/components/FlowbiteThemableChild/FlowbiteThemableChild.vue # src/components/utils/FlowbiteThemable/components/FlowbiteThemableChild/composables/useFlowbiteThemableChildClasses.ts # src/components/utils/FlowbiteThemable/types.d.ts # src/components/utils/FwbSlotListener/FwbSlotListener.vue # src/components/utils/SlotListener/types.ts # src/composables.ts # src/index.ts # src/utils/flatten.ts
2 parents db8b9f9 + 4deae45 commit 7e1b9e6

File tree

183 files changed

+2832
-2839
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+2832
-2839
lines changed

‎.eslintrc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = {
2222
'linebreak-style': ['error', 'unix'],
2323
'no-multiple-empty-lines': 'error',
2424
'object-curly-spacing': ['error', 'always'],
25-
'sort-imports': ['error', { ignoreDeclarationSort: true }],
25+
'sort-imports': ['error', { ignoreCase: true, ignoreDeclarationSort: true }],
2626
'vue/block-order': ['error', { order: ['template', 'script', 'style'] }],
2727
'vue/component-name-in-template-casing': ['error', 'kebab-case'],
2828
},

‎docs/components/PLAYGROUND/examples/SlotListenerExample.vue‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<template>
2-
<slot-listener
2+
<fwb-slot-listener
33
@click="onClick"
44
@mouseleave="onMouseleave"
55
@mouseenter="onMouseenter"
66
>
7-
<button>HELLO</button>
8-
</slot-listener>
7+
<fwb-button>HELLO</fwb-button>
8+
</fwb-slot-listener>
99
</template>
10+
1011
<script lang="ts" setup>
11-
import { SlotListener } from '../../../../src/index'
12+
import { FwbButton, FwbSlotListener } from '../../../../src/index'
1213
const onClick = () => {
1314
console.log('onClick from slot-listener')
1415
}

‎docs/components/checkbox.md‎

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,75 @@
11
<script setup>
2-
import CheckboxDefault from './checkbox/examples/CheckboxDefault.vue'
3-
import CheckboxDisabled from './checkbox/examples/CheckboxDisabled.vue'
4-
import CheckboxChecked from './checkbox/examples/CheckboxChecked.vue'
5-
import CheckboxLink from './checkbox/examples/CheckboxLink.vue'
2+
import FwbCheckboxExample from './checkbox/examples/FwbCheckboxExample.vue'
3+
import FwbCheckboxExampleChecked from './checkbox/examples/FwbCheckboxExampleChecked.vue'
4+
import FwbCheckboxExampleDisabled from './checkbox/examples/FwbCheckboxExampleDisabled.vue'
5+
import FwbCheckboxExampleLink from './checkbox/examples/FwbCheckboxExampleLink.vue'
66
</script>
77
# Vue Footer - Flowbite
88

99
## Default checkbox
1010

11+
<fwb-checkbox-example />
1112
```vue
13+
<template>
14+
<fwb-checkbox v-model="check" label="Default checkbox" />
15+
</template>
16+
1217
<script setup>
13-
import { Checkbox } from 'flowbite-vue'
1418
import { ref } from 'vue'
19+
import { FwbCheckbox } from 'flowbite-vue'
1520
16-
const ref1 = ref(false)
21+
const check = ref(false)
1722
</script>
18-
<template>
19-
<Checkbox v-model="ref1" label="Default checkbox" />
20-
</template>
2123
```
2224

23-
<CheckboxDefault />
24-
2525
## Disabled checkbox
2626

27+
<fwb-checkbox-example-disabled />
2728
```vue
29+
<template>
30+
<fwb-checkbox v-model="check" disabled label="Disabled checkbox" />
31+
</template>
32+
2833
<script setup>
29-
import { Checkbox } from 'flowbite-vue'
3034
import { ref } from 'vue'
35+
import { FwbCheckbox } from 'flowbite-vue'
3136
32-
const ref1 = ref(false)
37+
const check = ref(false)
3338
</script>
34-
<template>
35-
<Checkbox v-model="ref1" label="Disabled checkbox" :disabled="true" />
36-
</template>
3739
```
3840

39-
<CheckboxDisabled />
40-
4141
## Checked checkbox
4242

43+
<fwb-checkbox-example-checked />
4344
```vue
45+
<template>
46+
<fwb-checkbox v-model="check" label="Checked checkbox" />
47+
</template>
48+
4449
<script setup>
45-
import { Checkbox } from 'flowbite-vue'
4650
import { ref } from 'vue'
51+
import { FwbCheckbox } from 'flowbite-vue'
4752
48-
const ref1 = ref(true)
53+
const check = ref(true)
4954
</script>
50-
<template>
51-
<Checkbox v-model="ref1" label="Checked checkbox" />
52-
</template>
5355
```
5456

55-
<CheckboxChecked />
56-
5757
## Link with checkbox
5858

59+
<fwb-checkbox-example-link />
5960
```vue
6061
<template>
61-
<div>
62-
<Checkbox>
63-
<a href="/" class="text-primary-600 dark:text-primary-500 hover:underline ml-1">I agree with the terms and conditions</a>.
64-
</Checkbox>
65-
</div>
62+
<fwb-checkbox v-model="check">
63+
<fwb-a href="#">
64+
I agree with the terms and conditions.
65+
</fwb-a>
66+
</fwb-checkbox>
6667
</template>
67-
```
6868
69-
<CheckboxLink />
69+
<script setup>
70+
import { ref } from 'vue'
71+
import { FwbA, FwbCheckbox } from 'flowbite-vue'
72+
73+
const check = ref(false)
74+
</script>
75+
```

‎docs/components/checkbox/examples/CheckboxChecked.vue‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +0,0 @@
1-
<template>
2-
<div>
3-
<checkbox
4-
v-model="ref3"
5-
label="Checked checkbox"
6-
/>
7-
</div>
8-
</template>
9-
10-
<script setup>
11-
import { ref } from 'vue'
12-
import Checkbox from '../../../../src/components/Checkbox/Checkbox.vue'
13-
14-
const ref3 = ref(true)
15-
</script>

‎docs/components/checkbox/examples/CheckboxDefault.vue‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +0,0 @@
1-
<template>
2-
<div>
3-
<checkbox
4-
v-model="ref1"
5-
label="Default checkbox"
6-
/>
7-
</div>
8-
</template>
9-
10-
<script setup>
11-
import { ref } from 'vue'
12-
import Checkbox from '../../../../src/components/Checkbox/Checkbox.vue'
13-
14-
const ref1 = ref(false)
15-
</script>

‎docs/components/checkbox/examples/CheckboxDisabled.vue‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎docs/components/checkbox/examples/CheckboxLink.vue‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎docs/components/checkbox/examples/FwbCheckboxExample.vue‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<template>
2+
<div class="vp-raw">
3+
<fwb-checkbox
4+
v-model="check"
5+
label="Default checkbox"
6+
/>
7+
</div>
8+
</template>
9+
10+
<script setup>
11+
import { ref } from 'vue'
12+
import { FwbCheckbox } from '../../../../src/index'
13+
14+
const check = ref(false)
15+
</script>

‎docs/components/checkbox/examples/FwbCheckboxExampleChecked.vue‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<template>
2+
<div class="vp-raw">
3+
<fwb-checkbox
4+
v-model="check"
5+
label="Checked checkbox"
6+
/>
7+
</div>
8+
</template>
9+
10+
<script setup>
11+
import { ref } from 'vue'
12+
import { FwbCheckbox } from '../../../../src/index'
13+
14+
const check = ref(true)
15+
</script>

‎docs/components/checkbox/examples/FwbCheckboxExampleDisabled.vue‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<template>
2+
<div class="vp-raw">
3+
<fwb-checkbox
4+
v-model="check"
5+
disabled
6+
label="Disabled checkbox"
7+
/>
8+
</div>
9+
</template>
10+
11+
<script setup>
12+
import { ref } from 'vue'
13+
import { FwbCheckbox } from '../../../../src/index'
14+
15+
const check = ref(false)
16+
</script>

0 commit comments

Comments
 (0)