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

refactor: TSX to SFC #105

Merged
merged 49 commits into from
Dec 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
47eed2f
feat: alert component refactored
jd-solanki Dec 17, 2022
c996604
feat: avatar component refactored
jd-solanki Dec 17, 2022
d766a7d
feat: badge component refactored
jd-solanki Dec 17, 2022
069ae69
feat: refactored base input component
jd-solanki Dec 17, 2022
40cb425
feat: button refactored
jd-solanki Dec 17, 2022
4b0fd37
feat: card refactored
jd-solanki Dec 17, 2022
f3455ca
feat: refactored checkbox
jd-solanki Dec 17, 2022
31b9bbb
feat: chip refactored
jd-solanki Dec 17, 2022
fb2abeb
feat: dialog refactored
jd-solanki Dec 17, 2022
fbf0c19
feat: drawer refactored
jd-solanki Dec 17, 2022
aba3dc6
feat: AInput refactored
jd-solanki Dec 18, 2022
d1b200d
feat: list & list item refactored
jd-solanki Dec 18, 2022
2ebb196
feat: menu refactored
jd-solanki Dec 18, 2022
e409d90
feat: radio refactored
jd-solanki Dec 18, 2022
ffa8678
fear: rating refactored
jd-solanki Dec 19, 2022
c7c2032
feat: select refactored
jd-solanki Dec 19, 2022
462dcb0
feat: switch refactored
jd-solanki Dec 19, 2022
343c75d
feat: textarea refactored
jd-solanki Dec 19, 2022
40c3032
refactor: typography refactored
jd-solanki Dec 19, 2022
c955a82
feat: baseInput issue refactored
jd-solanki Dec 19, 2022
813ad7e
feat: use object syntax for props instead of interface
jd-solanki Dec 20, 2022
6dbb307
feat: use object syntax for props instead of interface
jd-solanki Dec 20, 2022
263c8c0
feat: switch use object syntax for prop
jd-solanki Dec 20, 2022
b22479b
feat: `ATable` completed
jd-solanki Dec 20, 2022
a825c44
chore: minor refactor
jd-solanki Dec 20, 2022
b3ba427
wip: server-table. sorting & filtering completed
jd-solanki Dec 21, 2022
65f509b
wip
jd-solanki Dec 22, 2022
d4ce257
feat: server table completed
jd-solanki Dec 22, 2022
08b0801
wip table
jd-solanki Dec 23, 2022
d1799e4
refactor: table component updated
jd-solanki Dec 24, 2022
07e7818
chore: build updated
jd-solanki Dec 24, 2022
09c8928
fix: todos fixed
jd-solanki Dec 24, 2022
4658d1b
fix: radio inheritAttrs false
jd-solanki Dec 24, 2022
27186ce
fix: allow scrolling textarea when readonly or disabled
jd-solanki Dec 24, 2022
960c778
chore: autogenerate nuxt imports
jd-solanki Dec 24, 2022
1733316
refactor: use `@use` instead of `@import`
jd-solanki Dec 24, 2022
03690c6
chore: update preset-theme-default build process
jd-solanki Dec 25, 2022
2f7c747
chore: remove nuxt update on build & dev
jd-solanki Dec 25, 2022
d063484
chore: omit preset-theme-default style import in docs
jd-solanki Dec 25, 2022
dd15d9a
chore: fixing preset-theme-default scss issue
jd-solanki Dec 25, 2022
a3693f7
Merge branch 'main' into refactor
jd-solanki Dec 25, 2022
eea8eea
chore: use uno reset as dep instead of dev dep
jd-solanki Dec 25, 2022
c9c1965
Merge branch 'refactor' of https://github.com/jd-solanki/anu into ref…
jd-solanki Dec 25, 2022
5f58fb4
chore: update lock file
jd-solanki Dec 25, 2022
28bcad3
trying import instead of use
jd-solanki Dec 25, 2022
fbeae37
fix(table): pagination & header slot override tests
jd-solanki Dec 26, 2022
68530a6
chore: fix typing
jd-solanki Dec 26, 2022
db9c9ae
Revert "trying import instead of use"
jd-solanki Dec 26, 2022
23612ca
fix: preset-theme-default build
jd-solanki Dec 26, 2022
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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ indent_size = 4
indent_style = tab

# Indentation override for all JS under lib directory
[.*{js,ts,tsx,jsx}]
[.*{js,ts,tsx,jsx,vue}]
indent_style = space
indent_size = 2

Expand Down
60 changes: 33 additions & 27 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ module.exports = {
],
}],

// Vue
'vue/require-default-prop': 'off',
'vue/no-restricted-class': ['error', '/^(p|m)(l|r)-/'],
'vue/no-required-prop-with-default': 'error',
'vue/v-on-event-hyphenation': ['error', 'never'],

