Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:elpassion/elranks

  • Loading branch information...
commit 68f62cd2f94804297ce5a9f675929b56da7b8fbc 2 parents 82015b0 + 5b8ef80
@aserafin aserafin authored
View
1  Gemfile
@@ -42,6 +42,7 @@ gem 'letter_opener', :group => :development
group :production do
gem 'postmark-rails', '~> 0.5.2'
+ gem 'rails_12factor'
end
gem 'angularjs-rails'
View
6 Gemfile.lock
@@ -186,6 +186,11 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.1)
sprockets-rails (~> 2.0.0)
+ rails_12factor (0.0.2)
+ rails_serve_static_assets
+ rails_stdout_logging
+ rails_serve_static_assets (0.0.1)
+ rails_stdout_logging (0.0.3)
railties (4.0.1)
actionpack (= 4.0.1)
activesupport (= 4.0.1)
@@ -287,6 +292,7 @@ DEPENDENCIES
postmark-rails (~> 0.5.2)
pry
rails (= 4.0.1)
+ rails_12factor
rspec-rails
sass-rails (~> 4.0.0)
sdoc
View
4 app/assets/stylesheets/main.css.scss
@@ -102,6 +102,10 @@ h1 {
float: right;
margin-top: 10px;
+ .loginbutton {
+ background-color: #299d4d;
+ border-color: #299d4d;
+ }
.caret {
margin-left: 5px;
View
4 app/views/layouts/_navbar.html.slim
@@ -1,6 +1,6 @@
header.navbar.navbar-inverse.navbar-fixed-top
.container
- a( href='/' title='Best Fifa League... in the world. - EA.com' )
+ a( href='/' title='Return Home' )
h1.logo El Ranks
@@ -17,4 +17,4 @@ header.navbar.navbar-inverse.navbar-fixed-top
- else
- = link_to "Login", "/auth/google", class: 'btn btn-primary'
+ = link_to "Login", "/auth/google", class: 'btn btn-primary loginbutton'
View
5 app/views/layouts/application.html.erb
@@ -1,9 +1,9 @@
<!DOCTYPE html>
<html>
<head>
- <title>Elranks</title>
+ <title>El Ranks - The Best FIFA League In The World</title>
<%= stylesheet_link_tag "application", media: "all" %>
- <%= javascript_include_tag "application" %>
+
<%= csrf_meta_tags %>
</head>
<body ng-app="MyApp">
@@ -12,5 +12,6 @@
<%= yield %>
+<%= javascript_include_tag "application" %>
</body>
</html>
View
4 app/views/matches/new.html.slim
@@ -3,8 +3,8 @@
.hometeam
img(ng-src="{{logoUrl(home.team_id)}}" ng-show="home.team_id" width="60" height="37")
.score
- input(type='number' step="1" min="0" ng-model="home.score" autofocus)
- input(type='number' step="1" min="0" ng-model="away.score")
+ input(type='text' step="1" min="0" placeholder="0" value="" ng-model="home.score" autofocus)
+ input(type='text' step="1" min="0" placeholder="0" value="" ng-model="away.score")
.awayteam
img(ng-src="{{logoUrl(away.team_id)}}" ng-show="away.team_id" width="60" height="37")
View
2  app/views/welcome/index.html.slim
@@ -24,7 +24,7 @@ section.table.standings
span.award
= idx + 1
td.avatar
- = image_tag rating.player.avatar_url, size: '48'
+ = image_tag rating.player.avatar_url, size: '48', alt: "#{rating.player.name}'s avatar"
td.playername
= rating.player.name
View
2  config/environments/production.rb
@@ -20,7 +20,7 @@
# config.action_dispatch.rack_cache = true
# Disable Rails's static asset server (Apache or nginx will already do this).
- config.serve_static_assets = false
+ config.serve_static_assets = true
# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
View
3  db/schema.rb
@@ -13,6 +13,9 @@
ActiveRecord::Schema.define(version: 20140103111522) do
+ # These are extensions that must be enabled in order to support this database
+ enable_extension "plpgsql"
+
create_table "competitors", force: true do |t|
t.integer "match_id", null: false
t.integer "player_id", null: false
Please sign in to comment.
Something went wrong with that request. Please try again.