Merge pull request #370 from manosim/fix-github-hostname

Fix GitHub hostname - Avoid Redirects

Author: manosim

README.md

@@ -6,20 +6,20 @@
 
 ### Download
 
-You can download Gitify for **free** from either the website [www.gitify.io](http://www.gitify.io/) or from the GitHub repository [releases](https://github.com/manosim/gitify/releases) page.
+You can download Gitify for **free** from either the website [www.gitify.io](https://www.gitify.io/) or from the GitHub repository [releases](https://github.com/manosim/gitify/releases) page.
 
 You can also install Gitify via [Homebrew Cask](http://brew.sh/)
 
 ```shell
 brew cask install gitify
 ```
 
-Gitify currently only supports OS X.
+Gitify currently only supports mac OS.
 
 ### Prerequisites
 
 - Node 10+
-- Yarn
+- [Yarn](https://yarnpkg.com/)
 - [Electron](https://electronjs.org/)
 - [TypeScript](https://www.typescriptlang.org/)
 - [React](https://reactjs.org/)
@@ -92,4 +92,4 @@ Gitify is licensed under the MIT Open Source license. For more information, see
 [codecov-image]: https://codecov.io/gh/manosim/gitify/branch/master/graph/badge.svg
 [codecov-url]: https://codecov.io/gh/manosim/gitify
 [downloads-image]: https://img.shields.io/github/downloads/manosim/gitify/total.svg
-[downloads-url]: http://www.gitify.io
+[downloads-url]: https://www.gitify.io

src/js/components/sidebar.tsx

@@ -135,7 +135,7 @@ export class Sidebar extends React.Component<IProps> {
   }
 
   onOpenBrowser() {
-    shell.openExternal(`https://www.github.com/${Constants.REPO_SLUG}`);
+    shell.openExternal(`https://github.com/${Constants.REPO_SLUG}`);
   }
 
   goToSettings() {

src/js/routes/login.tsx

@@ -3,7 +3,6 @@ const { ipcRenderer } = require('electron');
 import * as React from 'react';
 import { Redirect } from 'react-router-dom';
 import { connect } from 'react-redux';
-import Octicon, { MarkGithub } from '@primer/octicons-react';
 import styled from 'styled-components';
 
 import { AppState } from '../../types/reducers';

src/js/utils/helpers.test.ts

@@ -16,7 +16,7 @@ describe('utils/helpers.ts', () => {
       'https://api.github.com/repos/ekonstantinidis/notifications-test/issues/3';
     const newUrl = generateGitHubWebUrl(apiUrl);
     expect(newUrl).toBe(
-      'https://www.github.com/ekonstantinidis/notifications-test/issues/3'
+      'https://github.com/ekonstantinidis/notifications-test/issues/3'
     );
   });
 
@@ -25,17 +25,15 @@ describe('utils/helpers.ts', () => {
       'https://api.github.com/repos/ekonstantinidis/notifications-test/pulls/123';
     const newUrl = generateGitHubWebUrl(apiUrl);
     expect(newUrl).toBe(
-      'https://www.github.com/ekonstantinidis/notifications-test/pull/123'
+      'https://github.com/ekonstantinidis/notifications-test/pull/123'
     );
   });
 
   it('should generate the GitHub url - non enterprise - (release)', () => {
     const apiUrl =
       'https://api.github.com/repos/myorg/notifications-test/releases/3988077';
     const newUrl = generateGitHubWebUrl(apiUrl);
-    expect(newUrl).toBe(
-      'https://www.github.com/myorg/notifications-test/releases'
-    );
+    expect(newUrl).toBe('https://github.com/myorg/notifications-test/releases');
   });
 
   it('should generate the GitHub url - enterprise - (issue)', () => {
@@ -100,7 +98,7 @@ describe('utils/helpers.ts', () => {
       (event, callback) => {
         if (event === 'will-redirect') {
           const event = new Event('will-redirect');
-          callback(event, 'http://www.github.com/?code=123-456');
+          callback(event, 'https://github.com/?code=123-456');
         }
       }
     );
@@ -156,7 +154,7 @@ describe('utils/helpers.ts', () => {
       (event, callback) => {
         if (event === 'did-fail-load') {
           const event = new Event('did-fail-load');
-          callback(event, 500, null, 'http://www.github.com/?code=123-456');
+          callback(event, 500, null, 'https://github.com/?code=123-456');
         }
       }
     );

src/js/utils/helpers.ts

@@ -25,7 +25,7 @@ export function generateGitHubWebUrl(url) {
 
   let newUrl = isEnterprise
     ? url.replace(`${hostname}/api/v3/repos`, hostname)
-    : url.replace('api.github.com/repos', 'www.github.com');
+    : url.replace('api.github.com/repos', 'github.com');
 
   if (newUrl.indexOf('/pulls/') !== -1) {
     newUrl = newUrl.replace('/pulls/', '/pull/');