Skip to content

Commit e758aa4

Browse files
authored
Merge pull request #284 from qwikifiers/pr-change-daisy
2 parents d945b72 + ca03213 commit e758aa4

File tree

195 files changed

+3442
-3065
lines changed

Some content is hidden

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

195 files changed

+3442
-3065
lines changed

.github/actions/test/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ runs:
2323
shell: bash
2424
run: npx nx build headless
2525

26-
# - name: Build Daisy Theme
26+
# - name: Build Tailwind Theme
2727
# shell: bash
28-
# run: npx nx build daisy
28+
# run: npx nx build tailwind
2929

3030
# - name: Build
3131
# shell: bash

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"git.pullTags": false,
3-
"conventionalCommits.scopes": ["daisy"]
3+
"conventionalCommits.scopes": ["tailwind"]
44
}

CODING_STANDARDS.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ export type TooltipProps = QwikIntrinsicElements['div'] & {
6464
};
6565
```
6666

67-
For **Daisy, Material and other components variations**, you can define the new props in a new type, named with the component name and the variation as prefix. For example:
67+
For **Tailwind, Material and other components variations**, you can define the new props in a new type, named with the component name and the variation as prefix. For example:
6868

6969
```ts
70-
type DaisyTooltipProps = {
70+
type TailwindTooltipProps = {
7171
size?: 'sm' | 'md';
7272
};
7373
```
@@ -77,7 +77,7 @@ The final exported type will extend from the headless props type. For example:
7777
```ts
7878
import { TooltipProps as HeadlessTooltipProps } from '@qwik-ui/headless';
7979

80-
export type TooltipProps = HeadlessTooltipProps & DaisyTooltipProps;
80+
export type TooltipProps = HeadlessTooltipProps & TailwindTooltipProps;
8181
```
8282

8383
- Use object destructuring in the component$ declaration on all the props you are going to use. For example:
@@ -104,15 +104,15 @@ return (
104104
- Use accessibility attributes whenever they are needed.
105105
- For simple primitive states use signals. For object state, use stores.
106106

107-
## Example of headless button customisation with Daisy
107+
## Example of headless button customisation with Tailwind
108108

109109
```tsx
110110
import { component$, QwikIntrinsicElements, Slot } from '@builder.io/qwik';
111111
import { Button as HeadlessButton, ButtonProps as ButtonHeadlessProps } from '@qwik-ui/headless';
112112
import { clsq } from '@qwik-ui/shared';
113113

114-
type DaisyButtonProps = { size?: 'sm' | 'md', ... };
115-
export type ButtonProps = ButtonHeadlessProps & DaisyButtonProps;
114+
type TailwindButtonProps = { size?: 'sm' | 'md', ... };
115+
export type ButtonProps = ButtonHeadlessProps & TailwindButtonProps;
116116

117117
export const Button = component$(
118118
({ size = 'md', class: classNames, ...rest }: ButtonProps) => {

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ git checkout -b my-fix-branch main
6464

6565
- Visit the URL printed in the console and you'll have a page opened with the suite of widgets.
6666

67-
- Once you made some changes in either package (`headless`, `daisy` or `material`), you will see them immediately reflected on the page.
67+
- Once you made some changes in either package (`headless`, `tailwind` or `material`), you will see them immediately reflected on the page.
6868

6969
### ▶ 5. Make sure you add / modify tests
7070

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
This library is still in early stages and once we'll collect enough feedback from the community we'll release the first beta version.
4141

4242
### ROADMAP
43-
44-
- [ ] Deploy the documentation site
43+
44+
- [ ] Deploy the documentation site
4545
- [ ] Add "Readiness" statuses to the components
4646
- [ ] Add a getting started video tutorial
4747
- [ ] Make a public storybook url
48-
- [ ] Deploy the daisy-theme package
48+
- [ ] Deploy the tailwind-kit package
4949
- [ ] Cover all of the components with storybook tests
5050
- [ ] Add testing coverage reports
5151
- [ ] Add a contribution tutorial video

apps/website/src/components/selectTheme/selectTheme.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import { useLocation } from '@builder.io/qwik-city';
33
import { APP_STATE } from '../../constants';
44
import { ThemeIcon } from '../icons/ThemeIcon';
55

6-
export type Theme = 'HEADLESS' | 'DAISY' | 'MATERIAL' | 'NOT_DEFINED';
6+
export type Theme = 'HEADLESS' | 'TAILWIND' | 'MATERIAL' | 'NOT_DEFINED';
77

88
export const SelectTheme = component$(() => {
99
const location = useLocation();
1010
const appState = useContext(APP_STATE);
1111
const openThemeSignal = useSignal<boolean>(false);
1212

13-
const themes: Theme[] = ['HEADLESS', 'DAISY', 'MATERIAL'];
13+
const themes: Theme[] = ['HEADLESS', 'TAILWIND', 'MATERIAL'];
1414
return (
1515
<div
1616
title="Change Theme"

apps/website/src/components/wrapper/wrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
useSignal,
55
useStylesScoped$,
66
} from '@builder.io/qwik';
7-
import { Tab, TabPanel, Tabs } from '@qwik-ui/theme-daisy';
7+
import { Tab, TabPanel, Tabs } from '@qwik-ui/tailwind';
88
import styles from './wrapper.css?inline';
99

1010
export interface WrapperProps {

apps/website/src/routes/docs/daisy/accordion/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { component$, useStylesScoped$ } from '@builder.io/qwik';
2-
import { Accordion, AccordionItem } from '@qwik-ui/theme-daisy';
2+
import { Accordion, AccordionItem } from '@qwik-ui/tailwind';
33

44
export default component$(() => {
55
useStylesScoped$(`

apps/website/src/routes/docs/daisy/alert/index.tsx

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { $, component$ } from '@builder.io/qwik';
2-
import { Alert as DaisyAlert } from '@qwik-ui/theme-daisy';
2+
import { Alert as TailwindAlert } from '@qwik-ui/tailwind';
33
import { GitHubIcon } from '../../../../components/icons/GitHubIcon';
44

55
export default component$(() => {
@@ -8,40 +8,42 @@ export default component$(() => {
88
<h2>This is the documentation for the Alert</h2>
99

1010
<div class="flex flex-col gap-4">
11-
<DaisyAlert>This is a success alert.</DaisyAlert>
12-
<DaisyAlert variant="error">This is an error alert.</DaisyAlert>
13-
<DaisyAlert variant="warning">This is a warning alert.</DaisyAlert>
14-
<DaisyAlert variant="info">This is an info alert.</DaisyAlert>
11+
<TailwindAlert>This is a success alert.</TailwindAlert>
12+
<TailwindAlert variant="error">This is an error alert.</TailwindAlert>
13+
<TailwindAlert variant="warning">
14+
This is a warning alert.
15+
</TailwindAlert>
16+
<TailwindAlert variant="info">This is an info alert.</TailwindAlert>
1517
</div>
1618

1719
<div class="flex flex-col gap-2">
1820
<h3>With a title</h3>
19-
<DaisyAlert variant="warning" title="Watch out!">
21+
<TailwindAlert variant="warning" title="Watch out!">
2022
This is a warning alert.
21-
</DaisyAlert>
23+
</TailwindAlert>
2224
</div>
2325

2426
<div class="flex flex-col gap-2">
2527
<h3>With an icon</h3>
26-
<DaisyAlert variant="success">
28+
<TailwindAlert variant="success">
2729
<div q:slot="icon">💸</div>
2830
This is a success alert with an icon.
29-
</DaisyAlert>
31+
</TailwindAlert>
3032
</div>
3133

3234
<div class="flex flex-col gap-2">
3335
<h3>With a action</h3>
34-
<DaisyAlert
36+
<TailwindAlert
3537
variant="error"
3638
action={{ label: 'undo', onClick$: $(() => alert('Undoing...')) }}
3739
>
3840
This is a success alert with an action.
39-
</DaisyAlert>
41+
</TailwindAlert>
4042
</div>
4143

4244
<div class="flex flex-col gap-2">
4345
<h3>A mix</h3>
44-
<DaisyAlert
46+
<TailwindAlert
4547
variant="info"
4648
title="Did you know?"
4749
action={{ label: 'cool!', onClick$: $(() => alert('Hi!')) }}
@@ -50,7 +52,7 @@ export default component$(() => {
5052
<GitHubIcon />
5153
</div>
5254
This is an info alert with an action, icon, and title.
53-
</DaisyAlert>
55+
</TailwindAlert>
5456
</div>
5557
</div>
5658
);

apps/website/src/routes/docs/daisy/badge/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { component$, useStylesScoped$ } from '@builder.io/qwik';
2-
import { Badge, Button } from '@qwik-ui/theme-daisy';
2+
import { Badge, Button } from '@qwik-ui/tailwind';
33

44
export default component$(() => {
55
useStylesScoped$(`

0 commit comments

Comments
 (0)