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.

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

Translation for Gen2 moves, HP, Level for pokemon #2

Open
wants to merge 106 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
fee19b5
initial human walk sniper
samuraitruong Aug 30, 2016
ae8df42
initial human walk sniper
samuraitruong Aug 30, 2016
4103b06
initi heroku
Aug 31, 2016
e7f5f40
change default google map api key
Aug 31, 2016
bc45fc0
add feature remove + priority snipe
samuraitruong Aug 31, 2016
426fc6d
add feature remove + priority snipe
samuraitruong Aug 31, 2016
1a16e12
add animation
samuraitruong Aug 31, 2016
e37c920
Merge branch 'develop' of https://github.com/samuraitruong/pokeease i…
samuraitruong Aug 31, 2016
6f03a12
Merge branch 'master' of https://github.com/samuraitruong/pokeease
samuraitruong Aug 31, 2016
d4949a8
add temp gmap key
samuraitruong Aug 31, 2016
357b43e
add handlebar template & popup info init
samuraitruong Sep 1, 2016
f808c03
change build scrip
Sep 2, 2016
cbb0917
finish popup info google map + refactor
samuraitruong Sep 2, 2016
7276945
massive update & change
samuraitruong Sep 3, 2016
5758aa3
refactor, add typings, add bower.json
samuraitruong Sep 4, 2016
fa77d4d
merge with base master
samuraitruong Sep 4, 2016
5e5e982
update build command
samuraitruong Sep 4, 2016
e10ae14
remove public folder
samuraitruong Sep 4, 2016
5a98d75
update git ignore
samuraitruong Sep 4, 2016
af3f141
temp
samuraitruong Sep 4, 2016
4e9b289
merged
samuraitruong Sep 4, 2016
809f726
meged
samuraitruong Sep 4, 2016
cce76aa
serve from public
samuraitruong Sep 4, 2016
841fede
correct gruntfile
samuraitruong Sep 4, 2016
b28d6dd
add grunt to dependencies for deploy heroku
samuraitruong Sep 4, 2016
0ebcdba
add grunt to dependencies for deploy heroku
samuraitruong Sep 4, 2016
bbad10c
add grunt to dependencies for deploy heroku
samuraitruong Sep 4, 2016
558edcf
add grunt to dependencies for deploy heroku
samuraitruong Sep 4, 2016
3eff173
add grunt to dependencies for deploy heroku
samuraitruong Sep 4, 2016
d34dd16
cleanup & add ignore
Sep 5, 2016
828a6b3
add defined type from typings
Sep 5, 2016
1884734
should work on heroku now
samuraitruong Sep 5, 2016
5cde907
add bower install command
samuraitruong Sep 5, 2016
6ce77e8
bring back snipe target
samuraitruong Sep 5, 2016
c3a9552
git ignore & cleanup
samuraitruong Sep 5, 2016
735097d
add important to overwrite.css
samuraitruong Sep 5, 2016
5922353
Removed unused qtip
GediminasMasaitis Sep 5, 2016
397c902
Add move to here - google map - popup
samuraitruong Sep 5, 2016
a35ef0b
small correction
samuraitruong Sep 5, 2016
5861846
Begin moving files for a proper release
GediminasMasaitis Sep 5, 2016
77d8717
Removed compiled script files
GediminasMasaitis Sep 5, 2016
0008fa4
Deleted compiled css files
GediminasMasaitis Sep 5, 2016
d23ad02
Removed dist for now as a quick fix
GediminasMasaitis Sep 5, 2016
bfe46e1
fixed jsoneditor typing
kaunas163 Sep 5, 2016
9c29f7d
small correction
samuraitruong Sep 5, 2016
a308843
Update launch.bat
GediminasMasaitis Sep 6, 2016
e23089f
test merge
samuraitruong Sep 9, 2016
1ebef3a
cleanup
samuraitruong Sep 9, 2016
9fa9998
Merge branch 'develop'
samuraitruong Sep 9, 2016
ebedc3e
move to target will work now
samuraitruong Sep 10, 2016
f378d34
add index.d.ts to resolve type name, make life easier when coding, cl…
samuraitruong Sep 10, 2016
8c554c0
add index.d.ts to resolve type name, make life easier when coding, cl…
samuraitruong Sep 10, 2016
8c3e1ac
add move to button on gym & pokestop popup window info
samuraitruong Sep 10, 2016
ac3579d
add move to button on gym & pokestop popup window info
samuraitruong Sep 10, 2016
cc7b7b1
remove overwrite css for iron slider skin
samuraitruong Sep 10, 2016
333fbca
try to fix case sensitive asset url for heroku
samuraitruong Sep 10, 2016
5852ffa
deploy
samuraitruong Sep 10, 2016
756a2a3
minor fix gulp file
samuraitruong Sep 10, 2016
ed7c3ae
minor fix gulp file
samuraitruong Sep 10, 2016
143e66a
add upgrade feature
samuraitruong Sep 11, 2016
13ddb76
misc fixes
samuraitruong Sep 11, 2016
093f6b0
Exclude src/external/** from git
jjskuld Sep 14, 2016
c920c42
Add public
jjskuld Sep 14, 2016
1411293
Fix typings to use typescript 1 definitions
jjskuld Feb 22, 2017
b3222bf
Fix typescript compilation errors
jjskuld Feb 22, 2017
3108362
Add new images
jjskuld Feb 22, 2017
5fdc80c
Add audio files
jjskuld Feb 22, 2017
2e5145c
Updated build
jjskuld Feb 22, 2017
10d8d5f
Cherry pick gen2 support from sanguneo/PokeEase
jjskuld Feb 22, 2017
82dc8ce
Fix references to pokemon transfer event Id, which should be changed …
jjskuld Feb 23, 2017
ee0b67e
Updated build
jjskuld Feb 23, 2017
9536c12
Add target-densitydpi=high-dpi and add new pokemon images.
jjskuld Feb 23, 2017
d43f228
Fix spelling
jjskuld Feb 23, 2017
0367f3f
Fix spelling
jjskuld Feb 23, 2017
0c5ee99
Add copy audio task
jjskuld Feb 23, 2017
6211273
Add audio notification settings
jjskuld Feb 23, 2017
bc1bdff
Add audio notifications
jjskuld Feb 23, 2017
0878bb5
Fix IAudioNotificationControllerConfig container to be of type "any" …
jjskuld Feb 23, 2017
055ab94
Update build
jjskuld Feb 23, 2017
3982de9
Merge branch 'feature/audio_notifications'
jjskuld Feb 23, 2017
a1f7fd7
Add pokemon level to journal notifications
jjskuld Feb 24, 2017
e56f404
Update batch files to point to the correct index.html file.
jjskuld Feb 24, 2017
741221a
Remove unused files
jjskuld Feb 24, 2017
423ca2f
Clean up desktop notifications and add pokemon catch level.
jjskuld Feb 24, 2017
c7f2a9a
Updated raw data JSON.
jjskuld Feb 24, 2017
d848f17
Style fixes.
jjskuld Feb 24, 2017
f8a77f6
Receive candies from websocket (reapply fix).
jjskuld Feb 24, 2017
36a7646
Update build
jjskuld Feb 24, 2017
841c60e
Cleanup
jjskuld Feb 24, 2017
8556048
rearrange and reseted base
sanguneo Feb 24, 2017
4c580aa
Bug fix - Fix for Electron jquery issue (http://stackoverflow.com/que…
jjskuld Feb 24, 2017
084fd4a
Add appveyor build and update version in package.json
jjskuld Feb 24, 2017
5e2728e
Change version back to 3 digits
jjskuld Feb 24, 2017
e69c748
Update appveyor build version format to be 3 digits
jjskuld Feb 24, 2017
5227a97
Fixing appveyor build - make sure grunt can be found.
jjskuld Feb 24, 2017
3a8440f
Update README.md
jjskuld Feb 24, 2017
e8af02d
Don't rebuild when making changes to README.md
jjskuld Feb 24, 2017
9ea4798
Update AppVeyor branch to point to master
jjskuld Feb 24, 2017
8adf777
Add CHANGELOG.md placeholder
jjskuld Feb 24, 2017
92a7763
Add changelog generator
jjskuld Feb 24, 2017
bada50f
Fix double build.
jjskuld Feb 24, 2017
d944bb1
Updating Appveyor build
jjskuld Feb 24, 2017
d5658ca
Added 2nd gen moves translation.
Feb 26, 2017
e8efe6b
Added level and HP to pokemon info page.
Feb 26, 2017
c93ccbc
Merge pull request #5 from sanguneo/master
jjskuld Feb 28, 2017
cc41628
Merge branch 'master' into working
jjskuld Feb 28, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 20 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

src/external/**
src/script/script.js
src/script/script.js.map
src/script/template.js
src/script/template.js.map
src/style/style.css
src/style/style.css.map
# Build results
[Dd]ebug/
[Dd]ebugPublic/
Expand Down Expand Up @@ -192,12 +199,14 @@ ClientBin/
*.pfx
*.publishsettings
node_modules/
bower_componenets/
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

bower_components/
.tmp/
tscommand*.*
# RIA/Silverlight projects
Generated_Code/

Expand Down Expand Up @@ -247,18 +256,19 @@ paket-files/

# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml

### grunt ###
# Grunt usually compiles files inside this directory
dist/

# Grunt usually preprocesses files such as coffeescript, compass... inside the .tmp directory
.tmp/

dist/
node_modules/

.tscache
bower_components/
/typings/
.tscache
/src/script/script.js
/src/script/script.js.map
/src/style/style.css
/src/style/style.css.map
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Change Log
224 changes: 210 additions & 14 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,44 +1,240 @@
module.exports = function (grunt) {
require('load-grunt-tasks')(grunt);

grunt.initConfig({
buildPath: 'public',
pkg: grunt.file.readJSON('package.json'),

ts: {
ts: {
default: {
src: ["src/script/ts/**/*.ts", "!node_modules/**"],
src: ["typings/**/*.ts", "src/script/**/*.ts", "!node_modules/**"],
dest: "src/script/script.js"
}
},

sass: {
options: {
sourceMap: true
sourceMap: false
},
dist: {
files: {
'src/style/style.css': 'src/style/style.scss'
'src/style/style.css': 'src/style/scss/style.scss'
}
}
},

watch: {
sass: {
files: ['**/*.scss'],
files: ['**/*.scss', '**/**/*.scss'],
tasks: ['sass'],
options: {
spawn: false,
spawn: false,
},
},
ts: {
files: ['**/*.ts','**/**/*.ts','**/**/**/*.ts','**/**/**/**/*.ts'],
tasks: ['ts'],
options: {
files: ['src/script/**/*.ts'],
tasks: ['ts'],
options: {
spawn: false,
},
},
handlebars: {
files: ['**/*.hbs'],
tasks: ['handlebars'],
options: {
spawn: false,
},
}
},
});
handlebars: {
compile: {
options: {
namespace: function (filename) {
var names = filename.split('/')//filename.replace(/src\/script\/templates\/(.*)\/(.*)\.hbs/, '$1');
names = names.slice(2, names.length - 1)
return "app." + names.join('.');
},
processName: function (filename) { // input: templates/_header.hbs
//return filename.replace(/src\/script\/templates\/(.*)\.hbs/, '$1')
var pieces = filename.split('/');
var name = pieces[pieces.length - 1];
return name.replace('.hbs', '');
}
},
files: {
'src/script/template.js': ['src/script/**/*.hbs']
}
}
},
inline: {
dist: {
options: {
inlineTagAttributes: {
js: 'data-inlined="true"',
css: 'data-inlined="true"'
},
uglify: true,
cssmin: true,
},
src: "src/index.html",
dest: "src/PokeEase.html"
}
},

