Skip to content

Commit df17e48

Browse files
Leonardo-SignorelliLeonardo-Signorelli
committed
Merge branch 'develop' into staging
2 parents 63103df + 52b6843 commit df17e48

File tree

231 files changed

+2802
-2021
lines changed

Some content is hidden

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

231 files changed

+2802
-2021
lines changed

‎.github/workflows/continuum.yaml

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
cd packages/ketchup/dist
3636
zip -qr /tmp/ketchup.zip *
3737
zip -qr /tmp/ketchup-components.zip ketchup/*
38-
38+
3939
- name: Setup AWS
4040
uses: aws-actions/configure-aws-credentials@v4
4141
with:
@@ -74,8 +74,56 @@ jobs:
7474
id: deployment
7575
uses: actions/deploy-pages@v4
7676

77-
trigger-webup-continuum:
77+
build:
78+
runs-on: ubuntu-latest
7879
needs: ketchup-release
80+
steps:
81+
- uses: actions/checkout@v4
82+
- uses: actions/setup-node@v4
83+
with:
84+
node-version: '18.x'
85+
registry-url: 'https://registry.npmjs.org'
86+
87+
- name: Install dependencies
88+
run: yarn install --no-immutable
89+
90+
- name: Update Ketchup Version with Timestamp
91+
run: |
92+
cd packages/ketchup
93+
VERSION=$(node -p "require('./package.json').version")
94+
TIMESTAMP=$(date +%Y%m%d%H%M%S)
95+
NEW_VERSION="${VERSION}-${TIMESTAMP}"
96+
echo "New version: $NEW_VERSION"
97+
sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/" ./package.json
98+
99+
- name: Update Ketchup React Version with Timestamp
100+
run: |
101+
cd packages/ketchup-react
102+
VERSION=$(node -p "require('./package.json').version")
103+
TIMESTAMP=$(date +%Y%m%d%H%M%S)
104+
NEW_VERSION="${VERSION}-${TIMESTAMP}"
105+
echo "New version: $NEW_VERSION"
106+
sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/" ./package.json
107+
108+
- name: Run Ketchup build
109+
run: npm run k:build
110+
111+
- name: Publish Ketchup
112+
run: |
113+
cd packages/ketchup
114+
npm publish
115+
env:
116+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
117+
118+
- name: Publish Ketchup React
119+
run: |
120+
cd packages/ketchup-react
121+
npm publish
122+
env:
123+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
124+
125+
trigger-webup-continuum:
126+
needs: build
79127
runs-on: ubuntu-latest
80128
steps:
81129
- run: |
@@ -86,9 +134,9 @@ jobs:
86134
-H "X-GitHub-Api-Version: 2022-11-28" \
87135
https://api.github.com/repos/smeup/webup-project/actions/workflows/continuum.yaml/dispatches \
88136
-d '{"ref": "develop"}'
89-
137+
90138
trigger-webupjs-develop:
91-
needs: ketchup-release
139+
needs: build
92140
runs-on: ubuntu-latest
93141
steps:
94142
- run: |

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ import { defineCustomElements } from '@sme.up/ketchup/dist/loader';
7575
defineCustomElements(window);
7676
```
7777

78-
- Use Ketchup components in your pages. About components and their props and events see [Ketchup Showcase](https://ketchup.smeup.com/). A simple sample for a Ketchup button can be:
78+
- Use Ketchup components in your pages. About components and their props and events see [Ketchup Showcase](https://smeup.github.io/ketchup/). A simple sample for a Ketchup button can be:
7979

8080
```
8181
<kup-button label="I'm a button" @kup-button-click="myButtonAction" />

‎docs/styleGuide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Ideally, component classes should be structured like this:
6969
/**
7070
* Custom style of the component.
7171
* @default ""
72-
* @see https://ketchup.smeup.com/ketchup-showcase/#/customization
72+
* @see https://smeup.github.io/ketchup/#/customization
7373
*/
7474
@Prop() customStyle: string = '';
7575
```
@@ -230,7 +230,7 @@ Almost all Ketchup components should include these features:
230230
- customStyle
231231
- debugging
232232

233-
The `customStyle` prop allows a custom stylesheet to be defined inside a component. More info [here](https://ketchup.smeup.com/ketchup-showcase/#/customization).
233+
The `customStyle` prop allows a custom stylesheet to be defined inside a component. More info [here](https://smeup.github.io/ketchup/#/customization).
234234

235235
Debugging is useful to understand a component's performances.
236236

@@ -251,7 +251,7 @@ Both these features (among many others) reside in an API called `KupManager`, wh
251251
/**
252252
* Custom style of the component.
253253
* @default ""
254-
* @see https://ketchup.smeup.com/ketchup-showcase/#/customization
254+
* @see https://smeup.github.io/ketchup/#/customization
255255
*/
256256
@Prop() customStyle: string = '';
257257
```

