diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..6550da6 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.4.3 \ No newline at end of file diff --git a/Gemfile b/Gemfile index 5709e7a..b1e8208 100644 --- a/Gemfile +++ b/Gemfile @@ -9,9 +9,10 @@ source "https://rubygems.org" # This will help ensure the proper Jekyll version is running. # Happy Jekylling! gem "jekyll", "3.5.2" +gem "jekyll-analytics" # This is the default theme for new Jekyll sites. You may change this to anything you like. -# gem "minima", "~> 2.0" +gem "minima", "~> 2.0" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. diff --git a/Gemfile.lock b/Gemfile.lock index 8515a1e..07a44d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) colorator (1.1.0) - ffi (1.9.18) + ffi (1.9.25) forwardable-extended (2.6.0) jekyll (3.5.2) addressable (~> 2.4) @@ -17,29 +17,36 @@ GEM pathutil (~> 0.9) rouge (~> 1.7) safe_yaml (~> 1.0) - jekyll-feed (0.9.2) + jekyll-analytics (0.1.11) + jekyll-feed (0.11.0) jekyll (~> 3.3) - jekyll-sass-converter (1.5.0) + jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - kramdown (1.15.0) + jekyll-seo-tag (2.5.0) + jekyll (~> 3.3) + jekyll-watch (1.5.1) + listen (~> 3.0) + kramdown (1.17.0) liquid (4.0.0) - listen (3.0.8) + listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) mercenary (0.3.6) - minima (2.1.1) - jekyll (~> 3.3) - pathutil (0.14.0) + minima (2.5.0) + jekyll (~> 3.5) + jekyll-feed (~> 0.9) + jekyll-seo-tag (~> 2.1) + pathutil (0.16.1) forwardable-extended (~> 2.6) - public_suffix (3.0.0) - rb-fsevent (0.10.2) + public_suffix (3.0.3) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rouge (1.11.1) + ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.1) + sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -50,9 +57,10 @@ PLATFORMS DEPENDENCIES jekyll (= 3.5.2) + jekyll-analytics jekyll-feed (~> 0.6) minima (~> 2.0) tzinfo-data BUNDLED WITH - 1.15.4 + 1.16.5 diff --git a/README.md b/README.md index 3544fa2..19fe5a3 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,19 @@ # my-first-pull-request Helping first time contributors learn the mechanics of submitting a pull request +## Menu +You can check the following topics that will guide you through your PR submitting process. -# Welcome +0. [Create and issue](#0-create-an-issue) +1. [Fork the repository](#1-fork-the-repository) +2. [Clone the repository](#2-clone-the-repository) +3. [Make necessary-changes](#3-make-necessary-changes) +4. [Commit with a proper commit message](#4-commit-with-a-proper-commit-message) +5. [Initiate a Pull Request](#5-initiate-a-pull-request) +6. [Signing in](#6-signing-in) +7. [Opening pull requests](#7-opening-pull-requests) + +----------- # 0. Create an issue 1. Go to [Issue section](https://github.com/sushant-j/my-first-pull-request/issues) of the repository. @@ -17,8 +28,38 @@ Helping first time contributors learn the mechanics of submitting a pull request # 1. Fork the repository -# 2. Make necessary changes +1. On the upper-right corner of the repo, you'll see a fork icon. +![fork icon](./images/DEMO-03.png) +2. Click on the fork icon, and wait until the forking process is finished. +3. You're done! You can now fork the repo using your github user directly. + + +# 2. Clone the repository + -- you will get a link out there,clone it by copy the link from dialog box. + + +# 3. Make necessary changes. + + +# 4. Commit with a proper commit message. +1. git commit filename -m"message". + +# 5. Initiate a Pull Request + 1. Push the changes to branch other than master. + -- you can change branch by git checkout branchname(Do not make changes in master branch.NEVER). + -- if you have not created branch then you can create it by git branch branchname. + -- git push -u origin issue_name. + + +# 6. Signing in +if you are pushing request for the 1st time you need to sign in with your username and password. + +# 7. Opening pull requests: +If you are hoping to contribute back to the original repository, you can send a request to the original author to pull your fork into their repository by submitting a pull request. + +Congrats! +--Now its on author to merge changes you made or not. +--if any suggestions are made,correct it and repeat step 3 and 4 again.Cheers -# 3. Commit with a proper commit message. -# 4. Initiate a Pull Request \ No newline at end of file + diff --git a/_config.yml b/_config.yml index 9e70fe8..4a158e0 100644 --- a/_config.yml +++ b/_config.yml @@ -18,16 +18,22 @@ email: sushantj@sminq.com description: > # this means to ignore newlines until "baseurl:" Welcome! This project exists for beginners to learn the mechanics of making a Pull Request, or PR. baseurl: "" # the subpath of your site, e.g. /blog -url: "https://first-pull-request.tk" # the base hostname & protocol for your site, e.g. http://example.com -twitter_username: sushdagr8 +url: "https://sushant-j.github.io/my-first-pull-request" # the base hostname & protocol for your site, e.g. http://example.com +twitter_username: apparentlyquiet github_username: sushant-j # Build settings markdown: kramdown -# theme: minima +theme: minima plugins: - jekyll-feed + - jekyll-analytics + +jekyll_analytics: + GoogleAnalytics: # Add, if you want to track with Google Analytics + id: UA-6226203-3 # Required - replace with your tracking id + anonymizeIp: false # Optional - Default: false - set to true for anonymized tracking # Exclude from processing. # The following items will not be processed, by default. Create a custom list # to override the default setting. @@ -38,4 +44,5 @@ plugins: # - vendor/bundle/ # - vendor/cache/ # - vendor/gems/ -# - vendor/ruby/ \ No newline at end of file +# - vendor/ruby/ +# theme: jekyll-theme-slate diff --git a/_includes/google-analytics.html b/_includes/google-analytics.html index eb2a692..24ffd86 100644 --- a/_includes/google-analytics.html +++ b/_includes/google-analytics.html @@ -4,7 +4,7 @@ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); - ga('create', '{{ site.google_analytics }}', 'auto'); + ga('create', '{{ UA-6226203-3 }}', 'auto'); ga('send', 'pageview'); diff --git a/_includes/head.html b/_includes/head.html index 8a57fd9..0afa285 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -6,11 +6,11 @@ {% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %} - + - + {% if jekyll.environment == 'production' and site.google_analytics %} {% include google-analytics.html %} {% endif %} diff --git a/_layouts/home.html b/_layouts/home.html index cb26c4b..c6cd4ee 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -13,7 +13,7 @@

