Resolve conflict on Version Control System readme.md

pull/1095/head
Aroyan 3 years ago
commit 507e1d0ce7
  1. 8
      content/roadmaps/100-frontend/content/117-progressive-web-apps/readme.md
  2. 9
      content/roadmaps/100-frontend/content/121-mobile-applications/100-react-native.md
  3. 1
      content/roadmaps/101-backend/content/101-basic-frontend/100-html.md
  4. 2
      content/roadmaps/101-backend/content/101-basic-frontend/101-css.md
  5. 1
      content/roadmaps/101-backend/content/103-learn-a-language/105-javascript.md
  6. 12
      content/roadmaps/101-backend/content/103-learn-a-language/106-python.md
  7. 9
      content/roadmaps/101-backend/content/104-version-control-systems/readme.md
  8. 10
      content/roadmaps/101-backend/content/105-repo-hosting-services/readme.md
  9. 8
      content/roadmaps/101-backend/content/108-more-about-databases/101-acid.md
  10. 9
      content/roadmaps/101-backend/content/114-design-and-development-principles/102-test-driven-development.md
  11. 11
      content/roadmaps/101-backend/content/123-scalability/103-horizontal-vertial-scaling.md
  12. 2
      pages/thanks.tsx

@ -1 +1,7 @@
# Progressive web apps
# Progressive Web Apps
Progressive Web Apps (PWAs) are websites that are progressively enhanced to function like installed, native apps on supporting platforms, while functioning like regular websites on other browsers.
<ResourceGroupTitle>Free Content</ResourceGroupTitle>
<BadgeLink badgeText='Read' colorScheme="yellow" href='https://www.freecodecamp.org/news/what-are-progressive-web-apps/'>Progressive Web Apps for Beginners</BadgeLink>
<BadgeLink badgeText='Watch' href='https://www.youtube.com/watch?v=sFsRylCQblw'>Build a Progressive Web App</BadgeLink>

@ -1 +1,8 @@
# React native
# React Native
React Native is a popular JavaScript-based mobile app framework that allows you to build natively-rendered mobile apps for iOS and Android. The framework lets you create an application for various platforms by using the same codebase.
<ResourceGroupTitle>Free Content</ResourceGroupTitle>
<BadgeLink colorScheme='blue' badgeText='Official Website' href='https://reactnative.dev/'>Official Website</BadgeLink>
<BadgeLink colorScheme='blue' badgeText='Official Docs' href='https://reactnative.dev/docs/getting-started'>Official Getting Started to React Native</BadgeLink>
<BadgeLink colorScheme='Watch' badgeText='Watch' href='https://www.youtube.com/watch?v=0-S5a0eXPoc'>Tutorial to Learn React Native</BadgeLink>

@ -6,3 +6,4 @@ HTML stands for Hyper Text Markup Language. It is used on the frontend and gives
<BadgeLink badgeText='Read' href='https://www.w3schools.com/html/html_intro.asp'>W3Schools: Learn HTML</BadgeLink>
<BadgeLink badgeText='Course' colorScheme='green' href='https://www.youtube.com/watch?v=pQN-pnXPaVg'>HTML Full Course - Build a Website Tutorial</BadgeLink>
<BadgeLink badgeText='Course' colorScheme='green' href='https://www.youtube.com/watch?v=qz0aGYrrlhU'>HTML Tutorial for Beginners: HTML Crash Course</BadgeLink>
<BadgeLink badgeText='Course' colorScheme='green' href='https://www.codecademy.com/learn/learn-html'>Codecademy - Learn HTML</BadgeLink>

@ -10,3 +10,5 @@ CSS or Cascading Style Sheets is the language used to style the frontend of any
<BadgeLink colorScheme='green' badgeText='Course' href='https://www.youtube.com/watch?v=D-h8L5hgW-w'>HTML and CSS Tutorial</BadgeLink>
<BadgeLink colorScheme='green' badgeText='Course' href='https://www.youtube.com/watch?v=FqmB-Zj2-PA'>CSS Masterclass - Tutorial & Course for Beginners</BadgeLink>
<BadgeLink colorScheme='green' badgeText='Course' href='href=https://flexbox.io/'>What The Flexbox!</BadgeLink>
<BadgeLink colorScheme='green' badgeText='Course' href='https://www.codecademy.com/learn/learn-css'>Learn CSS | Codecademy</BadgeLink>
<BadgeLink colorScheme='green' badgeText='Course' href='https://www.codecademy.com/learn/learn-intermediate-css'>Learn Intermediate CSS | Codecademy</BadgeLink>

