Skip to content

Heart Gold Update + Platinum Hall of Fame #70

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

Open
wants to merge 71 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
28b7537
Badges
May 9, 2014
6f3aba3
Full HeartHold Update
May 24, 2014
c7eab05
Add Platinum Hall of Fame and E4 titles for images
May 24, 2014
c9d34e7
Proper foundation install.
Jun 6, 2014
302ba2c
HG Team Added.
Jun 6, 2014
e552650
Fix gruntfile.
hjc Jun 7, 2014
1fc7a86
CUSTOM BADGES!
Jun 7, 2014
8414982
Update CNAME
hjc Jun 8, 2014
122eddb
Final minor changes (there was a feedback link...)
hjc Jun 8, 2014
99fa12a
Add custom Blue badge
hjc Jun 8, 2014
1b944e1
Pokes + new e4.
hjc Jun 9, 2014
7bead8d
More pokes.
Jun 9, 2014
fc3e630
Integrate a little Envoy up in there for ya.
Jun 10, 2014
865f009
Lance down + Envoy test.
Jun 10, 2014
fb07b1b
I liked that last commit and don't like force pushing.
Jun 10, 2014
49ee705
Update static content.
hjc Jun 10, 2014
169bf00
YAY!!! WE EVOLVED LORD SKULL!!
Jun 11, 2014
5379f45
Merge branch 'master' of github.com:hjc1710/tpp
Jun 11, 2014
c6ebe8e
New lines for better Envoi printing.
Jun 12, 2014
af61253
Beat Alice! Highlight Sprite!
Jun 12, 2014
9749136
Merge branch 'feature-envoy-itegration'
Jun 12, 2014
0f58a77
WE BEAT ALICE!!!!!!!!! YAYAYAYAY!!!!
Jun 12, 2014
2ce47d1
.......I'm dumb.
Jun 12, 2014
7910999
My dear Helix... what is wrong with me today?
Jun 12, 2014
fb4309c
Add a lil' Pokemon B&W counter for ya.
Jun 13, 2014
6eb9f7b
Update time.
Jun 13, 2014
26c6956
POKEMON BLACK HERE WE COME!
hjc Jun 15, 2014
21d925a
......
hjc Jun 15, 2014
db02f83
Reddit live updater.
hjc Jun 15, 2014
cb16042
BYE BYE CRESS!
hjc Jun 15, 2014
eab4e42
SUCK IT LENORA!
Jun 16, 2014
01556d6
Badges + Pokes.
Jun 17, 2014
07429a7
SUCK IT ELESA AND CLAY!
Jun 19, 2014
4e0bcd2
Pokes.
Jun 21, 2014
d49b6e1
WOOOOOOOO 4/4 E4 DOWN!
Jun 26, 2014
f144518
Whoops, we didn't beat Alder yet...
Jun 26, 2014
b3163e4
...What is wrong with me today?
Jun 26, 2014
2a39cd5
I turned on my issue tracker, changed the link.
Jun 26, 2014
7aa0d2c
Wow... can't believe the save got deleted.
Jun 27, 2014
69c3e9b
Whoops, wrong level.
Jun 27, 2014
dbc30cb
Welcome to the HoF Black Team.
Jun 30, 2014
8429449
Revert "Whoops, wrong level."
Jun 30, 2014
ed38be5
Revert "Wow... can't believe the save got deleted."
Jun 30, 2014
c7d41b2
Setup for Pkmn Black 2 + update team in top right.
Jun 30, 2014
d6c94f9
????...
Jun 30, 2014
37cb80d
...No comment...
Jun 30, 2014
7df7d07
Update reddit live.
hjc Jul 6, 2014
4f45adc
Prepare for black 2.
hjc Jul 6, 2014
74cc711
No more counter.
hjc Jul 6, 2014
f781488
Badges + Pokes
Jul 8, 2014
173e2f1
I'm bad at updating the 'Updated at' time.
Jul 8, 2014
39c3a29
SUCK IT BURGH!!!!
Jul 9, 2014
1023a36
I hate moving pokemon images.
hjc Jul 9, 2014
8f45221
TRANQUILL EVVVOLLLVVVEEDDDD!!!!
Jul 9, 2014
80a30fc
Update poke levels.
Jul 9, 2014
c9442a4
GET REKT ELESA!!!
Jul 10, 2014
be21940
QUAKE BAADDDGGGEEE HYYPPPEEE
hjc Jul 13, 2014
34acbfc
JET BADGE HYYYYPPPEEEE!!!
Jul 15, 2014
8ec87ab
more savefiles
return Jul 18, 2014
7f1373e
4/4 E4 DOWN!!! ONLY CHAMP LEFT!!!
Jul 21, 2014
447aed0
......Should actually commit and push changes.
Jul 23, 2014
90227b5
X HYPE!!!!!!
hjc Jul 27, 2014
d183349
Figured out the E4 issue.
hjc Jul 27, 2014
c7aa9ec
Optimize E4 images, change E4 titles.
hjc Jul 27, 2014
6f0dd21
VIOLA DOWNNNN BITCHES!!!
Jul 28, 2014
e066894
I lied last time about Updated text... fixed.
Jul 28, 2014
6cc6881
GRANT DOWN!!!
Jul 28, 2014
fb9b757
Update badges.
Jul 30, 2014
dba655f
Added Black 2 save
return Jul 30, 2014
d865f06
....Its over.
Aug 1, 2014
fc4bf5e
Merge pull request #3 from return/master
hjc Aug 28, 2014
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
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "bower_components"
}
25 changes: 25 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
; http://editorconfig.org/
; Initial file copied from Symfony's .editorconfig found here:
; https://github.com/symfony/symfony/blob/master/.editorconfig

