forked from External/greenlight
work on user settings
This commit is contained in:
Josh
@ -9,7 +9,7 @@
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-md-8 col-sm-12 form-inline mb-5">
|
||||
<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 %>
|
||||
@ -34,5 +34,3 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= @room.participants %>
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
<% content_for :title do %>
|
||||
<div class="title">
|
||||
<h2><%= "Login" %></h2>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<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">
|
||||
|
||||
<% configured_providers.each do |provider| %>
|
||||
<%= link_to omniauth_login_url(provider), class: "signin-link signin-link-#{provider}" do %>
|
||||
<div class="signin-button center-block">
|
||||
<div class="signin-icon-wrapper">
|
||||
<%= image_tag("#{provider}_logo.png", alt: "T", class: "signin-icon") %>
|
||||
</div>
|
||||
<div class="signin-text-wrapper text-center">
|
||||
<span class="signin-text"><%= "Login with #{provider.capitalize}" %></span>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<% if allow_greenlight_users? %>
|
||||
<center><p>or...<br><br></p></center>
|
||||
|
||||
<%= form_for(:session, url: login_path) do |f| %>
|
||||
<div class="input-field col s12">
|
||||
<%= f.label :email, "Email Address" %>
|
||||
<%= f.text_field :email %>
|
||||
</div>
|
||||
<div class="input-field col s12">
|
||||
<%= f.label :password %>
|
||||
<%= f.password_field :password %>
|
||||
</div>
|
||||
<br>
|
||||
<%= f.submit "Login", class: "btn white-text light-green" %>
|
||||
<%= link_to "Don't have an account? Sign up!", signup_path %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
3
app/views/shared/_flash_messages.html.erb
Normal file
3
app/views/shared/_flash_messages.html.erb
Normal file
@ -0,0 +1,3 @@
|
||||
<% flash.each do |key, value| %>
|
||||
<%= content_tag :div, value, class: "flash #{key} d-inline-block text-success" %>
|
||||
<% end %>
|
||||
@ -31,7 +31,7 @@
|
||||
<%= link_to current_user.main_room, class: "dropdown-item" do %>
|
||||
<i class="dropdown-icon fas fa-home"></i> Home Room
|
||||
<% end %>
|
||||
<%= link_to settings_path, class: "dropdown-item" do %>
|
||||
<%= link_to edit_user_path(current_user), class: "dropdown-item" do %>
|
||||
<i class="dropdown-icon fe fe-settings"></i> Settings
|
||||
<% end %>
|
||||
<div class="dropdown-divider"></div>
|
||||
|
||||
@ -15,25 +15,29 @@
|
||||
<% end %>
|
||||
|
||||
<hr>
|
||||
<div class="form-group">
|
||||
<div class="input-icon">
|
||||
<span class="input-icon-addon">
|
||||
<i class="fas fa-at"></i>
|
||||
</span>
|
||||
<input type="email" class="form-control" placeholder="Email">
|
||||
<%= form_for(:session, url: create_session_path) do |f| %>
|
||||
<div class="form-group">
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<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 class="form-group">
|
||||
<div class="input-icon">
|
||||
<span class="input-icon-addon">
|
||||
<i class="fas fa-key"></i>
|
||||
</span>
|
||||
<%= f.password_field :password, class: "form-control", placeholder: "Password" %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-footer">
|
||||
<button type="submit" class="btn btn-outline-primary btn-block btn-pill">Login</button>
|
||||
</div>
|
||||
|
||||
<div class="form-footer">
|
||||
<%= f.submit "Login", class: "btn btn-outline-primary btn-block btn-pill" %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
<hr class="small-rule">
|
||||
|
||||
<%= form_for(User.new, url: signup_path) do |f| %>
|
||||
<%= 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" %>
|
||||
|
||||
32
app/views/shared/settings/_account.html.erb
Normal file
32
app/views/shared/settings/_account.html.erb
Normal file
@ -0,0 +1,32 @@
|
||||
<%= form_for @user, url: update_user_path, method: :patch do |f| %>
|
||||
<%= hidden_field_tag :setting, "account" %>
|
||||
<div class="form-group">
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<%= 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", value: @user.name, placeholder: "Fullname" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-6">
|
||||
<%= 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 #{'is-invalid' if !@user.errors.messages[:email].empty?}", value: @user.email, placeholder: "Email" %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<%= f.label "Provider", class: "form-label" %>
|
||||
<%= f.text_field :provider, class: "form-control", value: @user.provider.capitalize, readonly: "" %>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<%= f.submit "Update", class: "btn btn-primary float-right" %>
|
||||
</div>
|
||||
<% end %>
|
||||
7
app/views/shared/settings/_design.html.erb
Normal file
7
app/views/shared/settings/_design.html.erb
Normal file
@ -0,0 +1,7 @@
|
||||
<div class="form-group">
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
5
app/views/shared/settings/_image.html.erb
Normal file
5
app/views/shared/settings/_image.html.erb
Normal file
@ -0,0 +1,5 @@
|
||||
<div class="form-group">
|
||||
<div class="row">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
20
app/views/shared/settings/_password.html.erb
Normal file
20
app/views/shared/settings/_password.html.erb
Normal file
@ -0,0 +1,20 @@
|
||||
<%= form_for @user, url: update_user_path, method: :patch do |f| %>
|
||||
<%= hidden_field_tag :setting, "password" %>
|
||||
<div class="form-group">
|
||||
<div class="row">
|
||||
<div class="col-8">
|
||||
<%= f.label "Old Password", class: "form-label" %>
|
||||
<%= f.password_field :password, class: "form-control" %>
|
||||
<br>
|
||||
<%= f.label "New Password", class: "form-label" %>
|
||||
<%= f.password_field :new_password, class: "form-control" %>
|
||||
<br>
|
||||
<%= f.label "New Password Confirmation", class: "form-label" %>
|
||||
<%= f.password_field :password_confirmation, class: "form-control" %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<%= f.submit "Update", class: "btn btn-primary float-right" %>
|
||||
</div>
|
||||
<% end %>
|
||||
10
app/views/shared/settings/_setting_view.html.erb
Normal file
10
app/views/shared/settings/_setting_view.html.erb
Normal file
@ -0,0 +1,10 @@
|
||||
<%= content_tag(:div, id: setting_id, class: "setting-view card") do %>
|
||||
<div class="card-body p-6">
|
||||
<div class="card-title text-primary">
|
||||
<h4><%= setting_title %></h4>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
<%= render "shared/settings/#{setting_id}" %>
|
||||
</div>
|
||||
<% end %>
|
||||
86
app/views/users/edit.html.erb
Normal file
86
app/views/users/edit.html.erb
Normal file
@ -0,0 +1,86 @@
|
||||
<div class="container mt-8">
|
||||
|
||||
<%= render "shared/components/subtitle", subtitle: "Settings", search: false %>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-3 mb-4">
|
||||
<div class="list-group list-group-transparent mb-0">
|
||||
<%= link_to edit_user_path(@user, setting: "account"), id: "account", class: "list-group-item list-group-item-action setting-btn" do %>
|
||||
<span class="icon mr-3"><i class="fe fe-user"></i></span>Account
|
||||
<% end %>
|
||||
|
||||
<%= link_to edit_user_path(@user, setting: "image"), id: "image", class: "list-group-item list-group-item-action setting-btn" do %>
|
||||
<span class="icon mr-3"><i class="fe fe-image"></i></span>Profile Image
|
||||
<% end %>
|
||||
|
||||
<% if @user.social_uid.nil? %>
|
||||
<%= link_to edit_user_path(@user, setting: "password"), id: "password", class: "list-group-item list-group-item-action setting-btn" do %>
|
||||
<span class="icon mr-3"><i class="fe fe-lock"></i></span>Password
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<%= link_to edit_user_path(@user, setting: "design"), id: "design", class: "list-group-item list-group-item-action setting-btn" do %>
|
||||
<span class="icon mr-3"><i class="fe fe-edit-2"></i></span>Design
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<% if @user.errors.any? %>
|
||||
<h5 class="mt-8">Errors:</h5>
|
||||
<ul>
|
||||
<% @user.errors.full_messages.each do |err| %>
|
||||
<li class="text-danger"><%= err %>.</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
<% end %>
|
||||
|
||||
<div class="mt-8">
|
||||
<%= render 'shared/flash_messages' unless flash.empty? %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-lg-9">
|
||||
<%= render "shared/settings/setting_view", setting_id: "account", setting_title: "Update your Account Info" %>
|
||||
<%= render "shared/settings/setting_view", setting_id: "image", setting_title: "Change your Profile Image" %>
|
||||
|
||||
<% if @user.social_uid.nil? %>
|
||||
<%= render "shared/settings/setting_view", setting_id: "password", setting_title: "Change your Password" %>
|
||||
<% end %>
|
||||
|
||||
<%= render "shared/settings/setting_view", setting_id: "design", setting_title: "Customize GreenLight" %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
/*
|
||||
// Helper for grabbing URL params.
|
||||
$.urlParam = function(name){
|
||||
var results = new RegExp('[\?&]' + name + '=([^]*)').exec(window.location.href);
|
||||
if (results==null){
|
||||
return null;
|
||||
} else {
|
||||
return results[1] || 0;
|
||||
}
|
||||
}
|
||||
|
||||
settingsViews = $('.setting-view');
|
||||
|
||||
$(document).ready(function(){
|
||||
var setting = $.urlParam("setting");
|
||||
|
||||
/*if (!["account", "image", "password", "design"].includes(setting)){
|
||||
var url = [location.protocol, '//', location.host, location.pathname].join('');
|
||||
window.location.href = url + "?setting=account";
|
||||
}
|
||||
if (!["account", "image", "password", "design"].includes(setting)){ setting = "account"; }
|
||||
|
||||
$("#" + setting).addClass("active");
|
||||
|
||||
settingsViews.each(function(i, view){
|
||||
if($(view).attr("id") != setting){
|
||||
$(view).hide();
|
||||
}
|
||||
});
|
||||
});*/
|
||||
</script>
|
||||
@ -1,132 +0,0 @@
|
||||
<div class="container mt-8">
|
||||
|
||||
<%= render "shared/components/subtitle", subtitle: "Settings", search: false %>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-3 mb-4">
|
||||
<div class="list-group list-group-transparent mb-0">
|
||||
<button id="account" class="list-group-item list-group-item-action setting-btn active">
|
||||
<span class="icon mr-3"><i class="fe fe-user"></i></span>Account
|
||||
</button>
|
||||
|
||||
<button id="password" class="list-group-item list-group-item-action setting-btn">
|
||||
<span class="icon mr-3"><i class="fe fe-lock"></i></span>Password
|
||||
</button>
|
||||
|
||||
<button id="design" class="list-group-item list-group-item-action setting-btn">
|
||||
<span class="icon mr-3"><i class="fe fe-edit-2"></i></span>Design
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-lg-9">
|
||||
<div id="account" class="setting-view card">
|
||||
<div class="card-body p-6">
|
||||
<div class="card-title text-primary">
|
||||
<h4>Update your Account</h4>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="form-group">
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<label class="form-label">Fullname</label>
|
||||
<div class="input-icon">
|
||||
<span class="input-icon-addon">
|
||||
<i class="fas fa-user"></i>
|
||||
</span>
|
||||
<input type="text" class="form-control" value="<%= current_user.name %>" placeholder="Fullname">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<label class="form-label">Email</label>
|
||||
<div class="input-icon">
|
||||
<span class="input-icon-addon">
|
||||
<i class="fas fa-at"></i>
|
||||
</span>
|
||||
<input type="email" class="form-control" value="<%= current_user.email %>" placeholder="Email">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<label class="form-label">Account Provider</label>
|
||||
<input type="text" class="form-control" value="<%= current_user.provider.capitalize %>" readonly="">
|
||||
<br>
|
||||
<label class="form-label">Profile Image</label>
|
||||
<span class="avatar avatar-xl" style="background-image: url(<%= current_user.image %>)"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<a href="#" class="btn btn-primary float-right">Update</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="password" class="setting-view card">
|
||||
<div class="card-body p-6">
|
||||
<div class="card-title text-primary">
|
||||
<h4>Change your Password</h4>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="form-group">
|
||||
<div class="row">
|
||||
<div class="col-8">
|
||||
<label class="form-label">Old Password</label>
|
||||
<input type="password" class="form-control">
|
||||
<br>
|
||||
<label class="form-label">New Password</label>
|
||||
<input type="password" class="form-control">
|
||||
<br>
|
||||
<label class="form-label">New Password Confirmation</label>
|
||||
<input type="password" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<a href="#" class="btn btn-primary float-right">Update</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="design" class="setting-view card">
|
||||
<div class="card-body p-6">
|
||||
<div class="card-title text-primary">
|
||||
<h4>Customize Greenlight</h4>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="form-group">
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<a href="#" class="btn btn-primary float-right">Update</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
settingsButtons = $('.setting-btn');
|
||||
settingsViews = $('.setting-view');
|
||||
|
||||
$(document).ready(function(){
|
||||
settingsButtons.each(function(i, btn) {
|
||||
if(i != 0){ $(settingsViews[i]).hide(); }
|
||||
$(btn).click(function(){
|
||||
$(btn).addClass("active");
|
||||
settingsViews.each(function(i, view){
|
||||
if($(view).attr("id") == $(btn).attr("id")){
|
||||
$(view).show();
|
||||
} else {
|
||||
$(settingsButtons[i]).removeClass("active");
|
||||
$(view).hide();
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
Reference in New Issue
Block a user