From a9d5215d2b59989a378eaedddf4a0ef42696ba8b Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 1 Jun 2018 14:20:40 -0400 Subject: [PATCH] styling again --- app/assets/stylesheets/application.scss | 2 + app/controllers/rooms_controller.rb | 5 +- app/views/rooms/join.html.erb | 16 ++--- app/views/rooms/show.html.erb | 6 +- app/views/shared/_sessions.html.erb | 63 ++++++++++--------- .../shared/components/_room_block.html.erb | 8 +-- 6 files changed, 53 insertions(+), 47 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 388914de..46e31a56 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -38,6 +38,8 @@ @import "tabler"; @import "tabler.plugins"; +@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&subset=latin-ext); + $background-color: #F5F7FB; $rule-color: lightblue; diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index 8d3c5b24..36c0d073 100644 --- a/app/controllers/rooms_controller.rb +++ b/app/controllers/rooms_controller.rb @@ -56,9 +56,10 @@ 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[:join_name] + if params[@room.invite_path][:join_name] redirect_to @room.join_path(params[:join_name], opts) end end diff --git a/app/views/rooms/join.html.erb b/app/views/rooms/join.html.erb index 953ff216..6199bdf7 100644 --- a/app/views/rooms/join.html.erb +++ b/app/views/rooms/join.html.erb @@ -18,13 +18,15 @@
<%= @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" %> + +
+ <% end %>
- \ No newline at end of file + diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb index 4c45e455..8212cfe8 100644 --- a/app/views/rooms/show.html.erb +++ b/app/views/rooms/show.html.erb @@ -2,13 +2,13 @@
-

<%= @room.name %> +

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

-

<%= @room.sessions %> Sessions | <%= @recordings.length %> Recordings

- +

<%= @room.sessions %> Sessions | <%= @recordings.length %> Recordings

+
diff --git a/app/views/shared/_sessions.html.erb b/app/views/shared/_sessions.html.erb index 9ed16c1a..8e751646 100644 --- a/app/views/shared/_sessions.html.erb +++ b/app/views/shared/_sessions.html.erb @@ -2,38 +2,39 @@
<%= render "shared/components/subtitle", subtitle: "Recordings", search: true %> - -
-
-
- - - - - - - - - - - - - - <% if recordings.empty? %> - - - - <% else %> - <% recordings.each do |recording| %> - <%= render "shared/components/recording_row", recording: recording %> +
+
+
+
+
NameThumbnailsLengthUsersVisibilityFormats
- This room has no recordings. -
+ + + + + + + + + + + + + <% if recordings.empty? %> + + + + <% else %> + <% recordings.each do |recording| %> + <%= render "shared/components/recording_row", recording: recording %> + <% end %> <% end %> - <% end %> - -
NameThumbnailsLengthUsersVisibilityFormats
+ This room has no recordings. +
-
-
+ + +
+
+
diff --git a/app/views/shared/components/_room_block.html.erb b/app/views/shared/components/_room_block.html.erb index e8af2cde..3a9bf4ea 100644 --- a/app/views/shared/components/_room_block.html.erb +++ b/app/views/shared/components/_room_block.html.erb @@ -1,18 +1,18 @@
- +
- + <% if room == current_user.main_room %> <% else %> - + <% end %> -
<%= room.name %>
+

<%= room.name %>

Last Session on <%= recording_date(room.created_at) %>