Skip to content

Fix conflicts in installation.md #130

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 17, 2025
Merged

Fix conflicts in installation.md #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 10 additions & 38 deletions src/content/learn/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,9 @@ title: Instalacija

React je dizajniran od početka za postepeno usvajanje. Možete koristiti koliko god React-a želite. Bez obzira da li želite da probate React, dodate neku interaktivnost na HTML stranicu ili da započnete kompleksnu React aplikaciju, ova sekcija će vam pomoći da počnete.


</Intro>

<<<<<<< HEAD
<YouWillLearn isChapter={true}>

* [Kako započeti novi React projekat](/learn/start-a-new-react-project)
* [Kako dodati React na postojeći projekat](/learn/add-react-to-an-existing-project)
* [Kako da konfigurišete vaš editor](/learn/editor-setup)
* [Kako da instalirate React Developer tools](/learn/react-developer-tools)

</YouWillLearn>

## Isprobajte React {/*try-react*/}
=======
## Try React {/*try-react*/}
>>>>>>> 49284218b1f5c94f930f8a9b305040dbe7d3dd48

Ne morate ništa instalirati da bi ste se igrali sa React-om. Probajte da izmenite ovaj sandbox!

Expand All @@ -44,42 +30,28 @@ Možete ga direktno menjati ili otvoriti u novom tabu pritiskom na "Fork" dugme

Većina stranica u React dokumentaciji sadrži sandbox-e kao ovaj. Van React dokumentacije postoje mnogi online sandbox-i koji podržavaju React: [CodeSandbox](https://codesandbox.io/s/new), [StackBlitz](https://stackblitz.com/fork/react) ili [CodePen](https://codepen.io/pen?template=QWYVwWN).

<<<<<<< HEAD
### Isprobajte React lokalno {/*try-react-locally*/}

Da isprobate React lokalno na vašem računaru, [preuzmite ovu HTML stranicu.](https://gist.githubusercontent.com/gaearon/0275b1e1518599bbeafcde4722e79ed1/raw/db72dcbf3384ee1708c4a07d3be79860db04bff0/example.html) Otvorite je u vašem editoru i u vašem pretraživaču!

## Započnite novi React projekat {/*start-a-new-react-project*/}

Ako želite da napravite aplikaciju ili sajt koristeći samo React, [započnite novi React projekat.](/learn/start-a-new-react-project)
=======
To try React locally on your computer, [download this HTML page.](https://gist.githubusercontent.com/gaearon/0275b1e1518599bbeafcde4722e79ed1/raw/db72dcbf3384ee1708c4a07d3be79860db04bff0/example.html) Open it in your editor and in your browser!
Da isprobate React lokalno na vašem računaru, [preuzmite ovu HTML stranicu](https://gist.githubusercontent.com/gaearon/0275b1e1518599bbeafcde4722e79ed1/raw/db72dcbf3384ee1708c4a07d3be79860db04bff0/example.html). Otvorite je u vašem editoru i u vašem pretraživaču!

## Creating a React App {/*creating-a-react-app*/}
## Kreirajte React aplikaciju {/*creating-a-react-app*/}

If you want to start a new React app, you can [create a React app](/learn/creating-a-react-app) using a recommended framework.
Ako želite da napravite novu React aplikaciju, možete [kreirati React aplikaciju](/learn/creating-a-react-app) pomoću preporučenog framework-a.

## Build a React Framework {/*build-a-react-framework*/}
## Napravite React framework {/*build-a-react-framework*/}

If a framework is not a good fit for your project, or you prefer to start by building your own framework, you can [build your own React framework](/learn/building-a-react-framework).
>>>>>>> 49284218b1f5c94f930f8a9b305040dbe7d3dd48
Ako framework nije pogodan za vaš projekat, ili želite da započnete sa pravljenjem sopstvenog framework-a, možete [napraviti sopstveni React framework](/learn/building-a-react-framework).

## Dodajte React u postojeći projekat {/*add-react-to-an-existing-project*/}

<<<<<<< HEAD
Ako žeite da isprobate React u vašem postojećem sajtu ili aplikaciji, [dodajte React u postojeći projekat.](/learn/add-react-to-an-existing-project)
=======
If want to try using React in your existing app or a website, you can [add React to an existing project.](/learn/add-react-to-an-existing-project)
Ako želite da isprobate React na vašem postojećem sajtu ili aplikaciji, možete [dodati React u postojeći projekat](/learn/add-react-to-an-existing-project).

## Deprecated Options {/*deprecated-options*/}
## Deprecated opcije {/*deprecated-options*/}

### Create React App (Deprecated) {/*create-react-app-deprecated*/}

Create React App is a deprecated tool, previously recommended for creating new React apps. If you want to start a new React app, you can [create a React app](/learn/creating-a-react-app) using a recommended framework.
Create React App je deprecated alat, koji je ranije bio preporučen za kreiranje novih React aplikacija. Ako želite da napravite novu React aplikaciju, možete [kreirati React aplikaciju](/learn/creating-a-react-app) pomoću preporučenog framework-a.

For more information, see [Sunsetting Create React App](/blog/2025/02/14/sunsetting-create-react-app).
>>>>>>> 49284218b1f5c94f930f8a9b305040dbe7d3dd48
Za više informacija, pogledajte [Gašenje Create React App](/blog/2025/02/14/sunsetting-create-react-app).

## Sledeći koraci {/*next-steps*/}

Idite na [Brzi Uvod](/learn) vodič za turu najvažnijih React koncepta sa kojima ćete se susretati svakodnevno.
Idite na [Brzi Uvod](/learn) vodič za turu najvažnijih React koncepata sa kojima ćete se susretati svakodnevno.
Loading