From 82d46482a28e60a88d3fecb05842810ca2240662 Mon Sep 17 00:00:00 2001
From: Stuart Williams <stuart@sidereal.ca>
Date: Mon, 11 Apr 2016 18:13:50 -0400
Subject: [PATCH] Update application name mentions, remove unused dependencies

---
 assets-windows/installer-script.iss           |  2 +-
 desktop-app/bower.json                        |  2 +-
 desktop-app/index.html                        | 25 +++++++++---------
 desktop-app/js/error_handler.js               |  2 +-
 desktop-app/js/tinder++.updater.js            | 26 -------------------
 ...{tinder++.api.js => tinder-desktop.api.js} |  2 +-
 ...controls.js => tinder-desktop.controls.js} |  4 +--
 .../js/{tinder++.js => tinder-desktop.js}     |  2 +-
 ...der++.login.js => tinder-desktop.login.js} |  2 +-
 ...messages.js => tinder-desktop.messages.js} |  2 +-
 ...+.profile.js => tinder-desktop.profile.js} |  2 +-
 ...settings.js => tinder-desktop.settings.js} |  2 +-
 ...der++.swipe.js => tinder-desktop.swipe.js} |  2 +-
 desktop-app/package.json                      |  5 ++--
 package.json                                  | 19 ++++++++------
 15 files changed, 37 insertions(+), 62 deletions(-)
 delete mode 100644 desktop-app/js/tinder++.updater.js
 rename desktop-app/js/{tinder++.api.js => tinder-desktop.api.js} (99%)
 rename desktop-app/js/{tinder++.controls.js => tinder-desktop.controls.js} (98%)
 rename desktop-app/js/{tinder++.js => tinder-desktop.js} (83%)
 rename desktop-app/js/{tinder++.login.js => tinder-desktop.login.js} (96%)
 rename desktop-app/js/{tinder++.messages.js => tinder-desktop.messages.js} (96%)
 rename desktop-app/js/{tinder++.profile.js => tinder-desktop.profile.js} (77%)
 rename desktop-app/js/{tinder++.settings.js => tinder-desktop.settings.js} (96%)
 rename desktop-app/js/{tinder++.swipe.js => tinder-desktop.swipe.js} (98%)

diff --git a/assets-windows/installer-script.iss b/assets-windows/installer-script.iss
index ad6473e..244fbd9 100644
--- a/assets-windows/installer-script.iss
+++ b/assets-windows/installer-script.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Tinder Desktop"
-#define MyAppVersion "1.2.1"
+#define MyAppVersion "0.1.0"
 #define MyAppPublisher "TinderJS, Github Organization"
 #define MyAppURL "https://github.com/tinderjs/tinder-desktop"
 #define MyAppExeName "tinder-desktop.exe"
