Merge pull request #270 from manosim/v2

Gitify V2

Author: manosim

.eslintrc

@@ -3,7 +3,8 @@
     browser: true,
     es6: true,
     node: true,
-    mocha: true
+    jest: true,
+    jasmine: true,
   },
   "parserOptions": {
     "ecmaVersion": 6,

.sass-lint.yml

@@ -16,7 +16,7 @@ rules:
       exclude:
         - src
         - transform
-  no-ids: 2
+  no-ids: 0
   no-important: 2
   no-transition-all: 0
   no-vendor-prefixes: 0

.travis.yml

@@ -1,20 +1,15 @@
 language: node_js
 
 node_js:
-  - '5'
+  - '6.10.3'
 
 cache:
+  yarn: true
   directories:
-    - node_modules
-
-install:
-  - npm install
-
-before_script:
-  - npm run build
+    - "node_modules"
 
 script:
-  - npm test
+  - yarn test -- --runInBand
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

.vscode/launch.json

@@ -0,0 +1,21 @@
+{
+    // Use IntelliSense to learn about possible Node.js debug attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "program": "${workspaceRoot}/main.js"
+        },
+        {
+            "type": "node",
+            "request": "attach",
+            "name": "Attach to Process",
+            "address": "localhost",
+            "port": 5858
+        }
+    ]
+}

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Emmanouil Konstantinidis
+Copyright (c) 2017 Emmanouil Konstantinidis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -5,15 +5,6 @@
 ![Gitify](images/press.png)
 
 
-### Version 1.0.0 is now out!
-
-> Gitify finally reaches version **1.0.0**. The app has been rewritten from scratch using React v15, Redux, Bootstrap 4 and more. This allows me to prepare the surface for more features (GitHub Enterprise etc). Unfortunately, due to a change in the auto-update package API, you will have **to download the update manually**. This is now fixed and you won't have to download any updates manually again. Finally the user settings will be reset with the new version. Hope you like it and feel free to give me some feedback!
-
-> Cheers,
-
-> Manos
-
-
 ### 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.
 
@@ -28,10 +19,10 @@ Gitify currently only supports OS X.
 
 ### Prerequisites
 
