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

continue front-end work

This commit is contained in:
Josh 2018-05-25 11:55:48 -04:00
parent a1a41bfa43
commit 0dce8d2bf5
16 changed files with 238 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/placeholder-user.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

13
app/assets/stylesheets/application.scss
View File

@ -68,6 +68,19 @@ html, body {
background-color: $rule-color; background-color: $rule-color;
} }
.thumbnail {
height: 60%;
width: auto;
}
.client-icon {
height: 100px;
width: 100px;
display: flex;
align-items: center;
justify-content: center;
}
.container-fluid { .container-fluid {
height: 100%; height: 100%;
} }

5
app/controllers/users_controller.rb
View File

@ -17,6 +17,11 @@ class UsersController < ApplicationController
end end
end end
# GET /settings
def settings
redirect_to root_path unless current_user
end
private private
def user_params def user_params

19
app/models/user.rb
View File

@ -26,7 +26,7 @@ class User < ApplicationRecord
user.name = send("#{auth['provider']}_name", auth) user.name = send("#{auth['provider']}_name", auth)
user.username = send("#{auth['provider']}_username", auth) user.username = send("#{auth['provider']}_username", auth)
user.email = send("#{auth['provider']}_email", auth) user.email = send("#{auth['provider']}_email", auth)
user.image = send("#{auth['provider']}_image", auth)
user.save! user.save!
user user
end end
@ -51,6 +51,10 @@ class User < ApplicationRecord
auth['info']['email'] auth['info']['email']
end end
def twitter_image(auth)
auth['info']['image']
end
def google_name(auth) def google_name(auth)
auth['info']['name'] auth['info']['name']
end end
@ -62,6 +66,19 @@ class User < ApplicationRecord
def google_email(auth) def google_email(auth)
auth['info']['email'] auth['info']['email']
end end
def google_image(auth)
auth['info']['picture']
end
end
def subtitle
case provider
when "greenlight", "google", "twitter"
"User"
else
"Unknown"
end
end end
private private

2
app/views/main/index.html.erb
View File

