Merge

@@ -113,6 +113,25 @@ table {
   }
   }
 }
 }
 
 
+// Admin
+.pools {
+  grid-template-columns: 2.5vw auto 2.5vw;
+}
+
+.admin-index {
+  grid-row: 2;
+  grid-column: 2;
+
+  th { text-align: left; }
+}
+
+.admin-pools {
+  grid-row: 2;
+  grid-column: 2;
+
+  th { text-align: left; } 
+}
+
 input[type="submit"] {
 input[type="submit"] {
   float: right;
   float: right;
   margin-top: 10px;
   margin-top: 10px;
@@ -130,6 +149,11 @@ input[type="submit"] {
   }
   }
 }
 }
 
 
+.group-form {
+  grid-row: 2;
+  grid-column: 2;
+}
+
 // Media Queries
 // Media Queries
 @media only screen and (max-width: 823px) {
 @media only screen and (max-width: 823px) {
   .container.application {
   .container.application {

@@ -2,8 +2,8 @@ class ApplicationController < HeimdallEngine::ApplicationController
   protect_from_forgery with: :exception
   protect_from_forgery with: :exception
 
 
   def root
   def root
-    @leaders = leaderboard
-    @upcoming_matches = check_matches
+    leaderboard
+    check_matches
     recent_matches
     recent_matches
     @results = check_results
     @results = check_results
   end
   end
@@ -21,19 +21,19 @@ class ApplicationController < HeimdallEngine::ApplicationController
   end
   end
 
 
   def check_matches
   def check_matches
-    Match.active.order(date: :ASC).limit(5)
+    @upcoming_matches =  Match.active.order(date: :ASC).limit(5)
                               .where('date > ?', Time.zone.now)
                               .where('date > ?', Time.zone.now)
   end
   end
 
 
+  def recent_matches
+    @recent_matches = Match.active.where.not(result: nil)
+      .order(:date).limit(5)
+  end
+
   def check_results
   def check_results
     return [] unless current_user
     return [] unless current_user
     current_user.bets.joins(:match).order('matches.date desc')
     current_user.bets.joins(:match).order('matches.date desc')
       .where.not(result: nil)
       .where.not(result: nil)
       .limit(5)
       .limit(5)
   end
   end
-
-  def recent_matches
-    @recent_matches = Match.active.where.not(result: nil)
-      .order(:date).limit(5)
-  end
 end
 end

-= simple_nested_form_for [:admin, @object] do |f|
+.group-form
+  h2
+    = "#{title} group"
+  = simple_nested_form_for [:admin, @object] do |f|
     = f.input :name
     = f.input :name
     = f.association :pool
     = f.association :pool
     = f.association :users
     = f.association :users

-div style='margin-top: 100px; width: 100%'
-  h2 New Group
-
-  = render 'form'
+= render 'form', title: 'New'

-= simple_nested_form_for [:admin, @object] do |f|
+.admin-pools
+  h2
+    = "#{title} Pool"
+  = simple_nested_form_for [:admin, @object] do |f|
     = f.input :name
     = f.input :name
     = f.input :editable_until
     = f.input :editable_until
     = f.input :active
     = f.input :active

-h2
-  | New Pool
-
-= render 'form'
+= render 'form', title: 'Edit'

-h2
+.admin-index
+  h2
     | Pools
     | Pools
     = link_to 'New Pool', new_admin_pool_path, style: 'float: right'
     = link_to 'New Pool', new_admin_pool_path, style: 'float: right'
 
 
-- attrs = %i[name editable_until active]
-table
+  - attrs = %i[name editable_until active]
+  table
     thead
     thead
       - attrs.each do |a|
       - attrs.each do |a|
         th = Pool.human_attribute_name(a)
         th = Pool.human_attribute_name(a)

-h2
-  | New Pool
-
-= render 'form'
+= render 'form', title: 'New'

@@ -24,6 +24,13 @@ ActiveRecord::Schema.define(version: 20180611152633) do
     t.integer "points"
     t.integer "points"
   end
   end
 
 
+  create_table "group_users", force: :cascade do |t|
+    t.integer "group_id"
+    t.integer "user_id"
+    t.index ["group_id"], name: "index_group_users_on_group_id", using: :btree
+    t.index ["user_id"], name: "index_group_users_on_user_id", using: :btree
+  end
+
   create_table "groups", force: :cascade do |t|
   create_table "groups", force: :cascade do |t|
     t.integer  "pool_id"
     t.integer  "pool_id"
     t.string   "name"
     t.string   "name"
@@ -32,13 +39,6 @@ ActiveRecord::Schema.define(version: 20180611152633) do
     t.index ["pool_id"], name: "index_groups_on_pool_id", using: :btree
     t.index ["pool_id"], name: "index_groups_on_pool_id", using: :btree
   end
   end
 
 
-  create_table "groups_users", force: :cascade do |t|
-    t.integer "group_id"
-    t.integer "user_id"
-    t.index ["group_id"], name: "index_groups_users_on_group_id", using: :btree
-    t.index ["user_id"], name: "index_groups_users_on_user_id", using: :btree
-  end
-
   create_table "heimdall_engine_role_abilities", force: :cascade do |t|
   create_table "heimdall_engine_role_abilities", force: :cascade do |t|
     t.integer  "role_id"
     t.integer  "role_id"
     t.string   "key"
     t.string   "key"