Skip to content

Commit 5aa67e1

Browse files
deblasisdeblasis
committed
chore: merge conflicts
Closes #475, #474, #473, #472, #471
1 parent eb7169a commit 5aa67e1

File tree

5 files changed

+120
-272
lines changed

5 files changed

+120
-272
lines changed

‎src/content/learn/conditional-rendering.md‎

Lines changed: 100 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ export default function PackingList() {
3232
<section>
3333
<h1>Sally Ride's Packing List</h1>
3434
<ul>
35-
<Item
36-
isPacked={true}
37-
name="Space suit"
35+
<Item
36+
isPacked={true}
37+
name="Space suit"
3838
/>
39-
<Item
40-
isPacked={true}
41-
name="Helmet with a golden leaf"
39+
<Item
40+
isPacked={true}
41+
name="Helmet with a golden leaf"
4242
/>
43-
<Item
44-
isPacked={false}
45-
name="Photo of Tam"
43+
<Item
44+
isPacked={false}
45+
name="Photo of Tam"
4646
/>
4747
</ul>
4848
</section>
@@ -80,17 +80,17 @@ export default function PackingList() {
8080
<section>
8181
<h1>Sally Ride's Packing List</h1>
8282
<ul>
83-
<Item
84-
isPacked={true}
85-
name="Space suit"
83+
<Item
84+
isPacked={true}
85+
name="Space suit"
8686
/>
87-
<Item
88-
isPacked={true}
89-
name="Helmet with a golden leaf"
87+
<Item
88+
isPacked={true}
89+
name="Helmet with a golden leaf"
9090
/>
91-
<Item
92-
isPacked={false}
93-
name="Photo of Tam"
91+
<Item
92+
isPacked={false}
93+
name="Photo of Tam"
9494
/>
9595
</ul>
9696
</section>
@@ -132,17 +132,17 @@ export default function PackingList() {
132132
<section>
133133
<h1>Sally Ride's Packing List</h1>
134134
<ul>
135-
<Item
136-
isPacked={true}
137-
name="Space suit"
135+
<Item
136+
isPacked={true}
137+
name="Space suit"
138138
/>
139-
<Item
140-
isPacked={true}
141-
name="Helmet with a golden leaf"
139+
<Item
140+
isPacked={true}
141+
name="Helmet with a golden leaf"
142142
/>
143-
<Item
144-
isPacked={false}
145-
name="Photo of Tam"
143+
<Item
144+
isPacked={false}
145+
name="Photo of Tam"
146146
/>
147147
</ul>
148148
</section>
@@ -236,17 +236,17 @@ export default function PackingList() {
236236
<section>
237237
<h1>Sally Ride's Packing List</h1>
238238
<ul>
239-
<Item
240-
isPacked={true}
241-
name="Space suit"
239+
<Item
240+
isPacked={true}
241+
name="Space suit"
242242
/>
243-
<Item
244-
isPacked={true}
245-
name="Helmet with a golden leaf"
243+
<Item
244+
isPacked={true}
245+
name="Helmet with a golden leaf"
246246
/>
247-
<Item
248-
isPacked={false}
249-
name="Photo of Tam"
247+
<Item
248+
isPacked={false}
249+
name="Photo of Tam"
250250
/>
251251
</ul>
252252
</section>
@@ -291,17 +291,17 @@ export default function PackingList() {
291291
<section>
292292
<h1>Sally Ride's Packing List</h1>
293293
<ul>
294-
<Item
295-
isPacked={true}
296-
name="Space suit"
294+
<Item
295+
isPacked={true}
296+
name="Space suit"
297297
/>
298-
<Item
299-
isPacked={true}
300-
name="Helmet with a golden leaf"
298+
<Item
299+
isPacked={true}
300+
name="Helmet with a golden leaf"
301301
/>
302-
<Item
303-
isPacked={false}
304-
name="Photo of Tam"
302+
<Item
303+
isPacked={false}
304+
name="Photo of Tam"
305305
/>
306306
</ul>
307307
</section>
@@ -371,17 +371,17 @@ export default function PackingList() {
371371
<section>
372372
<h1>Sally Ride's Packing List</h1>
373373
<ul>
374-
<Item
375-
isPacked={true}
376-
name="Space suit"
374+
<Item
375+
isPacked={true}
376+
name="Space suit"
377377
/>
378-
<Item
379-
isPacked={true}
380-
name="Helmet with a golden leaf"
378+
<Item
379+
isPacked={true}
380+
name="Helmet with a golden leaf"
381381
/>
382-
<Item
383-
isPacked={false}
384-
name="Photo of Tam"
382+
<Item
383+
isPacked={false}
384+
name="Photo of Tam"
385385
/>
386386
</ul>
387387
</section>
@@ -417,17 +417,17 @@ export default function PackingList() {
417417
<section>
418418
<h1>Sally Ride's Packing List</h1>
419419
<ul>
420-
<Item
421-
isPacked={true}
422-
name="Space suit"
420+
<Item
421+
isPacked={true}
422+
name="Space suit"
423423
/>
424-
<Item
425-
isPacked={true}
426-
name="Helmet with a golden leaf"
424+
<Item
425+
isPacked={true}
426+
name="Helmet with a golden leaf"
427427
/>
428-
<Item
429-
isPacked={false}
430-
name="Photo of Tam"
428+
<Item
429+
isPacked={false}
430+
name="Photo of Tam"
431431
/>
432432
</ul>
433433
</section>
@@ -474,17 +474,17 @@ export default function PackingList() {
474474
<section>
475475
<h1>Sally Ride's Packing List</h1>
476476
<ul>
477-
<Item
478-
isPacked={true}
479-
name="Space suit"
477+
<Item
478+
isPacked={true}
479+
name="Space suit"
480480
/>
481-
<Item
482-
isPacked={true}
483-
name="Helmet with a golden leaf"
481+
<Item
482+
isPacked={true}
483+
name="Helmet with a golden leaf"
484484
/>
485-
<Item
486-
isPacked={false}
487-
name="Photo of Tam"
485+
<Item
486+
isPacked={false}
487+
name="Photo of Tam"
488488
/>
489489
</ul>
490490
</section>
@@ -512,17 +512,17 @@ export default function PackingList() {
512512
<section>
513513
<h1>Sally Ride's Packing List</h1>
514514
<ul>
515-
<Item
516-
isPacked={true}
517-
name="Space suit"
515+
<Item
516+
isPacked={true}
517+
name="Space suit"
518518
/>
519-
<Item
520-
isPacked={true}
521-
name="Helmet with a golden leaf"
519+
<Item
520+
isPacked={true}
521+
name="Helmet with a golden leaf"
522522
/>
523-
<Item
524-
isPacked={false}
525-
name="Photo of Tam"
523+
<Item
524+
isPacked={false}
525+
name="Photo of Tam"
526526
/>
527527
</ul>
528528
</section>
@@ -560,17 +560,17 @@ export default function PackingList() {
560560
<section>
561561
<h1>Sally Ride's Packing List</h1>
562562
<ul>
563-
<Item
564-
importance={9}
565-
name="Space suit"
563+
<Item
564+
importance={9}
565+
name="Space suit"
566566
/>
567-
<Item
568-
importance={0}
569-
name="Helmet with a golden leaf"
567+
<Item
568+
importance={0}
569+
name="Helmet with a golden leaf"
570570
/>
571-
<Item
572-
importance={6}
573-
name="Photo of Tam"
571+
<Item
572+
importance={6}
573+
name="Photo of Tam"
574574
/>
575575
</ul>
576576
</section>
@@ -604,17 +604,17 @@ export default function PackingList() {
604604
<section>
605605
<h1>Sally Ride's Packing List</h1>
606606
<ul>
607-
<Item
608-
importance={9}
609-
name="Space suit"
607+
<Item
608+
importance={9}
609+
name="Space suit"
610610
/>
611-
<Item
612-
importance={0}
613-
name="Helmet with a golden leaf"
611+
<Item
612+
importance={0}
613+
name="Helmet with a golden leaf"
614614
/>
615-
<Item
616-
importance={6}
617-
name="Photo of Tam"
615+
<Item
616+
importance={6}
617+
name="Photo of Tam"
618618
/>
619619
</ul>
620620
</section>
@@ -626,11 +626,7 @@ export default function PackingList() {
626626
627627
Tieni presente che dovrai scrivere `importance > 0 && ...` invece di `importance && ...` in modo che se `importance` è `0`, `0` non venga renderizzato come risultato!
628628
629-
<<<<<<< HEAD
630-
In questa soluzione, vengono utilizzate due condizioni separate per inserire uno spazio tra il nome e l'etichetta di importanza. In alternativa, potresti utilizzare un frammento con uno spazio iniziale: `importance > 0 && <> <i>...</i></>` oppure aggiungere uno spazio immediatamente all'interno del tag `<i>`: `importance > 0 && <i> ...</i>`.
631-
=======
632-
In this solution, two separate conditions are used to insert a space between the name and the importance label. Alternatively, you could use a Fragment with a leading space: `importance > 0 && <> <i>...</i></>` or add a space immediately inside the `<i>`: `importance > 0 && <i> ...</i>`.
633-
>>>>>>> af54fc873819892f6050340df236f33a18ba5fb8
629+
In questa soluzione, vengono utilizzate due condizioni separate per inserire uno spazio tra il nome e l'etichetta di importanza. In alternativa, potresti utilizzare un Fragment con uno spazio iniziale: `importance > 0 && <> <i>...</i></>` oppure aggiungere uno spazio immediatamente all'interno del tag `<i>`: `importance > 0 && <i> ...</i>`.
634630
635631
</Solution>
636632

‎src/content/learn/rendering-lists.md‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,11 +1146,7 @@ hr {
11461146

11471147
<Hint>
11481148

1149-
<<<<<<< HEAD
1150-
Dovrai convertire `map` in un loop manuale o utilizzare un frammento.
1151-
=======
1152-
You'll either need to convert `map` to a manual loop, or use a Fragment.
1153-
>>>>>>> af54fc873819892f6050340df236f33a18ba5fb8
1149+
Dovrai convertire `map` in un loop manuale o utilizzare un Fragment.
11541150

11551151
</Hint>
11561152

@@ -1213,11 +1209,7 @@ hr {
12131209

12141210
Se usi l'indice originale come `key` non funziona più perché ogni separatore e paragrafo sono ora nello stesso array. Tuttavia, puoi dare a ciascuno di essi una key distinta usando un suffisso, ad esempio `key={i + '-text'}`.
12151211

1216-
<<<<<<< HEAD
1217-
In alternativa, potresti renderizzare una collezione di fragments che contengono `<hr />` e `<p>...</p>`. Tuttavia, la sintassi abbreviata `<>...</>` non supporta il passaggio di key, quindi dovresti scrivere `<Fragment>` esplicitamente:
1218-
=======
1219-
Alternatively, you could render a collection of Fragments which contain `<hr />` and `<p>...</p>`. However, the `<>...</>` shorthand syntax doesn't support passing keys, so you'd have to write `<Fragment>` explicitly:
1220-
>>>>>>> af54fc873819892f6050340df236f33a18ba5fb8
1212+
In alternativa, potresti renderizzare una collezione di Fragments che contengono `<hr />` e `<p>...</p>`. Tuttavia, la sintassi abbreviata `<>...</>` non supporta il passaggio di key, quindi dovresti scrivere `<Fragment>` esplicitamente:
12211213

12221214
<Sandpack>
12231215

@@ -1263,11 +1255,7 @@ hr {
12631255

12641256
</Sandpack>
12651257

1266-
<<<<<<< HEAD
1267-
Ricorda, i fragment (spesso scritti come `<>...</>`) ti consentono di raggruppare i nodi JSX senza aggiungere extra `<div>`!
1268-
=======
1269-
Remember, Fragments (often written as `<> </>`) let you group JSX nodes without adding extra `<div>`s!
1270-
>>>>>>> af54fc873819892f6050340df236f33a18ba5fb8
1258+
Ricorda, i Fragments (spesso scritti come `<>...</>`) ti consentono di raggruppare i nodi JSX senza aggiungere extra `<div>`!
12711259

12721260
</Solution>
12731261

‎src/content/learn/start-a-new-react-project.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ Se vuoi costruire una nuova app o un nuovo sito web interamente con React, ti co
2424
npx create-next-app@latest
2525
</TerminalBlock>
2626

27-
<<<<<<< HEAD
28-
Se sei nuovo in Next.js, dai un'occhiata al [tutorial di Next.js.](https://nextjs.org/learn/foundations/about-nextjs)
29-
=======
30-
If you're new to Next.js, check out the [learn Next.js course.](https://nextjs.org/learn)
31-
>>>>>>> af54fc873819892f6050340df236f33a18ba5fb8
27+
Se sei nuovo in Next.js, dai un'occhiata al [corso per imparare Next.js.](https://nextjs.org/learn)
3228

3329
Next.js è mantenuto da [Vercel](https://vercel.com/). Puoi [distribuire un'app Next.js](https://nextjs.org/docs/app/building-your-application/deploying) su qualsiasi hosting Node.js o serverless, o sul tuo server personale. [Le app Next.js completamente statiche](https://nextjs.org/docs/advanced-features/static-html-export) possono essere distribuite su qualsiasi hosting statico.
3430

‎src/content/learn/tutorial-tic-tac-toe.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -366,11 +366,7 @@ Otterrai questo errore:
366366

367367
</ConsoleBlock>
368368

369-
<<<<<<< HEAD
370-
I componenti React devono restituire un singolo elemento JSX e non multipli elementi JSX adiacenti come due pulsanti. Per risolvere questo problema puoi usare i *fragments* (`<>` e `</>`) per avvolgere più elementi JSX adiacenti in questo modo:
371-
=======
372-
React components need to return a single JSX element and not multiple adjacent JSX elements like two buttons. To fix this you can use *Fragments* (`<>` and `</>`) to wrap multiple adjacent JSX elements like this:
373-
>>>>>>> af54fc873819892f6050340df236f33a18ba5fb8
369+
I componenti React devono restituire un singolo elemento JSX e non multipli elementi JSX adiacenti come due pulsanti. Per risolvere questo problema puoi usare i *Fragments* (`<>` e `</>`) per avvolgere più elementi JSX adiacenti in questo modo:
374370

375371
```js {3-6}
376372
export default function Square() {

0 commit comments

Comments
 (0)