Skip to content

Facebook Button #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wilson-Duncan wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Facebook Button #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1f105b
Made main.css resource and facebook sign in button.
Wilson-Duncan Aug 1, 2014
34d5037
Adjusting layout.
Wilson-Duncan Aug 1, 2014
49b37b1
Layout issue with fb button taken care of.
Wilson-Duncan Aug 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions app/assets/stylesheets/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.h4{
text-align: center;
}
.sign-in{
display:inline-flex;
}
#f{

width:50px;
background-color: #2c3e50;
border-radius:4px;
padding-top:11px;
padding-bottom:11px;
color:white;
border-color:#2c3e50;
text-align:center;
float:left;
margin-right: 2px;
}
1 change: 1 addition & 0 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootswatch/3.2.0/flatly/bootstrap.min.css">
<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,900' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css">
<link rel="stylesheet" href="app/assets/stylesheets/main.css">
<style>body,h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family: 'Source Sans Pro',Arial;}body{padding-top:60px;}</style>
<%= csrf_meta_tags %>
</head>
Expand Down
52 changes: 40 additions & 12 deletions app/views/pages/home.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,9 @@
margin-right: 0px;
margin-bottom: 0px;
">
<% if user_signed_in? %>

<h2>Welcome <%= current_user.name %>, you're signed in!</h2>
<%= link_to "Click Here to Log out!", destroy_user_session_path, method: :delete %>
<%= link_to "Click Here to make an event", "/events/new" %>
<% else %>


<style>
html,
body {
Expand All @@ -39,7 +36,25 @@ body {
body {
font-family: "Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;
}
.h4{
text-align: center;
}
.sign-in{
display:inline-flex;
}
#f{

width:50px;
background-color: #2c3e50;
border-radius:4px;
padding-top:11px;
padding-bottom:11px;
color:white;
border-color:#2c3e50;
text-align:center;
float:left;
margin-right: 2px;
}
.text-vertical-center {
display: table-cell;
text-align: center;
Expand Down Expand Up @@ -267,13 +282,26 @@ footer {
<div class="text-vertical-center">
<img src = "/assets/PlayPickup.png" class = "responsive"/>
<h3 style="color: white;">We're some KICKASS PEOPLE</h3>
<br>
<%= link_to user_omniauth_authorize_path(:facebook) do %>
<button class = "fblogin">
<span class = "fb-logo"><i class="fa fa-facebook-square"></i></span>
<span class= "words">Sign up with Facebook</span>
</button>
<% end %>
<!--My code-->
<% if user_signed_in? %>

<h2>Welcome <%= current_user.name %>, you're signed in!</h2>
<%= button_to "Click Here to Log out!", destroy_user_session_path, :class => "btn btn-primary", method: :delete %>
<%= link_to "Click Here to make an event", "/events/new" %>
<% else %>
<div>
<h4 class="h4" style="color:white;">Game On lets people connect with one another through competitive sport.</h4>
<h4 class="h4" style="color:white;"><b>Try it out!</b></h4>
<br/>
<center>
<section class="sign-in">
<center><div id="f" >f</div></center>
<center><%= button_to "Sign in with Facebook", user_omniauth_authorize_path(:facebook), :class => "btn btn-primary sign-in" %></center>
</section>
</center>
</div>
<!--My code-->

</div>
</header>
<!-- <header id="top" class="header">
Expand Down
1 change: 0 additions & 1 deletion db/schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
create_table "events", force: true do |t|
t.float "latitude"
t.float "longitude"
#We didn't create a migration for long and lat
t.string "location"
t.datetime "starts_at"
t.string "details"
Expand Down