Skip to content

Run ggtracker in Vagrant #20

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

Merged
dsjoerg merged 4 commits into from
Apr 15, 2016
Merged

Run ggtracker in Vagrant #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59a0b24
Run ggtracker in Vagrant.
nickelsen Apr 11, 2016
1d76d0c
Foreman is needed to run the webapp.
nickelsen Apr 12, 2016
2a6661b
Buckets are permanently redirected to specific endpoints.
nickelsen Apr 13, 2016
e58f37f
Merge pull request #1 from dsjoerg/master
nickelsen Apr 13, 2016
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
4 changes: 3 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'rails', '3.2.22'

gem 'mysql2'

gem 'unicorn', '1.1.5'
gem 'unicorn'

# Gems used only for assets and not required
# in production environments by default.
Expand Down Expand Up @@ -145,3 +145,5 @@ gem 'activemerchant'

gem 'rack-attack'
gem 'unf_ext', '0.0.6'

gem 'foreman'
15 changes: 12 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ GEM
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.0)
foreman (0.78.0)
thor (~> 0.19.1)
formtastic (2.2.1)
actionpack (>= 3.0)
gon (4.1.1)
Expand All @@ -157,6 +159,7 @@ GEM
json (1.8.3)
juggernaut (2.1.1)
redis
kgio (2.10.0)
listen (1.1.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
Expand Down Expand Up @@ -213,6 +216,7 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.16.0)
rake (10.4.2)
rb-fsevent (0.9.3)
rb-inotify (0.9.2)
Expand Down Expand Up @@ -282,8 +286,9 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.6)
unicorn (1.1.5)
rack
unicorn (5.1.0)
kgio (~> 2.6)
raindrops (~> 0.7)
uuidtools (2.1.4)
vegas (0.1.11)
rack (>= 1.0.0)
Expand All @@ -310,6 +315,7 @@ DEPENDENCIES
ey_config
factory_girl_rails (~> 4.0)
faker
foreman
formtastic
gg!
gon
Expand All @@ -332,4 +338,7 @@ DEPENDENCIES
simplecov
uglifier (>= 1.0.3)
unf_ext (= 0.0.6)
unicorn (= 1.1.5)
unicorn

BUNDLED WITH
1.11.2
4 changes: 2 additions & 2 deletions app/views/matches/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<% if @match.map_url.present? || @match.map["s2ma_hash"].present? %>
<div class="last map block">
<% if [email protected]_url || @match.map_url.blank? %>
<img class="minimap" height="90" src="http://s3.amazonaws.com/<%= Rails.configuration.s3['minimaps']['bucket'] %>/<%= @match.map["s2ma_hash"] %>_100.png" />
<img class="minimap" height="90" src="http://<%= Rails.configuration.s3['minimaps']['bucket'] %>.s3.amazonaws.com/<%= @match.map["s2ma_hash"] %>_100.png" />
<% else %>
<img src="<%= @match.map_url %>"/>
<% end %>
Expand Down Expand Up @@ -62,7 +62,7 @@
<div class="top">
<%= render 'shared/sidebarad' %>

<matchmap data-framee="current_framee" data-minimapurl="http://s3.amazonaws.com/<%= Rails.configuration.s3['minimaps']['bucket'] %>/<%= @match.map["s2ma_hash"] %>_100.png" data-match="match"></matchmap>
<matchmap data-framee="current_framee" data-minimapurl="http://<%= Rails.configuration.s3['minimaps']['bucket'] %>.s3.amazonaws.com/<%= @match.map["s2ma_hash"] %>_100.png" data-match="match"></matchmap>
<a href class="ggtipper2" title="Total army strength in minerals + gas throughout the game.<br><br>Move your mouse over the chart to see what was in each army at any point in the game.<br><br>Click and drag to zoom.<br><br>Click on the chart to freeze that time selection." data-gravity="nw">
<span class="title lefty">army strength, minerals + gas</span>
</a>
Expand Down