forked from External/greenlight
		
	room resources
This commit is contained in:
		@@ -11,8 +11,13 @@ class RoomsController < ApplicationController
 | 
				
			|||||||
    room.user = current_user
 | 
					    room.user = current_user
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if room.save
 | 
					    if room.save
 | 
				
			||||||
      redirect_to room
 | 
					      if room_params[:auto_join] == "1"
 | 
				
			||||||
 | 
					        redirect_to start_room_path(room)
 | 
				
			||||||
 | 
					      else
 | 
				
			||||||
 | 
					        redirect_to room
 | 
				
			||||||
 | 
					      end
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
 | 
					      # Handle room didn't save.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
@@ -45,6 +50,13 @@ class RoomsController < ApplicationController
 | 
				
			|||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  # DELETE /r/:room_uid
 | 
				
			||||||
 | 
					  def destroy
 | 
				
			||||||
 | 
					    @room.destroy
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    redirect_to root_path
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # GET /r/:room_uid/start
 | 
					  # GET /r/:room_uid/start
 | 
				
			||||||
  def start
 | 
					  def start
 | 
				
			||||||
    # Join the user in and start the meeting.
 | 
					    # Join the user in and start the meeting.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,7 +38,6 @@
 | 
				
			|||||||
      <% if current_user %>
 | 
					      <% if current_user %>
 | 
				
			||||||
        <%= render "shared/modals/create_room_modal" %>
 | 
					        <%= render "shared/modals/create_room_modal" %>
 | 
				
			||||||
      <% end %>
 | 
					      <% end %>
 | 
				
			||||||
      
 | 
					 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
  </body>
 | 
					  </body>
 | 
				
			||||||
</html>
 | 
					</html>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,7 +8,7 @@
 | 
				
			|||||||
        <td>
 | 
					        <td>
 | 
				
			||||||
          <div><%= room.name %></div>
 | 
					          <div><%= room.name %></div>
 | 
				
			||||||
          <div class="small text-muted">
 | 
					          <div class="small text-muted">
 | 
				
			||||||
            <i>Created on <%= room.created_at.strftime("%B #{room.created_at.day.ordinalize}, %Y") %></i>
 | 
					            <i>Created on <%= room.created_at.strftime("%B #{room.created_at.day.ordinalize}, %Y.") %></i>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </td>
 | 
					        </td>
 | 
				
			||||||
        <td class="text-right">
 | 
					        <td class="text-right">
 | 
				
			||||||
@@ -17,7 +17,9 @@
 | 
				
			|||||||
            <div class="dropdown-menu dropdown-menu-right">
 | 
					            <div class="dropdown-menu dropdown-menu-right">
 | 
				
			||||||
              <a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-tag"></i> Action </a>
 | 
					              <a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-tag"></i> Action </a>
 | 
				
			||||||
              <a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-edit-2"></i> Another action </a>
 | 
					              <a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-edit-2"></i> Another action </a>
 | 
				
			||||||
              <a href="javascript:void(0)" class="dropdown-item"><i class="dropdown-icon fe fe-trash"></i> Delete</a>
 | 
					              <%= button_to room, method: :delete, data: { confirm: 'Are you sure?' }, class: "dropdown-item" do %>
 | 
				
			||||||
 | 
					                <i class="dropdown-icon fe fe-trash"></i> Delete
 | 
				
			||||||
 | 
					              <% end %>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </td>
 | 
					        </td>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,7 +8,7 @@
 | 
				
			|||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
          <hr class="small-rule">
 | 
					          <hr class="small-rule">
 | 
				
			||||||
          <%= form_for(:room, url: create_room_path) do |f| %>
 | 
					          <%= form_for(:room, url: rooms_path) do |f| %>
 | 
				
			||||||
            <div class="input-icon">
 | 
					            <div class="input-icon">
 | 
				
			||||||
              <span class="input-icon-addon">
 | 
					              <span class="input-icon-addon">
 | 
				
			||||||
                <i class="fas fa-chalkboard-teacher"></i>
 | 
					                <i class="fas fa-chalkboard-teacher"></i>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,15 +1,13 @@
 | 
				
			|||||||
Rails.application.routes.draw do
 | 
					Rails.application.routes.draw do
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  resources :rooms, only: [:create, :show, :destroy], param: :room_uid, path: '/r'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Room routes.
 | 
					  # Room routes.
 | 
				
			||||||
  scope '/r' do
 | 
					  scope '/r/:room_uid' do
 | 
				
			||||||
    post '/', to: 'rooms#create', as: :create_room
 | 
					    get '/start', to: 'rooms#start', as: :start_room
 | 
				
			||||||
    scope '/:room_uid' do
 | 
					    match '/wait', to: 'rooms#wait', as: :wait_room, via: [:get, :post]
 | 
				
			||||||
      match '/', to: 'rooms#show', as: :room, via: [:get, :post]
 | 
					    get '/logout', to: 'rooms#logout', as: :logout_room
 | 
				
			||||||
      get '/start', to: 'rooms#start', as: :start_room
 | 
					    get '/sessions', to: 'rooms#sessions', as: :sessions
 | 
				
			||||||
      match '/wait', to: 'rooms#wait', as: :wait_room, via: [:get, :post]
 | 
					 | 
				
			||||||
      get '/logout', to: 'rooms#logout', as: :logout_room
 | 
					 | 
				
			||||||
      get '/sessions', to: 'rooms#sessions', as: :sessions
 | 
					 | 
				
			||||||
    end
 | 
					 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Signup routes.
 | 
					  # Signup routes.
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user