From 2268238369ad90cecc5f1e612ba17327bd978152 Mon Sep 17 00:00:00 2001 From: sklett Date: Mon, 20 Nov 2017 15:12:13 +0100 Subject: [PATCH 01/10] contributors --- CONTRIBUTORS.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 81d8718..283ad9e 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -1,6 +1,8 @@ Contributors: - David Joerg - @dsjoerg on github - Marian Rudzynski - @fx on github +new: Soeren Klett - @sklett-src on github + +# David Joerg - @dsjoerg on github +# Marian Rudzynski - @fx on github Special thanks to Blizzard for their help and participation. From ad04d1981d8d6ac7ab7baa12b8fd6d885a9466b8 Mon Sep 17 00:00:00 2001 From: Soeren Klett Date: Fri, 24 Nov 2017 13:56:39 +0100 Subject: [PATCH 02/10] init gggreplays --- .gitignore | 2 ++ Procfile | 2 +- app/assets/javascripts/angular.js | 10 +++++++++- app/mailers/problem_mailer.rb | 4 ++-- app/mailers/report_mailer.rb | 6 +++--- app/mailers/welcome_mailer.rb | 2 +- app/views/home/_go_pro.html | 2 +- app/views/home/_hiring.html | 6 +++--- app/views/home/credits.html.erb | 4 ++-- app/views/home/developers.html | 2 +- app/views/home/faq.html | 2 +- app/views/home/faq_deutsch.html | 2 +- app/views/home/replay_problems.html.erb | 2 +- app/views/home/terms.html.erb | 2 +- app/views/home/you_are_pro.html.erb | 2 +- app/views/layouts/application.html.erb | 2 +- config/app.development.vcl | 4 ++-- config/database.yml | 4 ++-- config/initializers/abstract_mysql2_adapter.rb | 3 +++ config/initializers/recaptcha.rb | 4 ++-- testacular.conf.js | 2 +- 21 files changed, 41 insertions(+), 28 deletions(-) create mode 100644 config/initializers/abstract_mysql2_adapter.rb diff --git a/.gitignore b/.gitignore index dd484e8..cfcaa28 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ # Ignore all logfiles and tempfiles. /log/*.log /tmp +nohup.out # Ignore emacs poop *~ @@ -31,6 +32,7 @@ coverage config/ey_services_config_local.yml config/secrets.yml config/s3.yml +config/initializers/recaptcha.rb # Ignore production config magic cookbooks diff --git a/Procfile b/Procfile index 45763c9..feaf8d3 100644 --- a/Procfile +++ b/Procfile @@ -1,3 +1,3 @@ -web: bundle exec unicorn -p3000 +web: bundle exec unicorn -p80 log: tail -f -n0 log/development.log juggernaut: juggernaut --port 5300 diff --git a/app/assets/javascripts/angular.js b/app/assets/javascripts/angular.js index 44353f4..7bfb927 100644 --- a/app/assets/javascripts/angular.js +++ b/app/assets/javascripts/angular.js @@ -85,7 +85,15 @@ gg.run(['$rootScope', '$window', '$http', function($rootScope, $window, $http) { $window.gg.state.apply(false); }, true); - gg.settings.api_host = ($window.gon != undefined) ? $window.gon.global.api_host : '127.0.0.1:9292'; +console.log('angular.js !#! : window.gon, window.gon.global.api_host') +console.log($window.gon != undefined) +console.log($window.gon.global.api_host) + +// TODO SKLETT DANGEROUS WORKAROUND + gg.settings.api_host = ($window.gon != undefined) ? 'gggreplays.com:9292' : 'gggreplays.com:9292'; +// gg.settings.api_host = ($window.gon != undefined) ? $window.gon.global.api_host : '127.0.0.2:9292'; + + // Finally, just default window.gon to an empty object if it's not defined. if(typeof $window.gon == 'undefined') diff --git a/app/mailers/problem_mailer.rb b/app/mailers/problem_mailer.rb index a675626..fea140f 100644 --- a/app/mailers/problem_mailer.rb +++ b/app/mailers/problem_mailer.rb @@ -1,8 +1,8 @@ class ProblemMailer < ActionMailer::Base - default :from => "dsjoerg@ggtracker.com" + default :from => "gggreplays@gmail.com" def simple_problem(subject, problem) @problem = problem - mail(:to => 'dsjoerg@ggtracker.com', :subject => subject) + mail(:to => 'gggreplays@gmail.com', :subject => subject) end end diff --git a/app/mailers/report_mailer.rb b/app/mailers/report_mailer.rb index 22733c4..c08278c 100644 --- a/app/mailers/report_mailer.rb +++ b/app/mailers/report_mailer.rb @@ -1,11 +1,11 @@ class ReportMailer < ActionMailer::Base - default :from => "dsjoerg@ggtracker.com" + default :from => "gggreplays@gmail.com" def simple_report() - mail(:to => 'dsjoerg@ggtracker.com', :subject => "User report for #{Date.today()}") + mail(:to => 'gggreplays@gmail.com', :subject => "User report for #{Date.today()}") end def esdb_report() - mail(:to => 'dsjoerg@ggtracker.com', :subject => "ESDB report for #{Date.today()}") + mail(:to => 'gggreplays@gmail.com', :subject => "ESDB report for #{Date.today()}") end end diff --git a/app/mailers/welcome_mailer.rb b/app/mailers/welcome_mailer.rb index 211d6fc..1a46684 100644 --- a/app/mailers/welcome_mailer.rb +++ b/app/mailers/welcome_mailer.rb @@ -1,5 +1,5 @@ class WelcomeMailer < ActionMailer::Base - default :from => "dsjoerg@ggtracker.com" + default :from => "gggreplays@gmail.com" def welcome_buddy(user) mail(:to => user.email, :subject => "Welcome to GGTracker") diff --git a/app/views/home/_go_pro.html b/app/views/home/_go_pro.html index 43c85a5..da316b7 100644 --- a/app/views/home/_go_pro.html +++ b/app/views/home/_go_pro.html @@ -17,6 +17,6 @@ It's $5/month, sign up for GGTRACKER PRO