‎packages/ketchup-showcase/src/views/components/advanced/box/examples/BoxDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ export default {
184184
{
185185
prop: 'customStyle',
186186
description:
187-
'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
187+
'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
188188
type: 'string',
189189
default: '""',
190190
try: 'css',

‎packages/ketchup-showcase/src/views/components/advanced/buttonlist/examples/ButtonlistBasic.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
<div class="demo-wrapper">
44
<p
55
>Button lists are a set of
6-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/button"
7-
>kup-button</a
8-
>
6+
<a href="https://smeup.github.io/ketchup/#/button">kup-button</a>
97
elements. </p
108
><br />
119
<p>For this reason, they inherit their style.</p>

‎packages/ketchup-showcase/src/views/components/advanced/buttonlist/examples/ButtonlistDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export default {
106106
{
107107
prop: 'customStyle',
108108
description:
109-
'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
109+
'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
110110
type: 'string',
111111
default: '""',
112112
try: 'css',

‎packages/ketchup-showcase/src/views/components/advanced/calendar/examples/CalendarDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export default {
7171
{
7272
prop: 'customStyle',
7373
description:
74-
'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
74+
'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
7575
type: 'string',
7676
default: '""',
7777
try: 'css',

‎packages/ketchup-showcase/src/views/components/advanced/card/examples/CardBasic.vue

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,59 +14,49 @@
1414
>
1515
<br />
1616
<span class="code-word">autocomplete</span>: array of objects containing
17-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/autocomplete"
17+
<a href="https://smeup.github.io/ketchup/#/autocomplete"
1818
>kup-autocomplete</a
1919
>
2020
<br />
2121
<span class="code-word">button</span>: array of objects containing
22-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/button"
23-
>kup-button</a
24-
>
22+
<a href="https://smeup.github.io/ketchup/#/button">kup-button</a>
2523
props.
2624
<br />
2725
<span class="code-word">cell</span>: array of cells.
2826
<br />
2927
<span class="code-word">chart</span>: array of objects containing
30-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/chart">kup-chart</a>
28+
<a href="https://smeup.github.io/ketchup/#/chart">kup-chart</a>
3129
props.
3230
<br />
3331
<span class="code-word">checkbox</span>: array of objects containing
34-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/checkbox"
35-
>kup-checkbox</a
36-
>
32+
<a href="https://smeup.github.io/ketchup/#/checkbox">kup-checkbox</a>
3733
<br />
3834
<span class="code-word">chip</span>: array of objects containing
39-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/button">kup-chip</a>
35+
<a href="https://smeup.github.io/ketchup/#/button">kup-chip</a>
4036
props.
4137
<br />
4238
<span class="code-word">color</span>: array of CSS color strings.
4339
<br />
4440
<span class="code-word">columns</span>: array of columns.
4541
<br />
4642
<span class="code-word">combobox</span>: array of objects containing
47-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/combobox"
48-
>kup-combobox</a
49-
>
43+
<a href="https://smeup.github.io/ketchup/#/combobox">kup-combobox</a>
5044
props.
5145
<br />
5246
<span class="code-word">datatable</span>: array of objects containing
53-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/datatable"
54-
>kup-data-table</a
55-
>
47+
<a href="https://smeup.github.io/ketchup/#/datatable">kup-data-table</a>
5648
props.
5749
<br />
5850
<span class="code-word">datepicker</span>: array of objects containing
59-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/datepicker"
60-
>kup-date-picker</a
61-
>
51+
<a href="https://smeup.github.io/ketchup/#/datepicker">kup-date-picker</a>
6252
props.
6353
<br />
6454
<span class="code-word">image</span>: array of objects containing
65-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/image">kup-image</a>
55+
<a href="https://smeup.github.io/ketchup/#/image">kup-image</a>
6656
props.
6757
<br />
6858
<span class="code-word">list</span>: array of objects containing
69-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/list">kup-list</a>
59+
<a href="https://smeup.github.io/ketchup/#/list">kup-list</a>
7060
props.
7161
<br />
7262
<span class="code-word">object</span>: array of objects containing
@@ -76,33 +66,27 @@
7666
built-in layouts and it contains their settings.
7767
<br />
7868
<span class="code-word">progressbar</span>: array of objects containing
79-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/progressbar"
69+
<a href="https://smeup.github.io/ketchup/#/progressbar"
8070
>kup-progress-bar</a
8171
>
8272
props.
8373
<br />
8474
<span class="code-word">tabbar</span>: array of objects containing
85-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/tabbar"
86-
>kup-tab-bar</a
87-
>
75+
<a href="https://smeup.github.io/ketchup/#/tabbar">kup-tab-bar</a>
8876
props.
8977
<br />
9078
<span class="code-word">text</span>: array of strings.
9179
<br />
9280
<span class="code-word">textfield</span>: array of objects containing
93-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/textfield"
94-
>kup-text-field</a
95-
>
81+
<a href="https://smeup.github.io/ketchup/#/textfield">kup-text-field</a>
9682
props.
9783
<br />
9884
<span class="code-word">timepicker</span>: array of objects containing
99-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/timepicker"
100-
>kup-time-picker</a
101-
>
85+
<a href="https://smeup.github.io/ketchup/#/timepicker">kup-time-picker</a>
10286
props.
10387
<br />
10488
<span class="code-word">tree</span>: array of objects containing
105-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/tree">kup-tree</a>
89+
<a href="https://smeup.github.io/ketchup/#/tree">kup-tree</a>
10690
props.
10791
<br />
10892
<br />

‎packages/ketchup-showcase/src/views/components/advanced/card/examples/CardDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export default {
6464
{
6565
prop: 'customStyle',
6666
description:
67-
'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
67+
'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
6868
type: 'string',
6969
default: '""',
7070
try: 'css',

‎packages/ketchup-showcase/src/views/components/advanced/cardlist/examples/CardListBasic.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
<div class="demo-wrapper">
44
<p
55
>Cards lists are a set of scalable
6-
<a href="https://ketchup.smeup.com/ketchup-showcase/#/button"
7-
>kup-card</a
8-
>
6+
<a href="https://smeup.github.io/ketchup/#/button">kup-card</a>
97
elements. </p
108
><br />
119
<p>For this reason, they inherit their style.</p>

‎packages/ketchup-showcase/src/views/components/advanced/cardlist/examples/CardListDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export default {
5454
{
5555
prop: 'customStyle',
5656
description:
57-
'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
57+
'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
5858
type: 'string',
5959
default: '""',
6060
try: 'css',

‎packages/ketchup-showcase/src/views/components/advanced/cell/examples/CellDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export default {
6363
{
6464
prop: 'customStyle',
6565
description:
66-
'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
66+
'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
6767
type: 'string',
6868
default: '""',
6969
try: 'css',

‎packages/ketchup-showcase/src/views/components/advanced/chart/examples/ChartDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default {
8282
{
8383
prop: 'customStyle',
8484
description:
85-
'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization.',
85+
'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization.',
8686
type: 'string',
8787
default: '""',
8888
try: 'css',

‎packages/ketchup-showcase/src/views/components/advanced/dashboard/examples/DashboardDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default {
4747
{
4848
prop: 'customStyle',
4949
description:
50-
'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
50+
'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
5151
type: 'string',
5252
default: '""',
5353
try: 'css',

‎packages/ketchup-showcase/src/views/components/advanced/datatable/examples/DatatableDemo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ export default {
183183
{
184184
prop: 'customStyle',
185185
description:
186-
'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
186+
'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
187187
type: 'string',
188188
default: '""',
189189
try: 'css',

‎packages/ketchup-showcase/src/views/components/advanced/echart/examples/EchartBar.vue

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@
2121
/>
2222
</div>
2323
</div>
24+
<br />
25+
<p>Stacked.</p>
26+
<div class="demo-container">
27+
<div class="kup-container">
28+
<kup-echart
29+
:axis.prop="axis"
30+
:data.prop="baseData"
31+
:types.prop="types"
32+
stacked
33+
/>
34+
</div>
35+
</div>
2436
</div>
2537
</template>
2638

‎packages/ketchup-showcase/src/views/components/advanced/echart/examples/EchartDemo.vue

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,13 @@ export default {
109109
default: '[]',
110110
try: 'json',
111111
},
112+
{
113+
prop: 'showMarks',
114+
description: 'Displays the numerical values.',
115+
type: 'boolean',
116+
default: 'false',
117+
try: 'switch',
118+
},
112119
{
113120
prop: 'sizeX',
114121
description:
@@ -125,6 +132,14 @@ export default {
125132
default: '100%',
126133
try: 'field',
127134
},
135+
{
136+
prop: 'stacked',
137+
description:
138+
'Displays the data columns of an object on top of each other.',
139+
type: 'boolean',
140+
default: 'false',
141+
try: 'switch',
142+
},
128143
{
129144
prop: 'types',
130145
description:

‎packages/ketchup-showcase/src/views/components/advanced/echart/examples/EchartHBar.vue

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@
2121
/>
2222
</div>
2323
</div>
24+
<br />
25+
<p>Stacked.</p>
26+
<div class="demo-container">
27+
<div class="kup-container">
28+
<kup-echart
29+
:axis.prop="axis"
30+
:data.prop="baseData"
31+
:types.prop="types"
32+
stacked
33+
/>
34+
</div>
35+
</div>
2436
</div>
2537
</template>
2638

0 commit comments

Comments
 (0)