Skip to content
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

Jump to bottom

Added the instructions to setup working environment #72

Merged
merged 12 commits into from
Mar 18, 2020
Merged

Added the instructions to setup working environment #72

merged 12 commits into from
Mar 18, 2020

Conversation

vngarg
Copy link

@vngarg vngarg commented Mar 1, 2020

Description

I had added a folder named SETUP WORKING ENVIRONMENT.md
It contains all the relevant details required to install Node and React on our Local Machine.
Issue #57 has been fixed.

@welcome
Copy link

welcome bot commented Mar 1, 2020

Thanks for opening this pull request!
Please add @vinitshahdeo as a reviewer if you haven't added.

@auto-assign auto-assign bot requested a review from vinitshahdeo March 1, 2020 12:14
@vinitshahdeo vinitshahdeo changed the base branch from master to feature/frontend March 2, 2020 06:14
@vinitshahdeo vinitshahdeo added gssoc20 Welcome to GirlScript Summer of Code 2020 easy Easy issue labels Mar 2, 2020
vinitshahdeo
vinitshahdeo requested changes Mar 2, 2020
View reviewed changes
SETUP WORKING ENVIRONMENT.md Outdated
- ***Firstly install Node on your machine, [click here](https://nodejs.org/en/).***
-***To check that Node has successfully installed, run the following command in Terminal. This will display the version of Node installed.***

```js
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's shell code, not JS code.

```js ❌

```bash ✅

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had changed the code ...
Review it please

@vngarg
Updated the SETUP WORKING ENVIRONMENT.md
b6de2a7 
I had updated the changes needed.
vinitshahdeo
vinitshahdeo approved these changes Mar 2, 2020
View reviewed changes
Copy link
Owner

@vinitshahdeo vinitshahdeo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job @vngarg 👏

@vngarg
Copy link
Author

vngarg commented Mar 2, 2020 •
edited
Loading

Good job @vngarg

Thank You
Sir PR bhi accept kr lo ..

@vngarg vngarg requested a review from vinitshahdeo March 4, 2020 13:11
@YashMeh YashMeh added nodejs and removed nodejs labels Mar 5, 2020
@vinitshahdeo
Copy link
Owner

@vngarg I can't merge. PR has conflicts, please resolve it.

@ghost
Copy link

ghost commented Mar 6, 2020

There were the following issues with this Pull Request

  • Commit: 2e9fd84
    • ✖ message may not be empty
    • ✖ type may not be empty
  • Commit: a77232f
    • ✖ message may not be empty
    • ✖ type may not be empty
  • Commit: 5def848
    • ✖ message may not be empty
    • ✖ type may not be empty
  • Commit: b6de2a7
    • ✖ message may not be empty
    • ✖ type may not be empty
  • Commit: 75abd4a
    • ✖ message may not be empty
    • ✖ type may not be empty

You may need to change the commit messages to comply with the repository contributing guidelines.

🤖 This comment was generated by commitlint[bot]. Please report issues here.

Happy coding!

@vngarg
Copy link
Author

vngarg commented Mar 6, 2020 •
edited
Loading

@vinitshahdeo I had removed the conflicts ...
Please merge this
Also I had created a PR for the animation of Water Tanks...
Please review it and merge it #117
Also please add the labels to #117 as some of my PR's have been emrged without labels..

@ghost
Copy link

ghost commented Mar 7, 2020

There were the following issues with this Pull Request

  • Commit: 2e9fd84
    • ✖ message may not be empty
    • ✖ type may not be empty
  • Commit: a77232f
    • ✖ message may not be empty
    • ✖ type may not be empty
  • Commit: 5def848
    • ✖ message may not be empty
    • ✖ type may not be empty
  • Commit: b6de2a7
    • ✖ message may not be empty
    • ✖ type may not be empty
  • Commit: 75abd4a
    • ✖ message may not be empty
    • ✖ type may not be empty
  • Commit: b8dcb6c
    • ✖ message may not be empty
    • ✖ type may not be empty

You may need to change the commit messages to comply with the repository contributing guidelines.

🤖 This comment was generated by commitlint[bot]. Please report issues here.

Happy coding!

vinitshahdeo
vinitshahdeo requested changes Mar 7, 2020
View reviewed changes
src/home.html Outdated
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="lib/createWaterBall-jquery.js"></script>
<script>

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vngarg The PR should be issue-specific, I can see the changes for another issue (animation) here. Please remove the changes or create a fresh branch and raise a new PR.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok sir, I'll fix this ...
Also, please review my another PR for the animation #128

@vngarg
Copy link
Author

vngarg commented Mar 8, 2020

@vinitshahdeo I had removed the changes from home.html...
And the animation is present in the PR #117 , please review both these and tell me if any changes are needed.

@vngarg vngarg requested a review from vinitshahdeo March 12, 2020 20:56
@vinitshahdeo
Copy link
Owner

@vngarg please resolve the conflicts in home.html.

@vngarg
Copy link
Author

vngarg commented Mar 13, 2020

@vngarg please resolve the conflicts in home.html.

@vinitshahdeo I had resolved the conflicts in the file...
Please merge it now.

@vngarg
Copy link
Author

vngarg commented Mar 15, 2020

@vngarg please resolve the conflicts in home.html.

@vinitshahdeo Please review the PR

@vinitshahdeo vinitshahdeo merged commit b6563bd into vinitshahdeo:feature/frontend Mar 18, 2020
@welcome
Copy link

welcome bot commented Mar 18, 2020

Congrats on merging your first pull request! 🙌🎉⚡️
Show some love by starring a few of my repositories.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vinitshahdeo vinitshahdeo vinitshahdeo approved these changes

Assignees

@vinitshahdeo vinitshahdeo

Labels
easy Easy issue gssoc20 Welcome to GirlScript Summer of Code 2020
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vngarg @vinitshahdeo @YashMeh