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

validate passwords and fix home

Browse Source
This commit is contained in:
Josh
2018-06-08 14:44:08 -04:00
parent 520c489e62
commit 4f70c9a8e5
9 changed files with 54 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/layouts/application.html.erb
View File

@ -8,10 +8,7 @@
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head>
<body class="app-background" data-controller="<%= params[:controller] %>" data-action="<%= params[:action] %>"
data-resource="<%= params[:resource] %>"
data-current-user="<%= current_user.try(:encrypted_id) %>">
<body class="app-background" data-controller="<%= params[:controller] %>" data-action="<%= params[:action] %>">
<div class="wrapper">
<!-- Messages -->

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

@ -1,37 +1,14 @@
<div class="room-section pb-2 pt-9">
<div class="container text-center">
<div class="room-section">
<div class="d-flex align-items-center" style="height: 100%;">
<div class="container text-center">
<h1 id="main-text" class="font-weight-400 resp-header">Welcome to BigBlueButton.</h1>
<h4 class="text-muted">A simple front end for your BigBlueButton Open Source Web Conferencing Server.</h4>
<h1 id="main-text" class="display-3 font-weight-400">Welcome to BigBlueButton.</h1>
<h4 class="text-muted">A simple front end for your BigBlueButton Open Source Web Conferencing Server.</h4>
<%= link_to "https://www.youtube.com/watch?v=yGX3JCv7OVM&feature=youtu.be", class: "p-3", target: "_blank" do %>
<h4>Watch a tutorial on using Greenlight <i class="fe fe-play-circle"></i></h4>
<% end %>
<%= link_to "https://www.youtube.com/watch?v=yGX3JCv7OVM&feature=youtu.be", class: "p-3", target: "_blank" do %>
<h4>Watch a tutorial on using Greenlight <i class="fe fe-play-circle"></i></h4>
<% end %>
</div>
</div>
</div>
<%= render "shared/features" %>
<script>
/*
textOptions = [
"Start your own Meeting.",
"Collaborate with Friends.",
"Connect in Real-Time.",
"Teach Students Online.",
]
textOpt = 0
var changeText = function(){
$('#main-text').text(textOptions[textOpt]);
$('#main-text').fadeIn(1000)
textOpt++;
if (textOpt > textOptions.length) { textOpt = 0; }
}
setInterval(function(){
$('#main-text').fadeOut(1000, changeText)
}, 7000);
*/
</script>

33
app/views/users/new.html.erb
View File

@ -6,29 +6,26 @@
<h4 class="mt-2">Create an Account</h4>
</div>
<div class="card-body">
<%= form_for @user, method: :post do |f| %>
<%= form_for @user, url: create_user_path, method: :post do |f| %>
<div class="form-group">
<%= f.label "Fullname", class: "form-label" %>
<div class="input-icon">
<span class="input-icon-addon">
<i class="fas fa-user"></i>
</span>
<%= f.text_field :name, class: "form-control", placeholder: "Fullname" %>
</div>
<br>
<%= f.text_field :name, class: "form-control #{form_is_invalid?(@user, :name)}", placeholder: "Fullname" %>
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:name).first %></div>
</div>
<div class="form-group">
<%= f.label "Email", class: "form-label" %>
<div class="input-icon">
<span class="input-icon-addon">
<i class="fas fa-at"></i>
</span>
<%= f.text_field :email, class: "form-control", placeholder: "Email" %>
</div>
<br>
<%= f.text_field :email, class: "form-control #{form_is_invalid?(@user, :email)}", placeholder: "Email" %>
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:email).first %></div>
</div>
<div class="form-group">
<%= f.label "Password", class: "form-label" %>
<%= f.password_field :password, class: "form-control", placeholder: "Password" %>
<br>
<%= f.password_field :password, class: "form-control #{form_is_invalid?(@user, :password)}", placeholder: "Password" %>
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:password).first %></div>
</div>
<div class="form-group">
<%= f.label "Password Confirmation", class: "form-label" %>
<%= f.password_field :password, class: "form-control", placeholder: "Password Confirmation" %>
<%= f.password_field :password_confirmation, class: "form-control #{form_is_invalid?(@user, :password_confirmation)}", placeholder: "Password Confirmation" %>
<div class="invalid-feedback d-block"><%= @user.errors.full_messages_for(:password_confirmation).first %></div>
</div>
<div class="card-footer">
<%= f.submit "Sign up", class: "btn btn-primary float-right" %>