Contributors

  • - Sushant J + Sushant Joshi @@ -22,5 +22,82 @@

    Contributors

  • +
  • + + Purva_Chaudhari + + + + + + + +
  • +
  • + + Danish Siraj + + + + + + + + + + +
  • +
  • + + Rushikesh J + + + + + + + +
  • +
  • + + Shubham Shirpurkar + + + + +
  • +
  • + + Mayur R + + + + +
  • +
  • + + Aditya M + +
  • +
  • + + Zainab Nomi + +
  • +
  • + + Tushar Ulhare + +
  • +
  • + + Shrikant Daund + +
  • +
  • + + Shilpa Pundge + +
  • diff --git a/home.html b/home.html new file mode 100644 index 0000000..0f39886 --- /dev/null +++ b/home.html @@ -0,0 +1,103 @@ +--- +layout: default +--- + +
    + +

    Welcome!

    +

    Following contributors have used this repository and submitted their first pull request successfully! Follow instructions at repository to to see how to make your first PR.

    +

    Contributors

    +
      + + +
    1. + + Sushant Joshi + + + + + + + +
    2. +
    3. + + Purva_Chaudhari + + + + + + + +
    4. +
    5. + + Danish Siraj + + + + + + + + + + +
    6. +
    7. + + Rushikesh J + + + + + + + +
    8. +
    9. + + Shubham Shirpurkar + + + + +
    10. +
    11. + + Mayur R + + + + +
    12. +
    13. + + Aditya M + +
    14. +
    15. + + Zainab Nomi + +
    16. +
    17. + + Tushar Ulhare + +
    18. +
    19. + + Shrikant Daund + +
    20. +
    21. + + shilpapundge + +
    22. +
    +
    diff --git a/images/DEMO-03.png b/images/DEMO-03.png new file mode 100644 index 0000000..7cfb48c Binary files /dev/null and b/images/DEMO-03.png differ