Merge pull request #8 from TairTidhar/gods-index

Gods index
TairTidhar · Nov 12, 2018 · 3f217b8 · 3f217b8
2 parents 1728691 + 8b137bc
commit 3f217b8
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 8 deletions.
diff --git a/app/controllers/gods_controller.rb b/app/controllers/gods_controller.rb
@@ -1,8 +1,6 @@
 class GodsController < ApplicationController
 	skip_before_action :authenticate_user!, only: :index
-	has_many :bookings
-	belongs_to :user
-
+
   def index
     @gods = God.all
   end

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
diff --git a/app/views/gods/index.html.erb b/app/views/gods/index.html.erb
@@ -0,0 +1,17 @@
+<!-- index.html.erb -->
+
+<!-- cocktail.html.erb -->
+<div class="container">
+  <div class="row">
+    <div class="col-xs-12 col-sm-10 col-sm-offset-1">
+      <h1>Here is the list of all the Gods</h1>
+      <ul class="list-group">
+        <% @gods.each do |god| %>
+          <li class="list-group-item">
+            <%= link_to god.name, god_path(god) %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+</div>
diff --git a/app/views/gods/show.html.erb b/app/views/gods/show.html.erb
@@ -0,0 +1,14 @@
+<!-- show.html.erb -->
+
+<div class="container">
+  <div class="row">
+    <div class="col-xs-12 col-sm-10 col-sm-offset-1">
+      <h1><%= @god.name %></h1>
+      <p><%= @god.location %></p>
+      <p><%= @god.description %></p>
+      <p><% @god.user.each do |god| %></p>
+        <%= user.name %>
+      <% end %>
+    </div>
+  </div>
+</div>
diff --git a/db/migrate/20181112070138_add_name_to_users.rb b/db/migrate/20181112070138_add_name_to_users.rb
@@ -0,0 +1,5 @@
+class AddNameToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :name, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_11_12_043710) do
+ActiveRecord::Schema.define(version: 2018_11_12_070138) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -44,6 +44,7 @@
     t.datetime "remember_created_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "name"
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end