61 app/views/users/show.html.erb
View file
@@ -1,50 +1,27 @@
<div id="fullpage">
<div class="section active">
<div class="slide">
<div class="container">
<div class="row">
<div class="medium-4 columns">
<%= image_tag("placeholder_user.png") %>
<div class="text-center">
<h3>User Name</h3>
<hr>
</div>
<p>Bio: </p>

<%= render 'looking_for_form' %>

</div>

<div class="medium-8 columns">
<div class="panel expgit">
<%= render 'experience_form' %>
</div>
</div>
</div>
<div class="container">
<div class="row">
<div class="medium-4 columns">
<div class="profilepic">
<%= image_tag(@user.picture_url, width: "200") %>
</div>
</div>
<div class="slide">
<div class="container">
<div class="row">
<div class="medium-4 columns">
<%= image_tag("placeholder_user.png") %>
<div class="text-center">
<h3>User Name</h3>
<hr>
</div>
<p>Bio: </p>
<div class="text-center">
<h3><%= @user.name %></h3>
<hr>
</div>
<p><%= @user.description %></p>

<%= render 'project_form' %>
<%= render 'looking_for_form' %>

</div>
</div>

<div class="medium-8 columns">
<div class="panel expgit">
<%= render 'github_form' %>
</div>
</div>
</div>
<div class="medium-8 columns">
<div class="panel expgit">
<%= render 'experience_form' %>
</div>
</div>
</div>
</div>

<div class="arrowright">
Github<%= link_to image_tag("arrow_right.png"), git_path %>
</div>
9 config/routes.rb
View file
@@ -1,5 +1,14 @@
Rails.application.routes.draw do
resources :users

get 'users/:id/git' => 'users#git', as: 'git'

match 'first/:id' => 'users#first_splash', as: 'first_splash', via: [:get]
match 'role/:id' => 'users#role_set', as: 'role_set', via: [:patch]
match 'second/:id' => 'users#second_splash', as: 'second_splash', via: [:get]
match 'gitid/:id' => 'users#git_set', as: 'git_set', via: [:patch]


# You can have the root of your site routed with "root"
root 'users#welcome'
match "/auth/linkedin/callback" => "sessions#create", via: [:get, :post]
5 db/migrate/20150317221753_add_github_id_to_users.rb
View file
@@ -0,0 +1,5 @@
class AddGithubIdToUsers < ActiveRecord::Migration
def change
add_column :users, :github_id, :string
end
end
3 db/schema.rb
View file
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20150317203140) do
ActiveRecord::Schema.define(version: 20150317221753) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -48,6 +48,7 @@
t.string "picture_url"
t.string "email"
t.string "description"
t.string "github_id"
end

end