From 3dd7b333632ef9c9af36a7bca92e7c6601b0e23a Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 23 May 2018 16:13:24 -0400 Subject: [PATCH] change rooms#index to rooms#show --- app/controllers/rooms_controller.rb | 5 +++-- config/routes.rb | 6 +++--- db/seeds.rb | 10 ---------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index 843665e5..df4214c4 100644 --- a/app/controllers/rooms_controller.rb +++ b/app/controllers/rooms_controller.rb @@ -4,7 +4,7 @@ class RoomsController < ApplicationController skip_before_action :verify_room_ownership, only: [:show, :join, :wait] # GET /r/:room_uid - def index + def show opts = default_meeting_options if @meeting.is_running? @@ -63,7 +63,7 @@ class RoomsController < ApplicationController end end - # GET /r/:room_uid/wait + # GET/POST /r/:room_uid/wait def wait if @meeting.is_running? if current_user @@ -84,6 +84,7 @@ class RoomsController < ApplicationController # GET /r/:room_uid/sessions def sessions + end private diff --git a/config/routes.rb b/config/routes.rb index a524aaf8..e381b8f7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,10 +3,10 @@ Rails.application.routes.draw do # Room routes. scope '/r/:room_uid' do get '/', to: 'rooms#show', as: :room - match '/start', to: 'rooms#start', as: :start_room, via: [:get, :post] - match '/join', to: 'rooms#join', as: :join_room, via: [:get, :post] + get '/start', to: 'rooms#start', as: :start_room + get '/join', to: 'rooms#join', as: :join_room match '/wait', to: 'rooms#wait', as: :wait_room, via: [:get, :post] - match '/logout', to: 'rooms#logout', as: :logout_room, via: [:get, :post] + get '/logout', to: 'rooms#logout', as: :logout_room get '/sessions', to: 'rooms#sessions', as: :sessions end diff --git a/db/seeds.rb b/db/seeds.rb index 055a93de..1beea2ac 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,13 +5,3 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) - -User.create( - provider: "greenlight", - name: "Test User", - uid: "someuid", - username: "testuser", - email: "test@user.com", - password: "password", - password_confirmation: "password", -) \ No newline at end of file