Skip to content

Commit 34f9439

Browse files
Merge branch 'main' into feat/note-parents
2 parents bf9de74 + db31174 commit 34f9439

205 files changed

Lines changed: 2681 additions & 554 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.

.architecture.eslintrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"plugins": [
33
"boundaries"
44
],
5-
"ignorePatterns": ["codex-ui"],
5+
"ignorePatterns": ["@codexteam/ui"],
66
"settings": {
77
"boundaries/elements": [
88
/**
@@ -112,7 +112,7 @@
112112
*/
113113
{
114114
"type": "CodeX UI",
115-
"pattern": "**/codex-ui/**/*",
115+
"pattern": "**/@codexteam/ui/**/*",
116116
"mode": "file"
117117
}
118118
],

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
!vite.config.ts
1919
!postcss.config.js
2020
!.yarn/releases
21-
!codex-ui
21+
!@codexteam/ui/
2222

2323
# Ignore unnecessary files inside allowed directories
2424
**/*~

.github/workflows/eslint-check.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
- name: Run ESLint
2323
run: yarn lint
2424

25-
- name: Install codex-ui dependencies
25+
- name: Install @codexteam/ui dependencies
2626
run: |
2727
yarn install
28-
working-directory: ./codex-ui
28+
working-directory: ./@codexteam/ui
2929

30-
- name: Run ESLint on codex-ui
30+
- name: Run ESLint on @codexteam/ui
3131
run: yarn lint
32-
working-directory: ./codex-ui
32+
working-directory: ./@codexteam/ui

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"eslint.workingDirectories": ["./", "./codex-ui"],
2+
"eslint.workingDirectories": ["./", "./@codexteam/ui"],
33

44
// Enable the ESlint flat config support
55
"eslint.experimental.useFlatConfig": true,

@codexteam/ui/.npmignore

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
dev/
2+
node_modules/
3+
src/
4+
*.log
5+
*.lock
6+
.npmrc
7+
.git/
8+
.gitignore
9+
.github/
10+
.idea/
11+
.vscode/
12+
13+
tsconfig.json
14+
tsconfig.dts.json
15+
eslint.config.mjs
16+
postcss.config.js
17+
vite.config.ts
18+
19+
README.md
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The Design System forged in the fires of open-source development
99
## Access Vue components
1010

1111
```ts
12-
import { Button, Input, Heading } from 'codex-ui/vue';
12+
import { Button, Input, Heading } from '@codexteam/ui/vue';
1313
```
1414

1515
```vue
@@ -28,23 +28,23 @@ Add the following "path" to the "tsconfig.json"
2828
{
2929
"compilerOptions": {
3030
"paths": {
31-
"codex-ui/vue": ["../codex-ui/dist/types/vue/index.d.ts"],
31+
"@codexteam/ui/vue": ["../@codexteam/ui/dist/types/vue/index.d.ts"],
3232
}
3333
},
3434
}
3535
3636
```
3737

3838
## Build Design System
39-
Build the design system to be able to use the codex-ui/styles import
39+
Build the design system to be able to use the @codexteam/ui/styles import
4040

4141
```
4242
yarn build
4343
```
4444

4545
## Access CSS variables
4646

47-
1. Import `codex-ui/styles` somewhere in App
47+
1. Import `@codexteam/ui/styles` somewhere in App
4848
2. Use variable in CSS, e.g `var(--ui-color)`
4949

5050
## Using Typography
Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
11
<template>
22
<div :class="$style.playground">
3-
<div :class="$style.header">
3+
<Navbar>
44
<a
55
:class="$style.logo"
66
href="/dev/index.html"
77
>
88
CodeX UI
99
</a>
10-
<Tabbar
11-
:class="$style.headerRight"
12-
:tabs="[{
13-
title: 'Figma',
14-
id: 'figma-button',
15-
picture: 'https://cdn.svgporn.com/logos/figma.svg',
16-
link: 'https://www.figma.com/design/YmJc2Vqmev25xZgXic5bjL/CodeX-Design-System?node-id=1288-953&t=PhdeYMJcGnLqT4js-0'
17-
}]"
18-
/>
19-
</div>
20-
<div :class="$style.body">
21-
<div
22-
:class="$style.aside"
23-
>
10+
<template #right>
11+
<Tabbar
12+
:tabs="[{
13+
title: 'Figma',
14+
id: 'figma-button',
15+
picture: 'https://cdn.svgporn.com/logos/figma.svg',
16+
link: 'https://www.figma.com/design/YmJc2Vqmev25xZgXic5bjL/CodeX-Design-System?node-id=1288-953&t=PhdeYMJcGnLqT4js-0'
17+
}]"
18+
/>
19+
</template>
20+
</Navbar>
21+
<PageBlock :stretched="true">
22+
<template #left>
2423
<VerticalMenu
2524
:items="pages"
2625
/>
27-
</div>
28-
<div :class="$style.content">
29-
<router-view />
30-
</div>
31-
</div>
26+
</template>
27+
<router-view />
28+
</PageBlock>
3229
<Popover />
30+
<Popup />
3331
</div>
3432
</template>
3533

@@ -38,9 +36,12 @@ import { computed } from 'vue';
3836
import {
3937
VerticalMenu,
4038
Tabbar,
41-
Popover
39+
Popover,
40+
Popup
4241
} from '../src/vue';
4342
import { useTheme } from '../src/vue/composables/useTheme';
43+
import { Navbar } from '../src/vue/layout/navbar';
44+
import { PageBlock } from '../src/vue/layout/page-block';
4445
4546
import { useRouter, useRoute } from 'vue-router';
4647
@@ -94,6 +95,21 @@ const pages = computed(() => [
9495
},
9596
],
9697
},
98+
{
99+
title: 'Layout',
100+
items: [
101+
{
102+
title: 'Navbar',
103+
onActivate: () => router.push('/layout/navbar'),
104+
isActive: route.path === '/layout/navbar',
105+
},
106+
{
107+
title: 'PageBlock',
108+
onActivate: () => router.push('/layout/page-block'),
109+
isActive: route.path === '/layout/page-block',
110+
},
111+
],
112+
},
97113
{
98114
title: 'Components',
99115
items: [
@@ -197,6 +213,16 @@ const pages = computed(() => [
197213
onActivate: () => router.push('/components/editor'),
198214
isActive: route.path === '/components/editor',
199215
},
216+
{
217+
title: 'Popup',
218+
onActivate: () => router.push('/components/popup'),
219+
isActive: route.path === '/components/popup',
220+
},
221+
{
222+
title: 'Confirm',
223+
onActivate: () => router.push('/components/confirm'),
224+
isActive: route.path === '/components/confirm',
225+
},
200226
],
201227
},
202228
]);
@@ -206,15 +232,6 @@ const pages = computed(() => [
206232
.playground {
207233
background-color: var(--base--bg-primary);
208234
color: var(--base--text);
209-
min-height: 100%;
210-
}
211-
.header {
212-
display: grid;
213-
grid-template-columns: auto auto;
214-
align-items: center;
215-
justify-content: space-between;
216-
border-bottom: 1px solid var(--base--border);
217-
padding: var(--spacing-xs) var(--spacing-m);
218235
}
219236
220237
.logo {
@@ -226,12 +243,4 @@ const pages = computed(() => [
226243
text-decoration: none;
227244
color: var(--base--text);
228245
}
229-
230-
.body {
231-
padding: var(--spacing-l);
232-
display: grid;
233-
grid-template-columns: auto minmax(0, 1fr);
234-
gap: var(--spacing-xxl);
235-
max-width: 1200px;
236-
}
237246
</style>
File renamed without changes.

0 commit comments

Comments
 (0)