@ -10,3 +10,4 @@ JavaScript allows you to add interactivity to your pages. Common examples that y
<BadgeLink badgeText='Watch' href='https://www.youtube.com/watch?v=fBNz5xF-Kx4'>Node.js Crash Course</BadgeLink>
<BadgeLink badgeText='Watch' href='https://www.youtube.com/watch?v=TlB_eWDSMt4'>Node.js Tutorial for Beginners</BadgeLink>
<BadgeLink badgeText='Course' colorScheme='green' href='https://www.codecademy.com/learn/introduction-to-javascript'>Codecademy - Learn JavaScript</BadgeLink>

@ -1 +1,11 @@
# Python
# Python
Python is a well known programming language which is both a strongly typed and a dynamically typed language. Being an interpreted language, code is executed as soon as it is written and the Python syntax allows for writing code in functional, procedureal or object-oriented programmatic ways.
<ResourceGroupTitle>Free Content</ResourceGroupTitle>
<BadgeLink colorScheme='blue' badgeText='Python Website' href='https://www.python.org/'>Python Website</BadgeLink>
<BadgeLink colorScheme='blue' badgeText='Read' href='https://www.python.org/about/gettingstarted/'>Python Getting Started</BadgeLink>
<BadgeLink badgeText='Course' colorScheme='green' href='https://www.w3schools.com/python/'>W3Schools - Python Tutorial </BadgeLink>
<BadgeLink badgeText='Course' colorScheme='green' href='https://ehmatthes.github.io/pcc/'>Python Crash Course</BadgeLink>
<BadgeLink colorScheme='blue' badgeText='Read' href='https://automatetheboringstuff.com/'>Automate the Boring Stuff</BadgeLink>
<BadgeLink badgeText='Course' colorScheme='green' href='https://www.codecademy.com/learn/learn-python'>Codecademy - Learn Python 2</BadgeLink>

@ -1,8 +1,9 @@
# Version Control Systems
Version control systems allow you to track changes to your codebase/files over time. They allow you to go back to some previous version of the codebase without any issues. Also, they help in collaborating with people working on the same code – if you’ve ever collaborated with other people on a project, you might already know the frustration of copying and merging the changes from someone else into your codebase; version control systems allow you to get rid of this issue.
Version control/source control systems allow developers to track and control changes to code over time. These services often include the ability to make atomic revisions to code, branch/fork off of specific points, and to compare versions of code. They are useful in determining the who, what, when, and why code changes were made.
<ResourceGroupTitle>Free Content</ResourceGroupTitle>
<BadgeLink badgeText='Watch' href='https://www.youtube.com/watch?v=zbKdDsNNOhg'>Version Control System Introduction</BadgeLink>
<BadgeLink badgeText='Watch' href='https://www.youtube.com/watch?v=SWYqp7iY_Tc'>Git & GitHub Crash Course For Beginners</BadgeLink>
<BadgeLink badgeText='Watch' href='https://youtu.be/Y9XZQO1n_7c?t=21'>Learn Git in 20 Minutes</BadgeLink>
<BadgeLink colorScheme='blue' badgeText='Official Website' href='https://git-scm.com/'>Git</BadgeLink>
<BadgeLink colorScheme='blue' badgeText='Official Website' href='https://www.mercurial-scm.org/'>Mercurial</BadgeLink>
<BadgeLink colorScheme='yellow' badgeText='Read' href='https://www.atlassian.com/git/tutorials/what-is-version-control'>What is Version Control?</BadgeLink>

@ -1 +1,9 @@
# Repo hosting services
# Repo Hosting Services
When working on a team, you often need a remote place to put your code so others can access it, create their own branches, and create or review pull requests. These services often include issue tracking, code review, and continuous integration features. A few popular choices are GitHub, GitLab, BitBucket, and AWS CodeCommit.
<ResourceGroupTitle>Free Content</ResourceGroupTitle>
<BadgeLink colorScheme='blue' badgeText='Official Website' href='https://github.com/features/'>GitHub</BadgeLink>
<BadgeLink colorScheme='blue' badgeText='Official Website' href='https://about.gitlab.com/'>GitLab</BadgeLink>
<BadgeLink colorScheme='blue' badgeText='Official Website' href='https://bitbucket.org/product/guides/getting-started/overview'>BitBucket</BadgeLink>
<BadgeLink colorScheme='yellow' badgeText='Read' href='https://bitbucket.org/product/code-repository'>How to choose the best source code repository</BadgeLink>

