Skip to content

Commit 5da77f2

Browse files
committed
replacing and prolevel
1 parent c5c45ca commit 5da77f2

File tree

9 files changed

+30
-18
lines changed

9 files changed

+30
-18
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ config/ey_services_config_local.yml
3333
config/secrets.yml
3434
config/s3.yml
3535
config/initializers/recaptcha.rb
36-
36+
config/.routes.rb.swp
3737
# Ignore production config magic
3838
cookbooks
3939

app/controllers/payment_controller.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ def paypal_ipn
2828

2929
# notify = Paypal::Notification.new(request.raw_post)
3030

31-
if params['txn_type'] == 'subscr_signup'
31+
# TODO SKLETT PRO IS FREE CHANGE THIS LATER
32+
if true || params['txn_type'] == 'subscr_signup'
3233

3334
user = User.find(params['custom'].to_i)
3435

app/controllers/replays_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ def drop
2828

2929
# welcome GGTracker partner
3030
params[:channel] = params[:token]
31-
32-
elsif current_user.nil? || !current_user.pro?
31+
# TODO SKLETT remove false to enable PRO subscriptions
32+
elsif false || current_user.nil? || !current_user.pro?
3333

3434
xml = Builder::XmlMarkup.new(indent: 2)
3535
xml.instruct!

app/views/devise/registrations/edit.html.erb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,21 @@
33
<h2 class="first">Your Battle.Net Account</h2>
44
<%= render 'accounts' %>
55

6-
<% if current_user.pro? %>
6+
<% if false %>
7+
78
<h2>GGTracker Pro Auto-uploader</h2>
89
<ol class="instructions">
910
<li>Download the auto-uploader: <a class="action button" href="https://s3.amazonaws.com/auto-uploader/ggtracker+uploader.zip">download</a></li>
1011
<li>Unzip it and start the version appropriate to your operating system.</li>
1112
<li>Click the Choose... button and pick a directory. The auto-uploader will watch that directory and its subdirectories for new replays.</li>
1213
<li>Paste this code: <span class="token"><%= current_user.access_token %></span> into the Upload key field in the Auto-uploader window.</li>
1314
<li>Play Starcraft! The auto-uploader will watch for any new replays and upload them to GGTracker.</li>
15+
<% end %>
16+
17+
18+
<% if true %>
19+
20+
1421
</ol>
1522

1623
<h2>SC2Gears Auto-uploader Plugin</h2>

app/views/home/_go_pro.html

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
<p>GGTracker Pro gets you:
1+
<p>GGGReplays Pro gets you:
22
<br><br>
33
<ul class="instructions">
4-
<li>replay auto-uploader program<a href class="ggtipper2 tiny" style="vertical-align:super" title="Windows and Mac!">*</a></li>
54
<li>sc2gears auto-upload<a href="https://twitter.com/Dougcope" class="ggtipper2 tiny" style="vertical-align:super" title="thanks to Doug Copestake">*</a></li>
65
<li>multiple battle.net accounts</li>
76
<li>unlimited web replay uploads</li>
8-
<li>a <span class="tooltipped icon icon-star-32"></span> on your GGTracker profile</li>
9-
<li>your clan logo or graphic on your GGTracker profile if you want</li>
7+
<li>a <span class="tooltipped icon icon-star-32"></span> on your GGGReplays profile</li>
8+
<li>your clan logo or graphic on your GGGReplays profile if you want</li>
109
<li>the satisfaction of knowing you're making eSports more awesome</li>
1110
<br>
1211
<li>private replays? <span class="tiny">if you would like this, let me know and I will add the capability to the site.</span></li>
1312
</ul>
1413
</p>
1514
<br><br>
1615
<p>
17-
It's $5/month, <a class="action button" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=Q4LPUP7WZQ3ZE&<% if current_user.present? %>custom=<%= current_user.id %><% end %>">sign up for GGTRACKER PRO</a></li>
16+
<% if false %>
17+
It's $5 for one month, <a class="action button" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=88MLJG4NCAELL&<% if current_user.present? %>custom=<%= current_user.id %><% end %>">sign up for GGGReplays PRO</a></li>
18+
<% end %>
1819
</p>
1920
<br><br><br><br><br><br><br>
20-
<p class="small">Players who are currently Grandmaster are entitled to GGTracker Pro for free. Just email dsjoerg at ggtracker dot com or <a href="http://twitter.com/GGGReplays_SC2">tweet</a>.</p><br>
21-
<p class="small">We also offer an <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3QMACJDPHS4EL&custom=<% if current_user.present? %>custom=<%= current_user.id %><% end %>">Annual Subscription</a> for $40/year.</p><br>
21+
<p class="small">Players who are currently Grandmaster are entitled to GGGReplays Pro for free. Just email us at [email protected] or <a href="http://twitter.com/GGGReplays_SC2">tweet</a>.</p><br>
22+
<!-- https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=88MLJG4NCAELL -->
23+
<!--p class="small">We also offer an <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=88MLJG4NCAELL&custom=<% if current_user.present? %>custom=<%= current_user.id %><% end %>">Annual Subscription</a> for $40/year.</p><br-->
2224
<p class="small">If GGTracker Pro isn't for you, you can still help by telling three friends. &nbsp;&nbsp; (Hat tip <a href="http://www.twitch.tv/tumescentpie">TumescentPie</a>)</p>

