Resolve merge conflicts

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+# github: [kamranahmedse]
+custom: https://paypal.me/kamranahmedse

.gitignore

@@ -1,7 +1,11 @@
-.next
-.idea
+_*
+Thumbs.db
 .DS_Store
+.idea
+.next
 out
 build
 node_modules
-yarn-error.log
+yarn-error.log
+*.sublime-project
+*.sublime-workspace

contributing.md

@@ -0,0 +1,32 @@
+## The Goal
+Our goal is not to have the biggest list of everything available out there.
+Our goal is to have a list of things that anybody would have to learn if they were to enter the field today. 
+
+## Contributing
+
+Your contributions to this repo are always welcome!
+Bear in mind, that this repo is *highly opinionated*, *unbiased* and *curated*.
+Your opinion on value of any resource may not match the opinion of curator.
+
+**No PR will be discarded without explanations!**
+
+## How are these roadmaps made?
+
+> Roadmaps are made using [Balsamiq](https://balsamiq.com/download/)
+
+* Clone the repository
+* Open Balsamiq, click <kbd>Project > Import > Mockup JSON</kbd>,
+* Copy and paste the JSON for the roadmap that you want to update
+* Add your changes
+* Export the JSON file <kbd>Project > Export > Mockup to JSON</kbd> and put it in the <kbd>project</kbd> directory
+* Export the image <kbd>Project > Export > Current Mockup to PNG</kbd> and put it in the <kbd>images</kbd> directory
+* Commits your changes and open a PR
+
+## Guidelines
+
+- <p><strong>Adding everything available out there is not the goal!</strong><br> 
+  The roadmaps represents the skillset most valuable today i.e. if you were to enter any of the listed fields today, what would you learn! There might be things that are of-course being used today but prioritize the things that are most in demand today e.g. agreed that lots of people are using angular.js today but you wouldn't want to learn that instead of React, Angular or Vue. Use your critical thinking to filter out non-essential stuff. Give honest arguments for why the resource should be included.</p>
+- <p><strong>One item per Pull Request</strong><br>
+  There may be a discussion related to an item you want to add. Adding just a single item per pull request makes it much easier for everyone involved.</p>
+- Write meaningful commit messages
+- Look at the existing issues/pull requests before opening new ones

project/disclaimer.json

@@ -0,0 +1 @@
+{"mockup":{"controls":{"control":[{"ID":"119","h":"274","measuredH":"140","measuredW":"200","properties":{"color":"16777215"},"typeID":"TextArea","w":"911","x":"223","y":"170","zOrder":"0"},{"ID":"120","measuredH":"40","measuredW":"170","properties":{"bold":"true","size":"32","text":"Disclaimer!"},"typeID":"Label","x":"245","y":"190","zOrder":"1"},{"ID":"121","measuredH":"32","measuredW":"856","properties":{"size":"24","text":"The purpose of this roadmap is to give you an idea about the landscape and to"},"typeID":"Label","x":"245","y":"246","zOrder":"2"},{"ID":"123","measuredH":"32","measuredW":"833","properties":{"size":"24","text":"guide you if you are confused about what to learn next and not to encourage"},"typeID":"Label","x":"245","y":"282","zOrder":"3"},{"ID":"124","measuredH":"32","measuredW":"825","properties":{"size":"24","text":"you to learn what is hip and trendy. You should *grow some understanding* of"},"typeID":"Label","x":"245","y":"317","zOrder":"4"},{"ID":"125","measuredH":"32","measuredW":"816","properties":{"size":"24","text":"*why one tool would be better suited for some cases than the other and*"},"typeID":"Label","x":"245","y":"353","zOrder":"5"},{"ID":"126","measuredH":"32","measuredW":"710","properties":{"size":"24","text":"*remember hip and trendy never means best suited for the job*"},"typeID":"Label","x":"245","y":"389","zOrder":"6"}]},"measuredH":"444","measuredW":"1134","mockupH":"274","mockupW":"911","version":"1.0"}}

readme.md

@@ -1,2 +1,47 @@
-## roadmap-next
-> roadmap.sh built with next.js
+![Web Developer Roadmap - 2019](https://i.imgur.com/s5cCV9q.png)
+
+> Roadmap to becoming a web developer in 2019
+
+Below you find a set of charts demonstrating the paths that you can take and the technologies that you would want to adopt in order to become a frontend, backend or a devops. I made these charts for an old professor of mine who wanted something to share with his college students to give them a perspective; sharing them here to help the community.
+
+If you think that these can be improved in anyway, please do suggest.
+
+***
+<p align="center"><b> 🎉 We are working on a more concise version of these roadmaps 🎉 </b><br>Keep your eyes on <a href="http://roadmap.sh">roadmap.sh</a> for the details!</p>
+
+***
+
+> The purpose of these roadmaps is to give you an idea about the landscape and to guide you if you are confused about what to learn next and not to encourage you to pick what is hip and trendy. You should grow some understanding of why one tool would better suited for some cases than the other and remember hip and trendy never means best suited for the job.
+
+## Introduction
+
+![Web Developer Roadmap Introduction](./images/intro.png)
+
+## Frontend Roadmap
+
+![Frontend Roadmap](./images/frontend.png?fix=531)
+
+## Back-end Roadmap
+
+![Back-end Roadmap](./images/backend.png)
+
+## DevOps Roadmap
+
+![DevOps Roadmap](./images/devops.png)
+
+## 🚦 Wrap Up
+
+If you think any of the roadmaps can be improved, feel free to discuss it in the issues. Also, I will continue to improve this, so you might want to watch this repository or subscribe at [roadmap.sh](http://roadmap.sh) to revisit.
+
+## 🙌 Contribution
+
+> Have a look at [contribution docs](./contributing.md) for how to update any of the roadmaps
+
+- Open pull request with improvements
+- Discuss ideas in issues
+- Spread the word
+- Reach out with any feedback [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/kamranahmedse.svg?style=social&label=Follow%20%40kamranahmedse)](https://twitter.com/kamranahmedse)
+ 
+## License
+
+[![License: CC BY-NC-ND 3.0](https://img.shields.io/badge/License-CC%20BY--NC--ND%203.0-lightgrey.svg)](https://creativecommons.org/licenses/by-nc-nd/3.0/)