paoda
/
polyglot
mirror of https://github.com/beatriceo/polyglot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9 from beatriceo/login-page 

Login page
This commit is contained in:
Ethan1710 2018-08-28 15:34:59 +01:00 committed by GitHub
parent e73df2ed65 45a6f19a9c
commit 8745a42b00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 94 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,3 +14,6 @@
@import "layouts/index";
@import "components/index";
@import "pages/index";
@import "devise/index";

1
app/assets/stylesheets/devise/_index.scss Normal file
View File

@ -0,0 +1 @@
@import 'login';

40
app/assets/stylesheets/devise/_login.scss Normal file
View File

@ -0,0 +1,40 @@
.login-container {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 100%;
height: 100vh;
position: absolute;
background-image:
linear-gradient(
-225deg,
rgba(5,25,55,0.3) 0%,
rgba(68,73,101,0.3),
rgba(128,129,149,0.3),
rgba(191,190,200,0.3),
rgba(255,255,255,0.3)
50%),
url('https://unsplash.com/photos/jay5BqVyf5A');
.login-content {
position: relative;
top: -10vh;
padding: 50px;
background-color: white;
width: 25vw;
border-radius: 3px;
box-shadow: 1px 1px 10px rgba(0,0,0, 0.21);
h2 {
color: $primary;
}
}
}
.login {
// color: $primary;
width:100%;
}

48
app/views/devise/registrations/new.html.erb
View File

@ -1,25 +1,29 @@
<h2>Sign up</h2>
<div class="login-container">
<div class="login-content">
<h2>Sign up</h2>
<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= f.error_notification %>
<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">
<%= f.input :email,
required: true,
autofocus: true ,
input_html: { autocomplete: "email" }%>
<%= f.input :password,
required: true,
hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length),
input_html: { autocomplete: "new-password" } %>
<%= f.input :password_confirmation,
required: true,
input_html: { autocomplete: "new-password" } %>
<div class="form-inputs">
<%= f.input :email,
required: true,
autofocus: true ,
input_html: { autocomplete: "email" }%>
<%= f.input :password,
required: true,
hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length),
input_html: { autocomplete: "new-password" } %>
<%= f.input :password_confirmation,
required: true,
input_html: { autocomplete: "new-password" } %>
</div>
<div class="form-actions">
<%= f.button :submit, "Sign up", class: "login btn btn-primary" %>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div>
<div class="form-actions">
<%= f.button :submit, "Sign up" %>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div>

40
app/views/devise/sessions/new.html.erb
View File

@ -1,20 +1,24 @@
<h2>Log in</h2>
<div class="login-container">
<div class="login-content">
<h2>Log in</h2>
<%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="form-inputs">
<%= f.input :email,
required: false,
autofocus: true,
input_html: { autocomplete: "email" } %>
<%= f.input :password,
required: false,
input_html: { autocomplete: "current-password" } %>
<%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
<%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="form-inputs">
<%= f.input :email,
required: false,
autofocus: true,
input_html: { autocomplete: "email" } %>
<%= f.input :password,
required: false,
input_html: { autocomplete: "current-password" } %>
<%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
</div>
<div class="form-actions">
<%= f.button :submit, "Log in", class: "login btn btn-primary" %>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div>
<div class="form-actions">
<%= f.button :submit, "Log in" %>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div>

2
app/views/devise/shared/_links.html.erb
View File

@ -3,7 +3,7 @@
<% end -%>
<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
<%= link_to "Sign up", new_registration_path(resource_name) %><br />
<%#= link_to "Sign up", new_registration_path(resource_name) %><!-- <br /> -->
<% end -%>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>

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

@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>TODO</title>
<title>Polyglot</title>
<%= csrf_meta_tags %>
<%= action_cable_meta_tag %>
<%= stylesheet_link_tag 'application', media: 'all' %>