lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

signup and room waiting

Browse Source
This commit is contained in:
Josh
2018-06-07 15:52:42 -04:00
parent 56489ee6cd
commit 657feb777f
18 changed files with 191 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/shared/_header.html.erb
View File

@@ -44,11 +44,10 @@
</div>
</div>
<% else %>
<button type="submit" class="btn btn-pill btn-outline-primary mx-2" data-toggle="modal" data-target="#loginModal">Login</button>
<button type="submit" class="btn btn-pill btn-outline-primary mx-2" data-toggle="modal" data-target="#signupModal">Signup</button>
<%= link_to "Login", "#loginModal", :class => "btn btn-pill btn-outline-primary mx-2", "data-toggle": "modal" %>
<%= link_to "Signup", signup_path, :class => "btn btn-pill btn-outline-primary mx-2" %>
<%= render "shared/modals/login_modal" %>
<%= render "shared/modals/signup_modal" %>
<% end %>
</div>
</div>

26
app/views/shared/_room_event.html.erb Normal file
View File

@@ -0,0 +1,26 @@
<div class="room-section pb-9" room="<%= @room.uid %>" join-name="<%= @join_name %>">
<div class="container">
<div class="row pt-9">
<div class="col-lg-12 col-sm-12">
<h4 class="text-left">You have been invited to join</h4>
<h1 class="display-3 text-left mb-3 font-weight-400"><%= @room.name %></h1>
<hr class="mt-2 float-left" style="width: 20%;">
</div>
</div>
<div class="row">
<div class="col-lg-6 col-md-8 col-sm-12 form-inline mb-5 align-top">
<% if @room.owner.image.nil? %>
<span class="avatar"><%= @room.owner.name.first %></span>
<% else %>
<span class="avatar" style="background-image: url(<%= @room.owner.image %>)"></span>
<% end %>
<h5 class="font-weight-normal ml-4 mt-3"><%= @room.owner.name %> (Owner)</h5>
</div>
<div class="col-lg-6 col-md-4 col-sm-12">
<%= yield %>
</div>
</div>
</div>
</div>

9
app/views/shared/components/_room_block.html.erb
View File

@@ -14,16 +14,17 @@
<td style="border-top: none;">
<h4 class="m-0 text-normal" style="color: #495057;"><%= room.name %></h4>
<div class="small text-muted">
<i>Last Session on <%= recording_date(room.created_at) %></i>
<% if room.sessions > 0 %>
<i>Last session on <%= recording_date(room.last_session) %></i>
<% else %>
<i>This room has no sessions, yet!</i>
<% end %>
</div>
</td>
<td class="text-right" style="border-top: none;">
<div class="item-action dropdown">
<a href="javascript:void(0)" data-toggle="dropdown" class="icon"><i class="fe fe-more-vertical"></i></a>
<div class="dropdown-menu dropdown-menu-right">
<%= button_to root_path, class: "dropdown-item" do %>
<i class="dropdown-icon fe fe-link"></i> Copy Link
<% end %>
<%= button_to root_path, class: "dropdown-item" do %>
<i class="dropdown-icon fas fa-cog"></i> Room Settings
<% end %>

38
app/views/shared/modals/_signup_modal.html.erb
View File

@@ -1,38 +0,0 @@
<div class="modal fade" id="signupModal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content text-center">
<div class="modal-body">
<div class="card-body p-6">
<div class="card-title text-primary">
<h3>Signup</h3>
</div>
<hr class="small-rule">
<%= form_for(User.new) do |f| %>
<div class="form-group">
<%= f.label :name, "Full Name", class: "form-label text-left" %>
<%= f.text_field :name, class: "form-control", placeholder: "Full Name" %>
</div>
<div class="form-group">
<%= f.label :email, "Email", class: "form-label text-left" %>
<%= f.text_field :email, class: "form-control", placeholder: "Email" %>
</div>
<div class="form-group">
<%= f.label :password, "Password", class: "form-label text-left" %>
<%= f.password_field :password, class: "form-control", placeholder: "Password" %>
</div>
<div class="form-group">
<%= f.label :password, "Password Confirmation", class: "form-label text-left" %>
<%= f.password_field :password, class: "form-control", placeholder: "Password Confirmation" %>
</div>
<div class="form-footer">
<%= f.submit "Signup", class: "btn btn-outline-primary btn-block btn-pill" %>
</div>
<% end %>
</div>
</div>
</div>
</div>
</div>