paoda/polyglot
1
0
Fork 0
mirror of https://github.com/beatriceo/polyglot.git synced 2025-10-23 01:52:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into front-end

Browse Source
This commit is contained in:
Beatrice Olivera
2018-08-28 17:21:12 +01:00
committed by GitHub
parent e98199d013 9f23553256
commit e7b4b74c00
14 changed files with 146 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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' %>

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

@@ -3,14 +3,14 @@
<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' %>
<%#= stylesheet_pack_tag 'application', media: 'all' %> <!-- Uncomment if you import CSS in app/javascript/packs/application.js -->
</head>
<body>
<%= render 'shared/navbar' %>
<%= render 'shared/navbar' unless params["action"] == "home"%>
<%= render 'shared/flashes' %>
<%= yield %>
<%= javascript_include_tag 'application' %>

17
app/views/pages/home.html.erb Normal file
View File

@@ -0,0 +1,17 @@
<div class="banner" style="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('<%= image_path 'phone.jpg' %>');">
<div class="banner-content">
<h1>Make a call</h1>
<p>Communicate in different languages</p>
<p>and receive real-time translated</p>
<p> subtitles in your native tongue.</p>
<p>
<span id="banner-typed-text"></span>
</p>
<%= link_to "Sign Up",new_user_registration_path, class: "btn btn-primary btn-lg" %>
<%= link_to "Login", new_user_session_path, class: "btn btn-primary btn-lg" %>
</div>
</div>
<% unless current_user.nil? %>
<% end %>