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 @@
- + <% if room == current_user.main_room %> <% else %> - + <% end %> |
- <%= room.name %>
+ <%= room.name %>
Last Session on <%= recording_date(room.created_at) %>
|