copy: {
html: {
files: [{
//cwd: "src/",
expand: true,
flatten: true,
src: ['src/*.html'],
dest: 'public',
filter: 'isFile'
},
]
},
images: {
files: [
// includes files within path
{
expand: true,
cwd: "src/images/",
src: ['**'],
dest: '<%= buildPath %>/images/',
filter: 'isFile'
},

// includes files within path and its sub-directories
//{expand: true, src: ['path/**'], dest: 'dest/'},

// makes all src relative to cwd
//{expand: true, cwd: 'path/', src: ['**'], dest: 'dest/'},
{ expand: true, flatten: true, src: ['bower_components/jsoneditor/dist/img/*'], dest: '<%= buildPath %>/styles/img', filter: 'isFile' },

// flattens results to a single level
{ expand: true, flatten: true, src: ['bower_components/ion.rangeSlider/img/*'], dest: '<%= buildPath %>/img/', filter: 'isFile' },
],
},
audio: {
files: [
// includes files within path
{
expand: true,
cwd: "src/audio/",
src: ['**'],
dest: '<%= buildPath %>/audio/',
filter: 'isFile'
}
]
}
},
concat: {
generated: {
files: [
{
dest: '.tmp/script/app.js',
src: ['src/script/*.js']
},
{
dest: '.tmp/script/vendor.js',
src: [
'bower_components/jquery/dist/jquery.js',
'bower_components/lodash/dist/lodash.js',
'src/external/localStoragePolyfill.js',
'bower_components/leaflet/dist/leaflet-src.js',
'bower_components/google-map-infobubble/src/infobubble.js',
'bower_components/jquery-animateNumber/jquery.animateNumber.js',
'bower_components/qtip2/dist/jquery.qtip.js',
'bower_components/moment/moment.js',
'bower_components/jquery-circle-progress/dist/circle-progress.min.js',
'bower_components/jquery.easing/js/jquery.easing.js',
'bower_components/handlebars/handlebars.js',
'bower_components/ion.rangeSlider/js/ion.rangeSlider.js',
'bower_components/jquery.easing/js/jquery.easing.compatibility.js',
'bower_components/jsoneditor/dist/jsoneditor.js'
]
},
{
dest: '.tmp/css/site.css',
src: ['src/style/*.css']
},
{
dest: '.tmp/css/vendor.css',
src: [
'bower_components/leaflet/dist/leaflet.css',
'bower_components/qtip2/dist/jquery.qtip.css',
'bower_components/ion.rangeSlider/css/ion.rangeSlider.css',
'bower_components/ion.rangeSlider/css/ion.rangeSlider.skinFlat.css',
'bower_components/jsoneditor/dist/jsoneditor.css'
]
}
]
}
},

