From fed79bcfd442f9fbb8bc3f12b0b34b09f448a885 Mon Sep 17 00:00:00 2001
From: Giovanne Marcelo <gms15@inf.ufpr.br>
Date: Thu, 25 Feb 2016 11:22:17 -0300
Subject: [PATCH] Adding apps id
---
app/helpers/learning_objects_helper.rb | 2 +-
app/views/devise/sessions/new.html.erb | 108 ++++++++++++------------
app/views/devise/shared/_links.html.erb | 4 +-
config/initializers/devise.rb | 8 +-
4 files changed, 63 insertions(+), 59 deletions(-)
diff --git a/app/helpers/learning_objects_helper.rb b/app/helpers/learning_objects_helper.rb
index 6da1d8803..010d22aad 100644
--- a/app/helpers/learning_objects_helper.rb
+++ b/app/helpers/learning_objects_helper.rb
@@ -79,7 +79,7 @@ module LearningObjectsHelper
}
set_meta_tags fb: {
- app_id: ''
+ app_id: '745857965514514'
}
end
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 53f07bb3b..293b439c2 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -3,63 +3,67 @@
<div class="row">
<div class=" col-md-12">
<div class="white-input">
- <div class="grey-panel">
- <h2>Entrar</h2>
- <br/>
- <%= image_tag image_path('user-anon.png'), class: "logo" %><br/><br/>
+ <div class="grey-panel">
+ <h2>Entrar</h2>
+ <br/>
+ <%= image_tag image_path('user-anon.png'), class: "logo" %><br/><br/>
- <form action="" method="">
- <table style="margin: 20px auto;">
- <tr>
- <td>Email:</td><td> </td>
- <td style=" padding: 10px;">
- <%= f.email_field :email, autofocus: true , style:"width:375px;"%>
- </td>
- </tr>
+ <form action="" method="">
+ <table style="margin: 20px auto;">
+ <tr>
+ <td>Email:</td>
+ <td> </td>
+ <td style=" padding: 10px;">
+ <%= f.email_field :email, autofocus: true, style: "width:375px;" %>
+ </td>
+ </tr>
- <tr>
- <td>Senha:</td><td> </td>
- <td><%= f.password_field :password, autocomplete: "off", style:"width:375px;" %></td>
- </tr>
- <tr>
- <td></td><td></td>
- <td>
- <span class="pull-right">
- <% if devise_mapping.rememberable? -%>
- <div class="field">
- <%= f.check_box :remember_me %>
- <%= f.label :remember_me %>
+ <tr>
+ <td>Senha:</td>
+ <td> </td>
+ <td><%= f.password_field :password, autocomplete: "off", style: "width:375px;" %></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td>
+ <span class="pull-right">
+ <% if devise_mapping.rememberable? -%>
+ <div class="field">
+ <%= f.check_box :remember_me %>
+ <%= f.label :remember_me %>
+ </div>
+ <% end -%>
+ <%= link_to "Esqueceu sua senha?", new_password_path(resource_name), class: 'link-setup-2' %>
+ </span>
+ </td>
+ </tr>
+ </table>
+ </form>
+ <br/>
+ <br/>
+ <div class="container-fluid">
+ <div class="col-md-offset-3 col-md-4">
+ <div class="col-md-7">
+ <span class="pull-right">Não possui conta?</span><br/>
+ <span class="pull-right">
+ <%= link_to "Cadastre-se", new_registration_path(resource_name), class: 'link-setup' %>
+ <span class="pull-right"><%= link_to "Entre com o Facebook", user_omniauth_authorize_path(:facebook), class: 'link-setup' %></span>
+ <span class="pull-right"><%= link_to "Entre com o Twitter", user_omniauth_authorize_path(:twitter), class: 'link-setup' %></span>
+ <span class="pull-right"><%= link_to "Entre com o Google", user_omniauth_authorize_path(:google_oauth2), class: 'link-setup' %></span>
+ </span>
</div>
- <% end -%>
- <%= link_to "Esqueceu sua senha?", new_password_path(resource_name) , class:'link-setup-2' %>
- </span></td>
- </tr>
- </table>
- </form>
- <br/>
- <br/>
- <div class="container-fluid">
- <div class="col-md-offset-3 col-md-4">
- <div class="col-md-7">
- <span class="pull-right">Não possui conta?</span><br/>
- <span class="pull-right">
- <%= link_to "Cadastre-se", new_registration_path(resource_name),class:'link-setup' %>
- <span class="pull-right"><%#= link_to "Entre com o Facebook", user_omniauth_authorize_path(:facebook), class:'link-setup' %></span>
- <span class="pull-right"><%#= link_to "Entre com o Twitter", user_omniauth_authorize_path(:twitter), class:'link-setup' %></span>
- <span class="pull-right"><%#= link_to "Entre com o Google", user_omniauth_authorize_path(:google_oauth2), class:'link-setup' %></span>
- </span>
- </div>
- <div class=" col-md-3">
- <span class="pull-left">
- <%= f.submit "Entrar", class: "btn-singin btn " %>
- </span>
- <br/>
- </div>
- </div>
- </div>
+ <div class=" col-md-3">
+ <span class="pull-left">
+ <%= f.submit "Entrar", class: "btn-singin btn " %>
+ </span>
+ <br/>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
- </div>
</div>
</div>
<% end %>
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb
index 5309f21ff..1d470b085 100644
--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
@@ -21,9 +21,9 @@
<%- if devise_mapping.omniauthable? %>
<%- resource_class.omniauth_providers.each do |provider| %>
<%- if provider.to_s.titleize == "Google Oauth2" %>
- <%#= link_to "Entre com Google", omniauth_authorize_path(resource_name, provider), {:class=>'add-picture'} %><br />
+ <%= link_to "Entre com Google", omniauth_authorize_path(resource_name, provider), {:class=>'add-picture'} %><br />
<%- else %>
- <%#= link_to "Entre com #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), {:class=>'add-picture'} %><br />
+ <%= link_to "Entre com #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), {:class=>'add-picture'} %><br />
<% end -%>
<%- end %>
<% end -%>
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a73f22ac0..e977629bb 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,4 +1,4 @@
-# Use this hook to configure devise mailer, warden hooks and so forth.
+''# Use this hook to configure devise mailer, warden hooks and so forth.
# Many of these configuration options can be set straight in your model.
Devise.setup do |config|
# The secret key used by Devise. Devise uses this key to generate
@@ -236,9 +236,9 @@ Devise.setup do |config|
# Add a new OmniAuth provider. Check the wiki for more information on setting
# up on your models and hooks.
# config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
- config.omniauth :facebook, "APP_ID", "APP_SECRET"
- config.omniauth :twitter, "APP_ID", "APP_SECRET"
- config.omniauth :google_oauth2, "APP_ID", "APP_SECRET", { }
+ config.omniauth :facebook, "745857965514514", "eb465ec961022087f56204e3b86a63ee"
+ config.omniauth :twitter, "pGD4B2uPuDv07yYqshlwDmdeM", "zt2PHrfIhHjk8lRCqlc47BanKrBghjxYyh8XOzaSnPF27rTnNS"
+ config.omniauth :google_oauth2, "314037571286-v3in875omm5vn56uhg77j06vtuic223f.apps.googleusercontent.com", "cJN0MTZisPqkkCLg3kSQDWIx", { }
# ==> Warden configuration
# If you want to use other strategies, that are not supported by Devise, or
--
GitLab