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

Update application name mentions, remove unused dependencies #54

Merged
merged 1 commit into from
Apr 11, 2016
Merged

Update application name mentions, remove unused dependencies #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets-windows/installer-script.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion desktop-app/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tinder-desktop",
"description": "",
"description": "A cross-platform desktop Tinder client",
"main": "index.html",
"authors": [
"tinderjs"
Expand Down
25 changes: 12 additions & 13 deletions desktop-app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'>
Expand All @@ -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')}}" />
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion desktop-app/js/error_handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});

Expand Down
26 changes: 0 additions & 26 deletions desktop-app/js/tinder++.updater.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion desktop-app/js/tinder++.api.js → desktop-app/js/tinder-desktop.api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};

Expand Down
4 changes: 2 additions & 2 deletions desktop-app/js/tinder++.controls.js → desktop-app/js/tinder-desktop.controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion desktop-app/js/tinder++.js → desktop-app/js/tinder-desktop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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); };
Expand Down
2 changes: 1 addition & 1 deletion desktop-app/js/tinder++.login.js → desktop-app/js/tinder-desktop.login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion desktop-app/js/tinder++.messages.js → desktop-app/js/tinder-desktop.messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion desktop-app/js/tinder++.profile.js → desktop-app/js/tinder-desktop.profile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion desktop-app/js/tinder++.settings.js → desktop-app/js/tinder-desktop.settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion desktop-app/js/tinder++.swipe.js → desktop-app/js/tinder-desktop.swipe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
Expand Down
5 changes: 2 additions & 3 deletions desktop-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tinder-desktop",
"version": "1.2.1",
"version": "0.1.0",
"main": "index.html",
"window": {
"title": "Tinder Desktop",
Expand All @@ -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"
}
}
19 changes: 11 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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",
Expand Down