Skip to content

Commit 9f7fb53

Browse files
michaelcozzolinomichaelcozzolino
authored
Merge pull request #144 from michaelcozzolino/release(core)/v2.3.0
release(core): v2.3.0
2 parents 8b46c92 + b529ac0 commit 9f7fb53

126 files changed

Lines changed: 239 additions & 273 deletions

File tree

Some content is hidden

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

‎packages/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "flyonui-vue",
33
"type": "module",
4-
"version": "2.2.0",
4+
"version": "2.3.0",
55
"author": "Michael Cozzolino",
66
"license": "MIT",
77
"repository": {

‎packages/core/src/UI/Components/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ export * from '@/UI/Components/Stats';
1515
export * from '@/UI/Components/Status';
1616
export * from '@/UI/Components/Swap';
1717
export * from '@/UI/Components/ThemeController';
18-
// export * from '@/Components/Radio';

‎packages/core/src/UI/Content/BlockQuote/UI/FoBlockQuote.vue‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,11 @@
3030
</div>
3131

3232
<template v-else>
33-
<!-- todo: replace with FoAvatar when implemented -->
34-
<div v-if="author.avatar !== undefined"
35-
class="avatar"
36-
>
37-
<div class="size-10 rounded-full">
38-
<img :src="author.avatar"
39-
:alt="author.name"
40-
>
41-
</div>
42-
</div>
33+
<FoAvatar v-if="author.avatar !== undefined"
34+
:avatar="{ src: author.avatar, alt: author.name }"
35+
shape="circle"
36+
size="medium"
37+
/>
4338

4439
<div class="ms-4">
4540
<div class="text-base-content text-base font-semibold">
@@ -64,6 +59,7 @@ import type { WithRequiredDefaultSlot } from '@/Types';
6459
import type { BlockQuoteProps } from '@/UI/Content/BlockQuote/Types';
6560
import { useAlignment } from '@/Lib/UseAlignment/Internal';
6661
import { useRequiredSlotMessage } from '@/Lib/Utils/Internal';
62+
import { FoAvatar } from '@/UI/Components';
6763
import { FoIcon } from '@/UI/Customization';
6864
import { computed } from 'vue';
6965

‎packages/docs/.vitepress/theme/Components/Layout/Features/Sidebar/Lib/UseSidebarItems.ts‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { SidebarBadge, SidebarItem } from '@/.vitepress/theme/Components/Layout/Features/Sidebar/Types/Sidebar';
22
import type { ComputedRef } from 'vue';
3-
import { flyonUIVueNextPath } from '@/Next/Lib/Next';
43
import { computed } from 'vue';
54

65
export function useSidebarItems(): ComputedRef<SidebarItem[]> {
@@ -38,17 +37,15 @@ export function useSidebarItems(): ComputedRef<SidebarItem[]> {
3837
children: [
3938
{
4039
text: 'BlockQuote',
41-
to: `${flyonUIVueNextPath}/content/block-quote`,
40+
to: '/content/block-quote',
4241
icon: 'tabler:quote',
4342
children: [],
44-
badge: _unreleasedBadge,
4543
},
4644
{
4745
text: 'Divider',
48-
to: `${flyonUIVueNextPath}/content/divider`,
46+
to: '/content/divider',
4947
icon: 'tabler:separator-horizontal',
5048
children: [],
51-
badge: _unreleasedBadge,
5249
},
5350
{
5451
text: 'Keyboard',
@@ -81,17 +78,15 @@ export function useSidebarItems(): ComputedRef<SidebarItem[]> {
8178
children: [
8279
{
8380
text: 'Alert',
84-
to: `${flyonUIVueNextPath}/components/alert`,
81+
to: '/components/alert',
8582
icon: 'line-md:alert',
8683
children: [],
87-
badge: _unreleasedBadge,
8884
},
8985
{
9086
text: 'Avatar',
91-
to: `${flyonUIVueNextPath}/components/avatar`,
87+
to: '/components/avatar',
9288
icon: 'carbon:user-avatar',
9389
children: [],
94-
badge: _unreleasedBadge,
9590
},
9691
{
9792
text: 'Badge',
@@ -107,10 +102,9 @@ export function useSidebarItems(): ComputedRef<SidebarItem[]> {
107102
},
108103
{
109104
text: 'Diff',
110-
to: `${flyonUIVueNextPath}/components/diff`,
105+
to: '/components/diff',
111106
icon: 'tabler:git-compare',
112107
children: [],
113-
badge: _unreleasedBadge,
114108
},
115109
{
116110
text: 'List Group',
@@ -126,17 +120,15 @@ export function useSidebarItems(): ComputedRef<SidebarItem[]> {
126120
},
127121
{
128122
text: 'Radial Progress',
129-
to: `${flyonUIVueNextPath}/components/radial-progress`,
123+
to: '/components/radial-progress',
130124
icon: 'tabler:progress',
131125
children: [],
132-
badge: _unreleasedBadge,
133126
},
134127
{
135128
text: 'Skeleton',
136-
to: `${flyonUIVueNextPath}/components/skeleton`,
129+
to: '/components/skeleton',
137130
icon: 'tdesign:placeholder-filled',
138131
children: [],
139-
badge: _unreleasedBadge,
140132
},
141133
{
142134
text: 'Stats',
@@ -146,10 +138,9 @@ export function useSidebarItems(): ComputedRef<SidebarItem[]> {
146138
},
147139
{
148140
text: 'Status',
149-
to: `${flyonUIVueNextPath}/components/status`,
141+
to: '/components/status',
150142
icon: 'tabler:circle-dot',
151143
children: [],
152-
badge: _unreleasedBadge,
153144
},
154145
{
155146
text: 'Swap',
@@ -222,10 +213,9 @@ export function useSidebarItems(): ComputedRef<SidebarItem[]> {
222213
},
223214
{
224215
text: 'Input File',
225-
to: `${flyonUIVueNextPath}/forms/input-file`,
216+
to: '/forms/input-file',
226217
icon: 'mdi:file-upload',
227218
children: [],
228-
badge: _unreleasedBadge,
229219
},
230220
{
231221
text: 'Input Text',
@@ -241,17 +231,15 @@ export function useSidebarItems(): ComputedRef<SidebarItem[]> {
241231
},
242232
{
243233
text: 'Radio',
244-
to: `${flyonUIVueNextPath}/forms/radio`,
234+
to: '/forms/radio',
245235
icon: 'mdi:radio-button-checked',
246236
children: [],
247-
badge: _unreleasedBadge,
248237
},
249238
{
250239
text: 'Range',
251-
to: `${flyonUIVueNextPath}/forms/range`,
240+
to: '/forms/range',
252241
icon: 'radix-icons:slider',
253242
children: [],
254-
badge: _unreleasedBadge,
255243
},
256244
{
257245
text: 'Select',
@@ -284,10 +272,9 @@ export function useSidebarItems(): ComputedRef<SidebarItem[]> {
284272
},
285273
{
286274
text: 'Data Table',
287-
to: `${flyonUIVueNextPath}/tables/data-table`,
275+
to: '/tables/data-table',
288276
icon: 'carbon:data-table',
289277
children: [],
290-
badge: _unreleasedBadge,
291278
},
292279
],
293280
},

‎packages/docs/.vitepress/theme/index.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ export default {
5151
registerDocComponents(app, [
5252
{
5353
name: 'AvatarDocs',
54-
component: defineAsyncComponent(() => import('@/Next/Components/Avatar/AvatarDocs.vue')),
54+
component: defineAsyncComponent(() => import('@/Components/Avatar/AvatarDocs.vue')),
5555
},
5656
{
5757
name: 'KeyboardDocs',
5858
component: defineAsyncComponent(() => import('@/Content/Keyboard/KeyboardDocs.vue')),
5959
},
6060
{
6161
name: 'AlertDocs',
62-
component: defineAsyncComponent(() => import('@/Next/Components/Alert/AlertDocs.vue')),
62+
component: defineAsyncComponent(() => import('@/Components/Alert/AlertDocs.vue')),
6363
},
6464
{
6565
name: 'ComponentNotReadyForProductionAlert',
@@ -79,7 +79,7 @@ export default {
7979
},
8080
{
8181
name: 'BlockQuoteDocs',
82-
component: defineAsyncComponent(() => import('@/Next/Content/BlockQuote/BlockQuoteDocs.vue')),
82+
component: defineAsyncComponent(() => import('@/Content/BlockQuote/BlockQuoteDocs.vue')),
8383
},
8484
{
8585
name: 'ButtonDocs',
@@ -91,19 +91,19 @@ export default {
9191
},
9292
{
9393
name: 'DataTableDocs',
94-
component: defineAsyncComponent(() => import('@/Next/Tables/DataTable/DataTableDocs.vue')),
94+
component: defineAsyncComponent(() => import('@/Tables/DataTable/DataTableDocs.vue')),
9595
},
9696
{
9797
name: 'DiffDocs',
98-
component: defineAsyncComponent(() => import('@/Next/Components/Diff/DiffDocs.vue')),
98+
component: defineAsyncComponent(() => import('@/Components/Diff/DiffDocs.vue')),
9999
},
100100
{
101101
name: 'DividerDocs',
102-
component: defineAsyncComponent(() => import('@/Next/Content/Divider/DividerDocs.vue')),
102+
component: defineAsyncComponent(() => import('@/Content/Divider/DividerDocs.vue')),
103103
},
104104
{
105105
name: 'InputFileDocs',
106-
component: defineAsyncComponent(() => import('@/Next/Forms/InputFile/InputFileDocs.vue')),
106+
component: defineAsyncComponent(() => import('@/Forms/InputFile/InputFileDocs.vue')),
107107
},
108108
{
109109
name: 'InputTextDocs',
@@ -155,27 +155,27 @@ export default {
155155
},
156156
{
157157
name: 'RadioDocs',
158-
component: defineAsyncComponent(() => import('@/Next/Forms/Radio/RadioDocs.vue')),
158+
component: defineAsyncComponent(() => import('@/Forms/Radio/RadioDocs.vue')),
159159
},
160160
{
161161
name: 'RangeDocs',
162-
component: defineAsyncComponent(() => import('@/Next/Forms/Range/RangeDocs.vue')),
162+
component: defineAsyncComponent(() => import('@/Forms/Range/RangeDocs.vue')),
163163
},
164164
{
165165
name: 'RadialProgressDocs',
166-
component: defineAsyncComponent(() => import('@/Next/Components/RadialProgress/RadialProgressDocs.vue')),
166+
component: defineAsyncComponent(() => import('@/Components/RadialProgress/RadialProgressDocs.vue')),
167167
},
168168
{
169169
name: 'SkeletonDocs',
170-
component: defineAsyncComponent(() => import('@/Next/Components/Skeleton/SkeletonDocs.vue')),
170+
component: defineAsyncComponent(() => import('@/Components/Skeleton/SkeletonDocs.vue')),
171171
},
172172
{
173173
name: 'StatsDocs',
174174
component: defineAsyncComponent(() => import('@/Components/Stats/StatsDocs.vue')),
175175
},
176176
{
177177
name: 'StatusDocs',
178-
component: defineAsyncComponent(() => import('@/Next/Components/Status/StatusDocs.vue')),
178+
component: defineAsyncComponent(() => import('@/Components/Status/StatusDocs.vue')),
179179
},
180180
{
181181
name: 'SwapDocs',

packages/docs/Next/Components/Alert.md renamed to packages/docs/Components/Alert.md

File renamed without changes.

packages/docs/Next/Components/Alert/AlertDocs.vue renamed to packages/docs/Components/Alert/AlertDocs.vue

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@
99
import type { ComponentDocsPreview } from '@/.vitepress/theme/Components/ComponentDocs/Types/ComponentDocs';
1010
import type { ApiType } from '@/Api/Types/Api.ts';
1111
import ComponentDocs from '@/.vitepress/theme/Components/ComponentDocs/UI/ComponentDocs.vue';
12-
import AlertWithAction from '@/Next/Components/Alert/AlertWithAction.vue';
13-
import AlertWithActionRaw from '@/Next/Components/Alert/AlertWithAction.vue?raw';
14-
import AlertWithIcon from '@/Next/Components/Alert/AlertWithIcon.vue';
15-
import AlertWithIconRaw from '@/Next/Components/Alert/AlertWithIcon.vue?raw';
16-
import AlertWithList from '@/Next/Components/Alert/AlertWithList.vue';
17-
import AlertWithListRaw from '@/Next/Components/Alert/AlertWithList.vue?raw';
18-
import DashedAlert from '@/Next/Components/Alert/DashedAlert.vue';
19-
import DashedAlertRaw from '@/Next/Components/Alert/DashedAlert.vue?raw';
20-
import DescriptiveAlert from '@/Next/Components/Alert/DescriptiveAlert.vue';
21-
import DescriptiveAlertRaw from '@/Next/Components/Alert/DescriptiveAlert.vue?raw';
22-
import DismissibleAlert from '@/Next/Components/Alert/DismissibleAlert.vue';
23-
import DismissibleAlertRaw from '@/Next/Components/Alert/DismissibleAlert.vue?raw';
24-
import OutlineAlert from '@/Next/Components/Alert/OutlineAlert.vue';
25-
import OutlineAlertRaw from '@/Next/Components/Alert/OutlineAlert.vue?raw';
26-
import ResponsiveAlert from '@/Next/Components/Alert/ResponsiveAlert.vue';
27-
import ResponsiveAlertRaw from '@/Next/Components/Alert/ResponsiveAlert.vue?raw';
28-
import SoftAlert from '@/Next/Components/Alert/SoftAlert.vue';
29-
import SoftAlertRaw from '@/Next/Components/Alert/SoftAlert.vue?raw';
30-
import SolidAlert from '@/Next/Components/Alert/SolidAlert.vue';
31-
import SolidAlertRaw from '@/Next/Components/Alert/SolidAlert.vue?raw';
12+
import AlertWithAction from '@/Components/Alert/AlertWithAction.vue';
13+
import AlertWithActionRaw from '@/Components/Alert/AlertWithAction.vue?raw';
14+
import AlertWithIcon from '@/Components/Alert/AlertWithIcon.vue';
15+
import AlertWithIconRaw from '@/Components/Alert/AlertWithIcon.vue?raw';
16+
import AlertWithList from '@/Components/Alert/AlertWithList.vue';
17+
import AlertWithListRaw from '@/Components/Alert/AlertWithList.vue?raw';
18+
import DashedAlert from '@/Components/Alert/DashedAlert.vue';
19+
import DashedAlertRaw from '@/Components/Alert/DashedAlert.vue?raw';
20+
import DescriptiveAlert from '@/Components/Alert/DescriptiveAlert.vue';
21+
import DescriptiveAlertRaw from '@/Components/Alert/DescriptiveAlert.vue?raw';
22+
import DismissibleAlert from '@/Components/Alert/DismissibleAlert.vue';
23+
import DismissibleAlertRaw from '@/Components/Alert/DismissibleAlert.vue?raw';
24+
import OutlineAlert from '@/Components/Alert/OutlineAlert.vue';
25+
import OutlineAlertRaw from '@/Components/Alert/OutlineAlert.vue?raw';
26+
import ResponsiveAlert from '@/Components/Alert/ResponsiveAlert.vue';
27+
import ResponsiveAlertRaw from '@/Components/Alert/ResponsiveAlert.vue?raw';
28+
import SoftAlert from '@/Components/Alert/SoftAlert.vue';
29+
import SoftAlertRaw from '@/Components/Alert/SoftAlert.vue?raw';
30+
import SolidAlert from '@/Components/Alert/SolidAlert.vue';
31+
import SolidAlertRaw from '@/Components/Alert/SolidAlert.vue?raw';
3232
import { computed } from 'vue';
3333
3434
type Section = 'solid'

packages/docs/Next/Components/Alert/AlertWithAction.vue renamed to packages/docs/Components/Alert/AlertWithAction.vue

File renamed without changes.

packages/docs/Next/Components/Alert/AlertWithIcon.vue renamed to packages/docs/Components/Alert/AlertWithIcon.vue

File renamed without changes.

packages/docs/Next/Components/Alert/AlertWithList.vue renamed to packages/docs/Components/Alert/AlertWithList.vue

File renamed without changes.

0 commit comments

Comments
 (0)