@ -1 +1,7 @@
# Acid
# ACID
ACID are the four properties of any database system that help in making sure that we are able to perform the transactions in a reliable manner. It's an acronym which refers to the presence of four properties: atomicity, consistency, isolation and durability
<ResourceGroupTitle>Free Content</ResourceGroupTitle>
<BadgeLink badgeText='Watch' href='https://www.youtube.com/watch?v=yaQ5YMWkxq4'>ACID Explained: Atomic, Consistent, Isolated & Durable</BadgeLink>
<BadgeLink badgeText='Read' colorScheme='yellow' href='https://retool.com/blog/whats-an-acid-compliant-database/'>What is ACID Compliant Database?</BadgeLink><BadgeLink badgeText='Read' colorScheme='yellow' href='https://fauna.com/blog/what-is-acid-compliance-atomicity-consistency-isolation'>What is ACID Compliance?: Atomicity, Consistency, Isolation</BadgeLink>

@ -1 +1,8 @@
# Test driven development
# Test Driven Development
Test driven development (TDD) is the process of writing tests for software's requirements which will fail until the software is developed to meet those requirements. Once those tests pass, then the cycle repeats to refactor code or develop another feature/requirement. In theory, this ensures that software is written to meet requirements in the simplest form, and avoids code defects.
<ResourceGroupTitle>Free Content</ResourceGroupTitle>
<BadgeLink colorScheme='yellow' badgeText='Read' href='https://www.guru99.com/test-driven-development.html'>What is Test Driven Development (TDD)?</BadgeLink>
<BadgeLink colorScheme='yellow' badgeText='Read' href='https://www.ibm.com/garage/method/practices/code/practice_test_driven_development/'>Test-driven development</BadgeLink>
<BadgeLink badgeText='Watch' href='https://youtu.be/uGaNkTahrIw'>Agile in Practice: Test Driven Development</BadgeLink>

@ -1 +1,10 @@
# Horizontal vertial scaling
# Horizontal/Vertical Scaling
Horizontal scaling is a change in the **number** of a resource. For example, increasing the number of virtual machines processing messages in a queue. Vertical scaling is a change in the **size/power** of a resource. For example, increasing the memory or disk space available to a machine. Scaling can be applied to databases, cloud resources, and other areas of computing.
<ResourceGroupTitle>Free Content</ResourceGroupTitle>
<BadgeLink badgeText='Watch' href='https://youtu.be/xpDnVSmNFX0'>System Design Basics: Horizontal vs. Vertical Scaling</BadgeLink>
<BadgeLink badgeText='Watch' href='https://www.youtube.com/watch?v=Y-Gl4HEyeUQ'>System Design 101</BadgeLink>
<BadgeLink colorScheme='yellow' badgeText='Read' href='https://touchstonesecurity.com/horizontal-vs-vertical-scaling-what-you-need-to-know/'>Horizontal vs Vertical Scaling</BadgeLink>
<BadgeLink colorScheme='yellow' badgeText='Read' href='https://www.geeksforgeeks.org/horizontal-and-vertical-scaling-in-databases/'>Scaling In Databases</BadgeLink>

@ -118,6 +118,8 @@ export default function Thanks() {
<Box mt='40px'>
<Heading mb='15px' fontSize='25px' as='h2'>Past or One Time Sponsors</Heading>
<UnorderedList>
<ListItem mb='5px'><Link color='blue.500' target='_blank' fontWeight={500}
href='https://github.com/kevin-bog'>Kevin Bot</Link></ListItem>
<ListItem mb='5px'><Link color='blue.500' target='_blank' fontWeight={500}
href='https://github.com/werber'>Myroslav</Link></ListItem>
<ListItem mb='5px'><Link color='blue.500' target='_blank' fontWeight={500}

Loading…
Cancel
Save