diff --git a/desktop-app/bower.json b/desktop-app/bower.json
index 2eb2115..013d3d7 100644
--- a/desktop-app/bower.json
+++ b/desktop-app/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tinder-desktop",
-  "description": "",
+  "description": "A cross-platform desktop Tinder client",
   "main": "index.html",
   "authors": [
     "tinderjs"
diff --git a/desktop-app/index.html b/desktop-app/index.html
index 4829c92..7456710 100644
--- a/desktop-app/index.html
+++ b/desktop-app/index.html
@@ -5,7 +5,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
   <title>Tinder Desktop</title>
-  <meta name="description" content="Desktop optimized Tinder">
+  <meta name="description" content="A cross-platform desktop Tinder client">
 
   <link rel="stylesheet" href="css/normalize.min.css"/>
   <link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
@@ -25,22 +25,21 @@
   <script src="js/vendor/swing.min.js"></script>
   <script src="js/vendor/twemoji.min.js"></script>
 
-  <script src="js/tinder++.api.js"></script>
-  <script src="js/tinder++.controls.js"></script>
-  <script src="js/tinder++.login.js"></script>
-  <script src="js/tinder++.swipe.js"></script>
-  <script src="js/tinder++.messages.js"></script>
-  <script src="js/tinder++.profile.js"></script>
-  <script src="js/tinder++.settings.js"></script>
-  <script src="js/tinder++.js"></script>
-  <!-- <script src="js/tinder++.updater.js"></script> -->
+  <script src="js/tinder-desktop.api.js"></script>
+  <script src="js/tinder-desktop.controls.js"></script>
+  <script src="js/tinder-desktop.login.js"></script>
+  <script src="js/tinder-desktop.swipe.js"></script>
+  <script src="js/tinder-desktop.messages.js"></script>
+  <script src="js/tinder-desktop.profile.js"></script>
+  <script src="js/tinder-desktop.settings.js"></script>
+  <script src="js/tinder-desktop.js"></script>
   <script src="js/emoji.js"></script>
   <script src="js/sweet-alert.min.js"></script>
 
   <script src="https://maps.googleapis.com/maps/api/js?libraries=places"></script>
 </head>
-<body ng-app="tinder++">
-<!--<div class="title-bar"><i class="fa fa-times" onclick="window.close()"></i>Tinder++</div>-->
+<body ng-app="tinder-desktop">
+<!--<div class="title-bar"><i class="fa fa-times" onclick="window.close()"></i>Tinder Desktop</div>-->
 <div class="header center">
   <a ng-href="#/profile/{{getCookie('userId')}}">
     <img ng-src="{{getCookie('smallPhoto')}}" />
@@ -139,7 +138,7 @@ <h3 class="fader" style="display: inline;">{{allPeople[peopleIndex].distance_mi}
 <script type="text/ng-template" id="login.html">
   <div class="fb-login">
     <div class="login-container">
-      <img src="img/icon.png" alt="Tinder++" class="icon" />
+      <img src="img/icon.png" alt="Tinder Desktop" class="icon" />
       <a id="sign_in" href="" ng-click="startLogin()"></a>
     </div>
   </div>
diff --git a/desktop-app/js/error_handler.js b/desktop-app/js/error_handler.js
index a9845f4..7cb1aac 100644
--- a/desktop-app/js/error_handler.js
+++ b/desktop-app/js/error_handler.js
@@ -18,7 +18,7 @@ process.on('uncaughtException', function(e) {
   console.log(e);
   console.groupEnd();
 
-  alert('Sorry, something went wrong, please restart the app (or try downloading latest version from tinderplusplus.com)');
+  alert('Sorry, something went wrong, please restart the app (or try downloading latest version from github.com/tinderjs/tinder-desktop)');
   return false;
 });
 
diff --git a/desktop-app/js/tinder++.updater.js b/desktop-app/js/tinder++.updater.js
deleted file mode 100644
index 6802b26..0000000
--- a/desktop-app/js/tinder++.updater.js
+++ /dev/null
@@ -1,26 +0,0 @@
-(function() {
-  var gui = require('nw.gui');
-  var currentVersion = gui.App.manifest.version;
-
-  var updateParams = {
-    'channel': 'beta',
-    'currentVersion': currentVersion,
-    'endpoint': 'http://tinderplusplus.com/update.json',
-    'verify': false
-  };
-
-  var updater = require('nw-updater')(updateParams);
-  updater.update();
-
-  updater.on('download', function(version) {
-    console.log('downloading new version: ' + version);
-  });
-
-  updater.on('installed', function() {
-    alert('Tinder++ has just been updated to the latest version, please restart the app!');
-  });
-
-  updater.on('error', function(err) {
-    console.log(err);
-  });
-})();
diff --git a/desktop-app/js/tinder++.api.js b/desktop-app/js/tinder-desktop.api.js
similarity index 99%
rename from desktop-app/js/tinder++.api.js
rename to desktop-app/js/tinder-desktop.api.js
index 1307874..ab02b7e 100644
--- a/desktop-app/js/tinder++.api.js
+++ b/desktop-app/js/tinder-desktop.api.js
@@ -6,7 +6,7 @@
   // if a token returned from tinder is in localstorage, set that token and skip auth
   if (localStorage.tinderToken) { client.setAuthToken(localStorage.tinderToken); }
 
-  angular.module('tinder++.api', []).factory('API', function($q) {
+  angular.module('tinder-desktop.api', []).factory('API', function($q) {
     var likesRemaining = null;
     var apiObj = {};
 
diff --git a/desktop-app/js/tinder++.controls.js b/desktop-app/js/tinder-desktop.controls.js
similarity index 98%
rename from desktop-app/js/tinder++.controls.js
rename to desktop-app/js/tinder-desktop.controls.js
index 3515a46..cabc577 100644
--- a/desktop-app/js/tinder++.controls.js
+++ b/desktop-app/js/tinder-desktop.controls.js
@@ -3,7 +3,7 @@
   var gui = require('nw.gui');
   var win = gui.Window.get();
 
-  module = angular.module('tinder++.controls', ['tinder++.api']);
+  module = angular.module('tinder-desktop.controls', ['tinder-desktop.api']);
 
   module.service('Controls', function(API, $interval, $q, orderByFilter, $timeout) {
 
@@ -78,7 +78,7 @@
           // could add info from the match to add the name and possibly
           // even the photo from the match as the icon
             var options = {
-              body: "Congratulations, you've got a new match on Tinder++!"
+              body: "Congratulations, you've got a new match on tinder-desktop!"
              };
 
             var notification = new Notification("New Match",options);
diff --git a/desktop-app/js/tinder++.js b/desktop-app/js/tinder-desktop.js
similarity index 83%
rename from desktop-app/js/tinder++.js
rename to desktop-app/js/tinder-desktop.js
index 23c7e9d..29da661 100644
--- a/desktop-app/js/tinder++.js
+++ b/desktop-app/js/tinder-desktop.js
@@ -14,7 +14,7 @@
     win.menu = nativeMenuBar;
   }
 
-  var app = angular.module('tinder++', ['tinder++.login', 'tinder++.swipe', 'tinder++.messages', 'tinder++.profile', 'ngRoute', 'tinder++.settings', 'tinder++.controls']);
+  var app = angular.module('tinder-desktop', ['tinder-desktop.login', 'tinder-desktop.swipe', 'tinder-desktop.messages', 'tinder-desktop.profile', 'ngRoute', 'tinder-desktop.settings', 'tinder-desktop.controls']);
 
   app.config(function($routeProvider) {
     var capitalize = function (s) { return s[0].toUpperCase() + s.slice(1); };
diff --git a/desktop-app/js/tinder++.login.js b/desktop-app/js/tinder-desktop.login.js
similarity index 96%
rename from desktop-app/js/tinder++.login.js
rename to desktop-app/js/tinder-desktop.login.js
index 749aa09..181dc02 100644
--- a/desktop-app/js/tinder++.login.js
+++ b/desktop-app/js/tinder-desktop.login.js
@@ -1,6 +1,6 @@
 (function() {
   gui = require('nw.gui');
-  module = angular.module('tinder++.login', ['tinder++.api']);
+  module = angular.module('tinder-desktop.login', ['tinder-desktop.api']);
 
   module.controller('LoginController', function LoginController($scope, $http, API) {
     $scope.loginUrl = 'https://m.facebook.com/dialog/oauth?client_id=464891386855067&redirect_uri=https://www.facebook.com/connect/login_success.html&scope=user_birthday,user_relationship_details,user_likes,user_activities,user_education_history,user_photos,user_friends,user_about_me,email,public_profile&response_type=token';
diff --git a/desktop-app/js/tinder++.messages.js b/desktop-app/js/tinder-desktop.messages.js
similarity index 96%
rename from desktop-app/js/tinder++.messages.js
rename to desktop-app/js/tinder-desktop.messages.js
index 6174d9b..a2634f8 100644
--- a/desktop-app/js/tinder++.messages.js
+++ b/desktop-app/js/tinder-desktop.messages.js
@@ -1,5 +1,5 @@
 (function() {
-  module = angular.module('tinder++.messages', ['tinder++.api', 'tinder++.settings', 'ngSanitize', 'emoji']);
+  module = angular.module('tinder-desktop.messages', ['tinder-desktop.api', 'tinder-desktop.settings', 'ngSanitize', 'emoji']);
 
   module.controller('MessagesController', function($scope, API, Settings) {
     // console.log(API.conversations)
diff --git a/desktop-app/js/tinder++.profile.js b/desktop-app/js/tinder-desktop.profile.js
similarity index 77%
rename from desktop-app/js/tinder++.profile.js
rename to desktop-app/js/tinder-desktop.profile.js
index 47a2e15..6702fc6 100644
--- a/desktop-app/js/tinder++.profile.js
+++ b/desktop-app/js/tinder-desktop.profile.js
@@ -1,5 +1,5 @@
 (function() {
-  var module = angular.module('tinder++.profile', ['ngRoute', 'tinder++.api', 'tinder++.swipe']);
+  var module = angular.module('tinder-desktop.profile', ['ngRoute', 'tinder-desktop.api', 'tinder-desktop.swipe']);
 
   module.controller('ProfileController', function($scope, $routeParams, API) {
     API.userInfo($routeParams.userId).then(function(user) {
diff --git a/desktop-app/js/tinder++.settings.js b/desktop-app/js/tinder-desktop.settings.js
similarity index 96%
rename from desktop-app/js/tinder++.settings.js
rename to desktop-app/js/tinder-desktop.settings.js
index e3530c8..5049469 100644
--- a/desktop-app/js/tinder++.settings.js
+++ b/desktop-app/js/tinder-desktop.settings.js
@@ -1,5 +1,5 @@
 (function() {
-  module = angular.module('tinder++.settings', ['ngAutocomplete', 'ngSanitize']);
+  module = angular.module('tinder-desktop.settings', ['ngAutocomplete', 'ngSanitize']);
 
   module.service('Settings', function() {
     var settingsObj = {
diff --git a/desktop-app/js/tinder++.swipe.js b/desktop-app/js/tinder-desktop.swipe.js
similarity index 98%
rename from desktop-app/js/tinder++.swipe.js
rename to desktop-app/js/tinder-desktop.swipe.js
index f181f71..f3d2b38 100644
--- a/desktop-app/js/tinder++.swipe.js
+++ b/desktop-app/js/tinder-desktop.swipe.js
@@ -2,7 +2,7 @@
   var superLike;
   var gui = require('nw.gui');
   var moment = require('moment');
-  var module = angular.module('tinder++.swipe', ['ngAutocomplete', 'ngSanitize', 'emoji', 'tinder++.api']);
+  var module = angular.module('tinder-desktop.swipe', ['ngAutocomplete', 'ngSanitize', 'emoji', 'tinder-desktop.api']);
 
   module.controller('SwipeController', function SwipeController($scope, $timeout, $interval, $location, API) {
     $scope.allPeople = [];
diff --git a/desktop-app/package.json b/desktop-app/package.json
index 441afee..fff37b4 100644
--- a/desktop-app/package.json
+++ b/desktop-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tinder-desktop",
-  "version": "1.2.1",
+  "version": "0.1.0",
   "main": "index.html",
   "window": {
     "title": "Tinder Desktop",
@@ -19,8 +19,7 @@
   "user-agent": "Mozilla/5.0 (Linux; U; en-gb; KFTHWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.16 Safari/535.19",
   "no-edit-menu": true,
   "dependencies": {
-    "moment": "^2.8.4",
-    "nw-updater": "git://github.com/mfkp/nw-updater",
+    "moment": "^2.12.0",
     "tinder": "^1.16.0"
   }
 }
diff --git a/package.json b/package.json
index 62c8761..cabf76d 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,21 @@
 {
-  "name": "tinderplusplus",
-  "version": "1.2.1",
-  "description": "tinder",
+  "name": "tinder-desktop",
+  "version": "0.1.0",
+  "description": "A cross-platform desktop Tinder client",
   "main": "build.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/mfkp/tinderplusplus.git"
+    "url": "https://github.com/tinderjs/tinder-desktop.git"
   },
-  "author": "@mfkp",
+  "author": "tinderjs",
   "contributors": [
+    {
+      "name": "Kyle Powers (@mfkp)",
+      "url": "http://kylepowers.com"
+    },
     {
       "name": "Thomas Schneider",
       "url": "http://thomasschneider.com"
@@ -23,11 +27,10 @@
   ],
   "license": "ISC",
   "bugs": {
-    "url": "https://github.com/mfkp/tinderplusplus/issues"
+    "url": "https://github.com/tinderjs/tinder-desktop/issues"
   },
-  "homepage": "https://github.com/mfkp/tinderplusplus",
+  "homepage": "https://github.com/tinderjs/tinder-desktop",
   "devDependencies": {
-    "archiver": "^0.14.4",
     "gulp": "^3.9.1",
     "gulp-appdmg": "^1.0.2",
     "gulp-inno": "0.0.7",