uglify: {
generated: {
files: [{
dest: 'public/script/app.js',
src: ['.tmp/script/app.js']
},
{
dest: 'public/script/vendor.js',
src: ['.tmp/script/vendor.js']
}]
}
},

cssmin: {
generated: {
files: [{
dest: 'public/styles/site.min.css',
src: ['.tmp/css/site.css']
},
{
dest: 'public/styles/vendor.min.css',
src: ['.tmp/css/vendor.css']
}]
}
},
useminPrepare: {
html: 'public/index.html',
options: {
dest: 'dist'
}
},
bower_main: {
copy: {
options: {
dest: 'src/external'
}
}
},
typings: {
install: {

grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-ts');
grunt.loadNpmTasks('grunt-sass');
grunt.registerTask('default', ['ts', 'sass','watch']);
}
},
usemin: {
html: 'public/index.html',
}
});

grunt.registerTask('build', [
'typings',
'ts',
'sass',
'handlebars',
//'bower_main',
'copy:html',
'copy:images',
'copy:audio',
'useminPrepare',
'concat:generated',
'cssmin:generated',
'uglify:generated',
// 'filerev',
'usemin'
]);
grunt.registerTask('default', ['bower_main', 'ts', 'sass', 'handlebars', 'watch']);
};
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
![logo](http://i.imgur.com/rKuTwCM.jpg)

[![Build status](https://ci.appveyor.com/api/projects/status/fcq8o3q7oj37imvw/branch/master?svg=true)](https://ci.appveyor.com/project/jjskuld/pokeease/branch/master)

# PokeEase
The Perfect GUI for Pokemon GO botting -- Work In Progress

New feature is adding day by date

FOR DEV

NPM INSTALL
GRUNT BUILD

<a href="https://discord.gg/Q9T2USY">
<img src="https://discordapp.com/api/guilds/213010121356214272/widget.png?style=banner2"/>
</a>
Expand Down
4 changes: 3 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
var express = require('express');
var port = process.env.PORT || 3000;
var app = express();
app.use(express.static(__dirname + '/src'));
app.set('case sensitive routing','false')
app.use(express.static(__dirname + '/public'))
console.log('server running at http://localhost:3000 .......')
app.listen(port);
Loading