; top-most EditorConfig file
root = true

; Unix-style newlines and files end in a new line.
; Also the generic indent styles
[*]
end_of_line = LF
insert_final_newline = true
indent_style = space
indent_size = 4

; PHP is set explicitly because I care about it more than anything else in the
; entire project.
[*.php]
indent_style = space
indent_size = 4

; You're special
[*.less]
indent_style = space
indent_size = 2
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
*.swp
.idea/
*.DS_Store
/css/app.css
/css/*
/bower_components/*
/node_modules/*
/deploy/deploy.config.json
/vendor/*
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
twitchplayspokemon.net
tppkmn.net
43 changes: 43 additions & 0 deletions Envoy.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
@setup
//grab our deployment configuration
$config = json_decode(file_get_contents('./deploy/deploy.config.json'));

//we need a branch to pull, so see if we got a CLI argument, otherwise, use
// what's in the config file
$branch = isset($branch) ? $branch: $config->branch;
//like above, we need a remote to use, so first check CLI, then config, then
// just default to master. If that whole situation fails... eff you.
$remote = (isset($remote) ? $remote : (isset($config->remote) ? $config->remote : 'origin'));
@endsetup

@servers((array) $config->servers)

@task('build')
# task to build CSS and JS, generic task, but needs a proper path
# CD to project repo
cd '{{$config->deploy_path}}';


# build any new CSS
grunt build;
@endtask

@task('deploy')
# task to do the actual deploy
# CD to project repo
cd '{{$config->deploy_path}}';


# change branch
git checkout '{{ $branch }}';


# update files
git pull '{{$remote}}' '{{$branch}}';
@endtask

//a macro to marry the two tasks and deploy then build
@macro('deploy-prod', ['on' => 'prod'])
deploy
build
@endmacro
34 changes: 34 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),

sass: {
options: {
includePaths: ['bower_components/foundation/scss']
},
dist: {
options: {
outputStyle: 'compressed'
},
files: {
'css/app.css': 'static/scss/app.scss'
}
}
},

watch: {
grunt: { files: ['Gruntfile.js'] },

sass: {
files: 'static/scss/**/*.scss',
tasks: ['sass']
}
}
});

grunt.loadNpmTasks('grunt-sass');
grunt.loadNpmTasks('grunt-contrib-watch');

grunt.registerTask('build', ['sass']);
grunt.registerTask('default', ['build','watch']);
}
74 changes: 74 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# Install TPP

```shell
git pull origin master
apt-get install ruby1.9.1
gem install foundation
apt-get install nodejs
# May need to run the below
# apt-get install npm
npm install -g bower grunt-cli

# If you get an error about missing sources, update nodjes like so:
# apt-get purge nodejs npm
# apt-get install -y python-software-properties python g++ make
# sudo add-apt-repository ppa:chris-lea/node.js
# if the above command fails, use:
# apt-get install software-properties-common
# sudo apt-get update
# Now repeat the above npm steps.

# you need a local grunt
npm install grunt grunt-sass grunt-contrib-watch
bower install
grunt build

```



# Deploy TPP

First take `deploy/deploy.config.json.sample` and copy it to: `deploy/deploy.config.json`.
You should fill out the parameters that are in the sample file and populate them with your
info. Here's a run down of what needs to be in this JSON file (with comments):

```
{
//a hash of servers we can deploy to. The key is the name of the server within
// envoy and the value is the actual user and IP of the server we want to
// SSH into, so to deploy to the first server, YOU@YOUR_SERVER_IP_HERE, you
// would run a task 'on' "prod", like so: @task('x', ['on' => 'prod']).
// Each server is explained below
"servers": {
//when you run vendor/bin/envoy deploy-prod, this is the server it deploysd
// too
"prod": "YOU@YOUR_SERVER_IP_HERE",
//as above, but with deploy-stage
"stage": "YOU@YOUR_STAGE_SERVER_HERE"
},
//the path we should deploy to. Basically, where the site lives on the server
"deploy_path": "/var/www/tpp",
//the branch we should deploy
"branch": "master",
//the remote the branch should come from
"remote": "origin"
}
```

We use a **git based** deploy system, so having a remote and a branch already setup
on your deployment environment is **critical**. Once you've copied and renamed the
file, you need to install envoy:

```shell
curl -sS https://getcomposer.org/installer | php
php composer.phar install
```

Then deploy with:

```
vendor/bin/envoy run deploy-prod
```

You can specify a specific branch with `--branch` or a different remote with `--remote`.
6 changes: 6 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "twitch-plays-pokemon-io",
"dependencies": {
"foundation": "zurb/bower-foundation"
}
}
7 changes: 7 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "hjc1710/tpp",
"require" : {
"symfony/console": "2.4.6",
"laravel/envoy": "~1.0"
}
}
122 changes: 0 additions & 122 deletions css/custom.css

This file was deleted.

Loading