create separate page for login

This commit is contained in:
Zachary Chai 2017-01-19 19:08:59 -05:00
parent ceeafa3208
commit 3039bd168b
10 changed files with 48 additions and 10 deletions

View File

@ -0,0 +1,10 @@
.login {
.center-panel {
.center-panel-size {
max-width: 600px
}
.center-panel-content-size {
max-width: 500px;
}
}
}

View File

@ -26,7 +26,7 @@ html, body {
background: #ffffff;
}
.app-background {
.background {
height: 350px;
width: 100%;
background: asset-url('greenlight_background');
@ -35,6 +35,10 @@ html, body {
background-repeat: no-repeat;
}
body[data-controller=landing].app-background {
@extend .background;
}
body[data-controller=landing][data-action=rooms].app-background {
background-image: asset-url('bg_personal_room');
}
@ -61,14 +65,14 @@ body[data-controller=landing][data-action=rooms].app-background {
padding: 20px;
}
.center-block {
float: none;
}
.center-panel {
.center-block {
float: none;
}
.center-panel-size {
max-width: 900px
}
.center-panel-conent-size {
.center-panel-content-size {
max-width: 800px;
}

View File

@ -15,6 +15,10 @@
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
class SessionsController < ApplicationController
def new
end
def create
@user = User.from_omniauth(request.env['omniauth.auth'])
session[:user_id] = @user.id

View File

@ -28,7 +28,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<% end %>
<%= render layout: 'shared/center_panel' do %>
<div class="center-block center-panel-conent-size col-xs-12">
<div class="center-block center-panel-content-size col-xs-12">
<% if admin? %>
<%= render 'shared/meeting_url', hidden: false %>
<% else %>

View File

@ -33,14 +33,18 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<div class="center-panel-wrapper">
<%= render layout: 'shared/center_panel' do %>
<div class="center-block center-panel-conent-size col-xs-12">
<div class="center-block center-panel-content-size col-xs-12">
<%= render 'shared/meeting_url', hidden: false %>
<%= render 'shared/join_form' %>
</div>
<% end %>
</div>
<%= render 'shared/signup' %>
<div class="center-block col-xs-6 login">
<div class="text-center">
<%= t('signup_description') %> <%= link_to 'Login', '/users/login', class: 'btn btn-lg btn-primary' %>
</div>
</div>
</div>
</div>

View File

@ -36,7 +36,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<div class="center-panel-wrapper">
<%= render layout: 'shared/center_panel' do %>
<div class="center-block center-panel-conent-size col-xs-12">
<div class="center-block center-panel-content-size col-xs-12">
<%= render 'shared/meeting_url', hidden: true %>
<%= render 'shared/join_form' %>
</div>

View File

@ -0,0 +1,14 @@
<div class="page-wrapper login">
<div class="container-fluid">
<div class="center-panel-wrapper">
<%= render layout: 'shared/center_panel' do %>
<div class="center-block center-panel-content-size col-xs-12">
<%= render 'shared/signup' %>
</div>
<% end %>
</div>
</div>
</div>

View File

@ -1,4 +1,4 @@
<span class="signup pull-right">
<span class="signup">
<% if current_user %>
<% if !@user %>
<%= link_to current_user.name, current_user.room_url %> |

View File

@ -97,6 +97,7 @@ en-US:
published: Published
return_to_room: Return to your personal room
session_url_explanation: The meeting will be taking place using the following URL
signup_description: Login for customized sessions
start: Start
start_meeting: Start Meeting
your_personal_room: Your Personal Room

View File

@ -19,6 +19,7 @@ Rails.application.routes.draw do
mount ActionCable.server => '/cable'
resources :users, only: [:edit, :update]
get '/users/login', to: 'sessions#new'
get '/users/logout', to: 'sessions#destroy', as: :user_logout
match '/auth/:provider/callback', to: 'sessions#create', via: [:get, :post]