+ - Node 6+
  - [Electron](http://electron.atom.io/)
  - [React](https://facebook.github.io/react/)
- - [Webpack](https://webpack.github.io/)
- - [NPM](https://www.npmjs.com/)
+ - [Gulp](https://www.gulpjs.com)
 
 
 ### Installation
@@ -64,16 +55,13 @@ To publish a new version, you also need to codesign the app running `npm run cod
 
 
 ### Tests
-There are 2 linters for `js` & `scss` and unit tests with `mocha`.
-
-    // Run all tests
-    npm run test
+There are 2 linters for `js` & `scss` and unit tests with `jest`.
 
     // Run only unit tests
-    npm run mocha
+    npm run jest
 
-    // Run unit tests with coverage
-    npm run coverage
+    // Run linter & unit tests with coverage
+    npm run test
 
 ### FAQ
 

electron/app-menu-template.js

@@ -0,0 +1,151 @@
+const { shell } = require('electron');
+
+const appMenuTemplate = [
+  {
+    label: 'Edit',
+    submenu: [
+      {
+        role: 'cut'
+      },
+      {
+        role: 'copy'
+      },
+      {
+        role: 'paste'
+      },
+      {
+        role: 'delete'
+      },
+      {
+        role: 'selectall'
+      }
+    ]
+  },
+  {
+    label: 'View',
+    submenu: [
+      {
+        label: 'Reload',
+        accelerator: 'CmdOrCtrl+R',
+        click (item, focusedWindow) {
+          if (focusedWindow) focusedWindow.reload();
+        }
+      },
+      {
+        label: 'Toggle Developer Tools',
+        accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
+        click (item, focusedWindow) {
+          if (focusedWindow) focusedWindow.webContents.toggleDevTools();
+        }
+      },
+      {
+        type: 'separator'
+      },
+      {
+        role: 'resetzoom'
+      },
+      {
+        role: 'zoomin'
+      },
+      {
+        role: 'zoomout'
+      },
+      {
+        type: 'separator'
+      },
+      {
+        role: 'togglefullscreen'
+      }
+    ]
+  },
+  {
+    role: 'window',
+    submenu: [
+      {
+        role: 'minimize'
+      },
+      {
+        role: 'close'
+      }
+    ]
+  },
+  {
+    role: 'help',
+    submenu: [
+      {
+        label: 'GitHub Repository',
+        click () { shell.openExternal('https://github.com/manosim/gitify'); }
+      },
+      {
+        label: 'Visit Website',
+        click () { shell.openExternal('http://www.gitify.io'); }
+      }
+    ]
+  }
+];
+
+if (process.platform === 'darwin') {
+  appMenuTemplate.unshift({
+    label: 'Gitify',
+    submenu: [
+      {
+        role: 'about'
+      },
+      {
+        type: 'separator'
+      },
+      {
+        label: 'Preferences',
+        accelerator: process.platform === 'darwin' ? 'Command+,' : 'Ctrl+,',
+        click (item, focusedWindow) {
+          if (focusedWindow) focusedWindow.webContents.send('toggle-settings');
+        }
+      },
+      {
+        type: 'separator'
+      },
+      {
+        role: 'hide'
+      },
+      {
+        role: 'hideothers'
+      },
+      {
+        role: 'unhide'
+      },
+      {
+        type: 'separator'
+      },
+      {
+        role: 'quit'
+      }
+    ]
+  });
+
+  // Window menu.
+  appMenuTemplate[3].submenu = [
+    {
+      label: 'Close',
+      accelerator: 'CmdOrCtrl+W',
+      role: 'close'
+    },
+    {
+      label: 'Minimize',
+      accelerator: 'CmdOrCtrl+M',
+      role: 'minimize'
+    },
+    {
+      label: 'Zoom',
+      role: 'zoom'
+    },
+    {
+      type: 'separator'
+    },
+    {
+      label: 'Bring All to Front',
+      role: 'front'
+    }
+  ];
+}
+
+module.exports = appMenuTemplate;

gulpfile.js

@@ -1,77 +1,23 @@
-var assign = require('lodash.assign');
-var babelify = require('babelify');
-var browserify = require('browserify');
-var buffer = require('vinyl-buffer');
-var gulp = require('gulp');
-var gutil = require('gulp-util');
-var sass = require('gulp-sass');
-var source = require('vinyl-source-stream');
-var uglify = require('gulp-uglify');
-var watchify = require('watchify');
+const gulp = require('gulp');
+const sass = require('gulp-sass');
 
-var options = {
-  browserifyOpts: {
-    entries: './src/js/app.js',
-    debug: true
-  },
-  jsDest: 'dist/js'
-};
-
-var bundler = browserify(options.browserifyOpts);
-
-gulp.task('build:js', function () {
-  return bundler
-    .transform(babelify)
-    .bundle()
-    .pipe(source('app.js'))
-    .pipe(buffer())
-    .pipe(uglify())
-    .pipe(gulp.dest(options.jsDest));
-});
-
-gulp.task('watch:js', function () {
-  var watcherOpts = assign({}, watchify.args, options.browserifyOpts);
-  var watcher = watchify(browserify(watcherOpts)).transform(babelify);
-
-  function bundle() {
-    return watcher
-      .bundle()
-      // log errors if they happen
-      .on('error', gutil.log.bind(gutil, 'Browserify Error'))
-      .pipe(source('app.js'))
-      .pipe(buffer())
-      .pipe(gulp.dest(options.jsDest));
-  }
-
-  watcher.on('update', bundle); // on any dep update, runs the bundler
-  watcher.on('log', gutil.log); // output build logs to terminal
-
-  return bundle();
-});
-
-gulp.task('build:scss', function () {
+gulp.task('build:scss', () => {
   return gulp.src('./src/scss/app.scss')
     .pipe(sass().on('error', sass.logError))
     .pipe(gulp.dest('./dist/css'));
 });
 
-gulp.task('watch:scss', function () {
+gulp.task('watch:scss', () => {
   gulp.watch('./src/scss/app.scss', ['build:scss']);
 });
 
-gulp.task('copy:fonts', function () {
+gulp.task('copy:fonts', () => {
   return gulp.src([
     './node_modules/font-awesome/fonts/*.+(eot|svg|ttf|woff|woff2|otf)',
     './node_modules/octicons/build/font/*.+(ttf|eot|svg|ttf|woff|woff2)',
   ])
   .pipe(gulp.dest('./dist/fonts'));
 });
 
-gulp.task('apply-prod-environment', function() {
-  process.env.NODE_ENV = 'production';
-});
-
-gulp.task('watch', ['watch:js', 'watch:scss']);
-gulp.task('build', ['copy:fonts', 'build:js', 'build:scss']);
-gulp.task('release', ['apply-prod-environment', 'build']);
-gulp.task('default', ['build']);
+gulp.task('watch', ['watch:scss']);
+gulp.task('build', ['copy:fonts', 'build:scss']);