Add alot of Jon's mistakes

georgebabayan · georgebabayan · Feb 15, 2017 · Feb 15, 2017 · Feb 15, 2017 · Feb 15, 2017
commit 3157bde1f221fefafa7c4da1a9653e3a36f6f943
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
@@ -0,0 +1,17 @@
+class GamesController < ApplicationController
+	def index
+		@games = Game.all
+	end
+
+	def show
+		@game = Game.find(params[:id])
+		@messages = @game.conversation.messages
+		@message = Message.new
+
+	end
+
+	def new
+		@message = Message.new
+	end
+
+end
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
@@ -0,0 +1,13 @@
+class MessagesController < ApplicationController
+  def new
+    @message = Message.new
+  end
+
+  def create
+    @message = Message.new(params[:message][:text], user: current_user, conversation: params[:game])
+
+    if @message.save
+      redirect_to "/games/1"
+    end
+  end
+end
diff --git a/app/controllers/rounds_controller.rb b/app/controllers/rounds_controller.rb
diff --git a/app/controllers/sides_controller.rb b/app/controllers/sides_controller.rb
@@ -0,0 +1,6 @@
+class SidesController < ApplicationController
+	def index
+		@side = Side.first
+		@board = @side.board
+	end
+end
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
@@ -1,7 +1,6 @@
 class StaticController < ApplicationController
 	def homepage
-		@round = Round.first
-		@board = @round.board.to_a
+		@side = Side.first
+		@board = @side.board.to_a
 	end
 end
-
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -32,9 +32,9 @@ def update
   end
 
   def destroy
-      @user.destroy
-      redirect_to root_path
-    end
+    @user.destroy
+    redirect_to root_path
+  end
 
   private
 

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,2 +1,3 @@
 module ApplicationHelper
+  include SessionsHelper
 end
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
@@ -0,0 +1,5 @@
+class Conversation < ApplicationRecord
+  has_many :messages
+  has_many :users, through: :messages
+  belongs_to :game 
+end
diff --git a/app/models/game.rb b/app/models/game.rb
@@ -3,4 +3,5 @@ class Game < ApplicationRecord
 	has_many :users, through: :rounds
 	belongs_to :winner, class_name: "User", foreign_key: "winner_id"
 	belongs_to :loser, class_name: "User", foreign_key: "loser_id"
+	has_one :conversation
 end
diff --git a/app/models/message.rb b/app/models/message.rb
@@ -0,0 +1,4 @@
+class Message < ApplicationRecord
+  belongs_to :conversation
+  belongs_to :user
+end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -2,6 +2,7 @@ class User < ApplicationRecord
 	has_secure_password
 	has_many :games
 	has_many :sides
+	has_many :messages
 
 	validates :username, presence: true
 	validates :username, uniqueness: true

diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb
@@ -0,0 +1,8 @@
+<h1> GAME ! </h1>
+
+
+<% @games.each do |game| %>
+  <%= game.name %>
+  <%= game.created_at %>
+  <a href="/games/<%= game.id %>"> click me </a>
+<% end %>
diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb
@@ -0,0 +1,20 @@
+<h1> SHOW ! </h1>
+
+
+<div>
+  <% @messages.each do |message|  %>
+      <%= message.text %>
+  <% end %>
+</div>
+
+<div class="form">
+  <%= form_for @message do |f| %>
+    <%= f.label :text %><br>
+    <%= f.text_field :text %><br>
+    <% f.hidden @game %><br>
+
+    <br>
+    <%= f.submit %>
+    <% end %>
+
+</div>
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,6 +1,10 @@
 Rails.application.routes.draw do
 
   resources :users
+  resources :games
+  resources :messages
+
+
 
   get '/login', to: 'sessions#new', as: 'login'
   post '/login', to: 'sessions#create'

diff --git a/db/migrate/20170216215849_create_conversations.rb b/db/migrate/20170216215849_create_conversations.rb
@@ -0,0 +1,9 @@
+class CreateConversations < ActiveRecord::Migration[5.0]
+  def change
+    create_table :conversations do |t|
+
+      t.references :game, foreign_key: true
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20170216221541_create_messages.rb b/db/migrate/20170216221541_create_messages.rb
@@ -0,0 +1,11 @@
+class CreateMessages < ActiveRecord::Migration[5.0]
+  def change
+    create_table :messages do |t|
+      t.string :text
+      t.references :user, foreign_key: true
+      t.references :conversation, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20170216222106_add_game_name_to_games.rb b/db/migrate/20170216222106_add_game_name_to_games.rb
@@ -0,0 +1,5 @@
+class AddGameNameToGames < ActiveRecord::Migration[5.0]
+  def change
+    add_column :games, :name, :string 
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -0,0 +1,75 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20170216222106) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "conversations", force: :cascade do |t|
+    t.integer  "game_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["game_id"], name: "index_conversations_on_game_id", using: :btree
+  end
+
+  create_table "games", force: :cascade do |t|
+    t.integer  "winner_id"
+    t.integer  "loser_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string   "name"
+  end
+
+  create_table "messages", force: :cascade do |t|
+    t.string   "text"
+    t.integer  "user_id"
+    t.integer  "conversation_id"
+    t.datetime "created_at",      null: false
+    t.datetime "updated_at",      null: false
+    t.index ["conversation_id"], name: "index_messages_on_conversation_id", using: :btree
+    t.index ["user_id"], name: "index_messages_on_user_id", using: :btree
+  end
+
+  create_table "sides", force: :cascade do |t|
+    t.integer  "user_id"
+    t.text     "board"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer  "game_id"
+    t.index ["game_id"], name: "index_sides_on_game_id", using: :btree
+    t.index ["user_id"], name: "index_sides_on_user_id", using: :btree
+  end
+
+  create_table "stages", force: :cascade do |t|
+    t.integer  "game_id"
+    t.text     "player1_move"
+    t.text     "player2_move"
+    t.datetime "created_at",   null: false
+    t.datetime "updated_at",   null: false
+    t.index ["game_id"], name: "index_stages_on_game_id", using: :btree
+  end
+
+  create_table "users", force: :cascade do |t|
+    t.string   "username"
+    t.string   "password_digest"
+    t.datetime "created_at",      null: false
+    t.datetime "updated_at",      null: false
+  end
+
+  add_foreign_key "conversations", "games"
+  add_foreign_key "messages", "conversations"
+  add_foreign_key "messages", "users"
+  add_foreign_key "sides", "games"
+  add_foreign_key "sides", "users"
+  add_foreign_key "stages", "games"
+end