From 11a61180eddd24322352f4f4b0b4202bd7830452 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 1 Jun 2018 17:28:39 -0400 Subject: [PATCH] show all rooms --- app/assets/stylesheets/application.scss | 14 +++++++------ app/controllers/rooms_controller.rb | 18 ++++------------- app/views/layouts/application.html.erb | 3 ++- app/views/rooms/join.html.erb | 20 +++++++++++-------- app/views/rooms/show.html.erb | 16 ++++++++------- app/views/shared/_header.html.erb | 2 +- .../shared/components/_room_block.html.erb | 9 ++++++--- .../shared/modals/_create_room_modal.html.erb | 1 + 8 files changed, 43 insertions(+), 40 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 46e31a56..7f919212 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -43,7 +43,7 @@ $background-color: #F5F7FB; $rule-color: lightblue; -$footer-height: 70px; +$footer-height: 80px; .video-container { position: relative; @@ -96,20 +96,22 @@ iframe{ html, body { width: 100%; height: 100%; - //background: linear-gradient(180deg, $background-color 50%, white 50%); - //background-repeat: no-repeat; background-color: white; } +.font-weight-400 { + font-weight: 400; +} + .wrapper { - min-height: calc(100% - $footer-height); + min-height: calc(100% - #{$footer-height}); position: relative; } .footer { width: 100%; - height: 70px; - text-align: center; + position: abolute; + bottom: 0px; } .small-rule { diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index 36c0d073..e7eb81c2 100644 --- a/app/controllers/rooms_controller.rb +++ b/app/controllers/rooms_controller.rb @@ -56,27 +56,17 @@ class RoomsController < ApplicationController # POST /r/:room_uid def join opts = default_meeting_options - puts - puts @room.invite_path + # If you're unauthenticated, you must enter a name to join the meeting. if params[@room.invite_path][:join_name] - redirect_to @room.join_path(params[:join_name], opts) + redirect_to @room.join_path(params[@room.invite_path][:join_name], opts) end end # DELETE /r/:room_uid def destroy - # Only delete a room if there is another to fallback too. - if current_user.rooms.length > 1 - - # Assign a new random main_room if it's the main room. - if @room == current_user.main_room - current_user.main_room = (current_user.rooms - [@room]).sample - current_user.save - end - - @room.destroy - end + # Don't delete the users home room. + @room.destroy if @room != current_user.main_room redirect_to current_user.main_room end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 90464892..c1209583 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -36,8 +36,9 @@ <% if current_user %> <%= render "shared/modals/create_room_modal" %> <% end %> + - + <%= render "shared/footer" %> diff --git a/app/views/rooms/join.html.erb b/app/views/rooms/join.html.erb index 6199bdf7..31e9f92d 100644 --- a/app/views/rooms/join.html.erb +++ b/app/views/rooms/join.html.erb @@ -2,9 +2,9 @@
-

You have been invited to join

-

<%= @room.name %>

-
+

You have been invited to join

+

<%= @room.name %>

+
@@ -15,15 +15,19 @@ <% else %> <% end %> -
<%= @room.owner.name %> (Owner)
+
<%= @room.owner.name %> (Owner)
<%= form_for room_path, method: :post do |f| %>
- <%= f.text_field :join_name, class: "form-control main-large", placeholder: "Enter your name!" %> - - <%= f.submit "Join", class: "btn btn-primary px-7 main-large" %> - + <% if current_user %> + <%= f.submit "Join", class: "btn btn-primary px-7 main-large btn-block"%> + <% else %> + <%= f.text_field :join_name, class: "form-control main-large", placeholder: "Enter your name!" %> + + <%= f.submit "Join", class: "btn btn-primary px-7 main-large" %> + + <% end %>
<% end %>
diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb index 8212cfe8..4d8aa5a4 100644 --- a/app/views/rooms/show.html.erb +++ b/app/views/rooms/show.html.erb @@ -2,7 +2,7 @@
-

<%= @room.name %> +

<%= @room.name %> <% if current_user.main_room == @room %> <% end %> @@ -32,12 +32,14 @@

- <% (current_user.rooms - [@room]).each do |room| %> -
- <%= link_to room do %> - <%= render "shared/components/room_block", room: room %> - <% end %> -
+ <% if current_user.rooms.length > 1 %> + <% current_user.rooms.each do |room| %> +
+ <%= link_to room do %> + <%= render "shared/components/room_block", room: room %> + <% end %> +
+ <% end %> <% end %>
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index bd5fa080..207fb0b3 100644 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -14,7 +14,7 @@
<% if current_user %> - Create Room +   Create Room
diff --git a/app/views/shared/components/_room_block.html.erb b/app/views/shared/components/_room_block.html.erb index aa027f70..9ec6a7bb 100644 --- a/app/views/shared/components/_room_block.html.erb +++ b/app/views/shared/components/_room_block.html.erb @@ -21,13 +21,16 @@
+ <%= button_to root_path, class: "dropdown-item" do %> + Copy Link + <% end %> <% if room != current_user.main_room %> <%= button_to make_home_path(room), class: "dropdown-item" do %> Make Home Room <% end %> - <% end %> - <%= button_to room, method: :delete, data: { confirm: 'Are you sure?' }, class: "dropdown-item" do %> - Delete + <%= button_to room, method: :delete, data: { confirm: 'Are you sure?' }, class: "dropdown-item" do %> + Delete + <% end %> <% end %>
diff --git a/app/views/shared/modals/_create_room_modal.html.erb b/app/views/shared/modals/_create_room_modal.html.erb index 6b40be47..3738d909 100644 --- a/app/views/shared/modals/_create_room_modal.html.erb +++ b/app/views/shared/modals/_create_room_modal.html.erb @@ -14,6 +14,7 @@ <%= f.text_field :name, id: "room-name", class: "form-control", placeholder: "Enter a room name...", autocomplete: :off %> +
Room name cannot be blank.