-

Players who are currently Grandmaster are entitled to GGTracker Pro for free. Just email dsjoerg at ggtracker dot com or tweet.


+

Players who are currently Grandmaster are entitled to GGTracker Pro for free. Just email dsjoerg at ggtracker dot com or tweet.


We also offer an Annual Subscription for $40/year.


If GGTracker Pro isn't for you, you can still help by telling three friends.    (Hat tip TumescentPie)

diff --git a/app/views/home/_hiring.html b/app/views/home/_hiring.html index 51ab11a..e2e2435 100644 --- a/app/views/home/_hiring.html +++ b/app/views/home/_hiring.html @@ -6,7 +6,7 @@ Now we're building a next-generation automated coaching system, starting with StarCraft.

-APPLY VIA EMAIL +APPLY VIA EMAIL



@@ -54,7 +54,7 @@


-OK, this is interesting, let's email +OK, this is interesting, let's email



@@ -70,7 +70,7 @@

Who is this David Joerg guy.
-I'm GGTracker's founder, David Joerg (linkedin). I got my Computer Science degree from Harvard. Ten years ago I joined a small team to build what is now a top automated trading firm. Before that, I co-founded an award-winning venture-backed mobile city guide company. The Kansas City Barbeque Society certified me as a judge in 2007. I used to play keyboards for Levi K and the Robotics. My wife and two kids and I live in Brooklyn. +GGTracker's founder, David Joerg (linkedin). I got my Computer Science degree from Harvard. Ten years ago I joined a small team to build what is now a top automated trading firm. Before that, I co-founded an award-winning venture-backed mobile city guide company. The Kansas City Barbeque Society certified me as a judge in 2007. I used to play keyboards for Levi K and the Robotics. My wife and two kids and I live in Brooklyn.



diff --git a/app/views/home/credits.html.erb b/app/views/home/credits.html.erb index aa02c8a..bbf7e18 100644 --- a/app/views/home/credits.html.erb +++ b/app/views/home/credits.html.erb @@ -6,7 +6,7 @@
-

Development:
David Joerg (@dsjoerg)
Marian Rudzynski (@effekt, Master of the Universe)

+

Development:
David Joerg (@dsjoerg)
Marian Rudzynski (@effekt, Master of the Universe)

Design: Bernat Fortet

sc2reader library: Graylin Kim

Auto-uploader: András Belicza

@@ -15,7 +15,7 @@

Some icons: iconmonstr

A great many Starcraft-related images: Blizzard Entertainment



-

If you live near New York City and you love to code, maybe you should work for GGTracker? Drop me a line.

+

If you live near New York City and you love to code, maybe you should work for GGTracker? Drop me a line.

diff --git a/app/views/home/developers.html b/app/views/home/developers.html index c7abd02..053614d 100644 --- a/app/views/home/developers.html +++ b/app/views/home/developers.html @@ -13,7 +13,7 @@

Also there is an API.

-

Have a question? Email me at dsjoerg@ggtracker.com or tweet @ggtracker.

+

Have a question? Email me at gggreplays@gmail.com or tweet @ggtracker.

diff --git a/app/views/home/faq.html b/app/views/home/faq.html index f6bb65e..4ccbd74 100644 --- a/app/views/home/faq.html +++ b/app/views/home/faq.html @@ -42,7 +42,7 @@

Frequently Asked Questions

<% end %>

I have a question that's not listed here!

-

Email me at dsjoerg@ggtracker.com, I would be happy to help. Or tweet @ggtracker.

+

Email me at gggreplays@gmail.com, I would be happy to help. Or tweet @ggtracker.





Who's behind GGTracker?