@ -9,7 +9,7 @@
<%= render "shared/features" %> <%= render "shared/features" %>
</div> </div>
<%= render "shared/video_modal" %> <%= render "shared/modals/video_modal" %>
<script> <script>
$(window).on('load',function(){ $(window).on('load',function(){

40
app/views/rooms/sessions.html.erb
View File

@ -1,3 +1,43 @@
<div class="container">
<div class="col-lg-10">
<div class="card">
<table class="table card-table table-vcenter">
<tbody>
<% 3.times do %>
<tr>
<td>
<!--<i class="fas fa-users fa-2x"></i>-->
<img class="thumbnail" src="http://test-install.blindsidenetworks.com/presentation/b622495d927cd99e9898b0601c2b18a5424a0627-1527259102285/presentation/d2d9a672040fbde2a47a10bf6c37b6a4b5ae187f-1527259102298/thumbnails/thumb-1.png">
</td>
<td class="text-left">
<h4>Introduction to Dinosaurs</h4>
<p><i>June 21, 2017 (about 3 hours ago)</i></p>
</td>
<td class="text-center d-none d-md-table-cell text-nowrap">
<h6 class="text-uppercase"><strong>Users</strong></h6>
<h5>3</h5>
</td>
<td class="text-center d-none d-md-table-cell text-nowrap">
<h6 class="text-uppercase"><strong>Length</strong></h6>
<h5>2 hours</h5>
</td>
<td class="text-center d-none d-md-table-cell text-nowrap">
<h6 class="text-uppercase"><strong>Visbility</strong></h6>
<h5>Unlisted</h5>
</td>
<td>
<button type="button" class="btn btn-icon btn-success"><i class="fas fa-video"></i></button>
<button type="button" class="btn btn-icon btn-primary"><i class="fas fa-chart-bar"></i></button>
<button type="button" class="btn btn-icon btn-warning"><i class="fas fa-podcast"></i></button>
</td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
</div>
Sessions Sessions
<br><br> <br><br>
<%= @meeting.recordings %> <%= @meeting.recordings %>

2
app/views/shared/_footer.html.erb
View File

@ -1,3 +1,3 @@
<div class="footer"> <div class="footer">
<h5 class="text-center">Powered by BigBlueButton.</h5> <h5 class="text-center">Powered by <a target="_blank" href="http://bigbluebutton.org/">BigBlueButton</a>.</h5>
</div> </div>

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

@ -9,17 +9,20 @@
<% if current_user %> <% if current_user %>
<div class="dropdown"> <div class="dropdown">
<a href="#" class="nav-link pr-0 leading-none" data-toggle="dropdown"> <a href="#" class="nav-link pr-0 leading-none" data-toggle="dropdown">
<span class="avatar" style="background-image: url({{ site.base }}/{{ user.photo }})"></span> <% if current_user.image.nil? %>
<span class="avatar"><%= current_user.name.first %></span>
<% else %>
<span class="avatar" style="background-image: url(<%= current_user.image %>)"></span>
<% end %>
<span class="ml-2 d-none d-lg-block"> <span class="ml-2 d-none d-lg-block">
<span class="text-default">{{ user.name }} {{ user.surname }}</span> <span class="text-default"><%= current_user.name %></span>
<small class="text-muted d-block mt-1">Administrator</small> <small class="text-muted d-block mt-1"><%= current_user.subtitle %></small>
</span> </span>
</a> </a>
</div> </div>
<% else %> <% else %>
<button type="submit" class="btn btn-pill btn-outline-primary ml-auto" data-toggle="modal" data-target="#loginModal">Login</button> <button type="submit" class="btn btn-pill btn-outline-primary ml-auto" data-toggle="modal" data-target="#loginModal">Login</button>
<%= render "shared/modals/login_modal" %>
<%= render "shared/login_modal" %>
<% end %> <% end %>
</div> </div>
</div> </div>

14
app/views/shared/_start_meeting.html.erb
View File

@ -1,12 +1,14 @@
<div class="card text-center"> <div class="card text-center">
<div class="card-body"> <div class="card-body">
<div class="col-8 offset-2 form-group"> <div class="col-8 offset-2 form-group">
<div class="input-group"> <%= form_for(:meeting, url: create_meeting_path) do |f| %>
<input type="text" class="form-control" placeholder="Enter a meeting name to start!"> <div class="input-group">
<span class="input-group-append"> <%= f.text_field :name, class: "form-control", placeholder: "Enter a meeting name to start!" %>
<button class="btn btn-primary" type="button">Start Meeting</button> <span class="input-group-append">
</span> <%= f.submit "Start Meeting", class: "btn btn-primary" %>
</div> </span>
</div>
<% end %>
</div> </div>
</div> </div>
<div class="card-footer"> <div class="card-footer">

14
app/views/shared/_login_modal.html.erb → app/views/shared/modals/_login_modal.html.erb
View File

@ -16,10 +16,20 @@
<hr> <hr>
<div class="form-group"> <div class="form-group">
<input type="email" class="form-control" id="exampleInputEmail1" aria-describedby="emailHelp" placeholder="Email"> <div class="input-icon">
<span class="input-icon-addon">
<i class="fas fa-at"></i>
</span>
<input type="email" class="form-control" placeholder="Email">
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password"> <div class="input-icon">
<span class="input-icon-addon">
<i class="fas fa-key"></i>
</span>
<input type="password" class="form-control" placeholder="Password">
</div>
</div> </div>
<div class="form-footer"> <div class="form-footer">
<button type="submit" class="btn btn-outline-primary btn-block btn-pill">Login</button> <button type="submit" class="btn btn-outline-primary btn-block btn-pill">Login</button>

32
app/views/shared/modals/_select_client_modal.html.erb Normal file
View File

@ -0,0 +1,32 @@
<div class="modal fade" id="selectClientModal" 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>Which client would you like to use?</h3>
</div>
<hr class="small-rule">
<div class="form-group">
<div class="selectgroup selectgroup-pills">
<label class="selectgroup-item">
<input type="radio" name="icon-input" value="1" class="selectgroup-input" checked="">
<span class="selectgroup-button selectgroup-button-icon client-icon p-2"><i class="fab fa-html5 fa-3x"></i></span>
<p>HTML5</p>
</label>
<label class="selectgroup-item">
<input type="radio" name="icon-input" value="2" class="selectgroup-input">
<span class="selectgroup-button selectgroup-button-icon client-icon"><i class="fas fa-bolt fa-3x"></i></span>
<p>Flash</p>
</label>
</div>
</div>
<div class="card-footer">
<p>We recommend you use the HTML5 client for the best experience.</p>
</div>
</div>
</div>
</div>
</div>
</div>

2
app/views/shared/_video_modal.html.erb → app/views/shared/modals/_video_modal.html.erb
View File

@ -4,7 +4,7 @@
<div class="modal-body"> <div class="modal-body">
<div class="card-body p-6"> <div class="card-body p-6">
<div class="card-title text-primary"> <div class="card-title text-primary">
<h3>Welcome</h3> <h3>Welcome to Greenlight</h3>
</div> </div>
<hr class="small-rule"> <hr class="small-rule">

93
app/views/users/settings.html.erb Normal file
View File

@ -0,0 +1,93 @@
<div class="container">
<div class="form-group">
<div class="selectgroup selectgroup-pills">
<label class="selectgroup-item">
<input type="radio" name="icon-input" value="1" class="selectgroup-input" checked="">
<span class="selectgroup-button selectgroup-button-icon"><i class="fas fa-user"></i> Account</span>
</label>
<label class="selectgroup-item">
<input type="radio" name="icon-input" value="2" class="selectgroup-input">
<span class="selectgroup-button selectgroup-button-icon"><i class="fas fa-pencil-alt"></i> Design </span>
</label>
</div>
</div>
<div class="form-group">
<label class="form-label">Background</label>
<div class="row gutters-xs">
<div class="col-auto">
<label class="colorinput">
<input name="color" type="radio" value="azure" class="colorinput-input">
<span class="colorinput-color bg-azure"></span>
</label>
</div>
<div class="col-auto">
<label class="colorinput">
<input name="color" type="radio" value="indigo" class="colorinput-input" checked="">
<span class="colorinput-color bg-indigo"></span>
</label>
</div>
<div class="col-auto">
<label class="colorinput">
<input name="color" type="radio" value="purple" class="colorinput-input">
<span class="colorinput-color bg-purple"></span>
</label>
</div>
<div class="col-auto">
<label class="colorinput">
<input name="color" type="radio" value="pink" class="colorinput-input">
<span class="colorinput-color bg-pink"></span>
</label>
</div>
<div class="col-auto">
<label class="colorinput">
<input name="color" type="radio" value="red" class="colorinput-input">
<span class="colorinput-color bg-red"></span>
</label>
</div>
<div class="col-auto">
<label class="colorinput">
<input name="color" type="radio" value="orange" class="colorinput-input">
<span class="colorinput-color bg-orange"></span>
</label>
</div>
<div class="col-auto">
<label class="colorinput">
<input name="color" type="radio" value="yellow" class="colorinput-input">
<span class="colorinput-color bg-yellow"></span>
</label>
</div>
<div class="col-auto">
<label class="colorinput">
<input name="color" type="radio" value="lime" class="colorinput-input">
<span class="colorinput-color bg-lime"></span>
</label>
</div>
<div class="col-auto">
<label class="colorinput">
<input name="color" type="radio" value="green" class="colorinput-input">
<span class="colorinput-color bg-green"></span>
</label>
</div>
<div class="col-auto">
<label class="colorinput">
<input name="color" type="radio" value="teal" class="colorinput-input">
<span class="colorinput-color bg-teal"></span>
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="form-label">Name</label>
<input type="text" class="form-control" value="<%= current_user.name %>" readonly="">
<label class="form-label">Email</label>
<input type="text" class="form-control" value="<%= current_user.email %>" readonly="">
<label class="form-label">Account Provider</label>
<input type="text" class="form-control" value="<%= current_user.provider.capitalize %>" readonly="">
</div>
</div>

3
config/routes.rb
View File

@ -21,6 +21,9 @@ Rails.application.routes.draw do
get '/signup', to: 'users#new' get '/signup', to: 'users#new'
post '/signup', to: 'users#create' post '/signup', to: 'users#create'
# User settings.
get '/settings', to: 'users#settings'
# Handles login of greenlight provider accounts. # Handles login of greenlight provider accounts.
post '/login', to: 'sessions#create', as: :create_session post '/login', to: 'sessions#create', as: :create_session

1
db/migrate/20180504131648_create_users.rb
View File

@ -6,6 +6,7 @@ class CreateUsers < ActiveRecord::Migration[5.0]
t.string :name t.string :name
t.string :username t.string :username
t.string :email t.string :email
t.string :image
t.string :password_digest, index: { unique: true } t.string :password_digest, index: { unique: true }
t.timestamps t.timestamps

1
db/schema.rb
View File

@ -38,6 +38,7 @@ ActiveRecord::Schema.define(version: 20180504131713) do
t.string "name" t.string "name"
t.string "username" t.string "username"
t.string "email" t.string "email"
t.string "image"
t.string "password_digest" t.string "password_digest"
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.datetime "updated_at", null: false t.datetime "updated_at", null: false