Skip to content

Commit 468dc67

Browse files
committed
minor #2284 [Site] Fix React/Svelte/Vue demo (smnandre)
This PR was squashed before being merged into the 2.x branch. Discussion ---------- [Site] Fix React/Svelte/Vue demo Fix #2268 Commits ------- bf92291 [Site] Fix React/Svelte/Vue demo
2 parents 45f6504 + bf92291 commit 468dc67

File tree

12 files changed

+101
-112
lines changed

12 files changed

+101
-112
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.yarn
2+
yarn.lock
3+
node_modules

ux.symfony.com/assets/react/src/package.json renamed to ux.symfony.com/assets/react/build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"license": "MIT",
88
"private": true,
99
"scripts": {
10-
"build": "../build/node_modules/.bin/babel ../. --out-dir ../../build/react --presets=@babel/preset-react"
10+
"build": "babel ../src/ --out-dir ../dist/ --presets=@babel/preset-react --no-babelrc"
1111
}
1212
}
Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,24 @@
11
import React from 'react';
22
export default function (props) {
33
if (props.packages.length === 0) {
4-
return /*#__PURE__*/React.createElement("div", {
5-
className: "alert alert-info"
6-
}, "Sad trombone... we haven't built any components that match this search yet!");
4+
return 'No packages found';
75
}
86
return /*#__PURE__*/React.createElement("div", {
9-
className: "row"
10-
}, props.packages.map(item => /*#__PURE__*/React.createElement("a", {
11-
key: item.name,
12-
href: item.url,
13-
className: "col-12 col-md-4 col-lg-3 mb-2"
7+
className: "PackageList"
8+
}, props.packages.map(item => /*#__PURE__*/React.createElement("div", {
9+
className: "PackageListItem",
10+
key: item.id
1411
}, /*#__PURE__*/React.createElement("div", {
15-
className: "components-container p-2"
16-
}, /*#__PURE__*/React.createElement("div", {
17-
className: "d-flex"
18-
}, /*#__PURE__*/React.createElement("div", {
19-
className: "live-component-img d-flex justify-content-center align-items-center",
12+
className: "PackageListItem__icon",
2013
style: {
21-
background: item.gradient
14+
'--gradient': item.gradient
2215
}
2316
}, /*#__PURE__*/React.createElement("img", {
24-
width: "17px",
25-
height: "17px",
2617
src: item.imageUrl,
2718
alt: `Image for the ${item.humanName} UX package`
28-
})), /*#__PURE__*/React.createElement("h4", {
29-
className: "ubuntu-title ps-2 align-self-center"
30-
}, item.humanName))))));
19+
})), /*#__PURE__*/React.createElement("h3", {
20+
className: "PackageListItem__label"
21+
}, /*#__PURE__*/React.createElement("a", {
22+
href: item.url
23+
}, item.humanName)))));
3124
}
Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
import React from 'react';
22

