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

Add timeout feature #7

Merged
merged 4 commits into from
Oct 3, 2020
Merged

Add timeout feature #7

merged 4 commits into from
Oct 3, 2020

Conversation

mshinh
Copy link
Collaborator

@mshinh mshinh commented Oct 1, 2020

Fixed #6

  • Added Timeout of 1.5 secs to axios (Optimization)

  • Updated README.md to include this feature and elaborated on the existing features

  • Improved styling and indentation

mshinh and others added 2 commits September 30, 2020 21:30
@mshinh
Merge pull request #1 from Shinh18/develop
0901724 
add readme, index.js,package.json,test.txt,fileHandler.js,.gitignore
added timeout feature
7124d0b
@chawlapalak
Copy link
Owner

chawlapalak commented Oct 2, 2020 •
edited
Loading

Hi Muskan:

I am unable to see your branch in my repository. Also, there is a merge conflict in the Readme file. So please resolve this merge conflict and add the changes in the branch visible to me.

Also, the branch name should be the issue number.

Thanks,
Palak

@mshinh
Copy link
Collaborator Author

mshinh commented Oct 2, 2020

Hey Palak,
You cannot see the branch in your repo because I forked your repo, cloned the one I forked, made a branch in that repo and then made changes and pushed.
So I created this pull request from the branch in my forked repo to your master branch. This is what I think we have to do.
Also, the readme file conflict will be resolved once you review the file and accept the changes, I think.

I made the mistake of branch name but I don't think I can change that now.

@mshinh
Copy link
Collaborator Author

mshinh commented Oct 2, 2020

Hey Palak,
I resolved the conflict in the readme file. There are no more conflicts.

Thanks,
Muskan

chawlapalak
chawlapalak requested changes Oct 3, 2020
View reviewed changes
Copy link
Owner

@chawlapalak chawlapalak left a comment

Choose a reason for hiding this comment

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

Hi,
Please correct the spellings in the readme file. Thanks.

Best,
Palak

README.md Outdated
@@ -1,16 +1,28 @@
# URL-Inspector
This is a command line interface tool to check different URLs and detect if they are good or bad or unknown.

# Installation
# Instalation
Copy link
Owner

Choose a reason for hiding this comment

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

Spelling mistake, please correct.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed.

README.md Outdated
* Bad or Status 400 or 404 is displayed in red
* Unknown status is displayed in gray
* It displays the toolname along with its current version with the following command
url-inspector -v or -V or --versin
Copy link
Owner

Choose a reason for hiding this comment

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

Version spelled wrong. Please fix.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed.

@chawlapalak chawlapalak merged commit 6ee9f0e into chawlapalak:master Oct 3, 2020
@chawlapalak
Copy link
Owner

Hi,
Approved.
Thanks,
Palak Chawla

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

@chawlapalak chawlapalak chawlapalak approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add timeout feature
2 participants
@mshinh @chawlapalak