From 1bcd1762859d40b427d0225de205a65935e8ded4 Mon Sep 17 00:00:00 2001 From: joshua-arts Date: Thu, 31 May 2018 22:15:18 -0400 Subject: [PATCH] styling --- app/assets/stylesheets/application.scss | 5 +- app/controllers/main_controller.rb | 1 - app/controllers/rooms_controller.rb | 11 ++- app/models/room.rb | 6 +- app/models/user.rb | 2 +- app/views/rooms/join.html.erb | 35 +++++-- app/views/rooms/show.html.erb | 14 ++- app/views/shared/_header.html.erb | 9 +- app/views/shared/_sessions.html.erb | 98 ++++++++++--------- .../shared/components/_room_block.html.erb | 14 ++- .../shared/components/_subtitle.html.erb | 14 ++- .../shared/modals/_signup_modal.html.erb | 2 +- app/views/users/settings.html.erb | 2 +- db/migrate/20180504131705_create_rooms.rb | 1 + 14 files changed, 137 insertions(+), 77 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5ee1348f..388914de 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -41,6 +41,8 @@ $background-color: #F5F7FB; $rule-color: lightblue; +$footer-height: 70px; + .video-container { position: relative; width: 100%; @@ -98,12 +100,13 @@ html, body { } .wrapper { - min-height: 100%; + min-height: calc(100% - $footer-height); position: relative; } .footer { width: 100%; + height: 70px; text-align: center; } diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index d79897dd..e0a46491 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -4,7 +4,6 @@ class MainController < ApplicationController # GET / def index - @user = User.new end private diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index 0e1b5883..3dd031f1 100644 --- a/app/controllers/rooms_controller.rb +++ b/app/controllers/rooms_controller.rb @@ -8,7 +8,7 @@ class RoomsController < ApplicationController # POST /r def create room = Room.new(name: room_params[:name]) - room.user = current_user + room.owner = current_user if room.save if room_params[:auto_join] == "1" @@ -38,10 +38,15 @@ class RoomsController < ApplicationController render :join end else - # If the meeting isn't running and you don't own the room, go to the waiting page. + # If the room isn't running, go to join page to enter a name. if !@room.owned_by?(current_user) - redirect_to wait_room_path(@room) + render :join end + + # If the meeting isn't running and you don't own the room, go to the waiting page. + #if !@room.owned_by?(current_user) + # redirect_to wait_room_path(@room) + #end end end diff --git a/app/models/room.rb b/app/models/room.rb index 7a6da96d..90adb05c 100644 --- a/app/models/room.rb +++ b/app/models/room.rb @@ -4,7 +4,7 @@ class Room < ApplicationRecord validates :name, presence: true - belongs_to :user + belongs_to :owner, class_name: 'User', foreign_key: :user_id has_one :meeting ROOM_ICONS = %w(circle star certificate play cloud heart square bookmark cog) @@ -111,7 +111,7 @@ class Room < ApplicationRecord def bbb @bbb = BigBlueButton::BigBlueButtonApi.new(remove_slash(bbb_endpoint), bbb_secret, "0.8") #@bbb ||= if Rails.configuration.loadbalanced_configuration - # lb_user = retrieve_loadbalanced_credentials(self.room.user.provider) + # lb_user = retrieve_loadbalanced_credentials(self.room.owner.provider) # BigBlueButton::BigBlueButtonApi.new(remove_slash(lb_user["apiURL"]), lb_user["secret"], "0.8") #else # BigBlueButton::BigBlueButtonApi.new(remove_slash(bbb_endpoint), bbb_secret, "0.8") @@ -120,7 +120,7 @@ class Room < ApplicationRecord # Generates a uid for the room and BigBlueButton. def setup - self.uid = [user.firstname, (0...8).map { (65 + rand(26)).chr }.join].join('-').downcase + self.uid = [owner.firstname, (0...9).map { (65 + rand(26)).chr }.join].join('-').downcase self.bbb_id = Digest::SHA1.hexdigest(Rails.application.secrets[:secret_key_base] + Time.now.to_i.to_s).to_s self.icon = ROOM_ICONS.sample diff --git a/app/models/user.rb b/app/models/user.rb index 8f4cbebe..545a4ffd 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -90,7 +90,7 @@ class User < ApplicationRecord # Initializes a room for the user. def initialize_main_room - self.main_room = Room.create!(user: self, name: firstname + "'s Room") + self.main_room = Room.create!(owner: self, name: firstname + "'s Room") self.save end end diff --git a/app/views/rooms/join.html.erb b/app/views/rooms/join.html.erb index 8d4b7682..953ff216 100644 --- a/app/views/rooms/join.html.erb +++ b/app/views/rooms/join.html.erb @@ -1,7 +1,30 @@ -

The join the meeting, enter a name.

+
+
+
+
+

You have been invited to join

+

<%= @room.name %>

+
+
+
-

Enter a name to start a session.

-<%= form_tag room_path(@room) do %> - <%= text_field_tag "join_name" %> - <%= submit_tag "Join" %> -<% end %> +
+
+ <% if @room.owner.image.nil? %> + <%= @room.owner.name.first %> + <% else %> + + <% end %> +
<%= @room.owner.name %> (Owner)
+
+
+
+ + + + +
+
+
+
+
\ No newline at end of file diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb index 1cfb3df2..b9182808 100644 --- a/app/views/rooms/show.html.erb +++ b/app/views/rooms/show.html.erb @@ -1,8 +1,12 @@ -
+
-
+
-

<%= @room.name %>

+

<%= @room.name %> + <% if current_user.main_room == @room %> + + <% end %> +

0 Sessions | 0 Recordings

@@ -29,7 +33,7 @@
<% (current_user.rooms - [@room]).each do |room| %> -
+
<%= link_to room do %> <%= render "shared/components/room_block", room: room %> <% end %> @@ -39,7 +43,7 @@
-<%= render "shared/sessions" %> +<%= render "shared/sessions", recordings: @room.recordings %>