33
export default function (props) {
4-
if (props.packages.length === 0) {
5-
return 'No packages found';
6-
}
4+
if (props.packages.length === 0) {
5+
return 'No packages found';
6+
}
77

8-
return (
9-
props.packages.map(item => (
10-
<div class="PackageListItem">
11-
<div class="PackageListItem__icon" style={`--gradient: ${item.gradient}`}>
12-
<img src={item.imageUrl} alt={`Image for the ${item.humanName} UX package`} />
13-
</div>
14-
<h3 class="PackageListItem__title">
15-
<a href={item.url}>{item.humanName}</a>
16-
</h3>
17-
</div>
18-
))
19-
);
8+
return (
9+
<div className="PackageList">
10+
{props.packages.map(item => (
11+
<div className="PackageListItem" key={item.id}>
12+
<div className="PackageListItem__icon" style={{'--gradient': item.gradient}}>
13+
<img src={item.imageUrl} alt={`Image for the ${item.humanName} UX package`}/>
14+
</div>
15+
<h3 className="PackageListItem__label">
16+
<a href={item.url}>{item.humanName}</a>
17+
</h3>
18+
</div>
19+
))}
20+
</div>
21+
);
2022
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.yarn
2+
yarn.lock
3+
node_modules

ux.symfony.com/assets/svelte/src/build.js renamed to ux.symfony.com/assets/svelte/build/build.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,27 @@ function compileDirectory(inputDir, outputDir) {
1212

1313
for (const file of files) {
1414
const inputFile = path.join(inputDir, file);
15+
16+
// Exclude node_modules directory
17+
if (inputFile.includes('node_')) {
18+
continue;
19+
}
20+
1521
const stats = fs.statSync(inputFile);
16-
1722
if (stats.isDirectory()) {
1823
const newOutputDir = path.join(outputDir, file);
1924
if (!fs.existsSync(newOutputDir)) {
2025
fs.mkdirSync(newOutputDir);
2126
}
27+
console.log('Entering', inputDir);
2228
compileDirectory(inputFile, newOutputDir);
23-
} else if (path.extname(file) === '.svelte') {
29+
continue;
30+
}
31+
32+
if(path.extname(file) === '.svelte') {
33+
console.log('Compiling', inputFile);
2434
const input = fs.readFileSync(inputFile, 'utf-8');
2535
const output = compile(input, { format: 'esm' });
26-
2736
const outputFile = path.join(outputDir, `${path.basename(file, '.svelte')}.js`);
2837
fs.writeFileSync(outputFile, output.js.code);
2938
}

ux.symfony.com/assets/svelte/src/package.json renamed to ux.symfony.com/assets/svelte/build/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
"devDependencies": {
33
"@babel/cli": "^7.25.6",
44
"@babel/core": "^7.25.2",
5-
"@babel/preset-react": "^7.24.7",
65
"svelte": "^3.59.1"
76
},
87
"license": "MIT",
98
"private": true,
109
"scripts": {
11-
"build": "yarn build-react && yarn build-svelte",
12-
"build-svelte": "node bin/compile_svelte.js"
10+
"build": "node build.js"
1311
}
1412
}

ux.symfony.com/assets/svelte/dist/components/PackageList.js

Lines changed: 34 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* generated by Svelte v3.59.1 */
1+
/* generated by Svelte v3.59.2 */
22
import {
33
SvelteComponent,
44
add_render_callback,
@@ -33,7 +33,7 @@ function get_each_context(ctx, list, i) {
3333
return child_ctx;
3434
}
3535

36-
// (13:0) {:else}
36+
// (11:0) {:else}
3737
function create_else_block(ctx) {
3838
let div;
3939
let each_blocks = [];
@@ -55,7 +55,7 @@ function create_else_block(ctx) {
5555
each_blocks[i].c();
5656
}
5757

58-
attr(div, "class", "row");
58+
attr(div, "class", "PackageList");
5959
},
6060
m(target, anchor) {
6161
insert(target, div, anchor);
@@ -92,81 +92,72 @@ function create_else_block(ctx) {
9292

9393
// (9:0) {#if packages.length === 0}
9494
function create_if_block(ctx) {
95-
let div;
95+
let t;
9696

9797
return {
9898
c() {
99-
div = element("div");
100-
div.textContent = "Sad trombone... we haven't built any components that\n match this search yet!";
101-
attr(div, "class", "alert alert-info");
99+
t = text("No packages found");
102100
},
103101
m(target, anchor) {
104-
insert(target, div, anchor);
102+
insert(target, t, anchor);
105103
},
106104
p: noop,
107105
i: noop,
108106
o: noop,
109107
d(detaching) {
110-
if (detaching) detach(div);
108+
if (detaching) detach(t);
111109
}
112110
};
113111
}
114112

115-
// (15:8) {#each packages as uxPackage(uxPackage.name)}
113+
// (13:8) {#each packages as uxPackage(uxPackage.name)}
116114
function create_each_block(key_1, ctx) {
117-
let a;
118-
let div2;
119115
let div1;
120116
let div0;
121117
let img;
122118
let img_src_value;
123119
let img_alt_value;
124120
let t0;
125-
let h4;
121+
let h3;
122+
let a;
126123
let t1_value = /*uxPackage*/ ctx[1].humanName + "";
127124
let t1;
128-
let t2;
129125
let a_href_value;
130-
let a_intro;
126+
let t2;
127+
let div1_intro;
131128
let rect;
132129
let stop_animation = noop;
133130

134131
return {
135132
key: key_1,
136133
first: null,
137134
c() {
138-
a = element("a");
139-
div2 = element("div");
140135
div1 = element("div");
141136
div0 = element("div");
142137
img = element("img");
143138
t0 = space();
144-
h4 = element("h4");
139+
h3 = element("h3");
140+
a = element("a");
145141
t1 = text(t1_value);
146142
t2 = space();
147-
attr(img, "width", "17");
148-
attr(img, "height", "17");
149143
if (!src_url_equal(img.src, img_src_value = /*uxPackage*/ ctx[1].imageUrl)) attr(img, "src", img_src_value);
150-
attr(img, "alt", img_alt_value = "`Image for the " + /*uxPackage*/ ctx[1].humanName + " UX package`");
151-
attr(div0, "class", "live-component-img d-flex justify-content-center align-items-center");
152-
set_style(div0, "background", /*uxPackage*/ ctx[1].gradient);
153-
attr(h4, "class", "ubuntu-title ps-2 align-self-center");
154-
attr(div1, "class", "d-flex");
155-
attr(div2, "class", "components-container p-2");
144+
attr(img, "alt", img_alt_value = "Image for the " + /*uxPackage*/ ctx[1].humanName + " UX package");
145+
attr(div0, "class", "PackageListItem__icon");
146+
set_style(div0, "--gradient", /*uxPackage*/ ctx[1].gradient);
156147
attr(a, "href", a_href_value = /*uxPackage*/ ctx[1].url);
157-
attr(a, "class", "col-12 col-md-4 col-lg-3 mb-2");
158-
this.first = a;
148+
attr(h3, "class", "PackageListItem__label");
149+
attr(div1, "class", "PackageListItem");
150+
this.first = div1;
159151
},
160152
m(target, anchor) {
161-
insert(target, a, anchor);
162-
append(a, div2);
163-
append(div2, div1);
153+
insert(target, div1, anchor);
164154
append(div1, div0);
165155
append(div0, img);
166156
append(div1, t0);
167-
append(div1, h4);
168-
append(h4, t1);
169-
append(a, t2);
157+
append(div1, h3);
158+
append(h3, a);
159+
append(a, t1);
160+
append(div1, t2);
170161
},
171162
p(new_ctx, dirty) {
172163
ctx = new_ctx;
@@ -175,12 +166,12 @@ function create_each_block(key_1, ctx) {
175166
attr(img, "src", img_src_value);
176167
}
177168

178-
if (dirty & /*packages*/ 1 && img_alt_value !== (img_alt_value = "`Image for the " + /*uxPackage*/ ctx[1].humanName + " UX package`")) {
169+
if (dirty & /*packages*/ 1 && img_alt_value !== (img_alt_value = "Image for the " + /*uxPackage*/ ctx[1].humanName + " UX package")) {
179170
attr(img, "alt", img_alt_value);
180171
}
181172

182173
if (dirty & /*packages*/ 1) {
183-
set_style(div0, "background", /*uxPackage*/ ctx[1].gradient);
174+
set_style(div0, "--gradient", /*uxPackage*/ ctx[1].gradient);
184175
}
185176

186177
if (dirty & /*packages*/ 1 && t1_value !== (t1_value = /*uxPackage*/ ctx[1].humanName + "")) set_data(t1, t1_value);
@@ -190,27 +181,27 @@ function create_each_block(key_1, ctx) {
190181
}
191182
},
192183
r() {
193-
rect = a.getBoundingClientRect();
184+
rect = div1.getBoundingClientRect();
194185
},
195186
f() {
196-
fix_position(a);
187+
fix_position(div1);
197188
stop_animation();
198189
},
199190
a() {
200191
stop_animation();
201-
stop_animation = create_animation(a, rect, flip, { duration: transitionDuration });
192+
stop_animation = create_animation(div1, rect, flip, { duration: transitionDuration });
202193
},
203194
i(local) {
204-
if (!a_intro) {
195+
if (!div1_intro) {
205196
add_render_callback(() => {
206-
a_intro = create_in_transition(a, fade, { duration: transitionDuration });
207-
a_intro.start();
197+
div1_intro = create_in_transition(div1, fade, { duration: transitionDuration });
198+
div1_intro.start();
208199
});
209200
}
210201
},
211202
o: noop,
212203
d(detaching) {
213-
if (detaching) detach(a);
204+
if (detaching) detach(div1);
214205
}
215206
};
216207
}

ux.symfony.com/assets/svelte/dist/controllers/PackageSearch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* generated by Svelte v3.59.1 */
1+
/* generated by Svelte v3.59.2 */
22
import {
33
SvelteComponent,
44
append,

ux.symfony.com/assets/svelte/src/components/PackageList.svelte

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,20 @@
77
</script>
88

99
{#if packages.length === 0}
10-
<div class='alert alert-info'>Sad trombone... we haven't built any components that
11-
match this search yet!
12-
</div>
10+
No packages found
1311
{:else}
14-
<div class='row'>
12+
<div class="PackageList">
1513
{#each packages as uxPackage(uxPackage.name)}
16-
<a
17-
href='{uxPackage.url}'
18-
class='col-12 col-md-4 col-lg-3 mb-2'
14+
<div class="PackageListItem"
1915
animate:flip={{duration: transitionDuration}} in:fade={{duration:transitionDuration}}
2016
>
21-
<div class='components-container p-2'>
22-
<div class='d-flex'>
23-
<div
24-
class='live-component-img d-flex justify-content-center align-items-center'
25-
style='background: {uxPackage.gradient}'>
26-
<img width='17' height='17'
27-
src='{uxPackage.imageUrl}'
28-
alt='`Image for the {uxPackage.humanName} UX package`'
29-
/>
30-
</div>
31-
<h4 class='ubuntu-title ps-2 align-self-center'>
32-
{ uxPackage.humanName }
33-
</h4>
34-
</div>
17+
<div class="PackageListItem__icon" style="--gradient: {uxPackage.gradient};">
18+
<img src="{uxPackage.imageUrl}" alt="Image for the {uxPackage.humanName} UX package" />
3519
</div>
36-
</a>
20+
<h3 class="PackageListItem__label">
21+
<a href="{uxPackage.url}">{uxPackage.humanName}</a>
22+
</h3>
23+
</div>
3724
{/each}
3825
</div>
3926
{/if}

0 commit comments

Comments
 (0)