// 'vue/require-prop-comment': ['error', {
// type: 'JSDoc',
// }],
Expand All @@ -81,35 +87,35 @@ module.exports = {
'@typescript-eslint/consistent-type-imports': 'error',

// JSX rules
'react/jsx-boolean-value': ['error', 'never'],
'react/jsx-child-element-spacing': 'error',
'react/jsx-closing-bracket-location': 'error',
// 'react/jsx-boolean-value': ['error', 'never'],
// 'react/jsx-child-element-spacing': 'error',
// 'react/jsx-closing-bracket-location': 'error',

// 'react/jsx-closing-tag-location': 'error',
'react/jsx-curly-brace-presence': 'error',
'react/jsx-curly-newline': 'error',
'react/jsx-curly-spacing': 'error',
'react/jsx-equals-spacing': 'error',
'react/jsx-filename-extension': ['error', { extensions: ['.tsx', '.jsx'] }],
'react/jsx-first-prop-new-line': 'error',
'react/jsx-indent-props': [2, 2],
'react/jsx-indent': [2, 2],
'react/jsx-max-props-per-line': 'error',
'react/jsx-no-comment-textnodes': 'error',
'react/jsx-no-duplicate-props': 'error',
'react/jsx-no-leaked-render': 'error',
'react/jsx-no-target-blank': 'error',
'react/jsx-no-useless-fragment': 'error',
'react/jsx-one-expression-per-line': 'error',
'react/jsx-pascal-case': 'error',
'react/jsx-props-no-multi-spaces': 'error',
'react/jsx-sort-props': 'error',
'react/jsx-tag-spacing': 'error',
'react/self-closing-comp': 'error',
// // 'react/jsx-closing-tag-location': 'error',
// 'react/jsx-curly-brace-presence': 'error',
// 'react/jsx-curly-newline': 'error',
// 'react/jsx-curly-spacing': 'error',
// 'react/jsx-equals-spacing': 'error',
// 'react/jsx-filename-extension': ['error', { extensions: ['.tsx', '.jsx'] }],
// 'react/jsx-first-prop-new-line': 'error',
// 'react/jsx-indent-props': [2, 2],
// 'react/jsx-indent': [2, 2],
// 'react/jsx-max-props-per-line': 'error',
// 'react/jsx-no-comment-textnodes': 'error',
// 'react/jsx-no-duplicate-props': 'error',
// 'react/jsx-no-leaked-render': 'error',
// 'react/jsx-no-target-blank': 'error',
// 'react/jsx-no-useless-fragment': 'error',
// 'react/jsx-one-expression-per-line': 'error',
// 'react/jsx-pascal-case': 'error',
// 'react/jsx-props-no-multi-spaces': 'error',
// 'react/jsx-sort-props': 'error',
// 'react/jsx-tag-spacing': 'error',
// 'react/self-closing-comp': 'error',

// 'react/no-unknown-property': ['error', { ignore: ['class', 'v-show', 'v-model', 'v-slots', 'for', 'tabindex'] }],
'react/no-unescaped-entities': 'error',
'react/no-invalid-html-attribute': 'error',
// // 'react/no-unknown-property': ['error', { ignore: ['class', 'v-show', 'v-model', 'v-slots', 'for', 'tabindex'] }],
// 'react/no-unescaped-entities': 'error',
// 'react/no-invalid-html-attribute': 'error',
},
settings: {
'import/parsers': {
Expand Down
1 change: 0 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
ignore-workspace-root-check=true
shamefully-hoist=true
11 changes: 10 additions & 1 deletion .vscode/comment-anchors.code-snippets
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,14 @@
"❗"
],
"description": "Add warning emoji"
},
"Create comment anchor SECTION": {
"prefix": "ca-html-section",
"body": [
"<!-- SECTION ${1:name} -->",
" ${2}",
"<!-- !SECTION -->"
],
"description": "Create comment anchor SECTION"
}
}
}
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@
"vue"
],
// Extension: Comment Anchors
"commentAnchors.tags.displayLineNumber": false,
"commentAnchors.workspace.enabled": false,
"commentAnchors.showCursor": true,
"commentAnchors.tags.displayTagName": false,
"commentAnchors.tags.list": [
{
"tag": "ℹ️",
Expand Down Expand Up @@ -81,6 +84,7 @@
"cSpell.words": [
"composables",
"defu",
"globby",
"nuxt",
"Vite",
"vitepress",
Expand Down
28 changes: 28 additions & 0 deletions .vscode/vue.code-snippets
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"Create SFC": {
"prefix": "sfc",
"body": [
"<script lang=\"ts\" setup>",
"defineOptions({",
" name: 'A${1}',",
"})",
"</script>",
"",
"<template>",
"",
"</template>",
"",
"<style lang=\"scss\">",
"",
"</style>"
],
"description": "Create SFC"
},
"Create template with v-if": {
"prefix": "tif",
"body": [
"<template v-if=\"${1}\"></template>"
],
"description": "Create template with v-if"
}
}
1 change: 1 addition & 0 deletions docs/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.vitepress/cache
2 changes: 1 addition & 1 deletion docs/components/Api.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts" setup>
import type { ComponentApi } from '../../../../scripts/gen-component-meta'
import type { ComponentApi } from '../../scripts/gen-component-meta'

const props = defineProps<{ api: ComponentApi }>()
const propsHeader = Object.keys(props.api.props[0])
Expand Down
17 changes: 2 additions & 15 deletions docs/demos/badge/DemoBadgeContent.vue
Original file line number Diff line number Diff line change
@@ -1,24 +1,11 @@
<script setup lang="ts">
import { ref } from 'vue'

const badgeContent = ref('9')
</script>

<template>
<AInput
v-model="badgeContent"
label="Badge content"
placeholder="Write your badge content"
class="sm:w-1/2"
/>
<br>
<div class="flex flex-wrap gap-8">
<ABadge :content="badgeContent">
<ABadge :content="9">
<i class="i-bx-bell w-6 h-6" />
</ABadge>
<ABadge>
<template #content>
{{ badgeContent }}
9
</template>
<i class="i-bx-bell w-6 h-6" />
</ABadge>
Expand Down
2 changes: 1 addition & 1 deletion docs/demos/checkbox/DemoCheckboxIndeterminate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const value = computed({
:key="item"
v-model="fruits"
:value="item"
class="ml-7"
class="ms-7"
>
{{ item }}
</ACheckbox>
Expand Down
2 changes: 1 addition & 1 deletion docs/demos/drawer/DemoDrawerWidth.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const isDrawerShown = ref(false)
v-model="isDrawerShown"
title="Drawer title"
subtitle="Chocolate cake tiramisu donut"
class="w-[400px]"
class="!w-[400px]"
/>

<ABtn @click="isDrawerShown = true">
Expand Down
2 changes: 1 addition & 1 deletion docs/demos/list/DemoListBasic.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const items = [
{ text: 'Donut jujubes' },
{ text: 'Sesame snaps' },
{ text: 'I love jelly' },
{ text: 'Cake gummi', disable: true },
{ text: 'Cake gummi', disabled: true },
]
</script>

Expand Down
2 changes: 1 addition & 1 deletion docs/demos/list/DemoListVModelSupport.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const items = [
{ text: 'Donut jujubes' },
{ text: 'Sesame snaps' },
{ text: 'I love jelly' },
{ text: 'Cake gummi', disable: true },
{ text: 'Cake gummi', disabled: true },
]

const itemsPropSelection = ref(0)
Expand Down
2 changes: 1 addition & 1 deletion docs/demos/list/DemoListVariants.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const items = [
{ text: 'Donut jujubes' },
{ text: 'Sesame snaps' },
{ text: 'I love jelly' },
{ text: 'Cake gummi', disable: true },
{ text: 'Cake gummi', disabled: true },
]

const selected = ref(0)
Expand Down
2 changes: 1 addition & 1 deletion docs/demos/menu/DemoMenuPlacement.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const selectNext = () => {
<ASelect
v-model="menuPlacement"
:options="placementOptions"
class="w-24 grow-0 ml-auto"
class="w-24 grow-0 ms-auto"
/>
<ABtn
variant="text"
Expand Down
28 changes: 1 addition & 27 deletions docs/demos/table/DemoTableBasic.vue
Original file line number Diff line number Diff line change
@@ -1,31 +1,5 @@
<script setup lang="ts">
const rows = [
{
name: 'Leanne Graham',
username: 'Bret',
website: 'hildegard.org',
},
{
name: 'Ervin Howell',
username: 'Antonette',
website: 'anastasia.net',
},
{
name: 'Clementine Bauch',
username: 'Samantha',
website: 'ramiro.info',
},
{
name: 'Patricia Lebsack',
username: 'Karianne',
website: 'kale.biz',
},
{
name: 'Chelsey Dietrich',
username: 'Kamren',
website: 'demarco.info',
},
]
import { rows } from './data'
</script>

<template>
Expand Down
44 changes: 0 additions & 44 deletions docs/demos/table/DemoTableColumnDefinition.vue

This file was deleted.

32 changes: 3 additions & 29 deletions docs/demos/table/DemoTableColumnFormatter.vue
Original file line number Diff line number Diff line change
@@ -1,33 +1,7 @@
<script setup lang="ts">
const rows = [
{
name: 'Leanne Graham',
username: 'Bret',
website: 'hildegard.org',
},
{
name: 'Ervin Howell',
username: 'Antonette',
website: 'anastasia.net',
},
{
name: 'Clementine Bauch',
username: 'Samantha',
website: 'ramiro.info',
},
{
name: 'Patricia Lebsack',
username: 'Karianne',
website: 'kale.biz',
},
{
name: 'Chelsey Dietrich',
username: 'Kamren',
website: 'demarco.info',
},
]
import { rows } from './data'

const columns = [
const cols = [
{ name: 'name' },
{ name: 'username', formatter: row => `@${row.username}` },
{ name: 'website' },
Expand All @@ -38,7 +12,7 @@ const columns = [
<div class="cards-demo-container">
<ATable
:rows="rows"
:columns="columns"
:cols="cols"
/>
</div>
</template>
Loading