app/views/home/home.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<% content_for(:head) do %>
2-
<title>GGTracker</title>
2+
<title>GGGReplays</title>
33
<meta name="Description" content="Get better faster. Upload your Starcraft II replays here. Charts and stats you can't get anywhere else.">
44
<% end %>
55

@@ -30,7 +30,7 @@
3030
<% end %>
3131

3232
<div class="box">
33-
<h3 class="large">Are you new to GGTracker?</h3>
33+
<h3 class="large">Are you new to GGGReplays?</h3>
3434

3535
<div class="button-upload">
3636
<input type="file" name="file" multiple/>

app/views/home/terms.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Breach
111111
<h2>Survival</h2>
112112
<p>The following sections shall survive any termination or expiration of this Agreement and any termination, suspension, expiration or cancelation of your account with us: Password, Right to Refuse Service, Restricted Activities, Intellectual Property, Breach, Privacy, No Warranty, Liability Limit, Indemnity, No Guarantees, Legal Compliance, Severability, No Agency, and Governing Law.</p>
113113
<h2>Notices</h2>
114-
<p>Except as expressly stated in this Agreement, any notices you send to ggtracker, incorporated shall be given by e-mail to [email protected], or by postal mail to 537 2nd Street, Brooklyn NY 11215. You agree to accept notices sent to you at the email address you provided to us during the registration process, or as you may update it from time to time. Notice shall be deemed given 24 hours after email is sent, unless the sending party is notified that the email address is invalid. Notice sent by postal mail shall be deemed given three (3) days after the date of mailing.</p>
114+
<p>Except as expressly stated in this Agreement, any notices you send to ggtracker, incorporated shall be given by e-mail to [email protected], or by postal mail to Soeren Klett, Schoenebergerstr.19, 33619 Bielefeld, Germany. You agree to accept notices sent to you at the email address you provided to us during the registration process, or as you may update it from time to time. Notice shall be deemed given 24 hours after email is sent, unless the sending party is notified that the email address is invalid. Notice sent by postal mail shall be deemed given three (3) days after the date of mailing.</p>
115115
<h2>Controlling Terms</h2>
116116
<p>This Agreement and those additional terms and conditions and policies referenced herein represent the complete agreement and understanding with respect to the subject matter of this Agreement. Different or additional terms or conditions in any prior or subsequent communication (whether by email or any other form of communication) shall not add to, modify, or otherwise change the terms and conditions of this Agreement.</p>
117117
<p></p>

app/views/home/tour.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<% content_for(:head) do %>
2-
<title>GGTracker</title>
2+
<title>GGGReplays</title>
33
<meta name="Description" content="Track your Starcraft 2 stats so you can get better faster. Spending Skill, race-specific macro, army composition and more.">
44
<% end %>
55

app/views/layouts/application.html.erb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ _\%_____/\%_____/\%_____/\%_/ /\%___fx/\%_____/\__/ /\%_____/\__/ /.com_
119119

120120
<a id="logo" class="logo logo20" target="_self" href="/">
121121
<% if !Rails.env.production? %>
122-
<em>gg</em><%= Rails.env %>
122+
<em>ggg</em>replays
123123
<% else %>
124-
<em>gg</em>tracker
124+
<em>ggg</em>replays
125125
<% end %>
126126
</a>
127127

@@ -228,6 +228,7 @@ _\%_____/\%_____/\%_____/\%_/ /\%___fx/\%_____/\__/ /\%_____/\__/ /.com_
228228

229229

230230
<% if !controller.is_a?(HomeController) %>
231+
<% if false %>
231232
<script type="text/javascript">
232233
var uvOptions = {};
233234
(function() {
@@ -237,5 +238,6 @@ _\%_____/\%_____/\%_____/\%_/ /\%___fx/\%_____/\__/ /\%_____/\__/ /.com_
237238
})();
238239
</script>
239240
<% end %>
241+
<% end %>
240242
</body>
241243
</html>

0 commit comments

Comments
 (0)